Merge remote-tracking branch 'mrdoob/dev' into docs

volos · Dec 4, 2012 · c14c0f2 · c14c0f2
2 parents 3f234f8 + d27a1bc
commit c14c0f2
Show file tree

Hide file tree

Showing 110 changed files with 44,695 additions and 38,618 deletions.
diff --git a/build/three.js b/build/three.js
diff --git a/build/three.min.js b/build/three.min.js
diff --git a/editor/index.html b/editor/index.html
@@ -264,15 +264,20 @@
 
 							if ( data.metadata.type === 'geometry' ) {
 
-								var geometry = new THREE.GeometryLoader().parse( data );
-								geometry.sourceType = "ascii";
-								geometry.sourceFile = file.name;
+								var loader = new THREE.JSONLoader();
 
-								var mesh = new THREE.Mesh( geometry, createDummyMaterial() );
-								mesh.name = filename;
+								loader.createModel( data, function ( geometry ) {
 
-								signals.objectAdded.dispatch( mesh );
-								signals.objectSelected.dispatch( mesh );
+									geometry.sourceType = "ascii";
+									geometry.sourceFile = file.name;
+
+									var mesh = new THREE.Mesh( geometry, createDummyMaterial() );
+									mesh.name = filename;
+
+									signals.objectAdded.dispatch( mesh );
+									signals.objectSelected.dispatch( mesh );
+
+								} );
 
 							} else if ( data.metadata.type === 'scene' ) {
 

diff --git a/examples/css3d_sandbox.html b/examples/css3d_sandbox.html
@@ -69,7 +69,7 @@
 					var element = document.createElement( 'div' );
 					element.style.width = '100px';
 					element.style.height = '100px';
-					element.style.background = new THREE.Color( Math.random() * 0xffffff ).getContextStyle();
+					element.style.background = new THREE.Color( Math.random() * 0xffffff ).getStyle();
 
 					var object = new THREE.CSS3DObject( element );
 					object.position.x = Math.random() * 200 - 100;