vlod 1 year ago
parent
commit
639671c017
2 changed files with 41 additions and 5 deletions
  1. 39 2
      Pika/gameplay/containers/marioKart/marioKart.h
  2. 2 3
      Pika/resources/logs.txt

+ 39 - 2
Pika/gameplay/containers/marioKart/marioKart.h

@@ -52,6 +52,7 @@ struct MarioKart: public Container
 	gl3d::Renderer3D renderer;
 	gl3d::Renderer3D renderer;
 	gl3d::Model worldModel;
 	gl3d::Model worldModel;
 	gl3d::Model sphereModel;
 	gl3d::Model sphereModel;
+	gl3d::Model wheelModel;
 	gl3d::Model marioModel;
 	gl3d::Model marioModel;
 	gl3d::Entity worldEntity;
 	gl3d::Entity worldEntity;
 	gl3d::Entity marioEntity;
 	gl3d::Entity marioEntity;
@@ -64,6 +65,8 @@ struct MarioKart: public Container
 	std::vector<gl3d::Entity> spheres;
 	std::vector<gl3d::Entity> spheres;
 	std::vector<gl3d::Entity> coins;
 	std::vector<gl3d::Entity> coins;
 
 
+	gl3d::Entity wheels[4];
+
 	pika::gl3d::General3DEditor editor;
 	pika::gl3d::General3DEditor editor;
 
 
 	bool create(RequestedContainerInfo &requestedInfo, pika::StaticString<256> commandLineArgument)
 	bool create(RequestedContainerInfo &requestedInfo, pika::StaticString<256> commandLineArgument)
@@ -127,6 +130,10 @@ struct MarioKart: public Container
 		sphereModel = renderer.loadModel(PIKA_RESOURCES_PATH "/marioKart/sphere.obj",
 		sphereModel = renderer.loadModel(PIKA_RESOURCES_PATH "/marioKart/sphere.obj",
 			gl3d::TextureLoadQuality::maxQuality, 1);
 			gl3d::TextureLoadQuality::maxQuality, 1);
 
 
+		wheelModel = renderer.loadModel("C:/Users/meemk/Desktop/wheel/wheel2.glb", 
+			gl3d::TextureLoadQuality::maxQuality, 1);
+
+
 		worldEntity = renderer.createEntity(worldModel, {});
 		worldEntity = renderer.createEntity(worldModel, {});
 
 
 
 
@@ -176,7 +183,10 @@ struct MarioKart: public Container
 
 
 		}
 		}
 
 
-
+		for (int i = 0; i < 4; i++)
+		{
+			wheels[i] = renderer.createEntity(wheelModel, {}, false);
+		}
 
 
 		if (markers.size() >= 2)
 		if (markers.size() >= 2)
 		{
 		{
@@ -503,7 +513,7 @@ struct MarioKart: public Container
 				//carPosition.y = m1.position.y;
 				//carPosition.y = m1.position.y;
 			}
 			}
 
 
-			glm::vec3 offset(0, 0.4, 0);
+			glm::vec3 offset(0, 0.3, 0);
 
 
 			float angle = std::atan2(moveDirection.z, -moveDirection.x) - glm::radians(90.f);
 			float angle = std::atan2(moveDirection.z, -moveDirection.x) - glm::radians(90.f);
 
 
@@ -513,6 +523,33 @@ struct MarioKart: public Container
 			t.rotation.z = -tilt;
 			t.rotation.z = -tilt;
 			renderer.setEntityTransform(carEntity, t);
 			renderer.setEntityTransform(carEntity, t);
 			renderer.setEntityTransform(marioEntity, t);
 			renderer.setEntityTransform(marioEntity, t);
+
+			static float wheelTimer = 0;
+			wheelTimer += input.deltaTime * acceleration;
+
+			t.scale =glm::vec3(0.065);
+			for (int i = 0; i < 4; i++)
+			{
+				//auto t2 = t;
+				glm::vec3 pos[4] = {glm::vec3(8.2, 0, 11.0),
+					glm::vec3(8.2, 0, -11.0),
+					glm::vec3(-8.2, 0, 11.0),
+					glm::vec3(-8.2, 0, -11.0),
+				};
+				
+				auto mat = t.getTransformMatrix();
+				mat = mat * glm::translate(pos[i]);
+				auto t2 = gl3d::Transform{};
+				t2.setFromMatrix(mat);
+				
+				t2.rotation.x = wheelTimer;
+				
+
+				renderer.setEntityTransform(wheels[i], t2);
+
+
+			}
+			
 		}
 		}
 
 
 			
 			

+ 2 - 3
Pika/resources/logs.txt

@@ -1,3 +1,2 @@
-#2024-01-20 04:45:54: Created container: MarioKart
-#2024-01-20 04:46:53: Reloaded dll
-#2024-01-20 04:47:30: Destroyed continer: MarioKart #1
+#2024-01-20 10:55:15: Created container: MarioKart
+#2024-01-20 10:57:53: Destroyed continer: MarioKart #1