Browse Source

finished steve model

meemknight 2 years ago
parent
commit
547ed9e1ad

BIN
Pika/engineResources/engineSaves/windowPos1.bin


BIN
Pika/engineResources/engineSaves/windowPos2.bin


+ 9 - 9
Pika/gameplay/containers/minecraftDungeons/mcDungeonsgameplay.h

@@ -28,10 +28,9 @@ struct McDungeonsGameplay: public Container
 		return info;
 	}
 
-
 	struct Player
 	{
-		glm::vec2 size = glm::vec2(0.3f,0.3f);
+		glm::vec2 size = glm::vec2(0.3f, 0.3f);
 		glm::vec2 position = {glm::vec2(0,0)};
 
 		glm::vec2 lastPos{};
@@ -51,17 +50,18 @@ struct McDungeonsGameplay: public Container
 
 	glm::vec2 performCollision(Player &player, glm::vec2 pos, glm::vec2 size,
 		glm::vec2 delta, bool &upTouch, bool &downTouch, bool &leftTouch, bool &rightTouch);
+
 	gl3d::Entity player;
 
 	enum Animations
 	{
-		attack = 0,
-		idle = 1,
-		run = 2,
-		run2 = 3,
-		zombieAttack = 4,
-		zombieIdle = 5,
-		zombieWalk = 6,
+		attack,
+		idle,
+		run,
+		run2,
+		zombieAttack,
+		zombieIdle,
+		zombieRun,
 	};
 
 

+ 4 - 8
Pika/resources/logs.txt

@@ -1,8 +1,4 @@
-#2023-03-11 10:09:39: Created container: Gameplay
-#2023-03-11 10:09:45: Created container: McDungeonsGameplay
-#2023-03-11 10:10:06: Reloaded dll
-#2023-03-11 10:10:50: Reloaded dll
-#2023-03-11 10:11:23: Reloaded dll
-#2023-03-11 10:12:15: Reloaded dll
-#2023-03-11 10:12:44: Destroyed continer: Gameplay #1
-#2023-03-11 10:12:45: Destroyed continer: McDungeonsGameplay #2
+#2023-03-11 10:22:10: Created container: Gameplay
+#2023-03-11 10:22:15: Created container: McDungeonsGameplay
+#2023-03-11 10:22:21: Destroyed continer: Gameplay #1
+#2023-03-11 10:22:21: Destroyed continer: McDungeonsGameplay #2