diff --git a/assets/items/bombup.obj b/assets/items/bombup.obj index ab9d47d4..cf171182 100644 --- a/assets/items/bombup.obj +++ b/assets/items/bombup.obj @@ -1,31 +1,31 @@ -# Blender v2.92.0 OBJ File: '' +# Blender v2.93.0 OBJ File: '' # www.blender.org mtllib bombup.mtl o map_ob000_item_02_bombup -v 0.400000 -0.335876 0.229810 -v -0.400000 0.229810 -0.335876 -v 0.400000 0.229810 -0.335876 -v -0.400000 -0.335876 0.229810 -v 0.400000 0.229810 -0.335876 -v -0.400000 0.335876 -0.229810 -v 0.400000 0.335876 -0.229810 -v -0.400000 0.229810 -0.335876 -v 0.400000 0.335876 -0.229810 -v -0.400000 -0.229810 0.335876 -v 0.400000 -0.229810 0.335876 -v -0.400000 0.335876 -0.229810 -v 0.400000 -0.229810 0.335876 -v -0.400000 -0.335876 0.229810 -v 0.400000 -0.335876 0.229810 -v -0.400000 -0.229810 0.335876 -v -0.400000 -0.229810 0.335876 -v -0.400000 0.229810 -0.335876 -v -0.400000 -0.335876 0.229810 -v -0.400000 0.335876 -0.229810 -v 0.400000 0.335876 -0.229810 -v 0.400000 -0.335876 0.229810 -v 0.400000 0.229810 -0.335876 -v 0.400000 -0.229810 0.335876 +v 0.400000 0.398345 -0.083348 +v 0.400000 -0.401481 -0.066619 +v -0.400000 0.398345 -0.083348 +v -0.400000 -0.401481 -0.066619 +v 0.400000 0.401481 0.066619 +v 0.400000 0.398345 -0.083348 +v -0.400000 0.401481 0.066619 +v -0.400000 0.398345 -0.083348 +v 0.400000 -0.398345 0.083348 +v 0.400000 0.401481 0.066619 +v -0.400000 -0.398345 0.083348 +v -0.400000 0.401481 0.066619 +v 0.400000 -0.401481 -0.066619 +v 0.400000 -0.398345 0.083348 +v -0.400000 -0.401481 -0.066619 +v -0.400000 -0.398345 0.083348 +v -0.400000 -0.401481 -0.066619 +v -0.400000 -0.398345 0.083348 +v -0.400000 0.398345 -0.083348 +v -0.400000 0.401481 0.066619 +v 0.400000 0.398345 -0.083348 +v 0.400000 0.401481 0.066619 +v 0.400000 -0.401481 -0.066619 +v 0.400000 -0.398345 0.083348 vt 0.001000 0.498000 vt 0.001000 0.252000 vt 0.124000 0.498000 @@ -50,23 +50,23 @@ vt 0.648280 0.996259 vt 0.632244 0.996259 vt 0.648280 0.754140 vt 0.632244 0.754140 -vn 0.0000 -0.7071 -0.7071 -vn 0.0000 0.7071 -0.7071 -vn 0.0000 0.7071 0.7071 -vn 0.0000 -0.7071 0.7071 +vn 0.0000 -0.0209 -0.9998 +vn 0.0000 0.9998 -0.0209 +vn 0.0000 0.0209 0.9998 +vn 0.0000 -0.9998 0.0209 vn -1.0000 0.0000 0.0000 vn 1.0000 0.0000 0.0000 usemtl mat_map_ob000_item_007 -s off -f 3/1/1 1/2/1 2/3/1 -f 2/3/1 1/2/1 4/4/1 -f 7/5/2 5/6/2 6/7/2 -f 6/7/2 5/6/2 8/8/2 -f 11/9/3 9/10/3 10/11/3 -f 10/11/3 9/10/3 12/12/3 -f 15/13/4 13/14/4 14/15/4 -f 14/15/4 13/14/4 16/16/4 -f 19/17/5 17/18/5 18/19/5 -f 18/19/5 17/18/5 20/20/5 -f 23/21/6 21/22/6 22/23/6 -f 22/23/6 21/22/6 24/24/6 +s 1 +f 1/1/1 2/2/1 3/3/1 +f 3/3/1 2/2/1 4/4/1 +f 5/5/2 6/6/2 7/7/2 +f 7/7/2 6/6/2 8/8/2 +f 9/9/3 10/10/3 11/11/3 +f 11/11/3 10/10/3 12/12/3 +f 13/13/4 14/14/4 15/15/4 +f 15/15/4 14/14/4 16/16/4 +f 17/17/5 18/18/5 19/19/5 +f 19/19/5 18/18/5 20/20/5 +f 21/21/6 22/22/6 23/23/6 +f 23/23/6 22/22/6 24/24/6 diff --git a/assets/items/bombup.png b/assets/items/bombup.png deleted file mode 100644 index 687a064f..00000000 Binary files a/assets/items/bombup.png and /dev/null differ diff --git a/assets/items/fireup.mtl b/assets/items/fireup.mtl index 2445bb45..5b165d4a 100644 --- a/assets/items/fireup.mtl +++ b/assets/items/fireup.mtl @@ -1,12 +1,2 @@ # Blender MTL File: 'None' -# Material Count: 1 - -newmtl mat_map_ob000_item_007.001 -Ns 323.999994 -Ka 1.000000 1.000000 1.000000 -Kd 0.800000 0.800000 0.800000 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.000000 -d 1.000000 -illum 2 +# Material Count: 0 diff --git a/assets/items/fireup.obj b/assets/items/fireup.obj index 664c62c4..cf171182 100644 --- a/assets/items/fireup.obj +++ b/assets/items/fireup.obj @@ -1,72 +1,72 @@ -# Blender v2.92.0 OBJ File: '' +# Blender v2.93.0 OBJ File: '' # www.blender.org -mtllib fireup.mtl -o map_ob000_item_01_fireup -v 0.400000 -0.335876 0.229810 -v -0.400000 0.229810 -0.335876 -v 0.400000 0.229810 -0.335876 -v -0.400000 -0.335876 0.229810 -v 0.400000 0.229810 -0.335876 -v -0.400000 0.335876 -0.229810 -v 0.400000 0.335876 -0.229810 -v -0.400000 0.229810 -0.335876 -v 0.400000 0.335876 -0.229810 -v -0.400000 -0.229810 0.335876 -v 0.400000 -0.229810 0.335876 -v -0.400000 0.335876 -0.229810 -v 0.400000 -0.229810 0.335876 -v -0.400000 -0.335876 0.229810 -v 0.400000 -0.335876 0.229810 -v -0.400000 -0.229810 0.335876 -v -0.400000 -0.229810 0.335876 -v -0.400000 0.229810 -0.335876 -v -0.400000 -0.335876 0.229810 -v -0.400000 0.335876 -0.229810 -v 0.400000 0.335876 -0.229810 -v 0.400000 -0.335876 0.229810 -v 0.400000 0.229810 -0.335876 -v 0.400000 -0.229810 0.335876 -vt 0.000000 0.250000 -vt 0.000000 0.000000 -vt 0.125000 0.250000 -vt 0.125000 0.000000 -vt 0.125000 0.237500 -vt 0.125000 0.250000 -vt 0.000000 0.237500 -vt 0.000000 0.250000 -vt 0.125000 0.000000 -vt 0.125000 0.250000 -vt 0.000000 0.000000 -vt 0.000000 0.250000 -vt 0.000000 0.250000 -vt 0.000000 0.237500 -vt 0.125000 0.250000 -vt 0.125000 0.237500 -vt 0.000000 0.250000 -vt 0.000000 0.237500 -vt 0.125000 0.250000 -vt 0.125000 0.237500 -vt 0.000000 0.250000 -vt 0.000000 0.237500 -vt 0.125000 0.250000 -vt 0.125000 0.237500 -vn 0.0000 -0.7071 -0.7071 -vn 0.0000 0.7071 -0.7071 -vn 0.0000 0.7071 0.7071 -vn 0.0000 -0.7071 0.7071 +mtllib bombup.mtl +o map_ob000_item_02_bombup +v 0.400000 0.398345 -0.083348 +v 0.400000 -0.401481 -0.066619 +v -0.400000 0.398345 -0.083348 +v -0.400000 -0.401481 -0.066619 +v 0.400000 0.401481 0.066619 +v 0.400000 0.398345 -0.083348 +v -0.400000 0.401481 0.066619 +v -0.400000 0.398345 -0.083348 +v 0.400000 -0.398345 0.083348 +v 0.400000 0.401481 0.066619 +v -0.400000 -0.398345 0.083348 +v -0.400000 0.401481 0.066619 +v 0.400000 -0.401481 -0.066619 +v 0.400000 -0.398345 0.083348 +v -0.400000 -0.401481 -0.066619 +v -0.400000 -0.398345 0.083348 +v -0.400000 -0.401481 -0.066619 +v -0.400000 -0.398345 0.083348 +v -0.400000 0.398345 -0.083348 +v -0.400000 0.401481 0.066619 +v 0.400000 0.398345 -0.083348 +v 0.400000 0.401481 0.066619 +v 0.400000 -0.401481 -0.066619 +v 0.400000 -0.398345 0.083348 +vt 0.001000 0.498000 +vt 0.001000 0.252000 +vt 0.124000 0.498000 +vt 0.124000 0.252000 +vt 0.632244 0.754140 +vt 0.648280 0.754140 +vt 0.632244 0.996259 +vt 0.648280 0.996259 +vt 0.124000 0.252000 +vt 0.124000 0.498000 +vt 0.001000 0.252000 +vt 0.001000 0.498000 +vt 0.648280 0.996259 +vt 0.632244 0.996259 +vt 0.648280 0.754140 +vt 0.632244 0.754140 +vt 0.648280 0.996259 +vt 0.632244 0.996259 +vt 0.648280 0.754140 +vt 0.632244 0.754140 +vt 0.648280 0.996259 +vt 0.632244 0.996259 +vt 0.648280 0.754140 +vt 0.632244 0.754140 +vn 0.0000 -0.0209 -0.9998 +vn 0.0000 0.9998 -0.0209 +vn 0.0000 0.0209 0.9998 +vn 0.0000 -0.9998 0.0209 vn -1.0000 0.0000 0.0000 vn 1.0000 0.0000 0.0000 -usemtl mat_map_ob000_item_007.001 -s off -f 3/1/1 1/2/1 2/3/1 -f 2/3/1 1/2/1 4/4/1 -f 7/5/2 5/6/2 6/7/2 -f 6/7/2 5/6/2 8/8/2 -f 11/9/3 9/10/3 10/11/3 -f 10/11/3 9/10/3 12/12/3 -f 15/13/4 13/14/4 14/15/4 -f 14/15/4 13/14/4 16/16/4 -f 19/17/5 17/18/5 18/19/5 -f 18/19/5 17/18/5 20/20/5 -f 23/21/6 21/22/6 22/23/6 -f 22/23/6 21/22/6 24/24/6 +usemtl mat_map_ob000_item_007 +s 1 +f 1/1/1 2/2/1 3/3/1 +f 3/3/1 2/2/1 4/4/1 +f 5/5/2 6/6/2 7/7/2 +f 7/7/2 6/6/2 8/8/2 +f 9/9/3 10/10/3 11/11/3 +f 11/11/3 10/10/3 12/12/3 +f 13/13/4 14/14/4 15/15/4 +f 15/15/4 14/14/4 16/16/4 +f 17/17/5 18/18/5 19/19/5 +f 19/19/5 18/18/5 20/20/5 +f 21/21/6 22/22/6 23/23/6 +f 23/23/6 22/22/6 24/24/6 diff --git a/assets/items/fireup.png b/assets/items/fireup.png deleted file mode 100644 index 2756f248..00000000 Binary files a/assets/items/fireup.png and /dev/null differ diff --git a/assets/items/items.png-autosave.kra b/assets/items/items.png-autosave.kra deleted file mode 100644 index a41c6732..00000000 Binary files a/assets/items/items.png-autosave.kra and /dev/null differ diff --git a/assets/items/speedup.obj b/assets/items/speedup.obj index 9b8292cc..c1db8bdd 100644 --- a/assets/items/speedup.obj +++ b/assets/items/speedup.obj @@ -1,31 +1,31 @@ -# Blender v2.92.0 OBJ File: '' +# Blender v2.93.0 OBJ File: '' # www.blender.org mtllib speedup.mtl o map_ob000_item_03_speedup -v 0.400000 -0.335876 0.229810 -v -0.400000 0.229810 -0.335876 -v 0.400000 0.229810 -0.335876 -v -0.400000 -0.335876 0.229810 -v 0.400000 0.229810 -0.335876 -v -0.400000 0.335876 -0.229810 -v 0.400000 0.335876 -0.229810 -v -0.400000 0.229810 -0.335876 -v 0.400000 0.335876 -0.229810 -v -0.400000 -0.229810 0.335876 -v 0.400000 -0.229810 0.335876 -v -0.400000 0.335876 -0.229810 -v 0.400000 -0.229810 0.335876 -v -0.400000 -0.335876 0.229810 -v 0.400000 -0.335876 0.229810 -v -0.400000 -0.229810 0.335876 -v -0.400000 -0.229810 0.335876 -v -0.400000 0.229810 -0.335876 -v -0.400000 -0.335876 0.229810 -v -0.400000 0.335876 -0.229810 -v 0.400000 0.335876 -0.229810 -v 0.400000 -0.335876 0.229810 -v 0.400000 0.229810 -0.335876 -v 0.400000 -0.229810 0.335876 +v 0.400000 0.397750 -0.086142 +v 0.400000 -0.401939 -0.063800 +v -0.400000 0.397750 -0.086142 +v -0.400000 -0.401939 -0.063800 +v 0.400000 0.401939 0.063800 +v 0.400000 0.397750 -0.086142 +v -0.400000 0.401939 0.063800 +v -0.400000 0.397750 -0.086142 +v 0.400000 -0.397750 0.086142 +v 0.400000 0.401939 0.063800 +v -0.400000 -0.397750 0.086142 +v -0.400000 0.401939 0.063800 +v 0.400000 -0.401939 -0.063800 +v 0.400000 -0.397750 0.086142 +v -0.400000 -0.401939 -0.063800 +v -0.400000 -0.397750 0.086142 +v -0.400000 -0.401939 -0.063800 +v -0.400000 -0.397750 0.086142 +v -0.400000 0.397750 -0.086142 +v -0.400000 0.401939 0.063800 +v 0.400000 0.397750 -0.086142 +v 0.400000 0.401939 0.063800 +v 0.400000 -0.401939 -0.063800 +v 0.400000 -0.397750 0.086142 vt 0.001000 0.748000 vt 0.001000 0.502000 vt 0.124000 0.748000 @@ -50,23 +50,23 @@ vt 0.648280 0.996259 vt 0.632244 0.996259 vt 0.648280 0.754140 vt 0.632244 0.754140 -vn 0.0000 -0.7071 -0.7071 -vn 0.0000 0.7071 -0.7071 -vn 0.0000 0.7071 0.7071 -vn 0.0000 -0.7071 0.7071 -vn -1.0000 0.0000 0.0000 +vn 0.0000 -0.0279 -0.9996 +vn 0.0000 0.9996 -0.0279 +vn 0.0000 0.0279 0.9996 +vn 0.0000 -0.9996 0.0279 +vn -1.0000 -0.0000 0.0000 vn 1.0000 0.0000 0.0000 usemtl mat_map_ob000_item_007.002 -s off -f 3/1/1 1/2/1 2/3/1 -f 2/3/1 1/2/1 4/4/1 -f 7/5/2 5/6/2 6/7/2 -f 6/7/2 5/6/2 8/8/2 -f 11/9/3 9/10/3 10/11/3 -f 10/11/3 9/10/3 12/12/3 -f 15/13/4 13/14/4 14/15/4 -f 14/15/4 13/14/4 16/16/4 -f 19/17/5 17/18/5 18/19/5 -f 18/19/5 17/18/5 20/20/5 -f 23/21/6 21/22/6 22/23/6 -f 22/23/6 21/22/6 24/24/6 +s 1 +f 1/1/1 2/2/1 3/3/1 +f 3/3/1 2/2/1 4/4/1 +f 5/5/2 6/6/2 7/7/2 +f 7/7/2 6/6/2 8/8/2 +f 9/9/3 10/10/3 11/11/3 +f 11/11/3 10/10/3 12/12/3 +f 13/13/4 14/14/4 15/15/4 +f 15/15/4 14/14/4 16/16/4 +f 17/17/5 18/18/5 19/19/5 +f 19/19/5 18/18/5 20/20/5 +f 21/21/6 22/22/6 23/23/6 +f 23/23/6 22/22/6 24/24/6 diff --git a/assets/items/speedup.png b/assets/items/speedup.png deleted file mode 100644 index 81157d2f..00000000 Binary files a/assets/items/speedup.png and /dev/null differ diff --git a/assets/items/wallpass.obj b/assets/items/wallpass.obj index 44360fc0..919b15c3 100644 --- a/assets/items/wallpass.obj +++ b/assets/items/wallpass.obj @@ -1,31 +1,31 @@ -# Blender v2.92.0 OBJ File: '' +# Blender v2.93.0 OBJ File: '' # www.blender.org mtllib wallpass.mtl o map_ob000_item_14_wallthrough -v 0.400000 -0.335876 0.229810 -v -0.400000 0.229810 -0.335876 -v 0.400000 0.229810 -0.335876 -v -0.400000 -0.335876 0.229810 -v 0.400000 0.229810 -0.335876 -v -0.400000 0.335876 -0.229810 -v 0.400000 0.335876 -0.229810 -v -0.400000 0.229810 -0.335876 -v 0.400000 0.335876 -0.229810 -v -0.400000 -0.229810 0.335876 -v 0.400000 -0.229810 0.335876 -v -0.400000 0.335876 -0.229810 -v 0.400000 -0.229810 0.335876 -v -0.400000 -0.335876 0.229810 -v 0.400000 -0.335876 0.229810 -v -0.400000 -0.229810 0.335876 -v -0.400000 -0.229810 0.335876 -v -0.400000 0.229810 -0.335876 -v -0.400000 -0.335876 0.229810 -v -0.400000 0.335876 -0.229810 -v 0.400000 0.335876 -0.229810 -v 0.400000 -0.335876 0.229810 -v 0.400000 0.229810 -0.335876 -v 0.400000 -0.229810 0.335876 +v 0.400000 0.394974 -0.098087 +v 0.400000 -0.403679 -0.051660 +v -0.400000 0.394974 -0.098087 +v -0.400000 -0.403679 -0.051660 +v 0.400000 0.403679 0.051660 +v 0.400000 0.394974 -0.098087 +v -0.400000 0.403679 0.051660 +v -0.400000 0.394974 -0.098087 +v 0.400000 -0.394974 0.098087 +v 0.400000 0.403679 0.051660 +v -0.400000 -0.394974 0.098087 +v -0.400000 0.403679 0.051660 +v 0.400000 -0.403679 -0.051660 +v 0.400000 -0.394974 0.098087 +v -0.400000 -0.403679 -0.051660 +v -0.400000 -0.394974 0.098087 +v -0.400000 -0.403679 -0.051660 +v -0.400000 -0.394974 0.098087 +v -0.400000 0.394974 -0.098087 +v -0.400000 0.403679 0.051660 +v 0.400000 0.394974 -0.098087 +v 0.400000 0.403679 0.051660 +v 0.400000 -0.403679 -0.051660 +v 0.400000 -0.394974 0.098087 vt 0.501000 0.998000 vt 0.501000 0.752000 vt 0.624000 0.998000 @@ -50,23 +50,23 @@ vt 0.648280 0.996259 vt 0.632244 0.996259 vt 0.648280 0.754140 vt 0.632244 0.754140 -vn 0.0000 -0.7071 -0.7071 -vn 0.0000 0.7071 -0.7071 -vn 0.0000 0.7071 0.7071 -vn 0.0000 -0.7071 0.7071 +vn 0.0000 -0.0580 -0.9983 +vn 0.0000 0.9983 -0.0580 +vn 0.0000 0.0580 0.9983 +vn 0.0000 -0.9983 0.0580 vn -1.0000 0.0000 0.0000 -vn 1.0000 0.0000 0.0000 +vn 1.0000 -0.0000 0.0000 usemtl mat_map_ob000_item_007.003 -s off -f 3/1/1 1/2/1 2/3/1 -f 2/3/1 1/2/1 4/4/1 -f 7/5/2 5/6/2 6/7/2 -f 6/7/2 5/6/2 8/8/2 -f 11/9/3 9/10/3 10/11/3 -f 10/11/3 9/10/3 12/12/3 -f 15/13/4 13/14/4 14/15/4 -f 14/15/4 13/14/4 16/16/4 -f 19/17/5 17/18/5 18/19/5 -f 18/19/5 17/18/5 20/20/5 -f 23/21/6 21/22/6 22/23/6 -f 22/23/6 21/22/6 24/24/6 +s 1 +f 1/1/1 2/2/1 3/3/1 +f 3/3/1 2/2/1 4/4/1 +f 5/5/2 6/6/2 7/7/2 +f 7/7/2 6/6/2 8/8/2 +f 9/9/3 10/10/3 11/11/3 +f 11/11/3 10/10/3 12/12/3 +f 13/13/4 14/14/4 15/15/4 +f 15/15/4 14/14/4 16/16/4 +f 17/17/5 18/18/5 19/19/5 +f 19/19/5 18/18/5 20/20/5 +f 21/21/6 22/22/6 23/23/6 +f 23/23/6 22/22/6 24/24/6 diff --git a/assets/items/wallpass.png b/assets/items/wallpass.png deleted file mode 100644 index 0ecd6181..00000000 Binary files a/assets/items/wallpass.png and /dev/null differ diff --git a/sources/System/Health/HealthSystem.cpp b/sources/System/Health/HealthSystem.cpp index 9c49303a..82afdfeb 100644 --- a/sources/System/Health/HealthSystem.cpp +++ b/sources/System/Health/HealthSystem.cpp @@ -51,7 +51,7 @@ namespace BBM // std::cout << "Bonus disappeared" << std::endl; // bonus.scheduleDeletion(); // }) - .addComponent>(map.at(bonusType) + ".obj", std::make_pair(MAP_DIFFUSE, map.at(bonusType) + ".png")); + .addComponent>(map.at(bonusType) + ".obj", std::make_pair(MAP_DIFFUSE, "assets/items/items.png")); } void HealthSystem::onFixedUpdate(WAL::Entity &entity)