From dbd9dd0001bde4014c39a6daeaa74f727e31bf6e Mon Sep 17 00:00:00 2001 From: Johannes Schmelz Date: Mon, 18 Nov 2024 16:43:54 +0100 Subject: [PATCH] refactor models --- .../main/resources/Models}/Würfel_blau.j30 | Bin .../src/main/resources/Models/Würfel_blau.mtl | 12 ------ .../src/main/resources/Models/Würfel_blau.obj | 40 ------------------ .../main/resources/Models}/Würfel_gelb.j30 | Bin .../src/main/resources/Models/Würfel_gelb.mtl | 12 ------ .../src/main/resources/Models/Würfel_gelb.obj | 40 ------------------ .../main/resources/Models}/Würfel_grün.j30 | Bin .../src/main/resources/Models/Würfel_grün.mtl | 12 ------ .../src/main/resources/Models/Würfel_grün.obj | 40 ------------------ .../main/resources/Models}/Würfel_rosa.j30 | Bin .../src/main/resources/Models/Würfel_rosa.mtl | 12 ------ .../src/main/resources/Models/Würfel_rosa.obj | 40 ------------------ .../src/main/resources/Models}/Würfel_rot.j30 | Bin .../src/main/resources/Models/Würfel_rot.mtl | 12 ------ .../src/main/resources/Models/Würfel_rot.obj | 40 ------------------ .../main/resources/Models}/Würfel_schwarz.j30 | Bin .../main/resources/Models/Würfel_schwarz.mtl | 12 ------ .../main/resources/Models/Würfel_schwarz.obj | 40 ------------------ 18 files changed, 312 deletions(-) rename Projekte/{battleship/converter/src/main/resources/Models/Figures => monopoly/client/src/main/resources/Models}/Würfel_blau.j30 (100%) delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.mtl delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.obj rename Projekte/{battleship/converter/src/main/resources/Models/Figures => monopoly/client/src/main/resources/Models}/Würfel_gelb.j30 (100%) delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.mtl delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.obj rename Projekte/{battleship/converter/src/main/resources/Models/Figures => monopoly/client/src/main/resources/Models}/Würfel_grün.j30 (100%) delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.mtl delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.obj rename Projekte/{battleship/converter/src/main/resources/Models/Figures => monopoly/client/src/main/resources/Models}/Würfel_rosa.j30 (100%) delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.mtl delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.obj rename Projekte/{battleship/converter/src/main/resources/Models/Figures => monopoly/client/src/main/resources/Models}/Würfel_rot.j30 (100%) delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.mtl delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.obj rename Projekte/{battleship/converter/src/main/resources/Models/Figures => monopoly/client/src/main/resources/Models}/Würfel_schwarz.j30 (100%) delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.mtl delete mode 100644 Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.obj diff --git a/Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_blau.j30 b/Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.j30 similarity index 100% rename from Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_blau.j30 rename to Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.j30 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.mtl b/Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.mtl deleted file mode 100644 index 78ad4d8..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.mtl +++ /dev/null @@ -1,12 +0,0 @@ -# Blender 4.2.2 LTS MTL File: 'Würfel_blau.blend' -# www.blender.org - -newmtl Material -Ns 250.000000 -Ka 1.000000 1.000000 1.000000 -Kd 0.000000 0.000000 0.603827 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.obj b/Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.obj deleted file mode 100644 index 746d619..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_blau.obj +++ /dev/null @@ -1,40 +0,0 @@ -# Blender 4.2.2 LTS -# www.blender.org -mtllib Würfel_blau.mtl -o Cube -v 0.260625 0.589927 -0.304167 -v 0.259622 0.088364 -0.303845 -v 0.259884 0.590251 0.197396 -v 0.258881 0.088688 0.197718 -v -0.240937 0.590930 -0.304909 -v -0.241940 0.089368 -0.304586 -v -0.241678 0.591254 0.196654 -v -0.242681 0.089691 0.196976 -vn 0.0020 1.0000 -0.0006 -vn -0.0015 0.0006 1.0000 -vn -1.0000 0.0020 -0.0015 -vn -0.0020 -1.0000 0.0006 -vn 1.0000 -0.0020 0.0015 -vn 0.0015 -0.0006 -1.0000 -vt 0.625000 0.500000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.125000 0.500000 -vt 0.375000 0.500000 -vt 0.125000 0.750000 -s 0 -usemtl Material -f 1/1/1 5/2/1 7/3/1 3/4/1 -f 4/5/2 3/4/2 7/6/2 8/7/2 -f 8/8/3 7/9/3 5/10/3 6/11/3 -f 6/12/4 2/13/4 4/5/4 8/14/4 -f 2/13/5 1/1/5 3/4/5 4/5/5 -f 6/11/6 5/10/6 1/1/6 2/13/6 diff --git a/Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_gelb.j30 b/Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.j30 similarity index 100% rename from Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_gelb.j30 rename to Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.j30 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.mtl b/Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.mtl deleted file mode 100644 index cb84ce6..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.mtl +++ /dev/null @@ -1,12 +0,0 @@ -# Blender 4.2.2 LTS MTL File: 'Würfel_gelb.blend' -# www.blender.org - -newmtl Material -Ns 250.000000 -Ka 1.000000 1.000000 1.000000 -Kd 1.000000 1.000000 0.000000 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.obj b/Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.obj deleted file mode 100644 index 4e02890..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_gelb.obj +++ /dev/null @@ -1,40 +0,0 @@ -# Blender 4.2.2 LTS -# www.blender.org -mtllib Würfel_gelb.mtl -o Cube -v 0.260625 0.589927 -0.304167 -v 0.259622 0.088364 -0.303845 -v 0.259884 0.590251 0.197396 -v 0.258881 0.088688 0.197718 -v -0.240937 0.590930 -0.304909 -v -0.241940 0.089368 -0.304586 -v -0.241678 0.591254 0.196654 -v -0.242681 0.089691 0.196976 -vn 0.0020 1.0000 -0.0006 -vn -0.0015 0.0006 1.0000 -vn -1.0000 0.0020 -0.0015 -vn -0.0020 -1.0000 0.0006 -vn 1.0000 -0.0020 0.0015 -vn 0.0015 -0.0006 -1.0000 -vt 0.625000 0.500000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.125000 0.500000 -vt 0.375000 0.500000 -vt 0.125000 0.750000 -s 0 -usemtl Material -f 1/1/1 5/2/1 7/3/1 3/4/1 -f 4/5/2 3/4/2 7/6/2 8/7/2 -f 8/8/3 7/9/3 5/10/3 6/11/3 -f 6/12/4 2/13/4 4/5/4 8/14/4 -f 2/13/5 1/1/5 3/4/5 4/5/5 -f 6/11/6 5/10/6 1/1/6 2/13/6 diff --git a/Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_grün.j30 b/Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.j30 similarity index 100% rename from Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_grün.j30 rename to Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.j30 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.mtl b/Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.mtl deleted file mode 100644 index 548f359..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.mtl +++ /dev/null @@ -1,12 +0,0 @@ -# Blender 4.2.2 LTS MTL File: 'Würfel_grün.blend' -# www.blender.org - -newmtl Material -Ns 250.000000 -Ka 1.000000 1.000000 1.000000 -Kd 0.000000 0.603828 0.000000 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.obj b/Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.obj deleted file mode 100644 index 089a128..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_grün.obj +++ /dev/null @@ -1,40 +0,0 @@ -# Blender 4.2.2 LTS -# www.blender.org -mtllib Würfel_grün.mtl -o Cube -v 0.260625 0.589927 -0.304167 -v 0.259622 0.088364 -0.303845 -v 0.259884 0.590251 0.197396 -v 0.258881 0.088688 0.197718 -v -0.240937 0.590930 -0.304909 -v -0.241940 0.089368 -0.304586 -v -0.241678 0.591254 0.196654 -v -0.242681 0.089691 0.196976 -vn 0.0020 1.0000 -0.0006 -vn -0.0015 0.0006 1.0000 -vn -1.0000 0.0020 -0.0015 -vn -0.0020 -1.0000 0.0006 -vn 1.0000 -0.0020 0.0015 -vn 0.0015 -0.0006 -1.0000 -vt 0.625000 0.500000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.125000 0.500000 -vt 0.375000 0.500000 -vt 0.125000 0.750000 -s 0 -usemtl Material -f 1/1/1 5/2/1 7/3/1 3/4/1 -f 4/5/2 3/4/2 7/6/2 8/7/2 -f 8/8/3 7/9/3 5/10/3 6/11/3 -f 6/12/4 2/13/4 4/5/4 8/14/4 -f 2/13/5 1/1/5 3/4/5 4/5/5 -f 6/11/6 5/10/6 1/1/6 2/13/6 diff --git a/Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_rosa.j30 b/Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.j30 similarity index 100% rename from Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_rosa.j30 rename to Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.j30 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.mtl b/Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.mtl deleted file mode 100644 index b0fcce9..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.mtl +++ /dev/null @@ -1,12 +0,0 @@ -# Blender 4.2.2 LTS MTL File: 'Würfel_rosa.blend' -# www.blender.org - -newmtl Material -Ns 250.000000 -Ka 1.000000 1.000000 1.000000 -Kd 1.000000 0.074213 0.381326 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.obj b/Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.obj deleted file mode 100644 index 638f74a..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_rosa.obj +++ /dev/null @@ -1,40 +0,0 @@ -# Blender 4.2.2 LTS -# www.blender.org -mtllib Würfel_rosa.mtl -o Cube -v 0.260625 0.589927 -0.304167 -v 0.259622 0.088364 -0.303845 -v 0.259884 0.590251 0.197396 -v 0.258881 0.088688 0.197718 -v -0.240937 0.590930 -0.304909 -v -0.241940 0.089368 -0.304586 -v -0.241678 0.591254 0.196654 -v -0.242681 0.089691 0.196976 -vn 0.0020 1.0000 -0.0006 -vn -0.0015 0.0006 1.0000 -vn -1.0000 0.0020 -0.0015 -vn -0.0020 -1.0000 0.0006 -vn 1.0000 -0.0020 0.0015 -vn 0.0015 -0.0006 -1.0000 -vt 0.625000 0.500000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.125000 0.500000 -vt 0.375000 0.500000 -vt 0.125000 0.750000 -s 0 -usemtl Material -f 1/1/1 5/2/1 7/3/1 3/4/1 -f 4/5/2 3/4/2 7/6/2 8/7/2 -f 8/8/3 7/9/3 5/10/3 6/11/3 -f 6/12/4 2/13/4 4/5/4 8/14/4 -f 2/13/5 1/1/5 3/4/5 4/5/5 -f 6/11/6 5/10/6 1/1/6 2/13/6 diff --git a/Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_rot.j30 b/Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.j30 similarity index 100% rename from Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_rot.j30 rename to Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.j30 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.mtl b/Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.mtl deleted file mode 100644 index 7226f32..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.mtl +++ /dev/null @@ -1,12 +0,0 @@ -# Blender 4.2.2 LTS MTL File: 'Würfel_rot.blend' -# www.blender.org - -newmtl Material -Ns 250.000000 -Ka 1.000000 1.000000 1.000000 -Kd 0.800007 0.006284 0.012634 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.obj b/Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.obj deleted file mode 100644 index 9291ea8..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_rot.obj +++ /dev/null @@ -1,40 +0,0 @@ -# Blender 4.2.2 LTS -# www.blender.org -mtllib Würfel_rot.mtl -o Cube -v 0.260625 0.589927 -0.304167 -v 0.259622 0.088364 -0.303845 -v 0.259884 0.590251 0.197396 -v 0.258881 0.088688 0.197718 -v -0.240937 0.590930 -0.304909 -v -0.241940 0.089368 -0.304586 -v -0.241678 0.591254 0.196654 -v -0.242681 0.089691 0.196976 -vn 0.0020 1.0000 -0.0006 -vn -0.0015 0.0006 1.0000 -vn -1.0000 0.0020 -0.0015 -vn -0.0020 -1.0000 0.0006 -vn 1.0000 -0.0020 0.0015 -vn 0.0015 -0.0006 -1.0000 -vt 0.625000 0.500000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.125000 0.500000 -vt 0.375000 0.500000 -vt 0.125000 0.750000 -s 0 -usemtl Material -f 1/1/1 5/2/1 7/3/1 3/4/1 -f 4/5/2 3/4/2 7/6/2 8/7/2 -f 8/8/3 7/9/3 5/10/3 6/11/3 -f 6/12/4 2/13/4 4/5/4 8/14/4 -f 2/13/5 1/1/5 3/4/5 4/5/5 -f 6/11/6 5/10/6 1/1/6 2/13/6 diff --git a/Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_schwarz.j30 b/Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.j30 similarity index 100% rename from Projekte/battleship/converter/src/main/resources/Models/Figures/Würfel_schwarz.j30 rename to Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.j30 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.mtl b/Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.mtl deleted file mode 100644 index 945a5e2..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.mtl +++ /dev/null @@ -1,12 +0,0 @@ -# Blender 4.2.2 LTS MTL File: 'Würfel_schwarz.blend' -# www.blender.org - -newmtl Material -Ns 250.000000 -Ka 1.000000 1.000000 1.000000 -Kd 0.001400 0.000423 0.000912 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 diff --git a/Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.obj b/Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.obj deleted file mode 100644 index 24a0ae2..0000000 --- a/Projekte/monopoly/client/src/main/resources/Models/Würfel_schwarz.obj +++ /dev/null @@ -1,40 +0,0 @@ -# Blender 4.2.2 LTS -# www.blender.org -mtllib Würfel_schwarz.mtl -o Cube -v 0.260625 0.589927 -0.304167 -v 0.259622 0.088364 -0.303845 -v 0.259884 0.590251 0.197396 -v 0.258881 0.088688 0.197718 -v -0.240937 0.590930 -0.304909 -v -0.241940 0.089368 -0.304586 -v -0.241678 0.591254 0.196654 -v -0.242681 0.089691 0.196976 -vn 0.0020 1.0000 -0.0006 -vn -0.0015 0.0006 1.0000 -vn -1.0000 0.0020 -0.0015 -vn -0.0020 -1.0000 0.0006 -vn 1.0000 -0.0020 0.0015 -vn 0.0015 -0.0006 -1.0000 -vt 0.625000 0.500000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.125000 0.500000 -vt 0.375000 0.500000 -vt 0.125000 0.750000 -s 0 -usemtl Material -f 1/1/1 5/2/1 7/3/1 3/4/1 -f 4/5/2 3/4/2 7/6/2 8/7/2 -f 8/8/3 7/9/3 5/10/3 6/11/3 -f 6/12/4 2/13/4 4/5/4 8/14/4 -f 2/13/5 1/1/5 3/4/5 4/5/5 -f 6/11/6 5/10/6 1/1/6 2/13/6