Browse Source

Geometries: Adjust metadata

Mugen87 8 years ago
parent
commit
f21e97d41b

+ 5 - 5
src/geometries/BoxGeometry.js

@@ -1,8 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector3 } from '../math/Vector3';
-
 /**
  * @author mrdoob / http://mrdoob.com/
  * @author Mugen87 / https://github.com/Mugen87
@@ -10,6 +5,11 @@ import { Vector3 } from '../math/Vector3';
  * based on http://papervision3d.googlecode.com/svn/trunk/as3/trunk/src/org/papervision3d/objects/primitives/Cube.as
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector3 } from '../math/Vector3';
+
 // BoxGeometry
 
 function BoxGeometry( width, height, depth, widthSegments, heightSegments, depthSegments ) {

+ 6 - 6
src/geometries/CircleGeometry.js

@@ -1,15 +1,15 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector3 } from '../math/Vector3';
-import { Vector2 } from '../math/Vector2';
-
 /**
  * @author benaadams / https://twitter.com/ben_a_adams
  * @author Mugen87 / https://github.com/Mugen87
  * @author hughes
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector3 } from '../math/Vector3';
+import { Vector2 } from '../math/Vector2';
+
 // CircleGeometry
 
 function CircleGeometry( radius, segments, thetaStart, thetaLength ) {

+ 3 - 3
src/geometries/ConeGeometry.js

@@ -1,10 +1,10 @@
-import { CylinderGeometry } from './CylinderGeometry';
-import { CylinderBufferGeometry } from './CylinderGeometry';
-
 /**
  * @author abelnation / http://github.com/abelnation
  */
 
