Update THREE JS to r52

dimroc · Oct 18, 2012 · 87dff72 · 87dff72
1 parent 07cc165
commit 87dff72
Show file tree

Hide file tree

Showing 42 changed files with 21,605 additions and 23,123 deletions.
diff --git a/index.html b/index.html
@@ -1204,12 +1204,19 @@ <h2>Credits</h2>
 
         "lib/js/three.js",
         "lib/js/three/EffectComposer.js",
-        "lib/js/three/ShaderExtras.js",
         "lib/js/three/RenderPass.js",
         "lib/js/three/BloomPass.js",
         "lib/js/three/ShaderPass.js",
         "lib/js/three/MaskPass.js",
 
+        // three shaders
+        "lib/js/three/shaders/CopyShader.js",
+        "lib/js/three/shaders/BasicShader.js",
+        "lib/js/three/shaders/DotScreenShader.js",
+        "lib/js/three/shaders/UnpackDepthRGBAShader.js",
+        "lib/js/three/shaders/HorizontalBlurShader.js",
+        "lib/js/three/shaders/VerticalBlurShader.js",
+
         // js files needed for WebGL specific samples (excluding three js)
         "lib/js/J3DI.js",
         "lib/js/J3DIMath.js",

diff --git a/js/samples/blur_post_process.js b/js/samples/blur_post_process.js
@@ -24,10 +24,10 @@
       var composer = new THREE.EffectComposer( renderer );
 
       var renderModel = new THREE.RenderPass( scene, camera );
-      var effectHorizontalBlur = new THREE.ShaderPass( THREE.ShaderExtras[ "horizontalBlur" ] );
+      var effectHorizontalBlur = new THREE.ShaderPass( THREE.HorizontalBlurShader );
       effectHorizontalBlur.uniforms.h.value = 2 / sample_defaults.width;
 
-      var effectVerticalBlur = new THREE.ShaderPass( THREE.ShaderExtras[ "verticalBlur" ] );
+      var effectVerticalBlur = new THREE.ShaderPass( THREE.VerticalBlurShader );
       effectVerticalBlur.uniforms.v.value = 2 / sample_defaults.height;
 
       effectVerticalBlur.renderToScreen = true;

diff --git a/js/samples/particle_height_map.js b/js/samples/particle_height_map.js
@@ -56,7 +56,7 @@
 
         scene.add( particles );
 
-        var axisHelper = new THREE.AxisHelper();
+        var axisHelper = new THREE.AxisHelper(50);
         scene.add( axisHelper );
 
         renderer = new THREE.WebGLRenderer({canvas: canvas});

diff --git a/js/samples/particle_height_map_vertex_texture.js b/js/samples/particle_height_map_vertex_texture.js
@@ -60,7 +60,7 @@
 
           scene.add( particles );
 
-          var axisHelper = new THREE.AxisHelper();
+          var axisHelper = new THREE.AxisHelper(50);
           scene.add( axisHelper );
 
           renderer = new THREE.WebGLRenderer({canvas: canvas});

diff --git a/js/samples/render_to_texture.js b/js/samples/render_to_texture.js
@@ -37,7 +37,7 @@
 
       // Create plane to render spinning cube as texture.
       var planeGeometry = new THREE.PlaneGeometry( 1, 1 );
-      var planeMaterial = new THREE.ShaderMaterial( THREE.ShaderExtras["screen"] );
+      var planeMaterial = new THREE.ShaderMaterial( THREE.DotScreenShader );
       planeMaterial.side = THREE.DoubleSide;
       var planeMesh = new THREE.Mesh(planeGeometry, planeMaterial);
       planeMesh.position.z = -100;

diff --git a/js/samples/shadow_map.js b/js/samples/shadow_map.js
@@ -59,7 +59,7 @@
       var camera = new THREE.OrthographicCamera(width / -2, width / 2, height / 2, height / -2);
       camera.position.z = 10;
 
-      var shader = THREE.ShaderExtras[ "unpackDepthRGBA" ];
+      var shader = THREE.UnpackDepthRGBAShader;
       var uniforms = new THREE.UniformsUtils.clone( shader.uniforms );
 
       var hudMaterial = new THREE.ShaderMaterial( { vertexShader: shader.vertexShader, fragmentShader: shader.fragmentShader, uniforms: uniforms } );

diff --git a/js/samples/spinning_wireframe_cube.js b/js/samples/spinning_wireframe_cube.js
@@ -16,8 +16,7 @@
       var mesh = new THREE.Mesh( geometry, material );
       scene.add( mesh );
 
-      var axisHelper = new THREE.AxisHelper();
+      var axisHelper = new THREE.AxisHelper(50);
-      axisHelper.scale.x = axisHelper.scale.y = axisHelper.scale.z = 0.015;
       scene.add( axisHelper );
 
       var renderer = new THREE.WebGLRenderer({canvas: canvas, antialias: true});

diff --git a/js/samples/spinning_wireframe_torus.js b/js/samples/spinning_wireframe_torus.js
@@ -18,8 +18,7 @@
       mesh.position.y = 35;
       scene.add( mesh );
 
-      var axisHelper = new THREE.AxisHelper();
+      var axisHelper = new THREE.AxisHelper(50);
-      axisHelper.scale.x = axisHelper.scale.y = axisHelper.scale.z = 0.5;
       scene.add( axisHelper );
 
       var renderer = new THREE.WebGLRenderer({"canvas": canvas});