diff --git a/core/src/net/sf/openrocket/file/wavefrontobj/DefaultMtl.java b/core/src/net/sf/openrocket/file/wavefrontobj/DefaultMtl.java index d47c043fd..86a2bc063 100644 --- a/core/src/net/sf/openrocket/file/wavefrontobj/DefaultMtl.java +++ b/core/src/net/sf/openrocket/file/wavefrontobj/DefaultMtl.java @@ -37,7 +37,7 @@ import java.util.List; /** * Default implementation of an Mtl (material) */ -final class DefaultMtl implements Mtl { +public final class DefaultMtl implements Mtl { /** * The name of this material */ @@ -210,7 +210,7 @@ final class DefaultMtl implements Mtl { * * @param name The name of this material */ - DefaultMtl(String name) { + public DefaultMtl(String name) { this.name = name; this.reflOptions = new ArrayList(); } diff --git a/core/src/net/sf/openrocket/file/wavefrontobj/DefaultMtlWriter.java b/core/src/net/sf/openrocket/file/wavefrontobj/DefaultMtlWriter.java index a11670060..46327ea4d 100644 --- a/core/src/net/sf/openrocket/file/wavefrontobj/DefaultMtlWriter.java +++ b/core/src/net/sf/openrocket/file/wavefrontobj/DefaultMtlWriter.java @@ -79,9 +79,11 @@ public class DefaultMtlWriter { * * @param mtl The {@link Mtl} * @param writer The writer - * @throws IOException If an IO error occurs + * @throws IOExcept + * + * ion If an IO error occurs */ - private static void write(Mtl mtl, Writer writer) + public static void write(Mtl mtl, Writer writer) throws IOException { writer.write(createString(mtl)); writer.flush(); diff --git a/core/src/net/sf/openrocket/file/wavefrontobj/DefaultTextureOptions.java b/core/src/net/sf/openrocket/file/wavefrontobj/DefaultTextureOptions.java index 2d364adf7..4d8e51a5b 100644 --- a/core/src/net/sf/openrocket/file/wavefrontobj/DefaultTextureOptions.java +++ b/core/src/net/sf/openrocket/file/wavefrontobj/DefaultTextureOptions.java @@ -36,7 +36,7 @@ import java.util.Objects; /** * Default implementation of {@link TextureOptions} */ -final class DefaultTextureOptions implements TextureOptions { +public final class DefaultTextureOptions implements TextureOptions { /** * The file name */ @@ -110,7 +110,7 @@ final class DefaultTextureOptions implements TextureOptions { /** * Default constructor */ - DefaultTextureOptions() { + public DefaultTextureOptions() { // Default constructor } diff --git a/core/test/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactoryTest.java b/core/test/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactoryTest.java index f0699ec8b..8a087066c 100644 --- a/core/test/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactoryTest.java +++ b/core/test/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactoryTest.java @@ -160,22 +160,27 @@ public class OBJExporterFactoryTest { Path tempFile = Files.createTempFile("testExport", ".obj"); String filePath = tempFile.toAbsolutePath().toString(); + + filePath = "/Users/SiboVanGool/Downloads/testExport.obj"; // TODO: remove this line + + // Do the exporting - CoordTransform transformer = new DefaultCoordTransform(rocket.getLength()); - OBJExporterFactory exporterFactory = new OBJExporterFactory(components, rocket.getSelectedConfiguration(), true, false, true, - transformer, filePath); + OBJExportOptions options = new OBJExportOptions(rocket); + options.setScaling(30); + options.setExportChildren(true); + OBJExporterFactory exporterFactory = new OBJExporterFactory(components, rocket.getSelectedConfiguration(), filePath, options); exporterFactory.doExport(); // Test with other parameters - noseCone.setShoulderCapped(false); + /*noseCone.setShoulderCapped(false); railButton.setScrewHeight(0); bodyTube.setFilled(true); transformer = new DefaultCoordTransform(rocket.getLength()); - exporterFactory = new OBJExporterFactory(components, rocket.getSelectedConfiguration(), false, false, true, + exporterFactory = new OBJExporterFactory(components, rocket.getSelectedConfiguration(), true, false, false, transformer, filePath); - exporterFactory.doExport(); + exporterFactory.doExport();*/ // Clean up Files.delete(tempFile);