瀏覽代碼

Merge remote-tracking branch 'skfcz/master' into dev

Mr.doob 13 年之前
父節點
當前提交
b25f16f63a
共有 3 個文件被更改,包括 831 次插入10 次删除
  1. 309 0
      examples/scenes/test_scene_nested.js
  2. 483 0
      examples/webgl_loader_scene_nested.html
  3. 39 10
      src/loaders/SceneLoader.js

+ 309 - 0
examples/scenes/test_scene_nested.js

@@ -0,0 +1,309 @@
+{
+
+"metadata":
+{
+	"formatVersion": 3,
+	"type"		   : "scene"
+},
+
+"urlBaseType" : "relativeToHTML",
+
+"objects":
+{
+	"rootNode" : {
+            "position" : [ 0, 0, 0 ],
+            "rotation" : [ 0, 0, 0 ],
+            "scale"	: [ 1, 1, 1 ],
+            "visible"  : true,
+            "children" : {
+
+                "row1" : {
+                    "position" : [ 0, 0, 0 ],
+                    "rotation" : [ 0, 0, 0 ],
+                    "scale"    : [ 1, 1, 1 ],
+                    "visible"  : true,
+                    "children" : {
+
+                        "cube11" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_green" ],
+                             "position" : [ 0, 0, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+                        
+                         "cube12" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_green" ],
+                             "position" : [ 10, 0, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+                        
+                         "cube13" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_green" ],
+                             "position" : [ 10, 10, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+                        
+                         "cube14" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_green" ],
+                             "position" : [ 0, 10, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        }
+                    }
+                },
+            
+            
+                "row2" : {
+                    "position" : [ 0, 0, 10 ],
+                    "rotation" : [ 0, 0, 0 ],
+                    "scale"    : [ 1, 1, 1 ],
+                    "visible"  : true,
+                    "children" : {
+
+                        "cube21" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_red" ],
+                             "position" : [ 0, 0, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+
+                         "cube22" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_red" ],
+                             "position" : [ 10, 0, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+
+                         "cube23" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_red" ],
+                             "position" : [ 10, 10, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+
+                         "cube24" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_red" ],
+                             "position" : [ 0, 10, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        }
+                    }
+                },
+                
+                
+                "row3" : {
+                    "position" : [ 0, 0, 20 ],
+                    "rotation" : [ 0, 0, 0.4 ],
+                    "scale"    : [ 1, 1, 1 ],
+                    "visible"  : true,
+                    "children" : {
+
+                        "cube31" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_blue" ],
+                             "position" : [ 0, 0, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+
+                         "cube32" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_blue" ],
+                             "position" : [ 10, 0, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+
+                         "cube33" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_blue" ],
+                             "position" : [ 10, 10, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        },
+
+                         "cube34" : {
+                            "geometry" : "cube",
+                             "materials": [ "lambert_blue" ],
+                             "position" : [ 0, 10, 0 ],
+                             "rotation" : [ 0, 0, 0 ],
+                             "scale"    : [ 1, 1, 1 ],
+                             "visible"  : true
+                        }
+                    }
+                }
+                
+            }
+            
+        }, 
+
+	"ground" : {
+		"geometry" : "plane",
+		"materials": [ "basic_gray" ],
+		"position" : [ 0, -10, 0 ],
+		"rotation" : [ 0, 0, 0 ],
+		"scale"	   : [ 100, 100, 100 ],
+		"visible"  : true
+	}
+
+},
+
+"geometries":
+{
+	"cube": {
+		"type"  : "cube",
+		"width" : 1,
+		"height": 2,
+		"depth" : 3,
+		"segmentsWidth"  : 1,
+		"segmentsHeight" : 1,
+		"segmentsDepth"  : 1,
+		"flipped" : false,
+		"sides"   : { "px": true, "nx": true, "py": true, "ny": true, "pz": true, "nz": true }
+	},
+
+	"plane": {
+		"type"   : "plane",
+		"width"  : 10,
+		"height" : 10,
+		"segmentsWidth"  : 50,
+		"segmentsHeight" : 50
+	}
+
+	
+},
+
+
+
+"materials":
+{
+
+	"basic_gray": {
+		"type": "MeshBasicMaterial",
+		"parameters": { "color": 6710886, "wireframe": true }
+	},
+
+	"basic_white": {
+		"type": "MeshBasicMaterial",
+		"parameters": { "color": 16777215, "wireframe": true }
+	},
+
+	"faceted_white": {
+		"type": "MeshLambertMaterial",
+		"parameters": { "color": 16777215, "shading": "flat" }
+	},
+
+	"lambert_red": {
+		"type": "MeshLambertMaterial",
+		"parameters": { "color": 16711680 }
+	},
+
+	"lambert_green": {
+		"type": "MeshLambertMaterial",
+		"parameters": { "color": 30481, "blending": "AdditiveBlending", "transparent": true }
+	},
+
+	"lambert_blue": {
+		"type": "MeshLambertMaterial",
+		"parameters": { "color": 21930 }
+	}
+	
+},
+
+
+
+"cameras":
+{
+	"cam1": {
+		"type"  : "perspective",
+		"fov"   : 50,
+		"aspect": 1.33333,
+		"near"  : 1,
+		"far"   : 1000,
+		"position": [0,0,100],
+		"target"  : [0,0,0]
+	},
+
+	"cam2": {
+		"type"  : "ortho",
+		"left"  : 0,
+		"right" : 1024,
+		"top"   : 0,
+		"bottom": 1024,
+		"near"  : 1,
+		"far"   : 1000,
+		"position": [0,0,0],
+		"target"  : [0,0,0]
+	}
+
+},
+
+"lights":
+{
+	"light1": {
+		"type"		 : "directional",
+		"direction"	 : [0,1,1],
+		"color" 	 : 16777215,
+		"intensity"	 : 0.8
+	},
+
+	"light2": {
+		"type"	  : "point",
+		"position": [0,0,0],
+		"color"   : 16777215
+	}
+
+},
+
+"fogs":
+{
+	"basic": {
+		"type" : "linear",
+		"color": [1,0,0],
+		"near" : 1,
+		"far"  : 1000
+	},
+
+	"exponential": {
+		"type"    : "exp2",
+		"color"   : [1,1,1],
+		"density" : 0.005
+	},
+
+	"black": {
+		"type"    : "exp2",
+		"color"   : [0,0,0],
+		"density" : 0.005
+	}
+},
+
+"defaults" :
+{
+	"bgcolor" : [0,0,0],
+	"bgalpha" : 1,
+	"camera"  : "cam1",
+	"fog"	  : "black"
+}
+
+}

+ 483 - 0
examples/webgl_loader_scene_nested.html

@@ -0,0 +1,483 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<title>three.js webgl - io - scene loader</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+		<style>
+			body {
+				background:#000;
+				color:#fff;
+				padding:0;
+				margin:0;
+				overflow:hidden;
+				font-family:georgia;
+				text-align:center;
+			}
+
+			#info {
+				position: absolute;
+				top: 0px; width: 100%;
+				padding: 5px;
+				font-family: Monospace;
+				font-size: 13px;
+				text-align: center;
+				z-index:100;
+			}
+
+			#progress {
+				color:red;
+				top:7em;
+				width: 100%;
+				font-size:3em;
+				font-variant:small-caps;
+				font-weight:bold;
+				position:absolute;
+				z-index:100;
+				text-align: center;
+				text-shadow: #000 0px 0px 10px;
+				display:none;
+			}
+
+			#start {
+				color:#fff;
+				text-shadow: #000 0px 0px 2px;
+				padding:0.1em 0.3em;
+				width:3em;
+				text-align: center;
+				display:none;
+			}
+
+			.shadow {
+				-moz-box-shadow: 0px 0px 5px #000;
+				-webkit-box-shadow: 0px 0px 5px #000;
+				box-shadow: 0px 0px 5px #000;
+			}
+
+			#progressbar {
+				text-align: center;
+				background: white;
+				width: 250px;
+				height: 10px;
+			}
+
+			#bar {
+				background:#d00;
+				width:50px;
+				height:10px;
+			}
+
+			.enabled {
+				color: lime!important;
+				cursor:pointer;
+			}
+
+			.enabled:hover {
+				text-shadow: #0f0 0px 0px 5px !important;
+			}
+
+			.disabled {
+				background:gray;
+				cursor:default;
+			}
+
+			a { color:red }
+			canvas { pointer-events:none; z-index:10; }
+
+			#scene_explorer {
+				background:transparent;
+				color:#fff;
+				width:200px;
+				position:absolute;
+				text-align:left;
+				top:0px;
+				z-index:200;
+				overflow:auto;
+			}
+
+			#section_exp {
+				background:rgba(0,0,50,0.5);
+				padding:0.5em 0;
+				display:none;
+			}
+
+			#scene_explorer h3 {
+				font-size:1em;
+				padding:0;
+				margin:0;
+				color:orange;
+			}
+
+			#scene_explorer a {
+				color:#555;
+				font-weight:bold;
+				text-decoration:none;
+				font-size:1.2em;
+				font-family:Monospace;
+			}
+			#scene_explorer a:hover {
+				background:#555;
+				color:rgba(0,0,50,1);
+			}
+
+			.part {
+				display:none;
+				padding:0 0 0.5em 2em;
+			}
+
+		</style>
+	</head>
+
+	<body>
+		<div id="info">
+			<a href="http://github.com/mrdoob/three.js">three.js</a> - scene loader test
+		</div>
+
+		<div id="scene_explorer">
+			<a id="plus_exp" href="#">[+]</a>
+			<div id="section_exp"></div>
+		</div>
+
+		<div id="progress">
+			<span id="message">Loading ...</span>
+
+			<center>
+				<div id="progressbar" class="shadow"><div id="bar" class="shadow"></div></div>
+				<div id="start" class="disabled">Start</div>
+			</center>
+		</div>
+
+		<script src="../build/Three.js"></script>
+
+		<script src="js/Detector.js"></script>
+		<script src="js/Stats.js"></script>
+
+		<script>
+
+			if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
+
+			var SCREEN_WIDTH = window.innerWidth;
+			var SCREEN_HEIGHT = window.innerHeight;
+
+			var container,stats;
+
+			var camera, scene, loaded;
+			var renderer;
+
+			var mouseX = 0, mouseY = 0;
+
+			var windowHalfX = window.innerWidth / 2;
+			var windowHalfY = window.innerHeight / 2;
+
+			document.addEventListener( 'mousemove', onDocumentMouseMove, false );
+
+			init();
+			animate();
+
+			function $( id ) {
+
+				return document.getElementById( id );
+
+			}
+
+			function handle_update( result, pieces ) {
+
+				refreshSceneView( result );
+				//renderer.initWebGLObjects( result.scene );
+
+				var m, material, count = 0;
+
+				for ( m in result.materials ) {
+
+					material = result.materials[ m ];
+					if ( ! ( material instanceof THREE.MeshFaceMaterial ) ) {
+
+						if( !material.program ) {
+
+							console.log(m);
+							renderer.initMaterial( material, result.scene.__lights, result.scene.fog );
+
+							count += 1;
+							if( count > pieces ) {
+
+								//console.log("xxxxxxxxx");
+								break;
+
+							}
+
+						}
+
+					}
+
+				}
+
+			}
+
+			function init() {
+
+				container = document.createElement( 'div' );
+				document.body.appendChild( container );
+
+				var loadScene = createLoadScene();
+				scene  = loadScene.scene;
+				camera = loadScene.camera;
+
+				renderer = new THREE.WebGLRenderer( { antialias: true } );
+				renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
+				renderer.domElement.style.position = "relative";
+				container.appendChild( renderer.domElement );
+
+				stats = new Stats();
+				stats.domElement.style.position = 'absolute';
+				stats.domElement.style.top = '0px';
+				stats.domElement.style.right = '0px';
+				stats.domElement.style.zIndex = 100;
+				container.appendChild( stats.domElement );
+
+				$( "start" ).addEventListener( 'click', onStartClick, false );
+
+				var callbackProgress = function( progress, result ) {
+
+					var bar = 250,
+						total = progress.totalModels + progress.totalTextures,
+						loaded = progress.loadedModels + progress.loadedTextures;
+
+					if ( total )
+						bar = Math.floor( bar * loaded / total );
+
+					$( "bar" ).style.width = bar + "px";
+
+					count = 0;
+					for ( var m in result.materials ) count++;
+
+					handle_update( result, Math.floor( count/total ) );
+
+				}
+
+				var callbackSync = function( result ) {
+
+					/*
+
+					// uncomment to see progressive scene loading
+
+					scene = result.scene;
+					camera = result.currentCamera;
+
+					camera.aspect = window.innerWidth / window.innerHeight;
+					camera.updateProjectionMatrix();
+
+					renderer.setClearColor( result.bgColor, result.bgAlpha );
+
+					*/
+
+					//handle_update( result, 1 );
+
+				}
+
+				var callbackFinished = function( result ) {
+
+					loaded = result;
+
+					
+
+					$( "message" ).style.display = "none";
+					$( "progressbar" ).style.display = "none";
+					$( "start" ).style.display = "block";
+					$( "start" ).className = "enabled";
+
+					handle_update( result, 1 );
+
+					console.log( result );
+
+				}
+
+				$( "progress" ).style.display = "block";
+
+				var loader = new THREE.SceneLoader();
+
+				loader.callbackSync = callbackSync;
+				loader.callbackProgress = callbackProgress;
+
+				loader.load( "scenes/test_scene_nested.js", callbackFinished );
+
+				$( "plus_exp" ).addEventListener( 'click', createToggle( "exp" ), false );
+
+			}
+
+			function setButtonActive( id ) {
+
+				$( "start" ).style.backgroundColor = "green";
+
+			}
+
+			function onStartClick() {
+
+				$( "progress" ).style.display = "none";
+
+				scene = loaded.scene;
+				camera = loaded.currentCamera;
+
+				scene.add( camera );
+
+				camera.aspect = window.innerWidth / window.innerHeight;
+				camera.updateProjectionMatrix();
+
+				renderer.setClearColor( loaded.bgColor, loaded.bgAlpha );
+
+			}
+
+			function onDocumentMouseMove(event) {
+
+				mouseX = ( event.clientX - windowHalfX );
+				mouseY = ( event.clientY - windowHalfY );
+
+			}
+
+			function createLoadScene() {
+
+				var result = {
+
+					scene:  new THREE.Scene(),
+					camera: new THREE.PerspectiveCamera( 65, window.innerWidth / window.innerHeight, 1, 1000 )
+
+				};
+
+				result.camera.position.z = 100;
+				result.scene.add( result.camera );
+
+				var object, geometry, material, light, count = 500, range = 200;
+
+				material = new THREE.MeshLambertMaterial( { color:0xffffff } );
+				geometry = new THREE.CubeGeometry( 5, 5, 5 );
+
+				for( var i = 0; i < count; i++ ) {
+
+					object = new THREE.Mesh( geometry, material );
+
+					object.position.x = ( Math.random() - 0.5 ) * range;
+					object.position.y = ( Math.random() - 0.5 ) * range;
+					object.position.z = ( Math.random() - 0.5 ) * range;
+
+					object.rotation.x = Math.random() * 6;
+					object.rotation.y = Math.random() * 6;
+					object.rotation.z = Math.random() * 6;
+
+					object.matrixAutoUpdate = false;
+					object.updateMatrix();
+
+					result.scene.add( object );
+
+				}
+
+				result.scene.matrixAutoUpdate = false;
+
+				light = new THREE.PointLight( 0xffffff );
+				result.scene.add( light );
+
+				light = new THREE.DirectionalLight( 0x111111 );
+				light.position.x = 1;
+				result.scene.add( light );
+
+				return result;
+
+			}
+
+			//
+
+			function animate() {
+
+				requestAnimationFrame( animate );
+
+				render();
+				stats.update();
+
+			}
+
+			function render() {
+
+				camera.position.x += ( mouseX - camera.position.x ) * .001;
+				camera.position.y += ( - mouseY - camera.position.y ) * .001;
+
+				camera.lookAt( scene.position );
+
+				renderer.render( scene, camera );
+
+			}
+
+			// Scene explorer user interface
+
+			function toggle( id ) {
+
+				var scn = $( "section_" + id ).style,
+					btn = $( "plus_" + id );
+
+				if ( scn.display == "block" ) {
+
+					scn.display = "none";
+					btn.innerHTML = "[+]";
+
+				}
+				else {
+
+					scn.display = "block";
+					btn.innerHTML = "[-]";
+
+				}
+
+			}
+
+			function createToggle( label ) { return function() { toggle( label ) } };
+
+			function refreshSceneView( result ) {
+
+				$( "section_exp" ).innerHTML = generateSceneView( result );
+
+				var config = [ "obj", "geo", "mat", "tex", "lit", "cam" ];
+
+				for ( var i = 0; i < config.length; i++ )
+					$( "plus_" + config[i] ).addEventListener( 'click', createToggle( config[i] ), false );
+
+			}
+
+			function generateSection( label, id, objects ) {
+
+				var html = "";
+
+				html += "<h3><a id='plus_" + id + "' href='#'>[+]</a> " + label + "</h3>";
+				html += "<div id='section_" + id + "' class='part'>";
+
+				for( var o in objects ) {
+
+					html += o + "<br/>";
+
+				}
+				html += "</div>";
+
+				return html;
+
+			}
+
+			function generateSceneView( result ) {
+
+				var config = [
+				[ "Objects",    "obj", result.objects ],
+				[ "Geometries", "geo", result.geometries ],
+				[ "Materials",  "mat", result.materials ],
+				[ "Textures",   "tex", result.textures ],
+				[ "Lights",     "lit", result.lights ],
+				[ "Cameras",    "cam", result.cameras ]
+				];
+
+				var html = "";
+
+				for ( var i = 0; i < config.length; i++ )
+					html += generateSection( config[i][0], config[i][1], config[i][2] );
+
+				return html;
+
+			}
+
+		</script>
+
+	</body>
+</html>

+ 39 - 10
src/loaders/SceneLoader.js

@@ -122,16 +122,37 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
 		}
 
 	};
-
-	function handle_objects() {
-
-		var object;
-
-		for( dd in data.objects ) {
-
+        // the toplevel loader function, delegates to handle_children
+	 function handle_objects() {
+
+		console.log("handle_objects");
+                
+                var parentNode=result.scene;
+                var children = data.objects;
+                
+                handle_children( parentNode, children);
+         }
+         
+         // the loading function to load all children of one node
+         // parentNode: the node to attach the children to, either the scene itself or Object3D
+         // children: the list of children to handle
+         function handle_children( parentNode, childrenVar) {
+             
+                console.log("handle_children", parentNode, childrenVar);
+             
+                var object;
+                
+		for( dd in childrenVar ) {
+                        console.log("dd : ", dd);
+                        console.log("children ", childrenVar[dd].children);
+                        console.log("check", !result.objects[ dd ] , " ", result.objects[ dd ] );
+
+                        // check by id if child has already been handled, 
+                        // if not, create new objec
 			if ( !result.objects[ dd ] ) {
 
-				o = data.objects[ dd ];
+				o = childrenVar[ dd ];
+                                console.log("o : ", o);
 
 				if ( o.geometry !== undefined ) {
 
@@ -214,7 +235,7 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
 						object.castShadow = o.castShadow;
 						object.receiveShadow = o.receiveShadow;
 
-						result.scene.add( object );
+						parentNode.add( object );
 
 						result.objects[ dd ] = object;
 
@@ -251,12 +272,20 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
 					object.scale.set( s[0], s[1], s[2] );
 					object.visible = ( o.visible !== undefined ) ? o.visible : false;
 
-					result.scene.add( object );
+					parentNode.add( object );
 
 					result.objects[ dd ] = object;
 					result.empties[ dd ] = object;
 
 				}
+                                
+                                // recursive descend if necessary
+                                if ( o.children !== undefined ) {
+                                    console.log("add children of ", dd);
+                                    handle_children( object, o.children);
+                                } else {
+                                    console.log("no children of ", dd);
+                                }                               
 
 			}