diff --git a/sprite/hand.png b/sprite/hand.png new file mode 100644 index 0000000..55906f9 Binary files /dev/null and b/sprite/hand.png differ diff --git a/sprite/meme.mtl b/sprite/meme.mtl new file mode 100644 index 0000000..f7e35b1 --- /dev/null +++ b/sprite/meme.mtl @@ -0,0 +1,11 @@ +newmtl material +Ns 90.0 +Ka 1.0 1.0 1.0 +Kd 0.5 0.5 0.5 +Ks 0.5 0.5 0.5 +Ke 0.0 0.0 0.0 +Ni 1.0 +d 1.0 +illum 2 +map_Kd meme.png + diff --git a/sprite/meme.obj b/sprite/meme.obj new file mode 100644 index 0000000..7e5e899 --- /dev/null +++ b/sprite/meme.obj @@ -0,0 +1,15 @@ +mtllib meme.mtl +o square +v -1.0 0.0 1.0 +v 1.0 0.0 1.0 +v -1.0 0.0 -1.0 +v 1.0 0.0 -1.0 +vt 1.0 1.0 +vt 0.0 1.0 +vt 0.0 0.0 +vt 1.0 0.0 +vn 0.0 1.0 0.0 +usemtl material +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 + diff --git a/sprite/meme.png b/sprite/meme.png new file mode 100644 index 0000000..857f30d Binary files /dev/null and b/sprite/meme.png differ diff --git a/sprite/wall.mtl b/sprite/wall.mtl new file mode 100644 index 0000000..0f404aa --- /dev/null +++ b/sprite/wall.mtl @@ -0,0 +1,11 @@ +newmtl material +Ns 90.0 +Ka 1.0 1.0 1.0 +Kd 0.5 0.5 0.5 +Ks 0.5 0.5 0.5 +Ke 0.0 0.0 0.0 +Ni 1.0 +d 1.0 +illum 2 +map_Kd wall.png + diff --git a/sprite/wall.obj b/sprite/wall.obj new file mode 100644 index 0000000..6dd422d --- /dev/null +++ b/sprite/wall.obj @@ -0,0 +1,15 @@ +mtllib wall.mtl +o square +v -1.0 0.0 0.0 +v 1.0 0.0 0.0 +v -1.0 2.0 0.0 +v 1.0 2.0 0.0 +vt 0.0 0.0 +vt 1.0 0.0 +vt 1.0 1.0 +vt 0.0 1.0 +vn 0.0 1.0 0.0 +usemtl material +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 + diff --git a/sprite/wall.png b/sprite/wall.png new file mode 100644 index 0000000..df3ce94 Binary files /dev/null and b/sprite/wall.png differ diff --git a/xhampion.adb b/xhampion.adb index 79d8658..ca870f0 100644 --- a/xhampion.adb +++ b/xhampion.adb @@ -55,7 +55,6 @@ begin gameplay: loop exit when window_should_close; - --~update_camera (view'access, camera_first_person); if is_key_pressed (key_w) then movement.x := movement.x + 1.0; elsif is_key_pressed (key_s) then movement.x := movement.x - 1.0; elsif is_key_pressed (key_a) then movement.y := movement.y - 1.0; @@ -67,8 +66,6 @@ begin rotation.x := dd.x; update_camera_pro (view'access, movement, rotation, 1.0); - --~update_camera_pro (view'access, (0.0, 0.0, 0.0), rotation, 1.0); - --~update_camera_pro (view'access, movement, (0.0, 0.0, 0.0), 1.0); begin_drawing; @@ -80,8 +77,8 @@ begin loop for j in 0 .. 40 loop - draw_model (model_array (0), (float (i) * (-4.0), -10.0, float (j) * (-4.0)), 2.0, white); - draw_model (model_array (1), (float (i) * (-4.0), -10.0, float (j) * (-4.0)), 2.0, white); + draw_model (model_array (0), (float (i) * (-4.0), -1.0, float (j) * (-4.0)), 2.0, white); + draw_model (model_array (1), (float (i) * (-4.0), -1.0, float (j) * (-4.0)), 2.0, white); end loop; end loop;