From 5e61ffb491295bc75531930dec531bfc8f72fb53 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 7 Feb 2024 15:41:34 +0100 Subject: [PATCH] Refactor simple OBJ triangulation --- .../openrocket/file/wavefrontobj/TriangulationHelper.java | 7 +++++++ .../file/wavefrontobj/export/OBJExporterFactory.java | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 core/src/net/sf/openrocket/file/wavefrontobj/TriangulationHelper.java diff --git a/core/src/net/sf/openrocket/file/wavefrontobj/TriangulationHelper.java b/core/src/net/sf/openrocket/file/wavefrontobj/TriangulationHelper.java new file mode 100644 index 000000000..fdacd8c44 --- /dev/null +++ b/core/src/net/sf/openrocket/file/wavefrontobj/TriangulationHelper.java @@ -0,0 +1,7 @@ +package net.sf.openrocket.file.wavefrontobj; + +public abstract class TriangulationHelper { + public static DefaultObj simpleTriangulate(DefaultObj obj) { + return de.javagl.obj.ObjUtils.triangulate(obj, new DefaultObj()); + } +} diff --git a/core/src/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactory.java b/core/src/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactory.java index 11a607146..8b416ca66 100644 --- a/core/src/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactory.java +++ b/core/src/net/sf/openrocket/file/wavefrontobj/export/OBJExporterFactory.java @@ -8,6 +8,7 @@ import net.sf.openrocket.file.wavefrontobj.DefaultMtl; import net.sf.openrocket.file.wavefrontobj.DefaultMtlWriter; import net.sf.openrocket.file.wavefrontobj.DefaultObj; import net.sf.openrocket.file.wavefrontobj.ObjUtils; +import net.sf.openrocket.file.wavefrontobj.TriangulationHelper; import net.sf.openrocket.file.wavefrontobj.export.components.BodyTubeExporter; import net.sf.openrocket.file.wavefrontobj.export.components.FinSetExporter; import net.sf.openrocket.file.wavefrontobj.export.components.LaunchLugExporter; @@ -174,7 +175,7 @@ public class OBJExporterFactory { // Triangulate mesh if (this.options.isTriangulate()) { - obj = de.javagl.obj.ObjUtils.triangulate(obj, new DefaultObj()); + obj = TriangulationHelper.simpleTriangulate(obj); } // Remove position offset