merge

1 files changed, 79 insertions, 9 deletions

diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index d80f225..43e81d8 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -9,36 +9,98 @@ var ReaderView = View.extend({
 	
 	initialize: function(){
 		this.mediaPlayer = new MediaPlayer ({ parent: this })
+		this.shareView = new ShareView ({ parent: this })
 	},
 
 	load: function(name){
-		if (window.location.search.indexOf("noui") !== -1) {
-			$(".logo,.topLinks,#editorView").hide()
+	  var opt = this.getQS()
+	  var mode = "default"
+		var name = sanitize(name)
+
+		if (opt.noui) {
+			$(".logo, .topLinks, #editorView, #keyhint").hide()
+      mode = "noui"
+		}
+		if (opt.embed) {
+			$(".topLinks, .share, #edit-room-link, #keyhint").hide()
+      mode = "embed"
 		}
-		if (window.location.search.indexOf("mute") !== -1) {
+		if (opt.mute) {
 			app.muted = true
 		}
-		name = sanitize(name)
-		$.get(this.projectAction + name, this.ready.bind(this))
+
+    this.tracker = new Tracker ({ mode: mode })
+
+    if ('vvalls_data' in window) {
+      this.ready(window.vvalls_data)
+    }
+    else {
+      $.get(this.projectAction + name, this.ready.bind(this))
+    }
+	},
+	
+	getQS: function(){
+	  var qs = {}
+	  window.location.search.replace(/^\?/,"").split("&").forEach(function(s){
+	    var pair = s.split("=")
+	    if (pair.length < 2) {
+        qs[pair[0]] = true
+	    }
+	    else {
+        qs[pair[0]] = pair[1]
+	    }
+	  })
+	  return qs
 	},
 	
 	ready: function(data){
 		$("#map").hide()
+    this.data = data
+    var is_landscape = window.innerWidth > window.innerHeight
 
-		data.rooms && Rooms.deserialize(data.rooms)
+		if (is_desktop || (is_mobile && is_landscape)) {
+		  this.build(data)
+		  return
+		}
+		
+		// don't build anything until we're in landscape mode, otherwise ios might crash!!
+		var orientationFn = orientationchange.bind(this)
+    window.addEventListener('orientationchange', orientationFn)
+    function orientationchange (e) {
+      var is_landscape = window.innerWidth > window.innerHeight
+      if (is_landscape) {
+        window.removeEventListener('orientationchange', orientationFn)
+        this.build(data)
+      }
+    }
+  },
+  
+  build: function(data){
+		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
+		
 		var colors = data.colors || app.defaults.colors
     var modes = [ "wall", "outline", "floor", "ceiling" ]
     modes.forEach(function(mode){
       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(){
@@ -71,11 +133,19 @@ var ReaderView = View.extend({
 	},
 
 	pick: function(scenery){
-		this.mediaPlayer.pick(scenery)
+		var has_info = this.mediaPlayer.pick(scenery)
+    $("#minimap").toggleClass('active', ! has_info)
+    app.tube("pick-scenery", { scenery: scenery })
+	},
+
+	pickWall: function(wall, pos){
+		this.hideExtras()
 	},
 
 	hideExtras: function(){
+		$("#minimap").addClass('active')
 		this.mediaPlayer.hide()
+    app.tube("close-scenery")
 	}
 
 })