Merge work #7
@@ -26,9 +26,10 @@ enum BoardAsset {
|
||||
swapCard,
|
||||
tank,
|
||||
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_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 diffPath;
|
||||
@@ -54,6 +55,12 @@ enum BoardAsset {
|
||||
this.size = size;
|
||||
}
|
||||
|
||||
BoardAsset(String modelPath, String diffPath, float size){
|
||||
this.modelPath = modelPath;
|
||||
this.diffPath = diffPath;
|
||||
this.size = size;
|
||||
}
|
||||
|
||||
public String getModelPath() {
|
||||
return modelPath;
|
||||
}
|
||||
|
||||
@@ -82,6 +82,7 @@ private static BoardAsset getLoadedAsset(String assetName) {
|
||||
case "ship" -> BoardAsset.ship;
|
||||
case "tank" -> BoardAsset.tank;
|
||||
case "tree_small" -> BoardAsset.tree_small;
|
||||
case "tree_big" -> BoardAsset.tree_big;
|
||||
default -> throw new IllegalStateException("Unexpected value: " + assetName);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
world 0,0 90
|
||||
|
||||
tree_small 0,0 0
|
||||
tree_small 1,1 0
|
||||
tree_big 0,0 0
|
||||
|
||||
|
||||
#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 |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 59 KiB |
18861
Projekte/mdga/client/src/main/resources/world_new/world_new.obj
Normal file
18861
Projekte/mdga/client/src/main/resources/world_new/world_new.obj
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 10 MiB |
Reference in New Issue
Block a user