New batch of Model/rendering fixes:

- PerspectiveMapWrapper did not pass IModelData through to the wrapped model.
- CompositeModel did not store the returned textures from getTextureDependencies.
- VertexFormat used COLOR instead of UV to detect UV presence.
- QuadTransformer would crash due to index out of bounds.
- Small cleanup of TransformationHelper
This commit is contained in:
David Quintana committed 2019-12-24 13:12:38 +01:00
1 parent ac61018806
commit e8ce61d4cd
8 files changed
+43 -27

No files matched your search

@@ -33,6 +33,7 @@ import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraft.world.World;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.common.model.TransformationHelper;
import javax.annotation.Nullable;
@@ -130,7 +131,10 @@ public class PerspectiveMapWrapper implements IBakedModel
@SuppressWarnings("deprecation")
@Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); }
@Override public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand) { return parent.getQuads(state, side, rand); }
@Override public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData extraData)
{
return parent.getQuads(state, side, rand, extraData);
}
@Override
public ItemOverrideList getOverrides()
@@ -48,9 +48,9 @@ public class QuadTransformer
private void processVertices(int[] inData, int[] outData)
{
// TODO: Extract rotation matrix and fix NORMALs if present.
int stride = format.getIntegerSize();
for (int i=0;i<4;i++)
int count = inData.length / stride;
for (int i=0;i<count;i++)
{
int offset = positionOffset + i * stride;
float x = Float.intBitsToFloat(inData[offset ]);
@@ -68,7 +68,7 @@ public class QuadTransformer
if (normalOffset >= 0)
{
for (int i=0;i<4;i++)
for (int i=0;i<count;i++)
{
int offset = normalOffset + i * stride;
int normalIn = inData[offset];
@@ -27,7 +27,6 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
@@ -84,7 +83,7 @@ public class CompositeModel implements IBakedModel
{
quads.addAll(part.getQuads(state, side, rand, EmptyModelData.INSTANCE));
}
return null;
return quads;
}
@Override
@@ -228,7 +227,7 @@ public class CompositeModel implements IBakedModel
Set<Material> textures = new HashSet<>();
for(Submodel part : parts.values())
{
part.getTextureDependencies(owner, modelGetter, missingTextureErrors);
textures.addAll(part.getTextureDependencies(owner, modelGetter, missingTextureErrors));
}
return textures;
}