mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-16 18:45:09 +00:00
Fix CompositeModel not respecting "display" transforms.
Remove leftovers from discarded feature.
This commit is contained in:
1 parent
ecb56054bc
commit
ca031ca33f
5 files changed
+36
-211
No files matched your search
@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableMap;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.renderer.model.*;
|
||||
@@ -51,14 +52,16 @@ public class CompositeModel implements IBakedModel
|
||||
private final boolean isGui3d;
|
||||
private final TextureAtlasSprite particle;
|
||||
private final ItemOverrideList overrides;
|
||||
private final IModelTransform transforms;
|
||||
|
||||
public CompositeModel(boolean isGui3d, boolean isAmbientOcclusion, TextureAtlasSprite particle, ImmutableMap<String, IBakedModel> bakedParts, ItemOverrideList overrides)
|
||||
public CompositeModel(boolean isGui3d, boolean isAmbientOcclusion, TextureAtlasSprite particle, ImmutableMap<String, IBakedModel> bakedParts, IModelTransform combinedTransform, ItemOverrideList overrides)
|
||||
{
|
||||
this.bakedParts = bakedParts;
|
||||
this.isAmbientOcclusion = isAmbientOcclusion;
|
||||
this.isGui3d = isGui3d;
|
||||
this.particle = particle;
|
||||
this.overrides = overrides;
|
||||
this.transforms = combinedTransform;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -116,6 +119,18 @@ public class CompositeModel implements IBakedModel
|
||||
return overrides;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doesHandlePerspectives()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat)
|
||||
{
|
||||
return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType, mat);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public IBakedModel getPart(String name)
|
||||
{
|
||||
@@ -218,7 +233,7 @@ public class CompositeModel implements IBakedModel
|
||||
continue;
|
||||
bakedParts.put(part.getKey(), submodel.func_225613_a_(bakery, spriteGetter, modelTransform, modelLocation));
|
||||
}
|
||||
return new CompositeModel(owner.isShadedInGui(), owner.useSmoothLighting(), particle, bakedParts.build(), overrides);
|
||||
return new CompositeModel(owner.isShadedInGui(), owner.useSmoothLighting(), particle, bakedParts.build(), owner.getCombinedTransform(), overrides);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -338,46 +338,6 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
return Optional.ofNullable(parts.get(name));
|
||||
}
|
||||
|
||||
public VertexFormat calculateBestVertexFormat(@Nullable VertexFormat base)
|
||||
{
|
||||
List<VertexFormatElement> elements = Lists.newArrayList(base.func_227894_c_());
|
||||
|
||||
addElementIfNotPresent(elements, DefaultVertexFormats.POSITION_3F);
|
||||
|
||||
if (texCoords.size() > 0)
|
||||
{
|
||||
addElementIfNotPresent(elements, DefaultVertexFormats.TEX_2F);
|
||||
}
|
||||
|
||||
if (normals.size() > 0)
|
||||
{
|
||||
addElementIfNotPresent(elements, DefaultVertexFormats.NORMAL_3B);
|
||||
addElementIfNotPresent(elements, DefaultVertexFormats.PADDING_1B);
|
||||
}
|
||||
|
||||
if (colors.size() > 0)
|
||||
{
|
||||
addElementIfNotPresent(elements, DefaultVertexFormats.COLOR_4UB);
|
||||
}
|
||||
|
||||
if (ambientToFullbright && parts.values().stream().anyMatch(ModelGroup::hasAnyFullBright))
|
||||
{
|
||||
addElementIfNotPresent(elements, DefaultVertexFormats.TEX_2S);
|
||||
}
|
||||
|
||||
return new VertexFormat(ImmutableList.copyOf(elements));
|
||||
}
|
||||
|
||||
private static void addElementIfNotPresent(List<VertexFormatElement> fmt, VertexFormatElement element)
|
||||
{
|
||||
for(VertexFormatElement e : fmt)
|
||||
{
|
||||
if (e.getUsage() == element.getUsage() && e.getIndex() == element.getIndex())
|
||||
return;
|
||||
}
|
||||
fmt.add(element);
|
||||
}
|
||||
|
||||
private Pair<BakedQuad,Direction> makeQuad(int[][] indices, int tintIndex, Vector4f colorTint, Vector4f ambientColor, boolean isFullbright, TextureAtlasSprite texture, VertexFormat format, TransformationMatrix transform)
|
||||
{
|
||||
boolean needsNormalRecalculation = false;
|
||||
@@ -539,23 +499,6 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
public BakedGeometryRenderable<Void> bakeRenderable()
|
||||
{
|
||||
return bakeRenderable(DummyAtlasSprite.GETTER);
|
||||
}
|
||||
|
||||
public BakedGeometryRenderable<Void> bakeRenderable(Function<ResourceLocation, TextureAtlasSprite> spriteGetter)
|
||||
{
|
||||
return BakedGeometryRenderable.of(GL11.GL_QUADS, calculateBestVertexFormat(null), ((bufferBuilder, fmt) -> {
|
||||
this.addQuads(
|
||||
new StandaloneModelConfiguration("", true, diffuseLighting),
|
||||
new VertexBufferModelBuilder(bufferBuilder),
|
||||
null, spriteGetter, SimpleModelTransform.IDENTITY, fmt);
|
||||
}));
|
||||
}
|
||||
*/
|
||||
|
||||
public class ModelObject implements IModelGeometryPart
|
||||
{
|
||||
public final String name;
|
||||
@@ -668,86 +611,4 @@ public class OBJModel implements IMultipartModelGeometry<OBJModel>
|
||||
return mat != null && TransformationHelper.epsilonEquals(mat.ambientColor, new Vector4f(1,1,1,1), 1/256f);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
private static class VertexBufferModelBuilder implements IModelBuilder<VertexBufferModelBuilder>
|
||||
{
|
||||
private final BufferBuilder bufferBuilder;
|
||||
|
||||
public VertexBufferModelBuilder(BufferBuilder bufferBuilder)
|
||||
{
|
||||
this.bufferBuilder = bufferBuilder;
|
||||
}
|
||||
|
||||
@Override
|
||||
public VertexBufferModelBuilder addFaceQuad(Direction facing, BakedQuad quad)
|
||||
{
|
||||
LightUtil.renderQuadColor(bufferBuilder, quad, -1);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public VertexBufferModelBuilder addGeneralQuad(BakedQuad quad)
|
||||
{
|
||||
LightUtil.renderQuadColor(bufferBuilder, quad, -1);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel build()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static class StandaloneModelConfiguration implements IModelConfiguration
|
||||
{
|
||||
private final String modelName;
|
||||
private final boolean diffuseLighting;
|
||||
private final boolean directionalLighting;
|
||||
|
||||
private StandaloneModelConfiguration(String modelName, boolean directionalLighting, boolean diffuseLighting)
|
||||
{
|
||||
this.modelName = modelName;
|
||||
this.directionalLighting = directionalLighting;
|
||||
this.diffuseLighting = diffuseLighting;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModelName()
|
||||
{
|
||||
return modelName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Material resolveTexture(String name)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isShadedInGui()
|
||||
{
|
||||
return directionalLighting;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean useSmoothLighting()
|
||||
{
|
||||
return diffuseLighting;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemCameraTransforms getCameraTransforms()
|
||||
{
|
||||
return ItemCameraTransforms.DEFAULT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IModelTransform getCombinedTransform()
|
||||
{
|
||||
return SimpleModelTransform.IDENTITY;
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
Reference in new issue
Block a user