merge

1 files changed, 18 insertions, 4 deletions

diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 617a145..43e81d8 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -31,7 +31,12 @@ var ReaderView = View.extend({
 
     this.tracker = new Tracker ({ mode: mode })
 
-    $.get(this.projectAction + name, this.ready.bind(this))
+    if ('vvalls_data' in window) {
+      this.ready(window.vvalls_data)
+    }
+    else {
+      $.get(this.projectAction + name, this.ready.bind(this))
+    }
 	},
 	
 	getQS: function(){
@@ -71,9 +76,15 @@ var ReaderView = View.extend({
   },
   
   build: function(data){
-		data.rooms && Rooms.deserialize(data.rooms)
+		if (data.shapes.length) {
+		  Rooms.deserializeFromShapes(data)
+		}
+		else {
+		  Rooms.deserialize(data.rooms)
+		}
 		data.walls && Walls.deserialize(data.walls)
 		data.media && Scenery.deserialize(data.media)
+    data.sculpture && Sculpture.deserialize(data.sculpture)
 		data.startPosition && scene.camera.move(data.startPosition)
 		
 		cam.y = window.viewHeight = data.viewHeight || app.defaults.viewHeight
@@ -84,9 +95,12 @@ var ReaderView = View.extend({
       Walls.setColor[mode](colors[mode])
     })
 
-		editor.permissions.clear()
+		window.editor && editor.permissions.clear()
 		
-		this.listen()
+		// disable until we start using spinning again
+		// this.listen()
+
+    app.tube("site-ready")
 	},
 	
 	listen: function(){