mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2025-02-06 18:24:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Reorganization I

Browse source 
- Package `backend.gl` -> `gl`
- Package `core.source` -> `glsl`
This commit is contained in:
PepperCode1 2023-03-30 12:59:09 -07:00
parent e7fd1c6178
commit 8cc32b49f2
109 changed files with 235 additions and 235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/jozufozu/flywheel/api/context/Context.java
View file

@ -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;

4
src/main/java/com/jozufozu/flywheel/api/pipeline/Pipeline.java
View file

@ -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;

4
src/main/java/com/jozufozu/flywheel/backend/Loader.java
View file

@ -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;

6
src/main/java/com/jozufozu/flywheel/backend/gl/buffer/package-info.java
View file

@ -1,6 +0,0 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.backend.gl.buffer;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;

6
src/main/java/com/jozufozu/flywheel/backend/gl/shader/package-info.java
View file

@ -1,6 +0,0 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.backend.gl.shader;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;

10
src/main/java/com/jozufozu/flywheel/backend/instancing/compile/Compilation.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompilationResult.java
View file

@ -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

6
src/main/java/com/jozufozu/flywheel/backend/instancing/compile/CompileUtil.java
View file

@ -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 {

8
src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FailedCompilation.java
View file

@ -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;

14
src/main/java/com/jozufozu/flywheel/backend/instancing/compile/FlwCompiler.java
View file

@ -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 {

12
src/main/java/com/jozufozu/flywheel/backend/instancing/compile/MaterialAdapterComponent.java
View file

@ -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;

6
src/main/java/com/jozufozu/flywheel/backend/instancing/compile/ShaderCompiler.java
View file

@ -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 {

6
src/main/java/com/jozufozu/flywheel/backend/instancing/compile/UniformComponent.java
View file

@ -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;

12
src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectComponent.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectCullingGroup.java
View file

@ -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<T extends InstancedPart> {

4
src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectEngine.java
View file

@ -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;

4
src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/DrawCall.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/ElementBuffer.java
View file

@ -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 {

10
src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java
View file

@ -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<D extends InstancedPart> extends AbstractInstancer<D> {

8
src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedArraysComponent.java
View file

@ -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;

10
src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMeshPool.java
View file

@ -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;

4
src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/BackendTypes.java
View file

@ -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;

10
src/main/java/com/jozufozu/flywheel/core/FullscreenQuad.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/core/Materials.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/Pipelines.java
View file

@ -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;

6
src/main/java/com/jozufozu/flywheel/core/QuadConverter.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/context/SimpleContext.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/layout/BufferLayout.java
View file

@ -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.

6
src/main/java/com/jozufozu/flywheel/core/layout/CommonItems.java
View file

@ -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 {

4
src/main/java/com/jozufozu/flywheel/core/layout/InputType.java
View file

@ -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 {

4
src/main/java/com/jozufozu/flywheel/core/layout/LayoutItem.java
View file

@ -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) {

8
src/main/java/com/jozufozu/flywheel/core/layout/MatInput.java
View file

@ -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 {

4
src/main/java/com/jozufozu/flywheel/core/layout/VecInput.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/core/pipeline/SimplePipeline.java
View file

@ -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;

6
src/main/java/com/jozufozu/flywheel/core/source/generate/package-info.java
View file

@ -1,6 +0,0 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.core.source.generate;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;

4
src/main/java/com/jozufozu/flywheel/core/uniform/UniformBuffer.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/backend/gl/GLSLVersion.java → src/main/java/com/jozufozu/flywheel/gl/GLSLVersion.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl;
package com.jozufozu.flywheel.gl;
public enum GLSLVersion {
V110(110),

2
src/main/java/com/jozufozu/flywheel/backend/gl/GlFence.java → src/main/java/com/jozufozu/flywheel/gl/GlFence.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java → src/main/java/com/jozufozu/flywheel/gl/GlNumericType.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl;
package com.jozufozu.flywheel.gl;
import java.nio.ByteBuffer;
import java.util.Arrays;

2
src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java → src/main/java/com/jozufozu/flywheel/gl/GlObject.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java → src/main/java/com/jozufozu/flywheel/gl/GlPrimitive.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl;
package com.jozufozu.flywheel.gl;
import org.lwjgl.opengl.GL11;

4
src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java → src/main/java/com/jozufozu/flywheel/gl/GlStateTracker.java
View file

@ -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;
/**

2
src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java → src/main/java/com/jozufozu/flywheel/gl/GlTexture.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl;
package com.jozufozu.flywheel.gl;
import org.lwjgl.opengl.GL20;

2
src/main/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java → src/main/java/com/jozufozu/flywheel/gl/GlTextureUnit.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl;
package com.jozufozu.flywheel.gl;
import static org.lwjgl.opengl.GL13.GL_TEXTURE0;

12
src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java → src/main/java/com/jozufozu/flywheel/gl/array/GlVertexArray.java
View file

@ -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")

2
src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java → src/main/java/com/jozufozu/flywheel/gl/array/VertexAttribute.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl.array;
package com.jozufozu.flywheel.gl.array;
public interface VertexAttribute {
int getByteWidth();

4
src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttributeF.java → src/main/java/com/jozufozu/flywheel/gl/array/VertexAttributeF.java
View file

@ -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.

4
src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttributeI.java → src/main/java/com/jozufozu/flywheel/gl/array/VertexAttributeI.java
View file

@ -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.

8
src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java → src/main/java/com/jozufozu/flywheel/gl/buffer/GlBuffer.java
View file

@ -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 {

4
src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java → src/main/java/com/jozufozu/flywheel/gl/buffer/GlBufferType.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java → src/main/java/com/jozufozu/flywheel/gl/buffer/GlBufferUsage.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl.buffer;
package com.jozufozu.flywheel.gl.buffer;
import org.lwjgl.opengl.GL15;

2
src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBuffer.java → src/main/java/com/jozufozu/flywheel/gl/buffer/MappedBuffer.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl.buffer;
package com.jozufozu.flywheel.gl.buffer;
import static org.lwjgl.system.MemoryUtil.NULL;

2
src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBufferUsage.java → src/main/java/com/jozufozu/flywheel/gl/buffer/MappedBufferUsage.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl.buffer;
package com.jozufozu.flywheel.gl.buffer;
import org.lwjgl.opengl.GL15C;

2
src/main/java/com/jozufozu/flywheel/backend/gl/package-info.java → src/main/java/com/jozufozu/flywheel/gl/buffer/package-info.java
View file

@ -1,5 +1,5 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.backend.gl;
package com.jozufozu.flywheel.gl.buffer;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/jozufozu/flywheel/backend/gl/error/GlError.java → src/main/java/com/jozufozu/flywheel/gl/error/GlError.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl.error;
package com.jozufozu.flywheel.gl.error;
import java.util.function.Supplier;

2
src/main/java/com/jozufozu/flywheel/backend/gl/error/GlException.java → src/main/java/com/jozufozu/flywheel/gl/error/GlException.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl.error;
package com.jozufozu.flywheel.gl.error;
public class GlException extends RuntimeException {

2
src/main/java/com/jozufozu/flywheel/core/source/package-info.java → src/main/java/com/jozufozu/flywheel/gl/package-info.java
View file

@ -1,5 +1,5 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.core.source;
package com.jozufozu.flywheel.gl;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java → src/main/java/com/jozufozu/flywheel/gl/shader/GlProgram.java
View file

@ -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 {

4
src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java → src/main/java/com/jozufozu/flywheel/gl/shader/GlShader.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java → src/main/java/com/jozufozu/flywheel/gl/shader/ShaderType.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/span/package-info.java → src/main/java/com/jozufozu/flywheel/gl/shader/package-info.java
View file

@ -1,5 +1,5 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.core.source.span;
package com.jozufozu.flywheel.gl.shader;
import javax.annotation.ParametersAreNonnullByDefault;

4
src/main/java/com/jozufozu/flywheel/backend/gl/versioned/BufferStorage.java → src/main/java/com/jozufozu/flywheel/gl/versioned/BufferStorage.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java → src/main/java/com/jozufozu/flywheel/gl/versioned/GlCompat.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlVersioned.java → src/main/java/com/jozufozu/flywheel/gl/versioned/GlVersioned.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.backend.gl.versioned;
package com.jozufozu.flywheel.gl.versioned;
import org.lwjgl.opengl.GLCapabilities;

2
src/main/java/com/jozufozu/flywheel/backend/gl/versioned/InstancedArrays.java → src/main/java/com/jozufozu/flywheel/gl/versioned/InstancedArrays.java
View file

@ -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;

6
src/main/java/com/jozufozu/flywheel/core/source/Index.java → src/main/java/com/jozufozu/flywheel/glsl/Index.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/ShaderLoadingException.java → src/main/java/com/jozufozu/flywheel/glsl/ShaderLoadingException.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.core.source;
package com.jozufozu.flywheel.glsl;
public class ShaderLoadingException extends RuntimeException {

4
src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java → src/main/java/com/jozufozu/flywheel/glsl/ShaderSources.java
View file

@ -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;

8
src/main/java/com/jozufozu/flywheel/core/source/SourceChecks.java → src/main/java/com/jozufozu/flywheel/glsl/SourceChecks.java
View file

@ -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 {

16
src/main/java/com/jozufozu/flywheel/core/source/SourceFile.java → src/main/java/com/jozufozu/flywheel/glsl/SourceFile.java
View file

@ -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;

4
src/main/java/com/jozufozu/flywheel/core/source/SourceLines.java → src/main/java/com/jozufozu/flywheel/glsl/SourceLines.java
View file

@ -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;

20
src/main/java/com/jozufozu/flywheel/core/source/error/ErrorBuilder.java → src/main/java/com/jozufozu/flywheel/glsl/error/ErrorBuilder.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/error/ErrorLevel.java → src/main/java/com/jozufozu/flywheel/glsl/error/ErrorLevel.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.core.source.error;
package com.jozufozu.flywheel.glsl.error;
import com.jozufozu.flywheel.util.ConsoleColors;

8
src/main/java/com/jozufozu/flywheel/core/source/error/ErrorReporter.java → src/main/java/com/jozufozu/flywheel/glsl/error/ErrorReporter.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/error/lines/Divider.java → src/main/java/com/jozufozu/flywheel/glsl/error/lines/Divider.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.core.source.error.lines;
package com.jozufozu.flywheel.glsl.error.lines;
public enum Divider {
BAR(" | "),

2
src/main/java/com/jozufozu/flywheel/core/source/error/lines/ErrorLine.java → src/main/java/com/jozufozu/flywheel/glsl/error/lines/ErrorLine.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.core.source.error.lines;
package com.jozufozu.flywheel.glsl.error.lines;
public interface ErrorLine {

2
src/main/java/com/jozufozu/flywheel/core/source/error/lines/FileLine.java → src/main/java/com/jozufozu/flywheel/glsl/error/lines/FileLine.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/core/source/error/lines/HeaderLine.java → src/main/java/com/jozufozu/flywheel/glsl/error/lines/HeaderLine.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/core/source/error/lines/SourceLine.java → src/main/java/com/jozufozu/flywheel/glsl/error/lines/SourceLine.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/core/source/error/lines/SpanHighlightLine.java → src/main/java/com/jozufozu/flywheel/glsl/error/lines/SpanHighlightLine.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/error/lines/TextLine.java → src/main/java/com/jozufozu/flywheel/glsl/error/lines/TextLine.java
View file

@ -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 {

2
src/main/java/com/jozufozu/flywheel/core/source/error/package-info.java → src/main/java/com/jozufozu/flywheel/glsl/error/package-info.java
View file

@ -1,5 +1,5 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.core.source.error;
package com.jozufozu.flywheel.glsl.error;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/FnSignature.java → src/main/java/com/jozufozu/flywheel/glsl/generate/FnSignature.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslBlock.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslBlock.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslBuilder.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslBuilder.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslExpr.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslExpr.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslFn.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslFn.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.core.source.generate;
package com.jozufozu.flywheel.glsl.generate;
import java.util.function.Consumer;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslStmt.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslStmt.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.core.source.generate;
package com.jozufozu.flywheel.glsl.generate;
public interface GlslStmt {
GlslStmt BREAK = () -> "break;";

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslStruct.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslStruct.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslSwitch.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslSwitch.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslUniformBlock.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslUniformBlock.java
View file

@ -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;

2
src/main/java/com/jozufozu/flywheel/core/source/generate/GlslVertexInput.java → src/main/java/com/jozufozu/flywheel/glsl/generate/GlslVertexInput.java
View file

@ -1,4 +1,4 @@
package com.jozufozu.flywheel.core.source.generate;
package com.jozufozu.flywheel.glsl.generate;
public class GlslVertexInput implements GlslBuilder.Declaration {

6
src/main/java/com/jozufozu/flywheel/glsl/generate/package-info.java Normal file
View file

@ -0,0 +1,6 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.glsl.generate;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;

6
src/main/java/com/jozufozu/flywheel/glsl/package-info.java Normal file
View file

@ -0,0 +1,6 @@
@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault
package com.jozufozu.flywheel.glsl;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;

4
src/main/java/com/jozufozu/flywheel/core/source/parse/Import.java → src/main/java/com/jozufozu/flywheel/glsl/parse/Import.java
View file

@ -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 {

4
src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderField.java → src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderField.java
View file

@ -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]+)");

4
src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderFunction.java → src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderFunction.java
View file

@ -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 {

4
src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderStruct.java → src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderStruct.java
View file

@ -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 {

4
src/main/java/com/jozufozu/flywheel/core/source/parse/ShaderVariable.java → src/main/java/com/jozufozu/flywheel/glsl/parse/ShaderVariable.java
View file

@ -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 {

Some files were not shown because too many files have changed in this diff Show more