Reverted PlaneGeometry XY to XZ change.

mlgmlg103 · Aug 3, 2012 · 686c8ef · 686c8ef
1 parent 47ee3b0
commit 686c8ef
Show file tree

Hide file tree

Showing 51 changed files with 76 additions and 69 deletions.
diff --git a/build/Three.js b/build/Three.js
diff --git a/build/custom/ThreeCanvas.js b/build/custom/ThreeCanvas.js
diff --git a/build/custom/ThreeExtras.js b/build/custom/ThreeExtras.js
diff --git a/examples/canvas_ascii_effect.html b/examples/canvas_ascii_effect.html
@@ -73,6 +73,7 @@
 
 				plane = new THREE.Mesh( new THREE.PlaneGeometry( 400, 400 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0 } ) );
 				plane.position.y = - 200;
+				plane.rotation.x = - Math.PI / 2;
 				scene.add( plane );
 
 				renderer = new THREE.CanvasRenderer();

diff --git a/examples/canvas_geometry_cube.html b/examples/canvas_geometry_cube.html
@@ -76,6 +76,7 @@
 				// Plane
 
 				plane = new THREE.Mesh( new THREE.PlaneGeometry( 200, 200 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0 } ) );
+				plane.geometry.applyMatrix( new THREE.Matrix4().makeRotationX( - Math.PI / 2 ) );
 				scene.add( plane );
 
 				renderer = new THREE.CanvasRenderer();

diff --git a/examples/canvas_geometry_earth.html b/examples/canvas_geometry_earth.html
@@ -102,6 +102,7 @@
 
 				var mesh = new THREE.Mesh( geometry, material );
 				mesh.position.y = - 250;
+				mesh.rotation.x = - Math.PI / 2;
 				group.add( mesh );
 
 				renderer = new THREE.CanvasRenderer();

diff --git a/examples/canvas_geometry_terrain.html b/examples/canvas_geometry_terrain.html
@@ -70,7 +70,9 @@
 				var material = new THREE.MeshBasicMaterial( { map: new THREE.Texture( generateTexture( data, 1024, 1024 ) ), overdraw: true } );
 
 				var quality = 16, step = 1024 / quality;
+
 				var plane = new THREE.PlaneGeometry( 2000, 2000, quality - 1, quality - 1 );
+				plane.applyMatrix( new THREE.Matrix4().makeRotationX( - Math.PI / 2 ) );
 
 				for ( var i = 0, l = plane.vertices.length; i < l; i ++ ) {
 

diff --git a/examples/canvas_interactive_voxelpainter.html b/examples/canvas_interactive_voxelpainter.html
@@ -76,6 +76,7 @@
 				projector = new THREE.Projector();
 
 				plane = new THREE.Mesh( new THREE.PlaneGeometry( 1000, 1000 ), new THREE.MeshFaceMaterial() );
+				plane.rotation.x = - Math.PI / 2;
 				scene.add( plane );
 
 				mouse2D = new THREE.Vector3( 0, 10000, 0.5 );

diff --git a/examples/canvas_materials_depth.html b/examples/canvas_materials_depth.html
@@ -66,9 +66,9 @@
 				var material = new THREE.MeshDepthMaterial( { overdraw: true } );
 
 				plane = new THREE.Mesh( new THREE.PlaneGeometry( 1000, 1000, 10, 10 ), material );
-				plane.doubleSided = true;
 				plane.position.y = - 100;
-
+				plane.rotation.x = - Math.PI / 2;
+				plane.doubleSided = true;
 				scene.add( plane );
 
 				// Cubes

diff --git a/examples/canvas_materials_video.html b/examples/canvas_materials_video.html
@@ -108,13 +108,12 @@
 				var plane = new THREE.PlaneGeometry( 480, 204, 4, 4 );
 
 				mesh = new THREE.Mesh( plane, material );
-				mesh.rotation.x = Math.PI / 2;
 				mesh.scale.x = mesh.scale.y = mesh.scale.z = 1.5;
 				scene.add(mesh);
 
 				mesh = new THREE.Mesh( plane, materialReflection );
 				mesh.position.y = -306;
-				mesh.rotation.x = - Math.PI / 2;
+				mesh.rotation.x = - Math.PI;
 				mesh.scale.x = mesh.scale.y = mesh.scale.z = 1.5;
 				mesh.doubleSided = true;
 				scene.add( mesh );

diff --git a/examples/js/effects/AnaglyphEffect.js b/examples/js/effects/AnaglyphEffect.js
@@ -75,7 +75,6 @@ THREE.AnaglyphEffect = function ( renderer ) {
 	} );
 
 	var mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), _material );
-	mesh.rotation.x = Math.PI / 2;
 	_scene.add( mesh );
 
 	this.setSize = function ( width, height ) {

diff --git a/examples/js/effects/ParallaxBarrierEffect.js b/examples/js/effects/ParallaxBarrierEffect.js
@@ -77,7 +77,6 @@ THREE.ParallaxBarrierEffect = function ( renderer ) {
 	} );
 
 	var mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), _material );
