-
-
Notifications
You must be signed in to change notification settings - Fork 19
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.
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
ShadelessFox:master
Choose a base branch
from
REDxEYE:map_tile_export
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Map tile export #61
Changes from 5 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
9f058b5
Map tile export
REDxEYE 39120be
Fix issues
REDxEYE 3653b96
make bbox vectors constant
REDxEYE bfe1341
Add common function to export some types
REDxEYE 36c9e2e
Add identity constructor to Quaternion class
REDxEYE 6100b93
Formatting fixes
REDxEYE 460cb87
Fix function return value getBitsPerChannel
REDxEYE 51da4ce
Add check for bpc in png exporter only allowing 8 bits per channel im…
REDxEYE 64700db
Minor cleanup
REDxEYE df28d40
Bump DMF file version. This change introduces new way of de-duping ob…
REDxEYE 6e80cb4
Merge branch 'master' into map_tile_export
REDxEYE cfc98fe
Update
REDxEYE ef15180
Revert some stuff
REDxEYE 3b8e067
Fixes
REDxEYE 081af5b
Fixes
REDxEYE 8690944
Merge branch 'master' into map_tile_export
REDxEYE 4591178
Update Level exporter
REDxEYE f516dc3
Re-organized classes
REDxEYE 932fc80
Add common VertexSteam abstract class and added common function to ex…
REDxEYE 016e259
Catch another IOException
REDxEYE 257de27
Merge branch 'master' into map_tile_export
REDxEYE ba6ca8a
Fixes
REDxEYE File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
214 changes: 138 additions & 76 deletions
214
...t-model-exporter/src/main/java/com/shade/decima/ui/data/viewer/model/dmf/DMFExporter.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
...xt-model-exporter/src/main/java/com/shade/decima/ui/data/viewer/model/dmf/DMFMapTile.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.shade.decima.ui.data.viewer.model.dmf; | ||
|
|
||
| import com.shade.util.NotNull; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class DMFMapTile extends DMFNode { | ||
| public int[] gridCoordinate; | ||
| public float[] bboxMin; | ||
| public float[] bboxMax; | ||
| public Map<String, DMFMapTile.TileTextureInfo> textures = new HashMap<>(); | ||
|
|
||
| public DMFMapTile(@NotNull String name) { | ||
| super(name, DMFNodeType.MAP_TILE); | ||
| } | ||
|
|
||
| public static final class TileTextureInfo { | ||
| public final Map<String, TileTextureChannelInfo> channels = new HashMap<>(); | ||
| public Integer textureId = null; | ||
|
|
||
| public static class TileTextureChannelInfo { | ||
| public String usage; | ||
| public float minRange; | ||
| public float maxRange; | ||
|
|
||
| public TileTextureChannelInfo(String usage, float minRange, float maxRange) { | ||
| this.usage = usage; | ||
| this.minRange = minRange; | ||
| this.maxRange = maxRange; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,4 +9,5 @@ public enum DMFNodeType { | |
| MODEL, | ||
| SKINNED_MODEL, | ||
| ATTACHMENT, | ||
| MAP_TILE, | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,4 +39,6 @@ enum Type { | |
|
|
||
| @NotNull | ||
| String getPixelFormat(); | ||
|
|
||
| int getBitsPerChannel(); | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.