Inicio Explorar Axuda
Iniciar sesión
javascript
/
three.js
réplica de https://github.com/tazdij/three.js.git
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

Clean up.

Mr.doob %!s(int64=11) %!d(string=hai) anos
pai
a05727b668
achega
62e17f2e1a
Modificáronse 14 ficheiros con 23 adicións e 230 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 0 48
      docs/api/core/Geometry2.html
  2. 0 48
      docs/api/extras/geometries/BoxGeometry2.html
  3. 0 48
      docs/api/extras/geometries/PlaneGeometry2.html
  4. 0 46
      docs/api/loaders/Geometry2Loader.html
  5. 0 4
      docs/list.js
  6. 0 1
      editor/js/Editor.js
  7. 0 5
      editor/js/Menubar.File.js
  8. 0 5
      editor/js/Sidebar.Geometry.js
  9. 0 1
      editor/js/Sidebar.Material.js
  10. 0 5
      editor/js/Viewport.js
  11. 23 7
      examples/canvas_geometry2_sandbox.html
  12. 0 1
      examples/js/exporters/ObjectExporter.js
  13. 0 4
      examples/webgl_geometries2.html
  14. 0 7
      src/loaders/ObjectLoader.js

+ 0 - 48
docs/api/core/Geometry2.html
Ver ficheiro 

@@ -1,48 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<meta charset="utf-8" />
 
-		<script src="../../list.js"></script>
 
-		<script src="../../page.js"></script>
 
-		<link type="text/css" rel="stylesheet" href="../../page.css" />
 
-	</head>
 
-	<body>
 
-		[page:BufferGeometry] &rarr;
 
-		
-		<h1>[name]</h1>
 
-
 
-		<div class="desc">todo</div>
 
-
 
-		<h2>Example</h2>
 
-
 
-		<code>todo</code>
 
-
 
-		<h2>Constructor</h2>
 
-
 
-
 
-		<h3>todo</h3>
 
-		<div></div>
 
-
 
-
 
-		<h2>Properties</h2>
 
-
 
-		<h3>todo</h3>
 
-		<div>
 
-		todo
 
-		</div> 
-
 
-
 
-		<h2>Methods</h2>
 
-		
-
 
-		<h3>todo</h3>
 
-		<div>todo</div>
 
-		<div>
 
-		todo
 
-		</div>
 
-		
-		<h2>Source</h2>
 
-
 
-		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
-	</body>
 
-</html>

+ 0 - 48
docs/api/extras/geometries/BoxGeometry2.html
Ver ficheiro 

@@ -1,48 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<meta charset="utf-8" />
 
-		<script src="../../../list.js"></script>
 
-		<script src="../../../page.js"></script>
 
-		<link type="text/css" rel="stylesheet" href="../../../page.css" />
 
-	</head>
 
-	<body>
 
-		[page:Geometry2] &rarr;
 
-		
-		<h1>[name]</h1>
 
-
 
-		<div class="desc">todo</div>
 
-
 
-		<h2>Example</h2>
 
-
 
-		<code>todo</code>
 
-
 
-		<h2>Constructor</h2>
 
-
 
-
 
-		<h3>todo</h3>
 
-		<div></div>
 
-
 
-
 
-		<h2>Properties</h2>
 
-
 
-		<h3>todo</h3>
 
-		<div>
 
-		todo
 
-		</div> 
-
 
-
 
-		<h2>Methods</h2>
 
-		
-
 
-		<h3>todo</h3>
 
-		<div>todo</div>
 
-		<div>
 
-		todo
 
-		</div>
 
-		
-		<h2>Source</h2>
 
-
 
-		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
-	</body>
 
-</html>

+ 0 - 48
docs/api/extras/geometries/PlaneGeometry2.html
Ver ficheiro 

@@ -1,48 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<meta charset="utf-8" />
 
-		<script src="../../../list.js"></script>
 
-		<script src="../../../page.js"></script>
 
-		<link type="text/css" rel="stylesheet" href="../../../page.css" />
 
-	</head>
 
-	<body>
 
-		[page:Geometry2] &rarr;
 
-		
-		<h1>[name]</h1>
 
-
 
-		<div class="desc">todo</div>
 
-
 
-		<h2>Example</h2>
 
-
 
-		<code>todo</code>
 
-
 
-		<h2>Constructor</h2>
 
-
 
-
 
