Remove subpackages from rendering.type package

rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystem.java

@@ -35,7 +35,7 @@ import de.staropensource.engine.rendering.event.RenderingErrorEvent;
 import de.staropensource.engine.rendering.exception.NotOnMainThreadException;
 import de.staropensource.engine.rendering.renderer.Renderer;
 import de.staropensource.engine.rendering.type.Window;
-import de.staropensource.engine.rendering.type.window.Platform;
+import de.staropensource.engine.rendering.type.Platform;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

rendering/src/main/java/de/staropensource/engine/rendering/RenderingSubsystemConfiguration.java

@@ -23,10 +23,10 @@ import de.staropensource.engine.base.implementable.Configuration;
 import de.staropensource.engine.base.logging.Logger;
 import de.staropensource.engine.base.utility.PropertiesReader;
 import de.staropensource.engine.rendering.event.RenderingErrorEvent;
-import de.staropensource.engine.rendering.type.window.Adapter;
-import de.staropensource.engine.rendering.type.window.Platform;
-import de.staropensource.engine.rendering.type.window.Renderer;
-import de.staropensource.engine.rendering.type.window.VsyncMode;
+import de.staropensource.engine.rendering.type.Adapter;
+import de.staropensource.engine.rendering.type.Platform;
+import de.staropensource.engine.rendering.type.Renderer;
+import de.staropensource.engine.rendering.type.VsyncMode;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

rendering/src/main/java/de/staropensource/engine/rendering/callback/KeyCallback.java

@@ -21,8 +21,8 @@ package de.staropensource.engine.rendering.callback;
 
 import de.staropensource.engine.rendering.type.Window;
 import de.staropensource.engine.rendering.event.InputEvent;
-import de.staropensource.engine.rendering.type.input.Key;
-import de.staropensource.engine.rendering.type.input.KeyState;
+import de.staropensource.engine.rendering.type.Key;
+import de.staropensource.engine.rendering.type.KeyState;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFWKeyCallbackI;
 

rendering/src/main/java/de/staropensource/engine/rendering/callback/MouseButtonCallback.java

@@ -21,8 +21,8 @@ package de.staropensource.engine.rendering.callback;
 
 import de.staropensource.engine.rendering.type.Window;
 import de.staropensource.engine.rendering.event.InputEvent;
-import de.staropensource.engine.rendering.type.input.Key;
-import de.staropensource.engine.rendering.type.input.KeyState;
+import de.staropensource.engine.rendering.type.Key;
+import de.staropensource.engine.rendering.type.KeyState;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFWMouseButtonCallbackI;
 

rendering/src/main/java/de/staropensource/engine/rendering/event/InputEvent.java

@@ -24,8 +24,8 @@ import de.staropensource.engine.base.implementable.helper.EventHelper;
 import de.staropensource.engine.base.logging.Logger;
 import de.staropensource.engine.rendering.RenderingSubsystemConfiguration;
 import de.staropensource.engine.rendering.type.Window;
-import de.staropensource.engine.rendering.type.input.Key;
-import de.staropensource.engine.rendering.type.input.KeyState;
+import de.staropensource.engine.rendering.type.Key;
+import de.staropensource.engine.rendering.type.KeyState;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

rendering/src/main/java/de/staropensource/engine/rendering/renderer/RenderingCode.java

@@ -25,7 +25,7 @@ import de.staropensource.engine.base.utility.misc.NumberUtil;
 import de.staropensource.engine.rendering.RenderingSubsystemConfiguration;
 import de.staropensource.engine.rendering.type.FrameHandler;
 import de.staropensource.engine.rendering.type.Window;
-import de.staropensource.engine.rendering.type.window.VsyncMode;
+import de.staropensource.engine.rendering.type.VsyncMode;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

rendering/src/main/java/de/staropensource/engine/rendering/type/Adapter.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.window;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Represents all available adapters.

rendering/src/main/java/de/staropensource/engine/rendering/type/Key.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.input;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Contains a list of keys which can be recognized by the engine.

rendering/src/main/java/de/staropensource/engine/rendering/type/KeyState.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.input;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Contains in which state a key is.

rendering/src/main/java/de/staropensource/engine/rendering/type/Platform.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.window;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Represents all available platforms.

rendering/src/main/java/de/staropensource/engine/rendering/type/Renderer.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.window;
+package de.staropensource.engine.rendering.type;
 
 /**
  * Represents all available renderers.

rendering/src/main/java/de/staropensource/engine/rendering/type/VsyncMode.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.engine.rendering.type.window;
+package de.staropensource.engine.rendering.type;
 
 import de.staropensource.engine.rendering.RenderingSubsystemConfiguration;
 

rendering/src/main/java/de/staropensource/engine/rendering/type/input/package-info.java

@@ -1,25 +0,0 @@
-/*
- * STAROPENSOURCE ENGINE SOURCE FILE
- * Copyright (c) 2024 The StarOpenSource Engine Authors
- * Licensed under the GNU Affero General Public License v3
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * Data types related to input.
- *
- * @since v1-alpha9
- */
-package de.staropensource.engine.rendering.type.input;

rendering/src/main/java/de/staropensource/engine/rendering/type/window/package-info.java

@@ -1,25 +0,0 @@
-/*
- * STAROPENSOURCE ENGINE SOURCE FILE
- * Copyright (c) 2024 The StarOpenSource Engine Authors
- * Licensed under the GNU Affero General Public License v3
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * Data types related to windows.
- *
- * @since v1-alpha9
- */
-package de.staropensource.engine.rendering.type.window;

rendering/src/main/java/module-info.java

@@ -22,8 +22,6 @@ module sosengine.rendering {
     exports de.staropensource.engine.rendering.exception;
     exports de.staropensource.engine.rendering.renderer;
     exports de.staropensource.engine.rendering.type;
-    exports de.staropensource.engine.rendering.type.input;
-    exports de.staropensource.engine.rendering.type.window;
 
     // Reflection access
     opens de.staropensource.engine.rendering;
@@ -31,6 +29,4 @@ module sosengine.rendering {
     opens de.staropensource.engine.rendering.exception;
     opens de.staropensource.engine.rendering.renderer;
     opens de.staropensource.engine.rendering.type;
-    opens de.staropensource.engine.rendering.type.input;
-    opens de.staropensource.engine.rendering.type.window;
 }

testapp/build.gradle

@@ -73,9 +73,15 @@ jar {
 application {
     mainClass.set("de.staropensource.engine.testapp.Main")
     applicationDefaultJvmArgs = [
+            "-XX:+UnlockDiagnosticVMOptions",
+
             // Display GC log
             //"-Xlog:gc",
 
+            // Log compilation of methods
+            //"-XX:+PrintCompilation",
+            //"-XX:+PrintInlining",
+
             // Set log level to DIAGNOSTIC
             "-Dsosengine.base.logLevel=diagnostic",
 

testapp/src/main/java/de/staropensource/engine/testapp/Main.java

@@ -29,8 +29,8 @@ import de.staropensource.engine.rendering.event.InputEvent;
 import de.staropensource.engine.rendering.renderer.Renderer;
 import de.staropensource.engine.rendering.type.FrameHandler;
 import de.staropensource.engine.rendering.type.Window;
-import de.staropensource.engine.rendering.type.input.Key;
-import de.staropensource.engine.rendering.type.input.KeyState;
+import de.staropensource.engine.rendering.type.Key;
+import de.staropensource.engine.rendering.type.KeyState;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;