-	mesh.rotation.x = Math.PI / 2;
 	_scene.add( mesh );
 
 	this.setSize = function ( width, height ) {

diff --git a/examples/js/postprocessing/EffectComposer.js b/examples/js/postprocessing/EffectComposer.js
@@ -132,7 +132,6 @@ THREE.EffectComposer.camera = new THREE.OrthographicCamera( THREE.EffectComposer
 // shared fullscreen quad scene
 
 THREE.EffectComposer.geometry = new THREE.PlaneGeometry( 1, 1 );
-THREE.EffectComposer.geometry.applyMatrix( new THREE.Matrix4().makeRotationX( Math.PI / 2 ) );
 
 THREE.EffectComposer.quad = new THREE.Mesh( THREE.EffectComposer.geometry, null );
 THREE.EffectComposer.quad.position.z = -100;

diff --git a/examples/misc_software.html b/examples/misc_software.html
@@ -64,6 +64,7 @@
 
 				plane = new THREE.Mesh( new THREE.PlaneGeometry( 200, 200 ), new THREE.MeshBasicMaterial( { color: 0xe0e0e0 } ) );
 				plane.position.y = - 150;
+				plane.rotation.x = - Math.PI / 2;
 				scene.add( plane );
 
 				renderer = new THREE.SoftwareRenderer2();

diff --git a/examples/misc_sound.html b/examples/misc_sound.html
@@ -165,10 +165,9 @@
 				var material_wireframe = new THREE.MeshLambertMaterial( { color: 0xffaa00, wireframe: true, wireframeLinewidth: 1 } );
 				material_wireframe.color.setHSV( 0.1, 0.2, 0.5 );
 
-
-				var plane = new THREE.PlaneGeometry( 1000, 1000, 100, 100 );
-				mesh = new THREE.Mesh( plane, material_wireframe );
+				mesh = new THREE.Mesh( new THREE.PlaneGeometry( 1000, 1000, 100, 100 ), material_wireframe );
 				mesh.position.y = 0.1;
+				mesh.rotation.x = - Math.PI / 2;
 				scene.add( mesh );
 
 				//

diff --git a/examples/misc_ubiquity_test.html b/examples/misc_ubiquity_test.html
@@ -83,7 +83,6 @@
 
 				mesh = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff } ) );
 				mesh.position.y = -500;
-				mesh.rotation.x = Math.PI / 2;
 				mesh.scale.x = mesh.scale.y = mesh.scale.z = 2;
 				mesh.doubleSided = true;
 				scene.add( mesh );

diff --git a/examples/scenes/test_scene.js b/examples/scenes/test_scene.js
@@ -123,7 +123,7 @@
 		"geometry" : "quad",
 		"materials": [ "textured_bg" ],
 		"position" : [ 0, 15, -90 ],
-		"rotation" : [ 1.57, 0, 0 ],
+		"rotation" : [ 0, 0, 0 ],
 		"scale"	   : [ 20, 20, 20 ],
 		"visible"  : true
 	},
@@ -132,7 +132,7 @@
 		"geometry" : "plane",
 		"materials": [ "basic_gray" ],
 		"position" : [ 0, -10, 0 ],
-		"rotation" : [ 0, 0, 0 ],
+		"rotation" : [ -1.57, 0, 0 ],
 		"scale"	   : [ 100, 100, 100 ],
 		"visible"  : true
 	}

diff --git a/examples/webgl_animation_skinning.html b/examples/webgl_animation_skinning.html
@@ -94,10 +94,12 @@
 
 				floor = new THREE.Mesh( planeSimple, matSolid );
 				floor.position.y = -10;
+				floor.rotation.x = - Math.PI / 2;
 				floor.scale.set( 25, 25, 25 );
 				scene.add( floor );
 
 				floor = new THREE.Mesh( planeTesselated, matWire );
+				floor.rotation.x = - Math.PI / 2;
 				floor.scale.set( 25, 25, 25 );
 				scene.add( floor );
 

diff --git a/examples/webgl_geometry_colors.html b/examples/webgl_geometry_colors.html
@@ -76,16 +76,19 @@
 
 				mesh = new THREE.Mesh( shadowGeo, shadowMaterial );
 				mesh.position.y = - 250;
+				mesh.rotation.x = - Math.PI / 2;
 				scene.add( mesh );
 
 				mesh = new THREE.Mesh( shadowGeo, shadowMaterial );
 				mesh.position.y = - 250;
 				mesh.position.x = - 400;
+				mesh.rotation.x = - Math.PI / 2;
 				scene.add( mesh );
 
 				mesh = new THREE.Mesh( shadowGeo, shadowMaterial );
 				mesh.position.y = - 250;
 				mesh.position.x = 400;
+				mesh.rotation.x = - Math.PI / 2;
 				scene.add( mesh );
 
 				var faceIndices = [ 'a', 'b', 'c', 'd' ];