Merge branch 'master' into optimalization

JamesTKhan · Nov 22, 2024 · 50302b8 · 50302b8
2 parents 44585c3 + 3a7f97b
commit 50302b8
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
 
     ext {
         appName = "Mundus"
-        gdxVersion = '1.12.0'
+        gdxVersion = '1.13.0'
         visuiVersion = '1.5.2'
         kryoVersion = '5.2.0'
         junitVersion = '4.13.2'

diff --git a/commons/build.gradle b/commons/build.gradle
@@ -4,8 +4,8 @@ apply plugin: "maven-publish"
 group = 'com.github.jamestkhan.mundus'
 version = '0.5.1'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 sourceSets.main.java.srcDirs = ["src/main"]

diff --git a/editor-commons/build.gradle b/editor-commons/build.gradle
@@ -4,8 +4,8 @@ apply plugin: "maven-publish"
 group = 'com.github.jamestkhan.mundus'
 version = '0.5.1'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 sourceSets.main.java.srcDirs = ["src/"]

diff --git a/editor/src/main/com/mbrlabs/mundus/editor/Main.kt b/editor/src/main/com/mbrlabs/mundus/editor/Main.kt
@@ -20,6 +20,7 @@ package com.mbrlabs.mundus.editor
 
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
+import com.badlogic.gdx.utils.Os
 import com.badlogic.gdx.utils.SharedLibraryLoader
 import com.kotcrab.vis.ui.util.OsUtils
 import com.mbrlabs.mundus.commons.utils.ShaderPreprocessor
@@ -92,7 +93,7 @@ private fun launchEditor(options: LaunchOptions) {
     config.setForegroundFPS(options.fps)
 
     if (options.useGL30) {
-        if (SharedLibraryLoader.isMac) {
+        if (SharedLibraryLoader.os == Os.MacOsX ) {
             config.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.GL30, 3, 2)
         } else {
             config.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.GL30, 4, 3)

diff --git a/editor/src/main/com/mbrlabs/mundus/editor/ui/gizmos/LightGizmo.kt b/editor/src/main/com/mbrlabs/mundus/editor/ui/gizmos/LightGizmo.kt
@@ -11,7 +11,7 @@ import com.mbrlabs.mundus.commons.scene3d.components.LightComponent
  * @version June 01, 2022
  */
 class LightGizmo(private var lightComponent: LightComponent) : Gizmo() {
-    override lateinit var decal: Decal
+    override var decal: Decal
 
     init {
         val region = TextureRegion(Texture(Gdx.files.internal("icon/gizmos/lightbulb-icon.png")))

diff --git a/gdx-runtime/CHANGES b/gdx-runtime/CHANGES
@@ -10,6 +10,7 @@
 - Fix render water if it is child game object
 - Update gdx-gltf version to 2.2.1
 - Add findChildrenByComponent(Component.Type, Array<GameObject>) and findChildrenByTag(String, Array<GameObject>) methods into GameObject file
+- Set source compatibility to 1.8
 
 [0.5.1] ~ 08/08/2023
 - Updated libGDX to 1.12.0

diff --git a/gdx-runtime/build.gradle b/gdx-runtime/build.gradle
@@ -4,8 +4,8 @@ apply plugin: "maven-publish"
 group = 'com.github.jamestkhan.mundus'
 version = '0.5.1'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 sourceSets.main.java.srcDirs = ["src/"]
 sourceSets.main.resources.srcDirs = ["src/"]

diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle
@@ -4,8 +4,8 @@ apply plugin: "maven-publish"
 group = 'com.github.jamestkhan.mundus'
 version = '0.5.1'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 sourceSets.main.java.srcDirs = ["src/"]