more tools stuff

Author: LunaTheFoxgirl

.gitignore

@@ -14,3 +14,4 @@ wsedit-test-*
 *.obj
 *.lst
 dub.selections.json
+test.wsp

res/logo.png

@@ -1,5 +1,6 @@
 module wsedit.ir.scene;
 import wsedit.math;
+import containers.list;
 
 /**
     A scene
@@ -27,7 +28,7 @@ public:
     Vector2i tileSize;
 
     /// Regions of the scene
-    Region[] regions;
+    List!Region regions;
 
     /// The currently selected region
     uint selectedRegion = 0;

res/x_tiles/simpleTileset_blue.png

@@ -1,4 +1,7 @@
 module wsedit.math;
+public import std.math;
+public import std.algorithm.comparison : clamp;
+import std.format;
 
 /**
     A point in 2D space
@@ -14,6 +17,20 @@ struct Vector2 {
         Y coordinate
     */
     double y = 0.0;
+
+    /**
+        Gets wether a vector is within a circle
+
+        center = center of circle
+        radius = radius of circle
+    */
+    bool isInCircle(Vector2 center, double radius) {
+        return sqrt(pow(center.x-x, 2) + pow(center.y - y, 2)) <= radius;
+    }
+
+    string toString() {
+        return "[x=%f, y=%f]".format(x, y);
+    }
 }
 
 /**
@@ -31,6 +48,9 @@ struct Vector2i {
     */
     int y = 0;
 
+    string toString() {
+        return "[x=%d, y=%d]".format(x, y);
+    }
 }
 
 /**
@@ -74,10 +94,10 @@ struct Rectangle {
     */
     bool intersects(Rectangle other) {
         return !(
-            other.left >= this.right ||
-            other.right <= this.left ||
-            other.top >= this.bottom ||
-            other.bottom <= this.top
+            other.left > this.right ||
+            other.right < this.left ||
+            other.top > this.bottom ||
+            other.bottom < this.top
         );
     }
 
