keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fixed both RenderAllExcept behaviours

This commit is contained in:
MachineMuse 2013-06-29 23:24:03 -06:00
parent 0f25e6ec6b
commit ca011729d3
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
client/net/minecraftforge/client/model/obj/WavefrontObject.java
View File

@ -232,29 +232,41 @@ public class WavefrontObject implements IModelCustom
public void renderAllExcept(String... excludedGroupNames) public void renderAllExcept(String... excludedGroupNames)
{ {
boolean exclude;
for (GroupObject groupObject : groupObjects) for (GroupObject groupObject : groupObjects)
{ {
exclude=false;
for (String excludedGroupName : excludedGroupNames) for (String excludedGroupName : excludedGroupNames)
{ {
if (!excludedGroupName.equalsIgnoreCase(groupObject.name)) if (excludedGroupName.equalsIgnoreCase(groupObject.name))
{ {
groupObject.render(); exclude=true;
} }
} }
if(!exclude)
{
groupObject.render();
}
} }
} }
public void tessellateAllExcept(Tessellator tessellator, String... excludedGroupNames) public void tessellateAllExcept(Tessellator tessellator, String... excludedGroupNames)
{ {
boolean exclude;
for (GroupObject groupObject : groupObjects) for (GroupObject groupObject : groupObjects)
{ {
exclude=false;
for (String excludedGroupName : excludedGroupNames) for (String excludedGroupName : excludedGroupNames)
{ {
if (!excludedGroupName.equalsIgnoreCase(groupObject.name)) if (excludedGroupName.equalsIgnoreCase(groupObject.name))
{ {
groupObject.render(tessellator); exclude=true;
} }
} }
if(!exclude)
{
groupObject.render(tessellator);
}
} }
} }
@ -388,7 +400,7 @@ public class WavefrontObject implements IModelCustom
face.vertices = new Vertex[tokens.length]; face.vertices = new Vertex[tokens.length];
face.textureCoordinates = new TextureCoordinate[tokens.length]; face.textureCoordinates = new TextureCoordinate[tokens.length];
face.vertexNormals = new Vertex[tokens.length]; face.vertexNormals = new Vertex[tokens.length];
for (int i = 0; i < tokens.length; ++i) for (int i = 0; i < tokens.length; ++i)
{ {
subTokens = tokens[i].split("/"); subTokens = tokens[i].split("/");
@ -405,7 +417,7 @@ public class WavefrontObject implements IModelCustom
{ {
face.vertices = new Vertex[tokens.length]; face.vertices = new Vertex[tokens.length];
face.textureCoordinates = new TextureCoordinate[tokens.length]; face.textureCoordinates = new TextureCoordinate[tokens.length];
for (int i = 0; i < tokens.length; ++i) for (int i = 0; i < tokens.length; ++i)
{ {
subTokens = tokens[i].split("/"); subTokens = tokens[i].split("/");
@ -421,7 +433,7 @@ public class WavefrontObject implements IModelCustom
{ {
face.vertices = new Vertex[tokens.length]; face.vertices = new Vertex[tokens.length];
face.vertexNormals = new Vertex[tokens.length]; face.vertexNormals = new Vertex[tokens.length];
for (int i = 0; i < tokens.length; ++i) for (int i = 0; i < tokens.length; ++i)
{ {
subTokens = tokens[i].split("//"); subTokens = tokens[i].split("//");
@ -436,7 +448,7 @@ public class WavefrontObject implements IModelCustom
else if (isValidFace_V_Line(line)) else if (isValidFace_V_Line(line))
{ {
face.vertices = new Vertex[tokens.length]; face.vertices = new Vertex[tokens.length];
for (int i = 0; i < tokens.length; ++i) for (int i = 0; i < tokens.length; ++i)
{ {
face.vertices[i] = vertices.get(Integer.parseInt(tokens[i]) - 1); face.vertices[i] = vertices.get(Integer.parseInt(tokens[i]) - 1);