diff --git a/.gitignore b/.gitignore index ba76c61..57a7b2e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,7 @@ *.a *.lib *-test-* -*_test -*.exe +*.exec* *.pdb *.o *.obj diff --git a/dub.sdl b/dub.sdl index 85ad1af..7363210 100644 --- a/dub.sdl +++ b/dub.sdl @@ -1,12 +1,12 @@ -name "gameengine" +name "hibis" description "Game engine written in D" authors "Tulpenkiste" copyright "Copyright © 2023, Tulpenkiste" license "LGPL-3.0" targetType "none" -dependency "gameengine:engine" version="*" -dependency "gameengine:rsdl" version="*" -dependency "gameengine:test" version="*" +dependency "hibis:engine" version="*" +dependency "hibis:rsdl" version="*" +dependency "hibis:test" version="*" subPackage "engine" subPackage "renderer/rsdl" subPackage "test" \ No newline at end of file diff --git a/engine/dub.sdl b/engine/dub.sdl index 785a1fd..ca371b7 100644 --- a/engine/dub.sdl +++ b/engine/dub.sdl @@ -1,4 +1,4 @@ name "engine" license "LGPL-3.0" targetType "library" -targetName "gameengine" \ No newline at end of file +targetName "hibiscore" \ No newline at end of file diff --git a/engine/source/callback.d b/engine/source/callback.d index 61ea62f..cd163e0 100644 --- a/engine/source/callback.d +++ b/engine/source/callback.d @@ -1,5 +1,5 @@ -module gameengine.callback; +module hibis.callback; -import gameengine.logging.types; +import hibis.logging.types; alias LoggerCallback = void function(LoggingSeverity severity, string message); \ No newline at end of file diff --git a/engine/source/core/engine.d b/engine/source/core/engine.d index d758b65..cf8174d 100644 --- a/engine/source/core/engine.d +++ b/engine/source/core/engine.d @@ -1,10 +1,10 @@ -module gameengine.core.engine; +module hibis.core.engine; -import gameengine.graphics.drawable; -import gameengine.renderer.renderer; -import gameengine.logging.types; -import gameengine.callback; -import gameengine.node.node; +import hibis.graphics.drawable; +import hibis.renderer.renderer; +import hibis.logging.types; +import hibis.callback; +import hibis.node.node; import std.datetime.stopwatch; import std.stdio; diff --git a/engine/source/graphics/drawable.d b/engine/source/graphics/drawable.d index 9cd4b5e..4a621ab 100644 --- a/engine/source/graphics/drawable.d +++ b/engine/source/graphics/drawable.d @@ -1,5 +1,5 @@ -module gameengine.graphics.drawable; -import gameengine.renderer.renderer; +module hibis.graphics.drawable; +import hibis.renderer.renderer; abstract class Drawable { void draw(Renderer* renderer); diff --git a/engine/source/logging/types.d b/engine/source/logging/types.d index 75e89be..ea6169a 100644 --- a/engine/source/logging/types.d +++ b/engine/source/logging/types.d @@ -1,4 +1,4 @@ -module gameengine.logging.types; +module hibis.logging.types; enum LoggingSeverity { Message = 0, diff --git a/engine/source/math/types.d b/engine/source/math/types.d index 609c4f1..acc5549 100644 --- a/engine/source/math/types.d +++ b/engine/source/math/types.d @@ -1,4 +1,4 @@ -module gameengine.math.types; +module hibis.math.types; // Structs // - Image diff --git a/engine/source/node/node.d b/engine/source/node/node.d index ac7150c..6f87049 100644 --- a/engine/source/node/node.d +++ b/engine/source/node/node.d @@ -1,4 +1,4 @@ -module gameengine.node.node; +module hibis.node.node; abstract class Node { void process(float delta); diff --git a/engine/source/renderer/renderer.d b/engine/source/renderer/renderer.d index f6ef13a..fe33de7 100644 --- a/engine/source/renderer/renderer.d +++ b/engine/source/renderer/renderer.d @@ -1,6 +1,6 @@ -module gameengine.renderer.renderer; +module hibis.renderer.renderer; -import gameengine.math.types; +import hibis.math.types; abstract class Renderer { // Draw diff --git a/engine/source/resources/image.d b/engine/source/resources/image.d index 89c622d..005b7c3 100644 --- a/engine/source/resources/image.d +++ b/engine/source/resources/image.d @@ -1,5 +1,5 @@ -module gameengine.resources.image; +module hibis.resources.image; -import gameengine.resources.resource; +import hibis.resources.resource; abstract class Image : Resource {} \ No newline at end of file diff --git a/engine/source/resources/resource.d b/engine/source/resources/resource.d index 6163796..6615822 100644 --- a/engine/source/resources/resource.d +++ b/engine/source/resources/resource.d @@ -1,3 +1,3 @@ -module gameengine.resources.resource; +module hibis.resources.resource; abstract class Resource {} \ No newline at end of file diff --git a/renderer/rsdl/dub.sdl b/renderer/rsdl/dub.sdl index 5014a8d..63517fc 100644 --- a/renderer/rsdl/dub.sdl +++ b/renderer/rsdl/dub.sdl @@ -1,7 +1,7 @@ name "rsdl" -dependency "gameengine:engine" version=">=0.0.0" +dependency "hibis:engine" version=">=0.0.0" dependency "bindbc-sdl" version="~>1.3.5" targetType "library" -targetName "gameengine_rsdl" +targetName "hibis_rsdl" # Source paths so this can compile properly sourcePaths "./" "../../engine" \ No newline at end of file diff --git a/renderer/rsdl/source/gameengine_rsdl/package.d b/renderer/rsdl/source/hibis_rsdl.d similarity index 93% rename from renderer/rsdl/source/gameengine_rsdl/package.d rename to renderer/rsdl/source/hibis_rsdl.d index 6438f3d..da0a776 100644 --- a/renderer/rsdl/source/gameengine_rsdl/package.d +++ b/renderer/rsdl/source/hibis_rsdl.d @@ -1,8 +1,8 @@ -module gameengine_rsdl; +module hibis_rsdl; import bindbc.sdl; -import gameengine.renderer.renderer; -import gameengine.math.types; +import hibis.renderer.renderer; +import hibis.math.types; import std.exception; import std.format; @@ -55,6 +55,8 @@ class RSDL : Renderer { override void preDraw() {} override void postDraw() {} + override void update() {} + override void setWindowTitle(string title) {} private SDL_Window* window; diff --git a/run.sh b/run.sh index efd489a..a0171d2 100644 --- a/run.sh +++ b/run.sh @@ -1,3 +1,3 @@ #!/bin/bash -dub run gameengine:test \ No newline at end of file +dub run hibis:test \ No newline at end of file diff --git a/test/dub.sdl b/test/dub.sdl index de1fa7b..cf5c46a 100644 --- a/test/dub.sdl +++ b/test/dub.sdl @@ -1,9 +1,10 @@ name "test" -description "Test of the game engine" +description "Test of the Hibis game engine" authors "Tulpenkiste" copyright "Copyright © 2023, Tulpenkiste" license "LGPL-3.0" targetType "executable" -dependency "gameengine:engine" version="*" -dependency "gameengine:rsdl" version="*" +targetName "hibistest.exec" +dependency "hibis:engine" version="*" +dependency "hibis:rsdl" version="*" sourcePaths "./" "../engine" "../renderer/rsdl" \ No newline at end of file diff --git a/test/source/app.d b/test/source/app.d index 64dbc10..e532687 100644 --- a/test/source/app.d +++ b/test/source/app.d @@ -2,12 +2,12 @@ import std.stdio; import std.format; import std.conv; -import gameengine.core.engine; -import gameengine.math.types; -import gameengine.renderer.renderer; -import gameengine.logging.types; -import gameengine.callback; -import gameengine_rsdl; +import hibis.core.engine; +import hibis.math.types; +import hibis.renderer.renderer; +import hibis.logging.types; +import hibis.callback; +import hibis_rsdl; import core.thread;