hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fall back to blank material after applying it

Browse Source
This commit is contained in:
SiboVG 2023-08-23 23:05:15 +02:00
parent ed883fafa3
commit 20c0cacc7a
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/net/sf/openrocket/file/wavefrontobj/DefaultObj.java
View File

@ -141,6 +141,8 @@ public final class DefaultObj implements Obj {
private final FloatTupleBounds vertexBounds; private final FloatTupleBounds vertexBounds;
private static final String BLANK_MATERIAL = "___blank___";
/** /**
* Creates a new, empty DefaultObj. * Creates a new, empty DefaultObj.
*/ */
@ -415,6 +417,10 @@ public final class DefaultObj implements Obj {
nextActiveMaterialGroupName = materialGroupName; nextActiveMaterialGroupName = materialGroupName;
} }
public void resetToBlankMaterial() {
setActiveMaterialGroupName(BLANK_MATERIAL);
}
@Override @Override
public void addFace(ObjFace face) { public void addFace(ObjFace face) {
if (face == null) { if (face == null) {

2
core/src/net/sf/openrocket/file/wavefrontobj/export/AppearanceExporter.java
View File

@ -67,8 +67,6 @@ public class AppearanceExporter {
applyTexture(appearance, material); applyTexture(appearance, material);
materials.add(material); materials.add(material);
// TODO: default back to default material?
} }
private void applyTexture(Appearance appearance, DefaultMtl material) { private void applyTexture(Appearance appearance, DefaultMtl material) {

5
core/src/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactory.java
View File

@ -206,6 +206,11 @@ public class OBJExporterFactory {
// Write the OBJ file // Write the OBJ file
writeObj(obj, filePath); writeObj(obj, filePath);
// Reset the material
if (options.isExportAppearance()) {
obj.resetToBlankMaterial();
}
} }
} }