Browse Source

milk model

vlod 7 months ago
parent
commit
754de171ae

+ 24 - 0
Pika/gameplay/containers/milk/milk.h

@@ -33,6 +33,10 @@ struct Milk: public Container
 	pika::gl3d::General3DEditor editor;
 	gl3d::Material floorMaterial;
 
+	gl3d::Model milkModel;
+	gl3d::Entity milkEntity;
+
+
 	Simulator simulator;
 
 	struct Cube
@@ -198,6 +202,9 @@ struct Milk: public Container
 
 		//renderer.createDirectionalLight({-1,-0.5,-0.2});
 
+		milkModel = renderer.loadModel(PIKA_RESOURCES_PATH "milk/milk.glb", gl3d::TextureLoadQuality::maxQuality, 1);
+		milkEntity = renderer.createEntity(milkModel, {{66.9,4.9,-9.5}}, false);
+
 
 
 		return true;
@@ -399,6 +406,23 @@ struct Milk: public Container
 			}
 		}
 
+		{
+			static float timer = 0;
+			static glm::vec3 posOriginal = {};
+
+			auto t = renderer.getEntityTransform(milkEntity);
+
+			if (posOriginal == glm::vec3()) { posOriginal = t.position; }
+
+			t.rotation.x = 0.8;
+			t.rotation.y = timer * -0.5;
+			t.position.y = posOriginal.y + sin(timer * -0.6f);
+
+			timer += input.deltaTime * 1.4;
+
+			renderer.setEntityTransform(milkEntity, t);
+		}
+
 
 		renderer.render(input.deltaTime);
 

+ 13 - 1
Pika/resources/logs.txt

@@ -1 +1,13 @@
-#2025-05-13 11:03:07: Created container: Milk
+#2025-05-13 11:35:44: Created container: Milk
+#2025-05-13 11:36:34[warning]: Couldn't reloaded dll
+#2025-05-13 11:36:36: Reloaded dll
+#2025-05-13 11:37:46[warning]: Couldn't reloaded dll
+#2025-05-13 11:37:49[warning]: Couldn't reloaded dll
+#2025-05-13 11:37:49: Reloaded dll
+#2025-05-13 11:38:24[warning]: Couldn't reloaded dll
+#2025-05-13 11:38:26[warning]: Couldn't reloaded dll
+#2025-05-13 11:38:27: Reloaded dll
+#2025-05-13 11:39:13: Destroyed continer: Milk #1
+#2025-05-13 11:39:20[warning]: Couldn't reloaded dll
+#2025-05-13 11:39:23[warning]: Couldn't reloaded dll
+#2025-05-13 11:39:23: Reloaded dll

File diff suppressed because it is too large
+ 0 - 0
Pika/resources/milk/milk.bbmodel


BIN
Pika/resources/milk/milk.glb


BIN
Pika/resources/milk/milk.png


Some files were not shown because too many files changed in this diff