diff --git a/head-tracker-osc-bridge/Head Tracker OSC Bridge.jucer b/head-tracker-osc-bridge/Head Tracker OSC Bridge.jucer index 87b7a58..c95af6c 100644 --- a/head-tracker-osc-bridge/Head Tracker OSC Bridge.jucer +++ b/head-tracker-osc-bridge/Head Tracker OSC Bridge.jucer @@ -1,7 +1,7 @@ @@ -25,28 +25,28 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + @@ -66,7 +66,7 @@ - + diff --git a/head-tracker-osc-bridge/JuceLibraryCode/AppConfig.h b/head-tracker-osc-bridge/JuceLibraryCode/AppConfig.h index 6a9afb7..9b3301b 100644 --- a/head-tracker-osc-bridge/JuceLibraryCode/AppConfig.h +++ b/head-tracker-osc-bridge/JuceLibraryCode/AppConfig.h @@ -177,7 +177,7 @@ #endif #ifndef JUCE_USE_CURL - //#define JUCE_USE_CURL 0 + //#define JUCE_USE_CURL 1 #endif #ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY @@ -185,11 +185,11 @@ #endif #ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 1 + //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 #endif #ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 1 + //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 #endif #ifndef JUCE_STRICT_REFCOUNTEDPOINTER diff --git a/head-tracker-osc-bridge/Source/Bridge.cpp b/head-tracker-osc-bridge/Source/Bridge.cpp index 596cecc..f4a12d8 100644 --- a/head-tracker-osc-bridge/Source/Bridge.cpp +++ b/head-tracker-osc-bridge/Source/Bridge.cpp @@ -27,7 +27,8 @@ Bridge::Bridge() { BaudR = 115200; startTimer(10); - sender.connect ("127.0.0.1", 9001); + sender.connect ("127.0.0.1", 9000); + sender2.connect("127.0.0.1", 9001); } Bridge::~Bridge() @@ -112,21 +113,27 @@ void Bridge::timerCallback() YawOUT = atan2(siny_cosp, cosy_cosp) * (180 / double_Pi); // Sign change - RollOUT = RollOUT * -1; - PitchOUT = PitchOUT * -1; - //YawOUT = YawOUT * -1; + RollOUT = RollOUT; + PitchOUT = PitchOUT; + YawOUT = -YawOUT; - RollOutput = String(RollOUT * -1,1); - PitchOutput = String(PitchOUT * -1,1); - YawOutput = String(YawOUT * -1,1); + RollOutput = String(RollOUT,1); + PitchOutput = String(PitchOUT,1); + YawOutput = String(YawOUT,1); // Map and send OSC - RollOSC = (float) jmap(RollOUT, (float) -180, (float) 180, (float) 0, (float) 1); - PitchOSC = (float) jmap(PitchOUT, (float) -180, (float) 180, (float) 0, (float) 1); - YawOSC = (float) jmap(YawOUT, (float) -180, (float) 180, (float) 0, (float) 1); - if (AXmuted == false) sender.send ("/roll/", (float) RollOSC); - if (AYmuted == false) sender.send ("/pitch/", (float) PitchOSC); - if (AZmuted == false) sender.send ("/yaw/", (float) YawOSC); + RollOSC = (float) jmap(-RollOUT, (float) -180, (float) 180, (float) 0, (float) 1); + PitchOSC = (float) jmap(-PitchOUT, (float) -180, (float) 180, (float) 0, (float) 1); + YawOSC = (float) jmap(-YawOUT, (float) -180, (float) 180, (float) 0, (float) 1); + if (AXmuted == false) sender2.send ("/roll/", (float) RollOSC); + if (AYmuted == false) sender2.send ("/pitch/", (float) PitchOSC); + if (AZmuted == false) sender2.send ("/yaw/", (float) YawOSC); + + // send rpy + sender.send("/rendering/htrpy", RollOUT, PitchOUT, YawOUT); + + // send quaternions + //sender.send("/rendering/quaternions/", qW, qX, qY, qZ); } } } diff --git a/head-tracker-osc-bridge/Source/Bridge.h b/head-tracker-osc-bridge/Source/Bridge.h index 5113e9d..5d35407 100644 --- a/head-tracker-osc-bridge/Source/Bridge.h +++ b/head-tracker-osc-bridge/Source/Bridge.h @@ -66,7 +66,7 @@ class Bridge : private Timer void timerCallback() override; - OSCSender sender; + OSCSender sender, sender2; private: //============================================================================== diff --git a/head-tracker-osc-bridge/Source/MainComponent.cpp b/head-tracker-osc-bridge/Source/MainComponent.cpp index 6bbdd87..7fc8d0f 100644 --- a/head-tracker-osc-bridge/Source/MainComponent.cpp +++ b/head-tracker-osc-bridge/Source/MainComponent.cpp @@ -178,7 +178,7 @@ void MainComponent::paint (Graphics& g) g.drawText("IP Adress: 127.0.0.1", getLocalBounds().removeFromBottom(moutpos - 0).removeFromTop(30) .removeFromRight(290 - marginleft).removeFromLeft(280 - marginleft), Justification::left, 1); - g.drawText("UDP Port #: 9001", getLocalBounds().removeFromBottom(moutpos - 25).removeFromTop(30) + g.drawText("UDP Port #: 9000", getLocalBounds().removeFromBottom(moutpos - 25).removeFromTop(30) .removeFromRight(290 - marginleft).removeFromLeft(280 - marginleft), Justification::left, 1); // version number & authors @@ -186,7 +186,9 @@ void MainComponent::paint (Graphics& g) g.setColour(clblue); g.drawText("version 2.0", getLocalBounds().removeFromBottom(35).removeFromTop(30) .removeFromRight(290 - marginleft).removeFromLeft(280 - marginleft), Justification::left, 1); - g.drawText(String(CharPointer_UTF8("\u00A9")) + " 2019 Tomasz Rudzki, Jacek Majer", getLocalBounds().removeFromBottom(35).removeFromTop(30) + //g.drawText(String(CharPointer_UTF8("\u00A9")) + " 2019 Tomasz Rudzki, Jacek Majer", getLocalBounds().removeFromBottom(35).removeFromTop(30) + // .removeFromRight(290 - marginleft).removeFromLeft(280 - marginleft), Justification::right, 1); + g.drawText("2019 Tomasz Rudzki, Jacek Majer", getLocalBounds().removeFromBottom(35).removeFromTop(30) .removeFromRight(290 - marginleft).removeFromLeft(280 - marginleft), Justification::right, 1); // icons