FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber, updates to explictly set the HOST Endian using Cmake

Browse Source
This commit is contained in:
Robert Osfield
2012-11-22 11:47:03 +00:00
parent 56bc0b14bc
commit 9ef448c7b1
4 changed files with 243 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/osc/CMakeLists.txt
View File

@@ -1,5 +1,13 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR})
INCLUDE(TestBigEndian)
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
IF (WORDS_BIGENDIAN)
ADD_DEFINITIONS("-DOSC_HOST_BIG_ENDIAN")
ELSE (WORDS_BIGENDIAN)
ADD_DEFINITIONS("-DOSC_HOST_LITTLE_ENDIAN")
ENDIF (WORDS_BIGENDIAN)
SET(TARGET_SRC
ip/IpEndpointName.cpp
osc/OscOutboundPacketStream.cpp

160
src/osgPlugins/osc/OscDevice.cpp
View File

@@ -15,6 +15,7 @@
#include <OpenThreads/Thread>
#include <osgDB/FileUtils>
#include "osc/OscPrintReceivedElements.h"
#include "osc/OscHostEndianness.h"
class StandardRequestHandler : public OscDevice::RequestHandler {
@@ -178,6 +179,8 @@ private:
};
class MouseMotionRequestHandler : public OscDevice::RequestHandler {
public:
MouseMotionRequestHandler()
@@ -214,6 +217,46 @@ private:
float _lastX, _lastY;
};
class MouseScrollRequestHandler : public OscDevice::RequestHandler {
public:
MouseScrollRequestHandler()
: OscDevice::RequestHandler("/osgga/mouse/scroll")
{
}
virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m)
{
try {
osc::int32 sm(osgGA::GUIEventAdapter::SCROLL_NONE);
float delta_x(0.0f), delta_y(0.0f);
osc::ReceivedMessageArgumentStream args = m.ArgumentStream();
args >> sm >> delta_x >> delta_y >> osc::EndMessage;
if (sm != osgGA::GUIEventAdapter::SCROLL_NONE)
getDevice()->getEventQueue()->mouseScroll((osgGA::GUIEventAdapter::ScrollingMotion)sm, getLocalTime());
if ((delta_x != 0.0f) || (delta_y != 0.0f))
getDevice()->getEventQueue()->mouseScroll2D(delta_x, delta_y, getLocalTime());
return true;
}
catch (osc::Exception e) {
handleException(e);
}
return false;
}
virtual void describeTo(std::ostream& out) const
{
out << getRequestPath() << "(int scroll_motion, float x, float y): send mouse scroll-motion";
}
};
class MouseButtonToggleRequestHandler : public OscDevice::RequestHandler {
public:
MouseButtonToggleRequestHandler(const std::string& btn_name, MouseMotionRequestHandler* mm_handler)
@@ -321,6 +364,108 @@ private:
};
class PenPressureRequestHandler : public OscDevice::RequestHandler {
public:
PenPressureRequestHandler()
: OscDevice::RequestHandler("/osgga/pen/pressure")
{
}
virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m)
{
try {
float pressure(0.0f);
osc::ReceivedMessageArgumentStream args = m.ArgumentStream();
args >> pressure >> osc::EndMessage;
getDevice()->getEventQueue()->penPressure(pressure, getLocalTime());
return true;
}
catch (osc::Exception e) {
handleException(e);
}
return false;
}
virtual void describeTo(std::ostream& out) const
{
out << getRequestPath() << "(float pressure): send pen pressure";
}
};
class PenProximityRequestHandler : public OscDevice::RequestHandler {
public:
PenProximityRequestHandler(bool handle_enter)
: OscDevice::RequestHandler(std::string("/osgga/pen/proximity/") + ((handle_enter) ? std::string("enter") : std::string("leave")))
, _handleEnter(handle_enter)
{
}
virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m)
{
try {
osc::int32 pt(osgGA::GUIEventAdapter::UNKNOWN);
osc::ReceivedMessageArgumentStream args = m.ArgumentStream();
args >> pt >> osc::EndMessage;
getDevice()->getEventQueue()->penProximity((osgGA::GUIEventAdapter::TabletPointerType)pt, _handleEnter, getLocalTime());
return true;
}
catch (osc::Exception e) {
handleException(e);
}
return false;
}
virtual void describeTo(std::ostream& out) const
{
out << getRequestPath() << "(int table_pointer_type): send pen proximity " << (_handleEnter ? "enter":"leave");
}
private:
bool _handleEnter;
};
class PenOrientationRequestHandler : public OscDevice::RequestHandler {
public:
PenOrientationRequestHandler()
: OscDevice::RequestHandler("/osgga/pen/orientation")
, _lastX(0.0f)
, _lastY(0.0f)
{
}
virtual bool operator()(const std::string& request_path, const std::string& full_request_path, const osc::ReceivedMessage& m)
{
try {
float rotation(0.0f), tilt_x(0.0f), tilt_y(0.0f);
osc::ReceivedMessageArgumentStream args = m.ArgumentStream();
args >> rotation >> tilt_x >> tilt_y >> osc::EndMessage;
getDevice()->getEventQueue()->penOrientation(tilt_x, tilt_y, rotation, getLocalTime());
return true;
}
catch (osc::Exception e) {
handleException(e);
}
return false;
}
virtual void describeTo(std::ostream& out) const
{
out << getRequestPath() << "(float rotation, float tilt_x, float tilt_y): send pen orientation";
}
float getLastX() const { return _lastX; }
float getLastY() const { return _lastY; }
private:
float _lastX, _lastY;
};
OscDevice::OscDevice(const std::string& server_address, int listening_port)
: osgGA::Device()
@@ -331,6 +476,15 @@ OscDevice::OscDevice(const std::string& server_address, int listening_port)
, _socket(NULL)
, _map()
{
OSG_NOTICE << "OscDevice :: listening on " << server_address << ":" << listening_port << " ";
#ifdef OSC_HOST_LITTLE_ENDIAN
OSG_NOTICE << "(little endian)";
#elif OSC_HOST_BIG_ENDIAN
OSG_NOTICE << "(big endian)";
#endif
OSG_NOTICE << std::endl;
_socket = new UdpListeningReceiveSocket(IpEndpointName( server_address.c_str(), listening_port ), this);
addRequestHandler(new KeyCodeRequestHandler(false));
@@ -345,11 +499,17 @@ OscDevice::OscDevice(const std::string& server_address, int listening_port)
addRequestHandler(new MouseButtonRequestHandler(MouseButtonRequestHandler::PRESS));
addRequestHandler(new MouseButtonRequestHandler(MouseButtonRequestHandler::RELEASE));
addRequestHandler(new MouseButtonRequestHandler(MouseButtonRequestHandler::DOUBLE_PRESS));
addRequestHandler(new MouseScrollRequestHandler());
addRequestHandler(new MouseButtonToggleRequestHandler("1", mm_handler));
addRequestHandler(new MouseButtonToggleRequestHandler("2", mm_handler));
addRequestHandler(new MouseButtonToggleRequestHandler("3", mm_handler));
addRequestHandler(new PenPressureRequestHandler());
addRequestHandler(new PenOrientationRequestHandler());
addRequestHandler(new PenProximityRequestHandler(true));
addRequestHandler(new PenProximityRequestHandler(false));
addRequestHandler(new StandardRequestHandler());
start();

78
src/osgPlugins/osc/OscProxyEventHandler.cpp
View File

@@ -13,6 +13,7 @@
#include "OscProxyEventHandler.hpp"
#include "osc/OscHostEndianness.h"
static const unsigned long BUFFER_SIZE = 2048;
@@ -23,7 +24,14 @@ OscProxyEventHandler::OscProxyEventHandler(const std::string& address, int port)
, _oscStream(_buffer, BUFFER_SIZE)
, _firstRun(true)
{
OSG_INFO << "OscDevice :: sending events to " << address << ":" << port << std::endl;
OSG_NOTICE << "OscDevice :: sending events to " << address << ":" << port << " ";
#ifdef OSC_HOST_LITTLE_ENDIAN
OSG_NOTICE << "(little endian)";
#elif OSC_HOST_BIG_ENDIAN
OSG_NOTICE << "(big endian)";
#endif
OSG_NOTICE << std::endl;
}
@@ -45,24 +53,63 @@ OscProxyEventHandler::~OscProxyEventHandler()
do_send = true;
}
break;
case osgGA::GUIEventAdapter::RESIZE:
sendInit(ea);
do_send = true;
break;
case osgGA::GUIEventAdapter::SCROLL:
_oscStream << osc::BeginMessage("/osgga/mouse/scroll") << ea.getScrollingMotion() << ea.getScrollingDeltaX() << ea.getScrollingDeltaY() << osc::EndMessage;
do_send = true;
break;
case osgGA::GUIEventAdapter::PEN_PRESSURE:
_oscStream
<< osc::BeginMessage("/osgga/pen/pressure")
<< ea.getPenPressure()
<< osc::EndMessage;
do_send = true;
break;
case osgGA::GUIEventAdapter::PEN_ORIENTATION:
_oscStream
<< osc::BeginMessage("/osgga/pen/orientation")
<< ea.getPenRotation()
<< ea.getPenTiltX()
<< ea.getPenTiltY()
<< osc::EndMessage;
do_send = true;
break;
case osgGA::GUIEventAdapter::PEN_PROXIMITY_ENTER:
_oscStream
<< osc::BeginMessage("/osgga/pen/proximity/enter")
<< ea.getTabletPointerType()
<< osc::EndMessage;
do_send = true;
break;
case osgGA::GUIEventAdapter::PEN_PROXIMITY_LEAVE:
_oscStream
<< osc::BeginMessage("/osgga/pen/proximity/leave")
<< ea.getTabletPointerType()
<< osc::EndMessage;
do_send = true;
break;
case osgGA::GUIEventAdapter::PUSH:
_oscStream << osc::BeginMessage("/osgga/mouse/press") << ea.getX() << ea.getY() << ea.getButton() << osc::EndMessage;
_oscStream << osc::BeginMessage("/osgga/mouse/press") << ea.getX() << ea.getY() << getButtonNum(ea) << osc::EndMessage;
do_send = true;
break;
case osgGA::GUIEventAdapter::RELEASE:
_oscStream << osc::BeginMessage("/osgga/mouse/release") << ea.getX() << ea.getY() << ea.getButton() << osc::EndMessage;
_oscStream << osc::BeginMessage("/osgga/mouse/release") << ea.getX() << ea.getY() << getButtonNum(ea) << osc::EndMessage;
do_send = true;
break;
case osgGA::GUIEventAdapter::DOUBLECLICK:
_oscStream << osc::BeginMessage("/osgga/mouse/doublepress") << ea.getX() << ea.getY() << ea.getButton() << osc::EndMessage;
_oscStream << osc::BeginMessage("/osgga/mouse/doublepress") << ea.getX() << ea.getY() << getButtonNum(ea) << osc::EndMessage;
do_send = true;
break;
@@ -97,6 +144,25 @@ OscProxyEventHandler::~OscProxyEventHandler()
return false;
}
int OscProxyEventHandler::getButtonNum(const osgGA::GUIEventAdapter& ea)
{
switch(ea.getButton())
{
case osgGA::GUIEventAdapter::LEFT_MOUSE_BUTTON:
return 1;
break;
case osgGA::GUIEventAdapter::MIDDLE_MOUSE_BUTTON:
return 2;
break;
case osgGA::GUIEventAdapter::RIGHT_MOUSE_BUTTON:
return 3;
break;
default:
return -1;
}
return -1;
}
void OscProxyEventHandler::sendInit(const osgGA::GUIEventAdapter &ea)
{
_oscStream << osc::BeginBundle();

2
src/osgPlugins/osc/OscProxyEventHandler.hpp
View File

@@ -28,6 +28,8 @@ public:
private:
void sendInit(const osgGA::GUIEventAdapter& ea);
int getButtonNum(const osgGA::GUIEventAdapter& ea);
UdpTransmitSocket _transmitSocket;
char* _buffer;
osc::OutboundPacketStream _oscStream;