Examples fix.

WhitestormJS · Nov 15, 2015 · b9d7a05 · b9d7a05
1 parent ff15f0c
commit b9d7a05
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 48 deletions.
diff --git a/examples/assets/terrain/default_terrain.js b/examples/assets/terrain/default_terrain.js
diff --git a/examples/assets/terrain/default_terrain.png b/examples/assets/terrain/default_terrain.png
diff --git a/examples/assets/terrain/large_terrain.js b/examples/assets/terrain/large_terrain.js
diff --git a/examples/assets/terrain/large_terrain.png b/examples/assets/terrain/large_terrain.png
diff --git a/examples/assets/textures/backgrounddetailed6.jpg b/examples/assets/textures/backgrounddetailed6.jpg
diff --git a/examples/assets/textures/box.jpg b/examples/assets/textures/box.jpg
diff --git a/examples/assets/textures/bricks.jpg b/examples/assets/textures/bricks.jpg
diff --git a/examples/assets/textures/clouds.jpg b/examples/assets/textures/clouds.jpg
diff --git a/examples/assets/textures/crate.gif b/examples/assets/textures/crate.gif
diff --git a/examples/assets/textures/grass.jpg b/examples/assets/textures/grass.jpg
diff --git a/examples/assets/textures/grass01.png b/examples/assets/textures/grass01.png
diff --git a/examples/assets/textures/grasslight-big-nm.jpg b/examples/assets/textures/grasslight-big-nm.jpg
diff --git a/examples/assets/textures/grasslight-big.jpg b/examples/assets/textures/grasslight-big.jpg
diff --git a/examples/assets/textures/ground.jpg b/examples/assets/textures/ground.jpg
diff --git a/examples/assets/textures/stone-wall.jpg b/examples/assets/textures/stone-wall.jpg
diff --git a/examples/assets/textures/terrain/dirt-512.jpg b/examples/assets/textures/terrain/dirt-512.jpg
diff --git a/examples/assets/textures/terrain/grass-512.jpg b/examples/assets/textures/terrain/grass-512.jpg
diff --git a/examples/assets/textures/terrain/rock-512.jpg b/examples/assets/textures/terrain/rock-512.jpg
diff --git a/examples/assets/textures/terrain/sand-512.jpg b/examples/assets/textures/terrain/sand-512.jpg
diff --git a/examples/assets/textures/terrain/snow-512.jpg b/examples/assets/textures/terrain/snow-512.jpg
diff --git a/examples/assets/textures/terrain/water512.jpg b/examples/assets/textures/terrain/water512.jpg
diff --git a/examples/assets/textures/thingrass.jpg b/examples/assets/textures/thingrass.jpg
diff --git a/examples/assets/textures/thingrass.png b/examples/assets/textures/thingrass.png
diff --git a/examples/assets/textures/tree.jpeg b/examples/assets/textures/tree.jpeg
diff --git a/examples/assets/textures/wood-floor.jpg b/examples/assets/textures/wood-floor.jpg
diff --git a/examples/fps.html b/examples/fps.html
@@ -4,58 +4,16 @@
 <head>
  <meta charset="utf-8">
  <title>WhitestormJS development</title>
- <script src="libs/three.js"></script>
- <script src="libs/cannon.js"></script>
- <script src="libs/Wagner.js"></script>
+ <script src="../libs/three.js"></script>
+ <script src="../libs/cannon.js"></script>
+ <script src="../libs/Wagner.js"></script>
 
- <script src="assets/terrain/default_terrain.js"></script>
+ <script src="../assets/terrain/default_terrain.js"></script>
 </head>
 
 <body>
 </body>
-<script id="vertexShader" type="x-shader/x-vertex">
-uniform sampler2D bumpTexture;
-uniform float bumpScale;
-
-varying float vAmount;
-varying vec2 vUV;
-
-void main()
-{
- vUV = uv;
- //vec4 bumpData = texture2D( bumpTexture, uv );
-
- vAmount = position.y * 0.005 + 0.1; // bumpData.r; assuming map is grayscale it doesn't matter if you use r, g, or b.
-
- // move the position along the normal
- vec3 newPosition = position; //+ normal * bumpScale * vAmount;
-
- gl_Position = projectionMatrix * modelViewMatrix * vec4( newPosition, 1.0 );
-}
-</script>
-<script id="fragmentShader" type="x-shader/x-vertex">
-uniform sampler2D oceanTexture;
-uniform sampler2D sandyTexture;
-uniform sampler2D grassTexture;
-uniform sampler2D rockyTexture;
-uniform sampler2D snowyTexture;
-
-varying vec2 vUV;
-
-varying float vAmount;
-
-void main()
-{
- vec4 water = (smoothstep(0.01, 0.25, vAmount) - smoothstep(0.24, 0.26, vAmount)) * texture2D( oceanTexture, vUV * 0.1 );
- vec4 sandy = (smoothstep(0.24, 0.27, vAmount) - smoothstep(0.28, 0.31, vAmount)) * texture2D( sandyTexture, vUV * 0.1 );
- vec4 grass = (smoothstep(0.28, 0.32, vAmount) - smoothstep(0.35, 0.40, vAmount)) * texture2D( grassTexture, vUV * 0.2 );
- vec4 rocky = (smoothstep(0.30, 0.50, vAmount) - smoothstep(0.40, 0.70, vAmount)) * texture2D( rockyTexture, vUV * 0.2 );
- vec4 snowy = (smoothstep(0.50, 0.65, vAmount)) * texture2D( snowyTexture, vUV * 0.1 );
- gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0) + water + sandy + grass + rocky + snowy; //, 1.0);
- //gl_FragColor = vec4(vAmount, 0.0, 0.0, 1.0);
-}
-</script>
-<script src="build/whitestorm.js"></script>
+<script src="../build/whitestorm.js"></script>
 <script defer>
  // NOTE: Make person bigger 10 times
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
  "name": "whitestormjs",
  "version": "0.0.4",
  "description": "Three.js + Cannon.js render library.",
- "main": "whitestorm.js",
+ "main": "build/whitestorm.js",
  "scripts": {
  "test": "echo \"Error: no test specified\" && exit 1"
  },