Begun entity work

jmickle66666666 · Dec 27, 2018 · 9044b00 · 9044b00
1 parent 539a6fb
commit 9044b00
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 2 deletions.
diff --git a/js/jzbuilder.js b/js/jzbuilder.js
diff --git a/js/jzbuilder.js.map b/js/jzbuilder.js.map
diff --git a/src/canvas.ts b/src/canvas.ts
@@ -17,6 +17,8 @@ class BuilderCanvas {
     ACTIVE_FONT_COLOR : string       = "#FFFFFFFF";
     INACTIVE_FONT_COLOR : string       = "#FFFFFF77";
     PROCESSED_VERTEX_COLOR : string = "#019900";
+    ENTITY_COLOR:string = "#66CC44";
+    ENTITY_STROKE_COLOR:string = "#336622";
 
     VERTEX_SIZE : number            = 2;
     ZOOM_SPEED : number             = 1.05;
@@ -65,9 +67,22 @@ class BuilderCanvas {
     public redraw():void {
         this.drawGrid();
         this.drawSectors(mapData.sectors);
+        this.drawEntities(mapData.entities);
         this.drawIcons();
     }
 
+    public drawEntities(entities:Array<IEntity>) {
+        this.ctx.fillStyle = this.ENTITY_COLOR;
+        this.ctx.strokeStyle = this.ENTITY_STROKE_COLOR;
+        entities.forEach(e => {
+            this.ctx.beginPath();
+            let p = this.posToView(e.position);
+            this.ctx.ellipse(p.x, p.y, 16 / this.zoom, 16 / this.zoom, 0, 0, Math.PI * 2);
+            this.ctx.fill();
+            this.ctx.stroke();
+        });
+    }
+
 
     public modeSelectionOffset:Vertex = new Vertex(10,74);
     private toolSpacing:number = 24;

diff --git a/src/main.ts b/src/main.ts
@@ -18,6 +18,7 @@ function init() {
     Tool.tools.push(new BaseTool());
     Tool.tools.push(new Extrude());
     Tool.tools.push(new Split());
+    // Tool.tools.push(new EntityTool());
 
     Tool.changeTool(Tool.tools[0]);
 

diff --git a/src/mapdata.ts b/src/mapdata.ts
@@ -2,9 +2,11 @@
 class MapData {
 
     public sectors : Array<Sector>;
+    public entities : Array<IEntity>;
 
     constructor () {
         this.sectors = new Array<Sector>();
+        this.entities = new Array<IEntity>();
         this.defaultMap();
     }
 

diff --git a/src/tools/entitytool.ts b/src/tools/entitytool.ts
@@ -0,0 +1,8 @@
+class EntityTool implements ITool {
+    name:string = "Entities";
+    selectKey:string = "r";
+
+    onMouseDown() {
+        mapData.entities.push({position:Input.mousePos.clone()});
+    }
+}