+import { CylinderGeometry } from './CylinderGeometry';
+import { CylinderBufferGeometry } from './CylinderGeometry';
+
 // ConeGeometry
 
 function ConeGeometry( radius, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength ) {

+ 5 - 5
src/geometries/CylinderGeometry.js

@@ -1,14 +1,14 @@
+/**
+ * @author mrdoob / http://mrdoob.com/
+ * @author Mugen87 / https://github.com/Mugen87
+ */
+
 import { Geometry } from '../core/Geometry';
 import { BufferGeometry } from '../core/BufferGeometry';
 import { Float32BufferAttribute } from '../core/BufferAttribute';
 import { Vector3 } from '../math/Vector3';
 import { Vector2 } from '../math/Vector2';
 
-/**
- * @author mrdoob / http://mrdoob.com/
- * @author Mugen87 / https://github.com/Mugen87
- */
-
 // CylinderGeometry
 
 function CylinderGeometry( radiusTop, radiusBottom, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength ) {

+ 3 - 3
src/geometries/DodecahedronGeometry.js

@@ -1,11 +1,11 @@
-import { Geometry } from '../core/Geometry';
-import { PolyhedronBufferGeometry } from './PolyhedronGeometry';
-
 /**
  * @author Abe Pazos / https://hamoid.com
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { Geometry } from '../core/Geometry';
+import { PolyhedronBufferGeometry } from './PolyhedronGeometry';
+
 // DodecahedronGeometry
 
 function DodecahedronGeometry( radius, detail ) {

+ 5 - 5
src/geometries/EdgesGeometry.js

@@ -1,13 +1,13 @@
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Geometry } from '../core/Geometry';
-import { _Math } from '../math/Math';
-
 /**
  * @author WestLangley / http://github.com/WestLangley
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Geometry } from '../core/Geometry';
+import { _Math } from '../math/Math';
+
 function EdgesGeometry( geometry, thresholdAngle ) {
 
 	BufferGeometry.call( this );

+ 8 - 8
src/geometries/ExtrudeGeometry.js

@@ -1,10 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector2 } from '../math/Vector2';
-import { Vector3 } from '../math/Vector3';
-import { ShapeUtils } from '../extras/ShapeUtils';
-
 /**
  * @author zz85 / http://www.lab4games.net/zz85/blog
  *
@@ -27,7 +20,14 @@ import { ShapeUtils } from '../extras/ShapeUtils';
  *  UVGenerator: <Object> // object that provides UV generator functions
  *
  * }
- **/
+ */
+
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector2 } from '../math/Vector2';
+import { Vector3 } from '../math/Vector3';
+import { ShapeUtils } from '../extras/ShapeUtils';
 
 // ExtrudeGeometry
 

+ 3 - 3
src/geometries/IcosahedronGeometry.js

@@ -1,11 +1,11 @@
-import { Geometry } from '../core/Geometry';
-import { PolyhedronBufferGeometry } from './PolyhedronGeometry';
-
 /**
  * @author timothypratley / https://github.com/timothypratley
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { Geometry } from '../core/Geometry';
+import { PolyhedronBufferGeometry } from './PolyhedronGeometry';
+
 // IcosahedronGeometry
 
 function IcosahedronGeometry( radius, detail ) {

+ 7 - 7
src/geometries/LatheGeometry.js

@@ -1,10 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Vector3 } from '../math/Vector3';
-import { Vector2 } from '../math/Vector2';
-import { _Math } from '../math/Math';
-
 /**
  * @author astrodud / http://astrodud.isgreat.org/
  * @author zz85 / https://github.com/zz85
@@ -12,6 +5,13 @@ import { _Math } from '../math/Math';
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { Geometry } from '../core/Geometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Vector3 } from '../math/Vector3';
+import { Vector2 } from '../math/Vector2';
+import { _Math } from '../math/Math';
+
 // LatheGeometry
 
 function LatheGeometry( points, segments, phiStart, phiLength ) {

+ 3 - 3
src/geometries/OctahedronGeometry.js

@@ -1,11 +1,11 @@
-import { Geometry } from '../core/Geometry';
-import { PolyhedronBufferGeometry } from './PolyhedronGeometry';
-
 /**
  * @author timothypratley / https://github.com/timothypratley
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { Geometry } from '../core/Geometry';
+import { PolyhedronBufferGeometry } from './PolyhedronGeometry';
+
 // OctahedronGeometry
 
 function OctahedronGeometry( radius, detail ) {

+ 5 - 5
src/geometries/ParametricGeometry.js

@@ -1,8 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector3 } from '../math/Vector3';
-
 /**
  * @author zz85 / https://github.com/zz85
  * @author Mugen87 / https://github.com/Mugen87
@@ -11,6 +6,11 @@ import { Vector3 } from '../math/Vector3';
  * based on the brilliant article by @prideout http://prideout.net/blog/?p=44
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector3 } from '../math/Vector3';
+
 // ParametricGeometry
 
 function ParametricGeometry( func, slices, stacks ) {

+ 4 - 4
src/geometries/PlaneGeometry.js

@@ -1,7 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-
 /**
  * @author mrdoob / http://mrdoob.com/
  * @author Mugen87 / https://github.com/Mugen87
@@ -9,6 +5,10 @@ import { Float32BufferAttribute } from '../core/BufferAttribute';
  * based on http://papervision3d.googlecode.com/svn/trunk/as3/trunk/src/org/papervision3d/objects/primitives/Plane.as
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+
 // PlaneGeometry
 
 function PlaneGeometry( width, height, widthSegments, heightSegments ) {

+ 7 - 7
src/geometries/PolyhedronGeometry.js

@@ -1,15 +1,15 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector3 } from '../math/Vector3';
-import { Vector2 } from '../math/Vector2';
-
 /**
  * @author clockworkgeek / https://github.com/clockworkgeek
  * @author timothypratley / https://github.com/timothypratley
  * @author WestLangley / http://github.com/WestLangley
  * @author Mugen87 / https://github.com/Mugen87
-*/
+ */
+
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector3 } from '../math/Vector3';
+import { Vector2 } from '../math/Vector2';
 
 // PolyhedronGeometry
 

+ 5 - 5
src/geometries/RingGeometry.js

@@ -1,14 +1,14 @@
+/**
+ * @author Kaleb Murphy
+ * @author Mugen87 / https://github.com/Mugen87
+ */
+
 import { Geometry } from '../core/Geometry';
 import { BufferGeometry } from '../core/BufferGeometry';
 import { Float32BufferAttribute } from '../core/BufferAttribute';
 import { Vector2 } from '../math/Vector2';
 import { Vector3 } from '../math/Vector3';
 
