added world and trees for tree positioning

This commit is contained in:
Cedric Beck
2024-11-18 12:40:40 +01:00
parent 06d795b3e6
commit 2399bf2678
9 changed files with 23150 additions and 2286 deletions

View File

@@ -26,9 +26,10 @@ enum BoardAsset {
swapCard, swapCard,
tank, tank,
turboCard, turboCard,
world(1.2f), // world(1.2f),
world("./world_new/world_new.obj", "./world_new/world_new_diff.png", 1.2f),
tree_small("./tree_small/tree_small.obj", "./tree_small/tree_small_diff.png"), tree_small("./tree_small/tree_small.obj", "./tree_small/tree_small_diff.png"),
tree_big("./tree_small/tree_big.obj", "./tree_small/tree_small_big.png"); tree_big("./tree_big/tree_big.obj", "./tree_big/tree_big_diff.png");
private final String modelPath; private final String modelPath;
private final String diffPath; private final String diffPath;
@@ -54,6 +55,12 @@ enum BoardAsset {
this.size = size; this.size = size;
} }
BoardAsset(String modelPath, String diffPath, float size){
this.modelPath = modelPath;
this.diffPath = diffPath;
this.size = size;
}
public String getModelPath() { public String getModelPath() {
return modelPath; return modelPath;
} }

View File

@@ -82,6 +82,7 @@ private static BoardAsset getLoadedAsset(String assetName) {
case "ship" -> BoardAsset.ship; case "ship" -> BoardAsset.ship;
case "tank" -> BoardAsset.tank; case "tank" -> BoardAsset.tank;
case "tree_small" -> BoardAsset.tree_small; case "tree_small" -> BoardAsset.tree_small;
case "tree_big" -> BoardAsset.tree_big;
default -> throw new IllegalStateException("Unexpected value: " + assetName); default -> throw new IllegalStateException("Unexpected value: " + assetName);
}; };
} }

View File

@@ -1,6 +1,7 @@
world 0,0 90 world 0,0 90
tree_small 0,0 0 tree_small 1,1 0
tree_big 0,0 0
#Marine Pos #Marine Pos

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 KiB

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 59 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 MiB