|
@@ -303,7 +303,7 @@ THREE.Color = function ( color ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- return this.set( color )
|
|
|
+ return this.set( color );
|
|
|
|
|
|
};
|
|
|
|
|
@@ -366,7 +366,7 @@ THREE.Color.prototype = {
|
|
|
if ( t < 2 / 3 ) return p + ( q - p ) * 6 * ( 2 / 3 - t );
|
|
|
return p;
|
|
|
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
return function ( h, s, l ) {
|
|
|
|
|
@@ -10528,7 +10528,6 @@ THREE.BufferGeometry.prototype = {
|
|
|
console.log( 'THREE.BufferGeometry.setFromObject(). Converting', object, this );
|
|
|
|
|
|
var geometry = object.geometry;
|
|
|
- var material = object.material;
|
|
|
|
|
|
if ( object instanceof THREE.PointCloud || object instanceof THREE.Line ) {
|
|
|
|
|
@@ -13110,8 +13109,7 @@ THREE.JSONLoader.prototype = {
|
|
|
|
|
|
parse: function ( json, texturePath ) {
|
|
|
|
|
|
- var scope = this,
|
|
|
- geometry = new THREE.Geometry(),
|
|
|
+ var geometry = new THREE.Geometry(),
|
|
|
scale = ( json.scale !== undefined ) ? 1.0 / json.scale : 1.0;
|
|
|
|
|
|
parseModel( scale );
|
|
@@ -21238,7 +21236,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
uniforms: THREE.UniformsUtils.clone( shader.uniforms ),
|
|
|
vertexShader: shader.vertexShader,
|
|
|
fragmentShader: shader.fragmentShader
|
|
|
- }
|
|
|
+ };
|
|
|
|
|
|
} else {
|
|
|
|
|
@@ -21247,7 +21245,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
uniforms: material.uniforms,
|
|
|
vertexShader: material.vertexShader,
|
|
|
fragmentShader: material.fragmentShader
|
|
|
- }
|
|
|
+ };
|
|
|
|
|
|
}
|
|
|
|
|
@@ -23921,8 +23919,6 @@ THREE.WebGLProgram = ( function () {
|
|
|
var gl = renderer.context;
|
|
|
|
|
|
var defines = material.defines;
|
|
|
- var uniforms = material.__webglShader.uniforms;
|
|
|
- var attributes = material.attributes;
|
|
|
|
|
|
var vertexShader = material.__webglShader.vertexShader;
|
|
|
var fragmentShader = material.__webglShader.fragmentShader;
|
|
@@ -24448,8 +24444,6 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) {
|
|
|
_min = new THREE.Vector3(),
|
|
|
_max = new THREE.Vector3(),
|
|
|
|
|
|
- _webglObjects = _objects.objects,
|
|
|
-
|
|
|
_matrixPosition = new THREE.Vector3(),
|
|
|
|
|
|
_renderList = [];
|
|
@@ -32015,8 +32009,6 @@ THREE.ShapeGeometry.prototype.addShape = function ( shape, options ) {
|
|
|
|
|
|
// Vertices
|
|
|
|
|
|
- var contour = vertices;
|
|
|
-
|
|
|
for ( i = 0, l = holes.length; i < l; i ++ ) {
|
|
|
|
|
|
hole = holes[ i ];
|
|
@@ -33983,85 +33975,82 @@ THREE.BoxHelper = function ( object ) {
|
|
|
THREE.BoxHelper.prototype = Object.create( THREE.LineSegments.prototype );
|
|
|
THREE.BoxHelper.prototype.constructor = THREE.BoxHelper;
|
|
|
|
|
|
-THREE.BoxHelper.prototype.update = function ( object ) {
|
|
|
-
|
|
|
- var geometry = object.geometry;
|
|
|
+THREE.BoxHelper.prototype.update = ( function () {
|
|
|
|
|
|
- if ( geometry.boundingBox === null ) {
|
|
|
+ var box = new THREE.Box3();
|
|
|
|
|
|
- geometry.computeBoundingBox();
|
|
|
+ return function ( object ) {
|
|
|
|
|
|
- }
|
|
|
+ box.setFromObject( object );
|
|
|
|
|
|
- var min = geometry.boundingBox.min;
|
|
|
- var max = geometry.boundingBox.max;
|
|
|
+ var min = box.min;
|
|
|
+ var max = box.max;
|
|
|
|
|
|
- /*
|
|
|
- 5____4
|
|
|
- 1/___0/|
|
|
|
- | 6__|_7
|
|
|
- 2/___3/
|
|
|
-
|
|
|
- 0: max.x, max.y, max.z
|
|
|
- 1: min.x, max.y, max.z
|
|
|
- 2: min.x, min.y, max.z
|
|
|
- 3: max.x, min.y, max.z
|
|
|
- 4: max.x, max.y, min.z
|
|
|
- 5: min.x, max.y, min.z
|
|
|
- 6: min.x, min.y, min.z
|
|
|
- 7: max.x, min.y, min.z
|
|
|
- */
|
|
|
+ /*
|
|
|
+ 5____4
|
|
|
+ 1/___0/|
|
|
|
+ | 6__|_7
|
|
|
+ 2/___3/
|
|
|
+
|
|
|
+ 0: max.x, max.y, max.z
|
|
|
+ 1: min.x, max.y, max.z
|
|
|
+ 2: min.x, min.y, max.z
|
|
|
+ 3: max.x, min.y, max.z
|
|
|
+ 4: max.x, max.y, min.z
|
|
|
+ 5: min.x, max.y, min.z
|
|
|
+ 6: min.x, min.y, min.z
|
|
|
+ 7: max.x, min.y, min.z
|
|
|
+ */
|
|
|
|
|
|
- var vertices = this.geometry.attributes.position.array;
|
|
|
+ var vertices = this.geometry.attributes.position.array;
|
|
|
|
|
|
- vertices[ 0 ] = max.x; vertices[ 1 ] = max.y; vertices[ 2 ] = max.z;
|
|
|
- vertices[ 3 ] = min.x; vertices[ 4 ] = max.y; vertices[ 5 ] = max.z;
|
|
|
+ vertices[ 0 ] = max.x; vertices[ 1 ] = max.y; vertices[ 2 ] = max.z;
|
|
|
+ vertices[ 3 ] = min.x; vertices[ 4 ] = max.y; vertices[ 5 ] = max.z;
|
|
|
|
|
|
- vertices[ 6 ] = min.x; vertices[ 7 ] = max.y; vertices[ 8 ] = max.z;
|
|
|
- vertices[ 9 ] = min.x; vertices[ 10 ] = min.y; vertices[ 11 ] = max.z;
|
|
|
+ vertices[ 6 ] = min.x; vertices[ 7 ] = max.y; vertices[ 8 ] = max.z;
|
|
|
+ vertices[ 9 ] = min.x; vertices[ 10 ] = min.y; vertices[ 11 ] = max.z;
|
|
|
|
|
|
- vertices[ 12 ] = min.x; vertices[ 13 ] = min.y; vertices[ 14 ] = max.z;
|
|
|
- vertices[ 15 ] = max.x; vertices[ 16 ] = min.y; vertices[ 17 ] = max.z;
|
|
|
+ vertices[ 12 ] = min.x; vertices[ 13 ] = min.y; vertices[ 14 ] = max.z;
|
|
|
+ vertices[ 15 ] = max.x; vertices[ 16 ] = min.y; vertices[ 17 ] = max.z;
|
|
|
|
|
|
- vertices[ 18 ] = max.x; vertices[ 19 ] = min.y; vertices[ 20 ] = max.z;
|
|
|
- vertices[ 21 ] = max.x; vertices[ 22 ] = max.y; vertices[ 23 ] = max.z;
|
|
|
+ vertices[ 18 ] = max.x; vertices[ 19 ] = min.y; vertices[ 20 ] = max.z;
|
|
|
+ vertices[ 21 ] = max.x; vertices[ 22 ] = max.y; vertices[ 23 ] = max.z;
|
|
|
|
|
|
- //
|
|
|
+ //
|
|
|
|
|
|
- vertices[ 24 ] = max.x; vertices[ 25 ] = max.y; vertices[ 26 ] = min.z;
|
|
|
- vertices[ 27 ] = min.x; vertices[ 28 ] = max.y; vertices[ 29 ] = min.z;
|
|
|
+ vertices[ 24 ] = max.x; vertices[ 25 ] = max.y; vertices[ 26 ] = min.z;
|
|
|
+ vertices[ 27 ] = min.x; vertices[ 28 ] = max.y; vertices[ 29 ] = min.z;
|
|
|
|
|
|
- vertices[ 30 ] = min.x; vertices[ 31 ] = max.y; vertices[ 32 ] = min.z;
|
|
|
- vertices[ 33 ] = min.x; vertices[ 34 ] = min.y; vertices[ 35 ] = min.z;
|
|
|
+ vertices[ 30 ] = min.x; vertices[ 31 ] = max.y; vertices[ 32 ] = min.z;
|
|
|
+ vertices[ 33 ] = min.x; vertices[ 34 ] = min.y; vertices[ 35 ] = min.z;
|
|
|
|
|
|
- vertices[ 36 ] = min.x; vertices[ 37 ] = min.y; vertices[ 38 ] = min.z;
|
|
|
- vertices[ 39 ] = max.x; vertices[ 40 ] = min.y; vertices[ 41 ] = min.z;
|
|
|
+ vertices[ 36 ] = min.x; vertices[ 37 ] = min.y; vertices[ 38 ] = min.z;
|
|
|
+ vertices[ 39 ] = max.x; vertices[ 40 ] = min.y; vertices[ 41 ] = min.z;
|
|
|
|
|
|
- vertices[ 42 ] = max.x; vertices[ 43 ] = min.y; vertices[ 44 ] = min.z;
|
|
|
- vertices[ 45 ] = max.x; vertices[ 46 ] = max.y; vertices[ 47 ] = min.z;
|
|
|
+ vertices[ 42 ] = max.x; vertices[ 43 ] = min.y; vertices[ 44 ] = min.z;
|
|
|
+ vertices[ 45 ] = max.x; vertices[ 46 ] = max.y; vertices[ 47 ] = min.z;
|
|
|
|
|
|
- //
|
|
|
+ //
|
|
|
|
|
|
- vertices[ 48 ] = max.x; vertices[ 49 ] = max.y; vertices[ 50 ] = max.z;
|
|
|
- vertices[ 51 ] = max.x; vertices[ 52 ] = max.y; vertices[ 53 ] = min.z;
|
|
|
+ vertices[ 48 ] = max.x; vertices[ 49 ] = max.y; vertices[ 50 ] = max.z;
|
|
|
+ vertices[ 51 ] = max.x; vertices[ 52 ] = max.y; vertices[ 53 ] = min.z;
|
|
|
|
|
|
- vertices[ 54 ] = min.x; vertices[ 55 ] = max.y; vertices[ 56 ] = max.z;
|
|
|
- vertices[ 57 ] = min.x; vertices[ 58 ] = max.y; vertices[ 59 ] = min.z;
|
|
|
+ vertices[ 54 ] = min.x; vertices[ 55 ] = max.y; vertices[ 56 ] = max.z;
|
|
|
+ vertices[ 57 ] = min.x; vertices[ 58 ] = max.y; vertices[ 59 ] = min.z;
|
|
|
|
|
|
- vertices[ 60 ] = min.x; vertices[ 61 ] = min.y; vertices[ 62 ] = max.z;
|
|
|
- vertices[ 63 ] = min.x; vertices[ 64 ] = min.y; vertices[ 65 ] = min.z;
|
|
|
+ vertices[ 60 ] = min.x; vertices[ 61 ] = min.y; vertices[ 62 ] = max.z;
|
|
|
+ vertices[ 63 ] = min.x; vertices[ 64 ] = min.y; vertices[ 65 ] = min.z;
|
|
|
|
|
|
- vertices[ 66 ] = max.x; vertices[ 67 ] = min.y; vertices[ 68 ] = max.z;
|
|
|
- vertices[ 69 ] = max.x; vertices[ 70 ] = min.y; vertices[ 71 ] = min.z;
|
|
|
+ vertices[ 66 ] = max.x; vertices[ 67 ] = min.y; vertices[ 68 ] = max.z;
|
|
|
+ vertices[ 69 ] = max.x; vertices[ 70 ] = min.y; vertices[ 71 ] = min.z;
|
|
|
|
|
|
- this.geometry.attributes.position.needsUpdate = true;
|
|
|
+ this.geometry.attributes.position.needsUpdate = true;
|
|
|
|
|
|
- this.geometry.computeBoundingSphere();
|
|
|
+ this.geometry.computeBoundingSphere();
|
|
|
|
|
|
- this.matrix = object.matrixWorld;
|
|
|
- this.matrixAutoUpdate = false;
|
|
|
+ }
|
|
|
|
|
|
-};
|
|
|
+} )();
|
|
|
|
|
|
// File:src/extras/helpers/BoundingBoxHelper.js
|
|
|
|