@@ -86,10 +106,10 @@ struct Rectangle {
     */
     bool intersects(Vector2 other) {
         return !(
-            other.x >= this.right ||
-            other.x <= this.left ||
-            other.y >= this.bottom ||
-            other.y <= this.top
+            other.x > this.right ||
+            other.x < this.left ||
+            other.y > this.bottom ||
+            other.y < this.top
         );
     }
 
@@ -98,17 +118,25 @@ struct Rectangle {
     */
     bool intersects(Vector2i other) {
         return !(
-            other.x >= this.right ||
-            other.x <= this.left ||
-            other.y >= this.bottom ||
-            other.y <= this.top
+            other.x > this.right ||
+            other.x < this.left ||
+            other.y > this.bottom ||
+            other.y < this.top
         );
     }
 
+    Rectangle expand(int x, int y) {
+        return Rectangle(this.x-x, this.y-y, this.width+(x*2), this.height+(y*2));
+    }
+
     /**
         Gets the cetner of this rectangle
     */
     Vector2 center() {
         return Vector2(cast(double)x+cast(double)(width/2), cast(double)y+cast(double)(height/2));
     }
+
+    string toString() {
+        return "[x=%d, y=%d, w=%d, h=%d]".format(x, y, width, height);
+    }
 }

res/x_tiles/simpleTileset_brown.png

@@ -380,12 +380,12 @@ public:
         ctx.paint();
 
         // Draw wereshift logo
-        ctx.translate(widgetArea.width/2, widgetArea.height/2);
+        ctx.translate(widgetArea.width/2, (widgetArea.height/2));
         ctx.setSourcePixbuf(wseditLogo, -originX, -originY);
         ctx.paint();
 
         // Draw info text
-        ctx.translate(-(extents.width/2), originY-32);
+        ctx.translate(-(extents.width/2), originY+16);
         ctx.setSourceRgb(1, 1, 1);
         ctx.showText(subtext);
 

res/x_tiles/simpleTileset_green.png

@@ -0,0 +1,41 @@
+module wsedit.tools.regions.erasertool;
+import wsedit.tools;
+import wsedit.math;
+
+/**
+    Eraser tool
+*/
+class EraserTool : Tool {
+private:
+
+public:
+    this(Workspace workspace, ToolGroup group) {
+        super("Eraser Tool", "edit-delete-symbolic", group, workspace);
+    }
+    
+    override void draw(Renderer renderer) {
+    
+    }
+
+    override void update(Mouse mouse) {
+        int tileWidth = workspace.scene.tileSize.x;
+        int tileHeight = workspace.scene.tileSize.y;
+
+        Vector2 mousePosition = workspace.camera.toScene(mouse.position);
+
+
+        // We've started dragging
+        if (mouse.isButtonPressed(MouseButton.Left)) {
+
+            int tileX = (cast(int)mousePosition.x)/tileWidth;
+            int tileY = (cast(int)mousePosition.y)/tileHeight;
+
+            foreach(i; 0..workspace.scene.regions.count) {
+                if (workspace.scene.regions[i].area.intersects(Vector2i(tileX, tileY))) {
+                    workspace.scene.regions.removeAt(i);
+                    continue;
+                }
+            }
+        }
+    }
+}

res/x_tiles/simpleTileset_pink.png

@@ -5,12 +5,13 @@ import std.format;
 
 public import wsedit.tools.regions.regiontool;
 public import wsedit.tools.regions.createtool;
+public import wsedit.tools.regions.erasertool;
 
 class RegionsGroup : ToolGroup {
 public:
     this(Workspace workspace) {
         super("Regions", "zoom-fit-best-symbolic", workspace);
-        tools = [new RegionTool(workspace, this), new CreateTool(workspace, this)];
+        tools = [new RegionTool(workspace, this), new EraserTool(workspace, this), new CreateTool(workspace, this)];
     }
 
     override void draw(Renderer renderer) {

res/x_tiles/simpleTileset_violet.png

@@ -1,7 +1,18 @@
 module wsedit.tools.regions.regiontool;
 import wsedit.tools;
 import wsedit.ir;
+import wsedit.ir.scene;
 import wsedit.math;
+import std.format;
+
+enum ResizeMode {
+    None = 0,
+    Right = 1,
+    Bottom = 2,
+    Corner = 3,
+}
+
+enum HANDLE_RADIUS = 8.0;
 
 /**
     Select tool
@@ -14,8 +25,14 @@ private:
 
     int mstartX;
     int mstartY;
+
+    ResizeMode resizeMode;
 
     Region selectedRegion;
+    Region hRegion;
+    Vector2 mousePosition;
+    Vector2 surfMousePosition;
+
 
 public:
 
@@ -24,54 +41,118 @@ public:
     }
 
     override void draw(Renderer renderer) {
-    
+        if (hRegion !is null) {
+            Vector2 renderPos = Vector2(
+                surfMousePosition.x+(32*workspace.camera.zoom), 
+                surfMousePosition.y+(32*workspace.camera.zoom)
+            );
+
+            renderer.renderBadge(
+                resizeMode == ResizeMode.None ? 
+                    "Move" : "Resize", 
+                workspace.camera.toScene(renderPos), 
+                1.1/workspace.camera.zoom
+            );
+        }
     }
 
     override void update(Mouse mouse) {
         int tileWidth = workspace.scene.tileSize.x;
         int tileHeight = workspace.scene.tileSize.y;
 
-        Vector2 mousePosition = workspace.camera.toScene(mouse.position);
+        mousePosition = workspace.camera.toScene(mouse.position);
+        surfMousePosition = mouse.position;
 
         // We've stopped dragging
         if (mouse.isButtonReleased(MouseButton.Left) && selectedRegion !is null) {
             selectedRegion = null;
         }
-        
-        // We've started dragging
-        if (mouse.isButtonPressed(MouseButton.Left) && selectedRegion is null) {
-
-            int tileX = (cast(int)mousePosition.x)/tileWidth;
-            int tileY = (cast(int)mousePosition.y)/tileHeight;
 
-            foreach(region; workspace.scene.regions) {
-                if (region.area.intersects(Vector2i(tileX, tileY))) {
+        // Prepare tile position
+        int tileX = cast(int)(mousePosition.x/cast(double)tileWidth);
+        int tileY = cast(int)(mousePosition.y/cast(double)tileHeight);
 
-                    // The internal selected region is only for moving
-                    selectedRegion = region;
+        // Handle modes
+        if (selectedRegion is null) {
+            hRegion = null;
+            resizeMode = ResizeMode.None;
 
-                    // This region is for the toolbar :)
-                    workspace.selectedRegion = region;
+            foreach(region; workspace.scene.regions) {
+                Rectangle actualArea = Rectangle(
+                    region.area.x*tileWidth, 
+                    region.area.y*tileHeight, 
+                    (region.area.width*tileWidth)+cast(int)HANDLE_RADIUS,
+                    (region.area.height*tileHeight)+cast(int)HANDLE_RADIUS
+                );
+                
+                if (actualArea.intersects(mousePosition)) {
+                    hRegion = region;
+
+                    double right = region.area.right*tileWidth;
+                    double bottom = region.area.bottom*tileHeight;
+
+                    double selX = clamp(mousePosition.x, region.area.left*tileWidth, region.area.right*tileWidth);
+                    double selY = clamp(mousePosition.y, region.area.top*tileHeight, region.area.bottom*tileHeight);
+
+                    if (mousePosition.isInCircle(Vector2(selX, bottom), HANDLE_RADIUS)) {
+                        resizeMode |= ResizeMode.Bottom;
+                    }
+
+                    if (mousePosition.isInCircle(Vector2(right, selY), HANDLE_RADIUS)) {
+                        resizeMode |= ResizeMode.Right;
+                    }
 
-                    startX = region.area.x;
-                    startY = region.area.y;
                     mstartX = cast(int)mousePosition.x;
                     mstartY = cast(int)mousePosition.y;
-                    continue;
+
+                    if (!resizeMode) {
+                        startX = region.area.x;
+                        startY = region.area.y;
+                    } else {
+                        startX = region.area.width;
+                        startY = region.area.height;
+                    }
+
+                    if (mouse.isButtonPressed(MouseButton.Left)) {
+                        // The internal selected region is only for moving
+                        selectedRegion = region;
+
+                        // This region is for the toolbar :)
+                        workspace.selectedRegion = region;
+                    }                    
+                    break;
                 }
             }
         }
 
         // We're dragging
         if (mouse.isButtonPressed(MouseButton.Left) && selectedRegion !is null) {
 
-            int tileX = ((cast(int)mousePosition.x)-mstartX)/tileWidth;
-            int tileY = ((cast(int)mousePosition.y)-mstartY)/tileHeight;
+            tileX = ((cast(int)mousePosition.x)-mstartX)/tileWidth;
+            tileY = ((cast(int)mousePosition.y)-mstartY)/tileHeight;
 
-            selectedRegion.area.x = startX+tileX;
-            selectedRegion.area.y = startY+tileY;
-            foreach(region; workspace.scene.regions) {
-                region.scanOverlaps();
+            if (resizeMode > 0) {
+                // RESIZE MODE
+                if ((resizeMode & ResizeMode.Right) > 0) {
+                    selectedRegion.area.width = startX+tileX;
+                    if (selectedRegion.area.width <= 1) selectedRegion.area.width = 1;
+                }
+
+                if ((resizeMode & ResizeMode.Bottom) > 0) {
+                    selectedRegion.area.height = startY+tileY;
+                    if (selectedRegion.area.height <= 1) selectedRegion.area.height = 1;
+                }
+
+                foreach(region; workspace.scene.regions) {
+                    region.scanOverlaps();
+                }
+            } else {
+                // MOVE MODE
+                selectedRegion.area.x = startX+tileX;
+                selectedRegion.area.y = startY+tileY;
+                foreach(region; workspace.scene.regions) {
+                    region.scanOverlaps();
+                }
             }
         }
     }