TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changes to make compatible with VRPN 07.03

Browse Source
This commit is contained in:
Mark Mine 2005-12-17 03:08:45 +00:00
parent 24cfaaea3f
commit 73b717f47c
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/vrpn/vrpnAnalog.cxx
View File

@ -112,7 +112,7 @@ write(ostream &out, int indent_level) const {
// code and sends it to any interested // code and sends it to any interested
// VrpnAnalogDevices. // VrpnAnalogDevices.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnAnalog:: void VRPN_CALLBACK VrpnAnalog::
vrpn_analog_callback(void *userdata, const vrpn_ANALOGCB info) { vrpn_analog_callback(void *userdata, const vrpn_ANALOGCB info) {
VrpnAnalog *self = (VrpnAnalog *)userdata; VrpnAnalog *self = (VrpnAnalog *)userdata;

2
panda/src/vrpn/vrpnAnalog.h
View File

@ -60,7 +60,7 @@ public:
void write(ostream &out, int indent_level = 0) const; void write(ostream &out, int indent_level = 0) const;
private: private:
static void static void VRPN_CALLBACK
vrpn_analog_callback(void *userdata, const vrpn_ANALOGCB info); vrpn_analog_callback(void *userdata, const vrpn_ANALOGCB info);
private: private:

2
panda/src/vrpn/vrpnButton.cxx
View File

@ -112,7 +112,7 @@ write(ostream &out, int indent_level) const {
// code and sends it to any interested // code and sends it to any interested
// VrpnButtonDevices. // VrpnButtonDevices.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnButton:: void VRPN_CALLBACK VrpnButton::
vrpn_button_callback(void *userdata, const vrpn_BUTTONCB info) { vrpn_button_callback(void *userdata, const vrpn_BUTTONCB info) {
VrpnButton *self = (VrpnButton *)userdata; VrpnButton *self = (VrpnButton *)userdata;
if (vrpn_cat.is_debug()) { if (vrpn_cat.is_debug()) {

2
panda/src/vrpn/vrpnButton.h
View File

@ -60,7 +60,7 @@ public:
void write(ostream &out, int indent_level = 0) const; void write(ostream &out, int indent_level = 0) const;
private: private:
static void static void VRPN_CALLBACK
vrpn_button_callback(void *userdata, const vrpn_BUTTONCB info); vrpn_button_callback(void *userdata, const vrpn_BUTTONCB info);
private: private:

6
panda/src/vrpn/vrpnClient.cxx
View File

@ -867,7 +867,7 @@ poll_dial(const string &dial) {
// Description: Callback function that merely passes the data down // Description: Callback function that merely passes the data down
// to the appropriate non-static function // to the appropriate non-static function
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnClient:: void VRPN_CALLBACK VrpnClient::
st_tracker_position(void *userdata, const vrpn_TRACKERCB info) { st_tracker_position(void *userdata, const vrpn_TRACKERCB info) {
VrpnClientInfo *data = (VrpnClientInfo *)userdata; VrpnClientInfo *data = (VrpnClientInfo *)userdata;
((VrpnClient *)data->self)->tracker_position(data->device_name, info); ((VrpnClient *)data->self)->tracker_position(data->device_name, info);
@ -879,7 +879,7 @@ st_tracker_position(void *userdata, const vrpn_TRACKERCB info) {
// Description: Callback function that merely passes the data down // Description: Callback function that merely passes the data down
// to the appropriate non-static function // to the appropriate non-static function
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnClient:: void VRPN_CALLBACK VrpnClient::
st_tracker_velocity(void *userdata, const vrpn_TRACKERVELCB info) { st_tracker_velocity(void *userdata, const vrpn_TRACKERVELCB info) {
VrpnClientInfo *data = (VrpnClientInfo *)userdata; VrpnClientInfo *data = (VrpnClientInfo *)userdata;
((VrpnClient *)data->self)->tracker_velocity(data->device_name, info); ((VrpnClient *)data->self)->tracker_velocity(data->device_name, info);
@ -890,7 +890,7 @@ st_tracker_velocity(void *userdata, const vrpn_TRACKERVELCB info) {
// Description: Callback function that merely passes the data down // Description: Callback function that merely passes the data down
// to the appropriate non-static function // to the appropriate non-static function
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnClient:: void VRPN_CALLBACK VrpnClient::
st_tracker_acceleration(void *userdata, const vrpn_TRACKERACCCB info) { st_tracker_acceleration(void *userdata, const vrpn_TRACKERACCCB info) {
VrpnClientInfo *data = (VrpnClientInfo *)userdata; VrpnClientInfo *data = (VrpnClientInfo *)userdata;
((VrpnClient *)data->self)->tracker_acceleration(data->device_name, info); ((VrpnClient *)data->self)->tracker_acceleration(data->device_name, info);

2
panda/src/vrpn/vrpnDial.cxx
View File

@ -112,7 +112,7 @@ write(ostream &out, int indent_level) const {
// code and sends it to any interested // code and sends it to any interested
// VrpnDialDevices. // VrpnDialDevices.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnDial:: void VRPN_CALLBACK VrpnDial::
vrpn_dial_callback(void *userdata, const vrpn_DIALCB info) { vrpn_dial_callback(void *userdata, const vrpn_DIALCB info) {
VrpnDial *self = (VrpnDial *)userdata; VrpnDial *self = (VrpnDial *)userdata;

2
panda/src/vrpn/vrpnDial.h
View File

@ -60,7 +60,7 @@ public:
void write(ostream &out, int indent_level = 0) const; void write(ostream &out, int indent_level = 0) const;
private: private:
static void static void VRPN_CALLBACK
vrpn_dial_callback(void *userdata, const vrpn_DIALCB info); vrpn_dial_callback(void *userdata, const vrpn_DIALCB info);
private: private:

6
panda/src/vrpn/vrpnTracker.cxx
View File

@ -114,7 +114,7 @@ write(ostream &out, int indent_level) const {
// code and sends it to any interested // code and sends it to any interested
// VrpnTrackerDevices. // VrpnTrackerDevices.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnTracker:: void VRPN_CALLBACK VrpnTracker::
vrpn_position_callback(void *userdata, const vrpn_TRACKERCB info) { vrpn_position_callback(void *userdata, const vrpn_TRACKERCB info) {
VrpnTracker *self = (VrpnTracker *)userdata; VrpnTracker *self = (VrpnTracker *)userdata;
if (vrpn_cat.is_spam()) { if (vrpn_cat.is_spam()) {
@ -143,7 +143,7 @@ vrpn_position_callback(void *userdata, const vrpn_TRACKERCB info) {
// code and sends it to any interested // code and sends it to any interested
// VrpnTrackerDevices. // VrpnTrackerDevices.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnTracker:: void VRPN_CALLBACK VrpnTracker::
vrpn_velocity_callback(void *userdata, const vrpn_TRACKERVELCB info) { vrpn_velocity_callback(void *userdata, const vrpn_TRACKERVELCB info) {
VrpnTracker *self = (VrpnTracker *)userdata; VrpnTracker *self = (VrpnTracker *)userdata;
if (vrpn_cat.is_spam()) { if (vrpn_cat.is_spam()) {
@ -174,7 +174,7 @@ vrpn_velocity_callback(void *userdata, const vrpn_TRACKERVELCB info) {
// code and sends it to any interested // code and sends it to any interested
// VrpnTrackerDevices. // VrpnTrackerDevices.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void VrpnTracker:: void VRPN_CALLBACK VrpnTracker::
vrpn_acceleration_callback(void *userdata, const vrpn_TRACKERACCCB info) { vrpn_acceleration_callback(void *userdata, const vrpn_TRACKERACCCB info) {
VrpnTracker *self = (VrpnTracker *)userdata; VrpnTracker *self = (VrpnTracker *)userdata;
if (vrpn_cat.is_spam()) { if (vrpn_cat.is_spam()) {

6
panda/src/vrpn/vrpnTracker.h
View File

@ -59,11 +59,11 @@ public:
void write(ostream &out, int indent_level = 0) const; void write(ostream &out, int indent_level = 0) const;
private: private:
static void static void VRPN_CALLBACK
vrpn_position_callback(void *userdata, const vrpn_TRACKERCB info); vrpn_position_callback(void *userdata, const vrpn_TRACKERCB info);
static void static void VRPN_CALLBACK
vrpn_velocity_callback(void *userdata, const vrpn_TRACKERVELCB info); vrpn_velocity_callback(void *userdata, const vrpn_TRACKERVELCB info);
static void static void VRPN_CALLBACK
vrpn_acceleration_callback(void *userdata, const vrpn_TRACKERACCCB info); vrpn_acceleration_callback(void *userdata, const vrpn_TRACKERACCCB info);
private: private: