From 0443ef5a9e9a31259b17702b720fa8f03e627285 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 5 Sep 2013 09:14:10 -0400 Subject: [PATCH] MachineMuse, remember, there's TWO model formats supported! --- .../client/model/obj/WavefrontObject.java | 10 +++-- .../client/model/techne/TechneModel.java | 37 +++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/client/net/minecraftforge/client/model/obj/WavefrontObject.java b/client/net/minecraftforge/client/model/obj/WavefrontObject.java index d39eba878b..20f9045104 100644 --- a/client/net/minecraftforge/client/model/obj/WavefrontObject.java +++ b/client/net/minecraftforge/client/model/obj/WavefrontObject.java @@ -169,6 +169,7 @@ public class WavefrontObject implements IModelCustom } } + @Override public void renderAll() { Tessellator tessellator = Tessellator.instance; @@ -194,6 +195,7 @@ public class WavefrontObject implements IModelCustom } } + @Override public void renderOnly(String... groupNames) { for (GroupObject groupObject : groupObjects) @@ -221,6 +223,7 @@ public class WavefrontObject implements IModelCustom } } + @Override public void renderPart(String partName) { for (GroupObject groupObject : groupObjects) @@ -244,18 +247,17 @@ public class WavefrontObject implements IModelCustom public void renderAllExcept(String... excludedGroupNames) { - boolean exclude; for (GroupObject groupObject : groupObjects) { - exclude=false; + boolean skipPart=false; for (String excludedGroupName : excludedGroupNames) { if (excludedGroupName.equalsIgnoreCase(groupObject.name)) { - exclude=true; + skipPart=true; } } - if(!exclude) + if(!skipPart) { groupObject.render(); } diff --git a/client/net/minecraftforge/client/model/techne/TechneModel.java b/client/net/minecraftforge/client/model/techne/TechneModel.java index 66a32aa9b3..d826ac65f3 100644 --- a/client/net/minecraftforge/client/model/techne/TechneModel.java +++ b/client/net/minecraftforge/client/model/techne/TechneModel.java @@ -37,6 +37,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.client.model.ModelFormatException; +import net.minecraftforge.client.model.obj.GroupObject; /** * Techne model importer, based on iChun's Hats importer @@ -298,4 +299,40 @@ public class TechneModel extends ModelBase implements IModelCustom { part.renderWithRotation(1.0F); } } + + @Override + public void renderOnly(String... groupNames) + { + bindTexture(); + for (ModelRenderer part : parts.values()) + { + for (String groupName : groupNames) + { + if (groupName.equalsIgnoreCase(part.boxName)) + { + part.render(1.0f); + } + } + } + } + + @Override + public void renderAllExcept(String... excludedGroupNames) + { + for (ModelRenderer part : parts.values()) + { + boolean skipPart=false; + for (String excludedGroupName : excludedGroupNames) + { + if (excludedGroupName.equalsIgnoreCase(part.boxName)) + { + skipPart=true; + } + } + if(!skipPart) + { + part.render(1.0f); + } + } + } }