Начало Каталог Помощ
Вход
javascript
/
three.js
огледало от https://github.com/tazdij/three.js.git
2
0
Разклонения 0
Файлове Задачи 0 Уики
Преглед на файлове

Clean up.

Mr.doob преди 9 години
родител
5720ae4e06
ревизия
1fd2e44d22
променени са 6 файла, в които са добавени 14 реда и са изтрити 57 реда
Обединен изглед Покажи статистика за разликите
  1. 0 0
      examples/models/obj/tree.obj
  2. 0 7
      examples/obj/tree/.htaccess
  3. 0 23
      examples/obj/tree/tree.js
  4. 0 2
      examples/webgl_lights_pointlights.html
  5. 9 18
      examples/webgl_postprocessing_godrays.html
  6. 5 7
      src/loaders/JSONLoader.js

+ 0 - 0
examples/obj/tree/tree.obj → examples/models/obj/tree.obj
Целия файл


+ 0 - 7
examples/obj/tree/.htaccess
Целия файл 

@@ -1,7 +0,0 @@
 
-<Files *.js>
 
-SetOutputFilter DEFLATE
 
-</Files>
 
-
 
-<Files *.bin>
 
-SetOutputFilter DEFLATE
 
-</Files>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 23
examples/obj/tree/tree.js


+ 0 - 2
examples/webgl_lights_pointlights.html
Целия файл 

@@ -80,8 +80,6 @@
 
 
 
 				loader.load( "obj/walt/WaltHead_bin.js", callback );
 
 				loader.load( "obj/walt/WaltHead_bin.js", callback );
 
 
 
-				scene.add( new THREE.AmbientLight( 0x000000 ) );
 
-
 
 				var sphere = new THREE.SphereGeometry( 0.5, 16, 8 );
 
 				var sphere = new THREE.SphereGeometry( 0.5, 16, 8 );
 
 
 
 				light1 = new THREE.PointLight( 0xff0040, 2, 50 );
 
 				light1 = new THREE.PointLight( 0xff0040, 2, 50 );

+ 9 - 18
examples/webgl_postprocessing_godrays.html
Целия файл 

@@ -37,6 +37,7 @@
 
 
 
 	<body>
 
 	<body>
 
 		<script src="../build/three.min.js"></script>
 
 		<script src="../build/three.min.js"></script>
 
+		<script src="js/loaders/OBJLoader.js"></script>
 
 		<script src="js/ShaderGodRays.js"></script>
 
 		<script src="js/ShaderGodRays.js"></script>
 
 
 
 		<script src="js/Detector.js"></script>
 
 		<script src="js/Detector.js"></script>
 
@@ -54,7 +55,7 @@
 
 			var container, stats;
 
 			var container, stats;
 
 			var camera, scene, renderer, materialDepth;
 
 			var camera, scene, renderer, materialDepth;
 
 
 
-			var treeMesh, sphereMesh;
 
+			var sphereMesh;
 
 
 
 			var sunPosition = new THREE.Vector3( 0, 1000, -1000 );
 
 			var sunPosition = new THREE.Vector3( 0, 1000, -1000 );
 
 			var screenSpacePosition = new THREE.Vector3();
 
 			var screenSpacePosition = new THREE.Vector3();
 
@@ -94,20 +95,13 @@
 
 
 
 				// tree
 
 				// tree
 
 
 
-				var loader = new THREE.JSONLoader();
 
+				var loader = new THREE.OBJLoader();
 
+				loader.load( "models/obj/tree.obj", function ( object ) {
 
 
 
-				loader.load( "obj/tree/tree.js", function( geometry ) {
 
-
 
-					treeMesh = new THREE.Mesh( geometry, materialScene );
 
-					treeMesh.position.set( 0, -150, -150 );
 
-
 
-					var sc = 400;
 
-					treeMesh.scale.set( sc, sc, sc );
 
-
 
-					treeMesh.matrixAutoUpdate = false;
 
-					treeMesh.updateMatrix();
 
-
 
-					scene.add( treeMesh );
 
+					object.material = materialScene;
 
+					object.position.set( 0, -150, -150 );
 
+					object.scale.multiplyScalar( 400 );
 
+					scene.add( object );
 
 
 
 				} );
 
 				} );
 
 
 
@@ -115,10 +109,7 @@
 
 
 
 				var geo = new THREE.SphereGeometry( 1, 20, 10 );
 
 				var geo = new THREE.SphereGeometry( 1, 20, 10 );
 
 				sphereMesh = new THREE.Mesh( geo, materialScene );
 
 				sphereMesh = new THREE.Mesh( geo, materialScene );
 
-
 
-				var sc = 20;
 
-				sphereMesh.scale.set( sc, sc, sc );
 
-
 
+				sphereMesh.scale.multiplyScalar( 20 );
 
 				scene.add( sphereMesh );
 
 				scene.add( sphereMesh );
 
 
 
 				//
 
 				//

+ 5 - 7
src/loaders/JSONLoader.js
Целия файл 

@@ -23,7 +23,7 @@ THREE.JSONLoader.prototype = {
 
 	constructor: THREE.JSONLoader,

 	constructor: THREE.JSONLoader,

 

 

 	// Deprecated

 	// Deprecated

-	

+

 	get statusDomElement () {

 	get statusDomElement () {

 

 

 		if ( this._statusDomElement === undefined ) {

 		if ( this._statusDomElement === undefined ) {

@@ -451,18 +451,16 @@ THREE.JSONLoader.prototype = {
 
 

 

 			if ( json.morphTargets !== undefined ) {

 			if ( json.morphTargets !== undefined ) {

 

 

-				var i, l, v, vl, dstVertices, srcVertices;

-

-				for ( i = 0, l = json.morphTargets.length; i < l; i ++ ) {

+				for ( var i = 0, l = json.morphTargets.length; i < l; i ++ ) {

 

 

 					geometry.morphTargets[ i ] = {};

 					geometry.morphTargets[ i ] = {};

 					geometry.morphTargets[ i ].name = json.morphTargets[ i ].name;

 					geometry.morphTargets[ i ].name = json.morphTargets[ i ].name;

 					geometry.morphTargets[ i ].vertices = [];

 					geometry.morphTargets[ i ].vertices = [];

 

 

-					dstVertices = geometry.morphTargets[ i ].vertices;

-					srcVertices = json.morphTargets[ i ].vertices;

+					var dstVertices = geometry.morphTargets[ i ].vertices;

+					var srcVertices = json.morphTargets[ i ].vertices;

 

 

-					for ( v = 0, vl = srcVertices.length; v < vl; v += 3 ) {

+					for ( var v = 0, vl = srcVertices.length; v < vl; v += 3 ) {

 

 

 						var vertex = new THREE.Vector3();

 						var vertex = new THREE.Vector3();

 						vertex.x = srcVertices[ v ] * scale;

 						vertex.x = srcVertices[ v ] * scale;

Някои файлове не бяха показани, защото твърде много файлове са промени