Moved OSC objects in App to protected section so they can be accessed…

… by subclasses. Made allosphere app connect to device server by default.
AlloSphere-Research-Group · Jun 3, 2016 · 781c7d6 · 781c7d6
1 parent 10d0c19
commit 781c7d6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/allocore/allocore/io/al_App.hpp b/allocore/allocore/io/al_App.hpp
@@ -355,6 +355,10 @@ class App {
 	 // i.e. use mouse xy
 	Rayd getPickRay(const ViewpointWindow& w, int screenX, int screenY);
 
+protected:
+	osc::Recv mOSCRecv;
+	osc::Send mOSCSend;
+
 private:
 
 	typedef std::vector<Viewpoint *> Viewpoints;
@@ -379,8 +383,6 @@ class App {
 
 	// control
 	NavInputControl mNavControl;
-	osc::Recv mOSCRecv;
-	osc::Send mOSCSend;
 
 	std::string mName;
 	void * mClockAnimate;

diff --git a/allocore/src/io/al_App.cpp b/allocore/src/io/al_App.cpp
@@ -231,7 +231,9 @@ bool SceneWindowHandler::onFrame(){
 App::App()
 :	mName(""),
 	mNavControl(mNav),
-	mClockAnimate(0), mClockNav(0)
+	mClockAnimate(0), mClockNav(0),
+	mOSCRecv(12001, "", 0.001),
+	mOSCSend(12000, "bossanova.mat.ucsb.edu", 0)
 {}
 
 

diff --git a/allosphere/allosphere/al_AlloSphereApp.hpp b/allosphere/allosphere/al_AlloSphereApp.hpp
@@ -128,17 +128,17 @@ class AudioRendererBase : public AudioRendererBaseNoState {
 template<typename State = DummyState, typename AudioState = DummyState,
          unsigned GRAPHICSPORT = ALLOAPP_GRAPHICS_PORT,
          unsigned AUDIOPORT = ALLOAPP_AUDIO_PORT>
-class SimulatorBase : public App {
+class SimulatorBase : public App, public osc::PacketHandler {
 public:
 	explicit SimulatorBase(const Window::Dim& dims = Window::Dim(320, 240),
 	                       const std::string title="",
 	                       double fps=60,
 	                       Window::DisplayMode mode = Window::DEFAULT_BUF,
 	                       int flags=0,
-	                       const char *broadcastIP = "127.0.0.1") :
+						   const char *broadcastIP = "127.0.0.1") :
 	    mDims(dims), mTitle(title), mFps(fps), mMode(mode), mFlags(flags),
 	    mMakerAudio(broadcastIP),
-	    mMakerGraphics(broadcastIP)
+		mMakerGraphics(broadcastIP)
 	{
 		mMakerGraphics.start();
 		mMakerAudio.start();
@@ -157,6 +157,12 @@ class SimulatorBase : public App {
 	///
 	virtual void onAnimate(double dt) override{}
 
+	///
+	/// \brief onMessage will recieve the messages from Device Server
+	/// \param m
+	///
+	virtual void onMessage(osc::Message &m) override {};
+
 	///
 	/// \brief Send the state to the graphics renderers
 	///