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

OBJ model: use original vertex material when defining face.

Browse source
This commit is contained in:
RainWarrior 2015-11-03 01:53:24 +03:00
parent bdbcf31fc2
commit cf8972262a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/net/minecraftforge/client/model/obj/OBJModel.java
View file

@ -301,7 +301,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
norm = Integer.parseInt(splitSlash[i][1]); norm = Integer.parseInt(splitSlash[i][1]);
norm = norm < 0 ? this.normals.size() - 1 : norm - 1; norm = norm < 0 ? this.normals.size() - 1 : norm - 1;
Vertex newV = new Vertex(new Vector4f(this.vertices.get(vert).getPos()), material); Vertex newV = new Vertex(new Vector4f(this.vertices.get(vert).getPos()), this.vertices.get(vert).getMaterial());
newV.setNormal(this.normals.get(norm)); newV.setNormal(this.normals.get(norm));
v.add(newV); v.add(newV);
@ -321,7 +321,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
norm = norm < 0 ? this.normals.size() - 1 : norm - 1; norm = norm < 0 ? this.normals.size() - 1 : norm - 1;
} }
Vertex newV = new Vertex(new Vector4f(this.vertices.get(vert).getPos()), material); Vertex newV = new Vertex(new Vector4f(this.vertices.get(vert).getPos()), this.vertices.get(vert).getMaterial());
newV.setTextureCoordinate(this.texCoords.get(texCoord)); newV.setTextureCoordinate(this.texCoords.get(texCoord));
newV.setNormal(splitSlash[i].length > 2 ? this.normals.get(norm) : null); newV.setNormal(splitSlash[i].length > 2 ? this.normals.get(norm) : null);
@ -336,7 +336,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
vert = Integer.parseInt(splitSlash[i][0]); vert = Integer.parseInt(splitSlash[i][0]);
vert = vert < 0 ? this.vertices.size() - 1 : vert - 1; vert = vert < 0 ? this.vertices.size() - 1 : vert - 1;
Vertex newV = new Vertex(new Vector4f(this.vertices.get(vert).getPos()), material); Vertex newV = new Vertex(new Vector4f(this.vertices.get(vert).getPos()), this.vertices.get(vert).getMaterial());
v.add(newV); v.add(newV);
} }
} }