From 8cc32b49f26e42f5873063746e145f4a182381c0 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Thu, 30 Mar 2023 12:59:09 -0700 Subject: [PATCH] Reorganization I - Package `backend.gl` -> `gl` - Package `core.source` -> `glsl` --- .../flywheel/api/context/Context.java | 2 +- .../flywheel/api/pipeline/Pipeline.java | 4 ++-- .../com/jozufozu/flywheel/backend/Loader.java | 4 ++-- .../backend/gl/buffer/package-info.java | 6 ------ .../backend/gl/shader/package-info.java | 6 ------ .../instancing/compile/Compilation.java | 10 +++++----- .../instancing/compile/CompilationResult.java | 2 +- .../instancing/compile/CompileUtil.java | 6 +++--- .../instancing/compile/FailedCompilation.java | 8 ++++---- .../instancing/compile/FlwCompiler.java | 14 ++++++------- .../compile/MaterialAdapterComponent.java | 12 +++++------ .../instancing/compile/ShaderCompiler.java | 6 +++--- .../instancing/compile/UniformComponent.java | 6 +++--- .../indirect/IndirectComponent.java | 12 +++++------ .../indirect/IndirectCullingGroup.java | 2 +- .../instancing/indirect/IndirectEngine.java | 4 ++-- .../instancing/instancing/DrawCall.java | 4 ++-- .../instancing/instancing/ElementBuffer.java | 2 +- .../instancing/instancing/GPUInstancer.java | 10 +++++----- .../instancing/InstancedArraysComponent.java | 8 ++++---- .../instancing/InstancedMeshPool.java | 10 +++++----- .../instancing/InstancingEngine.java | 4 ++-- .../jozufozu/flywheel/core/BackendTypes.java | 2 +- .../flywheel/core/FullscreenQuad.java | 10 +++++----- .../com/jozufozu/flywheel/core/Materials.java | 2 +- .../com/jozufozu/flywheel/core/Pipelines.java | 2 +- .../jozufozu/flywheel/core/QuadConverter.java | 6 +++--- .../flywheel/core/context/SimpleContext.java | 2 +- .../flywheel/core/layout/BufferLayout.java | 2 +- .../flywheel/core/layout/CommonItems.java | 6 +++--- .../flywheel/core/layout/InputType.java | 4 ++-- .../flywheel/core/layout/LayoutItem.java | 4 ++-- .../flywheel/core/layout/MatInput.java | 8 ++++---- .../flywheel/core/layout/VecInput.java | 4 ++-- .../core/pipeline/SimplePipeline.java | 2 +- .../core/source/generate/package-info.java | 6 ------ .../flywheel/core/uniform/UniformBuffer.java | 4 ++-- .../{backend => }/gl/GLSLVersion.java | 2 +- .../flywheel/{backend => }/gl/GlFence.java | 2 +- .../{backend => }/gl/GlNumericType.java | 2 +- .../flywheel/{backend => }/gl/GlObject.java | 2 +- .../{backend => }/gl/GlPrimitive.java | 2 +- .../{backend => }/gl/GlStateTracker.java | 4 ++-- .../flywheel/{backend => }/gl/GlTexture.java | 2 +- .../{backend => }/gl/GlTextureUnit.java | 2 +- .../{backend => }/gl/array/GlVertexArray.java | 12 +++++------ .../gl/array/VertexAttribute.java | 2 +- .../gl/array/VertexAttributeF.java | 4 ++-- .../gl/array/VertexAttributeI.java | 4 ++-- .../{backend => }/gl/buffer/GlBuffer.java | 8 ++++---- .../{backend => }/gl/buffer/GlBufferType.java | 4 ++-- .../gl/buffer/GlBufferUsage.java | 2 +- .../{backend => }/gl/buffer/MappedBuffer.java | 2 +- .../gl/buffer/MappedBufferUsage.java | 2 +- .../gl => gl/buffer}/package-info.java | 2 +- .../{backend => }/gl/error/GlError.java | 2 +- .../{backend => }/gl/error/GlException.java | 2 +- .../{core/source => gl}/package-info.java | 2 +- .../{backend => }/gl/shader/GlProgram.java | 4 ++-- .../{backend => }/gl/shader/GlShader.java | 4 ++-- .../{backend => }/gl/shader/ShaderType.java | 2 +- .../span => gl/shader}/package-info.java | 2 +- .../gl/versioned/BufferStorage.java | 4 ++-- .../{backend => }/gl/versioned/GlCompat.java | 2 +- .../gl/versioned/GlVersioned.java | 2 +- .../gl/versioned/InstancedArrays.java | 2 +- .../flywheel/{core/source => glsl}/Index.java | 6 +++--- .../ShaderLoadingException.java | 2 +- .../{core/source => glsl}/ShaderSources.java | 4 ++-- .../{core/source => glsl}/SourceChecks.java | 8 ++++---- .../{core/source => glsl}/SourceFile.java | 16 +++++++-------- .../{core/source => glsl}/SourceLines.java | 4 ++-- .../source => glsl}/error/ErrorBuilder.java | 20 +++++++++---------- .../source => glsl}/error/ErrorLevel.java | 2 +- .../source => glsl}/error/ErrorReporter.java | 8 ++++---- .../source => glsl}/error/lines/Divider.java | 2 +- .../error/lines/ErrorLine.java | 2 +- .../source => glsl}/error/lines/FileLine.java | 2 +- .../error/lines/HeaderLine.java | 2 +- .../error/lines/SourceLine.java | 2 +- .../error/lines/SpanHighlightLine.java | 2 +- .../source => glsl}/error/lines/TextLine.java | 2 +- .../source => glsl}/error/package-info.java | 2 +- .../source => glsl}/generate/FnSignature.java | 2 +- .../source => glsl}/generate/GlslBlock.java | 2 +- .../source => glsl}/generate/GlslBuilder.java | 2 +- .../source => glsl}/generate/GlslExpr.java | 2 +- .../source => glsl}/generate/GlslFn.java | 2 +- .../source => glsl}/generate/GlslStmt.java | 2 +- .../source => glsl}/generate/GlslStruct.java | 2 +- .../source => glsl}/generate/GlslSwitch.java | 2 +- .../generate/GlslUniformBlock.java | 2 +- .../generate/GlslVertexInput.java | 2 +- .../flywheel/glsl/generate/package-info.java | 6 ++++++ .../jozufozu/flywheel/glsl/package-info.java | 6 ++++++ .../{core/source => glsl}/parse/Import.java | 4 ++-- .../source => glsl}/parse/ShaderField.java | 4 ++-- .../source => glsl}/parse/ShaderFunction.java | 4 ++-- .../source => glsl}/parse/ShaderStruct.java | 4 ++-- .../source => glsl}/parse/ShaderVariable.java | 4 ++-- .../source => glsl}/parse/StructField.java | 4 ++-- .../source => glsl}/parse/package-info.java | 2 +- .../{core/source => glsl}/span/CharPos.java | 2 +- .../{core/source => glsl}/span/ErrorSpan.java | 4 ++-- .../{core/source => glsl}/span/Span.java | 8 ++++---- .../source => glsl}/span/StringSpan.java | 4 ++-- .../flywheel/glsl/span/package-info.java | 6 ++++++ .../flywheel/light/GPULightVolume.java | 4 ++-- .../flywheel/mixin/GlStateManagerMixin.java | 4 ++-- 109 files changed, 235 insertions(+), 235 deletions(-) delete mode 100644 src/main/java/com/jozufozu/flywheel/backend/gl/buffer/package-info.java delete mode 100644 src/main/java/com/jozufozu/flywheel/backend/gl/shader/package-info.java delete mode 100644 src/main/java/com/jozufozu/flywheel/core/source/generate/package-info.java rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/GLSLVersion.java (91%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/GlFence.java (97%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/GlNumericType.java (97%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/GlObject.java (95%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/GlPrimitive.java (91%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/GlStateTracker.java (93%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/GlTexture.java (93%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/GlTextureUnit.java (95%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/array/GlVertexArray.java (90%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/array/VertexAttribute.java (92%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/array/VertexAttributeF.java (88%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/array/VertexAttributeI.java (87%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/buffer/GlBuffer.java (93%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/buffer/GlBufferType.java (96%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/buffer/GlBufferUsage.java (93%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/buffer/MappedBuffer.java (96%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/buffer/MappedBufferUsage.java (83%) rename src/main/java/com/jozufozu/flywheel/{backend/gl => gl/buffer}/package-info.java (80%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/error/GlError.java (96%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/error/GlException.java (87%) rename src/main/java/com/jozufozu/flywheel/{core/source => gl}/package-info.java (79%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/shader/GlProgram.java (93%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/shader/GlShader.java (82%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/shader/ShaderType.java (93%) rename src/main/java/com/jozufozu/flywheel/{core/source/span => gl/shader}/package-info.java (78%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/versioned/BufferStorage.java (89%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/versioned/GlCompat.java (98%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/versioned/GlVersioned.java (90%) rename src/main/java/com/jozufozu/flywheel/{backend => }/gl/versioned/InstancedArrays.java (94%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/Index.java (86%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/ShaderLoadingException.java (84%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/ShaderSources.java (95%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/SourceChecks.java (91%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/SourceFile.java (94%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/SourceLines.java (96%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/ErrorBuilder.java (84%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/ErrorLevel.java (88%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/ErrorReporter.java (93%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/lines/Divider.java (76%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/lines/ErrorLine.java (84%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/lines/FileLine.java (81%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/lines/HeaderLine.java (79%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/lines/SourceLine.java (85%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/lines/SpanHighlightLine.java (89%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/lines/TextLine.java (67%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/error/package-info.java (77%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/FnSignature.java (97%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslBlock.java (92%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslBuilder.java (97%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslExpr.java (98%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslFn.java (91%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslStmt.java (91%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslStruct.java (93%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslSwitch.java (96%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslUniformBlock.java (96%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/generate/GlslVertexInput.java (90%) create mode 100644 src/main/java/com/jozufozu/flywheel/glsl/generate/package-info.java create mode 100644 src/main/java/com/jozufozu/flywheel/glsl/package-info.java rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/parse/Import.java (74%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/parse/ShaderField.java (89%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/parse/ShaderFunction.java (95%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/parse/ShaderStruct.java (94%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/parse/ShaderVariable.java (88%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/parse/StructField.java (82%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/parse/package-info.java (77%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/span/CharPos.java (64%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/span/ErrorSpan.java (85%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/span/Span.java (92%) rename src/main/java/com/jozufozu/flywheel/{core/source => glsl}/span/StringSpan.java (83%) create mode 100644 src/main/java/com/jozufozu/flywheel/glsl/span/package-info.java diff --git a/src/main/java/com/jozufozu/flywheel/api/context/Context.java b/src/main/java/com/jozufozu/flywheel/api/context/Context.java index 0504e7fbf..5be86a3cc 100644 --- a/src/main/java/com/jozufozu/flywheel/api/context/Context.java +++ b/src/main/java/com/jozufozu/flywheel/api/context/Context.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.api.context; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import com.jozufozu.flywheel.gl.shader.GlProgram; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/api/pipeline/Pipeline.java b/src/main/java/com/jozufozu/flywheel/api/pipeline/Pipeline.java index ce4761393..04939a553 100644 --- a/src/main/java/com/jozufozu/flywheel/api/pipeline/Pipeline.java +++ b/src/main/java/com/jozufozu/flywheel/api/pipeline/Pipeline.java @@ -2,9 +2,9 @@ package com.jozufozu.flywheel.api.pipeline; import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.api.vertex.VertexType; -import com.jozufozu.flywheel.backend.gl.GLSLVersion; import com.jozufozu.flywheel.core.SourceComponent; -import com.jozufozu.flywheel.core.source.ShaderSources; +import com.jozufozu.flywheel.gl.GLSLVersion; +import com.jozufozu.flywheel.glsl.ShaderSources; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/backend/Loader.java b/src/main/java/com/jozufozu/flywheel/backend/Loader.java index 07c940c10..756d705bf 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/Loader.java +++ b/src/main/java/com/jozufozu/flywheel/backend/Loader.java @@ -2,8 +2,8 @@ package com.jozufozu.flywheel.backend; import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher; import com.jozufozu.flywheel.backend.instancing.compile.FlwCompiler; -import com.jozufozu.flywheel.core.source.ShaderSources; -import com.jozufozu.flywheel.core.source.error.ErrorReporter; +import com.jozufozu.flywheel.glsl.ShaderSources; +import com.jozufozu.flywheel.glsl.error.ErrorReporter; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/package-info.java b/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/package-info.java deleted file mode 100644 index 42e951282..000000000 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.backend.gl.buffer; - -import javax.annotation.ParametersAreNonnullByDefault; - -import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/package-info.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/package-info.java deleted file mode 100644 index 865330294..000000000 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.backend.gl.shader; - -import javax.annotation.ParametersAreNonnullByDefault; - -import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/Compilation.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/Compilation.java index f8253f8f5..aa8f89a42 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/Compilation.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/Compilation.java @@ -10,12 +10,12 @@ import org.jetbrains.annotations.NotNull; import org.lwjgl.opengl.GL20; import com.jozufozu.flywheel.backend.Backend; -import com.jozufozu.flywheel.backend.gl.GLSLVersion; -import com.jozufozu.flywheel.backend.gl.shader.GlShader; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; -import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; import com.jozufozu.flywheel.core.SourceComponent; -import com.jozufozu.flywheel.core.source.SourceFile; +import com.jozufozu.flywheel.gl.GLSLVersion; +import com.jozufozu.flywheel.gl.shader.GlShader; +import com.jozufozu.flywheel.gl.shader.ShaderType; +import com.jozufozu.flywheel.gl.versioned.GlCompat; +import com.jozufozu.flywheel.glsl.SourceFile; import com.jozufozu.flywheel.util.StringUtil; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompilationResult.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompilationResult.java index a5d352f73..8376af63d 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompilationResult.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompilationResult.java @@ -2,7 +2,7 @@ package com.jozufozu.flywheel.backend.instancing.compile; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.gl.shader.GlShader; +import com.jozufozu.flywheel.gl.shader.GlShader; public sealed interface CompilationResult { @Nullable diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompileUtil.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompileUtil.java index bbf16226c..de2ec5278 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompileUtil.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompileUtil.java @@ -14,9 +14,9 @@ import java.util.stream.Stream; import org.jetbrains.annotations.NotNull; import com.jozufozu.flywheel.backend.Backend; -import com.jozufozu.flywheel.backend.gl.GLSLVersion; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; -import com.jozufozu.flywheel.core.source.SourceFile; +import com.jozufozu.flywheel.gl.GLSLVersion; +import com.jozufozu.flywheel.gl.shader.ShaderType; +import com.jozufozu.flywheel.glsl.SourceFile; public class CompileUtil { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FailedCompilation.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FailedCompilation.java index fc44515bb..e265ca1b0 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FailedCompilation.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FailedCompilation.java @@ -8,10 +8,10 @@ import java.util.stream.Stream; import org.jetbrains.annotations.NotNull; -import com.jozufozu.flywheel.core.source.SourceFile; -import com.jozufozu.flywheel.core.source.SourceLines; -import com.jozufozu.flywheel.core.source.error.ErrorBuilder; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.SourceFile; +import com.jozufozu.flywheel.glsl.SourceLines; +import com.jozufozu.flywheel.glsl.error.ErrorBuilder; +import com.jozufozu.flywheel.glsl.span.Span; import com.jozufozu.flywheel.util.ConsoleColors; import com.jozufozu.flywheel.util.StringUtil; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FlwCompiler.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FlwCompiler.java index 42635d642..4f6e4e0f8 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FlwCompiler.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FlwCompiler.java @@ -17,19 +17,19 @@ import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.api.uniform.ShaderUniforms; import com.jozufozu.flywheel.api.vertex.VertexType; import com.jozufozu.flywheel.backend.Backend; -import com.jozufozu.flywheel.backend.gl.GLSLVersion; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; import com.jozufozu.flywheel.backend.instancing.indirect.IndirectComponent; import com.jozufozu.flywheel.core.ComponentRegistry; import com.jozufozu.flywheel.core.Pipelines; import com.jozufozu.flywheel.core.SourceComponent; import com.jozufozu.flywheel.core.context.SimpleContext; import com.jozufozu.flywheel.core.pipeline.SimplePipeline; -import com.jozufozu.flywheel.core.source.ShaderLoadingException; -import com.jozufozu.flywheel.core.source.ShaderSources; -import com.jozufozu.flywheel.core.source.generate.FnSignature; -import com.jozufozu.flywheel.core.source.generate.GlslExpr; +import com.jozufozu.flywheel.gl.GLSLVersion; +import com.jozufozu.flywheel.gl.shader.GlProgram; +import com.jozufozu.flywheel.gl.shader.ShaderType; +import com.jozufozu.flywheel.glsl.ShaderLoadingException; +import com.jozufozu.flywheel.glsl.ShaderSources; +import com.jozufozu.flywheel.glsl.generate.FnSignature; +import com.jozufozu.flywheel.glsl.generate.GlslExpr; import com.jozufozu.flywheel.util.StringUtil; public class FlwCompiler { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/MaterialAdapterComponent.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/MaterialAdapterComponent.java index f3e575982..3aa388337 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/MaterialAdapterComponent.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/MaterialAdapterComponent.java @@ -12,12 +12,12 @@ import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableList; import com.jozufozu.flywheel.core.SourceComponent; -import com.jozufozu.flywheel.core.source.ShaderSources; -import com.jozufozu.flywheel.core.source.generate.FnSignature; -import com.jozufozu.flywheel.core.source.generate.GlslBlock; -import com.jozufozu.flywheel.core.source.generate.GlslBuilder; -import com.jozufozu.flywheel.core.source.generate.GlslExpr; -import com.jozufozu.flywheel.core.source.generate.GlslSwitch; +import com.jozufozu.flywheel.glsl.ShaderSources; +import com.jozufozu.flywheel.glsl.generate.FnSignature; +import com.jozufozu.flywheel.glsl.generate.GlslBlock; +import com.jozufozu.flywheel.glsl.generate.GlslBuilder; +import com.jozufozu.flywheel.glsl.generate.GlslExpr; +import com.jozufozu.flywheel.glsl.generate.GlslSwitch; import com.jozufozu.flywheel.util.ResourceUtil; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/ShaderCompiler.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/ShaderCompiler.java index ca570b1e9..f35bec3a0 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/ShaderCompiler.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/ShaderCompiler.java @@ -9,10 +9,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.backend.gl.GLSLVersion; -import com.jozufozu.flywheel.backend.gl.shader.GlShader; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; import com.jozufozu.flywheel.core.SourceComponent; +import com.jozufozu.flywheel.gl.GLSLVersion; +import com.jozufozu.flywheel.gl.shader.GlShader; +import com.jozufozu.flywheel.gl.shader.ShaderType; import com.jozufozu.flywheel.util.FlwUtil; public class ShaderCompiler { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/UniformComponent.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/UniformComponent.java index 4c334635d..04de57ebe 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/UniformComponent.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/compile/UniformComponent.java @@ -6,9 +6,9 @@ import java.util.List; import com.google.common.collect.ImmutableList; import com.jozufozu.flywheel.core.SourceComponent; -import com.jozufozu.flywheel.core.source.ShaderSources; -import com.jozufozu.flywheel.core.source.SourceFile; -import com.jozufozu.flywheel.core.source.generate.GlslBuilder; +import com.jozufozu.flywheel.glsl.ShaderSources; +import com.jozufozu.flywheel.glsl.SourceFile; +import com.jozufozu.flywheel.glsl.generate.GlslBuilder; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectComponent.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectComponent.java index a9f9d4606..219542599 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectComponent.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectComponent.java @@ -10,12 +10,12 @@ import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.core.Pipelines; import com.jozufozu.flywheel.core.SourceComponent; import com.jozufozu.flywheel.core.layout.LayoutItem; -import com.jozufozu.flywheel.core.source.ShaderSources; -import com.jozufozu.flywheel.core.source.SourceFile; -import com.jozufozu.flywheel.core.source.generate.FnSignature; -import com.jozufozu.flywheel.core.source.generate.GlslBlock; -import com.jozufozu.flywheel.core.source.generate.GlslBuilder; -import com.jozufozu.flywheel.core.source.generate.GlslExpr; +import com.jozufozu.flywheel.glsl.ShaderSources; +import com.jozufozu.flywheel.glsl.SourceFile; +import com.jozufozu.flywheel.glsl.generate.FnSignature; +import com.jozufozu.flywheel.glsl.generate.GlslBlock; +import com.jozufozu.flywheel.glsl.generate.GlslBuilder; +import com.jozufozu.flywheel.glsl.generate.GlslExpr; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectCullingGroup.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectCullingGroup.java index acfd540ad..56bd82f99 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectCullingGroup.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectCullingGroup.java @@ -15,11 +15,11 @@ import com.jozufozu.flywheel.api.RenderStage; import com.jozufozu.flywheel.api.instancer.InstancedPart; import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.api.vertex.VertexType; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; import com.jozufozu.flywheel.backend.instancing.compile.FlwCompiler; import com.jozufozu.flywheel.core.Components; import com.jozufozu.flywheel.core.Pipelines; import com.jozufozu.flywheel.core.QuadConverter; +import com.jozufozu.flywheel.gl.shader.GlProgram; public class IndirectCullingGroup { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectEngine.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectEngine.java index 5a30d526a..24d26c739 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectEngine.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectEngine.java @@ -10,14 +10,14 @@ import com.jozufozu.flywheel.api.RenderStage; import com.jozufozu.flywheel.api.instancer.InstancedPart; import com.jozufozu.flywheel.api.instancer.Instancer; import com.jozufozu.flywheel.api.struct.StructType; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.GlTextureUnit; import com.jozufozu.flywheel.backend.instancing.Engine; import com.jozufozu.flywheel.backend.instancing.InstanceManager; import com.jozufozu.flywheel.backend.instancing.TaskExecutor; import com.jozufozu.flywheel.core.RenderContext; import com.jozufozu.flywheel.core.context.SimpleContext; import com.jozufozu.flywheel.core.model.Model; +import com.jozufozu.flywheel.gl.GlStateTracker; +import com.jozufozu.flywheel.gl.GlTextureUnit; import com.jozufozu.flywheel.util.FlwUtil; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/DrawCall.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/DrawCall.java index 19362548c..df24fe3b5 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/DrawCall.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/DrawCall.java @@ -2,8 +2,8 @@ package com.jozufozu.flywheel.backend.instancing.instancing; import com.jozufozu.flywheel.api.material.Material; import com.jozufozu.flywheel.api.vertex.VertexType; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.array.GlVertexArray; +import com.jozufozu.flywheel.gl.GlStateTracker; +import com.jozufozu.flywheel.gl.array.GlVertexArray; public class DrawCall { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/ElementBuffer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/ElementBuffer.java index e22ce8c85..d5bbb1f31 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/ElementBuffer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/ElementBuffer.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.backend.instancing.instancing; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; import com.mojang.blaze3d.vertex.VertexFormat; public class ElementBuffer { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java index 520976482..1e4ecea3d 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java @@ -7,13 +7,13 @@ import com.jozufozu.flywheel.Flywheel; import com.jozufozu.flywheel.api.instancer.InstancedPart; import com.jozufozu.flywheel.api.struct.StructType; import com.jozufozu.flywheel.api.struct.StructWriter; -import com.jozufozu.flywheel.backend.gl.array.GlVertexArray; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferUsage; -import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer; import com.jozufozu.flywheel.backend.instancing.AbstractInstancer; import com.jozufozu.flywheel.core.layout.BufferLayout; +import com.jozufozu.flywheel.gl.array.GlVertexArray; +import com.jozufozu.flywheel.gl.buffer.GlBuffer; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.buffer.GlBufferUsage; +import com.jozufozu.flywheel.gl.buffer.MappedBuffer; public class GPUInstancer extends AbstractInstancer { diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedArraysComponent.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedArraysComponent.java index f894d7c63..518ff101c 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedArraysComponent.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedArraysComponent.java @@ -8,10 +8,10 @@ import com.jozufozu.flywheel.Flywheel; import com.jozufozu.flywheel.api.pipeline.Pipeline; import com.jozufozu.flywheel.core.SourceComponent; import com.jozufozu.flywheel.core.layout.LayoutItem; -import com.jozufozu.flywheel.core.source.generate.FnSignature; -import com.jozufozu.flywheel.core.source.generate.GlslBlock; -import com.jozufozu.flywheel.core.source.generate.GlslBuilder; -import com.jozufozu.flywheel.core.source.generate.GlslExpr; +import com.jozufozu.flywheel.glsl.generate.FnSignature; +import com.jozufozu.flywheel.glsl.generate.GlslBlock; +import com.jozufozu.flywheel.glsl.generate.GlslBuilder; +import com.jozufozu.flywheel.glsl.generate.GlslExpr; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMeshPool.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMeshPool.java index 0dcc8eccc..71ecad955 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMeshPool.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMeshPool.java @@ -12,12 +12,12 @@ import org.lwjgl.opengl.GL32; import com.jozufozu.flywheel.Flywheel; import com.jozufozu.flywheel.api.vertex.VertexType; -import com.jozufozu.flywheel.backend.gl.GlPrimitive; -import com.jozufozu.flywheel.backend.gl.array.GlVertexArray; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer; import com.jozufozu.flywheel.core.model.Mesh; +import com.jozufozu.flywheel.gl.GlPrimitive; +import com.jozufozu.flywheel.gl.array.GlVertexArray; +import com.jozufozu.flywheel.gl.buffer.GlBuffer; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.buffer.MappedBuffer; public class InstancedMeshPool { private final VertexType vertexType; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java index 267b64343..09ebd637b 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java @@ -10,8 +10,6 @@ import com.jozufozu.flywheel.api.RenderStage; import com.jozufozu.flywheel.api.instancer.InstancedPart; import com.jozufozu.flywheel.api.instancer.Instancer; import com.jozufozu.flywheel.api.struct.StructType; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.GlTextureUnit; import com.jozufozu.flywheel.backend.instancing.Engine; import com.jozufozu.flywheel.backend.instancing.InstanceManager; import com.jozufozu.flywheel.backend.instancing.TaskExecutor; @@ -21,6 +19,8 @@ import com.jozufozu.flywheel.core.Pipelines; import com.jozufozu.flywheel.core.RenderContext; import com.jozufozu.flywheel.core.context.SimpleContext; import com.jozufozu.flywheel.core.model.Model; +import com.jozufozu.flywheel.gl.GlStateTracker; +import com.jozufozu.flywheel.gl.GlTextureUnit; import com.jozufozu.flywheel.util.FlwUtil; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/jozufozu/flywheel/core/BackendTypes.java b/src/main/java/com/jozufozu/flywheel/core/BackendTypes.java index 22aa862c8..a071a95f3 100644 --- a/src/main/java/com/jozufozu/flywheel/core/BackendTypes.java +++ b/src/main/java/com/jozufozu/flywheel/core/BackendTypes.java @@ -12,11 +12,11 @@ import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.backend.BackendType; import com.jozufozu.flywheel.backend.ShadersModHandler; import com.jozufozu.flywheel.backend.SimpleBackendType; -import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; import com.jozufozu.flywheel.backend.instancing.batching.BatchingEngine; import com.jozufozu.flywheel.backend.instancing.indirect.IndirectEngine; import com.jozufozu.flywheel.backend.instancing.instancing.InstancingEngine; import com.jozufozu.flywheel.core.pipeline.SimplePipeline; +import com.jozufozu.flywheel.gl.versioned.GlCompat; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.TextComponent; diff --git a/src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java b/src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java index bcbfe95a2..8d58b7a30 100644 --- a/src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java +++ b/src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java @@ -6,13 +6,13 @@ import static org.lwjgl.opengl.GL11.glDrawArrays; import org.lwjgl.system.MemoryUtil; import com.jozufozu.flywheel.Flywheel; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.array.GlVertexArray; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer; import com.jozufozu.flywheel.core.layout.BufferLayout; import com.jozufozu.flywheel.core.layout.CommonItems; +import com.jozufozu.flywheel.gl.GlStateTracker; +import com.jozufozu.flywheel.gl.array.GlVertexArray; +import com.jozufozu.flywheel.gl.buffer.GlBuffer; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.buffer.MappedBuffer; import com.jozufozu.flywheel.util.Lazy; public class FullscreenQuad { diff --git a/src/main/java/com/jozufozu/flywheel/core/Materials.java b/src/main/java/com/jozufozu/flywheel/core/Materials.java index 01cc3ad28..f9ad53c9e 100644 --- a/src/main/java/com/jozufozu/flywheel/core/Materials.java +++ b/src/main/java/com/jozufozu/flywheel/core/Materials.java @@ -2,9 +2,9 @@ package com.jozufozu.flywheel.core; import com.jozufozu.flywheel.api.material.Material; import com.jozufozu.flywheel.backend.ShadersModHandler; -import com.jozufozu.flywheel.backend.gl.GlTextureUnit; import com.jozufozu.flywheel.core.material.SimpleMaterial; import com.jozufozu.flywheel.core.material.SimpleMaterial.GlStateShard; +import com.jozufozu.flywheel.gl.GlTextureUnit; import com.jozufozu.flywheel.util.DiffuseLightCalculator; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/jozufozu/flywheel/core/Pipelines.java b/src/main/java/com/jozufozu/flywheel/core/Pipelines.java index c26f98c6a..7794dd0b1 100644 --- a/src/main/java/com/jozufozu/flywheel/core/Pipelines.java +++ b/src/main/java/com/jozufozu/flywheel/core/Pipelines.java @@ -1,10 +1,10 @@ package com.jozufozu.flywheel.core; import com.jozufozu.flywheel.Flywheel; -import com.jozufozu.flywheel.backend.gl.GLSLVersion; import com.jozufozu.flywheel.backend.instancing.indirect.IndirectComponent; import com.jozufozu.flywheel.backend.instancing.instancing.InstancedArraysComponent; import com.jozufozu.flywheel.core.pipeline.SimplePipeline; +import com.jozufozu.flywheel.gl.GLSLVersion; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java b/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java index fe3b1a98a..ce79162c3 100644 --- a/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java +++ b/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java @@ -6,11 +6,11 @@ import org.lwjgl.opengl.GL32; import org.lwjgl.opengl.GL32C; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.backend.gl.GlNumericType; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferUsage; import com.jozufozu.flywheel.backend.instancing.instancing.ElementBuffer; import com.jozufozu.flywheel.event.ReloadRenderersEvent; +import com.jozufozu.flywheel.gl.GlNumericType; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.buffer.GlBufferUsage; import com.mojang.blaze3d.vertex.VertexFormat; import it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap; diff --git a/src/main/java/com/jozufozu/flywheel/core/context/SimpleContext.java b/src/main/java/com/jozufozu/flywheel/core/context/SimpleContext.java index 73ee24389..7dbacedb5 100644 --- a/src/main/java/com/jozufozu/flywheel/core/context/SimpleContext.java +++ b/src/main/java/com/jozufozu/flywheel/core/context/SimpleContext.java @@ -1,7 +1,7 @@ package com.jozufozu.flywheel.core.context; import com.jozufozu.flywheel.api.context.Context; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import com.jozufozu.flywheel.gl.shader.GlProgram; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/core/layout/BufferLayout.java b/src/main/java/com/jozufozu/flywheel/core/layout/BufferLayout.java index 70e6fee9a..9b49eef14 100644 --- a/src/main/java/com/jozufozu/flywheel/core/layout/BufferLayout.java +++ b/src/main/java/com/jozufozu/flywheel/core/layout/BufferLayout.java @@ -4,7 +4,7 @@ import java.util.List; import com.google.common.collect.ImmutableList; import com.jozufozu.flywheel.api.vertex.VertexType; -import com.jozufozu.flywheel.backend.gl.array.VertexAttribute; +import com.jozufozu.flywheel.gl.array.VertexAttribute; /** * Classic Vertex Format struct with a clever name. diff --git a/src/main/java/com/jozufozu/flywheel/core/layout/CommonItems.java b/src/main/java/com/jozufozu/flywheel/core/layout/CommonItems.java index baf3da37a..abb6d8fe7 100644 --- a/src/main/java/com/jozufozu/flywheel/core/layout/CommonItems.java +++ b/src/main/java/com/jozufozu/flywheel/core/layout/CommonItems.java @@ -1,8 +1,8 @@ package com.jozufozu.flywheel.core.layout; -import com.jozufozu.flywheel.backend.gl.GlNumericType; -import com.jozufozu.flywheel.backend.gl.array.VertexAttributeF; -import com.jozufozu.flywheel.backend.gl.array.VertexAttributeI; +import com.jozufozu.flywheel.gl.GlNumericType; +import com.jozufozu.flywheel.gl.array.VertexAttributeF; +import com.jozufozu.flywheel.gl.array.VertexAttributeI; public class CommonItems { diff --git a/src/main/java/com/jozufozu/flywheel/core/layout/InputType.java b/src/main/java/com/jozufozu/flywheel/core/layout/InputType.java index 752c9edb9..6077affcc 100644 --- a/src/main/java/com/jozufozu/flywheel/core/layout/InputType.java +++ b/src/main/java/com/jozufozu/flywheel/core/layout/InputType.java @@ -2,8 +2,8 @@ package com.jozufozu.flywheel.core.layout; import java.util.function.Consumer; -import com.jozufozu.flywheel.backend.gl.array.VertexAttribute; -import com.jozufozu.flywheel.core.source.generate.GlslExpr; +import com.jozufozu.flywheel.gl.array.VertexAttribute; +import com.jozufozu.flywheel.glsl.generate.GlslExpr; public interface InputType { diff --git a/src/main/java/com/jozufozu/flywheel/core/layout/LayoutItem.java b/src/main/java/com/jozufozu/flywheel/core/layout/LayoutItem.java index d94c817e5..bab5fa51f 100644 --- a/src/main/java/com/jozufozu/flywheel/core/layout/LayoutItem.java +++ b/src/main/java/com/jozufozu/flywheel/core/layout/LayoutItem.java @@ -1,7 +1,7 @@ package com.jozufozu.flywheel.core.layout; -import com.jozufozu.flywheel.core.source.generate.GlslExpr; -import com.jozufozu.flywheel.core.source.generate.GlslStruct; +import com.jozufozu.flywheel.glsl.generate.GlslExpr; +import com.jozufozu.flywheel.glsl.generate.GlslStruct; public record LayoutItem(InputType type, String name) { public GlslExpr unpackField(GlslExpr.Variable struct) { diff --git a/src/main/java/com/jozufozu/flywheel/core/layout/MatInput.java b/src/main/java/com/jozufozu/flywheel/core/layout/MatInput.java index f37ef64f9..e6a2f6d38 100644 --- a/src/main/java/com/jozufozu/flywheel/core/layout/MatInput.java +++ b/src/main/java/com/jozufozu/flywheel/core/layout/MatInput.java @@ -2,10 +2,10 @@ package com.jozufozu.flywheel.core.layout; import java.util.function.Consumer; -import com.jozufozu.flywheel.backend.gl.GlNumericType; -import com.jozufozu.flywheel.backend.gl.array.VertexAttribute; -import com.jozufozu.flywheel.backend.gl.array.VertexAttributeF; -import com.jozufozu.flywheel.core.source.generate.GlslExpr; +import com.jozufozu.flywheel.gl.GlNumericType; +import com.jozufozu.flywheel.gl.array.VertexAttribute; +import com.jozufozu.flywheel.gl.array.VertexAttributeF; +import com.jozufozu.flywheel.glsl.generate.GlslExpr; public record MatInput(int rows, int cols, String typeName, String packedTypeName, String unpackingFunction) implements InputType { diff --git a/src/main/java/com/jozufozu/flywheel/core/layout/VecInput.java b/src/main/java/com/jozufozu/flywheel/core/layout/VecInput.java index 195601feb..3970267d3 100644 --- a/src/main/java/com/jozufozu/flywheel/core/layout/VecInput.java +++ b/src/main/java/com/jozufozu/flywheel/core/layout/VecInput.java @@ -3,8 +3,8 @@ package com.jozufozu.flywheel.core.layout; import java.util.function.Consumer; import java.util.function.Function; -import com.jozufozu.flywheel.backend.gl.array.VertexAttribute; -import com.jozufozu.flywheel.core.source.generate.GlslExpr; +import com.jozufozu.flywheel.gl.array.VertexAttribute; +import com.jozufozu.flywheel.glsl.generate.GlslExpr; public class VecInput implements InputType { diff --git a/src/main/java/com/jozufozu/flywheel/core/pipeline/SimplePipeline.java b/src/main/java/com/jozufozu/flywheel/core/pipeline/SimplePipeline.java index 8717a55c2..ba1aaac3c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/pipeline/SimplePipeline.java +++ b/src/main/java/com/jozufozu/flywheel/core/pipeline/SimplePipeline.java @@ -2,8 +2,8 @@ package com.jozufozu.flywheel.core.pipeline; import com.jozufozu.flywheel.api.pipeline.Pipeline; import com.jozufozu.flywheel.api.struct.StructType; -import com.jozufozu.flywheel.backend.gl.GLSLVersion; import com.jozufozu.flywheel.core.SourceComponent; +import com.jozufozu.flywheel.gl.GLSLVersion; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/package-info.java b/src/main/java/com/jozufozu/flywheel/core/source/generate/package-info.java deleted file mode 100644 index 6fa0c353e..000000000 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.core.source.generate; - -import javax.annotation.ParametersAreNonnullByDefault; - -import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/core/uniform/UniformBuffer.java b/src/main/java/com/jozufozu/flywheel/core/uniform/UniformBuffer.java index 348801fe0..40c759e78 100644 --- a/src/main/java/com/jozufozu/flywheel/core/uniform/UniformBuffer.java +++ b/src/main/java/com/jozufozu/flywheel/core/uniform/UniformBuffer.java @@ -7,10 +7,10 @@ import org.lwjgl.opengl.GL32; import com.google.common.collect.ImmutableList; import com.jozufozu.flywheel.api.uniform.ShaderUniforms; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; import com.jozufozu.flywheel.backend.memory.MemoryBlock; import com.jozufozu.flywheel.core.ComponentRegistry; +import com.jozufozu.flywheel.gl.buffer.GlBuffer; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; import com.jozufozu.flywheel.util.FlwUtil; import com.jozufozu.flywheel.util.RenderMath; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GLSLVersion.java b/src/main/java/com/jozufozu/flywheel/gl/GLSLVersion.java similarity index 91% rename from src/main/java/com/jozufozu/flywheel/backend/gl/GLSLVersion.java rename to src/main/java/com/jozufozu/flywheel/gl/GLSLVersion.java index 52ac01c2a..6b1576438 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GLSLVersion.java +++ b/src/main/java/com/jozufozu/flywheel/gl/GLSLVersion.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl; public enum GLSLVersion { V110(110), diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GlFence.java b/src/main/java/com/jozufozu/flywheel/gl/GlFence.java similarity index 97% rename from src/main/java/com/jozufozu/flywheel/backend/gl/GlFence.java rename to src/main/java/com/jozufozu/flywheel/gl/GlFence.java index f2b8c75c0..3d57aa55a 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GlFence.java +++ b/src/main/java/com/jozufozu/flywheel/gl/GlFence.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl; import static org.lwjgl.opengl.GL32.GL_SIGNALED; import static org.lwjgl.opengl.GL32.GL_SYNC_FLUSH_COMMANDS_BIT; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java b/src/main/java/com/jozufozu/flywheel/gl/GlNumericType.java similarity index 97% rename from src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java rename to src/main/java/com/jozufozu/flywheel/gl/GlNumericType.java index e5bdd65c8..0875dc69e 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java +++ b/src/main/java/com/jozufozu/flywheel/gl/GlNumericType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java b/src/main/java/com/jozufozu/flywheel/gl/GlObject.java similarity index 95% rename from src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java rename to src/main/java/com/jozufozu/flywheel/gl/GlObject.java index 9fffe7a88..ba18c18c5 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java +++ b/src/main/java/com/jozufozu/flywheel/gl/GlObject.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl; // Utility class for safely dealing with gl object handles. public abstract class GlObject { diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java b/src/main/java/com/jozufozu/flywheel/gl/GlPrimitive.java similarity index 91% rename from src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java rename to src/main/java/com/jozufozu/flywheel/gl/GlPrimitive.java index 71a8d5353..dad5b843a 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java +++ b/src/main/java/com/jozufozu/flywheel/gl/GlPrimitive.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java b/src/main/java/com/jozufozu/flywheel/gl/GlStateTracker.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java rename to src/main/java/com/jozufozu/flywheel/gl/GlStateTracker.java index fc978eb90..bf9d45e65 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java +++ b/src/main/java/com/jozufozu/flywheel/gl/GlStateTracker.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; import com.mojang.blaze3d.platform.GlStateManager; /** diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java b/src/main/java/com/jozufozu/flywheel/gl/GlTexture.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java rename to src/main/java/com/jozufozu/flywheel/gl/GlTexture.java index bc42e26bd..9b6d6b986 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java +++ b/src/main/java/com/jozufozu/flywheel/gl/GlTexture.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl; import org.lwjgl.opengl.GL20; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java b/src/main/java/com/jozufozu/flywheel/gl/GlTextureUnit.java similarity index 95% rename from src/main/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java rename to src/main/java/com/jozufozu/flywheel/gl/GlTextureUnit.java index c599c3cb4..b3ae91bb9 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java +++ b/src/main/java/com/jozufozu/flywheel/gl/GlTextureUnit.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl; import static org.lwjgl.opengl.GL13.GL_TEXTURE0; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java b/src/main/java/com/jozufozu/flywheel/gl/array/GlVertexArray.java similarity index 90% rename from src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java rename to src/main/java/com/jozufozu/flywheel/gl/array/GlVertexArray.java index a93ae4682..2c24524ea 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java +++ b/src/main/java/com/jozufozu/flywheel/gl/array/GlVertexArray.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.backend.gl.array; +package com.jozufozu.flywheel.gl.array; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL32; -import com.jozufozu.flywheel.backend.gl.GlObject; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; import com.jozufozu.flywheel.core.layout.BufferLayout; +import com.jozufozu.flywheel.gl.GlObject; +import com.jozufozu.flywheel.gl.GlStateTracker; +import com.jozufozu.flywheel.gl.buffer.GlBuffer; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.versioned.GlCompat; import com.mojang.blaze3d.platform.GlStateManager; @SuppressWarnings("MismatchedReadAndWriteOfArray") diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java b/src/main/java/com/jozufozu/flywheel/gl/array/VertexAttribute.java similarity index 92% rename from src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java rename to src/main/java/com/jozufozu/flywheel/gl/array/VertexAttribute.java index d18a568d6..d3a852529 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java +++ b/src/main/java/com/jozufozu/flywheel/gl/array/VertexAttribute.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.array; +package com.jozufozu.flywheel.gl.array; public interface VertexAttribute { int getByteWidth(); diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttributeF.java b/src/main/java/com/jozufozu/flywheel/gl/array/VertexAttributeF.java similarity index 88% rename from src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttributeF.java rename to src/main/java/com/jozufozu/flywheel/gl/array/VertexAttributeF.java index 65cb51b7c..d698136aa 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttributeF.java +++ b/src/main/java/com/jozufozu/flywheel/gl/array/VertexAttributeF.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.backend.gl.array; +package com.jozufozu.flywheel.gl.array; import org.lwjgl.opengl.GL32; import org.lwjgl.opengl.GL45; -import com.jozufozu.flywheel.backend.gl.GlNumericType; +import com.jozufozu.flywheel.gl.GlNumericType; /** * A bindable attribute in a vertex array. diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttributeI.java b/src/main/java/com/jozufozu/flywheel/gl/array/VertexAttributeI.java similarity index 87% rename from src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttributeI.java rename to src/main/java/com/jozufozu/flywheel/gl/array/VertexAttributeI.java index 64934cd3a..318856818 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttributeI.java +++ b/src/main/java/com/jozufozu/flywheel/gl/array/VertexAttributeI.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.backend.gl.array; +package com.jozufozu.flywheel.gl.array; import org.lwjgl.opengl.GL32; import org.lwjgl.opengl.GL45; -import com.jozufozu.flywheel.backend.gl.GlNumericType; +import com.jozufozu.flywheel.gl.GlNumericType; /** * A bindable attribute in a vertex array. diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java b/src/main/java/com/jozufozu/flywheel/gl/buffer/GlBuffer.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java rename to src/main/java/com/jozufozu/flywheel/gl/buffer/GlBuffer.java index ef8eaa6df..ac92303eb 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java +++ b/src/main/java/com/jozufozu/flywheel/gl/buffer/GlBuffer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package com.jozufozu.flywheel.gl.buffer; import static org.lwjgl.opengl.GL15.glBufferData; import static org.lwjgl.opengl.GL15.glDeleteBuffers; @@ -10,11 +10,11 @@ import static org.lwjgl.opengl.GL31.glCopyBufferSubData; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.backend.gl.GlObject; -import com.jozufozu.flywheel.backend.gl.error.GlError; -import com.jozufozu.flywheel.backend.gl.error.GlException; import com.jozufozu.flywheel.backend.memory.FlwMemoryTracker; import com.jozufozu.flywheel.backend.memory.MemoryBlock; +import com.jozufozu.flywheel.gl.GlObject; +import com.jozufozu.flywheel.gl.error.GlError; +import com.jozufozu.flywheel.gl.error.GlException; public class GlBuffer extends GlObject { diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java b/src/main/java/com/jozufozu/flywheel/gl/buffer/GlBufferType.java similarity index 96% rename from src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java rename to src/main/java/com/jozufozu/flywheel/gl/buffer/GlBufferType.java index 9592ef241..f97090f74 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java +++ b/src/main/java/com/jozufozu/flywheel/gl/buffer/GlBufferType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package com.jozufozu.flywheel.gl.buffer; import org.lwjgl.opengl.GL15C; import org.lwjgl.opengl.GL21; @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL40; import org.lwjgl.opengl.GL42; import org.lwjgl.opengl.GL43; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; +import com.jozufozu.flywheel.gl.GlStateTracker; import com.mojang.blaze3d.platform.GlStateManager; public enum GlBufferType { diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java b/src/main/java/com/jozufozu/flywheel/gl/buffer/GlBufferUsage.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java rename to src/main/java/com/jozufozu/flywheel/gl/buffer/GlBufferUsage.java index ef1a716fb..3ee63ef22 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java +++ b/src/main/java/com/jozufozu/flywheel/gl/buffer/GlBufferUsage.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package com.jozufozu.flywheel.gl.buffer; import org.lwjgl.opengl.GL15; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBuffer.java b/src/main/java/com/jozufozu/flywheel/gl/buffer/MappedBuffer.java similarity index 96% rename from src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBuffer.java rename to src/main/java/com/jozufozu/flywheel/gl/buffer/MappedBuffer.java index 4b2da8992..62f88ccd3 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBuffer.java +++ b/src/main/java/com/jozufozu/flywheel/gl/buffer/MappedBuffer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package com.jozufozu.flywheel.gl.buffer; import static org.lwjgl.system.MemoryUtil.NULL; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBufferUsage.java b/src/main/java/com/jozufozu/flywheel/gl/buffer/MappedBufferUsage.java similarity index 83% rename from src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBufferUsage.java rename to src/main/java/com/jozufozu/flywheel/gl/buffer/MappedBufferUsage.java index 30e60a348..b38a83788 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBufferUsage.java +++ b/src/main/java/com/jozufozu/flywheel/gl/buffer/MappedBufferUsage.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package com.jozufozu.flywheel.gl.buffer; import org.lwjgl.opengl.GL15C; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/package-info.java b/src/main/java/com/jozufozu/flywheel/gl/buffer/package-info.java similarity index 80% rename from src/main/java/com/jozufozu/flywheel/backend/gl/package-info.java rename to src/main/java/com/jozufozu/flywheel/gl/buffer/package-info.java index aa181e8fe..fb174795e 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/package-info.java +++ b/src/main/java/com/jozufozu/flywheel/gl/buffer/package-info.java @@ -1,5 +1,5 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.backend.gl; +package com.jozufozu.flywheel.gl.buffer; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/error/GlError.java b/src/main/java/com/jozufozu/flywheel/gl/error/GlError.java similarity index 96% rename from src/main/java/com/jozufozu/flywheel/backend/gl/error/GlError.java rename to src/main/java/com/jozufozu/flywheel/gl/error/GlError.java index a0cdbded8..03e79a1b5 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/error/GlError.java +++ b/src/main/java/com/jozufozu/flywheel/gl/error/GlError.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.error; +package com.jozufozu.flywheel.gl.error; import java.util.function.Supplier; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/error/GlException.java b/src/main/java/com/jozufozu/flywheel/gl/error/GlException.java similarity index 87% rename from src/main/java/com/jozufozu/flywheel/backend/gl/error/GlException.java rename to src/main/java/com/jozufozu/flywheel/gl/error/GlException.java index ac856a5f1..cfa202228 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/error/GlException.java +++ b/src/main/java/com/jozufozu/flywheel/gl/error/GlException.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.error; +package com.jozufozu.flywheel.gl.error; public class GlException extends RuntimeException { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/package-info.java b/src/main/java/com/jozufozu/flywheel/gl/package-info.java similarity index 79% rename from src/main/java/com/jozufozu/flywheel/core/source/package-info.java rename to src/main/java/com/jozufozu/flywheel/gl/package-info.java index 18f315f87..82ecdbdd6 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/package-info.java +++ b/src/main/java/com/jozufozu/flywheel/gl/package-info.java @@ -1,5 +1,5 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.core.source; +package com.jozufozu.flywheel.gl; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java b/src/main/java/com/jozufozu/flywheel/gl/shader/GlProgram.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java rename to src/main/java/com/jozufozu/flywheel/gl/shader/GlProgram.java index 2a8c387d5..7d1a660bb 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java +++ b/src/main/java/com/jozufozu/flywheel/gl/shader/GlProgram.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.backend.gl.shader; +package com.jozufozu.flywheel.gl.shader; import static org.lwjgl.opengl.GL20.glDeleteProgram; import static org.lwjgl.opengl.GL20.glGetUniformLocation; import static org.lwjgl.opengl.GL20.glUniform1i; import com.jozufozu.flywheel.backend.Backend; -import com.jozufozu.flywheel.backend.gl.GlObject; import com.jozufozu.flywheel.core.uniform.UniformBuffer; +import com.jozufozu.flywheel.gl.GlObject; import com.mojang.blaze3d.shaders.ProgramManager; public class GlProgram extends GlObject { diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java b/src/main/java/com/jozufozu/flywheel/gl/shader/GlShader.java similarity index 82% rename from src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java rename to src/main/java/com/jozufozu/flywheel/gl/shader/GlShader.java index a637b8298..717f0ed53 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java +++ b/src/main/java/com/jozufozu/flywheel/gl/shader/GlShader.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.gl.shader; +package com.jozufozu.flywheel.gl.shader; import org.lwjgl.opengl.GL20; -import com.jozufozu.flywheel.backend.gl.GlObject; +import com.jozufozu.flywheel.gl.GlObject; public class GlShader extends GlObject { diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java b/src/main/java/com/jozufozu/flywheel/gl/shader/ShaderType.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java rename to src/main/java/com/jozufozu/flywheel/gl/shader/ShaderType.java index f5b106232..6a3d16471 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java +++ b/src/main/java/com/jozufozu/flywheel/gl/shader/ShaderType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.shader; +package com.jozufozu.flywheel.gl.shader; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL43; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/span/package-info.java b/src/main/java/com/jozufozu/flywheel/gl/shader/package-info.java similarity index 78% rename from src/main/java/com/jozufozu/flywheel/core/source/span/package-info.java rename to src/main/java/com/jozufozu/flywheel/gl/shader/package-info.java index 1ee6ddb46..78a29d6a7 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/span/package-info.java +++ b/src/main/java/com/jozufozu/flywheel/gl/shader/package-info.java @@ -1,5 +1,5 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.core.source.span; +package com.jozufozu.flywheel.gl.shader; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/BufferStorage.java b/src/main/java/com/jozufozu/flywheel/gl/versioned/BufferStorage.java similarity index 89% rename from src/main/java/com/jozufozu/flywheel/backend/gl/versioned/BufferStorage.java rename to src/main/java/com/jozufozu/flywheel/gl/versioned/BufferStorage.java index a1d787037..f421be6ce 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/BufferStorage.java +++ b/src/main/java/com/jozufozu/flywheel/gl/versioned/BufferStorage.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.backend.gl.versioned; +package com.jozufozu.flywheel.gl.versioned; import org.lwjgl.opengl.ARBBufferStorage; import org.lwjgl.opengl.GL44; import org.lwjgl.opengl.GLCapabilities; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; public enum BufferStorage implements GlVersioned { diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java b/src/main/java/com/jozufozu/flywheel/gl/versioned/GlCompat.java similarity index 98% rename from src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java rename to src/main/java/com/jozufozu/flywheel/gl/versioned/GlCompat.java index 8380d111e..fe342d5ca 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java +++ b/src/main/java/com/jozufozu/flywheel/gl/versioned/GlCompat.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.versioned; +package com.jozufozu.flywheel.gl.versioned; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlVersioned.java b/src/main/java/com/jozufozu/flywheel/gl/versioned/GlVersioned.java similarity index 90% rename from src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlVersioned.java rename to src/main/java/com/jozufozu/flywheel/gl/versioned/GlVersioned.java index 8615e9086..e0c930b52 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlVersioned.java +++ b/src/main/java/com/jozufozu/flywheel/gl/versioned/GlVersioned.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.versioned; +package com.jozufozu.flywheel.gl.versioned; import org.lwjgl.opengl.GLCapabilities; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/InstancedArrays.java b/src/main/java/com/jozufozu/flywheel/gl/versioned/InstancedArrays.java similarity index 94% rename from src/main/java/com/jozufozu/flywheel/backend/gl/versioned/InstancedArrays.java rename to src/main/java/com/jozufozu/flywheel/gl/versioned/InstancedArrays.java index b2c221d81..76deadda4 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/InstancedArrays.java +++ b/src/main/java/com/jozufozu/flywheel/gl/versioned/InstancedArrays.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.versioned; +package com.jozufozu.flywheel.gl.versioned; import org.lwjgl.opengl.ARBInstancedArrays; import org.lwjgl.opengl.GL33; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/Index.java b/src/main/java/com/jozufozu/flywheel/glsl/Index.java similarity index 86% rename from src/main/java/com/jozufozu/flywheel/core/source/Index.java rename to src/main/java/com/jozufozu/flywheel/glsl/Index.java index dfcad42c5..0b84ae039 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/Index.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/Index.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.core.source; +package com.jozufozu.flywheel.glsl; import java.util.Collection; import java.util.Map; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; -import com.jozufozu.flywheel.core.source.parse.ShaderFunction; -import com.jozufozu.flywheel.core.source.parse.ShaderStruct; +import com.jozufozu.flywheel.glsl.parse.ShaderFunction; +import com.jozufozu.flywheel.glsl.parse.ShaderStruct; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/ShaderLoadingException.java b/src/main/java/com/jozufozu/flywheel/glsl/ShaderLoadingException.java similarity index 84% rename from src/main/java/com/jozufozu/flywheel/core/source/ShaderLoadingException.java rename to src/main/java/com/jozufozu/flywheel/glsl/ShaderLoadingException.java index 13dfc9857..8ecd90769 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/ShaderLoadingException.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/ShaderLoadingException.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source; +package com.jozufozu.flywheel.glsl; public class ShaderLoadingException extends RuntimeException { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java b/src/main/java/com/jozufozu/flywheel/glsl/ShaderSources.java similarity index 95% rename from src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java rename to src/main/java/com/jozufozu/flywheel/glsl/ShaderSources.java index 3e4a7f21c..73f2e2a7c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/ShaderSources.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source; +package com.jozufozu.flywheel.glsl; import java.io.IOException; import java.util.ArrayDeque; @@ -11,7 +11,7 @@ import java.util.stream.Collectors; import javax.annotation.Nonnull; import com.google.common.collect.Lists; -import com.jozufozu.flywheel.core.source.error.ErrorReporter; +import com.jozufozu.flywheel.glsl.error.ErrorReporter; import com.jozufozu.flywheel.util.ResourceUtil; import com.jozufozu.flywheel.util.StringUtil; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/SourceChecks.java b/src/main/java/com/jozufozu/flywheel/glsl/SourceChecks.java similarity index 91% rename from src/main/java/com/jozufozu/flywheel/core/source/SourceChecks.java rename to src/main/java/com/jozufozu/flywheel/glsl/SourceChecks.java index e26b9b94a..e84843a38 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/SourceChecks.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/SourceChecks.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source; +package com.jozufozu.flywheel.glsl; import java.util.Optional; import java.util.function.BiConsumer; @@ -6,9 +6,9 @@ import java.util.function.BiConsumer; import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.core.source.error.ErrorReporter; -import com.jozufozu.flywheel.core.source.parse.ShaderFunction; -import com.jozufozu.flywheel.core.source.parse.ShaderVariable; +import com.jozufozu.flywheel.glsl.error.ErrorReporter; +import com.jozufozu.flywheel.glsl.parse.ShaderFunction; +import com.jozufozu.flywheel.glsl.parse.ShaderVariable; public class SourceChecks { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/SourceFile.java b/src/main/java/com/jozufozu/flywheel/glsl/SourceFile.java similarity index 94% rename from src/main/java/com/jozufozu/flywheel/core/source/SourceFile.java rename to src/main/java/com/jozufozu/flywheel/glsl/SourceFile.java index 7c30d67c8..2dc6ce5c2 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/SourceFile.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/SourceFile.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source; +package com.jozufozu.flywheel.glsl; import java.util.Collection; import java.util.HashMap; @@ -10,13 +10,13 @@ import java.util.regex.Matcher; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.jozufozu.flywheel.core.SourceComponent; -import com.jozufozu.flywheel.core.source.parse.Import; -import com.jozufozu.flywheel.core.source.parse.ShaderField; -import com.jozufozu.flywheel.core.source.parse.ShaderFunction; -import com.jozufozu.flywheel.core.source.parse.ShaderStruct; -import com.jozufozu.flywheel.core.source.span.ErrorSpan; -import com.jozufozu.flywheel.core.source.span.Span; -import com.jozufozu.flywheel.core.source.span.StringSpan; +import com.jozufozu.flywheel.glsl.parse.Import; +import com.jozufozu.flywheel.glsl.parse.ShaderField; +import com.jozufozu.flywheel.glsl.parse.ShaderFunction; +import com.jozufozu.flywheel.glsl.parse.ShaderStruct; +import com.jozufozu.flywheel.glsl.span.ErrorSpan; +import com.jozufozu.flywheel.glsl.span.Span; +import com.jozufozu.flywheel.glsl.span.StringSpan; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/SourceLines.java b/src/main/java/com/jozufozu/flywheel/glsl/SourceLines.java similarity index 96% rename from src/main/java/com/jozufozu/flywheel/core/source/SourceLines.java rename to src/main/java/com/jozufozu/flywheel/glsl/SourceLines.java index 7b1b18b8c..926cfd432 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/SourceLines.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/SourceLines.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source; +package com.jozufozu.flywheel.glsl; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -6,7 +6,7 @@ import java.util.regex.Pattern; import org.jetbrains.annotations.NotNull; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.core.source.span.CharPos; +import com.jozufozu.flywheel.glsl.span.CharPos; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorBuilder.java b/src/main/java/com/jozufozu/flywheel/glsl/error/ErrorBuilder.java similarity index 84% rename from src/main/java/com/jozufozu/flywheel/core/source/error/ErrorBuilder.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/ErrorBuilder.java index a234d9433..e75633c08 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorBuilder.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/ErrorBuilder.java @@ -1,19 +1,19 @@ -package com.jozufozu.flywheel.core.source.error; +package com.jozufozu.flywheel.glsl.error; import java.util.ArrayList; import java.util.List; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.core.source.SourceFile; -import com.jozufozu.flywheel.core.source.SourceLines; -import com.jozufozu.flywheel.core.source.error.lines.ErrorLine; -import com.jozufozu.flywheel.core.source.error.lines.FileLine; -import com.jozufozu.flywheel.core.source.error.lines.HeaderLine; -import com.jozufozu.flywheel.core.source.error.lines.SourceLine; -import com.jozufozu.flywheel.core.source.error.lines.SpanHighlightLine; -import com.jozufozu.flywheel.core.source.error.lines.TextLine; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.SourceFile; +import com.jozufozu.flywheel.glsl.SourceLines; +import com.jozufozu.flywheel.glsl.error.lines.ErrorLine; +import com.jozufozu.flywheel.glsl.error.lines.FileLine; +import com.jozufozu.flywheel.glsl.error.lines.HeaderLine; +import com.jozufozu.flywheel.glsl.error.lines.SourceLine; +import com.jozufozu.flywheel.glsl.error.lines.SpanHighlightLine; +import com.jozufozu.flywheel.glsl.error.lines.TextLine; +import com.jozufozu.flywheel.glsl.span.Span; import com.jozufozu.flywheel.util.ConsoleColors; import com.jozufozu.flywheel.util.StringUtil; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorLevel.java b/src/main/java/com/jozufozu/flywheel/glsl/error/ErrorLevel.java similarity index 88% rename from src/main/java/com/jozufozu/flywheel/core/source/error/ErrorLevel.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/ErrorLevel.java index 316e3ceff..71d3fa1e6 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorLevel.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/ErrorLevel.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.error; +package com.jozufozu.flywheel.glsl.error; import com.jozufozu.flywheel.util.ConsoleColors; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorReporter.java b/src/main/java/com/jozufozu/flywheel/glsl/error/ErrorReporter.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/core/source/error/ErrorReporter.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/ErrorReporter.java index b287f9627..cce42d559 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/ErrorReporter.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/ErrorReporter.java @@ -1,13 +1,13 @@ -package com.jozufozu.flywheel.core.source.error; +package com.jozufozu.flywheel.glsl.error; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import com.jozufozu.flywheel.Flywheel; -import com.jozufozu.flywheel.core.source.ShaderLoadingException; -import com.jozufozu.flywheel.core.source.SourceFile; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.ShaderLoadingException; +import com.jozufozu.flywheel.glsl.SourceFile; +import com.jozufozu.flywheel.glsl.span.Span; import com.jozufozu.flywheel.util.FlwUtil; import com.jozufozu.flywheel.util.StringUtil; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/Divider.java b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/Divider.java similarity index 76% rename from src/main/java/com/jozufozu/flywheel/core/source/error/lines/Divider.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/lines/Divider.java index bca13fdc4..bbf8f7fb6 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/Divider.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/Divider.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.error.lines; +package com.jozufozu.flywheel.glsl.error.lines; public enum Divider { BAR(" | "), diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/ErrorLine.java b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/ErrorLine.java similarity index 84% rename from src/main/java/com/jozufozu/flywheel/core/source/error/lines/ErrorLine.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/lines/ErrorLine.java index 985275be6..a037f4de1 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/ErrorLine.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/ErrorLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.error.lines; +package com.jozufozu.flywheel.glsl.error.lines; public interface ErrorLine { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/FileLine.java b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/FileLine.java similarity index 81% rename from src/main/java/com/jozufozu/flywheel/core/source/error/lines/FileLine.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/lines/FileLine.java index 3bcf9cbe9..d3167e9ce 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/FileLine.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/FileLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.error.lines; +package com.jozufozu.flywheel.glsl.error.lines; public record FileLine(String fileName) implements ErrorLine { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/HeaderLine.java b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/HeaderLine.java similarity index 79% rename from src/main/java/com/jozufozu/flywheel/core/source/error/lines/HeaderLine.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/lines/HeaderLine.java index 25cd63783..3246f2b21 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/HeaderLine.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/HeaderLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.error.lines; +package com.jozufozu.flywheel.glsl.error.lines; public record HeaderLine(String level, CharSequence message) implements ErrorLine { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/SourceLine.java b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/SourceLine.java similarity index 85% rename from src/main/java/com/jozufozu/flywheel/core/source/error/lines/SourceLine.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/lines/SourceLine.java index f790fd08c..81fe5fc64 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/SourceLine.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/SourceLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.error.lines; +package com.jozufozu.flywheel.glsl.error.lines; public record SourceLine(String number, String line) implements ErrorLine { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/SpanHighlightLine.java b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/SpanHighlightLine.java similarity index 89% rename from src/main/java/com/jozufozu/flywheel/core/source/error/lines/SpanHighlightLine.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/lines/SpanHighlightLine.java index 2d2bf9431..46304a247 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/SpanHighlightLine.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/SpanHighlightLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.error.lines; +package com.jozufozu.flywheel.glsl.error.lines; public class SpanHighlightLine implements ErrorLine { private final String line; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/TextLine.java b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/TextLine.java similarity index 67% rename from src/main/java/com/jozufozu/flywheel/core/source/error/lines/TextLine.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/lines/TextLine.java index e5ff86ff0..8f61f836b 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/lines/TextLine.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/lines/TextLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.error.lines; +package com.jozufozu.flywheel.glsl.error.lines; public record TextLine(String msg) implements ErrorLine { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/error/package-info.java b/src/main/java/com/jozufozu/flywheel/glsl/error/package-info.java similarity index 77% rename from src/main/java/com/jozufozu/flywheel/core/source/error/package-info.java rename to src/main/java/com/jozufozu/flywheel/glsl/error/package-info.java index 3533088ae..dec2a6ef1 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/error/package-info.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/error/package-info.java @@ -1,5 +1,5 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.core.source.error; +package com.jozufozu.flywheel.glsl.error; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/FnSignature.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/FnSignature.java similarity index 97% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/FnSignature.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/FnSignature.java index 097da1c7e..d94bc6c1c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/FnSignature.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/FnSignature.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; import java.util.Collection; import java.util.stream.Collectors; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslBlock.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslBlock.java similarity index 92% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslBlock.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslBlock.java index af8a3705b..a490de11c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslBlock.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslBlock.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslBuilder.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslBuilder.java similarity index 97% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslBuilder.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslBuilder.java index 67677abfb..4917d782c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslBuilder.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslBuilder.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslExpr.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslExpr.java similarity index 98% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslExpr.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslExpr.java index cab45783f..a5e6bf37e 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslExpr.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslExpr.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; import java.util.Collection; import java.util.function.Function; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslFn.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslFn.java similarity index 91% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslFn.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslFn.java index 8a603b035..951dc8436 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslFn.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslFn.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; import java.util.function.Consumer; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslStmt.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslStmt.java similarity index 91% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslStmt.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslStmt.java index 7b301af8d..e34912016 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslStmt.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslStmt.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; public interface GlslStmt { GlslStmt BREAK = () -> "break;"; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslStruct.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslStruct.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslStruct.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslStruct.java index a713117c9..3b7ff275c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslStruct.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslStruct.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslSwitch.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslSwitch.java similarity index 96% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslSwitch.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslSwitch.java index 120cdac64..0aebc8327 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslSwitch.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslSwitch.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslUniformBlock.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslUniformBlock.java similarity index 96% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslUniformBlock.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslUniformBlock.java index 78f3df8cb..4a52addef 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslUniformBlock.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslUniformBlock.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslVertexInput.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslVertexInput.java similarity index 90% rename from src/main/java/com/jozufozu/flywheel/core/source/generate/GlslVertexInput.java rename to src/main/java/com/jozufozu/flywheel/glsl/generate/GlslVertexInput.java index ca52e4a89..254e0b16a 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/generate/GlslVertexInput.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/GlslVertexInput.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.generate; +package com.jozufozu.flywheel.glsl.generate; public class GlslVertexInput implements GlslBuilder.Declaration { diff --git a/src/main/java/com/jozufozu/flywheel/glsl/generate/package-info.java b/src/main/java/com/jozufozu/flywheel/glsl/generate/package-info.java new file mode 100644 index 000000000..f838a8574 --- /dev/null +++ b/src/main/java/com/jozufozu/flywheel/glsl/generate/package-info.java @@ -0,0 +1,6 @@ +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package com.jozufozu.flywheel.glsl.generate; + +import javax.annotation.ParametersAreNonnullByDefault; + +import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/glsl/package-info.java b/src/main/java/com/jozufozu/flywheel/glsl/package-info.java new file mode 100644 index 000000000..8c5b4376a --- /dev/null +++ b/src/main/java/com/jozufozu/flywheel/glsl/package-info.java @@ -0,0 +1,6 @@ +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package com.jozufozu.flywheel.glsl; + +import javax.annotation.ParametersAreNonnullByDefault; + +import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/parse/Import.java b/src/main/java/com/jozufozu/flywheel/glsl/parse/Import.java similarity index 74% rename from src/main/java/com/jozufozu/flywheel/core/source/parse/Import.java rename to src/main/java/com/jozufozu/flywheel/glsl/parse/Import.java index f348b5684..e13e2e702 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/parse/Import.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/parse/Import.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.core.source.parse; +package com.jozufozu.flywheel.glsl.parse; import java.util.regex.Pattern; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.span.Span; public class Import { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderField.java b/src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderField.java similarity index 89% rename from src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderField.java rename to src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderField.java index 82fe97e61..8d451478e 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderField.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderField.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.core.source.parse; +package com.jozufozu.flywheel.glsl.parse; import java.util.regex.Pattern; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.span.Span; public class ShaderField { public static final Pattern PATTERN = Pattern.compile("layout\\s*\\(location\\s*=\\s*(\\d+)\\)\\s+(in|out)\\s+([\\w\\d]+)\\s+" + "([\\w\\d]+)"); diff --git a/src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderFunction.java b/src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderFunction.java similarity index 95% rename from src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderFunction.java rename to src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderFunction.java index ae20a67a7..6d6114da4 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderFunction.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderFunction.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.core.source.parse; +package com.jozufozu.flywheel.glsl.parse; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.span.Span; public class ShaderFunction { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderStruct.java b/src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderStruct.java similarity index 94% rename from src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderStruct.java rename to src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderStruct.java index f273490ac..cf4651bdb 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderStruct.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderStruct.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.core.source.parse; +package com.jozufozu.flywheel.glsl.parse; import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.span.Span; public class ShaderStruct { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderVariable.java b/src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderVariable.java similarity index 88% rename from src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderVariable.java rename to src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderVariable.java index c202e8fa7..86e6da484 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderVariable.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderVariable.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.core.source.parse; +package com.jozufozu.flywheel.glsl.parse; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.span.Span; public class ShaderVariable { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/parse/StructField.java b/src/main/java/com/jozufozu/flywheel/glsl/parse/StructField.java similarity index 82% rename from src/main/java/com/jozufozu/flywheel/core/source/parse/StructField.java rename to src/main/java/com/jozufozu/flywheel/glsl/parse/StructField.java index 62b4649ab..53595916c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/parse/StructField.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/parse/StructField.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.core.source.parse; +package com.jozufozu.flywheel.glsl.parse; import java.util.regex.Pattern; -import com.jozufozu.flywheel.core.source.span.Span; +import com.jozufozu.flywheel.glsl.span.Span; public class StructField { public static final Pattern fieldPattern = Pattern.compile("(\\S+)\\s*(\\S+);"); diff --git a/src/main/java/com/jozufozu/flywheel/core/source/parse/package-info.java b/src/main/java/com/jozufozu/flywheel/glsl/parse/package-info.java similarity index 77% rename from src/main/java/com/jozufozu/flywheel/core/source/parse/package-info.java rename to src/main/java/com/jozufozu/flywheel/glsl/parse/package-info.java index 0984aedc8..e37344d0d 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/parse/package-info.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/parse/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.core.source.parse; +package com.jozufozu.flywheel.glsl.parse; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/core/source/span/CharPos.java b/src/main/java/com/jozufozu/flywheel/glsl/span/CharPos.java similarity index 64% rename from src/main/java/com/jozufozu/flywheel/core/source/span/CharPos.java rename to src/main/java/com/jozufozu/flywheel/glsl/span/CharPos.java index 617cfa0a7..ad9111039 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/span/CharPos.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/span/CharPos.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.core.source.span; +package com.jozufozu.flywheel.glsl.span; /** * A position in a file. diff --git a/src/main/java/com/jozufozu/flywheel/core/source/span/ErrorSpan.java b/src/main/java/com/jozufozu/flywheel/glsl/span/ErrorSpan.java similarity index 85% rename from src/main/java/com/jozufozu/flywheel/core/source/span/ErrorSpan.java rename to src/main/java/com/jozufozu/flywheel/glsl/span/ErrorSpan.java index 5c4cd39e1..9fd40d290 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/span/ErrorSpan.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/span/ErrorSpan.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.core.source.span; +package com.jozufozu.flywheel.glsl.span; -import com.jozufozu.flywheel.core.source.SourceFile; +import com.jozufozu.flywheel.glsl.SourceFile; /** * Represents a (syntactically) malformed segment of code. diff --git a/src/main/java/com/jozufozu/flywheel/core/source/span/Span.java b/src/main/java/com/jozufozu/flywheel/glsl/span/Span.java similarity index 92% rename from src/main/java/com/jozufozu/flywheel/core/source/span/Span.java rename to src/main/java/com/jozufozu/flywheel/glsl/span/Span.java index 38abe6b36..bf6a73d0c 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/span/Span.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/span/Span.java @@ -1,13 +1,13 @@ -package com.jozufozu.flywheel.core.source.span; +package com.jozufozu.flywheel.glsl.span; import java.util.Optional; import java.util.regex.Matcher; import org.jetbrains.annotations.NotNull; -import com.jozufozu.flywheel.core.source.SourceFile; -import com.jozufozu.flywheel.core.source.parse.ShaderFunction; -import com.jozufozu.flywheel.core.source.parse.ShaderStruct; +import com.jozufozu.flywheel.glsl.SourceFile; +import com.jozufozu.flywheel.glsl.parse.ShaderFunction; +import com.jozufozu.flywheel.glsl.parse.ShaderStruct; /** * A segment of code in a {@link SourceFile}. diff --git a/src/main/java/com/jozufozu/flywheel/core/source/span/StringSpan.java b/src/main/java/com/jozufozu/flywheel/glsl/span/StringSpan.java similarity index 83% rename from src/main/java/com/jozufozu/flywheel/core/source/span/StringSpan.java rename to src/main/java/com/jozufozu/flywheel/glsl/span/StringSpan.java index 5e0ef31c9..9d1835504 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/span/StringSpan.java +++ b/src/main/java/com/jozufozu/flywheel/glsl/span/StringSpan.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.core.source.span; +package com.jozufozu.flywheel.glsl.span; -import com.jozufozu.flywheel.core.source.SourceFile; +import com.jozufozu.flywheel.glsl.SourceFile; public class StringSpan extends Span { diff --git a/src/main/java/com/jozufozu/flywheel/glsl/span/package-info.java b/src/main/java/com/jozufozu/flywheel/glsl/span/package-info.java new file mode 100644 index 000000000..34ce53a9a --- /dev/null +++ b/src/main/java/com/jozufozu/flywheel/glsl/span/package-info.java @@ -0,0 +1,6 @@ +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package com.jozufozu.flywheel.glsl.span; + +import javax.annotation.ParametersAreNonnullByDefault; + +import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java b/src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java index 233b84504..ff93e80fd 100644 --- a/src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java +++ b/src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java @@ -21,8 +21,8 @@ import static org.lwjgl.opengl.GL14.GL_MIRRORED_REPEAT; import org.lwjgl.opengl.GL30; -import com.jozufozu.flywheel.backend.gl.GlTexture; -import com.jozufozu.flywheel.backend.gl.GlTextureUnit; +import com.jozufozu.flywheel.gl.GlTexture; +import com.jozufozu.flywheel.gl.GlTextureUnit; import com.jozufozu.flywheel.util.box.GridAlignedBB; import com.jozufozu.flywheel.util.box.ImmutableBox; diff --git a/src/main/java/com/jozufozu/flywheel/mixin/GlStateManagerMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/GlStateManagerMixin.java index 05f845087..2275d3973 100644 --- a/src/main/java/com/jozufozu/flywheel/mixin/GlStateManagerMixin.java +++ b/src/main/java/com/jozufozu/flywheel/mixin/GlStateManagerMixin.java @@ -5,8 +5,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; +import com.jozufozu.flywheel.gl.GlStateTracker; +import com.jozufozu.flywheel.gl.buffer.GlBufferType; import com.mojang.blaze3d.platform.GlStateManager; @Mixin(GlStateManager.class)