slapin/ogre-prototype
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Better way to import vrms; fix physics in editor

Browse Source
This commit is contained in:
Sergey Lapin
2026-02-08 14:36:45 +03:00
parent d139e77969
commit 71a560ab3f
8 changed files with 309 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gamedata/GameData.cpp
View File

@@ -107,7 +107,6 @@ void setupExteriorScene(Ogre::SceneManager *scnMgr, Ogre::SceneNode *cameraNode,
ecs.set<EngineData>({ scnMgr, 0.0f, 5.0f, (int)window->getWidth(),
(int)window->getHeight(), false });
ecs.set<Camera>({ cameraNode, camera, false });
PhysicsModule::configurePhysics();
ecs.add<GameData>();
ecs.add<Input>();
ecs.observer<GameState>("Game_Start_Scen_Startup")
@@ -212,9 +211,6 @@ void setupEditor(Ogre::SceneManager *scnMgr, Ogre::SceneNode *cameraNode,
Ogre::Camera *camera, Ogre::RenderWindow *window)
{
setup_minimal();
Physics &ph = ECS::get().ensure<Physics>();
ph.physics = new JoltPhysicsWrapper(scnMgr, cameraNode);
ECS::modified<Physics>();
ecs.component<RenderWindow>().add(flecs::Singleton);
ecs.component<EditorSceneSwitch>().add(flecs::Singleton);
ecs.import <CharacterModule>();
@@ -267,7 +263,6 @@ void setupEditor(Ogre::SceneManager *scnMgr, Ogre::SceneNode *cameraNode,
#if 0
ecs.set<EditorSceneSwitch>({ 0 });
#endif
PhysicsModule::configurePhysics();
ecs.add<GameData>();
ecs.add<Input>();
ecs.add<WaterSurface>();