GeyserMC-Mirror/Rainbow
1
0
Fork 0
mirror of https://github.com/GeyserMC/Rainbow.git synced 2025-12-19 14:59:16 +00:00
Code Issues Releases Activity

Increase max supported texture size when stitching textures for 3D models

Browse Source
This commit is contained in:
Eclipse
2025-10-27 16:23:21 +00:00
parent 371da30f10
commit 27aecbfed6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rainbow/src/main/java/org/geysermc/rainbow/mapping/texture/StitchedTextures.java
View File

@@ -23,6 +23,10 @@ import java.util.function.Supplier;
import java.util.stream.Stream; import java.util.stream.Stream;
public record StitchedTextures(Map<String, TextureAtlasSprite> sprites, Supplier<NativeImage> stitched, int width, int height) { public record StitchedTextures(Map<String, TextureAtlasSprite> sprites, Supplier<NativeImage> stitched, int width, int height) {
// Not sure if 16384 should be the max supported texture size, but it seems to work well enough.
// Max supported texture size seems to mostly be a driver thing, to not let the stitched texture get too big for uploading it to the GPU
// This is not an issue for us
private static final int MAX_TEXTURE_SIZE = 1 << 14;
public Optional<TextureAtlasSprite> getSprite(String key) { public Optional<TextureAtlasSprite> getSprite(String key) {
if (TextureSlotsAccessor.invokeIsTextureReference(key)) { if (TextureSlotsAccessor.invokeIsTextureReference(key)) {
@@ -48,8 +52,7 @@ public record StitchedTextures(Map<String, TextureAtlasSprite> sprites, Supplier
private static SpriteLoader.Preparations prepareStitching(Stream<ResourceLocation> textures, PackContext context) { private static SpriteLoader.Preparations prepareStitching(Stream<ResourceLocation> textures, PackContext context) {
// Atlas ID doesn't matter much here, but BLOCKS is the most appropriate // Atlas ID doesn't matter much here, but BLOCKS is the most appropriate
// Not sure if 1024 should be the max supported texture size, but it seems to work SpriteLoader spriteLoader = new SpriteLoader(AtlasIds.BLOCKS, MAX_TEXTURE_SIZE, 16, 16);
SpriteLoader spriteLoader = new SpriteLoader(AtlasIds.BLOCKS, 1024, 16, 16);
List<SpriteContents> sprites = textures.distinct() List<SpriteContents> sprites = textures.distinct()
.map(texture -> readSpriteContents(texture, context)) .map(texture -> readSpriteContents(texture, context))
.<SpriteContents>mapMulti(Optional::ifPresent) .<SpriteContents>mapMulti(Optional::ifPresent)