瀏覽代碼

Clean up.

Mr.doob 9 年之前
父節點
當前提交
5b9ef34f1e
共有 5 個文件被更改,包括 10 次插入37 次删除
  1. 1 2
      examples/webgl_helpers.html
  2. 5 4
      examples/webgl_loader_msgpack.html
  3. 2 0
      src/Three.Legacy.js
  4. 2 27
      src/loaders/ObjectLoader.js
  5. 0 4
      src/objects/Sprite.js

+ 1 - 2
examples/webgl_helpers.html

@@ -45,8 +45,7 @@
 
 				scene.add( new THREE.PointLightHelper( light, 5 ) );
 
-				var helper = new THREE.GridHelper( 200, 10 );
-				helper.setColors( 0x0000ff, 0x808080 );
+				var helper = new THREE.GridHelper( 200, 10, 0x0000ff, 0x808080 );
 				helper.position.y = - 150;
 				scene.add( helper );
 

+ 5 - 4
examples/webgl_loader_msgpack.html

@@ -56,7 +56,11 @@ https://github.com/creationix/msgpack-js-browser
 
 			function render() {
 
-				renderer.render( scene, camera );
+				if ( scene !== undefined ) {
+
+					renderer.render( scene, camera );
+
+				}
 
 			}
 
@@ -118,9 +122,6 @@ https://github.com/creationix/msgpack-js-browser
 
 			function init() {
 
-				scene = new THREE.Scene();
-
-				scene.add( new THREE.GridHelper( 10, 2.5 ) );
 				container = document.getElementById( 'viewport' );
 
 				renderer = new THREE.WebGLRenderer( { antialias: true, alpha: true	} );

+ 2 - 0
src/Three.Legacy.js

@@ -266,6 +266,8 @@ Object.defineProperties( THREE, {
 	}
 } );
 
+THREE.Particle = THREE.Sprite;
+
 //
 
 Object.defineProperties( THREE.Light.prototype, {

+ 2 - 27
src/loaders/ObjectLoader.js

@@ -162,35 +162,11 @@ THREE.ObjectLoader.prototype = {
 						break;
 
 					case 'DodecahedronGeometry':
-
-						geometry = new THREE.DodecahedronGeometry(
-							data.radius,
-							data.detail
-						);
-
-						break;
-
 					case 'IcosahedronGeometry':
-
-						geometry = new THREE.IcosahedronGeometry(
-							data.radius,
-							data.detail
-						);
-
-						break;
-
 					case 'OctahedronGeometry':
-
-						geometry = new THREE.OctahedronGeometry(
-							data.radius,
-							data.detail
-						);
-
-						break;
-
 					case 'TetrahedronGeometry':
 
-						geometry = new THREE.TetrahedronGeometry(
+						geometry = new THREE[ data.type ](
 							data.radius,
 							data.detail
 						);
@@ -466,8 +442,7 @@ THREE.ObjectLoader.prototype = {
 
 				case 'PerspectiveCamera':
 
-					object = new THREE.PerspectiveCamera(
-							data.fov, data.aspect, data.near, data.far );
+					object = new THREE.PerspectiveCamera( data.fov, data.aspect, data.near, data.far );
 
 					if ( data.focus !== undefined ) object.focus = data.focus;
 					if ( data.zoom !== undefined ) object.zoom = data.zoom;

+ 0 - 4
src/objects/Sprite.js

@@ -65,7 +65,3 @@ THREE.Sprite.prototype.clone = function () {
 	return new this.constructor( this.material ).copy( this );
 
 };
-
-// Backwards compatibility
-
-THREE.Particle = THREE.Sprite;