Browse Source

Minor tweaks.

Mr.doob 14 years ago
parent
commit
f5f9becaf1
2 changed files with 6 additions and 9 deletions
  1. 2 5
      examples/materials_cars.html
  2. 4 4
      src/renderers/CanvasRenderer.js

+ 2 - 5
examples/materials_cars.html

@@ -144,9 +144,6 @@
 			};
 			};
 
 
 
 
-			var SCREEN_WIDTH = window.innerWidth;
-			var SCREEN_HEIGHT = window.innerHeight;
-
 			var container, stats;
 			var container, stats;
 
 
 			var camera, scene, webglRenderer;
 			var camera, scene, webglRenderer;
@@ -174,7 +171,7 @@
 				container = document.createElement('div');
 				container = document.createElement('div');
 				document.body.appendChild(container);
 				document.body.appendChild(container);
 
 
-				camera = new THREE.Camera( 70, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 100000 );
+				camera = new THREE.Camera( 70, window.innerWidth / window.innerHeight, 1, 100000 );
 				// camera.position.z = 1000;
 				// camera.position.z = 1000;
 				camera.updateMatrix();
 				camera.updateMatrix();
 
 
@@ -211,7 +208,7 @@
 				SceneUtils.addPanoramaCubeWebGL( sceneCube, 100000, textureCube );
 				SceneUtils.addPanoramaCubeWebGL( sceneCube, 100000, textureCube );
 
 
 				webglRenderer = new THREE.WebGLRenderer( scene );
 				webglRenderer = new THREE.WebGLRenderer( scene );
-				webglRenderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
+				webglRenderer.setSize( window.innerWidth, window.innerHeight );
 				webglRenderer.setFaceCulling( 0 );
 				webglRenderer.setFaceCulling( 0 );
 				webglRenderer.autoClear = false;
 				webglRenderer.autoClear = false;
 				container.appendChild( webglRenderer.domElement );
 				container.appendChild( webglRenderer.domElement );

+ 4 - 4
src/renderers/CanvasRenderer.js

@@ -139,7 +139,7 @@ THREE.CanvasRenderer = function () {
 				for ( m = 0, ml = element.material.length; m < ml; m++ ) {
 				for ( m = 0, ml = element.material.length; m < ml; m++ ) {
 
 
 					material = element.material[ m ];
 					material = element.material[ m ];
-					material && renderParticle( _v1, element, material, scene );
+					renderParticle( _v1, element, material, scene );
 
 
 				}
 				}
 
 
@@ -164,7 +164,7 @@ THREE.CanvasRenderer = function () {
 				while ( m < ml ) {
 				while ( m < ml ) {
 
 
 					material = element.material[ m ++ ];
 					material = element.material[ m ++ ];
-					material && renderLine( _v1, _v2, element, material, scene );
+					renderLine( _v1, _v2, element, material, scene );
 
 
 				}
 				}
 
 
@@ -215,7 +215,7 @@ THREE.CanvasRenderer = function () {
 
 
 					}
 					}
 
 
-					material && renderFace3( _v1, _v2, _v3, element, material, scene );
+					renderFace3( _v1, _v2, _v3, element, material, scene );
 
 
 				}
 				}
 
 
@@ -278,7 +278,7 @@ THREE.CanvasRenderer = function () {
 
 
 					}
 					}
 
 
-					material && renderFace4( _v1, _v2, _v3, _v4, _v5, _v6, element, material, scene );
+					renderFace4( _v1, _v2, _v3, _v4, _v5, _v6, element, material, scene );
 
 
 				}
 				}