Merge branch 'master' into dev

MKXJun · Dec 12, 2023 · c2e4504 · c2e4504
2 parents 2f951ae + 7d8950e
commit c2e4504
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Project 19-/39 VSM and ESM/GameApp.cpp b/Project 19-/39 VSM and ESM/GameApp.cpp
@@ -535,7 +535,7 @@ bool GameApp::InitResource()
     // ******************
     // 初始化对象
     //
-    m_Powerplant.SetModel(m_ModelManager.CreateFromFile("..\\Model\\powerplant\\powerplant.obj"));
+    m_Powerplant.SetModel(m_ModelManager.CreateFromFile("..\\Model\\powerplant\\powerplant.gltf"));
 
     m_ModelManager.CreateFromGeometry("cube", Geometry::CreateBox());
     m_Cube.SetModel(m_ModelManager.GetModel("cube"));