Skip to content

Map tile export #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
REDxEYE wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Map tile export #61

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9f058b5
Map tile export
REDxEYE Nov 25, 2023
39120be
Fix issues
REDxEYE Nov 25, 2023
3653b96
make bbox vectors constant
REDxEYE Nov 25, 2023
bfe1341
Add common function to export some types
REDxEYE Nov 26, 2023
36c9e2e
Add identity constructor to Quaternion class
REDxEYE Nov 26, 2023
6100b93
Formatting fixes
REDxEYE Nov 27, 2023
460cb87
Fix function return value getBitsPerChannel
REDxEYE Nov 28, 2023
51da4ce
Add check for bpc in png exporter only allowing 8 bits per channel im…
REDxEYE Nov 28, 2023
64700db
Minor cleanup
REDxEYE Nov 29, 2023
df28d40
Bump DMF file version. This change introduces new way of de-duping ob…
REDxEYE Nov 29, 2023
6e80cb4
Merge branch 'master' into map_tile_export
REDxEYE Dec 4, 2023
cfc98fe
Update
REDxEYE Dec 4, 2023
ef15180
Revert some stuff
REDxEYE Dec 4, 2023
3b8e067
Fixes
REDxEYE Dec 5, 2023
081af5b
Fixes
REDxEYE Dec 5, 2023
8690944
Merge branch 'master' into map_tile_export
REDxEYE Mar 22, 2024
4591178
Update Level exporter
REDxEYE Mar 22, 2024
f516dc3
Re-organized classes
REDxEYE Mar 24, 2024
932fc80
Add common VertexSteam abstract class and added common function to ex…
REDxEYE Mar 24, 2024
016e259
Catch another IOException
REDxEYE Mar 24, 2024
257de27
Merge branch 'master' into map_tile_export
REDxEYE Mar 27, 2024
ba6ca8a
Fixes
REDxEYE Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...model-exporter/src/main/java/com/shade/decima/ui/data/viewer/model/BaseModelExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ protected static String uuidToString(@NotNull RTTIReference uuid) {
}
}

@NotNull
protected static String uuidToString(@NotNull RTTIObject uuid) {
return RTTIUtils.uuidToString(uuid);
}
Comment thread
REDxEYE marked this conversation as resolved.
Outdated

protected record DrawFlags(
@NotNull String renderType,
@NotNull String shadowCullMode,
Expand Down
25 changes: 15 additions & 10 deletions ...t-model-exporter/src/main/java/com/shade/decima/ui/data/viewer/model/dmf/DMFExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,20 @@ private DMFSceneFile export(
@NotNull RTTIObject object,
@NotNull String resourceName
) throws IOException {
scene = new DMFSceneFile(1);
scene = new DMFSceneFile(2);
collectionStack.push(scene.createCollection(resourceName));
exportResource(monitor, core, object, resourceName);
collectionStack.pop();
return scene;
}

private int toInstanceSource(@NotNull String uuid, @NotNull DMFNode node) {
DMFInstanceSource instanceSource = new DMFInstanceSource(uuid, node);
scene.instances.add(instanceSource);
return scene.instances.indexOf(instanceSource);
}


private void exportResource(
@NotNull ProgressMonitor monitor,
@NotNull CoreBinary core,
Expand Down Expand Up @@ -741,8 +748,7 @@ private DMFNode prefabInstanceToModel(
instanceData = toModel(task.split(1), prefabResource.binary(), prefabObject, nameFromReference(prefab, resourceName));
}
if (instanceData != null) {
scene.instances.add(instanceData);
instanceId = scene.instances.indexOf(instanceData);
instanceId = toInstanceSource(uuidToString(prefabObject.obj("ObjectUUID")), instanceData);
instances.put(prefabObject.obj("ObjectUUID"), instanceId);
}
}
Expand All @@ -766,17 +772,17 @@ private DMFNode staticMeshInstanceToModel(
final RTTIObject meshResourceObject = meshResource.object();
int instanceId = -1;

if (instances.containsKey(meshResourceObject.obj("ObjectUUID"))) {
instanceId = instances.get(meshResourceObject.obj("ObjectUUID"));
final RTTIObject objectUUID = meshResourceObject.obj("ObjectUUID");
if (instances.containsKey(objectUUID)) {
instanceId = instances.get(objectUUID);
} else {
final DMFNode instanceData;
try (ProgressMonitor.Task task = monitor.begin("Exporting StaticMeshInstance Resource", 1)) {
instanceData = toModel(task.split(1), meshResource.binary(), meshResourceObject, nameFromReference(resource, resourceName));
}
if (instanceData != null) {
scene.instances.add(instanceData);
instanceId = scene.instances.indexOf(instanceData);
instances.put(meshResourceObject.obj("ObjectUUID"), instanceId);
instanceId = toInstanceSource(uuidToString(objectUUID), instanceData);
instances.put(objectUUID, instanceId);
}
}

Expand Down Expand Up @@ -1016,8 +1022,7 @@ private DMFNode regularSkinnedMeshResourceToModel(
}
model.addToCollection(collectionStack.peek(), scene);
if (options.contains(ModelExporterProvider.Option.USE_INSTANCING)) {
scene.instances.add(model);
int instanceId = scene.instances.indexOf(model);
int instanceId = toInstanceSource(uuidToString(object.obj("ObjectUUID")),model);
instances.put(object.obj("ObjectUUID"), instanceId);
return new DMFInstance(resourceName, instanceId);
} else {
Expand Down
6 changes: 6 additions & 0 deletions ...l-exporter/src/main/java/com/shade/decima/ui/data/viewer/model/dmf/DMFInstanceSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.shade.decima.ui.data.viewer.model.dmf;

import com.shade.decima.ui.data.viewer.model.dmf.nodes.DMFNode;

public record DMFInstanceSource(String uuid, DMFNode rootNode) {
Comment thread
REDxEYE marked this conversation as resolved.
Outdated
}
2 changes: 1 addition & 1 deletion ...-model-exporter/src/main/java/com/shade/decima/ui/data/viewer/model/dmf/DMFSceneFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class DMFSceneFile {
public final List<DMFBuffer> buffers;
public final List<DMFMaterial> materials;
public final List<DMFTexture> textures;
public final List<DMFNode> instances;
public final List<DMFInstanceSource> instances;

public DMFSceneFile(int version) {
metadata = new DMFSceneMetaData("%s (%s, %s)".formatted(APP_TITLE, APP_VERSION, BUILD_COMMIT), version);
Expand Down