Consistent startup

Game.cpp

@@ -295,9 +295,9 @@ public:
 };
 class App : public OgreBites::ApplicationContext {
 	Ogre::SceneNode *mCameraNode, *mCameraPivot, *mCameraGoal;
-	Ogre::Camera *mCamera;
+    Ogre::Camera *mCamera, *mCameraInterior, *mCameraInventory;
 	Ogre::Real mPivotPitch;
-	Ogre::SceneManager *mScnMgr;
+    Ogre::SceneManager *mScnMgr, *mScnMgrInterior, *mScnMgrInventory;
 	Ogre::Viewport *mViewport;
 	SkyBoxRenderer *sky;
 	bool mGrab;
@@ -313,15 +313,19 @@ public:
 	virtual ~App()
 	{
 	}
-	void setup()
+    void setup() override
 	{
 		OgreBites::ApplicationContext::setup();
 		Ogre::Root *root = getRoot();
 		Ogre::SceneManager *scnMgr = root->createSceneManager();
 		mScnMgr = scnMgr;
-		Ogre::OverlaySystem *pOverlaySystem = getOverlaySystem();
+        mScnMgrInterior = root->createSceneManager();
+        mScnMgrInventory = root->createSceneManager();
+        Ogre::OverlaySystem *pOverlaySystem = getOverlaySystem();
 		mScnMgr->addRenderQueueListener(pOverlaySystem);
-		//		mTrayMgr = new OgreBites::TrayManager("AppTrays",
+        mScnMgrInterior->addRenderQueueListener(pOverlaySystem);
+        mScnMgrInventory->addRenderQueueListener(pOverlaySystem);
+        //		mTrayMgr = new OgreBites::TrayManager("AppTrays",
 		//						      getRenderWindow());
 	}
 	bool isWindowGrab()
@@ -347,7 +351,32 @@ public:
 		mGrab = grab;
 		ApplicationContextBase::setWindowGrab(grab);
 	}
-
+    void initInteriorCamera()
+    {
+        Ogre::SceneNode *cameraNode =
+            mScnMgrInterior->getRootSceneNode()
+                ->createChildSceneNode("InteriorCameraNode");
+        cameraNode->setPosition(0, 2, 3);
+        cameraNode->lookAt(Ogre::Vector3(0, 1, -1),
+                   Ogre::Node::TS_PARENT);
+        mCameraInterior = mScnMgr->createCamera("interior_camera");
+        mCameraInterior->setNearClipDistance(0.05f);
+        mCameraInterior->setAutoAspectRatio(true);
+        cameraNode->attachObject(mCameraInterior);
+    }
+    void initInventoryCamera()
+    {
+        Ogre::SceneNode *cameraNode =
+            mScnMgrInventory->getRootSceneNode()
+                ->createChildSceneNode("InteriorCameraNode");
+        cameraNode->setPosition(0, 2, 3);
+        cameraNode->lookAt(Ogre::Vector3(0, 1, -1),
+                   Ogre::Node::TS_PARENT);
+        mCameraInventory = mScnMgr->createCamera("inventory_camera");
+        mCameraInventory->setNearClipDistance(0.05f);
+        mCameraInventory->setAutoAspectRatio(true);
+        cameraNode->attachObject(mCameraInventory);
+    }
 	void initCamera()
 	{
 		mCameraNode = mScnMgr->getRootSceneNode()->createChildSceneNode(
@@ -378,12 +407,16 @@ public:
 		mCamera->setNearClipDistance(0.1f);
 		mCamera->setFarClipDistance(800);
 		mPivotPitch = 0;
+        initInteriorCamera();
+        initInventoryCamera();
 	}
 	void configure()
 	{
-		std::cout << "Startup" << "\n";
+        std::cout << "Startup"
+              << "\n";
 		initApp();
-		std::cout << "Set up RTSS" << "\n";
+        std::cout << "Set up RTSS"
+              << "\n";
 		Ogre::Root *root = getRoot();
 		Ogre::SceneManager *scnMgr = getSceneManager();
 
@@ -392,19 +425,25 @@ public:
 			Ogre::RTShader::ShaderGenerator::getSingletonPtr();
 		shadergen->addSceneManager(scnMgr);
 		setWindowGrab(true);
-		std::cout << "Init camera" << "\n";
+        std::cout << "Init camera"
+              << "\n";
 		initCamera();
-		std::cout << "Set up water" << "\n";
-		std::cout << "Set up cursor" << "\n";
+        std::cout << "Set up water"
+              << "\n";
+        std::cout << "Set up cursor"
+              << "\n";
 		Ogre::ResourceGroupManager::getSingleton()
 			.initialiseAllResourceGroups();
 		// OgreBites::ApplicationContext::loadResources();
 		// setupCursor();
-		std::cout << "Setup input" << "\n";
+        std::cout << "Setup input"
+              << "\n";
 		setupInput();
-		std::cout << "Create content" << "\n";
+        std::cout << "Create content"
+              << "\n";
 		createContent();
-		std::cout << "Setup done" << "\n";
+        std::cout << "Setup done"
+              << "\n";
 #if 0
 		mDbgDraw->setDebugMode(mDbgDraw->getDebugMode() |
 				       btIDebugDraw::DBG_DrawContactPoints);
@@ -601,8 +640,9 @@ public:
 				"Skybox/Dynamic", "General");
 		OgreAssert(m, "Sky box material not found.");
 		m->load();
-		ECS::setup(mScnMgr, /*mDynWorld.get(), */ mCameraNode, mCamera,
-			   getRenderWindow());
+        ECS::setupExteriorScene(mScnMgr,
+                    /*mDynWorld.get(), */ mCameraNode,
+                    mCamera, getRenderWindow());
 		ECS::get().set<ECS::RenderWindow>(
 			{ getRenderWindow(), getDisplayDPI() });
 		ECS::get()
@@ -736,9 +776,7 @@ public:
 	}
 	flecs::entity getPlayer() const
 	{
-		flecs::entity player =
-			ECS::get().lookup("ECS::CharacterModule::player");
-		return player;
+        return ECS::player;
 	}
 	void enableDbgDraw(bool enable)
 	{