diff options
| author | Julie Lala <jules@okfoc.us> | 2014-06-10 02:30:05 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-06-10 02:30:05 -0400 |
| commit | a51e91f46feb4d43f69a21e5639d44ca044dcc19 (patch) | |
| tree | b94f4dc1ecb9da21b339b7a81805d047783c6ee4 /public/assets/javascripts | |
| parent | 160eb7f88036d997d555520df204bf37aeb22f77 (diff) | |
rough sketch of builder view
Diffstat (limited to 'public/assets/javascripts')
| -rw-r--r-- | public/assets/javascripts/rectangles/_env.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/_map.js | 8 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/draw.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/BuilderView.js | 23 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/EditorView.js | 13 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/Router.js | 4 |
6 files changed, 46 insertions, 6 deletions
diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js index 972b1fe..09d1532 100644 --- a/public/assets/javascripts/rectangles/_env.js +++ b/public/assets/javascripts/rectangles/_env.js @@ -35,7 +35,7 @@ environment.init = function(){ app.movements.gravity(true) - $("#map").hide() + // $("#map").hide() Rooms.init() Scenery.init() diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js index 967e28b..b62a813 100644 --- a/public/assets/javascripts/rectangles/engine/map/_map.js +++ b/public/assets/javascripts/rectangles/engine/map/_map.js @@ -9,8 +9,8 @@ var map = new function(){ if (! base.el) return - base.dimensions = new vec2(500,500) - base.bounds = new vec2(500,500) + base.dimensions = new vec2(window.innerWidth, window.innerHeight) + base.bounds = new vec2(window.innerWidth, window.innerHeight) base.center = new vec2(0,0) base.sides = function(){ @@ -28,8 +28,8 @@ var map = new function(){ var canvas = document.createElement("canvas") var ctx = window.ctx = canvas.getContext("2d") - var w = window.w = canvas.width = 500 - var h = window.h = canvas.height = 500 + var w = window.w = canvas.width = base.dimensions.a + var h = window.h = canvas.height = base.dimensions.b document.querySelector("#map").appendChild(canvas) base.update = function(){ diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js index b2fc05f..ec60d31 100644 --- a/public/assets/javascripts/rectangles/engine/map/draw.js +++ b/public/assets/javascripts/rectangles/engine/map/draw.js @@ -22,7 +22,7 @@ map.draw = new function(){ } base.clear_canvas = function(){ - ctx.fillStyle = "rgba(255,255,255,0.99)" + ctx.fillStyle = "rgba(255,255,255,0.9)" ctx.clearRect(0,0,w,h) ctx.fillRect(0,0,w,h) } diff --git a/public/assets/javascripts/ui/BuilderView.js b/public/assets/javascripts/ui/BuilderView.js new file mode 100644 index 0000000..c91d9ee --- /dev/null +++ b/public/assets/javascripts/ui/BuilderView.js @@ -0,0 +1,23 @@ + +var BuilderView = View.extend({ + el: "#builderView", + + events: { + "click [data-role='toggle-map-view']": 'toggleMap', + "click [data-role='toggle-layout-settings']": 'toggleSettings', + }, + + load: function(){ + $("#map").show() + }, + + toggleMap: function(){ + map.toggle() + }, + + toggleSettings: function(){ + this.$(".settings").toggleClass("active") + }, + +}) + diff --git a/public/assets/javascripts/ui/EditorView.js b/public/assets/javascripts/ui/EditorView.js new file mode 100644 index 0000000..91329de --- /dev/null +++ b/public/assets/javascripts/ui/EditorView.js @@ -0,0 +1,13 @@ + +var EditorView = View.extend({ +// el: "#editorControls", + + events: { + }, + + load: function(){ + $("#map").hide() + } + +}) + diff --git a/public/assets/javascripts/ui/Router.js b/public/assets/javascripts/ui/Router.js index 85ed1aa..fe544ae 100644 --- a/public/assets/javascripts/ui/Router.js +++ b/public/assets/javascripts/ui/Router.js @@ -25,6 +25,8 @@ var Router = View.extend({ }, initialize: function(){ + this.builderView = new BuilderView() + this.editorView = new EditorView() this.signUpModal = new SignUpModal() this.signInModal = new SignInModal() this.newProjectModal = new NewProjectModal() @@ -62,11 +64,13 @@ var Router = View.extend({ launchBuilder: function(){ app.mode.builder = true app.launch() + this.builderView.load() }, launchEditor: function(){ app.mode.editor = true app.launch() + this.editorView.load() }, signup: function(e){ |
