Permalink
Browse files

Update THREE JS to r52

  • Loading branch information...
1 parent 07cc165 commit 87dff722db04b6385fb5bc8df7768d57062b5dbe @dimroc committed Oct 18, 2012
Showing with 21,605 additions and 23,123 deletions.
  1. +8 −1 index.html
  2. +2 −2 js/samples/blur_post_process.js
  3. +1 −1 js/samples/particle_height_map.js
  4. +1 −1 js/samples/particle_height_map_vertex_texture.js
  5. +1 −1 js/samples/render_to_texture.js
  6. +1 −1 js/samples/shadow_map.js
  7. +1 −2 js/samples/spinning_wireframe_cube.js
  8. +1 −2 js/samples/spinning_wireframe_torus.js
  9. +19,621 −21,300 lib/js/three.js
  10. +24 −14 lib/js/three/BloomPass.js
  11. +7 −6 lib/js/three/DotScreenPass.js
  12. +4 −1 lib/js/three/EffectComposer.js
  13. +4 −1 lib/js/three/FilmPass.js
  14. +4 −1 lib/js/three/SavePass.js
  15. +0 −1,788 lib/js/three/ShaderExtras.js
  16. +4 −1 lib/js/three/TexturePass.js
  17. +31 −0 lib/js/three/shaders/BasicShader.js
  18. +64 −0 lib/js/three/shaders/BleachBypassShader.js
  19. +51 −0 lib/js/three/shaders/BlendShader.js
  20. +116 −0 lib/js/three/shaders/BokehShader.js
  21. +58 −0 lib/js/three/shaders/BrightnessContrastShader.js
  22. +48 −0 lib/js/three/shaders/ColorCorrectionShader.js
  23. +49 −0 lib/js/three/shaders/ColorifyShader.js
  24. +101 −0 lib/js/three/shaders/ConvolutionShader.js
  25. +46 −0 lib/js/three/shaders/CopyShader.js
  26. +58 −0 lib/js/three/shaders/DOFMipMapShader.js
  27. +68 −0 lib/js/three/shaders/DotScreenShader.js
  28. +99 −0 lib/js/three/shaders/FXAAShader.js
  29. +104 −0 lib/js/three/shaders/FilmShader.js
  30. +91 −0 lib/js/three/shaders/FocusShader.js
  31. +62 −0 lib/js/three/shaders/HorizontalBlurShader.js
  32. +65 −0 lib/js/three/shaders/HorizontalTiltShiftShader.js
  33. +69 −0 lib/js/three/shaders/HueSaturationShader.js
  34. +50 −0 lib/js/three/shaders/LuminosityShader.js
  35. +53 −0 lib/js/three/shaders/NormalMapShader.js
  36. +259 −0 lib/js/three/shaders/SSAOShader.js
  37. +54 −0 lib/js/three/shaders/SepiaShader.js
  38. +78 −0 lib/js/three/shaders/TriangleBlurShader.js
  39. +57 −0 lib/js/three/shaders/UnpackDepthRGBAShader.js
  40. +62 −0 lib/js/three/shaders/VerticalBlurShader.js
  41. +65 −0 lib/js/three/shaders/VerticalTiltShiftShader.js
  42. +63 −0 lib/js/three/shaders/VignetteShader.js
View
@@ -1204,12 +1204,19 @@
"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",
@@ -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;
@@ -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});
@@ -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});
@@ -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;
View
@@ -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 } );
@@ -16,8 +16,7 @@
var mesh = new THREE.Mesh( geometry, material );
scene.add( mesh );
- var axisHelper = new THREE.AxisHelper();
- axisHelper.scale.x = axisHelper.scale.y = axisHelper.scale.z = 0.015;
+ var axisHelper = new THREE.AxisHelper(50);
scene.add( axisHelper );
var renderer = new THREE.WebGLRenderer({canvas: canvas, antialias: true});
@@ -18,8 +18,7 @@
mesh.position.y = 35;
scene.add( mesh );
- var axisHelper = new THREE.AxisHelper();
- axisHelper.scale.x = axisHelper.scale.y = axisHelper.scale.z = 0.5;
+ var axisHelper = new THREE.AxisHelper(50);
scene.add( axisHelper );
var renderer = new THREE.WebGLRenderer({"canvas": canvas});
Oops, something went wrong.

0 comments on commit 87dff72

Please sign in to comment.