-		<h3>todo</h3>
 
-		<div></div>
 
-
 
-
 
-		<h2>Properties</h2>
 
-
 
-		<h3>todo</h3>
 
-		<div>
 
-		todo
 
-		</div> 
-
 
-
 
-		<h2>Methods</h2>
 
-		
-
 
-		<h3>todo</h3>
 
-		<div>todo</div>
 
-		<div>
 
-		todo
 
-		</div>
 
-		
-		<h2>Source</h2>
 
-
 
-		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
-	</body>
 
-</html>

+ 0 - 46
docs/api/loaders/Geometry2Loader.html
Ver ficheiro 

@@ -1,46 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<meta charset="utf-8" />
 
-		<script src="../../list.js"></script>
 
-		<script src="../../page.js"></script>
 
-		<link type="text/css" rel="stylesheet" href="../../page.css" />
 
-	</head>
 
-	<body>
 
-		<h1>[name]</h1>
 
-
 
-		<div class="desc">todo</div>
 
-
 
-		<h2>Example</h2>
 
-
 
-		<code>todo</code>
 
-
 
-		<h2>Constructor</h2>
 
-
 
-
 
-		<h3>todo</h3>
 
-		<div></div>
 
-
 
-
 
-		<h2>Properties</h2>
 
-
 
-		<h3>todo</h3>
 
-		<div>
 
-		todo
 
-		</div> 
-
 
-
 
-		<h2>Methods</h2>
 
-		
-
 
-		<h3>todo</h3>
 
-		<div>todo</div>
 
-		<div>
 
-		todo
 
-		</div>
 
-		
-		<h2>Source</h2>
 
-
 
-		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
-	</body>
 
-</html>

+ 0 - 4
docs/list.js
Ver ficheiro 

