Unified renderer subprojects, bump to 22.3.0.0-alpha.0

README.md

@@ -25,7 +25,7 @@ repositories {
 
 
 dependencies {
-   implementation group: "org.plutoengine", name: "plutocore", version: "22.2.0.0-alpha.2"
+   implementation group: "org.plutoengine", name: "plutocore", version: "22.3.0.0-alpha.0"
 }
 ```
 
@@ -41,7 +41,7 @@ repositories {
 }
 
 dependencies {
-   implementation("org.plutoengine", "plutocore", "22.2.0.0-alpha.2")
+   implementation("org.plutoengine", "plutocore", "22.3.0.0-alpha.0")
 }
 ```
 
@@ -76,20 +76,20 @@ The following list simply provides an overview of how likely breaking changes ar
 
 ### Safe submodules
 * **PlutoCore** - Stable
-* **PlutoFramebuffer** - Stable
+* **PlutoSpritesheet** - Stable, some features are unfinished
-* **PlutoMesher** - Stable
-* **PlutoShader** - Stable
-* **PlutoTexture** - Stable
-* **PlutoSpriteSheet** - Stable, some features are unfinished
 * **PlutoDisplay** - Stable, collision API nowhere near completion
-* **PlutoUSS2** - Stable
 * **PlutoLib** - Mostly stable
+* **PlutoRender** - Stable
 * **PlutoRuntime** - Mostly stable
 
 ### Unstable submodules
 * **PlutoAudio** - Very tentative, work in progress
 * **PlutoGUI** - Recently rewritten, the API is highly unstable, work in progress
 
+### Extensions
+* **PlutoUSS2** - Stable
+* **PlutoGameObject** - Stable
+
 
 ## Current priorities
 

UPDATE_NOTES.md

@@ -1,3 +1,10 @@
+## 22.3.0.0-alpha.0
+* `[SDK]` **Combined `PlutoFramebuffer`, `PlutoMesher`, `PlutoShader` and `PlutoTexture`
+  into `PlutoRender`**
+  * Unified the package structure
+* `[SDK]` **Added the license to all source files**
+* `plutoengine-demos/jsr-clone` Added a proper license file for the music
+
 ## 22.2.0.0-alpha.2
 * `[SDK]` The libraries now always reference natives for all architectures
 * `[SDK]` Replaced `NEXT_RELEASE_DRAFT.md` with [an issue tracker](https://github.com/493msi/plutoengine/issues) 

buildSrc/src/main/kotlin/org/plutoengine/Versions.kt

@@ -22,13 +22,13 @@ object Versions {
     const val steamworks4jServerVersion = "1.8.0"
 
     const val versionYear = 22
-    const val versionMajor = 2
+    const val versionMajor = 3
     const val versionMinor = 0
     const val versionPatch = 0
 
     const val isPrerelease = true
     const val prereleaseName = "alpha"
-    const val prerealeaseUpdate = 2
+    const val prerealeaseUpdate = 0
 
     val versionFull =
         if (isPrerelease)

engine-core/plutodisplay/src/main/java/org/plutoengine/math/ProjectionMatrix.java

@@ -24,7 +24,7 @@ public class ProjectionMatrix
     }
 
     /**
-     * Create a centered 2D orthogonal projection Matrix3x2f based on the width and
+     * Create a centered 2D orthogonal projection Matrix4f based on the width and
      * height.
      * 
      * @param width  The ortho width

engine-core/plutoframebuffer/build.gradle.kts

@@ -1,10 +0,0 @@
-plugins {
-	java
-	`java-library`
-}
-
-description = ""
-
-dependencies {
-	api(project(":plutoengine:plutotexture"))
-}

engine-core/plutogui/src/main/java/org/plutoengine/graphics/PlutoGUIMod.java

@@ -10,7 +10,7 @@ import org.plutoengine.graphics.texture.texture2d.RectangleTexture;
 import org.plutoengine.mod.IModEntryPoint;
 import org.plutoengine.mod.Mod;
 import org.plutoengine.mod.ModEntry;
-import org.plutoengine.shader.RenderShaderBuilder;
+import org.plutoengine.graphics.shader.RenderShaderBuilder;
 
 /**
  * @author 493msi

engine-core/plutogui/src/main/java/org/plutoengine/graphics/gui/BitmapFontShader.java

@@ -1,15 +1,15 @@
 package org.plutoengine.graphics.gui;
 
 import org.joml.Matrix3fc;
-import org.plutoengine.graphics.gl.vao.attrib.ReservedAttributes;
+import org.plutoengine.graphics.vao.attrib.ReservedAttributes;
+import org.plutoengine.graphics.shader.uniform.*;
 import org.plutoengine.libra.paint.LiColorPaint;
 import org.plutoengine.libra.paint.LiGradientPaint;
 import org.plutoengine.libra.paint.LiPaint;
-import org.plutoengine.shader.ShaderBase;
+import org.plutoengine.graphics.shader.ShaderBase;
-import org.plutoengine.shader.ShaderProgram;
+import org.plutoengine.graphics.shader.ShaderProgram;
-import org.plutoengine.shader.VertexArrayAttribute;
+import org.plutoengine.graphics.shader.VertexArrayAttribute;
-import org.plutoengine.shader.uniform.*;
+import org.plutoengine.graphics.shader.uniform.auto.AutoViewportProjection;
-import org.plutoengine.shader.uniform.auto.AutoViewportProjection;
 import org.plutoengine.util.color.IRGBA;
 
 @ShaderProgram

engine-core/plutogui/src/main/java/org/plutoengine/graphics/gui/FontShader.java

@@ -1,15 +1,15 @@
 package org.plutoengine.graphics.gui;
 
 import org.joml.Matrix3fc;
-import org.plutoengine.graphics.gl.vao.attrib.ReservedAttributes;
+import org.plutoengine.graphics.vao.attrib.ReservedAttributes;
+import org.plutoengine.graphics.shader.uniform.*;
 import org.plutoengine.libra.paint.LiColorPaint;
 import org.plutoengine.libra.paint.LiGradientPaint;
 import org.plutoengine.libra.paint.LiPaint;
-import org.plutoengine.shader.ShaderBase;
+import org.plutoengine.graphics.shader.ShaderBase;
-import org.plutoengine.shader.ShaderProgram;
+import org.plutoengine.graphics.shader.ShaderProgram;
-import org.plutoengine.shader.VertexArrayAttribute;
+import org.plutoengine.graphics.shader.VertexArrayAttribute;
-import org.plutoengine.shader.uniform.*;
+import org.plutoengine.graphics.shader.uniform.auto.AutoViewportProjection;
-import org.plutoengine.shader.uniform.auto.AutoViewportProjection;
 import org.plutoengine.util.color.IRGBA;
 
 @ShaderProgram

engine-core/plutogui/src/main/java/org/plutoengine/graphics/gui/PlutoGUICommandParser.java

@@ -1,8 +1,8 @@
 package org.plutoengine.graphics.gui;
 
 import org.plutoengine.graphics.gl.DrawMode;
-import org.plutoengine.graphics.gl.vao.VertexArray;
+import org.plutoengine.graphics.vao.VertexArray;
-import org.plutoengine.graphics.gl.vao.VertexArrayBuilder;
+import org.plutoengine.graphics.vao.VertexArrayBuilder;
 import org.plutoengine.graphics.gui.command.PlutoCommandDrawMesh;
 import org.plutoengine.graphics.gui.command.PlutoCommandDrawMeshDirectBuffer;
 import org.plutoengine.graphics.gui.command.PlutoCommandSwitchShader;
@@ -13,7 +13,7 @@ import org.plutoengine.libra.command.LiCommandBuffer;
 import org.plutoengine.libra.command.impl.LiCommandSetPaint;
 import org.plutoengine.libra.command.impl.LiCommandSetTransform;
 import org.plutoengine.libra.command.impl.LiCommandSpecial;
-import org.plutoengine.shader.ShaderBase;
+import org.plutoengine.graphics.shader.ShaderBase;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;

engine-core/plutogui/src/main/java/org/plutoengine/graphics/gui/command/PlutoCommandDrawMesh.java

@@ -1,6 +1,6 @@
 package org.plutoengine.graphics.gui.command;
 
-import org.plutoengine.graphics.gl.vao.attrib.AttributeInfo;
+import org.plutoengine.graphics.vao.attrib.AttributeInfo;
 import org.plutoengine.libra.command.impl.LiCommand;
 import org.plutoengine.libra.command.impl.LiCommandDrawMesh;
 

engine-core/plutogui/src/main/java/org/plutoengine/graphics/gui/command/PlutoCommandDrawMeshDirectBuffer.java

@@ -1,8 +1,8 @@
 package org.plutoengine.graphics.gui.command;
 
 import org.lwjgl.system.MemoryUtil;
-import org.plutoengine.graphics.gl.vao.attrib.AttributeInfo;
+import org.plutoengine.graphics.vao.attrib.AttributeInfo;
-import org.plutoengine.graphics.gl.vbo.EnumArrayBufferType;
+import org.plutoengine.graphics.vbo.EnumArrayBufferType;
 
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;

engine-core/plutogui/src/main/java/org/plutoengine/graphics/gui/command/PlutoCommandDrawMeshHeap.java

@@ -1,7 +1,7 @@
 package org.plutoengine.graphics.gui.command;
 
-import org.plutoengine.graphics.gl.vao.attrib.AttributeInfo;
+import org.plutoengine.graphics.vao.attrib.AttributeInfo;
-import org.plutoengine.graphics.gl.vbo.EnumArrayBufferType;
+import org.plutoengine.graphics.vbo.EnumArrayBufferType;
 import org.plutoengine.libra.command.impl.LiCommand;
 
 import java.nio.FloatBuffer;

engine-core/plutorender/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 	`java-library`
 }
 
-description = ""
+description = "OpenGL-based renderer for PlutoEngine."
 
 dependencies {
 	api(project(":plutoengine:plutodisplay"))

engine-core/plutorender/src/main/java/org/plutoengine/graphics/PlutoRendererMod.java

@@ -1,14 +1,14 @@
-package org.plutoengine.shader;
+package org.plutoengine.graphics;
 
 import org.plutoengine.ModLWJGL;
 import org.plutoengine.Pluto;
 import org.plutoengine.mod.ModEntry;
 
-@ModEntry(modID = PlutoShaderMod.MOD_ID,
+@ModEntry(modID = PlutoRendererMod.MOD_ID,
         dependencies = { ModLWJGL.class },
         version = Pluto.VERSION)
-public class  PlutoShaderMod
+public class PlutoRendererMod
 {
-    public static final String MOD_ID = "tefek.plutoshader";
+    public static final String MOD_ID = "tefek.plutorender";
 
 }

engine-core/plutorender/src/main/java/org/plutoengine/graphics/fbo/Framebuffer.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.fbo;
+package org.plutoengine.graphics.fbo;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/fbo/FramebufferDepthTexture.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.fbo;
+package org.plutoengine.graphics.fbo;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/fbo/FramebufferTexture.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.fbo;
+package org.plutoengine.graphics.fbo;
 
 import org.lwjgl.system.MemoryUtil;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/gl/DrawMode.java

@@ -3,8 +3,6 @@ package org.plutoengine.graphics.gl;
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.opengl.GL40;
 
-import org.plutoengine.gl.IOpenGLEnum;
-
 public enum DrawMode implements IOpenGLEnum
 {
     POINTS(GL33.GL_POINTS),

engine-core/plutorender/src/main/java/org/plutoengine/graphics/gl/IOpenGLEnum.java

@@ -1,4 +1,4 @@
-package org.plutoengine.gl;
+package org.plutoengine.graphics.gl;
 
 /**
  * Denotes the implementing class is a set of OpenGL enums.

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/IShaderProgram.java

@@ -1,7 +1,7 @@
-package org.plutoengine.shader;
+package org.plutoengine.graphics.shader;
 
 import org.lwjgl.opengl.GL33;
-import org.plutoengine.shader.type.IShader;
+import org.plutoengine.graphics.shader.type.IShader;
 
 public interface IShaderProgram extends AutoCloseable
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/RenderShaderBuilder.java

@@ -1,15 +1,15 @@
-package org.plutoengine.shader;
+package org.plutoengine.graphics.shader;
 
 import org.lwjgl.opengl.GL33;
+import org.plutoengine.graphics.shader.type.FragmentShader;
+import org.plutoengine.graphics.shader.type.VertexShader;
+import org.plutoengine.graphics.shader.uniform.Uniform;
+import org.plutoengine.graphics.shader.uniform.UniformBase;
+import org.plutoengine.graphics.shader.uniform.UniformMat4;
+import org.plutoengine.graphics.shader.uniform.auto.AutoViewportProjection;
+import org.plutoengine.graphics.shader.uniform.auto.AutomaticUniforms;
 import org.plutoengine.logger.Logger;
 import org.plutoengine.logger.SmartSeverity;
-import org.plutoengine.shader.type.FragmentShader;
-import org.plutoengine.shader.type.VertexShader;
-import org.plutoengine.shader.uniform.Uniform;
-import org.plutoengine.shader.uniform.UniformBase;
-import org.plutoengine.shader.uniform.UniformMat4;
-import org.plutoengine.shader.uniform.auto.AutoViewportProjection;
-import org.plutoengine.shader.uniform.auto.AutomaticUniforms;
 
 import java.io.UncheckedIOException;
 import java.lang.reflect.InvocationTargetException;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/ShaderBase.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader;
+package org.plutoengine.graphics.shader;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/ShaderCompiler.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader;
+package org.plutoengine.graphics.shader;
 
 import org.lwjgl.opengl.GL33;
 
@@ -7,7 +7,7 @@ import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.plutoengine.shader.type.EnumShaderType;
+import org.plutoengine.graphics.shader.type.EnumShaderType;
 import org.plutoengine.logger.Logger;
 import org.plutoengine.logger.SmartSeverity;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/ShaderProgram.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader;
+package org.plutoengine.graphics.shader;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/VertexArrayAttribute.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader;
+package org.plutoengine.graphics.shader;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/type/EnumShaderType.java

@@ -1,10 +1,10 @@
-package org.plutoengine.shader.type;
+package org.plutoengine.graphics.shader.type;
 
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.opengl.GL40;
 import org.lwjgl.opengl.GL43;
 
-import org.plutoengine.gl.IOpenGLEnum;
+import org.plutoengine.graphics.gl.IOpenGLEnum;
 
 public enum EnumShaderType implements IOpenGLEnum
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/type/FragmentShader.java

@@ -1,6 +1,6 @@
-package org.plutoengine.shader.type;
+package org.plutoengine.graphics.shader.type;
 
-import org.plutoengine.shader.ShaderCompiler;
+import org.plutoengine.graphics.shader.ShaderCompiler;
 
 import java.nio.file.Path;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/type/GeometryShader.java

@@ -1,8 +1,8 @@
-package org.plutoengine.shader.type;
+package org.plutoengine.graphics.shader.type;
 
 import java.nio.file.Path;
 
-import org.plutoengine.shader.ShaderCompiler;
+import org.plutoengine.graphics.shader.ShaderCompiler;
 
 public final class GeometryShader implements IShader
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/type/IShader.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.type;
+package org.plutoengine.graphics.shader.type;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/type/VertexShader.java

@@ -1,8 +1,8 @@
-package org.plutoengine.shader.type;
+package org.plutoengine.graphics.shader.type;
 
 import java.nio.file.Path;
 
-import org.plutoengine.shader.ShaderCompiler;
+import org.plutoengine.graphics.shader.ShaderCompiler;
 
 public final class VertexShader implements IShader
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/ubo/UniformBufferBindingPoint.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.ubo;
+package org.plutoengine.graphics.shader.ubo;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/ubo/UniformBufferObject.java

@@ -1,8 +1,8 @@
-package org.plutoengine.shader.ubo;
+package org.plutoengine.graphics.shader.ubo;
 
 import org.lwjgl.opengl.GL33;
 
-import org.plutoengine.shader.ShaderBase;
+import org.plutoengine.graphics.shader.ShaderBase;
 import org.plutoengine.logger.Logger;
 import org.plutoengine.logger.SmartSeverity;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/Uniform.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformArrayFloat.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformArrayInt.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformArrayMat3x2.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Matrix3x2fc;
 import org.lwjgl.opengl.GL33;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformArrayRGBA.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.system.MemoryStack;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformArrayVec2.java

@@ -1,7 +1,6 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Vector2fc;
-import org.joml.Vector4fc;
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.system.MemoryStack;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformArrayVec3.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Vector2fc;
 import org.lwjgl.opengl.GL33;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformArrayVec4.java

@@ -1,11 +1,9 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Vector4fc;
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.system.MemoryStack;
 
-import java.nio.FloatBuffer;
-
 public class UniformArrayVec4 extends UniformBase
 {
     public UniformArrayVec4(int location)

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformBase.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 public abstract class UniformBase
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformBoolean.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformFloat.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformInt.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformMat3.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Matrix3fc;
 import org.lwjgl.opengl.GL33;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformMat3x2.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Matrix3x2fc;
 import org.lwjgl.opengl.GL33;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformMat4.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Matrix4fc;
 import org.lwjgl.opengl.GL33;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformRGB.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformRGBA.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformVec2.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Vector2fc;
 import org.lwjgl.opengl.GL33;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformVec3.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Vector3fc;
 import org.lwjgl.opengl.GL33;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/UniformVec4.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform;
+package org.plutoengine.graphics.shader.uniform;
 
 import org.joml.Vector4fc;
 import org.lwjgl.opengl.GL33;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/auto/AutoViewportProjection.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform.auto;
+package org.plutoengine.graphics.shader.uniform.auto;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/shader/uniform/auto/AutomaticUniforms.java

@@ -1,4 +1,4 @@
-package org.plutoengine.shader.uniform.auto;
+package org.plutoengine.graphics.shader.uniform.auto;
 
 import org.joml.Matrix4fc;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/texture/MagFilter.java

@@ -2,7 +2,7 @@ package org.plutoengine.graphics.texture;
 
 import org.lwjgl.opengl.GL33;
 
-import org.plutoengine.gl.IOpenGLEnum;
+import org.plutoengine.graphics.gl.IOpenGLEnum;
 
 public enum MagFilter implements IOpenGLEnum
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/texture/MinFilter.java

@@ -2,7 +2,7 @@ package org.plutoengine.graphics.texture;
 
 import org.lwjgl.opengl.GL33;
 
-import org.plutoengine.gl.IOpenGLEnum;
+import org.plutoengine.graphics.gl.IOpenGLEnum;
 
 public enum MinFilter implements IOpenGLEnum
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/texture/WrapMode.java

@@ -2,7 +2,7 @@ package org.plutoengine.graphics.texture;
 
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.opengl.GL44;
-import org.plutoengine.gl.IOpenGLEnum;
+import org.plutoengine.graphics.gl.IOpenGLEnum;
 
 import java.util.EnumSet;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vao/QuadPresets.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.vao;
+package org.plutoengine.graphics.vao;
 
 /**
  * @author 493msi

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vao/VertexArray.java

@@ -1,11 +1,11 @@
-package org.plutoengine.graphics.gl.vao;
+package org.plutoengine.graphics.vao;
 
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.system.MemoryUtil;
 import org.plutoengine.graphics.gl.DrawMode;
-import org.plutoengine.graphics.gl.vao.attrib.AttributeInfo;
+import org.plutoengine.graphics.vao.attrib.AttributeInfo;
-import org.plutoengine.graphics.gl.vbo.ArrayBuffer;
+import org.plutoengine.graphics.vbo.ArrayBuffer;
-import org.plutoengine.graphics.gl.vbo.IndexArrayBuffer;
+import org.plutoengine.graphics.vbo.IndexArrayBuffer;
 
 import java.util.*;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vao/VertexArrayBuilder.java

@@ -1,8 +1,11 @@
-package org.plutoengine.graphics.gl.vao;
+package org.plutoengine.graphics.vao;
 
-import org.plutoengine.graphics.gl.vao.attrib.AttributeInfo;
+import org.plutoengine.graphics.vao.attrib.AttributeInfo;
-import org.plutoengine.graphics.gl.vao.attrib.ReservedAttributes;
+import org.plutoengine.graphics.vao.attrib.ReservedAttributes;
-import org.plutoengine.graphics.gl.vbo.*;
+import org.plutoengine.graphics.vbo.EnumArrayBufferType;
+import org.plutoengine.graphics.vbo.FloatArrayBuffer;
+import org.plutoengine.graphics.vbo.IndexArrayBuffer;
+import org.plutoengine.graphics.vbo.IntArrayBuffer;
 
 import java.nio.Buffer;
 import java.nio.FloatBuffer;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vao/attrib/AttributeInfo.java

@@ -1,7 +1,7 @@
-package org.plutoengine.graphics.gl.vao.attrib;
+package org.plutoengine.graphics.vao.attrib;
 
 import org.intellij.lang.annotations.MagicConstant;
-import org.plutoengine.graphics.gl.vbo.EnumArrayBufferType;
+import org.plutoengine.graphics.vbo.EnumArrayBufferType;
 
 public record AttributeInfo(
     EnumArrayBufferType type,

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vao/attrib/ReservedAttributes.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.vao.attrib;
+package org.plutoengine.graphics.vao.attrib;
 
 public class ReservedAttributes
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vbo/ArrayBuffer.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.vbo;
+package org.plutoengine.graphics.vbo;
 
 import org.lwjgl.opengl.GL33;
 

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vbo/EnumArrayBufferType.java

@@ -1,8 +1,8 @@
-package org.plutoengine.graphics.gl.vbo;
+package org.plutoengine.graphics.vbo;
 
 import org.lwjgl.opengl.GL33;
 
-import org.plutoengine.gl.IOpenGLEnum;
+import org.plutoengine.graphics.gl.IOpenGLEnum;
 
 public enum EnumArrayBufferType implements IOpenGLEnum
 {

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vbo/FloatArrayBuffer.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.vbo;
+package org.plutoengine.graphics.vbo;
 
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.system.MemoryUtil;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vbo/IndexArrayBuffer.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.vbo;
+package org.plutoengine.graphics.vbo;
 
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.system.MemoryUtil;

engine-core/plutorender/src/main/java/org/plutoengine/graphics/vbo/IntArrayBuffer.java

@@ -1,4 +1,4 @@
-package org.plutoengine.graphics.gl.vbo;
+package org.plutoengine.graphics.vbo;
 
 import org.lwjgl.opengl.GL33;
 import org.lwjgl.system.MemoryUtil;

engine-core/plutoshader/build.gradle.kts

@@ -1,11 +0,0 @@
-plugins {
-	java
-	`java-library`
-}
-
-description = "Automated shader loader and manager."
-
-dependencies {
-	api(project(":plutoengine:plutotexture"))
-	api(project(":plutoengine:plutomesher"))
-}

engine-core/plutospritesheet/build.gradle.kts

@@ -6,6 +6,5 @@ plugins {
 description = "A library to manage, store and draw sprites."
 
 dependencies {
-	api(project(":plutoengine:plutoframebuffer"))
+	api(project(":plutoengine:plutorender"))
-	api(project(":plutoengine:plutoshader"))
 }

engine-core/plutospritesheet/src/main/java/org/plutoengine/graphics/IRectangleShader2D.java

@@ -5,7 +5,7 @@ import org.joml.Matrix4fc;
 import org.joml.Vector2fc;
 import org.joml.Vector4fc;
 
-import org.plutoengine.shader.IShaderProgram;
+import org.plutoengine.graphics.shader.IShaderProgram;
 
 public interface IRectangleShader2D extends IShaderProgram
 {

engine-core/plutospritesheet/src/main/java/org/plutoengine/graphics/IShader2D.java

@@ -5,7 +5,7 @@ import org.joml.Matrix4fc;
 import org.joml.Vector2fc;
 import org.joml.Vector4fc;
 
-import org.plutoengine.shader.IShaderProgram;
+import org.plutoengine.graphics.shader.IShaderProgram;
 
 public interface IShader2D extends IShaderProgram
 {

engine-core/plutospritesheet/src/main/java/org/plutoengine/graphics/PlutoSpriteSheetMod.java

@@ -1,17 +1,15 @@
 package org.plutoengine.graphics;
 
-import org.plutoengine.ModLWJGL;
 import org.plutoengine.Pluto;
+import org.plutoengine.graphics.shader.RenderShaderBuilder;
 import org.plutoengine.graphics.spritesheet.FramebufferTiledSpriteSheet;
 import org.plutoengine.mod.IModEntryPoint;
 import org.plutoengine.mod.Mod;
 import org.plutoengine.mod.ModEntry;
-import org.plutoengine.shader.PlutoShaderMod;
-import org.plutoengine.shader.RenderShaderBuilder;
 
 @ModEntry(modID = PlutoSpriteSheetMod.MOD_ID,
         version = Pluto.VERSION,
-        dependencies = { ModLWJGL.class, PlutoShaderMod.class })
+        dependencies = { PlutoRendererMod.class })
 public class PlutoSpriteSheetMod implements IModEntryPoint
 {
     public static final String MOD_ID = "tefek.plutospritesheet";

engine-core/plutospritesheet/src/main/java/org/plutoengine/graphics/RectangleRenderer2D.java

@@ -5,8 +5,8 @@ import org.joml.Matrix3x2fc;
 import org.joml.Vector4f;
 import org.lwjgl.opengl.GL33;
 import org.plutoengine.graphics.gl.DrawMode;
-import org.plutoengine.graphics.gl.vao.QuadPresets;
+import org.plutoengine.graphics.vao.QuadPresets;
-import org.plutoengine.graphics.gl.vao.VertexArray;
+import org.plutoengine.graphics.vao.VertexArray;
 import org.plutoengine.graphics.sprite.Sprite;
 import org.plutoengine.graphics.texture.texture2d.RectangleTexture;
 import org.plutoengine.util.color.IRGBA;

engine-core/plutospritesheet/src/main/java/org/plutoengine/graphics/Renderer2D.java

@@ -5,8 +5,8 @@ import org.joml.Matrix3x2fc;
 import org.joml.Vector4f;
 import org.lwjgl.opengl.GL33;
 import org.plutoengine.graphics.gl.DrawMode;
-import org.plutoengine.graphics.gl.vao.QuadPresets;
+import org.plutoengine.graphics.vao.QuadPresets;
-import org.plutoengine.graphics.gl.vao.VertexArray;
+import org.plutoengine.graphics.vao.VertexArray;
 import org.plutoengine.graphics.texture.texture2d.Texture2D;
 import org.plutoengine.util.color.IRGBA;
 

engine-core/plutospritesheet/src/main/java/org/plutoengine/graphics/Shader2D.java

@@ -3,16 +3,16 @@ package org.plutoengine.graphics;
 import org.joml.Matrix3x2fc;
 import org.joml.Matrix4fc;
 
-import org.plutoengine.graphics.gl.vao.attrib.ReservedAttributes;
+import org.plutoengine.graphics.vao.attrib.ReservedAttributes;
-import org.plutoengine.shader.ShaderBase;
+import org.plutoengine.graphics.shader.ShaderBase;
-import org.plutoengine.shader.ShaderProgram;
+import org.plutoengine.graphics.shader.ShaderProgram;
-import org.plutoengine.shader.VertexArrayAttribute;
+import org.plutoengine.graphics.shader.VertexArrayAttribute;
-import org.plutoengine.shader.uniform.Uniform;
+import org.plutoengine.graphics.shader.uniform.Uniform;
-import org.plutoengine.shader.uniform.UniformMat3x2;
+import org.plutoengine.graphics.shader.uniform.UniformMat3x2;
-import org.plutoengine.shader.uniform.UniformMat4;
+import org.plutoengine.graphics.shader.uniform.UniformMat4;
-import org.plutoengine.shader.uniform.UniformVec2;
+import org.plutoengine.graphics.shader.uniform.UniformVec2;
-import org.plutoengine.shader.uniform.UniformVec4;
+import org.plutoengine.graphics.shader.uniform.UniformVec4;
-import org.plutoengine.shader.uniform.auto.AutoViewportProjection;
+import org.plutoengine.graphics.shader.uniform.auto.AutoViewportProjection;
 
 /**
  * @author 493msi

engine-core/plutospritesheet/src/main/java/org/plutoengine/graphics/ShaderRectangle2D.java

@@ -3,16 +3,16 @@ package org.plutoengine.graphics;
 import org.joml.Matrix3x2fc;
 import org.joml.Matrix4fc;
 
-import org.plutoengine.graphics.gl.vao.attrib.ReservedAttributes;
+import org.plutoengine.graphics.vao.attrib.ReservedAttributes;
-import org.plutoengine.shader.ShaderBase;
+import org.plutoengine.graphics.shader.ShaderBase;
-import org.plutoengine.shader.ShaderProgram;
+import org.plutoengine.graphics.shader.ShaderProgram;
-import org.plutoengine.shader.VertexArrayAttribute;
+import org.plutoengine.graphics.shader.VertexArrayAttribute;
-import org.plutoengine.shader.uniform.Uniform;
+import org.plutoengine.graphics.shader.uniform.Uniform;
-import org.plutoengine.shader.uniform.UniformMat3x2;
+import org.plutoengine.graphics.shader.uniform.UniformMat3x2;
-import org.plutoengine.shader.uniform.UniformMat4;
+import org.plutoengine.graphics.shader.uniform.UniformMat4;
-import org.plutoengine.shader.uniform.UniformVec2;
+import org.plutoengine.graphics.shader.uniform.UniformVec2;
-import org.plutoengine.shader.uniform.UniformVec4;
+import org.plutoengine.graphics.shader.uniform.UniformVec4;
-import org.plutoengine.shader.uniform.auto.AutoViewportProjection;
+import org.plutoengine.graphics.shader.uniform.auto.AutoViewportProjection;
 
 /**
  * @author 493msi

engine-core/plutospritesheet/src/main/java/org/plutoengine/graphics/spritesheet/FramebufferTiledSpriteSheet.java

@@ -5,8 +5,8 @@ import org.lwjgl.opengl.GL33;
 
 import org.plutoengine.graphics.IRectangleShader2D;
 import org.plutoengine.graphics.RectangleRenderer2D;
-import org.plutoengine.graphics.gl.fbo.Framebuffer;
+import org.plutoengine.graphics.fbo.Framebuffer;
-import org.plutoengine.graphics.gl.fbo.FramebufferTexture;
+import org.plutoengine.graphics.fbo.FramebufferTexture;
 import org.plutoengine.graphics.sprite.Sprite;
 import org.plutoengine.graphics.sprite.TileSprite;
 import org.plutoengine.graphics.texture.MagFilter;

engine-core/plutotexture/build.gradle.kts

@@ -1,10 +0,0 @@
-plugins {
-	java
-	`java-library`
-}
-
-description = ""
-
-dependencies {
-	api(project(":plutoengine:plutodisplay"))
-}

engine-demo/basic-application/mods/tefek.plutogui/info.json

@@ -1,6 +1,6 @@
 {
-  "displayName": "Pluto Engine GUI Renderer",
+  "displayName": "PlutoGUI",
-  "description": "",
+  "description": "PlutoEngine's GUI Renderer.",
   "author": "Tefek",
   "resourceRoots": {
     "default": {

engine-demo/basic-application/mods/tefek.plutorender/info.json

@@ -0,0 +1,7 @@
+{
+  "displayName": "PlutoRender",
+  "description": "OpenGL-based renderer for PlutoEngine.",
+  "author": "Tefek",
+  "resourceRoots": {
+  }
+}

engine-demo/basic-application/mods/tefek.plutoshader/info.json

@@ -1,7 +0,0 @@
-{
-  "displayName": "Pluto Shader",
-  "description": "PlutoEngine's shader manager.",
-  "author": "Tefek",
-  "resourceRoots": {
-  }
-}

engine-demo/basic-application/mods/tefek.plutospritesheet/info.json

@@ -1,5 +1,5 @@
 {
-  "displayName": "Pluto SpriteSheet",
+  "displayName": "PlutoSpriteSheet",
   "description": "A library to manage, store and draw sprites.",
   "author": "Tefek",
   "resourceRoots": {

engine-demo/basic-application/src/main/java/org/plutoengine/demo/Main.java

@@ -18,8 +18,8 @@ import org.plutoengine.libra.paint.LiPaint;
 import org.plutoengine.libra.text.shaping.TextStyleOptions;
 import org.plutoengine.math.ProjectionMatrix;
 import org.plutoengine.mod.ModLoader;
-import org.plutoengine.shader.RenderShaderBuilder;
+import org.plutoengine.graphics.shader.RenderShaderBuilder;
-import org.plutoengine.shader.uniform.auto.AutomaticUniforms;
+import org.plutoengine.graphics.shader.uniform.auto.AutomaticUniforms;
 import org.plutoengine.util.color.Color;
 import org.plutoengine.util.color.EnumColorFormat;
 import org.plutoengine.util.color.HSB;

engine-demo/jsr-clone/build.gradle.kts

@@ -8,7 +8,7 @@ application {
 
 launch4j {
     mainClassName = "cz.tefek.srclone.Main"
-    bundledJrePath = "jre"
+    bundledJrePath = "jre-windows"
 }
 
 java {

engine-demo/jsr-clone/mods/tefek.plutogui/info.json

@@ -1,6 +1,6 @@
 {
-  "displayName": "Pluto Engine GUI Renderer",
+  "displayName": "PlutoGUI",
-  "description": "",
+  "description": "PlutoEngine's GUI Renderer.",
   "author": "Tefek",
   "resourceRoots": {
     "default": {

engine-demo/jsr-clone/mods/tefek.plutorender/info.json

@@ -0,0 +1,7 @@
+{
+  "displayName": "PlutoRender",
+  "description": "OpenGL-based renderer for PlutoEngine.",
+  "author": "Tefek",
+  "resourceRoots": {
+  }
+}

engine-demo/jsr-clone/mods/tefek.plutoshader/info.json

@@ -1,7 +0,0 @@
-{
-  "displayName": "Pluto Shader",
-  "description": "PlutoEngine's shader manager.",
-  "author": "Tefek",
-  "resourceRoots": {
-  }
-}