2
0
Эх сурвалжийг харах

Reverting to old WebGLRenderer again.
Lens flares and Sprites still need some work on WebGLRenderer2.

Mr.doob 12 жил өмнө
parent
commit
98a8973e4f

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 5877 - 6201
build/three.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 305 - 36298
build/three.min.js


+ 8 - 8
src/math/Line3.js

@@ -69,7 +69,7 @@ THREE.extend( THREE.Line3.prototype, {
 		var startEnd = new THREE.Vector3();
 
 		return function ( point, clampToLine ) {
-		
+
 			startP.subVectors( point, this.start );
 			startEnd.subVectors( this.end, this.start );
 
@@ -78,13 +78,13 @@ THREE.extend( THREE.Line3.prototype, {
 
 			var t = startEnd_startP / startEnd2;
 
-			if( clampToLine ) {
-				
-	        	t = THREE.Math.clamp( t, 0, 1 );
+			if ( clampToLine ) {
+
+				t = THREE.Math.clamp( t, 0, 1 );
 
-	        }
+			}
 
-	        return t;
+			return t;
 
 		};
 
@@ -94,9 +94,9 @@ THREE.extend( THREE.Line3.prototype, {
 
 		var t = this.closestPointToPointParameter( point, clampToLine );
 
-		var result = optionalTarget || new THREE.Vector3();			
+		var result = optionalTarget || new THREE.Vector3();
 
-        return this.delta( result ).multiplyScalar( t ).add( this.start );
+		return this.delta( result ).multiplyScalar( t ).add( this.start );
 
 	},
 

+ 2 - 8
utils/build/includes/common.json

@@ -5,6 +5,7 @@
 	"src/math/Vector2.js",
 	"src/math/Vector3.js",
 	"src/math/Vector4.js",
+	"src/math/Line3.js",
 	"src/math/Box2.js",
 	"src/math/Box3.js",
 	"src/math/Matrix3.js",
@@ -74,14 +75,7 @@
 	"src/scenes/FogExp2.js",
 	"src/renderers/CanvasRenderer.js",
 	"src/renderers/WebGLShaders.js",
-	"src/renderers/WebGLRenderer2.js",
-	"src/renderers/webgl/LowLevelRenderer.js",
-	"src/renderers/webgl/ShaderBuilder.js",
-	"src/renderers/webgl/objects/Object3DRenderer.js",
-	"src/renderers/webgl/objects/MeshRenderer.js",
-	"src/renderers/webgl/objects/ParticleRenderer.js",
-	"src/renderers/webgl/objects/LineRenderer.js",
-	"src/renderers/webgl/objects/RibbonRenderer.js",
+	"src/renderers/WebGLRenderer.js",
 	"src/renderers/WebGLRenderTarget.js",
 	"src/renderers/WebGLRenderTargetCube.js",
 	"src/renderers/renderables/RenderableVertex.js",

+ 8 - 2
utils/build/includes/common_old.json → utils/build/includes/common2.json

@@ -5,7 +5,6 @@
 	"src/math/Vector2.js",
 	"src/math/Vector3.js",
 	"src/math/Vector4.js",
-	"src/math/Line3.js",
 	"src/math/Box2.js",
 	"src/math/Box3.js",
 	"src/math/Matrix3.js",
@@ -75,7 +74,14 @@
 	"src/scenes/FogExp2.js",
 	"src/renderers/CanvasRenderer.js",
 	"src/renderers/WebGLShaders.js",
-	"src/renderers/WebGLRenderer.js",
+	"src/renderers/WebGLRenderer2.js",
+	"src/renderers/webgl/LowLevelRenderer.js",
+	"src/renderers/webgl/ShaderBuilder.js",
+	"src/renderers/webgl/objects/Object3DRenderer.js",
+	"src/renderers/webgl/objects/MeshRenderer.js",
+	"src/renderers/webgl/objects/ParticleRenderer.js",
+	"src/renderers/webgl/objects/LineRenderer.js",
+	"src/renderers/webgl/objects/RibbonRenderer.js",
 	"src/renderers/WebGLRenderTarget.js",
 	"src/renderers/WebGLRenderTargetCube.js",
 	"src/renderers/renderables/RenderableVertex.js",

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно