diff options
Diffstat (limited to 'public/assets/test/ortho3.html')
| -rw-r--r-- | public/assets/test/ortho3.html | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/public/assets/test/ortho3.html b/public/assets/test/ortho3.html index ef5732c..f41a0ba 100644 --- a/public/assets/test/ortho3.html +++ b/public/assets/test/ortho3.html @@ -80,6 +80,7 @@ body { <script src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script> <script src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script> <script src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script> +<script src="/assets/javascripts/ui/lib/Toolbar.js"></script> <script> var app = window.app || {} @@ -112,7 +113,6 @@ $(window).resize(function(){ }) var wall_height = 180 -var line var shapes = new ShapeList var ctx = map.draw.ctx var last_point = new vec2 (0,0) @@ -121,30 +121,6 @@ $("#url").on("input", function(){ floorplan.load({ src: this.value }) }) - -var Toolbar = Fiber.extend(function(base){ - var exports = {} - exports.init = function(rapper){ - this.rapper = (typeof rapper == "string") ? $(rapper)[0] : rapper - this.tools = {} - this.els = {} - } - exports.add = function(role, fn){ - var self = this - this.tools[role] = fn - this.els[role] = $("[data-role=" + role + "]", self.rapper) - this.els[role].click(function(){ - $(".active", self.rapper).removeClass('active') - $(this).addClass('active') - fn() - }) - } - exports.pick = function(role){ - this.els[role].trigger("click") - } - return exports -}) - var PerspectiveToolbar = new Toolbar (".persp-hud") PerspectiveToolbar.add("orbit-mode", function(){ controls.toggle(true) @@ -174,8 +150,8 @@ OrthographicToolbar.add("ortho-polyline-mode", function(){ OrthographicToolbar.add("eraser-mode", function(){ map.ui.set_tool("eraser") }) -// OrthographicToolbar.pick("ortho-polyline-mode") -OrthographicToolbar.pick("eraser-mode") +OrthographicToolbar.pick("ortho-polyline-mode") +// OrthographicToolbar.pick("eraser-mode") document.addEventListener('DOMContentLoaded', build) @@ -230,7 +206,7 @@ function build () { }) controls.init() - line = new Polyline () + var line = new Polyline () line.add( new vec2(-100,100) ) line.add( new vec2(100,100) ) line.add( new vec2(100,-100) ) @@ -260,10 +236,10 @@ function animate(t){ map.draw.coords() - if (line) { - line.draw(map.draw.ctx) + if (shapes.workline) { + shapes.workline.draw(map.draw.ctx) if (map.ui.placing && last_point) { - line.draw_line( map.draw.ctx, last_point ) + shapes.workline.draw_line( map.draw.ctx, last_point ) } } |