repo: janusweb
action: commit
revision: 
path_from: 
revision_from: b75223628dc6c42781df2226261e9f70e62723a4:
path_to: 
revision_to: 

commit b75223628dc6c42781df2226261e9f70e62723a4
Author: James Baicoianu 
Date:   Fri Jan 29 05:11:36 2016 -0800

    Store startplayerposition/orientation, support room near/far distances, support Image3D, parse orphaned nodes, use CORS proxy

diff --git a/scripts/room.js b/scripts/room.js

--- a/scripts/room.js
+++ b/scripts/room.js
@@ -21,6 +21,8 @@ elation.require([
         'fog_end': { type: 'float', default: 100.0 },
         'fog_col': { type: 'color', default: 0x000000 },
       });
+      this.playerstartposition = [0,0,0];
+      this.playerstartorientation = new THREE.Quaternion();
       this.load();
       this.roomsrc = '';
       //this.showDebug();
@@ -28,6 +30,21 @@ elation.require([
     this.setActive = function() {
       this.setSkybox();
       this.setFog();
+      this.setNearFar();
+      this.setPlayerPosition();
+    }
+    this.setPlayerPosition = function(pos, orientation) {
+      if (!pos) {
+        pos = this.playerstartposition;
+        orientation = this.playerstartorientation;
+      }
+        
+      if (pos && orientation) {
+        this.engine.client.player.properties.position.set(pos[0], pos[1], pos[2]);
+        this.engine.client.player.properties.orientation.copy(orientation);
+        // HACK - we actually want the angle opposite to this
+        this.engine.client.player.properties.orientation.multiply(new THREE.Quaternion().setFromEuler(new THREE.Euler(0,Math.PI,0)));
+      }
     }
     this.setSkybox = function() {
       if (this.skyboxtexture) {
@@ -109,6 +126,10 @@ elation.require([
         this.engine.systems.world.disableFog();
       }
     }
+    this.setNearFar = function() {
+      this.engine.client.player.camera.camera.near = this.properties.near_dist;
+      this.engine.client.player.camera.camera.far = this.properties.far_dist;
+    }
     this.showDebug = function() {
       var content = elation.ui.panel_vertical({classname: 'janusweb_room_debug'});
       if (!this.debugwindow) {
@@ -139,8 +160,18 @@ elation.require([

       this.setTitle('loading...');

-      elation.net.get(url, null, { 
-        //headers: {'User-Agent':'FireBox 1.0'},
+      var proxyurl = this.properties.janus.properties.corsproxy;
+
+      var fullurl = url;
+      if (fullurl[0] == '/' && fullurl[1] != '/') fullurl = this.baseurl + fullurl;
+      if (!fullurl.match(/^https?:/)) fullurl = self.location.origin + fullurl;
+      fullurl = proxyurl + fullurl;
+
+      elation.net.get(fullurl, null, { 
+        headers: {
+          //'User-Agent':'FireBox 1.0'
+          //'X-Requested-With':'JanusWeb Client'
+        },
         callback: elation.bind(this, function(data, xhr) { 
           this.fullsource = data;
           var titlere = /