eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-12 10:00:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

custom error message when texture map is missing, fixes #3990

Browse Source
This commit is contained in:
codeanticode
2016-05-11 06:24:09 -04:00
parent c5d41191c2
commit e7fb3ce4ff
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/processing/core/PShapeOBJ.java
View File

@@ -216,7 +216,6 @@ public class PShapeOBJ extends PShape {
1 - Float.valueOf(parts[2]).
floatValue());
texcoords.add(tempv);
PApplet.println(texcoords.size(), tempv);
readvt = true;
} else if (parts[0].equals("o")) {
// Object name is ignored, for now.
@@ -229,7 +228,7 @@ public class PShapeOBJ extends PShape {
}
BufferedReader mreader = parent.createReader(fn);
if (mreader != null) {
parseMTL(parent, path, mreader, materials, mtlTable);
parseMTL(parent, fn, path, mreader, materials, mtlTable);
mreader.close();
}
}
@@ -318,7 +317,7 @@ public class PShapeOBJ extends PShape {
}
static protected void parseMTL(PApplet parent, String path,
static protected void parseMTL(PApplet parent, String mtlfn, String path,
BufferedReader reader,
ArrayList<OBJMaterial> materials,
Map<String, Integer> materialsHash) {
@@ -347,7 +346,17 @@ public class PShapeOBJ extends PShape {
// Relative file name, adding the base path.
texname = path + File.separator + texname;
}
currentMtl.kdMap = parent.loadImage(texname);
File file = new File(parent.dataPath(texname));
if (file.exists()) {
currentMtl.kdMap = parent.loadImage(texname);
} else {
System.err.println("The texture map \"" + texname + "\" " +
"in the materials definition file \"" + mtlfn + "\" " +
"is missing or inaccessible, make sure " +
"the URL is valid or that the file has been " +
"added to your sketch and is readable.");
}
} else if (parts[0].equals("Ka") && parts.length > 3) {
// The ambient color of the material
currentMtl.ka.x = Float.valueOf(parts[1]).floatValue();