Skip to content

T
three.js

车家大少爷 / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

提交 62e17f2e 编写于 作者: M Mr.doob
浏览文件
操作

Clean up.

上级 a05727b6
隐藏空白更改
内联 并排
Showing with 23 addition and 230 deletion
docs/api/core/Geometry2.html 已删除 100644 → 0
浏览文件 @ a05727b6
<!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>
docs/api/extras/geometries/BoxGeometry2.html 已删除 100644 → 0
浏览文件 @ a05727b6
<!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>
docs/api/extras/geometries/PlaneGeometry2.html 已删除 100644 → 0
浏览文件 @ a05727b6
<!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>
docs/api/loaders/Geometry2Loader.html 已删除 100644 → 0
浏览文件 @ a05727b6
<!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>
docs/list.js
浏览文件 @ 62e17f2e
...@@ -27,7 +27,6 @@ var list = { ...@@ -27,7 +27,6 @@ var list = {
[ "EventDispatcher", "api/core/EventDispatcher" ], [ "EventDispatcher", "api/core/EventDispatcher" ],
[ "Face3", "api/core/Face3" ], [ "Face3", "api/core/Face3" ],
[ "Geometry", "api/core/Geometry" ], [ "Geometry", "api/core/Geometry" ],
[ "Geometry2", "api/core/Geometry2" ],
[ "Object3D", "api/core/Object3D" ], [ "Object3D", "api/core/Object3D" ],
[ "Projector", "api/core/Projector" ], [ "Projector", "api/core/Projector" ],
[ "Raycaster", "api/core/Raycaster" ], [ "Raycaster", "api/core/Raycaster" ],
...@@ -46,7 +45,6 @@ var list = { ...@@ -46,7 +45,6 @@ var list = {
"Loaders": [ "Loaders": [
[ "BufferGeometryLoader", "api/loaders/BufferGeometryLoader" ], [ "BufferGeometryLoader", "api/loaders/BufferGeometryLoader" ],
[ "Geometry2Loader", "api/loaders/Geometry2Loader" ],
[ "ImageLoader", "api/loaders/ImageLoader" ], [ "ImageLoader", "api/loaders/ImageLoader" ],
[ "JSONLoader", "api/loaders/JSONLoader" ], [ "JSONLoader", "api/loaders/JSONLoader" ],
[ "Loader", "api/loaders/Loader" ], [ "Loader", "api/loaders/Loader" ],
...@@ -184,7 +182,6 @@ var list = { ...@@ -184,7 +182,6 @@ var list = {
"Extras / Geometries": [ "Extras / Geometries": [
[ "BoxGeometry", "api/extras/geometries/BoxGeometry" ], [ "BoxGeometry", "api/extras/geometries/BoxGeometry" ],
[ "BoxGeometry2", "api/extras/geometries/BoxGeometry2" ],
[ "CircleGeometry", "api/extras/geometries/CircleGeometry" ], [ "CircleGeometry", "api/extras/geometries/CircleGeometry" ],
[ "CubeGeometry", "api/extras/geometries/CubeGeometry" ], [ "CubeGeometry", "api/extras/geometries/CubeGeometry" ],
[ "CylinderGeometry", "api/extras/geometries/CylinderGeometry" ], [ "CylinderGeometry", "api/extras/geometries/CylinderGeometry" ],
...@@ -194,7 +191,6 @@ var list = { ...@@ -194,7 +191,6 @@ var list = {
[ "OctahedronGeometry", "api/extras/geometries/OctahedronGeometry" ], [ "OctahedronGeometry", "api/extras/geometries/OctahedronGeometry" ],
[ "ParametricGeometry", "api/extras/geometries/ParametricGeometry" ], [ "ParametricGeometry", "api/extras/geometries/ParametricGeometry" ],
[ "PlaneGeometry", "api/extras/geometries/PlaneGeometry" ], [ "PlaneGeometry", "api/extras/geometries/PlaneGeometry" ],
[ "PlaneGeometry2", "api/extras/geometries/PlaneGeometry2" ],
[ "PolyhedronGeometry", "api/extras/geometries/PolyhedronGeometry" ], [ "PolyhedronGeometry", "api/extras/geometries/PolyhedronGeometry" ],
[ "RingGeometry", "api/extras/geometries/RingGeometry" ], [ "RingGeometry", "api/extras/geometries/RingGeometry" ],
[ "ShapeGeometry", "api/extras/geometries/ShapeGeometry" ], [ "ShapeGeometry", "api/extras/geometries/ShapeGeometry" ],
......
editor/js/Editor.js
浏览文件 @ 62e17f2e
...@@ -357,7 +357,6 @@ Editor.prototype = { ...@@ -357,7 +357,6 @@ Editor.prototype = {
'TorusKnotGeometry': THREE.TorusKnotGeometry, 'TorusKnotGeometry': THREE.TorusKnotGeometry,
'TubeGeometry': THREE.TubeGeometry, 'TubeGeometry': THREE.TubeGeometry,
'Geometry': THREE.Geometry, 'Geometry': THREE.Geometry,
'Geometry2': THREE.Geometry2,
'BufferGeometry': THREE.BufferGeometry 'BufferGeometry': THREE.BufferGeometry
}; };
......
editor/js/Menubar.File.js
浏览文件 @ 62e17f2e
...@@ -10,7 +10,6 @@ Menubar.File = function ( editor ) { ...@@ -10,7 +10,6 @@ Menubar.File = function ( editor ) {
var output = exporter.parse( object.geometry ); var output = exporter.parse( object.geometry );
if ( exporter instanceof THREE.BufferGeometryExporter || if ( exporter instanceof THREE.BufferGeometryExporter ||
exporter instanceof THREE.Geometry2Exporter ||
exporter instanceof THREE.GeometryExporter ) { exporter instanceof THREE.GeometryExporter ) {
output = JSON.stringify( output, null, '\t' ); output = JSON.stringify( output, null, '\t' );
...@@ -116,10 +115,6 @@ Menubar.File = function ( editor ) { ...@@ -116,10 +115,6 @@ Menubar.File = function ( editor ) {
exportGeometry( THREE.BufferGeometryExporter ); exportGeometry( THREE.BufferGeometryExporter );
} else if ( geometry instanceof THREE.Geometry2 ) {
exportGeometry( THREE.Geometry2Exporter );
} else if ( geometry instanceof THREE.Geometry ) { } else if ( geometry instanceof THREE.Geometry ) {
exportGeometry( THREE.GeometryExporter ); exportGeometry( THREE.GeometryExporter );
......
editor/js/Sidebar.Geometry.js
浏览文件 @ 62e17f2e
...@@ -165,11 +165,6 @@ Sidebar.Geometry = function ( editor ) { ...@@ -165,11 +165,6 @@ Sidebar.Geometry = function ( editor ) {
geometryVertices.setValue( geometry.vertices.length ); geometryVertices.setValue( geometry.vertices.length );
geometryFaces.setValue( geometry.faces.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 ) { } else if ( geometry instanceof THREE.BufferGeometry ) {
geometryVertices.setValue( geometry.attributes.position.array.length / 3 ); geometryVertices.setValue( geometry.attributes.position.array.length / 3 );
......
editor/js/Sidebar.Material.js
浏览文件 @ 62e17f2e
...@@ -313,7 +313,6 @@ Sidebar.Material = function ( editor ) { ...@@ -313,7 +313,6 @@ Sidebar.Material = function ( editor ) {
if ( object instanceof THREE.Sprite ) objectHasUvs = true; if ( object instanceof THREE.Sprite ) objectHasUvs = true;
if ( geometry instanceof THREE.Geometry && geometry.faceVertexUvs[ 0 ].length > 0 ) 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 ( geometry instanceof THREE.BufferGeometry && geometry.attributes.uv !== undefined ) objectHasUvs = true;
if ( material ) { if ( material ) {
......
editor/js/Viewport.js
浏览文件 @ 62e17f2e
...@@ -497,11 +497,6 @@ var Viewport = function ( editor ) { ...@@ -497,11 +497,6 @@ var Viewport = function ( editor ) {
vertices += geometry.vertices.length; vertices += geometry.vertices.length;
faces += geometry.faces.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 ) { } else if ( geometry instanceof THREE.BufferGeometry ) {
vertices += geometry.attributes.position.array.length / 3; vertices += geometry.attributes.position.array.length / 3;
......
examples/canvas_geometry2_sandbox.html
浏览文件 @ 62e17f2e
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
<script src="../src/extras/geometries/PlaneGeometry2.js"></script> <script src="../src/extras/geometries/PlaneGeometry2.js"></script>
<script src="../src/extras/geometries/PlaneGeometry2b.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 src="js/libs/stats.min.js"></script>
<script> <script>
...@@ -45,15 +50,20 @@ ...@@ -45,15 +50,20 @@
scene = new THREE.Scene(); scene = new THREE.Scene();
var light = new THREE.PointLight( 0xffffff );
light.position.set( 0, 200, - 50 );
scene.add( light );
// //
addGeometries( 'PlaneGeometry', 'BoxGeometry', - 300 ); addGeometries( 'PlaneGeometry', 'BoxGeometry', 0 );
addGeometries( 'PlaneGeometry2', 'BoxGeometry2', 0 ); // addGeometries( 'PlaneGeometry2', 'BoxGeometry2', 0 );
addGeometries( 'PlaneGeometry2b', 'BoxGeometry2', 300 ); // addGeometries( 'PlaneGeometry3', 'BoxGeometry2', 0 );
// addGeometries( 'PlaneGeometryB', 'BoxGeometry2', 0 );
// //
renderer = new THREE.CanvasRenderer(); renderer = new THREE.WebGLRenderer();
renderer.setClearColor( 0xf0f0f0 ); renderer.setClearColor( 0xf0f0f0 );
renderer.setSize( window.innerWidth, window.innerHeight ); renderer.setSize( window.innerWidth, window.innerHeight );
...@@ -75,8 +85,9 @@ ...@@ -75,8 +85,9 @@
createGeometry( 'PlaneGeometry' ); createGeometry( 'PlaneGeometry' );
createGeometry( 'PlaneGeometry2' ); createGeometry( 'PlaneGeometry2' );
createGeometry( 'PlaneGeometry2b' ); createGeometry( 'PlaneGeometry2b' );
createGeometry( 'PlaneGeometryB' );
}, 1000 ); }, 2000 );
} }
...@@ -94,15 +105,19 @@ ...@@ -94,15 +105,19 @@
// Plane // 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 ) ); 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 = new THREE.Mesh( geometry, material );
plane.position.x = x; plane.position.x = x;
scene.add( plane ); scene.add( plane );
/*
// Cube // Cube
var geometry = new THREE[ BoxGeometry ]( 200, 200, 200, 10, 10, 10 ); var geometry = new THREE[ BoxGeometry ]( 200, 200, 200, 10, 10, 10 );
...@@ -112,6 +127,7 @@ ...@@ -112,6 +127,7 @@
cube = new THREE.Mesh( geometry, material ); cube = new THREE.Mesh( geometry, material );
cube.position.y = 150; cube.position.y = 150;
plane.add( cube ); plane.add( cube );
*/
} }
......
examples/js/exporters/ObjectExporter.js
浏览文件 @ 62e17f2e
...@@ -24,7 +24,6 @@ THREE.ObjectExporter.prototype = { ...@@ -24,7 +24,6 @@ THREE.ObjectExporter.prototype = {
var geometries = {}; var geometries = {};
var geometryExporter = new THREE.GeometryExporter(); var geometryExporter = new THREE.GeometryExporter();
var geometry2Exporter = new THREE.Geometry2Exporter();
var bufferGeometryExporter = new THREE.BufferGeometryExporter(); var bufferGeometryExporter = new THREE.BufferGeometryExporter();
var parseGeometry = function ( geometry ) { var parseGeometry = function ( geometry ) {
......
examples/webgl_geometries2.html
浏览文件 @ 62e17f2e
...@@ -153,10 +153,6 @@ ...@@ -153,10 +153,6 @@
// object.position.set( -200, 100, 0 ); // object.position.set( -200, 100, 0 );
// scene.add( object ); // 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 = new THREE.AxisHelper( 50 );
object.position.set( 200, 0, -200 ); object.position.set( 200, 0, -200 );
scene.add( object ); scene.add( object );
......
src/loaders/ObjectLoader.js
浏览文件 @ 62e17f2e
...@@ -49,7 +49,6 @@ THREE.ObjectLoader.prototype = { ...@@ -49,7 +49,6 @@ THREE.ObjectLoader.prototype = {
if ( json !== undefined ) { if ( json !== undefined ) {
var geometryLoader = new THREE.JSONLoader(); var geometryLoader = new THREE.JSONLoader();
var geometry2Loader = new THREE.Geometry2Loader();
var bufferGeometryLoader = new THREE.BufferGeometryLoader(); var bufferGeometryLoader = new THREE.BufferGeometryLoader();
for ( var i = 0, l = json.length; i < l; i ++ ) { for ( var i = 0, l = json.length; i < l; i ++ ) {
...@@ -161,12 +160,6 @@ THREE.ObjectLoader.prototype = { ...@@ -161,12 +160,6 @@ THREE.ObjectLoader.prototype = {
break; break;
case 'Geometry2':
geometry = geometry2Loader.parse( data.data );
break;
case 'Geometry': case 'Geometry':
geometry = geometryLoader.parse( data.data ).geometry; geometry = geometryLoader.parse( data.data ).geometry;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或