Merging with @alteredq's experimental branches.

This commit is contained in:
Mr.doob
2011-10-23 12:34:46 +02:00
parent 20c96f52e9
commit 6b151b552e
150 changed files with 4982 additions and 3249 deletions
+3 -4
View File
@@ -128,13 +128,12 @@
sceneModel = new THREE.Scene();
directionalLight = new THREE.DirectionalLight( 0xffffff );
directionalLight.position.set( 0, 0, 1 );
directionalLight.position.normalize();
directionalLight.position.set( 0, 0, 1 ).normalize();
sceneModel.add( directionalLight );
loader = new THREE.JSONLoader( true );
document.body.appendChild( loader.statusDomElement );
loader.load( { model: "obj/leeperrysmith/LeePerrySmith.js", callback: function( geometry ) { createMesh( geometry, sceneModel, 100 ) } } );
loader.load( "obj/leeperrysmith/LeePerrySmith.js", function( geometry ) { createMesh( geometry, sceneModel, 100 ) } );
//
@@ -380,7 +379,7 @@
function render() {
var time = new Date().getTime() * 0.0004;
var time = Date.now() * 0.0004;
if ( mesh ) mesh.rotation.y = -time;