Remove custom vertex format from BakedQuad

This commit is contained in:
tterrag committed 2020-01-04 23:36:56 -05:00
1 parent b6c12f5fff
commit 90035ab084
22 files changed
+390 -523

No files matched your search

@@ -19,7 +19,13 @@
package net.minecraftforge.debug.client.model;
import java.util.List;
import java.util.Random;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
@@ -37,8 +43,11 @@ import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.model.QuadTransformer;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
import net.minecraftforge.client.model.pipeline.TRSRTransformer;
import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.model.TransformationHelper;
import net.minecraftforge.event.RegistryEvent;
@@ -47,10 +56,6 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.ObjectHolder;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Random;
@Mod(TRSRTransformerTest.MODID)
public class TRSRTransformerTest {
public static final String MODID = "trsr_transformer_test";
@@ -71,7 +76,7 @@ public class TRSRTransformerTest {
}
}
public class MyBakedModel implements IBakedModel
public class MyBakedModel implements IDynamicBakedModel
{
private final IBakedModel base;
@@ -80,7 +85,7 @@ public class TRSRTransformerTest {
}
@Override
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand) {
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData data) {
ImmutableList.Builder<BakedQuad> quads = new ImmutableList.Builder<>();
Quaternion rot = TransformationHelper.quatFromXYZ(new Vector3f(0, 45, 0), true);
@@ -88,11 +93,11 @@ public class TRSRTransformerTest {
TransformationMatrix trans = new TransformationMatrix(translation, rot, null, null).blockCenterToCorner();
for (BakedQuad quad : base.getQuads(state, side, rand)) {
for (BakedQuad quad : base.getQuads(state, side, rand, data)) {
if(true)
{
UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(quad.getFormat());
BakedQuadBuilder builder = new BakedQuadBuilder();
TRSRTransformer transformer = new TRSRTransformer(builder, trans);
@@ -102,7 +107,7 @@ public class TRSRTransformerTest {
}
else
{
QuadTransformer qt = new QuadTransformer(quad.getFormat(), trans);
QuadTransformer qt = new QuadTransformer(trans);
quads.add(qt.processOne(quad));
}
}