Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 11:22:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fix for linux #2?

Browse source
This commit is contained in:
Anthony J. Thibault 2015-12-29 09:23:03 -08:00
parent c35995b8e3
commit e10cecd310
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/hifiNeuron/src/NeuronPlugin.cpp
View file

@ -24,7 +24,10 @@ Q_LOGGING_CATEGORY(inputplugins, "hifi.inputplugins")
#define __OS_XUN__ 1 #define __OS_XUN__ 1
#define BOOL int #define BOOL int
#ifdef HAVE_NEURON
#include <NeuronDataReader.h> #include <NeuronDataReader.h>
#endif
const QString NeuronPlugin::NAME = "Neuron"; const QString NeuronPlugin::NAME = "Neuron";
const QString NeuronPlugin::NEURON_ID_STRING = "Perception Neuron"; const QString NeuronPlugin::NEURON_ID_STRING = "Perception Neuron";
@ -312,6 +315,8 @@ static quat eulerToQuat(vec3 euler) {
glm::angleAxis(e.z, Vectors::UNIT_Z)); glm::angleAxis(e.z, Vectors::UNIT_Z));
} }
#ifdef HAVE_NEURON
// //
// neuronDataReader SDK callback functions // neuronDataReader SDK callback functions
// //
@ -430,17 +435,24 @@ static void SocketStatusChangedCallback(void* context, SOCKET_REF sender, Socket
qCDebug(inputplugins) << "NeuronPlugin: socket status = " << message; qCDebug(inputplugins) << "NeuronPlugin: socket status = " << message;
} }
#endif // #ifdef HAVE_NEURON
// //
// NeuronPlugin // NeuronPlugin
// //
bool NeuronPlugin::isSupported() const { bool NeuronPlugin::isSupported() const {
#ifdef HAVE_NEURON
// Because it's a client/server network architecture, we can't tell // Because it's a client/server network architecture, we can't tell
// if the neuron is actually connected until we connect to the server. // if the neuron is actually connected until we connect to the server.
return true; return true;
#else
return false;
#endif
} }
void NeuronPlugin::activate() { void NeuronPlugin::activate() {
#ifdef HAVE_NEURON
InputPlugin::activate(); InputPlugin::activate();
// register with userInputMapper // register with userInputMapper
@ -466,9 +478,11 @@ void NeuronPlugin::activate() {
BRRegisterAutoSyncParmeter(_socketRef, Cmd_CombinationMode); BRRegisterAutoSyncParmeter(_socketRef, Cmd_CombinationMode);
} }
#endif
} }
void NeuronPlugin::deactivate() { void NeuronPlugin::deactivate() {
#ifdef HAVE_NEURON
// unregister from userInputMapper // unregister from userInputMapper
if (_inputDevice->_deviceID != controller::Input::INVALID_DEVICE) { if (_inputDevice->_deviceID != controller::Input::INVALID_DEVICE) {
auto userInputMapper = DependencyManager::get<controller::UserInputMapper>(); auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
@ -481,6 +495,7 @@ void NeuronPlugin::deactivate() {
} }
InputPlugin::deactivate(); InputPlugin::deactivate();
#endif
} }
void NeuronPlugin::pluginUpdate(float deltaTime, bool jointsCaptured) { void NeuronPlugin::pluginUpdate(float deltaTime, bool jointsCaptured) {