Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added SALTE output
  • Loading branch information
Tomasz Rudzki committed Sep 23, 2019
1 parent 4625fc3 commit 4a40bf8
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 37 deletions.
36 changes: 18 additions & 18 deletions head-tracker-osc-bridge/Head Tracker OSC Bridge.jucer
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="bHyyaC" name="Head Tracker OSC Bridge" projectType="guiapp"
jucerVersion="5.4.3" companyName="nvsonic" companyWebsite="nvsonic.io"
jucerVersion="5.4.4" companyName="nvsonic" companyWebsite="nvsonic.io"
companyEmail="tom@nvsonic.io" version="2.0">
<MAINGROUP id="RLPzK0" name="Head Tracker OSC Bridge">
<GROUP id="{248FD7E1-7B63-4263-1B25-0B52845722A6}" name="Resources">
Expand All @@ -25,28 +25,28 @@
</GROUP>
</MAINGROUP>
<EXPORTFORMATS>
<VS2017 targetFolder="Builds/VisualStudio2017">
<XCODE_MAC targetFolder="Builds/MacOSX">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug"/>
<CONFIGURATION isDebug="0" name="Release"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_audio_devices" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_audio_formats" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_audio_processors" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_core" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_cryptography" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_data_structures" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_events" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_graphics" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_gui_basics" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_gui_extra" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_opengl" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_osc" path="C:/JUCE 5.4.3/modules"/>
<MODULEPATH id="juce_osc" path="../../juce"/>
<MODULEPATH id="juce_opengl" path="../../juce"/>
<MODULEPATH id="juce_gui_extra" path="../../juce"/>
<MODULEPATH id="juce_gui_basics" path="../../juce"/>
<MODULEPATH id="juce_graphics" path="../../juce"/>
<MODULEPATH id="juce_events" path="../../juce"/>
<MODULEPATH id="juce_data_structures" path="../../juce"/>
<MODULEPATH id="juce_cryptography" path="../../juce"/>
<MODULEPATH id="juce_core" path="../../juce"/>
<MODULEPATH id="juce_audio_processors" path="../../juce"/>
<MODULEPATH id="juce_audio_formats" path="../../juce"/>
<MODULEPATH id="juce_audio_devices" path="../../juce"/>
<MODULEPATH id="juce_audio_basics" path="../../juce"/>
</MODULEPATHS>
</VS2017>
<XCODE_MAC targetFolder="Builds/MacOSX">
</XCODE_MAC>
<VS2019 targetFolder="Builds/VisualStudio2019">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug"/>
<CONFIGURATION isDebug="0" name="Release"/>
Expand All @@ -66,7 +66,7 @@
<MODULEPATH id="juce_audio_devices" path="../../juce"/>
<MODULEPATH id="juce_audio_basics" path="../../juce"/>
</MODULEPATHS>
</XCODE_MAC>
</VS2019>
</EXPORTFORMATS>
<MODULES>
<MODULE id="juce_audio_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
Expand Down
6 changes: 3 additions & 3 deletions head-tracker-osc-bridge/JuceLibraryCode/AppConfig.h
Expand Up @@ -177,19 +177,19 @@
#endif

#ifndef JUCE_USE_CURL
//#define JUCE_USE_CURL 0
//#define JUCE_USE_CURL 1
#endif

#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY
//#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0
#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
Expand Down
33 changes: 20 additions & 13 deletions head-tracker-osc-bridge/Source/Bridge.cpp
Expand Up @@ -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()
Expand Down Expand Up @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion head-tracker-osc-bridge/Source/Bridge.h
Expand Up @@ -66,7 +66,7 @@ class Bridge : private Timer

void timerCallback() override;

OSCSender sender;
OSCSender sender, sender2;

private:
//==============================================================================
Expand Down
6 changes: 4 additions & 2 deletions head-tracker-osc-bridge/Source/MainComponent.cpp
Expand Up @@ -178,15 +178,17 @@ 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
g.setFont(titlefontB.withPointHeight(12));
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
Expand Down

0 comments on commit 4a40bf8

Please sign in to comment.