diff --git a/build.gradle.kts b/build.gradle.kts index 371bded6..d54249de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -104,8 +104,8 @@ dependencies { testImplementation("org.testfx:openjfx-monocle:$testfxMonocleVersion") testImplementation("io.mockk:mockk:$mockkVersion") - implementation("com.github.husker-dev.openglfx:core:$openglfxVersion") - implementation("com.github.husker-dev.openglfx:lwjgl:$openglfxVersion") + implementation("com.huskerdev:openglfx:$openglfxVersion") + implementation("com.huskerdev:openglfx-lwjgl:$openglfxVersion") implementation(platform("org.lwjgl:lwjgl-bom:$lwjglVersion")) implementation("org.lwjgl:lwjgl:$lwjglVersion") implementation("org.lwjgl:lwjgl-assimp:$lwjglVersion") diff --git a/gradle.properties b/gradle.properties index 1054c2df..4aee7804 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ junitJupiterEngineVersion=5.9.2 testfxVersion=4.0.16-alpha testfxMonocleVersion=jdk-12.0.1+2 mockkVersion=1.13.5 -openglfxVersion=3.0.5 +openglfxVersion=4.0.5 lwjglVersion=3.3.3 jomlVersion=1.10.5 diff --git a/src/main/kotlin/solve/rendering/canvas/OpenGLCanvas.kt b/src/main/kotlin/solve/rendering/canvas/OpenGLCanvas.kt index 917a4380..5f584749 100644 --- a/src/main/kotlin/solve/rendering/canvas/OpenGLCanvas.kt +++ b/src/main/kotlin/solve/rendering/canvas/OpenGLCanvas.kt @@ -1,10 +1,10 @@ package solve.rendering.canvas -import com.huskerdev.openglfx.GLCanvasAnimator -import com.huskerdev.openglfx.events.GLDisposeEvent -import com.huskerdev.openglfx.events.GLInitializeEvent -import com.huskerdev.openglfx.events.GLRenderEvent -import com.huskerdev.openglfx.events.GLReshapeEvent +import com.huskerdev.openglfx.canvas.GLCanvasAnimator +import com.huskerdev.openglfx.canvas.events.GLDisposeEvent +import com.huskerdev.openglfx.canvas.events.GLInitializeEvent +import com.huskerdev.openglfx.canvas.events.GLRenderEvent +import com.huskerdev.openglfx.canvas.events.GLReshapeEvent import com.huskerdev.openglfx.lwjgl.LWJGLExecutor import org.joml.Vector2i import org.lwjgl.opengl.GL.createCapabilities @@ -28,10 +28,10 @@ import solve.rendering.engine.Window import solve.rendering.engine.utils.minus import solve.rendering.engine.utils.plus import solve.rendering.engine.utils.toFloatVector -import com.huskerdev.openglfx.OpenGLCanvas as OpenGLFXCanvas +import com.huskerdev.openglfx.canvas.GLCanvas as OpenGLFXCanvas abstract class OpenGLCanvas { - val canvas: OpenGLFXCanvas = OpenGLFXCanvas.create(LWJGLExecutor.LWJGL_MODULE) + val canvas: OpenGLFXCanvas = OpenGLFXCanvas(LWJGLExecutor.LWJGL_MODULE, flipY = true) protected lateinit var window: Window diff --git a/src/main/kotlin/solve/rendering/engine/core/texture/Texture.kt b/src/main/kotlin/solve/rendering/engine/core/texture/Texture.kt index 6a172322..c0e987f8 100644 --- a/src/main/kotlin/solve/rendering/engine/core/texture/Texture.kt +++ b/src/main/kotlin/solve/rendering/engine/core/texture/Texture.kt @@ -1,8 +1,8 @@ package solve.rendering.engine.core.texture -import com.huskerdev.openglfx.core.GL_NEAREST import org.joml.Vector2f import org.lwjgl.opengl.GL11.GL_LINEAR +import org.lwjgl.opengl.GL11.GL_NEAREST import org.lwjgl.opengl.GL11.GL_TEXTURE_MAG_FILTER import org.lwjgl.opengl.GL11.GL_TEXTURE_MIN_FILTER import org.lwjgl.opengl.GL11.glBindTexture diff --git a/src/main/kotlin/solve/utils/ResourcesUtils.kt b/src/main/kotlin/solve/utils/ResourcesUtils.kt index f86bbed5..ab2e2807 100644 --- a/src/main/kotlin/solve/utils/ResourcesUtils.kt +++ b/src/main/kotlin/solve/utils/ResourcesUtils.kt @@ -62,7 +62,7 @@ fun getResourceAbsolutePath(resourcesPath: String): String? { return null } - return resourceAbsolutePath.substring(1..resourceAbsolutePath.lastIndex) + return resourceAbsolutePath } private fun getResource(resourcesPath: String) = Any::class::class.java.getResource("/$resourcesPath") diff --git a/src/test/kotlin/solve/unit/parsers/planes/ImagePlanesParserTests.kt b/src/test/kotlin/solve/unit/parsers/planes/ImagePlanesParserTests.kt index b3d466b5..931f80de 100644 --- a/src/test/kotlin/solve/unit/parsers/planes/ImagePlanesParserTests.kt +++ b/src/test/kotlin/solve/unit/parsers/planes/ImagePlanesParserTests.kt @@ -141,7 +141,7 @@ internal class ImagePlanesParserTests { val chosenRGBColor = if (unpaintedColors.isEmpty()) { usedColors.random() } else { - unpaintedColors.removeFirst() + unpaintedColors.removeAt(0) } val chosenColor = getColorByIntRGB(chosenRGBColor)