Water works!

Game.cpp

@@ -167,6 +167,127 @@ public:
 		mSkyBoxGenParameters.skyBoxDistance = distance;
 	}
 };
+class App;
+class KeyboardListener : public OgreBites::InputListener {
+	App *mApp;
+
+	uint32_t control;
+	ECS::Vector2 mouse;
+	float wheel_y;
+	bool mouse_moved, wheel_moved;
+	float mInitDelay;
+
+public:
+	Ogre::Timer fps_timer;
+	bool fast;
+	KeyboardListener(App *app)
+		: OgreBites::InputListener()
+		, mApp(app)
+		, fast(false)
+		, control(0)
+		, mouse({ 0, 0 })
+		, wheel_y(0.0f)
+		, mouse_moved(false)
+		, wheel_moved(false)
+		, mInitDelay(1.0)
+	{
+	}
+	bool isGuiEnabled()
+	{
+		if (!ECS::get().has<ECS::GUI>())
+			return false;
+		return (ECS::get().get<ECS::GUI>().enabled);
+	}
+	void setGuiEnabled(bool value)
+	{
+		if (!ECS::get().has<ECS::GUI>())
+			return;
+		ECS::get().get_mut<ECS::GUI>().enabled = value;
+		ECS::get().modified<ECS::GUI>();
+	}
+	bool keyPressed(const OgreBites::KeyboardEvent &evt) override
+	{
+		bool updated = false;
+		if (isGuiEnabled())
+			return false;
+		if (evt.keysym.sym == OgreBites::SDLK_ESCAPE) {
+			OgreAssert(ECS::get().has<ECS::GUI>(), "");
+			setGuiEnabled(true);
+			if (ECS::get().has<ECS::GUI>())
+				ECS::get<ECS::GUI>().setWindowGrab(false);
+			return true;
+		}
+		OgreBites::Keycode key = evt.keysym.sym;
+		if (key == 'w')
+			control |= 1;
+		else if (key == 'a')
+			control |= 2;
+		else if (key == 's')
+			control |= 4;
+		else if (key == 'd')
+			control |= 8;
+		else if (key == OgreBites::SDLK_LSHIFT)
+			control |= 16;
+		if (key == 'w' || key == 'a' || key == 's' || key == 'd' ||
+		    key == OgreBites::SDLK_LSHIFT)
+			return true;
+		return false;
+	}
+	bool keyReleased(const OgreBites::KeyboardEvent &evt) override
+	{
+		OgreBites::Keycode key = evt.keysym.sym;
+		if (isGuiEnabled())
+			return false;
+		if (key == 'w')
+			control &= ~1;
+		else if (key == 'a')
+			control &= ~2;
+		else if (key == 's')
+			control &= ~4;
+		else if (key == 'd')
+			control &= ~8;
+		else if (key == OgreBites::SDLK_LSHIFT)
+			control &= ~16;
+		if (key == 'w' || key == 'a' || key == 's' || key == 'd' ||
+		    key == OgreBites::SDLK_LSHIFT)
+			return true;
+		return false;
+	}
+	bool mouseMoved(const OgreBites::MouseMotionEvent &evt) override
+	{
+		if (isGuiEnabled())
+			return false;
+		mouse.x = evt.xrel;
+		mouse.y = evt.yrel;
+		mouse_moved = true;
+		/* no special mouse handling */
+		return true;
+	}
+	bool mouseWheelRolled(const OgreBites::MouseWheelEvent &evt) override
+	{
+		if (isGuiEnabled())
+			return false;
+		/* no special mouse wheel handling */
+		wheel_y = evt.y;
+		wheel_moved = true;
+		return true;
+	}
+	bool mousePressed(const OgreBites::MouseButtonEvent &evt) override
+	{
+		std::cout << "Mouse press " << (int)evt.button << " "
+			  << (int)evt.clicks << "\n";
+		if ((int)evt.button == 1)
+			control |= 256;
+		else
+			control &= ~256;
+		return false;
+	}
+	void update(float delta)
+	{
+		return;
+	}
+	void frameRendered(const Ogre::FrameEvent &evt) override;
+};
 class App : public OgreBites::ApplicationContext {
 	std::unique_ptr<Ogre::Bullet::DynamicsWorld> mDynWorld;
 	std::unique_ptr<Ogre::Bullet::DebugDrawer> mDbgDraw;
@@ -177,171 +298,8 @@ class App : public OgreBites::ApplicationContext {
 	Ogre::Viewport *mViewport;
 	SkyBoxRenderer *sky;
 	bool mGrab;
-	class KeyboardListener : public OgreBites::InputListener,
-				 public Ogre::FrameListener {
-		App *mApp;
-
-		uint32_t control;
-		ECS::Vector2 mouse{ 0, 0 };
-		float wheel_y;
-		bool mouse_moved = false, wheel_moved = false;
-		float mInitDelay;
-
-	public:
-		Ogre::Timer fps_timer;
-		bool fast;
-		KeyboardListener(App *app)
-			: OgreBites::InputListener()
-			, Ogre::FrameListener()
-			, mApp(app)
-			, fast(false)
-			, control(0)
-			, mInitDelay(1.0)
-		{
-		}
-		bool isGuiEnabled()
-		{
-			if (!ECS::get().has<ECS::GUI>())
-				return false;
-			return (ECS::get().get<ECS::GUI>().enabled);
-		}
-		void setGuiEnabled(bool value)
-		{
-			if (!ECS::get().has<ECS::GUI>())
-				return;
-			ECS::get().get_mut<ECS::GUI>().enabled = value;
-			ECS::get().modified<ECS::GUI>();
-		}
-		bool keyPressed(const OgreBites::KeyboardEvent &evt) override
-		{
-			bool updated = false;
-			if (isGuiEnabled())
-				return false;
-			if (evt.keysym.sym == OgreBites::SDLK_ESCAPE) {
-				OgreAssert(ECS::get().has<ECS::GUI>(), "");
-				setGuiEnabled(true);
-				if (ECS::get().has<ECS::GUI>())
-					ECS::get<ECS::GUI>().setWindowGrab(
-						false);
-				return true;
-			}
-			OgreBites::Keycode key = evt.keysym.sym;
-			if (key == 'w')
-				control |= 1;
-			else if (key == 'a')
-				control |= 2;
-			else if (key == 's')
-				control |= 4;
-			else if (key == 'd')
-				control |= 8;
-			else if (key == OgreBites::SDLK_LSHIFT)
-				control |= 16;
-			if (key == 'w' || key == 'a' || key == 's' ||
-			    key == 'd' || key == OgreBites::SDLK_LSHIFT)
-				return true;
-			return false;
-		}
-		bool keyReleased(const OgreBites::KeyboardEvent &evt) override
-		{
-			OgreBites::Keycode key = evt.keysym.sym;
-			if (isGuiEnabled())
-				return false;
-			if (key == 'w')
-				control &= ~1;
-			else if (key == 'a')
-				control &= ~2;
-			else if (key == 's')
-				control &= ~4;
-			else if (key == 'd')
-				control &= ~8;
-			else if (key == OgreBites::SDLK_LSHIFT)
-				control &= ~16;
-			if (key == 'w' || key == 'a' || key == 's' ||
-			    key == 'd' || key == OgreBites::SDLK_LSHIFT)
-				return true;
-			return false;
-		}
-		bool mouseMoved(const OgreBites::MouseMotionEvent &evt) override
-		{
-			if (isGuiEnabled())
-				return false;
-			mouse.x = evt.xrel;
-			mouse.y = evt.yrel;
-			mouse_moved = true;
-			/* no special mouse handling */
-			return true;
-		}
-		bool
-		mouseWheelRolled(const OgreBites::MouseWheelEvent &evt) override
-		{
-			if (isGuiEnabled())
-				return false;
-			/* no special mouse wheel handling */
-			wheel_y = evt.y;
-			wheel_moved = true;
-			return true;
-		}
-		bool
-		mousePressed(const OgreBites::MouseButtonEvent &evt) override
-		{
-			std::cout << "Mouse press " << (int)evt.button << " "
-				  << (int)evt.clicks << "\n";
-			if ((int)evt.button == 1)
-				control |= 256;
-			else
-				control &= ~256;
-			return false;
-		}
-		void update(float delta)
-		{
-			return;
-		}
-		void frameRendered(const Ogre::FrameEvent &evt) override
-		{
-			if (fps_timer.getMilliseconds() > 1000.0f) {
-				std::cout << "FPS: "
-					  << mApp->getRenderWindow()
-						     ->getStatistics()
-						     .lastFPS
-					  << " ";
-				std::cout << "Draw calls: "
-					  << mApp->getRenderWindow()
-						     ->getStatistics()
-						     .batchCount
-					  << " ";
-				fps_timer.reset();
-				std::cout << "Drops: "
-					  << mApp->getRenderWindow()
-						     ->getStatistics()
-						     .vBlankMissCount
-					  << "\n";
-				fps_timer.reset();
-			}
-			update(evt.timeSinceLastFrame);
-			if (!isGuiEnabled() && mApp->isTerrainReady()) {
-				OgreAssert(mApp->isTerrainReady(),
-					   "terrain is not ready");
-			}
-			if (!isGuiEnabled()) {
-				mApp->updateWorld(evt.timeSinceLastFrame);
-				if (mInitDelay >= 0.0f)
-					mInitDelay -= evt.timeSinceLastFrame;
-			}
-			if (!isGuiEnabled() && ECS::get().has<ECS::Input>()) {
-				ECS::Input &input =
-					ECS::get().get_mut<ECS::Input>();
-				input.control = control;
-				input.mouse = mouse;
-				mouse.x = 0;
-				mouse.y = 0;
-				input.wheel_y = wheel_y;
-				wheel_y = 0;
-				input.mouse_moved = mouse_moved;
-				input.wheel_moved = wheel_moved;
-			}
-		}
-	};
 	KeyboardListener mKbd;
+	bool enabldDbgDraw;
 
 public:
 	App()
@@ -350,6 +308,7 @@ public:
 		, mDynWorld(new Ogre::Bullet::DynamicsWorld(
 			  Ogre::Vector3(0, -9.8, 0)))
 		, mGrab(false)
+		, enabldDbgDraw(false)
 	{
 	}
 	virtual ~App()
@@ -439,11 +398,13 @@ public:
 			.initialiseAllResourceGroups();
 		// OgreBites::ApplicationContext::loadResources();
 		// setupCursor();
-		std::cout << "Create content" << "\n";
-		createContent();
 		std::cout << "Setup input" << "\n";
 		setupInput();
+		std::cout << "Create content" << "\n";
+		createContent();
 		std::cout << "Setup done" << "\n";
+		mDbgDraw->setDebugMode(mDbgDraw->getDebugMode() |
+				       btIDebugDraw::DBG_DrawContactPoints);
 	}
 	Ogre::SceneManager *getSceneManager()
 	{
@@ -474,9 +435,10 @@ public:
 			ECS::get().get_mut<ECS::GUI>().grabChanged = false;
 			ECS::get().modified<ECS::GUI>();
 		}
-
 		ECS::update(delta);
-		//		mDbgDraw->update();
+
+		if (enabldDbgDraw)
+			mDbgDraw->update();
 	}
 	class InputListenerChainFlexible : public OgreBites::InputListener {
 	protected:
@@ -609,7 +571,30 @@ public:
 	flecs::entity find_wait_gui;
 	void setupInput()
 	{
-		ECS::App &p = ECS::get().get_mut<ECS::App>();
+	}
+	void createContent()
+	{
+		int i;
+		sky = new SkyBoxRenderer(getSceneManager());
+		bool drawFirst = true;
+		uint8_t renderQueue = drawFirst ?
+					      Ogre::RENDER_QUEUE_SKIES_EARLY :
+					      Ogre::RENDER_QUEUE_SKIES_LATE;
+		sky->create("Skybox/Dynamic", 450, renderQueue,
+			    Ogre::Quaternion::IDENTITY,
+			    Ogre::ResourceGroupManager::
+				    AUTODETECT_RESOURCE_GROUP_NAME);
+		sky->setEnabled(true);
+
+		Ogre::MaterialPtr m =
+			Ogre::MaterialManager::getSingleton().getByName(
+				"Skybox/Dynamic", "General");
+		OgreAssert(m, "Sky box material not found.");
+		m->load();
+		ECS::setup(mScnMgr, mDynWorld.get(), mCameraNode, mCamera,
+			   getRenderWindow());
+		ECS::get().set<ECS::RenderWindow>(
+			{ getRenderWindow(), getDisplayDPI() });
 		ECS::get()
 			.observer<ECS::GUI>("UpdateGrab")
 			.event(flecs::OnSet)
@@ -619,11 +604,6 @@ public:
 				std::cout << "grab: " << gui.grab << "\n";
 				std::cout << "GUI enabled: " << gui.enabled
 					  << "\n";
-				std::cout << "grabbed: " << isWindowGrab()
-					  << "\n";
-				std::cout
-					<< "UI active: " << mKbd.isGuiEnabled()
-					<< "\n";
 			});
 		ECS::get()
 			.observer<ECS::App>("UpdateInputListener")
@@ -632,8 +612,9 @@ public:
 				if (app.mInput)
 					removeInputListener(app.mInput);
 				delete app.mInput;
-				app.mInput = new OgreBites::InputListenerChain(
-					app.listeners);
+				app.mInput =
+					OGRE_NEW OgreBites::InputListenerChain(
+						app.listeners);
 				addInputListener(app.mInput);
 				std::cout << "Update listeners\n";
 			});
@@ -707,52 +688,10 @@ public:
 						  << "\n";
 				});
 #endif
-
-		p.listeners.clear();
-		p.listeners.push_back(&mKbd);
-		ECS::get().modified<ECS::App>();
-	}
-	void createContent()
-	{
-		int i;
-		std::cout << "addFrameListener\n";
-		getRoot()->addFrameListener(&mKbd);
-		sky = new SkyBoxRenderer(getSceneManager());
-		bool drawFirst = true;
-		uint8_t renderQueue = drawFirst ?
-					      Ogre::RENDER_QUEUE_SKIES_EARLY :
-					      Ogre::RENDER_QUEUE_SKIES_LATE;
-		sky->create("Skybox/Dynamic", 450, renderQueue,
-			    Ogre::Quaternion::IDENTITY,
-			    Ogre::ResourceGroupManager::
-				    AUTODETECT_RESOURCE_GROUP_NAME);
-		sky->setEnabled(true);
-
-		Ogre::MaterialPtr m =
-			Ogre::MaterialManager::getSingleton().getByName(
-				"Skybox/Dynamic", "General");
-		OgreAssert(m, "Sky box material not found.");
-		m->load();
-		ECS::setup(mScnMgr, mDynWorld.get(), mCameraNode, mCamera);
-		ECS::get()
-			.system<const ECS::GUI, ECS::App>("SetInputListener")
-			.kind(flecs::OnUpdate)
-			.each([this](const ECS::GUI &gui, ECS::App &app) {
-				if (gui.mGuiInpitListener &&
-				    app.listeners.size() == 1) {
-					app.listeners.clear();
-					app.listeners.push_back(
-						gui.mGuiInpitListener);
-					app.listeners.push_back(&mKbd);
-					ECS::modified<ECS::App>();
-				}
-			});
-		ECS::get().set<ECS::RenderWindow>(
-			{ getRenderWindow(), getDisplayDPI() });
 		ECS::get().set<ECS::App>(
-			{ static_cast<OgreBites::ApplicationContext *>(this),
+			{ initialiseImGui(),
 			  nullptr,
-			  {} });
+			  { getImGuiInputListener(), &mKbd } });
 		Sound::setup();
 		Sound::ding();
 	}
@@ -792,7 +731,51 @@ public:
 			ECS::get().lookup("ECS::CharacterModule::player");
 		return player;
 	}
+	void enableDbgDraw(bool enable)
+	{
+		enabldDbgDraw = enable;
+	}
+	bool isEnabledDbgDraw() const
+	{
+		return enabldDbgDraw;
+	}
 };
+void KeyboardListener::frameRendered(const Ogre::FrameEvent &evt)
+{
+	if (fps_timer.getMilliseconds() > 1000.0f) {
+		std::cout << "FPS: "
+			  << mApp->getRenderWindow()->getStatistics().lastFPS
+			  << " ";
+		std::cout << "Draw calls: "
+			  << mApp->getRenderWindow()->getStatistics().batchCount
+			  << " ";
+		fps_timer.reset();
+		std::cout << "Drops: "
+			  << mApp->getRenderWindow()
+				     ->getStatistics()
+				     .vBlankMissCount
+			  << "\n";
+		fps_timer.reset();
+	}
+	update(evt.timeSinceLastFrame);
+	if (!isGuiEnabled()) {
+		mApp->updateWorld(evt.timeSinceLastFrame);
+		if (mInitDelay >= 0.0f)
+			mInitDelay -= evt.timeSinceLastFrame;
+	}
+
+	if (!isGuiEnabled() && ECS::get().has<ECS::Input>()) {
+		ECS::Input &input = ECS::get().get_mut<ECS::Input>();
+		input.control = control;
+		input.mouse = mouse;
+		mouse.x = 0;
+		mouse.y = 0;
+		input.wheel_y = wheel_y;
+		wheel_y = 0;
+		input.mouse_moved = mouse_moved;
+		input.wheel_moved = wheel_moved;
+	}
+}
 
 int main()
 {
@@ -803,7 +786,7 @@ int main()
 	// register for input events
 	//    KeyHandler keyHandler;
 	//    ctx.addInputListener(&keyHandler);
-
+	ctx.enableDbgDraw(false);
 	ctx.getRoot()->startRendering();
 	ctx.setWindowGrab(false);
 	ctx.closeApp();