@@ -27,7 +27,6 @@ var list = {
 
 			[ "EventDispatcher", "api/core/EventDispatcher" ],
 
 			[ "Face3", "api/core/Face3" ],
 
 			[ "Geometry", "api/core/Geometry" ],
 
-			[ "Geometry2", "api/core/Geometry2" ],
 
 			[ "Object3D", "api/core/Object3D" ],
 
 			[ "Projector", "api/core/Projector" ],
 
 			[ "Raycaster", "api/core/Raycaster" ],
 
@@ -46,7 +45,6 @@ var list = {
 
 
 		"Loaders": [
 
 			[ "BufferGeometryLoader", "api/loaders/BufferGeometryLoader" ],
 
-			[ "Geometry2Loader", "api/loaders/Geometry2Loader" ],
 
 			[ "ImageLoader", "api/loaders/ImageLoader" ],
 
 			[ "JSONLoader", "api/loaders/JSONLoader" ],
 
 			[ "Loader", "api/loaders/Loader" ],
 
@@ -184,7 +182,6 @@ var list = {
 
 
 		"Extras / Geometries": [
 
 			[ "BoxGeometry", "api/extras/geometries/BoxGeometry" ],
 
-			[ "BoxGeometry2", "api/extras/geometries/BoxGeometry2" ],
 
 			[ "CircleGeometry", "api/extras/geometries/CircleGeometry" ],
 
 			[ "CubeGeometry", "api/extras/geometries/CubeGeometry" ],
 
 			[ "CylinderGeometry", "api/extras/geometries/CylinderGeometry" ],
 
@@ -194,7 +191,6 @@ var list = {
 
 			[ "OctahedronGeometry", "api/extras/geometries/OctahedronGeometry" ],
 
 			[ "ParametricGeometry", "api/extras/geometries/ParametricGeometry" ],
 
 			[ "PlaneGeometry", "api/extras/geometries/PlaneGeometry" ],
 
-			[ "PlaneGeometry2", "api/extras/geometries/PlaneGeometry2" ],
 
 			[ "PolyhedronGeometry", "api/extras/geometries/PolyhedronGeometry" ],
 
 			[ "RingGeometry", "api/extras/geometries/RingGeometry" ],
 
 			[ "ShapeGeometry", "api/extras/geometries/ShapeGeometry" ],

+ 0 - 1
editor/js/Editor.js
Ver ficheiro 

@@ -357,7 +357,6 @@ Editor.prototype = {
 
 			'TorusKnotGeometry': THREE.TorusKnotGeometry,
 
 			'TubeGeometry': THREE.TubeGeometry,
 
 			'Geometry': THREE.Geometry,
 
-			'Geometry2': THREE.Geometry2,
 
 			'BufferGeometry': THREE.BufferGeometry
 
 
 		};

+ 0 - 5
editor/js/Menubar.File.js
Ver ficheiro 

@@ -10,7 +10,6 @@ Menubar.File = function ( editor ) {
 
 		var output = exporter.parse( object.geometry );
 
 
 		if ( exporter instanceof THREE.BufferGeometryExporter ||
 
-			 exporter instanceof THREE.Geometry2Exporter ||
 
 		     exporter instanceof THREE.GeometryExporter ) {
 
 
 			output = JSON.stringify( output, null, '\t' );
 
@@ -116,10 +115,6 @@ Menubar.File = function ( editor ) {
 
 
 			exportGeometry( THREE.BufferGeometryExporter );
 
 
-		} else if ( geometry instanceof THREE.Geometry2 ) {
 
-
 
-			exportGeometry( THREE.Geometry2Exporter );
 
-
 
 		} else if ( geometry instanceof THREE.Geometry ) {
 
 
 			exportGeometry( THREE.GeometryExporter );

+ 0 - 5
editor/js/Sidebar.Geometry.js
Ver ficheiro 

@@ -165,11 +165,6 @@ Sidebar.Geometry = function ( editor ) {
 
 			geometryVertices.setValue( geometry.vertices.length );
 
 			geometryFaces.setValue( geometry.faces.length );
 
 
-		} else if ( geometry instanceof THREE.Geometry2 ) {
 
-
 
-			geometryVertices.setValue( geometry.vertices.length / 3 );
 
-			geometryFaces.setValue( geometry.vertices.length / 9 );
 
-
 
 		} else if ( geometry instanceof THREE.BufferGeometry ) {
 
 
 			geometryVertices.setValue( geometry.attributes.position.array.length / 3 );

+ 0 - 1
editor/js/Sidebar.Material.js
Ver ficheiro 

@@ -313,7 +313,6 @@ Sidebar.Material = function ( editor ) {
 
 
 		if ( object instanceof THREE.Sprite ) objectHasUvs = true;
 
 		if ( geometry instanceof THREE.Geometry && geometry.faceVertexUvs[ 0 ].length > 0 ) objectHasUvs = true;
 
-		if ( geometry instanceof THREE.Geometry2 && geometry.uvs.length > 0 ) objectHasUvs = true;
 
 		if ( geometry instanceof THREE.BufferGeometry && geometry.attributes.uv !== undefined ) objectHasUvs = true;
 
 
 		if ( material ) {

+ 0 - 5
editor/js/Viewport.js
Ver ficheiro 

@@ -497,11 +497,6 @@ var Viewport = function ( editor ) {
 
 					vertices += geometry.vertices.length;
 
 					faces += geometry.faces.length;
 
 
-				} else if ( geometry instanceof THREE.Geometry2 ) {
 
-
 
-					vertices += geometry.vertices.length / 3;
 
-					faces += geometry.vertices.length / 9;
 
-
 
 				} else if ( geometry instanceof THREE.BufferGeometry ) {
 
 
 					vertices += geometry.attributes.position.array.length / 3;

+ 23 - 7
examples/canvas_geometry2_sandbox.html
Ver ficheiro 

@@ -21,6 +21,11 @@
 
 		<script src="../src/extras/geometries/PlaneGeometry2.js"></script>
 
 		<script src="../src/extras/geometries/PlaneGeometry2b.js"></script>
 
 
+		<script src="../src/core/Geometry3.js"></script>
 
+		<script src="../src/extras/geometries/PlaneGeometry3.js"></script>
 
+
 
+		<script src="../src/extras/geometries/PlaneGeometryB.js"></script>
 
+
 
 		<script src="js/libs/stats.min.js"></script>
 
 
 		<script>
 
@@ -45,15 +50,20 @@
 
 
 				scene = new THREE.Scene();
 
 
+				var light = new THREE.PointLight( 0xffffff );
 
+				light.position.set( 0, 200, - 50 );
 
+				scene.add( light );
 
+
 
 				//
 
 
-				addGeometries( 'PlaneGeometry', 'BoxGeometry', - 300 );
 
-				addGeometries( 'PlaneGeometry2', 'BoxGeometry2', 0 );
 
-				addGeometries( 'PlaneGeometry2b', 'BoxGeometry2', 300 );
 
+				addGeometries( 'PlaneGeometry', 'BoxGeometry', 0 );
 
+				// addGeometries( 'PlaneGeometry2', 'BoxGeometry2', 0 );
 
+				// addGeometries( 'PlaneGeometry3', 'BoxGeometry2', 0 );
 
+				// addGeometries( 'PlaneGeometryB', 'BoxGeometry2', 0 );
 
 
 				//
 
 
-				renderer = new THREE.CanvasRenderer();
 
+				renderer = new THREE.WebGLRenderer();
 
 				renderer.setClearColor( 0xf0f0f0 );
 
 				renderer.setSize( window.innerWidth, window.innerHeight );
 
 
@@ -75,8 +85,9 @@
 
 					createGeometry( 'PlaneGeometry' );
 
 					createGeometry( 'PlaneGeometry2' );
 
 					createGeometry( 'PlaneGeometry2b' );
 
+					createGeometry( 'PlaneGeometryB' );
 
 
-				}, 1000 );
 
+				}, 2000 );
 
 
 			}
 
 
@@ -94,15 +105,19 @@
 
 
 				// Plane
 
 
-				var geometry = new THREE[ PlaneGeometry ]( 200, 200, 10, 10 );
 
+				console.time( PlaneGeometry );
 
+				var geometry = new THREE[ PlaneGeometry ]( 200, 200, 100, 100 );
 
+				console.timeEnd( PlaneGeometry );
 
+
 
 				geometry.applyMatrix( new THREE.Matrix4().makeRotationX( - Math.PI / 2 ) );
 
 
-				var material = new THREE.MeshBasicMaterial( { color: 0xff0000, wireframe: true } );
 
+				var material = new THREE.MeshPhongMaterial( { color: 0xffffff /*, wireframe: true*/ } );
 
 
 				plane = new THREE.Mesh( geometry, material );
 
 				plane.position.x = x;
 
 				scene.add( plane );
 
 
+				/*
 
 				// Cube
 
 
 				var geometry = new THREE[ BoxGeometry ]( 200, 200, 200, 10, 10, 10 );
 
@@ -112,6 +127,7 @@
 
 				cube = new THREE.Mesh( geometry, material );
 
 				cube.position.y = 150;
 
 				plane.add( cube );
 
+				*/
 
 
 			}

+ 0 - 1
examples/js/exporters/ObjectExporter.js
Ver ficheiro 

@@ -24,7 +24,6 @@ THREE.ObjectExporter.prototype = {
 
 
 		var geometries = {};
 
 		var geometryExporter = new THREE.GeometryExporter();
 
-		var geometry2Exporter = new THREE.Geometry2Exporter();
 
 		var bufferGeometryExporter = new THREE.BufferGeometryExporter();
 
 
 		var parseGeometry = function ( geometry ) {

+ 0 - 4
examples/webgl_geometries2.html
Ver ficheiro 

@@ -153,10 +153,6 @@
 
 				// object.position.set( -200, 100, 0 );
 
 				// scene.add( object );
 
 
-				// object = THREE.SceneUtils.createMultiMaterialObject( new THREE.PlaneGeometry2( 400, 400, 4, 4 ), materials );
 
-				// object.position.set( -200, 100, 0 );
 
-				// scene.add( object );
 
-
 
 				object = new THREE.AxisHelper( 50 );
 
 				object.position.set( 200, 0, -200 );
 
 				scene.add( object );

+ 0 - 7
src/loaders/ObjectLoader.js
Ver ficheiro 

@@ -49,7 +49,6 @@ THREE.ObjectLoader.prototype = {
 
 		if ( json !== undefined ) {
 
 
 			var geometryLoader = new THREE.JSONLoader();
 
-			var geometry2Loader = new THREE.Geometry2Loader();
 
 			var bufferGeometryLoader = new THREE.BufferGeometryLoader();
 
 
 			for ( var i = 0, l = json.length; i < l; i ++ ) {
 
@@ -161,12 +160,6 @@ THREE.ObjectLoader.prototype = {
 
 
 						break;
 
 
-					case 'Geometry2':
 
-
 
-						geometry = geometry2Loader.parse( data.data );
 
-
 
-						break;
 
-
 
 					case 'Geometry':
 
 
 						geometry = geometryLoader.parse( data.data ).geometry;