Răsfoiți Sursa

Moved ./extras/geometries to ./geometries.

Mr.doob 9 ani în urmă
părinte
comite
247454fea1
100 a modificat fișierele cu 182 adăugiri și 185 ștergeri
  1. 1 1
      docs/api/geometries/BoxBufferGeometry.html
  2. 1 1
      docs/api/geometries/BoxGeometry.html
  3. 1 1
      docs/api/geometries/CircleBufferGeometry.html
  4. 1 1
      docs/api/geometries/CircleGeometry.html
  5. 1 1
      docs/api/geometries/ConeBufferGeometry.html
  6. 1 1
      docs/api/geometries/ConeGeometry.html
  7. 1 1
      docs/api/geometries/CylinderBufferGeometry.html
  8. 1 1
      docs/api/geometries/CylinderGeometry.html
  9. 1 1
      docs/api/geometries/DodecahedronGeometry.html
  10. 1 1
      docs/api/geometries/ExtrudeGeometry.html
  11. 1 1
      docs/api/geometries/IcosahedronGeometry.html
  12. 1 1
      docs/api/geometries/LatheBufferGeometry.html
  13. 1 1
      docs/api/geometries/LatheGeometry.html
  14. 1 1
      docs/api/geometries/OctahedronGeometry.html
  15. 1 1
      docs/api/geometries/ParametricGeometry.html
  16. 1 1
      docs/api/geometries/PlaneBufferGeometry.html
  17. 1 1
      docs/api/geometries/PlaneGeometry.html
  18. 1 1
      docs/api/geometries/PolyhedronGeometry.html
  19. 1 1
      docs/api/geometries/RingBufferGeometry.html
  20. 1 1
      docs/api/geometries/RingGeometry.html
  21. 1 1
      docs/api/geometries/ShapeGeometry.html
  22. 1 1
      docs/api/geometries/SphereBufferGeometry.html
  23. 1 1
      docs/api/geometries/SphereGeometry.html
  24. 1 1
      docs/api/geometries/TetrahedronGeometry.html
  25. 1 1
      docs/api/geometries/TextGeometry.html
  26. 1 1
      docs/api/geometries/TorusBufferGeometry.html
  27. 1 1
      docs/api/geometries/TorusGeometry.html
  28. 1 1
      docs/api/geometries/TorusKnotBufferGeometry.html
  29. 1 1
      docs/api/geometries/TorusKnotGeometry.html
  30. 1 1
      docs/api/geometries/TubeGeometry.html
  31. 33 33
      docs/list.js
  32. 20 20
      editor/js/libs/tern-threejs/threejs.js
  33. 16 1
      src/Three.Legacy.js
  34. 1 1
      src/Three.js
  35. 0 18
      src/extras/core/Shape.js
  36. 1 1
      src/extras/helpers/ArrowHelper.js
  37. 1 1
      src/extras/helpers/BoundingBoxHelper.js
  38. 1 1
      src/extras/helpers/EdgesHelper.js
  39. 1 1
      src/extras/helpers/HemisphereLightHelper.js
  40. 1 1
      src/extras/helpers/PointLightHelper.js
  41. 1 1
      src/extras/helpers/WireframeHelper.js
  42. 3 3
      src/geometries/BoxBufferGeometry.js
  43. 1 1
      src/geometries/BoxGeometry.js
  44. 4 4
      src/geometries/CircleBufferGeometry.js
  45. 1 1
      src/geometries/CircleGeometry.js
  46. 1 1
      src/geometries/ConeBufferGeometry.js
  47. 0 0
      src/geometries/ConeGeometry.js
  48. 4 4
      src/geometries/CylinderBufferGeometry.js
  49. 1 1
      src/geometries/CylinderGeometry.js
  50. 0 0
      src/geometries/DodecahedronGeometry.js
  51. 4 4
      src/geometries/EdgesGeometry.js
  52. 5 5
      src/geometries/ExtrudeGeometry.js
  53. 0 0
      src/geometries/Geometries.js
  54. 0 0
      src/geometries/IcosahedronGeometry.js
  55. 5 5
      src/geometries/LatheBufferGeometry.js
  56. 1 1
      src/geometries/LatheGeometry.js
  57. 0 0
      src/geometries/OctahedronGeometry.js
  58. 3 3
      src/geometries/ParametricGeometry.js
  59. 2 2
      src/geometries/PlaneBufferGeometry.js
  60. 1 1
      src/geometries/PlaneGeometry.js
  61. 5 5
      src/geometries/PolyhedronGeometry.js
  62. 4 4
      src/geometries/RingBufferGeometry.js
  63. 1 1
      src/geometries/RingGeometry.js
  64. 4 4
      src/geometries/ShapeGeometry.js
  65. 4 4
      src/geometries/SphereBufferGeometry.js
  66. 1 1
      src/geometries/SphereGeometry.js
  67. 0 0
      src/geometries/TetrahedronGeometry.js
  68. 1 1
      src/geometries/TextGeometry.js
  69. 3 3
      src/geometries/TorusBufferGeometry.js
  70. 1 1
      src/geometries/TorusGeometry.js
  71. 4 4
      src/geometries/TorusKnotBufferGeometry.js
  72. 1 1
      src/geometries/TorusKnotGeometry.js
  73. 6 6
      src/geometries/TubeGeometry.js
  74. 2 2
      src/geometries/WireframeGeometry.js
  75. 1 1
      src/loaders/ObjectLoader.js
  76. 2 2
      src/renderers/WebGLRenderer.js
  77. 0 0
      test/unit/geometries/BoxGeometry.tests.js
  78. 0 0
      test/unit/geometries/CircleBufferGeometry.tests.js
  79. 0 0
      test/unit/geometries/CircleGeometry.tests.js
  80. 0 0
      test/unit/geometries/CylinderGeometry.tests.js
  81. 0 0
      test/unit/geometries/DodecahedronGeometry.tests.js
  82. 0 0
      test/unit/geometries/EdgesGeometry.js
  83. 0 0
      test/unit/geometries/ExtrudeGeometry.tests.js
  84. 0 0
      test/unit/geometries/IcosahedronGeometry.tests.js
  85. 0 0
      test/unit/geometries/LatheGeometry.tests.js
  86. 0 0
      test/unit/geometries/OctahedronGeometry.tests.js
  87. 0 0
      test/unit/geometries/ParametricGeometry.tests.js
  88. 0 0
      test/unit/geometries/PlaneBufferGeometry.tests.js
  89. 0 0
      test/unit/geometries/PlaneGeometry.tests.js
  90. 0 0
      test/unit/geometries/PolyhedronGeometry.tests.js
  91. 0 0
      test/unit/geometries/RingGeometry.tests.js
  92. 0 0
      test/unit/geometries/ShapeGeometry.tests.js
  93. 0 0
      test/unit/geometries/SphereBufferGeometry.tests.js
  94. 0 0
      test/unit/geometries/SphereGeometry.tests.js
  95. 0 0
      test/unit/geometries/TetrahedronGeometry.tests.js
  96. 0 0
      test/unit/geometries/TextGeometry.tests.js
  97. 0 0
      test/unit/geometries/TorusGeometry.tests.js
  98. 0 0
      test/unit/geometries/TorusKnotGeometry.tests.js
  99. 0 0
      test/unit/geometries/TubeGeometry.tests.js
  100. 0 0
      test/unit/geometries/WireframeGeometry.tests.js

