Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
iMSTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ruiliang Gao
iMSTK
Commits
07f651cf
Commit
07f651cf
authored
9 years ago
by
Alexis Girault
Browse files
Options
Downloads
Patches
Plain Diff
ENH: set vrpn_Phantom connection ifdef VRPN_USE_PHANTOM_SERVER
parent
df71480f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Devices/VRPNDeviceServer.cpp
+10
-5
10 additions, 5 deletions
Devices/VRPNDeviceServer.cpp
with
10 additions
and
5 deletions
Devices/VRPNDeviceServer.cpp
+
10
−
5
View file @
07f651cf
...
...
@@ -26,7 +26,6 @@
#include
<vrpn_Tracker_RazerHydra.h>
#include
<vrpn_Xkeys.h>
#include
<vrpn_Tracker_OSVRHackerDevKit.h>
#ifdef VRPN_USE_PHANTOM_SERVER
#include
<server_src/vrpn_Phantom.h>
#endif
...
...
@@ -87,14 +86,20 @@ bool VRPNDeviceServer::addDeviceClient(
vrpnButtonDevice
=
std
::
make_shared
<
vrpn_Xkeys_XK3
>
(
newDeviceName
.
c_str
(),
this
->
connection
);
break
;
// case DeviceType::PHANTOM_OMNI:
// vrpnDevice = std::make_shared<vrpn_Phantom> // TODO
// (newDeviceName.c_str(), this->connection, 60.0f, "Default PHANToM");
// break;
case
DeviceType
::
OSVR_HDK
:
vrpnTrackerDevice
=
std
::
make_shared
<
vrpn_Tracker_OSVRHackerDevKit
>
(
newDeviceName
.
c_str
(),
this
->
connection
);
break
;
case
DeviceType
::
PHANTOM_OMNI
:
#ifdef VRPN_USE_PHANTOM_SERVER
vrpnDevice
=
std
::
make_shared
<
vrpn_Phantom
>
// TODO
(
newDeviceName
.
c_str
(),
this
->
connection
,
60.0
f
,
"Default PHANToM"
);
#else
std
::
cerr
<<
"addDeviceClient error: needs VRPN_USE_PHANTOM_SERVER to be true "
<<
"to connect a Panthom omni device."
<<
std
::
endl
;
return
EXIT_FAILURE
;
#endif
break
;
default:
std
::
cerr
<<
"addDeviceClient error: unknown device type."
<<
std
::
endl
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment