more work

jeromeetienne · Dec 9, 2011 · 7b239ad · 7b239ad
1 parent cd00cc2
commit 7b239ad
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/js/camera.js b/js/camera.js
@@ -7,6 +7,7 @@ Marble.Camera = function()
  // for debug
  //this._relativePos = new THREE.Vector3(0, 75*0.5, 150);
  //this._relativePos = new THREE.Vector3(0, 600, 10);
+ //this._relativePos = new THREE.Vector3(0, 1.5*Marble.tileSize/2, 0);
 
  scene.add( this._object );
 }
@@ -24,5 +25,14 @@ Marble.Camera.prototype.tick = function()
 
  camera.position.add( player.mesh().position, this._relativePos);
  camera.lookAt( player.mesh().position );
+
+if(false){
+ var target = player.mesh().position.clone();
+ var direction = Math.PI/2;
+ var distance = 500;
+ target.x += Math.cos(direction)*distance;
+ target.z -= Math.sin(direction)*distance;
+ camera.lookAt( target );
+}
 }
 
diff --git a/js/voxel.js b/js/voxel.js
@@ -4,8 +4,10 @@ Marble.Voxel = function(opts)
  var type = this._type = opts.type || 0;
  var tileSize = Marble.tileSize;
  var texture = renderer._microCache.getSet('voxelTexture', function(){
+ //return THREE.ImageUtils.loadTexture( "images/backgrounddetailed6.jpg");
+ //return THREE.ImageUtils.loadTexture( "images/grasslight-big.jpg");
  //return THREE.ImageUtils.loadTexture( "images/MarbleWhite0035_2_thumbhuge.jpg")
- return THREE.ImageUtils.loadTexture( "images/MarbleWhite0040_2_thumbhuge.jpg")
+ //return THREE.ImageUtils.loadTexture( "images/MarbleWhite0040_2_thumbhuge.jpg")
  //return THREE.ImageUtils.loadTexture( "images/planets/moon_1024.jpg" )
  //return THREE.ImageUtils.loadTexture( "images/MetalBare0144_1_thumbhuge.jpg")
  //return THREE.ImageUtils.loadTexture( "images/MetalBare0141_2_thumbhuge.jpg")