upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a derp in that we provision the various arrays for a face, even if we are not going to parse data into it. Solves NPEs for when obj models that don't have texture coordinates attempt to render.

Browse Source
This commit is contained in:
pahimar committed 2013-04-12 15:57:59 -04:00
1 parent 3818ffdf56
commit 6bb839e13c
2 files changed
+14 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/net/minecraftforge/client/model/obj/Face.java
+2 -2
View File
@@ -31,7 +31,7 @@ public class Face
float averageU = 0F;
float averageV = 0F;
if (textureCoordinates.length != 0)
if ((textureCoordinates != null) && (textureCoordinates.length != 0))
{
for (int i = 0; i < textureCoordinates.length; ++i)
{
@@ -48,7 +48,7 @@ public class Face
for (int i = 0; i < vertices.length; ++i)
{
if (textureCoordinates.length != 0)
if ((textureCoordinates != null) && (textureCoordinates.length != 0))
{
offsetU = textureOffset;
offsetV = textureOffset;
client/net/minecraftforge/client/model/obj/WavefrontObject.java
+12 -4
View File
@@ -341,13 +341,13 @@ public class WavefrontObject implements IModelCustom
}
}
face.vertices = new Vertex[tokens.length];
face.textureCoordinates = new TextureCoordinate[tokens.length];
face.vertexNormals = new Vertex[tokens.length];
// f v1/vt1/vn1 v2/vt2/vn2 v3/vt3/vn3 ...
if (isValidFace_V_VT_VN_Line(line))
{
face.vertices = new Vertex[tokens.length];
face.textureCoordinates = new TextureCoordinate[tokens.length];
face.vertexNormals = new Vertex[tokens.length];
for (int i = 0; i < tokens.length; ++i)
{
subTokens = tokens[i].split("/");
@@ -362,6 +362,9 @@ public class WavefrontObject implements IModelCustom
// f v1/vt1 v2/vt2 v3/vt3 ...
else if (isValidFace_V_VT_Line(line))
{
face.vertices = new Vertex[tokens.length];
face.textureCoordinates = new TextureCoordinate[tokens.length];
for (int i = 0; i < tokens.length; ++i)
{
subTokens = tokens[i].split("/");
@@ -375,6 +378,9 @@ public class WavefrontObject implements IModelCustom
// f v1//vn1 v2//vn2 v3//vn3 ...
else if (isValidFace_V_VN_Line(line))
{
face.vertices = new Vertex[tokens.length];
face.vertexNormals = new Vertex[tokens.length];
for (int i = 0; i < tokens.length; ++i)
{
subTokens = tokens[i].split("//");
@@ -388,6 +394,8 @@ public class WavefrontObject implements IModelCustom
// f v1 v2 v3 ...
else if (isValidFace_V_Line(line))
{
face.vertices = new Vertex[tokens.length];
for (int i = 0; i < tokens.length; ++i)
{
face.vertices[i] = vertices.get(Integer.parseInt(tokens[i]) - 1);