Merge pull request #20 from RealDoigt/dub

Dub
RealDoigt · Nov 26, 2024 · f58a01f · f58a01f
2 parents 0a3d3b6 + 2f4b1c6
commit f58a01f
Show file tree

Hide file tree

Showing 36 changed files with 50 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,16 @@
+.dub
+docs.json
+__dummy.html
+docs/
+/door
+door.so
+door.dylib
+door.dll
+door.a
+door.lib
+door-test-*
+*.exe
+*.o
+*.obj
+*.lst
+libdoor.a
diff --git a/dub.sdl b/dub.sdl
@@ -0,0 +1,6 @@
+name "door"
+description "D Object Oriented Raylib. A high level, object oriented wrapper for raylib-d and useful extras."
+authors "Doigt"
+copyright "Copyright © 2024, Doigt"
+license "MIT"
+dependency "raylib-d" version="~>4.0.0"
diff --git a/dub.selections.json b/dub.selections.json
@@ -0,0 +1,10 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"ddmp": "0.0.1-0.dev.3",
+		"fluent-asserts": "0.13.3",
+		"libdparse": "0.14.0",
+		"raylib-d": "4.0.2",
+		"stdx-allocator": "2.77.5"
+	}
+}
diff --git a/lib/audio/device.d → source/audio/device.d b/lib/audio/device.d → source/audio/device.d
diff --git a/lib/audio/interface.d → source/audio/interface.d b/lib/audio/interface.d → source/audio/interface.d
diff --git a/lib/audio/music.d → source/audio/music.d b/lib/audio/music.d → source/audio/music.d
diff --git a/lib/audio/package.d → source/audio/package.d b/lib/audio/package.d → source/audio/package.d
diff --git a/lib/audio/sound.d → source/audio/sound.d b/lib/audio/sound.d → source/audio/sound.d
diff --git a/lib/audio/stream.d → source/audio/stream.d b/lib/audio/stream.d → source/audio/stream.d
diff --git a/lib/audio/wave.d → source/audio/wave.d b/lib/audio/wave.d → source/audio/wave.d
diff --git a/lib/colors/adwaita.d → source/colors/adwaita.d b/lib/colors/adwaita.d → source/colors/adwaita.d
diff --git a/lib/colors/other.d → source/colors/other.d b/lib/colors/other.d → source/colors/other.d
diff --git a/lib/colors/package.d → source/colors/package.d b/lib/colors/package.d → source/colors/package.d
diff --git a/lib/colors/ray.d → source/colors/ray.d b/lib/colors/ray.d → source/colors/ray.d
diff --git a/lib/colors/translucent.d → source/colors/translucent.d b/lib/colors/translucent.d → source/colors/translucent.d
diff --git a/lib/colors/web.d → source/colors/web.d b/lib/colors/web.d → source/colors/web.d
diff --git a/lib/colors/x11.d → source/colors/x11.d b/lib/colors/x11.d → source/colors/x11.d
diff --git a/lib/core/window.d → source/core/window.d b/lib/core/window.d → source/core/window.d
@@ -1,5 +1,7 @@
 module door.core.window;
 import raylib;
+import std.string;
+import door.images.image;
 
 __gshared class Window
 {
@@ -51,29 +53,29 @@ __gshared class Window
         return IsWindowMinimized;
     }
 
-    auto isMaximised()
+    auto isMaximized()
     {
-        return IsWindowMaximised;
+        return IsWindowMaximized;
     }
 
     void toggleFullscreen()
     {
         ToggleFullscreen;
     }
 
-    void toggleBorderlessWindowed()
-    {
-        ToggleBorderlessWindowed;
-    }
+    //void toggleBorderless()
+    //{
+    //    ToggleBorderlessWindowed;
+    //} Not sure why that won't compile, maybe it doesn't exist in 4.0? I'll have to check later
 
-    void maximise()
+    void maximize()
     {
-        MaximiseWindow;
+        MaximizeWindow;
     }
 
-    void minimise()
+    void minimize()
     {
-        MinimiseWindow;
+        MinimizeWindow;
     }
 
     void restore()

diff --git a/lib/images/clickable.d → source/images/clickable.d b/lib/images/clickable.d → source/images/clickable.d
diff --git a/lib/images/clickable_delegate.d → source/images/clickable_delegate.d b/lib/images/clickable_delegate.d → source/images/clickable_delegate.d
diff --git a/lib/images/image.d → source/images/image.d b/lib/images/image.d → source/images/image.d
@@ -25,7 +25,7 @@ class FileDataIsNullException : Exception
 
 class Img
 {
-    package(door.images) Image image;
+    package(door) Image image;
     alias image this;
 
     this(string fileName)

diff --git a/lib/images/package.d → source/images/package.d b/lib/images/package.d → source/images/package.d
diff --git a/lib/images/texture.d → source/images/texture.d b/lib/images/texture.d → source/images/texture.d
diff --git a/lib/package.d → source/package.d b/lib/package.d → source/package.d
diff --git a/lib/shapes/circle.d → source/shapes/circle.d b/lib/shapes/circle.d → source/shapes/circle.d
diff --git a/lib/shapes/factory.d → source/shapes/factory.d b/lib/shapes/factory.d → source/shapes/factory.d
diff --git a/lib/shapes/package.d → source/shapes/package.d b/lib/shapes/package.d → source/shapes/package.d
diff --git a/lib/shapes/rectangle.d → source/shapes/rectangle.d b/lib/shapes/rectangle.d → source/shapes/rectangle.d
diff --git a/lib/shapes/rectcut.d → source/shapes/rectcut.d b/lib/shapes/rectcut.d → source/shapes/rectcut.d
@@ -1,4 +1,5 @@
 module door.shapes.rectcut;
+import raylib;
 import door.shapes.rectangle;
 import door.colors.web;
 import std.algorithm;
@@ -110,15 +111,15 @@ class RectCut : Rect
     {
         x -= toCut;
         y -= toCut;
-        maxX += toCut; 
-        maxY += toCut;
+        width += toCut - x;
+        height += toCut - y;
     }
 
     void selfcontract(int toCut)
     {
         x += toCut;
         y += toCut;
-        maxX -= toCut; 
-        maxY -= toCut;
+        width -= toCut - x;
+        height -= toCut - y;
     }
 }
diff --git a/lib/shapes/regular.d → source/shapes/regular.d b/lib/shapes/regular.d → source/shapes/regular.d
diff --git a/lib/shapes/shape.d → source/shapes/shape.d b/lib/shapes/shape.d → source/shapes/shape.d
diff --git a/lib/shapes/triangle.d → source/shapes/triangle.d b/lib/shapes/triangle.d → source/shapes/triangle.d
diff --git a/lib/texts/clickable.d → source/texts/clickable.d b/lib/texts/clickable.d → source/texts/clickable.d
diff --git a/lib/texts/custom.d → source/texts/custom.d b/lib/texts/custom.d → source/texts/custom.d
diff --git a/lib/texts/package.d → source/texts/package.d b/lib/texts/package.d → source/texts/package.d
diff --git a/lib/texts/text.d → source/texts/text.d b/lib/texts/text.d → source/texts/text.d