+ 1 - 1
docs/api/extras/geometries/BoxBufferGeometry.html → docs/api/geometries/BoxBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/BoxGeometry.html → docs/api/geometries/BoxGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/CircleBufferGeometry.html → docs/api/geometries/CircleBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/CircleGeometry.html → docs/api/geometries/CircleGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/ConeBufferGeometry.html → docs/api/geometries/ConeBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/ConeGeometry.html → docs/api/geometries/ConeGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/CylinderBufferGeometry.html → docs/api/geometries/CylinderBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/CylinderGeometry.html → docs/api/geometries/CylinderGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/DodecahedronGeometry.html → docs/api/geometries/DodecahedronGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/ExtrudeGeometry.html → docs/api/geometries/ExtrudeGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/IcosahedronGeometry.html → docs/api/geometries/IcosahedronGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/LatheBufferGeometry.html → docs/api/geometries/LatheBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/LatheGeometry.html → docs/api/geometries/LatheGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/OctahedronGeometry.html → docs/api/geometries/OctahedronGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/ParametricGeometry.html → docs/api/geometries/ParametricGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/PlaneBufferGeometry.html → docs/api/geometries/PlaneBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/PlaneGeometry.html → docs/api/geometries/PlaneGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/PolyhedronGeometry.html → docs/api/geometries/PolyhedronGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/RingBufferGeometry.html → docs/api/geometries/RingBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/RingGeometry.html → docs/api/geometries/RingGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/ShapeGeometry.html → docs/api/geometries/ShapeGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/SphereBufferGeometry.html → docs/api/geometries/SphereBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/SphereGeometry.html → docs/api/geometries/SphereGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/TetrahedronGeometry.html → docs/api/geometries/TetrahedronGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/TextGeometry.html → docs/api/geometries/TextGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/TorusBufferGeometry.html → docs/api/geometries/TorusBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/TorusGeometry.html → docs/api/geometries/TorusGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/TorusKnotBufferGeometry.html → docs/api/geometries/TorusKnotBufferGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/TorusKnotGeometry.html → docs/api/geometries/TorusKnotGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 1 - 1
docs/api/extras/geometries/TubeGeometry.html → docs/api/geometries/TubeGeometry.html

