Added dynamic cubemap texture init

FoundryMC · Nov 1, 2024 · 931bfe3 · 931bfe3
1 parent 3e21c32
commit 931bfe3
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 87 deletions.
diff --git a/common/src/main/java/foundry/veil/api/client/color/Color.java b/common/src/main/java/foundry/veil/api/client/color/Color.java
@@ -1,8 +1,7 @@
 package foundry.veil.api.client.color;
 
-import net.minecraft.util.Mth;
-
 import com.mojang.serialization.Codec;
+import net.minecraft.util.Mth;
 
 /**
  * A simple color class that can be used to represent a color in RGBA format with utility functions.

diff --git a/common/src/main/java/foundry/veil/api/client/color/ColorTheme.java b/common/src/main/java/foundry/veil/api/client/color/ColorTheme.java
@@ -2,14 +2,12 @@
 
 import foundry.veil.api.client.color.theme.IThemeProperty;
 import foundry.veil.api.client.tooltip.Tooltippable;
-import net.minecraft.Util;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Supplier;
 
 /**
  * A color theme is a collection of colors. The colors can be accessed by name. Themes are intended to be used for color schemes.

diff --git a/common/src/main/java/foundry/veil/api/client/editor/Editor.java b/common/src/main/java/foundry/veil/api/client/editor/Editor.java
@@ -1,8 +1,6 @@
 package foundry.veil.api.client.editor;
 
 import foundry.veil.api.client.render.VeilRenderSystem;
-import imgui.ImGui;
-import imgui.type.ImBoolean;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import org.lwjgl.system.NativeResource;

diff --git a/common/src/main/java/foundry/veil/api/client/editor/EditorManager.java b/common/src/main/java/foundry/veil/api/client/editor/EditorManager.java
@@ -1,7 +1,6 @@
 package foundry.veil.api.client.editor;
 
 import foundry.veil.Veil;
-import foundry.veil.api.client.imgui.VeilImGuiUtil;
 import foundry.veil.api.client.registry.VeilResourceEditorRegistry;
 import foundry.veil.api.resource.editor.ResourceFileEditor;
 import foundry.veil.api.util.CompositeReloadListener;

diff --git a/common/src/main/java/foundry/veil/api/client/necromancer/Constraint.java b/common/src/main/java/foundry/veil/api/client/necromancer/Constraint.java
@@ -1,8 +1,6 @@
 package foundry.veil.api.client.necromancer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import foundry.veil.api.client.graveyard.skeleton.InterpolatedSkeleton;
-import foundry.veil.api.client.graveyard.skeleton.InterpolatedSkeletonParent;
 import net.minecraft.client.renderer.MultiBufferSource;
 
 // W.I.P. replacement for graveyard

diff --git a/common/src/main/java/foundry/veil/api/client/necromancer/Skin.java b/common/src/main/java/foundry/veil/api/client/necromancer/Skin.java
@@ -5,10 +5,6 @@
 import foundry.veil.Veil;
 import foundry.veil.api.client.render.VeilRenderSystem;
 import foundry.veil.api.client.render.VeilVertexFormat;
-import foundry.veil.api.client.render.shader.VeilShaders;
-import foundry.veil.ext.VertexBufferExtension;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.HashMap;

diff --git a/common/src/main/java/foundry/veil/api/client/render/shader/CompiledShader.java b/common/src/main/java/foundry/veil/api/client/render/shader/CompiledShader.java
@@ -5,7 +5,6 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Map;
 import java.util.Set;
 
 /**

diff --git a/...src/main/java/foundry/veil/api/client/render/shader/processor/ShaderVersionProcessor.java b/...src/main/java/foundry/veil/api/client/render/shader/processor/ShaderVersionProcessor.java
@@ -2,7 +2,6 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**

diff --git a/common/src/main/java/foundry/veil/api/client/render/texture/DynamicCubemapTexture.java b/common/src/main/java/foundry/veil/api/client/render/texture/DynamicCubemapTexture.java
@@ -10,9 +10,33 @@
 import java.io.IOException;
 
 import static org.lwjgl.opengl.GL11C.*;
+import static org.lwjgl.opengl.GL13C.GL_TEXTURE_CUBE_MAP_POSITIVE_X;
 
 public class DynamicCubemapTexture extends CubemapTexture {
 
+    public void init(int width, int height) {
+        try (NativeImage image = new NativeImage(width, height, true)) {
+            this.upload(image);
+        }
+    }
+
+    public void upload(NativeImage image) {
+        this.bind();
+
+        int width = image.getWidth();
+        int height = image.getHeight();
+        RenderSystem.assertOnRenderThreadOrInit();
+        NativeImageAccessor accessor = (NativeImageAccessor) (Object) image;
+        accessor.invokeCheckAllocated();
+        GlStateManager._pixelStore(GL_UNPACK_ROW_LENGTH, 0);
+        GlStateManager._pixelStore(GL_UNPACK_SKIP_ROWS, 0);
+        GlStateManager._pixelStore(GL_UNPACK_SKIP_PIXELS, 0);
+        image.format().setUnpackPixelStoreState();
+        for (int i = 0; i < 6; i++) {
+            GlStateManager._texSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, 0, 0, width, height, image.format().glFormat(), GL_UNSIGNED_BYTE, accessor.getPixels());
+        }
+    }
+
     public void upload(Direction face, NativeImage image) {
         this.upload(getGlFace(face), image);
     }

diff --git a/common/src/main/java/foundry/veil/api/client/ui/util/PoseStackAnimator.java b/common/src/main/java/foundry/veil/api/client/ui/util/PoseStackAnimator.java
@@ -1,11 +1,11 @@
 package foundry.veil.api.client.ui.util;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.util.Mth;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.util.Mth;
 
 /**
  * A utility class to manage and apply animations to a {@link PoseStack}.

diff --git a/common/src/main/java/foundry/veil/api/client/util/DebugFrustumRenderer.java b/common/src/main/java/foundry/veil/api/client/util/DebugFrustumRenderer.java
@@ -2,8 +2,6 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import foundry.veil.api.client.render.MatrixStack;
-import foundry.veil.api.client.render.VeilRenderBridge;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import org.jetbrains.annotations.NotNull;

diff --git a/common/src/main/java/foundry/veil/api/quasar/data/EmitterSettings.java b/common/src/main/java/foundry/veil/api/quasar/data/EmitterSettings.java
@@ -4,7 +4,6 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import foundry.veil.api.util.CodecUtil;
 import net.minecraft.core.Holder;
-import net.minecraft.util.ExtraCodecs;
 
 import java.util.List;
 

diff --git a/common/src/main/java/foundry/veil/api/quasar/data/ParticleEmitterData.java b/common/src/main/java/foundry/veil/api/quasar/data/ParticleEmitterData.java
@@ -2,14 +2,11 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import foundry.veil.api.util.CodecUtil;
 import net.minecraft.core.Holder;
 import net.minecraft.resources.RegistryFileCodec;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 /**
  * @param maxLifetime
  * @param loop               Whether the emitter will loop. If <code>true</code>, the emitter will reset after maxLifetime ticks

diff --git a/common/src/main/java/foundry/veil/api/quasar/data/ParticleModuleTypeRegistry.java b/common/src/main/java/foundry/veil/api/quasar/data/ParticleModuleTypeRegistry.java
@@ -1,7 +1,6 @@
 package foundry.veil.api.quasar.data;
 
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
 import foundry.veil.Veil;
 import foundry.veil.api.quasar.data.module.ModuleType;
 import foundry.veil.api.quasar.data.module.ParticleModuleData;

diff --git a/common/src/main/java/foundry/veil/api/quasar/data/QuasarParticleData.java b/common/src/main/java/foundry/veil/api/quasar/data/QuasarParticleData.java
@@ -4,7 +4,6 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import foundry.veil.api.quasar.data.module.ParticleModuleData;
 import foundry.veil.api.quasar.particle.QuasarParticle;
-import foundry.veil.api.quasar.particle.RenderData;
 import foundry.veil.api.quasar.particle.RenderStyle;
 import foundry.veil.api.quasar.particle.SpriteData;
 import foundry.veil.api.quasar.registry.RenderStyleRegistry;

diff --git a/common/src/main/java/foundry/veil/api/quasar/emitters/module/update/FaceVelocityModule.java b/common/src/main/java/foundry/veil/api/quasar/emitters/module/update/FaceVelocityModule.java
@@ -2,7 +2,6 @@
 
 import foundry.veil.api.quasar.emitters.module.UpdateParticleModule;
 import foundry.veil.api.quasar.particle.QuasarParticle;
-import foundry.veil.api.quasar.particle.RenderData;
 import foundry.veil.api.quasar.registry.RenderStyleRegistry;
 import net.minecraft.util.Mth;
 import org.joml.Vector3d;

diff --git a/common/src/main/java/foundry/veil/api/quasar/emitters/shape/EmitterShape.java b/common/src/main/java/foundry/veil/api/quasar/emitters/shape/EmitterShape.java
@@ -2,24 +2,14 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
-import foundry.veil.Veil;
 import foundry.veil.api.quasar.registry.EmitterShapeRegistry;
 import foundry.veil.api.util.CodecUtil;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.RandomSource;
 import org.joml.Vector3d;
 import org.joml.Vector3dc;
 import org.joml.Vector3fc;
 
-import java.util.Locale;
-import java.util.Optional;
-import java.util.function.Function;
-
 public interface EmitterShape {
 
     Vector3d getPoint(RandomSource randomSource, Vector3fc dimensions, Vector3fc rotation, Vector3dc position, boolean fromSurface);

diff --git a/common/src/main/java/foundry/veil/api/quasar/particle/RenderData.java b/common/src/main/java/foundry/veil/api/quasar/particle/RenderData.java
@@ -17,8 +17,8 @@
 import org.joml.*;
 
 import java.lang.Math;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.List;
 
 public class RenderData {
 

diff --git a/common/src/main/java/foundry/veil/api/quasar/particle/RenderStyle.java b/common/src/main/java/foundry/veil/api/quasar/particle/RenderStyle.java
@@ -3,7 +3,6 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
 import foundry.veil.api.quasar.data.QuasarParticleData;
 import foundry.veil.api.quasar.registry.RenderStyleRegistry;
 import foundry.veil.api.util.CodecUtil;
@@ -13,8 +12,6 @@
 import org.joml.Vector3f;
 import org.joml.Vector3fc;
 
-import java.util.Locale;
-
 public interface RenderStyle {
     Codec<RenderStyle> CODEC = CodecUtil.registryOrLegacyCodec(RenderStyleRegistry.REGISTRY);
 

diff --git a/common/src/main/java/foundry/veil/api/quasar/registry/EmitterShapeRegistry.java b/common/src/main/java/foundry/veil/api/quasar/registry/EmitterShapeRegistry.java
@@ -1,12 +1,6 @@
 package foundry.veil.api.quasar.registry;
 
-import com.mojang.serialization.Codec;
 import foundry.veil.Veil;
-import foundry.veil.api.client.render.post.PostPipeline;
-import foundry.veil.api.client.render.post.stage.BlitPostStage;
-import foundry.veil.api.client.render.post.stage.CopyPostStage;
-import foundry.veil.api.client.render.post.stage.DepthFunctionPostStage;
-import foundry.veil.api.client.render.post.stage.MaskPostStage;
 import foundry.veil.api.quasar.emitters.shape.*;
 import foundry.veil.platform.registry.RegistrationProvider;
 import net.minecraft.core.Registry;

diff --git a/common/src/main/java/foundry/veil/api/quasar/registry/RenderStyleRegistry.java b/common/src/main/java/foundry/veil/api/quasar/registry/RenderStyleRegistry.java
@@ -1,8 +1,6 @@
 package foundry.veil.api.quasar.registry;
 
 import foundry.veil.Veil;
-import foundry.veil.api.quasar.emitters.shape.*;
-import foundry.veil.api.quasar.particle.RenderData;
 import foundry.veil.api.quasar.particle.RenderStyle;
 import foundry.veil.platform.registry.RegistrationProvider;
 import net.minecraft.core.Registry;

diff --git a/common/src/main/java/foundry/veil/api/resource/type/McMetaResource.java b/common/src/main/java/foundry/veil/api/resource/type/McMetaResource.java
@@ -1,8 +1,8 @@
 package foundry.veil.api.resource.type;
 
-import foundry.veil.api.resource.VeilResourceInfo;
 import foundry.veil.api.resource.VeilResource;
 import foundry.veil.api.resource.VeilResourceAction;
+import foundry.veil.api.resource.VeilResourceInfo;
 import net.minecraft.server.packs.resources.ResourceMetadata;
 
 import java.util.List;

diff --git a/common/src/main/java/foundry/veil/api/resource/type/TextureResource.java b/common/src/main/java/foundry/veil/api/resource/type/TextureResource.java
@@ -1,9 +1,9 @@
 package foundry.veil.api.resource.type;
 
 import foundry.veil.api.client.imgui.VeilImGuiUtil;
-import foundry.veil.api.resource.VeilResourceInfo;
 import foundry.veil.api.resource.VeilResource;
 import foundry.veil.api.resource.VeilResourceAction;
+import foundry.veil.api.resource.VeilResourceInfo;
 import imgui.ImGui;
 import imgui.flag.ImGuiCol;
 import imgui.flag.ImGuiStyleVar;

diff --git a/common/src/main/java/foundry/veil/api/resource/type/UnknownResource.java b/common/src/main/java/foundry/veil/api/resource/type/UnknownResource.java
@@ -1,8 +1,8 @@
 package foundry.veil.api.resource.type;
 
-import foundry.veil.api.resource.VeilResourceInfo;
 import foundry.veil.api.resource.VeilResource;
 import foundry.veil.api.resource.VeilResourceAction;
+import foundry.veil.api.resource.VeilResourceInfo;
 
 import java.util.List;
 

diff --git a/common/src/main/java/foundry/veil/api/util/CodecUtil.java b/common/src/main/java/foundry/veil/api/util/CodecUtil.java
@@ -1,11 +1,9 @@
 package foundry.veil.api.util;
 
 import com.mojang.datafixers.util.Either;
-import com.mojang.datafixers.util.Pair;
-import com.mojang.serialization.*;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
 import foundry.veil.Veil;
-import foundry.veil.api.quasar.emitters.shape.EmitterShape;
-import foundry.veil.api.quasar.registry.EmitterShapeRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -16,7 +14,6 @@
 import java.util.Locale;
 import java.util.Optional;
 import java.util.function.Function;
-import java.util.stream.Stream;
 
 public class CodecUtil {
 

diff --git a/common/src/main/java/foundry/veil/impl/client/editor/DemoEditor.java b/common/src/main/java/foundry/veil/impl/client/editor/DemoEditor.java
@@ -6,7 +6,6 @@
 import imgui.type.ImBoolean;
 import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 @ApiStatus.Internal
 public class DemoEditor implements Editor {

diff --git a/common/src/main/java/foundry/veil/impl/client/editor/OpenCLEditor.java b/common/src/main/java/foundry/veil/impl/client/editor/OpenCLEditor.java
@@ -9,7 +9,6 @@
 import imgui.ImGui;
 import imgui.flag.ImGuiDataType;
 import imgui.type.ImInt;
-import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;

diff --git a/common/src/main/java/foundry/veil/impl/client/editor/PostEditor.java b/common/src/main/java/foundry/veil/impl/client/editor/PostEditor.java
@@ -12,7 +12,6 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/common/src/main/java/foundry/veil/impl/client/imgui/InactiveVeilImGuiImpl.java b/common/src/main/java/foundry/veil/impl/client/imgui/InactiveVeilImGuiImpl.java
@@ -1,10 +1,8 @@
 package foundry.veil.impl.client.imgui;
 
 import foundry.veil.api.client.imgui.VeilImGui;
-import imgui.ImFont;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.function.ObjIntConsumer;
 

diff --git a/common/src/main/java/foundry/veil/impl/client/imgui/style/VeilImGuiStylesheet.java b/common/src/main/java/foundry/veil/impl/client/imgui/style/VeilImGuiStylesheet.java
@@ -6,8 +6,6 @@
 import imgui.flag.ImGuiCol;
 import imgui.flag.ImGuiDir;
 
-import java.io.IOException;
-
 public class VeilImGuiStylesheet {
 
     public static void initStyles() {

diff --git a/...rc/main/java/foundry/veil/impl/client/render/shader/modifier/InputShaderModification.java b/...rc/main/java/foundry/veil/impl/client/render/shader/modifier/InputShaderModification.java
@@ -7,8 +7,6 @@
 import org.jetbrains.annotations.ApiStatus;
 
 import java.io.IOException;
-import java.util.function.Supplier;
-import java.util.regex.Matcher;
 
 @ApiStatus.Internal
 public class InputShaderModification implements ShaderModification {

diff --git a/...c/main/java/foundry/veil/impl/client/render/shader/modifier/SimpleShaderModification.java b/...c/main/java/foundry/veil/impl/client/render/shader/modifier/SimpleShaderModification.java
@@ -16,7 +16,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
-import java.util.Objects;
 import java.util.regex.Matcher;
 
 @ApiStatus.Internal

diff --git a/common/src/main/java/foundry/veil/impl/compat/SodiumShaderMap.java b/common/src/main/java/foundry/veil/impl/compat/SodiumShaderMap.java
@@ -1,16 +1,11 @@
 package foundry.veil.impl.compat;
 
 import foundry.veil.Veil;
-import it.unimi.dsi.fastutil.ints.IntSet;
-import it.unimi.dsi.fastutil.ints.IntSets;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMaps;
-import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
 
-import java.util.Collections;
-import java.util.Set;
 import java.util.function.Supplier;
 
 @ApiStatus.Internal

diff --git a/common/src/main/java/foundry/veil/impl/resource/action/FramebufferEditAction.java b/common/src/main/java/foundry/veil/impl/resource/action/FramebufferEditAction.java
@@ -6,7 +6,6 @@
 import foundry.veil.api.resource.type.FramebufferResource;
 import net.minecraft.network.chat.Component;
 
-import java.util.Comparator;
 import java.util.OptionalInt;
 
 public class FramebufferEditAction implements VeilResourceAction<FramebufferResource> {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     import org.jetbrains.annotations.NotNull;
-    import java.util.regex.Matcher;
     import java.util.regex.Pattern;
     /**
@@ Expand Down @@