mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-20 20:32:14 +00:00
Custom images, textures, SSBO, and ShaderPack/ShaderProperties backports
This commit is contained in:
1 parent
6d60477b93
commit
bb52476d27
54 files changed
+2210
-494
No files matched your search
@@ -1,10 +1,16 @@
|
||||
package net.coderbot.iris.pipeline;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor;
|
||||
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
|
||||
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
|
||||
import lombok.Getter;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gl.texture.GlTexture;
|
||||
import net.coderbot.iris.gl.texture.TextureAccess;
|
||||
import net.coderbot.iris.gl.texture.TextureType;
|
||||
import net.coderbot.iris.gl.texture.TextureWrapper;
|
||||
import net.coderbot.iris.rendertarget.NativeImageBackedCustomTexture;
|
||||
import net.coderbot.iris.rendertarget.NativeImageBackedNoiseTexture;
|
||||
import net.coderbot.iris.shaderpack.PackDirectives;
|
||||
@@ -29,24 +35,25 @@ import java.util.ArrayList;
|
||||
import java.util.EnumMap;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.function.IntSupplier;
|
||||
|
||||
public class CustomTextureManager {
|
||||
private final EnumMap<TextureStage, Object2ObjectMap<String, IntSupplier>> customTextureIdMap = new EnumMap<>(TextureStage.class);
|
||||
private final IntSupplier noise;
|
||||
@Getter private final EnumMap<TextureStage, Object2ObjectMap<String, TextureAccess>> customTextureIdMap = new EnumMap<>(TextureStage.class);
|
||||
@Getter private final Object2ObjectMap<String, TextureAccess> irisCustomTextures = new Object2ObjectOpenHashMap<>();
|
||||
private final TextureAccess noise;
|
||||
|
||||
/**
|
||||
* List of all OpenGL texture objects owned by this CustomTextureManager that need to be deleted in order to avoid
|
||||
* leaks.
|
||||
* List of all OpenGL texture objects owned by this CustomTextureManager that need to be deleted in order to avoid leaks.
|
||||
* Make sure any textures added to this list call releaseId from the close method.
|
||||
*/
|
||||
private final List<AbstractTexture> ownedTextures = new ArrayList<>();
|
||||
private final List<GlTexture> ownedRawTextures = new ArrayList<>();
|
||||
|
||||
public CustomTextureManager(PackDirectives packDirectives,
|
||||
EnumMap<TextureStage, Object2ObjectMap<String, CustomTextureData>> customTextureDataMap,
|
||||
Object2ObjectMap<String, CustomTextureData> irisCustomTextureDataMap,
|
||||
Optional<CustomTextureData> customNoiseTextureData) {
|
||||
customTextureDataMap.forEach((textureStage, customTextureStageDataMap) -> {
|
||||
Object2ObjectMap<String, IntSupplier> customTextureIds = new Object2ObjectOpenHashMap<>();
|
||||
final Object2ObjectMap<String, TextureAccess> customTextureIds = new Object2ObjectOpenHashMap<>();
|
||||
|
||||
customTextureStageDataMap.forEach((samplerName, textureData) -> {
|
||||
try {
|
||||
@@ -60,6 +67,14 @@ public class CustomTextureManager {
|
||||
customTextureIdMap.put(textureStage, customTextureIds);
|
||||
});
|
||||
|
||||
irisCustomTextureDataMap.forEach((name, texture) -> {
|
||||
try {
|
||||
irisCustomTextures.put(name, createCustomTexture(texture));
|
||||
} catch (IOException e) {
|
||||
Iris.logger.error("Unable to parse the image data for the custom texture on sampler " + name, e);
|
||||
}
|
||||
});
|
||||
|
||||
noise = customNoiseTextureData.flatMap(textureData -> {
|
||||
try {
|
||||
return Optional.of(createCustomTexture(textureData));
|
||||
@@ -71,75 +86,85 @@ public class CustomTextureManager {
|
||||
}).orElseGet(() -> {
|
||||
final int noiseTextureResolution = packDirectives.getNoiseTextureResolution();
|
||||
|
||||
AbstractTexture texture = new NativeImageBackedNoiseTexture(noiseTextureResolution);
|
||||
final AbstractTexture texture = new NativeImageBackedNoiseTexture(noiseTextureResolution);
|
||||
ownedTextures.add(texture);
|
||||
|
||||
return texture::getGlTextureId;
|
||||
return new TextureWrapper(texture::getGlTextureId, TextureType.TEXTURE_2D);
|
||||
});
|
||||
}
|
||||
|
||||
private IntSupplier createCustomTexture(CustomTextureData textureData) throws IOException {
|
||||
private TextureAccess createCustomTexture(CustomTextureData textureData) throws IOException {
|
||||
if (textureData instanceof CustomTextureData.PngData) {
|
||||
AbstractTexture texture = new NativeImageBackedCustomTexture((CustomTextureData.PngData) textureData);
|
||||
final AbstractTexture texture = new NativeImageBackedCustomTexture((CustomTextureData.PngData) textureData);
|
||||
ownedTextures.add(texture);
|
||||
|
||||
return texture::getGlTextureId;
|
||||
}
|
||||
// TODO: Iris
|
||||
// else if (textureData instanceof CustomTextureData.LightmapMarker) {
|
||||
// // Special code path for the light texture. While shader packs hardcode the primary light texture, it's
|
||||
// // possible that a mod will create a different light texture, so this code path is robust to that.
|
||||
// return () -> ((LightTextureAccessor) Minecraft.getMinecraft().gameRenderer.lightTexture()).getLightTexture().getId();
|
||||
// }
|
||||
else if (textureData instanceof CustomTextureData.ResourceData) {
|
||||
CustomTextureData.ResourceData resourceData = (CustomTextureData.ResourceData) textureData;
|
||||
String namespace = resourceData.getNamespace();
|
||||
return new TextureWrapper(texture::getGlTextureId, TextureType.TEXTURE_2D);
|
||||
} else if (textureData instanceof CustomTextureData.LightmapMarker) {
|
||||
// Special code path for the light texture. While shader packs hardcode the primary light texture, it's possible that a mod will
|
||||
// create a different light texture, so this code path is robust to that.
|
||||
return new TextureWrapper(() -> ((EntityRendererAccessor) Minecraft.getMinecraft().entityRenderer).getLightmapTexture().getGlTextureId(), TextureType.TEXTURE_2D);
|
||||
} else if (textureData instanceof CustomTextureData.RawData1D rawData) {
|
||||
final GlTexture texture = new GlTexture(TextureType.TEXTURE_1D, rawData.getSizeX(), 0, 0, rawData.getInternalFormat().getGlFormat(), rawData.getPixelFormat().getGlFormat(), rawData.getPixelType().getGlFormat(), rawData.getContent(), rawData.getFilteringData());
|
||||
ownedRawTextures.add(texture);
|
||||
return texture;
|
||||
} else if (textureData instanceof CustomTextureData.RawDataRect rawData) {
|
||||
final GlTexture texture = new GlTexture(TextureType.TEXTURE_RECTANGLE, rawData.getSizeX(), rawData.getSizeY(), 0, rawData.getInternalFormat().getGlFormat(), rawData.getPixelFormat().getGlFormat(), rawData.getPixelType().getGlFormat(), rawData.getContent(), rawData.getFilteringData());
|
||||
ownedRawTextures.add(texture);
|
||||
return texture;
|
||||
} else if (textureData instanceof CustomTextureData.RawData2D rawData) {
|
||||
final GlTexture texture = new GlTexture(TextureType.TEXTURE_2D, rawData.getSizeX(), rawData.getSizeY(), 0, rawData.getInternalFormat().getGlFormat(), rawData.getPixelFormat().getGlFormat(), rawData.getPixelType().getGlFormat(), rawData.getContent(), rawData.getFilteringData());
|
||||
ownedRawTextures.add(texture);
|
||||
return texture;
|
||||
} else if (textureData instanceof CustomTextureData.RawData3D rawData) {
|
||||
final GlTexture texture = new GlTexture(TextureType.TEXTURE_3D, rawData.getSizeX(), rawData.getSizeY(), rawData.getSizeZ(), rawData.getInternalFormat().getGlFormat(), rawData.getPixelFormat().getGlFormat(), rawData.getPixelType().getGlFormat(), rawData.getContent(), rawData.getFilteringData());
|
||||
ownedRawTextures.add(texture);
|
||||
return texture;
|
||||
} else if (textureData instanceof CustomTextureData.ResourceData resourceData) {
|
||||
final String namespace = resourceData.getNamespace();
|
||||
String location = resourceData.getLocation();
|
||||
|
||||
String withoutExtension;
|
||||
int extensionIndex = FilenameUtils.indexOfExtension(location);
|
||||
final String withoutExtension;
|
||||
final int extensionIndex = FilenameUtils.indexOfExtension(location);
|
||||
if (extensionIndex != -1) {
|
||||
withoutExtension = location.substring(0, extensionIndex);
|
||||
} else {
|
||||
withoutExtension = location;
|
||||
}
|
||||
PBRType pbrType = PBRType.fromFileLocation(withoutExtension);
|
||||
final PBRType pbrType = PBRType.fromFileLocation(withoutExtension);
|
||||
|
||||
TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
|
||||
final TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
|
||||
|
||||
if (pbrType == null) {
|
||||
ResourceLocation textureLocation = new ResourceLocation(namespace, location);
|
||||
final ResourceLocation textureLocation = new ResourceLocation(namespace, location);
|
||||
|
||||
// NB: We have to re-query the TextureManager for the texture object every time. This is because the
|
||||
// AbstractTexture object could be removed / deleted from the TextureManager on resource reloads,
|
||||
// and we could end up holding on to a deleted texture unless we added special code to handle resource
|
||||
// reloads. Re-fetching the texture from the TextureManager every time is the most robust approach for
|
||||
// now.
|
||||
return () -> {
|
||||
ITextureObject texture = textureManager.getTexture(textureLocation);
|
||||
|
||||
// TODO: Should we give something else if the texture isn't there? This will need some thought
|
||||
return new TextureWrapper(() -> {
|
||||
final ITextureObject texture = textureManager.getTexture(textureLocation);
|
||||
return texture != null ? texture.getGlTextureId() : TextureUtil.missingTexture.getGlTextureId();
|
||||
};
|
||||
}, TextureType.TEXTURE_2D);
|
||||
} else {
|
||||
location = location.substring(0, extensionIndex - pbrType.getSuffix().length()) + location.substring(extensionIndex);
|
||||
ResourceLocation textureLocation = new ResourceLocation(namespace, location);
|
||||
final ResourceLocation textureLocation = new ResourceLocation(namespace, location);
|
||||
|
||||
return () -> {
|
||||
ITextureObject texture = textureManager.getTexture(textureLocation);
|
||||
return new TextureWrapper(() -> {
|
||||
final ITextureObject texture = textureManager.getTexture(textureLocation);
|
||||
|
||||
if (texture != null) {
|
||||
int id = texture.getGlTextureId();
|
||||
PBRTextureHolder pbrHolder = PBRTextureManager.INSTANCE.getOrLoadHolder(id);
|
||||
AbstractTexture pbrTexture = switch (pbrType) {
|
||||
final int id = texture.getGlTextureId();
|
||||
final PBRTextureHolder pbrHolder = PBRTextureManager.INSTANCE.getOrLoadHolder(id);
|
||||
final AbstractTexture pbrTexture = switch (pbrType) {
|
||||
case NORMAL -> pbrHolder.getNormalTexture();
|
||||
case SPECULAR -> pbrHolder.getSpecularTexture();
|
||||
default -> throw new Error("Unknown PBRType '" + pbrType + "'");
|
||||
default -> throw new IllegalArgumentException("Unknown PBRType '" + pbrType + "'");
|
||||
};
|
||||
|
||||
TextureFormat textureFormat = TextureFormatLoader.getFormat();
|
||||
final TextureFormat textureFormat = TextureFormatLoader.getFormat();
|
||||
if (textureFormat != null) {
|
||||
int previousBinding = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
|
||||
final int previousBinding = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, pbrTexture.getGlTextureId());
|
||||
textureFormat.setupTextureParameters(pbrType, pbrTexture);
|
||||
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, previousBinding);
|
||||
@@ -148,29 +173,26 @@ public class CustomTextureManager {
|
||||
return pbrTexture.getGlTextureId();
|
||||
}
|
||||
|
||||
// return MissingTextureAtlasSprite.getTexture().getId();
|
||||
return TextureUtil.missingTexture.getGlTextureId();
|
||||
};
|
||||
}, TextureType.TEXTURE_2D);
|
||||
}
|
||||
} else {
|
||||
throw new IllegalArgumentException("Unable to handle custom texture data " + textureData);
|
||||
}
|
||||
throw new IllegalArgumentException("Unable to handle custom texture data " + textureData);
|
||||
}
|
||||
|
||||
public EnumMap<TextureStage, Object2ObjectMap<String, IntSupplier>> getCustomTextureIdMap() {
|
||||
return customTextureIdMap;
|
||||
}
|
||||
|
||||
public Object2ObjectMap<String, IntSupplier> getCustomTextureIdMap(TextureStage stage) {
|
||||
public Object2ObjectMap<String, TextureAccess> getCustomTextureIdMap(TextureStage stage) {
|
||||
return customTextureIdMap.getOrDefault(stage, Object2ObjectMaps.emptyMap());
|
||||
}
|
||||
|
||||
public IntSupplier getNoiseTexture() {
|
||||
public TextureAccess getNoiseTexture() {
|
||||
return noise;
|
||||
}
|
||||
|
||||
public void destroy() {
|
||||
// TODO :Iris
|
||||
// ownedTextures.forEach(AbstractTexture::close);
|
||||
public void destroy() {
|
||||
ownedTextures.forEach(AbstractTexture::deleteGlTexture);
|
||||
ownedTextures.clear();
|
||||
|
||||
ownedRawTextures.forEach(GlTexture::destroy);
|
||||
ownedRawTextures.clear();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user