-/**
- * @author Kaleb Murphy
- * @author Mugen87 / https://github.com/Mugen87
- */
-
 // RingGeometry
 
 function RingGeometry( innerRadius, outerRadius, thetaSegments, phiSegments, thetaStart, thetaLength ) {

+ 5 - 5
src/geometries/ShapeGeometry.js

@@ -1,13 +1,13 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { ShapeUtils } from '../extras/ShapeUtils';
-
 /**
  * @author jonobr1 / http://jonobr1.com
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { ShapeUtils } from '../extras/ShapeUtils';
+
 // ShapeGeometry
 
 function ShapeGeometry( shapes, curveSegments ) {

+ 5 - 5
src/geometries/SphereGeometry.js

@@ -1,14 +1,14 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector3 } from '../math/Vector3';
-
 /**
  * @author mrdoob / http://mrdoob.com/
  * @author benaadams / https://twitter.com/ben_a_adams
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector3 } from '../math/Vector3';
+
 // SphereGeometry
 
 function SphereGeometry( radius, widthSegments, heightSegments, phiStart, phiLength, thetaStart, thetaLength ) {

+ 3 - 3
src/geometries/TetrahedronGeometry.js

@@ -1,11 +1,11 @@
-import { Geometry } from '../core/Geometry';
-import { PolyhedronBufferGeometry } from './PolyhedronGeometry';
-
 /**
  * @author timothypratley / https://github.com/timothypratley
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { Geometry } from '../core/Geometry';
+import { PolyhedronBufferGeometry } from './PolyhedronGeometry';
+
 // TetrahedronGeometry
 
 function TetrahedronGeometry( radius, detail ) {

+ 3 - 3
src/geometries/TextGeometry.js

@@ -1,6 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { ExtrudeBufferGeometry } from './ExtrudeGeometry';
-
 /**
  * @author zz85 / http://www.lab4games.net/zz85/blog
  * @author alteredq / http://alteredqualia.com/
@@ -20,6 +17,9 @@ import { ExtrudeBufferGeometry } from './ExtrudeGeometry';
  * }
  */
 
+import { Geometry } from '../core/Geometry';
+import { ExtrudeBufferGeometry } from './ExtrudeGeometry';
+
 // TextGeometry
 
 function TextGeometry(  text, parameters ) {

+ 5 - 5
src/geometries/TorusGeometry.js

@@ -1,8 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector3 } from '../math/Vector3';
-
 /**
  * @author oosmoxiecode
  * @author mrdoob / http://mrdoob.com/
@@ -11,6 +6,11 @@ import { Vector3 } from '../math/Vector3';
  * based on http://code.google.com/p/away3d/source/browse/trunk/fp10/Away3DLite/src/away3dlite/primitives/Torus.as?r=2888
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector3 } from '../math/Vector3';
+
 // TorusGeometry
 
 function TorusGeometry( radius, tube, radialSegments, tubularSegments, arc ) {

+ 5 - 5
src/geometries/TorusKnotGeometry.js

@@ -1,8 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector3 } from '../math/Vector3';
-
 /**
  * @author oosmoxiecode
  * @author Mugen87 / https://github.com/Mugen87
@@ -10,6 +5,11 @@ import { Vector3 } from '../math/Vector3';
  * based on http://www.blackpawn.com/texts/pqtorus/
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector3 } from '../math/Vector3';
+
 // TorusKnotGeometry
 
 function TorusKnotGeometry( radius, tube, tubularSegments, radialSegments, p, q, heightScale ) {

+ 6 - 6
src/geometries/TubeGeometry.js

@@ -1,9 +1,3 @@
-import { Geometry } from '../core/Geometry';
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector2 } from '../math/Vector2';
-import { Vector3 } from '../math/Vector3';
-
 /**
  * @author oosmoxiecode / https://github.com/oosmoxiecode
  * @author WestLangley / https://github.com/WestLangley
@@ -14,6 +8,12 @@ import { Vector3 } from '../math/Vector3';
  *
  */
 
+import { Geometry } from '../core/Geometry';
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector2 } from '../math/Vector2';
+import { Vector3 } from '../math/Vector3';
+
 // TubeGeometry
 
 function TubeGeometry( path, tubularSegments, radius, radialSegments, closed, taper ) {

+ 4 - 4
src/geometries/WireframeGeometry.js

@@ -1,12 +1,12 @@
-import { BufferGeometry } from '../core/BufferGeometry';
-import { Float32BufferAttribute } from '../core/BufferAttribute';
-import { Vector3 } from '../math/Vector3';
-
 /**
  * @author mrdoob / http://mrdoob.com/
  * @author Mugen87 / https://github.com/Mugen87
  */
 
+import { BufferGeometry } from '../core/BufferGeometry';
+import { Float32BufferAttribute } from '../core/BufferAttribute';
+import { Vector3 } from '../math/Vector3';
+
 function WireframeGeometry( geometry ) {
 
 	BufferGeometry.call( this );