OSX Support (#33)

Spellbook-Studios · Feb 22, 2024 · 4520e88 · 4520e88
1 parent 5cd1c7a
commit 4520e88
Show file tree

Hide file tree

Showing 78 changed files with 55,516 additions and 823 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/buildSrc/src/main/groovy/dk.sebsa.spellbook.java-application-conventions.gradle b/buildSrc/src/main/groovy/dk.sebsa.spellbook.java-application-conventions.gradle
@@ -1,6 +1,4 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
+import org.gradle.internal.os.OperatingSystem
 
 plugins {
     // Apply the common convention plugin for shared build configuration between library and application projects.
@@ -9,3 +7,9 @@ plugins {
     // Apply the application plugin to add support for building a CLI application in Java.
     id 'application'
 }
+
+if(project.ext.os == OperatingSystem.MAC_OS) {
+    application {
+        applicationDefaultJvmArgs = ["-XstartOnFirstThread"]
+    }
+}
diff --git a/buildSrc/src/main/groovy/dk.sebsa.spellbook.java-common-conventions.gradle b/buildSrc/src/main/groovy/dk.sebsa.spellbook.java-common-conventions.gradle
@@ -1,41 +1,30 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
     // Apply the java Plugin to add support for Java.
     id 'java'
 }
 
-ext {
-    lwjglVersion = "3.3.3"
-    imguiVersion = "1.86.10"
-    jomlVersion = "1.10.5"
-}
-
-// Supports Linux X64, Windows x64
-if (!project.hasProperty('targetOS')) {
-    switch (OperatingSystem.current()) {
-        case OperatingSystem.LINUX:
-            project.ext.os = OperatingSystem.LINUX
-            break
-        case OperatingSystem.WINDOWS:
-            project.ext.os = OperatingSystem.WINDOWS
-            break
-    }
-} else {
+// Find out what the target os is
+if (!project.hasProperty('targetOS')) project.ext.os = OperatingSystem.current()
+else {
     if (targetOS.equalsIgnoreCase("linux")) project.ext.os = OperatingSystem.LINUX
     else if (targetOS.equalsIgnoreCase("windows") || os.equalsIgnoreCase("win")) project.ext.os = OperatingSystem.WINDOWS
+    else if (targetOS.equalsIgnoreCase("macos") || os.equalsIgnoreCase("osx")) project.ext.os = OperatingSystem.MAC_OS
 }
 
 switch (project.ext.os) {
     case OperatingSystem.LINUX:
         project.ext.lwjglNatives = "natives-linux"
+        project.ext.imguiNatives = "natives-linux"
         break
     case OperatingSystem.WINDOWS:
         project.ext.lwjglNatives = "natives-windows"
+        project.ext.imguiNatives = "natives-windows"
+        break
+    case OperatingSystem.MAC_OS:
+        project.ext.imguiNatives = "natives-macos"
+        project.ext.lwjglNatives = project.ext.os.properties.get("arch").startsWith("aarch64") ? "natives-macos-arm64" : "natives-macos"
         break
 }
 
@@ -51,14 +40,18 @@ repositories {
         name "spellbookRepositorySnapshots"
         url "https://maven.sebsa.dk/snapshots"
     }
+    maven {
+        name "realrobotixImguiJava"
+        url "https://maven.realrobotix.me/imgui-java"
+    }
 }
 
 dependencies {
-    implementation 'dk.sebsa:mana:1.0d-SNAPSHOT'
-    compileOnly 'org.projectlombok:lombok:1.18.30'
-    annotationProcessor 'org.projectlombok:lombok:1.18.30'
+    implementation "dk.sebsa:mana:${rootProject.ext.manaVersion}"
+    compileOnly "org.projectlombok:lombok:${rootProject.ext.lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${rootProject.ext.lombokVersion}"
 
-    implementation "org.joml:joml:${jomlVersion}"
+    implementation "org.joml:joml:${rootProject.ext.jomlVersion}"
 
     // LWJGL
     implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion")
@@ -70,7 +63,7 @@ dependencies {
 
     implementation "io.github.spair:imgui-java-binding:$imguiVersion"
     implementation "io.github.spair:imgui-java-lwjgl3:$imguiVersion"
-    implementation "io.github.spair:imgui-java-$lwjglNatives:$imguiVersion"
+    implementation "io.github.spair:imgui-java-$imguiNatives:$imguiVersion"
 
     // https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform
     implementation 'net.java.dev.jna:jna-platform:5.13.0'
@@ -93,5 +86,5 @@ tasks.withType(JavaCompile).configureEach {
 compileJava {
     sourceCompatibility = '1.21'
     targetCompatibility = '1.21'
-    options.release = targetJavaVersion;
+    options.release = targetJavaVersion
 }
diff --git a/demos/multiple-windows/src/main/java/dk/sebsa/MoreWindows.java b/demos/multiple-windows/src/main/java/dk/sebsa/MoreWindows.java
@@ -5,7 +5,7 @@
 import dk.sebsa.spellbook.core.events.EngineBuildRenderPipelineEvent;
 import dk.sebsa.spellbook.core.events.EventListener;
 import dk.sebsa.spellbook.math.Color;
-import dk.sebsa.spellbook.opengl.stages.SpriteStage;
+import dk.sebsa.spellbook.graphics.opengl.stages.SpriteStage;
 
 import java.io.File;
 

diff --git a/demos/tappy/src/main/java/dk/sebsa/Tappy.java b/demos/tappy/src/main/java/dk/sebsa/Tappy.java
@@ -15,8 +15,8 @@
 import dk.sebsa.spellbook.ecs.Entity;
 import dk.sebsa.spellbook.math.Color;
 import dk.sebsa.spellbook.math.Time;
-import dk.sebsa.spellbook.opengl.components.SpriteRenderer;
-import dk.sebsa.spellbook.opengl.stages.SpriteStage;
+import dk.sebsa.spellbook.graphics.opengl.components.SpriteRenderer;
+import dk.sebsa.spellbook.graphics.opengl.stages.SpriteStage;
 import dk.sebsa.spellbook.phys.components.BoxCollider2D;
 
 import java.io.File;

diff --git a/demos/tappy/src/main/java/dk/sebsa/components/BGManager.java b/demos/tappy/src/main/java/dk/sebsa/components/BGManager.java
@@ -5,7 +5,7 @@
 import dk.sebsa.spellbook.ecs.Component;
 import dk.sebsa.spellbook.ecs.Entity;
 import dk.sebsa.spellbook.math.Time;
-import dk.sebsa.spellbook.opengl.components.SpriteRenderer;
+import dk.sebsa.spellbook.graphics.opengl.components.SpriteRenderer;
 
 public class BGManager extends Component {
     public static final float BGSCALE = 0.5f;

diff --git a/demos/tappy/src/main/java/dk/sebsa/components/PipeComponent.java b/demos/tappy/src/main/java/dk/sebsa/components/PipeComponent.java
@@ -4,7 +4,7 @@
 import dk.sebsa.spellbook.FrameData;
 import dk.sebsa.spellbook.math.Time;
 import dk.sebsa.spellbook.math.Vector3f;
-import dk.sebsa.spellbook.opengl.components.SpriteRenderer;
+import dk.sebsa.spellbook.graphics.opengl.components.SpriteRenderer;
 import dk.sebsa.spellbook.phys.components.Collider2D;
 import dk.sebsa.spellbook.phys.components.SpriteCollider2D;
 

diff --git a/demos/tappy/src/main/java/dk/sebsa/components/PipesManager.java b/demos/tappy/src/main/java/dk/sebsa/components/PipesManager.java
@@ -5,7 +5,7 @@
 import dk.sebsa.spellbook.ecs.Component;
 import dk.sebsa.spellbook.ecs.Entity;
 import dk.sebsa.spellbook.math.Time;
-import dk.sebsa.spellbook.opengl.components.SpriteRenderer;
+import dk.sebsa.spellbook.graphics.opengl.components.SpriteRenderer;
 import dk.sebsa.spellbook.util.Random;
 
 public class PipesManager extends Component {

diff --git a/demos/tappy/src/main/java/dk/sebsa/components/TappyController.java b/demos/tappy/src/main/java/dk/sebsa/components/TappyController.java
@@ -3,7 +3,7 @@
 import dk.sebsa.spellbook.FrameData;
 import dk.sebsa.spellbook.math.Time;
 import dk.sebsa.spellbook.math.Vector3f;
-import dk.sebsa.spellbook.opengl.components.SpriteRenderer;
+import dk.sebsa.spellbook.graphics.opengl.components.SpriteRenderer;
 import dk.sebsa.spellbook.phys.components.Collider2D;
 import dk.sebsa.spellbook.phys.components.SpriteCollider2D;
 import org.lwjgl.glfw.GLFW;

diff --git a/demos/tappy/src/main/java/dk/sebsa/layers/DeathScreen.java b/demos/tappy/src/main/java/dk/sebsa/layers/DeathScreen.java
@@ -6,7 +6,7 @@
 import dk.sebsa.spellbook.core.events.Event;
 import dk.sebsa.spellbook.core.events.Layer;
 import dk.sebsa.spellbook.core.events.UserEvent;
-import dk.sebsa.spellbook.io.KeyPressedEvent;
+import dk.sebsa.spellbook.io.events.KeyPressedEvent;
 import dk.sebsa.spellbook.marble.FontType;
 import dk.sebsa.spellbook.marble.Marble;
 import dk.sebsa.spellbook.marble.MarbleIMRenderer;
@@ -29,12 +29,12 @@ protected void userEvent(UserEvent event) {
     @Override
     protected void render(Marble marble, Rect r) {
         if (titleRenderer == null) titleRenderer = marble.getMarbleIM(
-                marble.font((FontType) AssetManager.getAssetS(new Identifier("tappy", "SAOWelcomeTT-Bold.ttf")), 82),
+                marble.font(new Identifier("tappy", "SAOWelcomeTT-Bold.ttf"), 82),
                 null,
                 null);
-        if (otherRenderer == null) otherRenderer = marble.getMarbleIM(marble.font("Inter", 24), null, null);
-        titleRenderer.label("You Died", (r.width / 2) - ((float) titleRenderer.getFont().getStringWidth("You Died") / 2), 20);
+        if (otherRenderer == null) otherRenderer = marble.getMarbleIM(marble.font(new Identifier("spellbook", "fonts/Inter.ttf"), 24), null, null);
+        titleRenderer.label("You Died", new Rect(0,20,r.width,124));
 
-        otherRenderer.label("Press SPACE to restart", (r.width / 2) - ((float) otherRenderer.getFont().getStringWidth("Press SPACE to restart") / 2), 124);
+        otherRenderer.label("Press SPACE to restart", new Rect(0,124,r.width,242));
     }
 }
diff --git a/demos/tappy/src/main/java/dk/sebsa/layers/MainMenuScreen.java b/demos/tappy/src/main/java/dk/sebsa/layers/MainMenuScreen.java
@@ -6,7 +6,7 @@
 import dk.sebsa.spellbook.core.events.Event;
 import dk.sebsa.spellbook.core.events.Layer;
 import dk.sebsa.spellbook.core.events.UserEvent;
-import dk.sebsa.spellbook.io.KeyPressedEvent;
+import dk.sebsa.spellbook.io.events.KeyPressedEvent;
 import dk.sebsa.spellbook.marble.FontType;
 import dk.sebsa.spellbook.marble.Marble;
 import dk.sebsa.spellbook.marble.MarbleIMRenderer;
@@ -28,12 +28,12 @@ protected void userEvent(UserEvent event) {
     @Override
     protected void render(Marble marble, Rect r) {
         if (titleRenderer == null) titleRenderer = marble.getMarbleIM(
-                marble.font((FontType) AssetManager.getAssetS(new Identifier("tappy", "SAOWelcomeTT-Bold.ttf")), 82),
+                marble.font(new Identifier("tappy", "SAOWelcomeTT-Bold.ttf"), 82),
                 null,
                 null);
-        if (otherRenderer == null) otherRenderer = marble.getMarbleIM(marble.font("Inter", 24), null, null);
-        titleRenderer.label("Tappy Bird", (r.width / 2) - ((float) titleRenderer.getFont().getStringWidth("Tappy Bird") / 2) - 23, 20);
+        if (otherRenderer == null) otherRenderer = marble.getMarbleIM(marble.font(new Identifier("spellbook", "fonts/Inter.ttf"), 24), null, null);
+        titleRenderer.labelCenterH("Tappy Bird", new Rect(0,20,r.width,124));
 
-        otherRenderer.label("Press SPACE to jump", (r.width / 2) - ((float) otherRenderer.getFont().getStringWidth("Press SPACE to jump") / 2) - 23, 124);
+        otherRenderer.labelCenterH("Press SPACE to jump", new Rect(0,124,r.width,242));
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,5 @@
+lwjglVersion=3.3.3
+jomlVersion=1.10.5
+imguiVersion=1.86.11-10-g0dbf36c
+lombokVersion=1.18.30
+manaVersion=1.0d-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME