Mercurial > hg > orthanc-stone

diff Samples/Shared/SharedBasicScene.h @ 895:6073c980323a am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wip: adapting basic scene webassembly sample
author Alain Mazy <alain@mazy.be>
date Fri, 12 Jul 2019 14:57:06 +0200
parents 56e4e9281076
children
line wrap: on
line diff
--- a/Samples/Shared/SharedBasicScene.h	Tue Jul 09 17:36:47 2019 +0200
+++ b/Samples/Shared/SharedBasicScene.h	Fri Jul 12 14:57:06 2019 +0200
@@ -22,11 +22,12 @@
 
 #include <boost/shared_ptr.hpp>
 #include "../../Framework/Scene2DViewport/ViewportController.h"
+#include "../../Framework/Scene2D/Scene2D.h"
 
 extern const unsigned int BASIC_SCENE_FONT_SIZE;
 extern const int BASIC_SCENE_LAYER_POSITION;
 
-extern void PrepareScene(boost::shared_ptr<OrthancStone::ViewportController> controller);
+extern void PrepareScene(OrthancStone::Scene2D& scene);
 extern void TakeScreenshot(const std::string& target,
                            const OrthancStone::Scene2D& scene,
                            unsigned int canvasWidth,
@@ -48,7 +49,7 @@
   {}
 
   virtual bool OnMouseEvent(const OrthancStone::GuiAdapterMouseEvent& event, const OrthancStone::PointerEvent& pointerEvent) override;
-  virtual bool OnKeyboardEvent(const OrthancStone::GuiAdapterKeyboardEvent& guiEvent);
-  virtual bool OnWheelEvent(const OrthancStone::GuiAdapterWheelEvent& guiEvent);
+  virtual bool OnKeyboardEvent(const OrthancStone::GuiAdapterKeyboardEvent& guiEvent) override;
+  virtual bool OnWheelEvent(const OrthancStone::GuiAdapterWheelEvent& guiEvent) override;
 };