From 247454fea12f02edb638ff0d4ce347234416e6ab Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 14 Sep 2016 15:44:24 -0700 Subject: [PATCH] Moved ./extras/geometries to ./geometries. --- .../geometries/BoxBufferGeometry.html | 2 +- .../{extras => }/geometries/BoxGeometry.html | 2 +- .../geometries/CircleBufferGeometry.html | 2 +- .../geometries/CircleGeometry.html | 2 +- .../geometries/ConeBufferGeometry.html | 2 +- .../{extras => }/geometries/ConeGeometry.html | 2 +- .../geometries/CylinderBufferGeometry.html | 2 +- .../geometries/CylinderGeometry.html | 2 +- .../geometries/DodecahedronGeometry.html | 2 +- .../geometries/ExtrudeGeometry.html | 2 +- .../geometries/IcosahedronGeometry.html | 2 +- .../geometries/LatheBufferGeometry.html | 2 +- .../geometries/LatheGeometry.html | 2 +- .../geometries/OctahedronGeometry.html | 2 +- .../geometries/ParametricGeometry.html | 2 +- .../geometries/PlaneBufferGeometry.html | 2 +- .../geometries/PlaneGeometry.html | 2 +- .../geometries/PolyhedronGeometry.html | 2 +- .../geometries/RingBufferGeometry.html | 2 +- .../{extras => }/geometries/RingGeometry.html | 2 +- .../geometries/ShapeGeometry.html | 2 +- .../geometries/SphereBufferGeometry.html | 2 +- .../geometries/SphereGeometry.html | 2 +- .../geometries/TetrahedronGeometry.html | 2 +- .../{extras => }/geometries/TextGeometry.html | 2 +- .../geometries/TorusBufferGeometry.html | 2 +- .../geometries/TorusGeometry.html | 2 +- .../geometries/TorusKnotBufferGeometry.html | 2 +- .../geometries/TorusKnotGeometry.html | 2 +- .../{extras => }/geometries/TubeGeometry.html | 2 +- docs/list.js | 66 +++++++++---------- editor/js/libs/tern-threejs/threejs.js | 40 +++++------ src/Three.Legacy.js | 17 ++++- src/Three.js | 2 +- src/extras/core/Shape.js | 18 ----- src/extras/helpers/ArrowHelper.js | 2 +- src/extras/helpers/BoundingBoxHelper.js | 2 +- src/extras/helpers/EdgesHelper.js | 2 +- src/extras/helpers/HemisphereLightHelper.js | 2 +- src/extras/helpers/PointLightHelper.js | 2 +- src/extras/helpers/WireframeHelper.js | 2 +- .../geometries/BoxBufferGeometry.js | 6 +- src/{extras => }/geometries/BoxGeometry.js | 2 +- .../geometries/CircleBufferGeometry.js | 8 +-- src/{extras => }/geometries/CircleGeometry.js | 2 +- .../geometries/ConeBufferGeometry.js | 2 +- src/{extras => }/geometries/ConeGeometry.js | 0 .../geometries/CylinderBufferGeometry.js | 8 +-- .../geometries/CylinderGeometry.js | 2 +- .../geometries/DodecahedronGeometry.js | 0 src/{extras => }/geometries/EdgesGeometry.js | 8 +-- .../geometries/ExtrudeGeometry.js | 10 +-- src/{extras => }/geometries/Geometries.js | 0 .../geometries/IcosahedronGeometry.js | 0 .../geometries/LatheBufferGeometry.js | 10 +-- src/{extras => }/geometries/LatheGeometry.js | 2 +- .../geometries/OctahedronGeometry.js | 0 .../geometries/ParametricGeometry.js | 6 +- .../geometries/PlaneBufferGeometry.js | 4 +- src/{extras => }/geometries/PlaneGeometry.js | 2 +- .../geometries/PolyhedronGeometry.js | 10 +-- .../geometries/RingBufferGeometry.js | 8 +-- src/{extras => }/geometries/RingGeometry.js | 2 +- src/{extras => }/geometries/ShapeGeometry.js | 8 +-- .../geometries/SphereBufferGeometry.js | 8 +-- src/{extras => }/geometries/SphereGeometry.js | 2 +- .../geometries/TetrahedronGeometry.js | 0 src/{extras => }/geometries/TextGeometry.js | 2 +- .../geometries/TorusBufferGeometry.js | 6 +- src/{extras => }/geometries/TorusGeometry.js | 2 +- .../geometries/TorusKnotBufferGeometry.js | 8 +-- .../geometries/TorusKnotGeometry.js | 2 +- src/{extras => }/geometries/TubeGeometry.js | 12 ++-- .../geometries/WireframeGeometry.js | 4 +- src/loaders/ObjectLoader.js | 2 +- src/renderers/WebGLRenderer.js | 4 +- .../geometries/BoxGeometry.tests.js | 0 .../geometries/CircleBufferGeometry.tests.js | 0 .../geometries/CircleGeometry.tests.js | 0 .../geometries/CylinderGeometry.tests.js | 0 .../geometries/DodecahedronGeometry.tests.js | 0 .../{geometry => geometries}/EdgesGeometry.js | 0 .../geometries/ExtrudeGeometry.tests.js | 0 .../geometries/IcosahedronGeometry.tests.js | 0 .../geometries/LatheGeometry.tests.js | 0 .../geometries/OctahedronGeometry.tests.js | 0 .../geometries/ParametricGeometry.tests.js | 0 .../geometries/PlaneBufferGeometry.tests.js | 0 .../geometries/PlaneGeometry.tests.js | 0 .../geometries/PolyhedronGeometry.tests.js | 0 .../geometries/RingGeometry.tests.js | 0 .../geometries/ShapeGeometry.tests.js | 0 .../geometries/SphereBufferGeometry.tests.js | 0 .../geometries/SphereGeometry.tests.js | 0 .../geometries/TetrahedronGeometry.tests.js | 0 .../geometries/TextGeometry.tests.js | 0 .../geometries/TorusGeometry.tests.js | 0 .../geometries/TorusKnotGeometry.tests.js | 0 .../geometries/TubeGeometry.tests.js | 0 .../geometries/WireframeGeometry.tests.js | 0 test/unit/unittests_three.html | 48 +++++++------- 101 files changed, 206 insertions(+), 209 deletions(-) rename docs/api/{extras => }/geometries/BoxBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/BoxGeometry.html (98%) rename docs/api/{extras => }/geometries/CircleBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/CircleGeometry.html (98%) rename docs/api/{extras => }/geometries/ConeBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/ConeGeometry.html (98%) rename docs/api/{extras => }/geometries/CylinderBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/CylinderGeometry.html (98%) rename docs/api/{extras => }/geometries/DodecahedronGeometry.html (97%) rename docs/api/{extras => }/geometries/ExtrudeGeometry.html (96%) rename docs/api/{extras => }/geometries/IcosahedronGeometry.html (97%) rename docs/api/{extras => }/geometries/LatheBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/LatheGeometry.html (98%) rename docs/api/{extras => }/geometries/OctahedronGeometry.html (97%) rename docs/api/{extras => }/geometries/ParametricGeometry.html (96%) rename docs/api/{extras => }/geometries/PlaneBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/PlaneGeometry.html (95%) rename docs/api/{extras => }/geometries/PolyhedronGeometry.html (98%) rename docs/api/{extras => }/geometries/RingBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/RingGeometry.html (98%) rename docs/api/{extras => }/geometries/ShapeGeometry.html (98%) rename docs/api/{extras => }/geometries/SphereBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/SphereGeometry.html (98%) rename docs/api/{extras => }/geometries/TetrahedronGeometry.html (97%) rename docs/api/{extras => }/geometries/TextGeometry.html (99%) rename docs/api/{extras => }/geometries/TorusBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/TorusGeometry.html (98%) rename docs/api/{extras => }/geometries/TorusKnotBufferGeometry.html (98%) rename docs/api/{extras => }/geometries/TorusKnotGeometry.html (98%) rename docs/api/{extras => }/geometries/TubeGeometry.html (98%) rename src/{extras => }/geometries/BoxBufferGeometry.js (97%) rename src/{extras => }/geometries/BoxGeometry.js (94%) rename src/{extras => }/geometries/CircleBufferGeometry.js (89%) rename src/{extras => }/geometries/CircleGeometry.js (92%) rename src/{extras => }/geometries/ConeBufferGeometry.js (92%) rename src/{extras => }/geometries/ConeGeometry.js (100%) rename src/{extras => }/geometries/CylinderBufferGeometry.js (97%) rename src/{extras => }/geometries/CylinderGeometry.js (94%) rename src/{extras => }/geometries/DodecahedronGeometry.js (100%) rename src/{extras => }/geometries/EdgesGeometry.js (89%) rename src/{extras => }/geometries/ExtrudeGeometry.js (98%) rename src/{extras => }/geometries/Geometries.js (100%) rename src/{extras => }/geometries/IcosahedronGeometry.js (100%) rename src/{extras => }/geometries/LatheBufferGeometry.js (94%) rename src/{extras => }/geometries/LatheGeometry.js (95%) rename src/{extras => }/geometries/OctahedronGeometry.js (100%) rename src/{extras => }/geometries/ParametricGeometry.js (92%) rename src/{extras => }/geometries/PlaneBufferGeometry.js (94%) rename src/{extras => }/geometries/PlaneGeometry.js (93%) rename src/{extras => }/geometries/PolyhedronGeometry.js (95%) rename src/{extras => }/geometries/RingBufferGeometry.js (93%) rename src/{extras => }/geometries/RingGeometry.js (93%) rename src/{extras => }/geometries/ShapeGeometry.js (93%) rename src/{extras => }/geometries/SphereBufferGeometry.js (94%) rename src/{extras => }/geometries/SphereGeometry.js (94%) rename src/{extras => }/geometries/TetrahedronGeometry.js (100%) rename src/{extras => }/geometries/TextGeometry.js (96%) rename src/{extras => }/geometries/TorusBufferGeometry.js (95%) rename src/{extras => }/geometries/TorusGeometry.js (94%) rename src/{extras => }/geometries/TorusKnotBufferGeometry.js (95%) rename src/{extras => }/geometries/TorusKnotGeometry.js (94%) rename src/{extras => }/geometries/TubeGeometry.js (96%) rename src/{extras => }/geometries/WireframeGeometry.js (96%) rename test/unit/{extras => }/geometries/BoxGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/CircleBufferGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/CircleGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/CylinderGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/DodecahedronGeometry.tests.js (100%) rename test/unit/{geometry => geometries}/EdgesGeometry.js (100%) rename test/unit/{extras => }/geometries/ExtrudeGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/IcosahedronGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/LatheGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/OctahedronGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/ParametricGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/PlaneBufferGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/PlaneGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/PolyhedronGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/RingGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/ShapeGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/SphereBufferGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/SphereGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/TetrahedronGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/TextGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/TorusGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/TorusKnotGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/TubeGeometry.tests.js (100%) rename test/unit/{extras => }/geometries/WireframeGeometry.tests.js (100%) diff --git a/docs/api/extras/geometries/BoxBufferGeometry.html b/docs/api/geometries/BoxBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/BoxBufferGeometry.html rename to docs/api/geometries/BoxBufferGeometry.html index 6b91fe04b9..0b6268b16e 100644 --- a/docs/api/extras/geometries/BoxBufferGeometry.html +++ b/docs/api/geometries/BoxBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/BoxGeometry.html b/docs/api/geometries/BoxGeometry.html similarity index 98% rename from docs/api/extras/geometries/BoxGeometry.html rename to docs/api/geometries/BoxGeometry.html index ece201e3fe..3c61a73eac 100644 --- a/docs/api/extras/geometries/BoxGeometry.html +++ b/docs/api/geometries/BoxGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/CircleBufferGeometry.html b/docs/api/geometries/CircleBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/CircleBufferGeometry.html rename to docs/api/geometries/CircleBufferGeometry.html index 3399bdae45..6ced197071 100644 --- a/docs/api/extras/geometries/CircleBufferGeometry.html +++ b/docs/api/geometries/CircleBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/CircleGeometry.html b/docs/api/geometries/CircleGeometry.html similarity index 98% rename from docs/api/extras/geometries/CircleGeometry.html rename to docs/api/geometries/CircleGeometry.html index 3f4deec0dc..8d85299f18 100644 --- a/docs/api/extras/geometries/CircleGeometry.html +++ b/docs/api/geometries/CircleGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/ConeBufferGeometry.html b/docs/api/geometries/ConeBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/ConeBufferGeometry.html rename to docs/api/geometries/ConeBufferGeometry.html index a60f6ef07b..634bc461a2 100644 --- a/docs/api/extras/geometries/ConeBufferGeometry.html +++ b/docs/api/geometries/ConeBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/ConeGeometry.html b/docs/api/geometries/ConeGeometry.html similarity index 98% rename from docs/api/extras/geometries/ConeGeometry.html rename to docs/api/geometries/ConeGeometry.html index 409802a45a..2d8e5e6e39 100644 --- a/docs/api/extras/geometries/ConeGeometry.html +++ b/docs/api/geometries/ConeGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/CylinderBufferGeometry.html b/docs/api/geometries/CylinderBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/CylinderBufferGeometry.html rename to docs/api/geometries/CylinderBufferGeometry.html index e25ba3586c..b2b853e1a4 100644 --- a/docs/api/extras/geometries/CylinderBufferGeometry.html +++ b/docs/api/geometries/CylinderBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/CylinderGeometry.html b/docs/api/geometries/CylinderGeometry.html similarity index 98% rename from docs/api/extras/geometries/CylinderGeometry.html rename to docs/api/geometries/CylinderGeometry.html index ca34843c0b..cbe8bb45df 100644 --- a/docs/api/extras/geometries/CylinderGeometry.html +++ b/docs/api/geometries/CylinderGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/DodecahedronGeometry.html b/docs/api/geometries/DodecahedronGeometry.html similarity index 97% rename from docs/api/extras/geometries/DodecahedronGeometry.html rename to docs/api/geometries/DodecahedronGeometry.html index 974efa306f..8a62d252e2 100644 --- a/docs/api/extras/geometries/DodecahedronGeometry.html +++ b/docs/api/geometries/DodecahedronGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/ExtrudeGeometry.html b/docs/api/geometries/ExtrudeGeometry.html similarity index 96% rename from docs/api/extras/geometries/ExtrudeGeometry.html rename to docs/api/geometries/ExtrudeGeometry.html index 5dce4a1095..e3009d1a5c 100644 --- a/docs/api/extras/geometries/ExtrudeGeometry.html +++ b/docs/api/geometries/ExtrudeGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/IcosahedronGeometry.html b/docs/api/geometries/IcosahedronGeometry.html similarity index 97% rename from docs/api/extras/geometries/IcosahedronGeometry.html rename to docs/api/geometries/IcosahedronGeometry.html index a448deb172..2a9a015051 100644 --- a/docs/api/extras/geometries/IcosahedronGeometry.html +++ b/docs/api/geometries/IcosahedronGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/LatheBufferGeometry.html b/docs/api/geometries/LatheBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/LatheBufferGeometry.html rename to docs/api/geometries/LatheBufferGeometry.html index 039eca45d9..bf0b817a95 100644 --- a/docs/api/extras/geometries/LatheBufferGeometry.html +++ b/docs/api/geometries/LatheBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/LatheGeometry.html b/docs/api/geometries/LatheGeometry.html similarity index 98% rename from docs/api/extras/geometries/LatheGeometry.html rename to docs/api/geometries/LatheGeometry.html index d18a9e06c0..ab68b75e64 100644 --- a/docs/api/extras/geometries/LatheGeometry.html +++ b/docs/api/geometries/LatheGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/OctahedronGeometry.html b/docs/api/geometries/OctahedronGeometry.html similarity index 97% rename from docs/api/extras/geometries/OctahedronGeometry.html rename to docs/api/geometries/OctahedronGeometry.html index 55c62be5bf..bd890a4715 100644 --- a/docs/api/extras/geometries/OctahedronGeometry.html +++ b/docs/api/geometries/OctahedronGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/ParametricGeometry.html b/docs/api/geometries/ParametricGeometry.html similarity index 96% rename from docs/api/extras/geometries/ParametricGeometry.html rename to docs/api/geometries/ParametricGeometry.html index 21929a32a5..196b20965a 100644 --- a/docs/api/extras/geometries/ParametricGeometry.html +++ b/docs/api/geometries/ParametricGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/PlaneBufferGeometry.html b/docs/api/geometries/PlaneBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/PlaneBufferGeometry.html rename to docs/api/geometries/PlaneBufferGeometry.html index ad09fe64c8..95cd2d7431 100644 --- a/docs/api/extras/geometries/PlaneBufferGeometry.html +++ b/docs/api/geometries/PlaneBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/PlaneGeometry.html b/docs/api/geometries/PlaneGeometry.html similarity index 95% rename from docs/api/extras/geometries/PlaneGeometry.html rename to docs/api/geometries/PlaneGeometry.html index fb30586ed8..24639c91b8 100644 --- a/docs/api/extras/geometries/PlaneGeometry.html +++ b/docs/api/geometries/PlaneGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/PolyhedronGeometry.html b/docs/api/geometries/PolyhedronGeometry.html similarity index 98% rename from docs/api/extras/geometries/PolyhedronGeometry.html rename to docs/api/geometries/PolyhedronGeometry.html index abc4efde1e..0711f3b672 100644 --- a/docs/api/extras/geometries/PolyhedronGeometry.html +++ b/docs/api/geometries/PolyhedronGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/RingBufferGeometry.html b/docs/api/geometries/RingBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/RingBufferGeometry.html rename to docs/api/geometries/RingBufferGeometry.html index 8f2bc86fc4..e91ee3c5e7 100644 --- a/docs/api/extras/geometries/RingBufferGeometry.html +++ b/docs/api/geometries/RingBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/RingGeometry.html b/docs/api/geometries/RingGeometry.html similarity index 98% rename from docs/api/extras/geometries/RingGeometry.html rename to docs/api/geometries/RingGeometry.html index 28ce38e277..2dc05b190c 100644 --- a/docs/api/extras/geometries/RingGeometry.html +++ b/docs/api/geometries/RingGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/ShapeGeometry.html b/docs/api/geometries/ShapeGeometry.html similarity index 98% rename from docs/api/extras/geometries/ShapeGeometry.html rename to docs/api/geometries/ShapeGeometry.html index 7e3e495290..e0c31f1cf7 100644 --- a/docs/api/extras/geometries/ShapeGeometry.html +++ b/docs/api/geometries/ShapeGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/SphereBufferGeometry.html b/docs/api/geometries/SphereBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/SphereBufferGeometry.html rename to docs/api/geometries/SphereBufferGeometry.html index 701df82c98..e9355a8267 100644 --- a/docs/api/extras/geometries/SphereBufferGeometry.html +++ b/docs/api/geometries/SphereBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/SphereGeometry.html b/docs/api/geometries/SphereGeometry.html similarity index 98% rename from docs/api/extras/geometries/SphereGeometry.html rename to docs/api/geometries/SphereGeometry.html index 84eb40398a..fadf874ada 100644 --- a/docs/api/extras/geometries/SphereGeometry.html +++ b/docs/api/geometries/SphereGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/TetrahedronGeometry.html b/docs/api/geometries/TetrahedronGeometry.html similarity index 97% rename from docs/api/extras/geometries/TetrahedronGeometry.html rename to docs/api/geometries/TetrahedronGeometry.html index 120dfe42c8..869fcb367e 100644 --- a/docs/api/extras/geometries/TetrahedronGeometry.html +++ b/docs/api/geometries/TetrahedronGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/TextGeometry.html b/docs/api/geometries/TextGeometry.html similarity index 99% rename from docs/api/extras/geometries/TextGeometry.html rename to docs/api/geometries/TextGeometry.html index 7817ff3ce4..8a52722c93 100644 --- a/docs/api/extras/geometries/TextGeometry.html +++ b/docs/api/geometries/TextGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/TorusBufferGeometry.html b/docs/api/geometries/TorusBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/TorusBufferGeometry.html rename to docs/api/geometries/TorusBufferGeometry.html index 824cd47223..ad9810ba91 100644 --- a/docs/api/extras/geometries/TorusBufferGeometry.html +++ b/docs/api/geometries/TorusBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/TorusGeometry.html b/docs/api/geometries/TorusGeometry.html similarity index 98% rename from docs/api/extras/geometries/TorusGeometry.html rename to docs/api/geometries/TorusGeometry.html index ee724c1e66..12d5885316 100644 --- a/docs/api/extras/geometries/TorusGeometry.html +++ b/docs/api/geometries/TorusGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/TorusKnotBufferGeometry.html b/docs/api/geometries/TorusKnotBufferGeometry.html similarity index 98% rename from docs/api/extras/geometries/TorusKnotBufferGeometry.html rename to docs/api/geometries/TorusKnotBufferGeometry.html index 206396d58c..cef57a060b 100644 --- a/docs/api/extras/geometries/TorusKnotBufferGeometry.html +++ b/docs/api/geometries/TorusKnotBufferGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/TorusKnotGeometry.html b/docs/api/geometries/TorusKnotGeometry.html similarity index 98% rename from docs/api/extras/geometries/TorusKnotGeometry.html rename to docs/api/geometries/TorusKnotGeometry.html index cfbadba24f..a7e55d786d 100644 --- a/docs/api/extras/geometries/TorusKnotGeometry.html +++ b/docs/api/geometries/TorusKnotGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/api/extras/geometries/TubeGeometry.html b/docs/api/geometries/TubeGeometry.html similarity index 98% rename from docs/api/extras/geometries/TubeGeometry.html rename to docs/api/geometries/TubeGeometry.html index cecaaacf88..e21262caf5 100644 --- a/docs/api/extras/geometries/TubeGeometry.html +++ b/docs/api/geometries/TubeGeometry.html @@ -2,7 +2,7 @@ - + diff --git a/docs/list.js b/docs/list.js index 3c88832710..b00942d6ab 100644 --- a/docs/list.js +++ b/docs/list.js @@ -35,6 +35,39 @@ var list = { [ "Uniform", "api/core/Uniform"] ], + "Geometries": [ + [ "BoxBufferGeometry", "api/geometries/BoxBufferGeometry" ], + [ "BoxGeometry", "api/geometries/BoxGeometry" ], + [ "CircleBufferGeometry", "api/geometries/CircleBufferGeometry" ], + [ "CircleGeometry", "api/geometries/CircleGeometry" ], + [ "ConeBufferGeometry", "api/geometries/ConeBufferGeometry" ], + [ "ConeGeometry", "api/geometries/ConeGeometry" ], + [ "CylinderBufferGeometry", "api/geometries/CylinderBufferGeometry" ], + [ "CylinderGeometry", "api/geometries/CylinderGeometry" ], + [ "DodecahedronGeometry", "api/geometries/DodecahedronGeometry" ], + [ "ExtrudeGeometry", "api/geometries/ExtrudeGeometry" ], + [ "IcosahedronGeometry", "api/geometries/IcosahedronGeometry" ], + [ "LatheBufferGeometry", "api/geometries/LatheBufferGeometry" ], + [ "LatheGeometry", "api/geometries/LatheGeometry" ], + [ "OctahedronGeometry", "api/geometries/OctahedronGeometry" ], + [ "ParametricGeometry", "api/geometries/ParametricGeometry" ], + [ "PlaneBufferGeometry", "api/geometries/PlaneBufferGeometry" ], + [ "PlaneGeometry", "api/geometries/PlaneGeometry" ], + [ "PolyhedronGeometry", "api/geometries/PolyhedronGeometry" ], + [ "RingBufferGeometry", "api/geometries/RingBufferGeometry" ], + [ "RingGeometry", "api/geometries/RingGeometry" ], + [ "ShapeGeometry", "api/geometries/ShapeGeometry" ], + [ "SphereBufferGeometry", "api/geometries/SphereBufferGeometry" ], + [ "SphereGeometry", "api/geometries/SphereGeometry" ], + [ "TetrahedronGeometry", "api/geometries/TetrahedronGeometry" ], + [ "TextGeometry", "api/geometries/TextGeometry" ], + [ "TorusBufferGeometry", "api/geometries/TorusBufferGeometry" ], + [ "TorusGeometry", "api/geometries/TorusGeometry" ], + [ "TorusKnotBufferGeometry", "api/geometries/TorusKnotBufferGeometry" ], + [ "TorusKnotGeometry", "api/geometries/TorusKnotGeometry" ], + [ "TubeGeometry", "api/geometries/TubeGeometry" ] + ], + "Lights": [ [ "AmbientLight", "api/lights/AmbientLight" ], [ "DirectionalLight", "api/lights/DirectionalLight" ], @@ -191,39 +224,6 @@ var list = { [ "SplineCurve3", "api/extras/curves/SplineCurve3" ] ], - "Extras / Geometries": [ - [ "BoxBufferGeometry", "api/extras/geometries/BoxBufferGeometry" ], - [ "BoxGeometry", "api/extras/geometries/BoxGeometry" ], - [ "CircleBufferGeometry", "api/extras/geometries/CircleBufferGeometry" ], - [ "CircleGeometry", "api/extras/geometries/CircleGeometry" ], - [ "ConeBufferGeometry", "api/extras/geometries/ConeBufferGeometry" ], - [ "ConeGeometry", "api/extras/geometries/ConeGeometry" ], - [ "CylinderBufferGeometry", "api/extras/geometries/CylinderBufferGeometry" ], - [ "CylinderGeometry", "api/extras/geometries/CylinderGeometry" ], - [ "DodecahedronGeometry", "api/extras/geometries/DodecahedronGeometry" ], - [ "ExtrudeGeometry", "api/extras/geometries/ExtrudeGeometry" ], - [ "IcosahedronGeometry", "api/extras/geometries/IcosahedronGeometry" ], - [ "LatheBufferGeometry", "api/extras/geometries/LatheBufferGeometry" ], - [ "LatheGeometry", "api/extras/geometries/LatheGeometry" ], - [ "OctahedronGeometry", "api/extras/geometries/OctahedronGeometry" ], - [ "ParametricGeometry", "api/extras/geometries/ParametricGeometry" ], - [ "PlaneBufferGeometry", "api/extras/geometries/PlaneBufferGeometry" ], - [ "PlaneGeometry", "api/extras/geometries/PlaneGeometry" ], - [ "PolyhedronGeometry", "api/extras/geometries/PolyhedronGeometry" ], - [ "RingBufferGeometry", "api/extras/geometries/RingBufferGeometry" ], - [ "RingGeometry", "api/extras/geometries/RingGeometry" ], - [ "ShapeGeometry", "api/extras/geometries/ShapeGeometry" ], - [ "SphereBufferGeometry", "api/extras/geometries/SphereBufferGeometry" ], - [ "SphereGeometry", "api/extras/geometries/SphereGeometry" ], - [ "TetrahedronGeometry", "api/extras/geometries/TetrahedronGeometry" ], - [ "TextGeometry", "api/extras/geometries/TextGeometry" ], - [ "TorusBufferGeometry", "api/extras/geometries/TorusBufferGeometry" ], - [ "TorusGeometry", "api/extras/geometries/TorusGeometry" ], - [ "TorusKnotBufferGeometry", "api/extras/geometries/TorusKnotBufferGeometry" ], - [ "TorusKnotGeometry", "api/extras/geometries/TorusKnotGeometry" ], - [ "TubeGeometry", "api/extras/geometries/TubeGeometry" ] - ], - "Extras / Helpers": [ [ "ArrowHelper", "api/extras/helpers/ArrowHelper" ], [ "AxisHelper", "api/extras/helpers/AxisHelper" ], diff --git a/editor/js/libs/tern-threejs/threejs.js b/editor/js/libs/tern-threejs/threejs.js index f79682642b..b4cc967be2 100644 --- a/editor/js/libs/tern-threejs/threejs.js +++ b/editor/js/libs/tern-threejs/threejs.js @@ -1539,7 +1539,7 @@ "!type": "fn(points: [])" }, "BoxGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/BoxGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/BoxGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1547,7 +1547,7 @@ "!type": "fn(width: number, height: number, depth: number, widthSegments: number, heightSegments: number, depthSegments: number)" }, "CircleGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/CircleGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/CircleGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1555,14 +1555,14 @@ "!type": "fn(radius: number, segments: number, thetaStart: number, thetaLength: number)" }, "CubeGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/CubeGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/CubeGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, "!doc": "Renamed CubeGeometry to BoxGeometry. see [page:BoxGeometry]." }, "CylinderGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/CylinderGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/CylinderGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1570,7 +1570,7 @@ "!type": "fn(radiusTop: number, radiusBottom: number, height: number, radiusSegments: number, heightSegments: number, openEnded: bool, thetaStart: number, thetaLength: number)" }, "DodecahedronGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/DodecahedronGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/DodecahedronGeometry", "prototype": { "!proto": "THREE.PolyhedronGeometry.prototype", "parameters": { @@ -1582,7 +1582,7 @@ "!type": "fn(radius: number, detail: number)" }, "ExtrudeGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/ExtrudeGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/ExtrudeGeometry", "prototype": { "!proto": "THREE.Geometry.prototype", "addShapeList": { @@ -1598,7 +1598,7 @@ "!type": "fn(shapes: [], options: object)" }, "IcosahedronGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/IcosahedronGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/IcosahedronGeometry", "prototype": { "!proto": "THREE.PolyhedronGeometry.prototype", "parameters": { @@ -1610,7 +1610,7 @@ "!type": "fn(radius: number, detail: number)" }, "LatheGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/LatheGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/LatheGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1618,7 +1618,7 @@ "!type": "fn(points: [], segments: number, phiStart: number, phiLength: number)" }, "OctahedronGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/OctahedronGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/OctahedronGeometry", "prototype": { "!proto": "THREE.PolyhedronGeometry.prototype", "parameters": { @@ -1630,7 +1630,7 @@ "!type": "fn(radius: number, detail: number)" }, "ParametricGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/ParametricGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/ParametricGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1638,7 +1638,7 @@ "!type": "fn(func: function, slices: number, stacks: number)" }, "PlaneGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/PlaneGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/PlaneGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1646,7 +1646,7 @@ "!type": "fn(width: number, height: number, widthSegments: number, heightSegments: number)" }, "PolyhedronGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/PolyhedronGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/PolyhedronGeometry", "prototype": { "!proto": "THREE.Geometry.prototype", "parameters": { @@ -1658,7 +1658,7 @@ "!type": "fn(vertices: [], faces: [], radius: number, detail: number)" }, "RingGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/RingGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/RingGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1666,7 +1666,7 @@ "!type": "fn(innerRadius: number, outerRadius: number, thetaSegments: number, phiSegments: number, thetaStart: number, thetaLength: number)" }, "ShapeGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/ShapeGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/ShapeGeometry", "prototype": { "!proto": "THREE.Geometry.prototype", "addShape": { @@ -1678,7 +1678,7 @@ "!type": "fn(shapes: [], options: object)" }, "SphereGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/SphereGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/SphereGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1686,7 +1686,7 @@ "!type": "fn(radius: number, widthSegments: number, heightSegments: number, phiStart: number, phiLength: number, thetaStart: number, thetaLength: number)" }, "TetrahedronGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/TetrahedronGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/TetrahedronGeometry", "prototype": { "!proto": "THREE.PolyhedronGeometry.prototype", "parameters": { @@ -1698,7 +1698,7 @@ "!type": "fn(radius: number, detail: number)" }, "TextGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/TextGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/TextGeometry", "prototype": { "!proto": "THREE.ExtrudeGeometry.prototype" }, @@ -1706,7 +1706,7 @@ "!type": "fn(text: string, parameters: object)" }, "TorusGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/TorusGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/TorusGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1714,7 +1714,7 @@ "!type": "fn(radius: number, tube: number, radialSegments: number, tubularSegments: number, arc: number)" }, "TorusKnotGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/TorusKnotGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/TorusKnotGeometry", "prototype": { "!proto": "THREE.Geometry.prototype" }, @@ -1722,7 +1722,7 @@ "!type": "fn(radius: number, tube: number, radialSegments: number, tubularSegments: number, p: number, q: number, heightScale: number)" }, "TubeGeometry": { - "!url": "http://threejs.org/docs/#Reference/extras/geometries/TubeGeometry", + "!url": "http://threejs.org/docs/#Reference/geometries/TubeGeometry", "prototype": { "!proto": "THREE.Geometry.prototype", "parameters": { diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js index abd2b6ba38..3b299abbb4 100644 --- a/src/Three.Legacy.js +++ b/src/Three.Legacy.js @@ -11,7 +11,9 @@ import { BufferGeometry } from './core/BufferGeometry.js'; import { EventDispatcher } from './core/EventDispatcher.js'; import { Face3 } from './core/Face3.js'; import { Object3D } from './core/Object3D.js'; -import { BoxGeometry } from './extras/geometries/BoxGeometry.js'; +import { BoxGeometry } from './geometries/BoxGeometry.js'; +import { ExtrudeGeometry } from './geometries/ExtrudeGeometry.js'; +import { ShapeGeometry } from './geometries/ShapeGeometry.js'; import { Light } from './lights/Light.js'; import { AudioLoader } from './loaders/AudioLoader.js'; import { CubeTextureLoader } from './loaders/CubeTextureLoader.js'; @@ -24,6 +26,7 @@ import { ShaderMaterial } from './materials/ShaderMaterial.js'; import { Box2 } from './math/Box2.js'; import { Box3 } from './math/Box3.js'; import { Color } from './math/Color.js'; +import { Line3 } from './math/Line3.js'; import { Matrix3 } from './math/Matrix3.js'; import { Matrix4 } from './math/Matrix4.js'; import { Plane } from './math/Plane.js'; @@ -36,6 +39,7 @@ import { Sprite } from './objects/Sprite.js'; import { WebGLRenderer } from './renderers/WebGLRenderer.js'; import { WebGLRenderTarget } from './renderers/WebGLRenderTarget.js'; import { WebGLShadowMap } from './renderers/webgl/WebGLShadowMap.js'; +import { Shape } from './extras/core/Shape.js'; export { BoxGeometry as CubeGeometry }; @@ -219,6 +223,17 @@ Object.assign( Ray.prototype, { } } ); +Object.assign( Shape.prototype, { + extrude: function ( options ) { + console.warn( 'THREE.Shape: .extrude() has been removed. Use ExtrudeGeometry() instead.' ); + return new ExtrudeGeometry( this, options ); + }, + makeGeometry: function ( options ) { + console.warn( 'THREE.Shape: .makeGeometry() has been removed. Use ShapeGeometry() instead.' ); + return new ShapeGeometry( this, options ); + } +} ); + Object.assign( Vector3.prototype, { setEulerFromRotationMatrix: function () { console.error( 'THREE.Vector3: .setEulerFromRotationMatrix() has been removed. Use Euler.setFromRotationMatrix() instead.' ); diff --git a/src/Three.js b/src/Three.js index 73c20206ba..15d5488eed 100644 --- a/src/Three.js +++ b/src/Three.js @@ -28,6 +28,7 @@ export { CubeTexture } from './textures/CubeTexture.js'; export { CanvasTexture } from './textures/CanvasTexture.js'; export { DepthTexture } from './textures/DepthTexture.js'; export { TextureIdCount, Texture } from './textures/Texture.js'; +export * from './geometries/Geometries.js'; export * from './materials/Materials.js'; export { MaterialIdCount } from './materials/Material.js'; export { CompressedTextureLoader } from './loaders/CompressedTextureLoader.js'; @@ -146,7 +147,6 @@ export { BoundingBoxHelper } from './extras/helpers/BoundingBoxHelper.js'; export { BoxHelper } from './extras/helpers/BoxHelper.js'; export { ArrowHelper } from './extras/helpers/ArrowHelper.js'; export { AxisHelper } from './extras/helpers/AxisHelper.js'; -export * from './extras/geometries/Geometries.js'; export { ClosedSplineCurve3 } from './extras/curves/ClosedSplineCurve3.js'; export { CatmullRomCurve3 } from './extras/curves/CatmullRomCurve3.js'; export { SplineCurve3 } from './extras/curves/SplineCurve3.js'; diff --git a/src/extras/core/Shape.js b/src/extras/core/Shape.js index f60171b707..cc6f7e71f5 100644 --- a/src/extras/core/Shape.js +++ b/src/extras/core/Shape.js @@ -1,6 +1,4 @@ import { PathPrototype } from './PathPrototype'; -import { ShapeGeometry } from '../geometries/ShapeGeometry'; -import { ExtrudeGeometry } from '../geometries/ExtrudeGeometry'; import { Path } from './Path'; /** @@ -26,22 +24,6 @@ Shape.prototype = Object.assign( Object.create( PathPrototype ), { constructor: Shape, - // Convenience method to return ExtrudeGeometry - - extrude: function ( options ) { - - return new ExtrudeGeometry( this, options ); - - }, - - // Convenience method to return ShapeGeometry - - makeGeometry: function ( options ) { - - return new ShapeGeometry( this, options ); - - }, - getPointsHoles: function ( divisions ) { var holesPts = []; diff --git a/src/extras/helpers/ArrowHelper.js b/src/extras/helpers/ArrowHelper.js index 0506321875..8699a115c1 100644 --- a/src/extras/helpers/ArrowHelper.js +++ b/src/extras/helpers/ArrowHelper.js @@ -16,7 +16,7 @@ import { Vector3 } from '../../math/Vector3'; import { Object3D } from '../../core/Object3D'; -import { CylinderBufferGeometry } from '../geometries/CylinderBufferGeometry'; +import { CylinderBufferGeometry } from '../../geometries/CylinderBufferGeometry'; import { Float32Attribute } from '../../core/BufferAttribute'; import { BufferGeometry } from '../../core/BufferGeometry'; import { MeshBasicMaterial } from '../../materials/MeshBasicMaterial'; diff --git a/src/extras/helpers/BoundingBoxHelper.js b/src/extras/helpers/BoundingBoxHelper.js index bd2c843b7b..1cb50003da 100644 --- a/src/extras/helpers/BoundingBoxHelper.js +++ b/src/extras/helpers/BoundingBoxHelper.js @@ -1,6 +1,6 @@ import { Mesh } from '../../objects/Mesh'; import { MeshBasicMaterial } from '../../materials/MeshBasicMaterial'; -import { BoxGeometry } from '../geometries/BoxGeometry'; +import { BoxGeometry } from '../../geometries/BoxGeometry'; import { Box3 } from '../../math/Box3'; /** diff --git a/src/extras/helpers/EdgesHelper.js b/src/extras/helpers/EdgesHelper.js index 656202033a..6a7a2001cf 100644 --- a/src/extras/helpers/EdgesHelper.js +++ b/src/extras/helpers/EdgesHelper.js @@ -1,6 +1,6 @@ import { LineSegments } from '../../objects/LineSegments'; import { LineBasicMaterial } from '../../materials/LineBasicMaterial'; -import { EdgesGeometry } from '../geometries/EdgesGeometry'; +import { EdgesGeometry } from '../../geometries/EdgesGeometry'; /** * @author WestLangley / http://github.com/WestLangley diff --git a/src/extras/helpers/HemisphereLightHelper.js b/src/extras/helpers/HemisphereLightHelper.js index c0de2f22cd..38c055c426 100644 --- a/src/extras/helpers/HemisphereLightHelper.js +++ b/src/extras/helpers/HemisphereLightHelper.js @@ -3,7 +3,7 @@ import { Object3D } from '../../core/Object3D'; import { Mesh } from '../../objects/Mesh'; import { FaceColors } from '../../constants'; import { MeshBasicMaterial } from '../../materials/MeshBasicMaterial'; -import { SphereGeometry } from '../geometries/SphereGeometry'; +import { SphereGeometry } from '../../geometries/SphereGeometry'; import { Color } from '../../math/Color'; /** diff --git a/src/extras/helpers/PointLightHelper.js b/src/extras/helpers/PointLightHelper.js index 815db6d829..b64b2dc9c9 100644 --- a/src/extras/helpers/PointLightHelper.js +++ b/src/extras/helpers/PointLightHelper.js @@ -1,6 +1,6 @@ import { Mesh } from '../../objects/Mesh'; import { MeshBasicMaterial } from '../../materials/MeshBasicMaterial'; -import { SphereBufferGeometry } from '../geometries/SphereBufferGeometry'; +import { SphereBufferGeometry } from '../../geometries/SphereBufferGeometry'; /** * @author alteredq / http://alteredqualia.com/ diff --git a/src/extras/helpers/WireframeHelper.js b/src/extras/helpers/WireframeHelper.js index c23b7b6b24..e6244c8beb 100644 --- a/src/extras/helpers/WireframeHelper.js +++ b/src/extras/helpers/WireframeHelper.js @@ -1,6 +1,6 @@ import { LineSegments } from '../../objects/LineSegments'; import { LineBasicMaterial } from '../../materials/LineBasicMaterial'; -import { WireframeGeometry } from '../geometries/WireframeGeometry'; +import { WireframeGeometry } from '../../geometries/WireframeGeometry'; /** * @author mrdoob / http://mrdoob.com/ diff --git a/src/extras/geometries/BoxBufferGeometry.js b/src/geometries/BoxBufferGeometry.js similarity index 97% rename from src/extras/geometries/BoxBufferGeometry.js rename to src/geometries/BoxBufferGeometry.js index 9d029750d2..6e6e346a37 100644 --- a/src/extras/geometries/BoxBufferGeometry.js +++ b/src/geometries/BoxBufferGeometry.js @@ -1,6 +1,6 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { Vector3 } from '../../math/Vector3'; -import { BufferAttribute } from '../../core/BufferAttribute'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { Vector3 } from '../math/Vector3'; +import { BufferAttribute } from '../core/BufferAttribute'; /** * @author Mugen87 / https://github.com/Mugen87 diff --git a/src/extras/geometries/BoxGeometry.js b/src/geometries/BoxGeometry.js similarity index 94% rename from src/extras/geometries/BoxGeometry.js rename to src/geometries/BoxGeometry.js index 692eff5ff5..cea86ef065 100644 --- a/src/extras/geometries/BoxGeometry.js +++ b/src/geometries/BoxGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { BoxBufferGeometry } from './BoxBufferGeometry'; /** diff --git a/src/extras/geometries/CircleBufferGeometry.js b/src/geometries/CircleBufferGeometry.js similarity index 89% rename from src/extras/geometries/CircleBufferGeometry.js rename to src/geometries/CircleBufferGeometry.js index 63bda238b1..168eca6cbf 100644 --- a/src/extras/geometries/CircleBufferGeometry.js +++ b/src/geometries/CircleBufferGeometry.js @@ -1,7 +1,7 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { Vector3 } from '../../math/Vector3'; -import { Sphere } from '../../math/Sphere'; -import { BufferAttribute } from '../../core/BufferAttribute'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { Vector3 } from '../math/Vector3'; +import { Sphere } from '../math/Sphere'; +import { BufferAttribute } from '../core/BufferAttribute'; /** * @author benaadams / https://twitter.com/ben_a_adams diff --git a/src/extras/geometries/CircleGeometry.js b/src/geometries/CircleGeometry.js similarity index 92% rename from src/extras/geometries/CircleGeometry.js rename to src/geometries/CircleGeometry.js index efb2fcb27d..1ec16b1c6d 100644 --- a/src/extras/geometries/CircleGeometry.js +++ b/src/geometries/CircleGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { CircleBufferGeometry } from './CircleBufferGeometry'; /** diff --git a/src/extras/geometries/ConeBufferGeometry.js b/src/geometries/ConeBufferGeometry.js similarity index 92% rename from src/extras/geometries/ConeBufferGeometry.js rename to src/geometries/ConeBufferGeometry.js index 64162a296b..2552649f0a 100644 --- a/src/extras/geometries/ConeBufferGeometry.js +++ b/src/geometries/ConeBufferGeometry.js @@ -1,4 +1,4 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; +import { BufferGeometry } from '../core/BufferGeometry'; import { CylinderBufferGeometry } from './CylinderBufferGeometry'; /* diff --git a/src/extras/geometries/ConeGeometry.js b/src/geometries/ConeGeometry.js similarity index 100% rename from src/extras/geometries/ConeGeometry.js rename to src/geometries/ConeGeometry.js diff --git a/src/extras/geometries/CylinderBufferGeometry.js b/src/geometries/CylinderBufferGeometry.js similarity index 97% rename from src/extras/geometries/CylinderBufferGeometry.js rename to src/geometries/CylinderBufferGeometry.js index 8199b355c9..956a0ce117 100644 --- a/src/extras/geometries/CylinderBufferGeometry.js +++ b/src/geometries/CylinderBufferGeometry.js @@ -1,7 +1,7 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { Vector3 } from '../../math/Vector3'; -import { Vector2 } from '../../math/Vector2'; -import { BufferAttribute } from '../../core/BufferAttribute'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { Vector3 } from '../math/Vector3'; +import { Vector2 } from '../math/Vector2'; +import { BufferAttribute } from '../core/BufferAttribute'; /** * @author Mugen87 / https://github.com/Mugen87 diff --git a/src/extras/geometries/CylinderGeometry.js b/src/geometries/CylinderGeometry.js similarity index 94% rename from src/extras/geometries/CylinderGeometry.js rename to src/geometries/CylinderGeometry.js index a5fe368eee..223d2a4ddc 100644 --- a/src/extras/geometries/CylinderGeometry.js +++ b/src/geometries/CylinderGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { CylinderBufferGeometry } from './CylinderBufferGeometry'; /** diff --git a/src/extras/geometries/DodecahedronGeometry.js b/src/geometries/DodecahedronGeometry.js similarity index 100% rename from src/extras/geometries/DodecahedronGeometry.js rename to src/geometries/DodecahedronGeometry.js diff --git a/src/extras/geometries/EdgesGeometry.js b/src/geometries/EdgesGeometry.js similarity index 89% rename from src/extras/geometries/EdgesGeometry.js rename to src/geometries/EdgesGeometry.js index a837b7956b..433489c872 100644 --- a/src/extras/geometries/EdgesGeometry.js +++ b/src/geometries/EdgesGeometry.js @@ -1,7 +1,7 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { BufferAttribute } from '../../core/BufferAttribute'; -import { Geometry } from '../../core/Geometry'; -import { _Math } from '../../math/Math'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { BufferAttribute } from '../core/BufferAttribute'; +import { Geometry } from '../core/Geometry'; +import { _Math } from '../math/Math'; /** * @author WestLangley / http://github.com/WestLangley diff --git a/src/extras/geometries/ExtrudeGeometry.js b/src/geometries/ExtrudeGeometry.js similarity index 98% rename from src/extras/geometries/ExtrudeGeometry.js rename to src/geometries/ExtrudeGeometry.js index ed87ce72e0..eb2583562e 100644 --- a/src/extras/geometries/ExtrudeGeometry.js +++ b/src/geometries/ExtrudeGeometry.js @@ -1,8 +1,8 @@ -import { Geometry } from '../../core/Geometry'; -import { Vector2 } from '../../math/Vector2'; -import { Face3 } from '../../core/Face3'; -import { Vector3 } from '../../math/Vector3'; -import { ShapeUtils } from '../ShapeUtils'; +import { Geometry } from '../core/Geometry'; +import { Vector2 } from '../math/Vector2'; +import { Face3 } from '../core/Face3'; +import { Vector3 } from '../math/Vector3'; +import { ShapeUtils } from '../extras/ShapeUtils'; import { TubeGeometry } from './TubeGeometry'; /** diff --git a/src/extras/geometries/Geometries.js b/src/geometries/Geometries.js similarity index 100% rename from src/extras/geometries/Geometries.js rename to src/geometries/Geometries.js diff --git a/src/extras/geometries/IcosahedronGeometry.js b/src/geometries/IcosahedronGeometry.js similarity index 100% rename from src/extras/geometries/IcosahedronGeometry.js rename to src/geometries/IcosahedronGeometry.js diff --git a/src/extras/geometries/LatheBufferGeometry.js b/src/geometries/LatheBufferGeometry.js similarity index 94% rename from src/extras/geometries/LatheBufferGeometry.js rename to src/geometries/LatheBufferGeometry.js index 2b3336b758..1a5793f1b2 100644 --- a/src/extras/geometries/LatheBufferGeometry.js +++ b/src/geometries/LatheBufferGeometry.js @@ -1,8 +1,8 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { Vector3 } from '../../math/Vector3'; -import { Vector2 } from '../../math/Vector2'; -import { BufferAttribute } from '../../core/BufferAttribute'; -import { _Math } from '../../math/Math'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { Vector3 } from '../math/Vector3'; +import { Vector2 } from '../math/Vector2'; +import { BufferAttribute } from '../core/BufferAttribute'; +import { _Math } from '../math/Math'; /** * @author Mugen87 / https://github.com/Mugen87 diff --git a/src/extras/geometries/LatheGeometry.js b/src/geometries/LatheGeometry.js similarity index 95% rename from src/extras/geometries/LatheGeometry.js rename to src/geometries/LatheGeometry.js index 8e3ab10d85..1281acb81a 100644 --- a/src/extras/geometries/LatheGeometry.js +++ b/src/geometries/LatheGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { LatheBufferGeometry } from './LatheBufferGeometry'; /** diff --git a/src/extras/geometries/OctahedronGeometry.js b/src/geometries/OctahedronGeometry.js similarity index 100% rename from src/extras/geometries/OctahedronGeometry.js rename to src/geometries/OctahedronGeometry.js diff --git a/src/extras/geometries/ParametricGeometry.js b/src/geometries/ParametricGeometry.js similarity index 92% rename from src/extras/geometries/ParametricGeometry.js rename to src/geometries/ParametricGeometry.js index cadf2332cc..83dbb3f223 100644 --- a/src/extras/geometries/ParametricGeometry.js +++ b/src/geometries/ParametricGeometry.js @@ -1,6 +1,6 @@ -import { Geometry } from '../../core/Geometry'; -import { Face3 } from '../../core/Face3'; -import { Vector2 } from '../../math/Vector2'; +import { Geometry } from '../core/Geometry'; +import { Face3 } from '../core/Face3'; +import { Vector2 } from '../math/Vector2'; /** * @author zz85 / https://github.com/zz85 diff --git a/src/extras/geometries/PlaneBufferGeometry.js b/src/geometries/PlaneBufferGeometry.js similarity index 94% rename from src/extras/geometries/PlaneBufferGeometry.js rename to src/geometries/PlaneBufferGeometry.js index af85870c12..224074988d 100644 --- a/src/extras/geometries/PlaneBufferGeometry.js +++ b/src/geometries/PlaneBufferGeometry.js @@ -1,5 +1,5 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { BufferAttribute } from '../../core/BufferAttribute'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { BufferAttribute } from '../core/BufferAttribute'; /** * @author mrdoob / http://mrdoob.com/ diff --git a/src/extras/geometries/PlaneGeometry.js b/src/geometries/PlaneGeometry.js similarity index 93% rename from src/extras/geometries/PlaneGeometry.js rename to src/geometries/PlaneGeometry.js index aa32d682bd..cef3cbc9df 100644 --- a/src/extras/geometries/PlaneGeometry.js +++ b/src/geometries/PlaneGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { PlaneBufferGeometry } from './PlaneBufferGeometry'; /** diff --git a/src/extras/geometries/PolyhedronGeometry.js b/src/geometries/PolyhedronGeometry.js similarity index 95% rename from src/extras/geometries/PolyhedronGeometry.js rename to src/geometries/PolyhedronGeometry.js index 5a972201b2..2cdd2a2d6c 100644 --- a/src/extras/geometries/PolyhedronGeometry.js +++ b/src/geometries/PolyhedronGeometry.js @@ -1,8 +1,8 @@ -import { Geometry } from '../../core/Geometry'; -import { Vector2 } from '../../math/Vector2'; -import { Face3 } from '../../core/Face3'; -import { Vector3 } from '../../math/Vector3'; -import { Sphere } from '../../math/Sphere'; +import { Geometry } from '../core/Geometry'; +import { Vector2 } from '../math/Vector2'; +import { Face3 } from '../core/Face3'; +import { Vector3 } from '../math/Vector3'; +import { Sphere } from '../math/Sphere'; /** * @author clockworkgeek / https://github.com/clockworkgeek diff --git a/src/extras/geometries/RingBufferGeometry.js b/src/geometries/RingBufferGeometry.js similarity index 93% rename from src/extras/geometries/RingBufferGeometry.js rename to src/geometries/RingBufferGeometry.js index 096e84aa4f..8104985bd4 100644 --- a/src/extras/geometries/RingBufferGeometry.js +++ b/src/geometries/RingBufferGeometry.js @@ -1,7 +1,7 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { Vector2 } from '../../math/Vector2'; -import { Vector3 } from '../../math/Vector3'; -import { BufferAttribute } from '../../core/BufferAttribute'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { Vector2 } from '../math/Vector2'; +import { Vector3 } from '../math/Vector3'; +import { BufferAttribute } from '../core/BufferAttribute'; /** * @author Mugen87 / https://github.com/Mugen87 diff --git a/src/extras/geometries/RingGeometry.js b/src/geometries/RingGeometry.js similarity index 93% rename from src/extras/geometries/RingGeometry.js rename to src/geometries/RingGeometry.js index e1a7bbaf1f..1ec54f4e9a 100644 --- a/src/extras/geometries/RingGeometry.js +++ b/src/geometries/RingGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { RingBufferGeometry } from './RingBufferGeometry'; /** diff --git a/src/extras/geometries/ShapeGeometry.js b/src/geometries/ShapeGeometry.js similarity index 93% rename from src/extras/geometries/ShapeGeometry.js rename to src/geometries/ShapeGeometry.js index cf0b039466..cb3680d5b0 100644 --- a/src/extras/geometries/ShapeGeometry.js +++ b/src/geometries/ShapeGeometry.js @@ -1,7 +1,7 @@ -import { Geometry } from '../../core/Geometry'; -import { Face3 } from '../../core/Face3'; -import { Vector3 } from '../../math/Vector3'; -import { ShapeUtils } from '../ShapeUtils'; +import { Geometry } from '../core/Geometry'; +import { Face3 } from '../core/Face3'; +import { Vector3 } from '../math/Vector3'; +import { ShapeUtils } from '../extras/ShapeUtils'; import { ExtrudeGeometry } from './ExtrudeGeometry'; /** diff --git a/src/extras/geometries/SphereBufferGeometry.js b/src/geometries/SphereBufferGeometry.js similarity index 94% rename from src/extras/geometries/SphereBufferGeometry.js rename to src/geometries/SphereBufferGeometry.js index cce103a086..7c9d333e00 100644 --- a/src/extras/geometries/SphereBufferGeometry.js +++ b/src/geometries/SphereBufferGeometry.js @@ -1,7 +1,7 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { Vector3 } from '../../math/Vector3'; -import { Sphere } from '../../math/Sphere'; -import { Uint16Attribute, Uint32Attribute, BufferAttribute } from '../../core/BufferAttribute'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { Vector3 } from '../math/Vector3'; +import { Sphere } from '../math/Sphere'; +import { Uint16Attribute, Uint32Attribute, BufferAttribute } from '../core/BufferAttribute'; /** * @author benaadams / https://twitter.com/ben_a_adams diff --git a/src/extras/geometries/SphereGeometry.js b/src/geometries/SphereGeometry.js similarity index 94% rename from src/extras/geometries/SphereGeometry.js rename to src/geometries/SphereGeometry.js index cc271ed333..da4e0c4e08 100644 --- a/src/extras/geometries/SphereGeometry.js +++ b/src/geometries/SphereGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { SphereBufferGeometry } from './SphereBufferGeometry'; /** diff --git a/src/extras/geometries/TetrahedronGeometry.js b/src/geometries/TetrahedronGeometry.js similarity index 100% rename from src/extras/geometries/TetrahedronGeometry.js rename to src/geometries/TetrahedronGeometry.js diff --git a/src/extras/geometries/TextGeometry.js b/src/geometries/TextGeometry.js similarity index 96% rename from src/extras/geometries/TextGeometry.js rename to src/geometries/TextGeometry.js index b7f578c274..4e78a614bb 100644 --- a/src/extras/geometries/TextGeometry.js +++ b/src/geometries/TextGeometry.js @@ -1,5 +1,5 @@ import { ExtrudeGeometry } from './ExtrudeGeometry'; -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; /** * @author zz85 / http://www.lab4games.net/zz85/blog diff --git a/src/extras/geometries/TorusBufferGeometry.js b/src/geometries/TorusBufferGeometry.js similarity index 95% rename from src/extras/geometries/TorusBufferGeometry.js rename to src/geometries/TorusBufferGeometry.js index 6100dbd526..72d70392f4 100644 --- a/src/extras/geometries/TorusBufferGeometry.js +++ b/src/geometries/TorusBufferGeometry.js @@ -1,6 +1,6 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { BufferAttribute } from '../../core/BufferAttribute'; -import { Vector3 } from '../../math/Vector3'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { BufferAttribute } from '../core/BufferAttribute'; +import { Vector3 } from '../math/Vector3'; /** * @author Mugen87 / https://github.com/Mugen87 diff --git a/src/extras/geometries/TorusGeometry.js b/src/geometries/TorusGeometry.js similarity index 94% rename from src/extras/geometries/TorusGeometry.js rename to src/geometries/TorusGeometry.js index 8d4985d71c..19550215c8 100644 --- a/src/extras/geometries/TorusGeometry.js +++ b/src/geometries/TorusGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { TorusBufferGeometry } from './TorusBufferGeometry'; /** diff --git a/src/extras/geometries/TorusKnotBufferGeometry.js b/src/geometries/TorusKnotBufferGeometry.js similarity index 95% rename from src/extras/geometries/TorusKnotBufferGeometry.js rename to src/geometries/TorusKnotBufferGeometry.js index 5936ee5925..4a19258ff1 100644 --- a/src/extras/geometries/TorusKnotBufferGeometry.js +++ b/src/geometries/TorusKnotBufferGeometry.js @@ -1,7 +1,7 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { Vector3 } from '../../math/Vector3'; -import { Vector2 } from '../../math/Vector2'; -import { BufferAttribute } from '../../core/BufferAttribute'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { Vector3 } from '../math/Vector3'; +import { Vector2 } from '../math/Vector2'; +import { BufferAttribute } from '../core/BufferAttribute'; /** * @author Mugen87 / https://github.com/Mugen87 diff --git a/src/extras/geometries/TorusKnotGeometry.js b/src/geometries/TorusKnotGeometry.js similarity index 94% rename from src/extras/geometries/TorusKnotGeometry.js rename to src/geometries/TorusKnotGeometry.js index 7e9067e104..8f84d0bdb7 100644 --- a/src/extras/geometries/TorusKnotGeometry.js +++ b/src/geometries/TorusKnotGeometry.js @@ -1,4 +1,4 @@ -import { Geometry } from '../../core/Geometry'; +import { Geometry } from '../core/Geometry'; import { TorusKnotBufferGeometry } from './TorusKnotBufferGeometry'; /** diff --git a/src/extras/geometries/TubeGeometry.js b/src/geometries/TubeGeometry.js similarity index 96% rename from src/extras/geometries/TubeGeometry.js rename to src/geometries/TubeGeometry.js index 30e68254e5..9704bdd296 100644 --- a/src/extras/geometries/TubeGeometry.js +++ b/src/geometries/TubeGeometry.js @@ -1,9 +1,9 @@ -import { Geometry } from '../../core/Geometry'; -import { _Math } from '../../math/Math'; -import { Vector3 } from '../../math/Vector3'; -import { Matrix4 } from '../../math/Matrix4'; -import { Face3 } from '../../core/Face3'; -import { Vector2 } from '../../math/Vector2'; +import { Geometry } from '../core/Geometry'; +import { _Math } from '../math/Math'; +import { Vector3 } from '../math/Vector3'; +import { Matrix4 } from '../math/Matrix4'; +import { Face3 } from '../core/Face3'; +import { Vector2 } from '../math/Vector2'; /** * @author WestLangley / https://github.com/WestLangley diff --git a/src/extras/geometries/WireframeGeometry.js b/src/geometries/WireframeGeometry.js similarity index 96% rename from src/extras/geometries/WireframeGeometry.js rename to src/geometries/WireframeGeometry.js index 94e4b8a4f1..08b1e51f8b 100644 --- a/src/extras/geometries/WireframeGeometry.js +++ b/src/geometries/WireframeGeometry.js @@ -1,5 +1,5 @@ -import { BufferGeometry } from '../../core/BufferGeometry'; -import { BufferAttribute } from '../../core/BufferAttribute'; +import { BufferGeometry } from '../core/BufferGeometry'; +import { BufferAttribute } from '../core/BufferAttribute'; /** * @author mrdoob / http://mrdoob.com/ diff --git a/src/loaders/ObjectLoader.js b/src/loaders/ObjectLoader.js index 61355dd19d..1d4703d838 100644 --- a/src/loaders/ObjectLoader.js +++ b/src/loaders/ObjectLoader.js @@ -28,7 +28,7 @@ import { MaterialLoader } from './MaterialLoader'; import { BufferGeometryLoader } from './BufferGeometryLoader'; import { JSONLoader } from './JSONLoader'; import { XHRLoader } from './XHRLoader'; -import * as Geometries from '../extras/geometries/Geometries'; +import * as Geometries from '../geometries/Geometries'; /** * @author mrdoob / http://mrdoob.com/ diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 8c2254a2f1..3946bbea35 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -7,10 +7,10 @@ import { LensFlarePlugin } from './webgl/plugins/LensFlarePlugin'; import { SpritePlugin } from './webgl/plugins/SpritePlugin'; import { WebGLShadowMap } from './webgl/WebGLShadowMap'; import { ShaderMaterial } from '../materials/ShaderMaterial'; -import { BoxBufferGeometry } from '../extras/geometries/BoxBufferGeometry'; import { Mesh } from '../objects/Mesh'; +import { BoxBufferGeometry } from '../geometries/BoxBufferGeometry'; +import { PlaneBufferGeometry } from '../geometries/PlaneBufferGeometry'; import { MeshBasicMaterial } from '../materials/MeshBasicMaterial'; -import { PlaneBufferGeometry } from '../extras/geometries/PlaneBufferGeometry'; import { PerspectiveCamera } from '../cameras/PerspectiveCamera'; import { OrthographicCamera } from '../cameras/OrthographicCamera'; import { WebGLIndexedBufferRenderer } from './webgl/WebGLIndexedBufferRenderer'; diff --git a/test/unit/extras/geometries/BoxGeometry.tests.js b/test/unit/geometries/BoxGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/BoxGeometry.tests.js rename to test/unit/geometries/BoxGeometry.tests.js diff --git a/test/unit/extras/geometries/CircleBufferGeometry.tests.js b/test/unit/geometries/CircleBufferGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/CircleBufferGeometry.tests.js rename to test/unit/geometries/CircleBufferGeometry.tests.js diff --git a/test/unit/extras/geometries/CircleGeometry.tests.js b/test/unit/geometries/CircleGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/CircleGeometry.tests.js rename to test/unit/geometries/CircleGeometry.tests.js diff --git a/test/unit/extras/geometries/CylinderGeometry.tests.js b/test/unit/geometries/CylinderGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/CylinderGeometry.tests.js rename to test/unit/geometries/CylinderGeometry.tests.js diff --git a/test/unit/extras/geometries/DodecahedronGeometry.tests.js b/test/unit/geometries/DodecahedronGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/DodecahedronGeometry.tests.js rename to test/unit/geometries/DodecahedronGeometry.tests.js diff --git a/test/unit/geometry/EdgesGeometry.js b/test/unit/geometries/EdgesGeometry.js similarity index 100% rename from test/unit/geometry/EdgesGeometry.js rename to test/unit/geometries/EdgesGeometry.js diff --git a/test/unit/extras/geometries/ExtrudeGeometry.tests.js b/test/unit/geometries/ExtrudeGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/ExtrudeGeometry.tests.js rename to test/unit/geometries/ExtrudeGeometry.tests.js diff --git a/test/unit/extras/geometries/IcosahedronGeometry.tests.js b/test/unit/geometries/IcosahedronGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/IcosahedronGeometry.tests.js rename to test/unit/geometries/IcosahedronGeometry.tests.js diff --git a/test/unit/extras/geometries/LatheGeometry.tests.js b/test/unit/geometries/LatheGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/LatheGeometry.tests.js rename to test/unit/geometries/LatheGeometry.tests.js diff --git a/test/unit/extras/geometries/OctahedronGeometry.tests.js b/test/unit/geometries/OctahedronGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/OctahedronGeometry.tests.js rename to test/unit/geometries/OctahedronGeometry.tests.js diff --git a/test/unit/extras/geometries/ParametricGeometry.tests.js b/test/unit/geometries/ParametricGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/ParametricGeometry.tests.js rename to test/unit/geometries/ParametricGeometry.tests.js diff --git a/test/unit/extras/geometries/PlaneBufferGeometry.tests.js b/test/unit/geometries/PlaneBufferGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/PlaneBufferGeometry.tests.js rename to test/unit/geometries/PlaneBufferGeometry.tests.js diff --git a/test/unit/extras/geometries/PlaneGeometry.tests.js b/test/unit/geometries/PlaneGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/PlaneGeometry.tests.js rename to test/unit/geometries/PlaneGeometry.tests.js diff --git a/test/unit/extras/geometries/PolyhedronGeometry.tests.js b/test/unit/geometries/PolyhedronGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/PolyhedronGeometry.tests.js rename to test/unit/geometries/PolyhedronGeometry.tests.js diff --git a/test/unit/extras/geometries/RingGeometry.tests.js b/test/unit/geometries/RingGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/RingGeometry.tests.js rename to test/unit/geometries/RingGeometry.tests.js diff --git a/test/unit/extras/geometries/ShapeGeometry.tests.js b/test/unit/geometries/ShapeGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/ShapeGeometry.tests.js rename to test/unit/geometries/ShapeGeometry.tests.js diff --git a/test/unit/extras/geometries/SphereBufferGeometry.tests.js b/test/unit/geometries/SphereBufferGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/SphereBufferGeometry.tests.js rename to test/unit/geometries/SphereBufferGeometry.tests.js diff --git a/test/unit/extras/geometries/SphereGeometry.tests.js b/test/unit/geometries/SphereGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/SphereGeometry.tests.js rename to test/unit/geometries/SphereGeometry.tests.js diff --git a/test/unit/extras/geometries/TetrahedronGeometry.tests.js b/test/unit/geometries/TetrahedronGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/TetrahedronGeometry.tests.js rename to test/unit/geometries/TetrahedronGeometry.tests.js diff --git a/test/unit/extras/geometries/TextGeometry.tests.js b/test/unit/geometries/TextGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/TextGeometry.tests.js rename to test/unit/geometries/TextGeometry.tests.js diff --git a/test/unit/extras/geometries/TorusGeometry.tests.js b/test/unit/geometries/TorusGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/TorusGeometry.tests.js rename to test/unit/geometries/TorusGeometry.tests.js diff --git a/test/unit/extras/geometries/TorusKnotGeometry.tests.js b/test/unit/geometries/TorusKnotGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/TorusKnotGeometry.tests.js rename to test/unit/geometries/TorusKnotGeometry.tests.js diff --git a/test/unit/extras/geometries/TubeGeometry.tests.js b/test/unit/geometries/TubeGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/TubeGeometry.tests.js rename to test/unit/geometries/TubeGeometry.tests.js diff --git a/test/unit/extras/geometries/WireframeGeometry.tests.js b/test/unit/geometries/WireframeGeometry.tests.js similarity index 100% rename from test/unit/extras/geometries/WireframeGeometry.tests.js rename to test/unit/geometries/WireframeGeometry.tests.js diff --git a/test/unit/unittests_three.html b/test/unit/unittests_three.html index 2b2629f529..a453a84f59 100644 --- a/test/unit/unittests_three.html +++ b/test/unit/unittests_three.html @@ -63,33 +63,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab