Now multi-project to also build game jars

Ventus218 · Jul 8, 2024 · 78e9f25 · 78e9f25
1 parent 4c41828
commit 78e9f25
Show file tree

Hide file tree

Showing 80 changed files with 25 additions and 7 deletions.
diff --git a/.github/workflows/delivery.yml b/.github/workflows/delivery.yml
@@ -36,5 +36,5 @@ jobs:
       uses: softprops/action-gh-release@v2
       with:
         files: |
-          SGE.jar
+          *.jar
           Documentazione.pdf
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # generated jars (sbt assembly)
-SGE.jar
+*.jar
 
 # macOS
 .DS_Store

diff --git a/ExampleGame/src/main/scala/ExampleGame.scala b/ExampleGame/src/main/scala/ExampleGame.scala
@@ -0,0 +1,10 @@
+import sge.core.*
+import sge.swing.*
+
+object ExampleGame extends App:
+  val e = Engine(
+    SwingIO.withTitle("ExampleGame").withSize(400, 400).build(),
+    Storage(),
+    60
+  ).run(() => Seq())
+  println("ExampleGame")
diff --git a/src/main/scala/sge/core/Behaviour.scala → ...e/src/main/scala/sge/core/Behaviour.scala b/src/main/scala/sge/core/Behaviour.scala → ...e/src/main/scala/sge/core/Behaviour.scala
diff --git a/src/main/scala/sge/core/BehaviourUtils.scala → .../main/scala/sge/core/BehaviourUtils.scala b/src/main/scala/sge/core/BehaviourUtils.scala → .../main/scala/sge/core/BehaviourUtils.scala
diff --git a/src/main/scala/sge/core/Engine.scala → ...gine/src/main/scala/sge/core/Engine.scala b/src/main/scala/sge/core/Engine.scala → ...gine/src/main/scala/sge/core/Engine.scala
diff --git a/src/main/scala/sge/core/EngineUtils.scala → ...src/main/scala/sge/core/EngineUtils.scala b/src/main/scala/sge/core/EngineUtils.scala → ...src/main/scala/sge/core/EngineUtils.scala
diff --git a/src/main/scala/sge/core/Exports.scala → ...ine/src/main/scala/sge/core/Exports.scala b/src/main/scala/sge/core/Exports.scala → ...ine/src/main/scala/sge/core/Exports.scala
diff --git a/src/main/scala/sge/core/FPSLimiter.scala → .../src/main/scala/sge/core/FPSLimiter.scala b/src/main/scala/sge/core/FPSLimiter.scala → .../src/main/scala/sge/core/FPSLimiter.scala
diff --git a/src/main/scala/sge/core/IO.scala → ...meEngine/src/main/scala/sge/core/IO.scala b/src/main/scala/sge/core/IO.scala → ...meEngine/src/main/scala/sge/core/IO.scala
diff --git a/src/main/scala/sge/core/Scene.scala → ...ngine/src/main/scala/sge/core/Scene.scala b/src/main/scala/sge/core/Scene.scala → ...ngine/src/main/scala/sge/core/Scene.scala
diff --git a/src/main/scala/sge/core/Storage.scala → ...ine/src/main/scala/sge/core/Storage.scala b/src/main/scala/sge/core/Storage.scala → ...ine/src/main/scala/sge/core/Storage.scala
diff --git a/...la/sge/core/behaviours/Identifiable.scala → ...la/sge/core/behaviours/Identifiable.scala b/...la/sge/core/behaviours/Identifiable.scala → ...la/sge/core/behaviours/Identifiable.scala
diff --git a/...viours/dimension2d/PositionFollower.scala → ...viours/dimension2d/PositionFollower.scala b/...viours/dimension2d/PositionFollower.scala → ...viours/dimension2d/PositionFollower.scala
diff --git a/...behaviours/dimension2d/Positionable.scala → ...behaviours/dimension2d/Positionable.scala b/...behaviours/dimension2d/Positionable.scala → ...behaviours/dimension2d/Positionable.scala
diff --git a/...re/behaviours/dimension2d/Scalables.scala → ...re/behaviours/dimension2d/Scalables.scala b/...re/behaviours/dimension2d/Scalables.scala → ...re/behaviours/dimension2d/Scalables.scala
diff --git a/...e/behaviours/physics2d/Acceleration.scala → ...e/behaviours/physics2d/Acceleration.scala b/...e/behaviours/physics2d/Acceleration.scala → ...e/behaviours/physics2d/Acceleration.scala
diff --git a/...core/behaviours/physics2d/Colliders.scala → ...core/behaviours/physics2d/Colliders.scala b/...core/behaviours/physics2d/Colliders.scala → ...core/behaviours/physics2d/Colliders.scala
diff --git a/.../core/behaviours/physics2d/Velocity.scala → .../core/behaviours/physics2d/Velocity.scala b/.../core/behaviours/physics2d/Velocity.scala → .../core/behaviours/physics2d/Velocity.scala
diff --git a/src/main/scala/sge/core/metrics/Angle.scala → ...c/main/scala/sge/core/metrics/Angle.scala b/src/main/scala/sge/core/metrics/Angle.scala → ...c/main/scala/sge/core/metrics/Angle.scala
diff --git a/...ain/scala/sge/core/metrics/Vector2D.scala → ...ain/scala/sge/core/metrics/Vector2D.scala b/...ain/scala/sge/core/metrics/Vector2D.scala → ...ain/scala/sge/core/metrics/Vector2D.scala
diff --git a/src/main/scala/sge/swing/Exports.scala → ...ne/src/main/scala/sge/swing/Exports.scala b/src/main/scala/sge/swing/Exports.scala → ...ne/src/main/scala/sge/swing/Exports.scala
diff --git a/src/main/scala/sge/swing/SwingIO.scala → ...ne/src/main/scala/sge/swing/SwingIO.scala b/src/main/scala/sge/swing/SwingIO.scala → ...ne/src/main/scala/sge/swing/SwingIO.scala
diff --git a/src/main/scala/sge/swing/Utils.scala → ...gine/src/main/scala/sge/swing/Utils.scala b/src/main/scala/sge/swing/Utils.scala → ...gine/src/main/scala/sge/swing/Utils.scala
diff --git a/...scala/sge/swing/behaviours/Renderer.scala → ...scala/sge/swing/behaviours/Renderer.scala b/...scala/sge/swing/behaviours/Renderer.scala → ...scala/sge/swing/behaviours/Renderer.scala
diff --git a/.../sge/swing/behaviours/ingame/Button.scala → .../sge/swing/behaviours/ingame/Button.scala b/.../sge/swing/behaviours/ingame/Button.scala → .../sge/swing/behaviours/ingame/Button.scala
diff --git a/...wing/behaviours/ingame/InputHandler.scala → ...wing/behaviours/ingame/InputHandler.scala b/...wing/behaviours/ingame/InputHandler.scala → ...wing/behaviours/ingame/InputHandler.scala
diff --git a/...e/swing/behaviours/ingame/Renderers.scala → ...e/swing/behaviours/ingame/Renderers.scala b/...e/swing/behaviours/ingame/Renderers.scala → ...e/swing/behaviours/ingame/Renderers.scala
diff --git a/...g/behaviours/overlay/UITextRenderer.scala → ...g/behaviours/overlay/UITextRenderer.scala b/...g/behaviours/overlay/UITextRenderer.scala → ...g/behaviours/overlay/UITextRenderer.scala
diff --git a/...n/scala/sge/swing/input/InputButton.scala → ...n/scala/sge/swing/input/InputButton.scala b/...n/scala/sge/swing/input/InputButton.scala → ...n/scala/sge/swing/input/InputButton.scala
diff --git a/...in/scala/sge/swing/input/InputEvent.scala → ...in/scala/sge/swing/input/InputEvent.scala b/...in/scala/sge/swing/input/InputEvent.scala → ...in/scala/sge/swing/input/InputEvent.scala
diff --git a/.../swing/input/InputEventsAccumulator.scala → .../swing/input/InputEventsAccumulator.scala b/.../swing/input/InputEventsAccumulator.scala → .../swing/input/InputEventsAccumulator.scala
diff --git a/...scala/sge/swing/output/GameElements.scala → ...scala/sge/swing/output/GameElements.scala b/...scala/sge/swing/output/GameElements.scala → ...scala/sge/swing/output/GameElements.scala
diff --git a/src/main/scala/sge/swing/output/Images.scala → .../main/scala/sge/swing/output/Images.scala b/src/main/scala/sge/swing/output/Images.scala → .../main/scala/sge/swing/output/Images.scala
diff --git a/src/main/scala/sge/swing/output/Shapes.scala → .../main/scala/sge/swing/output/Shapes.scala b/src/main/scala/sge/swing/output/Shapes.scala → .../main/scala/sge/swing/output/Shapes.scala
diff --git a/src/main/scala/sge/swing/output/Text.scala → ...rc/main/scala/sge/swing/output/Text.scala b/src/main/scala/sge/swing/output/Text.scala → ...rc/main/scala/sge/swing/output/Text.scala
diff --git a/...a/sge/swing/output/overlay/UIAnchor.scala → ...a/sge/swing/output/overlay/UIAnchor.scala b/...a/sge/swing/output/overlay/UIAnchor.scala → ...a/sge/swing/output/overlay/UIAnchor.scala
diff --git a/src/main/scala/sge/testing/Exports.scala → .../src/main/scala/sge/testing/Exports.scala b/src/main/scala/sge/testing/Exports.scala → .../src/main/scala/sge/testing/Exports.scala
diff --git a/src/main/scala/sge/testing/TestUtils.scala → ...rc/main/scala/sge/testing/TestUtils.scala b/src/main/scala/sge/testing/TestUtils.scala → ...rc/main/scala/sge/testing/TestUtils.scala
diff --git a/...ge/testing/behaviours/NFrameStopper.scala → ...ge/testing/behaviours/NFrameStopper.scala b/...ge/testing/behaviours/NFrameStopper.scala → ...ge/testing/behaviours/NFrameStopper.scala
diff --git a/src/test/resources/epic-crocodile.png → ...ine/src/test/resources/epic-crocodile.png b/src/test/resources/epic-crocodile.png → ...ine/src/test/resources/epic-crocodile.png
diff --git a/src/test/scala/sge/ComplexTest.scala → ...gine/src/test/scala/sge/ComplexTest.scala b/src/test/scala/sge/ComplexTest.scala → ...gine/src/test/scala/sge/ComplexTest.scala
diff --git a/.../scala/sge/core/BehaviourUtilsTests.scala → .../scala/sge/core/BehaviourUtilsTests.scala b/.../scala/sge/core/BehaviourUtilsTests.scala → .../scala/sge/core/BehaviourUtilsTests.scala
diff --git a/...test/scala/sge/core/EngineFindTests.scala → ...test/scala/sge/core/EngineFindTests.scala b/...test/scala/sge/core/EngineFindTests.scala → ...test/scala/sge/core/EngineFindTests.scala
diff --git a/...scala/sge/core/EngineLoadSceneTests.scala → ...scala/sge/core/EngineLoadSceneTests.scala b/...scala/sge/core/EngineLoadSceneTests.scala → ...scala/sge/core/EngineLoadSceneTests.scala
diff --git a/.../sge/core/EngineObjectCreationTests.scala → .../sge/core/EngineObjectCreationTests.scala b/.../sge/core/EngineObjectCreationTests.scala → .../sge/core/EngineObjectCreationTests.scala
diff --git a/...ore/EngineObjectsEnableDisableTests.scala → ...ore/EngineObjectsEnableDisableTests.scala b/...ore/EngineObjectsEnableDisableTests.scala → ...ore/EngineObjectsEnableDisableTests.scala
diff --git a/...test/scala/sge/core/FPSLimiterTests.scala → ...test/scala/sge/core/FPSLimiterTests.scala b/...test/scala/sge/core/FPSLimiterTests.scala → ...test/scala/sge/core/FPSLimiterTests.scala
diff --git a/src/test/scala/sge/core/GameLoopTests.scala → ...c/test/scala/sge/core/GameLoopTests.scala b/src/test/scala/sge/core/GameLoopTests.scala → ...c/test/scala/sge/core/GameLoopTests.scala
diff --git a/src/test/scala/sge/core/SceneTests.scala → .../src/test/scala/sge/core/SceneTests.scala b/src/test/scala/sge/core/SceneTests.scala → .../src/test/scala/sge/core/SceneTests.scala
diff --git a/src/test/scala/sge/core/StorageTests.scala → ...rc/test/scala/sge/core/StorageTests.scala b/src/test/scala/sge/core/StorageTests.scala → ...rc/test/scala/sge/core/StorageTests.scala
diff --git a/...s/dimension2d/PositionFollowerTests.scala → ...s/dimension2d/PositionFollowerTests.scala b/...s/dimension2d/PositionFollowerTests.scala → ...s/dimension2d/PositionFollowerTests.scala
diff --git a/...iours/dimension2d/PositionableTests.scala → ...iours/dimension2d/PositionableTests.scala b/...iours/dimension2d/PositionableTests.scala → ...iours/dimension2d/PositionableTests.scala
diff --git a/...ehaviours/dimension2d/ScalableTests.scala → ...ehaviours/dimension2d/ScalableTests.scala b/...ehaviours/dimension2d/ScalableTests.scala → ...ehaviours/dimension2d/ScalableTests.scala
diff --git a/...aviours/physics2d/AccelerationTests.scala → ...aviours/physics2d/AccelerationTests.scala b/...aviours/physics2d/AccelerationTests.scala → ...aviours/physics2d/AccelerationTests.scala
diff --git a/...iours/physics2d/CircleColliderTests.scala → ...iours/physics2d/CircleColliderTests.scala b/...iours/physics2d/CircleColliderTests.scala → ...iours/physics2d/CircleColliderTests.scala
diff --git a/...aviours/physics2d/RectColliderTests.scala → ...aviours/physics2d/RectColliderTests.scala b/...aviours/physics2d/RectColliderTests.scala → ...aviours/physics2d/RectColliderTests.scala
diff --git a/.../behaviours/physics2d/VelocityTests.scala → .../behaviours/physics2d/VelocityTests.scala b/.../behaviours/physics2d/VelocityTests.scala → .../behaviours/physics2d/VelocityTests.scala
diff --git a/...t/scala/sge/core/metrics/AngleTests.scala → ...t/scala/sge/core/metrics/AngleTests.scala b/...t/scala/sge/core/metrics/AngleTests.scala → ...t/scala/sge/core/metrics/AngleTests.scala
diff --git a/...cala/sge/core/metrics/Vector2DTests.scala → ...cala/sge/core/metrics/Vector2DTests.scala b/...cala/sge/core/metrics/Vector2DTests.scala → ...cala/sge/core/metrics/Vector2DTests.scala
diff --git a/...est/scala/sge/core/mocks/EngineMock.scala → ...est/scala/sge/core/mocks/EngineMock.scala b/...est/scala/sge/core/mocks/EngineMock.scala → ...est/scala/sge/core/mocks/EngineMock.scala
diff --git a/...scala/sge/core/mocks/GameObjectMock.scala → ...scala/sge/core/mocks/GameObjectMock.scala b/...scala/sge/core/mocks/GameObjectMock.scala → ...scala/sge/core/mocks/GameObjectMock.scala
diff --git a/...scala/sge/core/mocks/GameloopTester.scala → ...scala/sge/core/mocks/GameloopTester.scala b/...scala/sge/core/mocks/GameloopTester.scala → ...scala/sge/core/mocks/GameloopTester.scala
diff --git a/...ala/sge/swing/EngineWithSwingIOTest.scala → ...ala/sge/swing/EngineWithSwingIOTest.scala b/...ala/sge/swing/EngineWithSwingIOTest.scala → ...ala/sge/swing/EngineWithSwingIOTest.scala
diff --git a/src/test/scala/sge/swing/SwingIOTest.scala → ...rc/test/scala/sge/swing/SwingIOTest.scala b/src/test/scala/sge/swing/SwingIOTest.scala → ...rc/test/scala/sge/swing/SwingIOTest.scala
diff --git a/...ng/behaviours/RendererTestUtilities.scala → ...ng/behaviours/RendererTestUtilities.scala b/...ng/behaviours/RendererTestUtilities.scala → ...ng/behaviours/RendererTestUtilities.scala
diff --git a/...swing/behaviours/ingame/ButtonTests.scala → ...swing/behaviours/ingame/ButtonTests.scala b/...swing/behaviours/ingame/ButtonTests.scala → ...swing/behaviours/ingame/ButtonTests.scala
diff --git a/...haviours/ingame/CircleRendererTests.scala → ...haviours/ingame/CircleRendererTests.scala b/...haviours/ingame/CircleRendererTests.scala → ...haviours/ingame/CircleRendererTests.scala
diff --git a/...ehaviours/ingame/ImageRendererTests.scala → ...ehaviours/ingame/ImageRendererTests.scala b/...ehaviours/ingame/ImageRendererTests.scala → ...ehaviours/ingame/ImageRendererTests.scala
diff --git a/...behaviours/ingame/InputHandlerTests.scala → ...behaviours/ingame/InputHandlerTests.scala b/...behaviours/ingame/InputHandlerTests.scala → ...behaviours/ingame/InputHandlerTests.scala
diff --git a/...behaviours/ingame/OvalRendererTests.scala → ...behaviours/ingame/OvalRendererTests.scala b/...behaviours/ingame/OvalRendererTests.scala → ...behaviours/ingame/OvalRendererTests.scala
diff --git a/...behaviours/ingame/RectRendererTests.scala → ...behaviours/ingame/RectRendererTests.scala b/...behaviours/ingame/RectRendererTests.scala → ...behaviours/ingame/RectRendererTests.scala
diff --git a/...viours/ingame/RendererRotationTests.scala → ...viours/ingame/RendererRotationTests.scala b/...viours/ingame/RendererRotationTests.scala → ...viours/ingame/RendererRotationTests.scala
diff --git a/...viours/ingame/ScalableRendererTests.scala → ...viours/ingame/ScalableRendererTests.scala b/...viours/ingame/ScalableRendererTests.scala → ...viours/ingame/ScalableRendererTests.scala
diff --git a/...haviours/ingame/SquareRendererTests.scala → ...haviours/ingame/SquareRendererTests.scala b/...haviours/ingame/SquareRendererTests.scala → ...haviours/ingame/SquareRendererTests.scala
diff --git a/...behaviours/ingame/TextRendererTests.scala → ...behaviours/ingame/TextRendererTests.scala b/...behaviours/ingame/TextRendererTests.scala → ...behaviours/ingame/TextRendererTests.scala
diff --git a/...haviours/overlay/UITextRendererTest.scala → ...haviours/overlay/UITextRendererTest.scala b/...haviours/overlay/UITextRendererTest.scala → ...haviours/overlay/UITextRendererTest.scala
diff --git a/...g/input/InputEventsAccumulatorTests.scala → ...g/input/InputEventsAccumulatorTests.scala b/...g/input/InputEventsAccumulatorTests.scala → ...g/input/InputEventsAccumulatorTests.scala
diff --git a/...sting/behaviours/NFrameStopperTests.scala → ...sting/behaviours/NFrameStopperTests.scala b/...sting/behaviours/NFrameStopperTests.scala → ...sting/behaviours/NFrameStopperTests.scala
diff --git a/build.sbt b/build.sbt
@@ -1,14 +1,22 @@
 val scala3Version = "3.4.2"
 
-lazy val root = project
-  .in(file("."))
+lazy val sge = project
+  .in(file("./ScalaGameEngine"))
   .settings(
     name := "ScalaGameEngine",
     version := "0.1.0-SNAPSHOT",
-
     scalaVersion := scala3Version,
-
     libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.18" % Test,
-
     assembly / assemblyOutputPath := file("./SGE.jar")
   )
+
+lazy val exampleGame = project
+  .in(file("./ExampleGame"))
+  .dependsOn(sge)
+  .settings(
+    name := "ExampleGame",
+    version := "0.1.0-SNAPSHOT",
+    scalaVersion := scala3Version,
+    assembly / assemblyOutputPath := file("./ExampleGame.jar"),
+    assembly / mainClass := Some("ExampleGame")
+  )