@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../../" />
+		<base href="../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

+ 33 - 33
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" ],

+ 20 - 20
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": {

+ 16 - 1
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.' );

+ 1 - 1
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';

+ 0 - 18
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 = [];

+ 1 - 1
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';

+ 1 - 1
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';
 
 /**

+ 1 - 1
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

+ 1 - 1
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';
 
 /**

+ 1 - 1
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/

+ 1 - 1
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/

+ 3 - 3
src/extras/geometries/BoxBufferGeometry.js → 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

+ 1 - 1
src/extras/geometries/BoxGeometry.js → src/geometries/BoxGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { BoxBufferGeometry } from './BoxBufferGeometry';
 
 /**

+ 4 - 4
src/extras/geometries/CircleBufferGeometry.js → 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

+ 1 - 1
src/extras/geometries/CircleGeometry.js → src/geometries/CircleGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { CircleBufferGeometry } from './CircleBufferGeometry';
 
 /**

+ 1 - 1
src/extras/geometries/ConeBufferGeometry.js → src/geometries/ConeBufferGeometry.js

@@ -1,4 +1,4 @@
-import { BufferGeometry } from '../../core/BufferGeometry';
+import { BufferGeometry } from '../core/BufferGeometry';
 import { CylinderBufferGeometry } from './CylinderBufferGeometry';
 
 /*

+ 0 - 0
src/extras/geometries/ConeGeometry.js → src/geometries/ConeGeometry.js


+ 4 - 4
src/extras/geometries/CylinderBufferGeometry.js → 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

+ 1 - 1
src/extras/geometries/CylinderGeometry.js → src/geometries/CylinderGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { CylinderBufferGeometry } from './CylinderBufferGeometry';
 
 /**

+ 0 - 0
src/extras/geometries/DodecahedronGeometry.js → src/geometries/DodecahedronGeometry.js


+ 4 - 4
src/extras/geometries/EdgesGeometry.js → 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

+ 5 - 5
src/extras/geometries/ExtrudeGeometry.js → 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';
 
 /**

+ 0 - 0
src/extras/geometries/Geometries.js → src/geometries/Geometries.js


+ 0 - 0
src/extras/geometries/IcosahedronGeometry.js → src/geometries/IcosahedronGeometry.js


+ 5 - 5
src/extras/geometries/LatheBufferGeometry.js → 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

+ 1 - 1
src/extras/geometries/LatheGeometry.js → src/geometries/LatheGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { LatheBufferGeometry } from './LatheBufferGeometry';
 
 /**

+ 0 - 0
src/extras/geometries/OctahedronGeometry.js → src/geometries/OctahedronGeometry.js


+ 3 - 3
src/extras/geometries/ParametricGeometry.js → 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

+ 2 - 2
src/extras/geometries/PlaneBufferGeometry.js → 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/

+ 1 - 1
src/extras/geometries/PlaneGeometry.js → src/geometries/PlaneGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { PlaneBufferGeometry } from './PlaneBufferGeometry';
 
 /**

+ 5 - 5
src/extras/geometries/PolyhedronGeometry.js → 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

+ 4 - 4
src/extras/geometries/RingBufferGeometry.js → 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

+ 1 - 1
src/extras/geometries/RingGeometry.js → src/geometries/RingGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { RingBufferGeometry } from './RingBufferGeometry';
 
 /**

+ 4 - 4
src/extras/geometries/ShapeGeometry.js → 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';
 
 /**

+ 4 - 4
src/extras/geometries/SphereBufferGeometry.js → 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

+ 1 - 1
src/extras/geometries/SphereGeometry.js → src/geometries/SphereGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { SphereBufferGeometry } from './SphereBufferGeometry';
 
 /**

+ 0 - 0
src/extras/geometries/TetrahedronGeometry.js → src/geometries/TetrahedronGeometry.js


+ 1 - 1
src/extras/geometries/TextGeometry.js → 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

+ 3 - 3
src/extras/geometries/TorusBufferGeometry.js → 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

+ 1 - 1
src/extras/geometries/TorusGeometry.js → src/geometries/TorusGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { TorusBufferGeometry } from './TorusBufferGeometry';
 
 /**

+ 4 - 4
src/extras/geometries/TorusKnotBufferGeometry.js → 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

+ 1 - 1
src/extras/geometries/TorusKnotGeometry.js → src/geometries/TorusKnotGeometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from '../../core/Geometry';
+import { Geometry } from '../core/Geometry';
 import { TorusKnotBufferGeometry } from './TorusKnotBufferGeometry';
 
 /**

+ 6 - 6
src/extras/geometries/TubeGeometry.js → 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

+ 2 - 2
src/extras/geometries/WireframeGeometry.js → 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/

+ 1 - 1
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/

+ 2 - 2
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';

+ 0 - 0
test/unit/extras/geometries/BoxGeometry.tests.js → test/unit/geometries/BoxGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/CircleBufferGeometry.tests.js → test/unit/geometries/CircleBufferGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/CircleGeometry.tests.js → test/unit/geometries/CircleGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/CylinderGeometry.tests.js → test/unit/geometries/CylinderGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/DodecahedronGeometry.tests.js → test/unit/geometries/DodecahedronGeometry.tests.js


+ 0 - 0
test/unit/geometry/EdgesGeometry.js → test/unit/geometries/EdgesGeometry.js


+ 0 - 0
test/unit/extras/geometries/ExtrudeGeometry.tests.js → test/unit/geometries/ExtrudeGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/IcosahedronGeometry.tests.js → test/unit/geometries/IcosahedronGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/LatheGeometry.tests.js → test/unit/geometries/LatheGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/OctahedronGeometry.tests.js → test/unit/geometries/OctahedronGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/ParametricGeometry.tests.js → test/unit/geometries/ParametricGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/PlaneBufferGeometry.tests.js → test/unit/geometries/PlaneBufferGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/PlaneGeometry.tests.js → test/unit/geometries/PlaneGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/PolyhedronGeometry.tests.js → test/unit/geometries/PolyhedronGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/RingGeometry.tests.js → test/unit/geometries/RingGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/ShapeGeometry.tests.js → test/unit/geometries/ShapeGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/SphereBufferGeometry.tests.js → test/unit/geometries/SphereBufferGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/SphereGeometry.tests.js → test/unit/geometries/SphereGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/TetrahedronGeometry.tests.js → test/unit/geometries/TetrahedronGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/TextGeometry.tests.js → test/unit/geometries/TextGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/TorusGeometry.tests.js → test/unit/geometries/TorusGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/TorusKnotGeometry.tests.js → test/unit/geometries/TorusKnotGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/TubeGeometry.tests.js → test/unit/geometries/TubeGeometry.tests.js


+ 0 - 0
test/unit/extras/geometries/WireframeGeometry.tests.js → test/unit/geometries/WireframeGeometry.tests.js


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff