diff options
4 files changed, 25 insertions, 16 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js index f4759fb..a936cef 100644 --- a/public/assets/javascripts/mx/extensions/mx.orbitCamera.js +++ b/public/assets/javascripts/mx/extensions/mx.orbitCamera.js @@ -88,8 +88,8 @@ MX.OrbitCamera = function(opt){ radius = opt.radius } opt.camera.x = opt.center.x + radius * sin(rx) * cos(ry) - opt.camera.z = opt.center.y + radius * sin(rx) * sin(ry) - opt.camera.y = opt.center.z + radius * cos(rx) + opt.camera.y = opt.center.y + radius * cos(rx) + opt.camera.z = opt.center.z + radius * sin(rx) * sin(ry) opt.camera.rotationX = PI/2 - rx opt.camera.rotationY = ry + PI/2 } diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js index cc469b6..72c129a 100644 --- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js +++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js @@ -8,14 +8,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({ initialize: function(opt){ this.parent = opt.parent -/* - $(window).resize(function(){ - scene.width = window.innerWidth/2 - scene.height = window.innerHeight - map.canvas.width = map.dimensions.a = window.innerWidth/2 - map.canvas.height = map.dimensions.b = window.innerHeight/2 - }) -*/ + $(window).resize(this.resize.bind(this)) scene = new MX.Scene().addTo("#perspective") scene.camera.radius = 20 @@ -48,7 +41,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({ var z = (offset.top - 0.5) * floorplan.height * floorplan.scale controls.opt.center.x = -x controls.opt.center.y = 0 - controls.opt.center.z = -z + controls.opt.center.z = z }, true) scene.update() @@ -63,6 +56,21 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({ controls.init() }, + resize: function(){ + if (this.parent.orbiting) { + scene.width = window.innerWidth/2 + scene.height = window.innerHeight + this.parent.map.canvas.width = this.parent.map.dimensions.a = window.innerWidth/2 + this.parent.map.canvas.height = this.parent.map.dimensions.b = window.innerHeight + this.parent.map.canvas.style.display = "block" + } + else { + scene.width = window.innerWidth + scene.height = window.innerHeight + this.parent.map.canvas.style.display = "none" + } + }, + loadFloorplan: function(media){ // console.log(media) this.floorplan.load({ diff --git a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js index a21a0ef..5f313fd 100644 --- a/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js +++ b/public/assets/javascripts/ui/blueprint/BlueprintToolbar.js @@ -29,11 +29,11 @@ var BlueprintToolbar = View.extend({ this.parent.uploader.show() }, - orbiting: true, toggleOrbitMode: function(){ - this.orbiting = ! this.orbiting - this.$toggleOrbitMode.toggleClass("inuse", ! this.orbiting) - if (this.orbiting) { + this.parent.orbiting = ! this.parent.orbiting + this.$toggleOrbitMode.toggleClass("inuse", ! this.parent.orbiting) + this.parent.editor.resize() + if (this.parent.orbiting) { controls.toggle(true) movements.lock() } diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js index 4cb9138..e84fc30 100644 --- a/public/assets/javascripts/ui/blueprint/BlueprintView.js +++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js @@ -30,7 +30,8 @@ var BlueprintView = View.extend({ $.get(this.action + name, this.ready.bind(this)) }, - + + orbiting: true, buildMap: function(){ // i forget if this has to be global map = new Map ({ |