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

Sort export components based on order in rocket

Browse Source 
This is useful if you import the OBJ with "split by groups". In that case, all the components are in nice chronological order.
This commit is contained in:
SiboVG 2023-08-18 04:01:03 +02:00
parent 08c4d08393
commit 9bb1151dba
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -114,8 +115,11 @@ public class OBJExporterFactory {
}
}
// Sort the components according to how they are ordered in the rocket (component tree)
Set<RocketComponent> sortedComponents = sortComponents(componentsToExport);
int idx = 1;
for (RocketComponent component : componentsToExport) {
for (RocketComponent component : sortedComponents) {
if (component instanceof ComponentAssembly) {
continue;
}
@ -179,7 +183,7 @@ public class OBJExporterFactory {
if (options.isExportAppearance()) {
String mtlFilePath = FileUtils.removeExtension(filePath) + ".mtl";
List<DefaultMtl> mtls = materials.get(obj);
try (OutputStream mtlOutputStream = new FileOutputStream(mtlFilePath)) {
try (OutputStream mtlOutputStream = new FileOutputStream(mtlFilePath, false)) {
DefaultMtlWriter.write(mtls, mtlOutputStream);
} catch (IOException e) {
throw new RuntimeException(e);
@ -234,6 +238,27 @@ public class OBJExporterFactory {
}
}
/**
* Sort a set of components according to how they are ordered in the rocket (component tree).
* @param components components to sort
* @return sorted components
*/
private Set<RocketComponent> sortComponents(Set<RocketComponent> components) {
Set<RocketComponent> sortedComponents = new LinkedHashSet<>();
addChildComponentToList(this.configuration.getRocket(), components, sortedComponents);
return sortedComponents;
}
private void addChildComponentToList(RocketComponent parent, Set<RocketComponent> components, Set<RocketComponent> sortedComponents) {
for (RocketComponent child : parent.getChildren()) {
if (components.contains(child)) {
sortedComponents.add(child);
}
addChildComponentToList(child, components, sortedComponents);
}
}
interface ExporterFactory<T extends RocketComponent> {
RocketComponentExporter<T> create(DefaultObj obj, FlightConfiguration config, CoordTransform transformer,
T component, String groupName, ObjUtils.LevelOfDetail LOD);