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

Merge branch 'master' into deploy-ng

Browse Source
This commit is contained in:
rdb 2018-11-04 15:26:58 +01:00
commit 23bb814f3f
11 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/parser-inc/vrpn_Analog.h Normal file
View File

@ -0,0 +1,4 @@
#pragma once
class vrpn_Analog_Remote;
typedef void vrpn_ANALOGCB;

4
dtool/src/parser-inc/vrpn_Button.h Normal file
View File

@ -0,0 +1,4 @@
#pragma once
class vrpn_Button_Remote;
typedef void vrpn_BUTTONCB;

3
dtool/src/parser-inc/vrpn_Configure.h Normal file
View File

@ -0,0 +1,3 @@
#pragma once
#define VRPN_CALLBACK

3
dtool/src/parser-inc/vrpn_Connection.h Normal file
View File

@ -0,0 +1,3 @@
#pragma once
class vrpn_Connection;

4
dtool/src/parser-inc/vrpn_Dial.h Normal file
View File

@ -0,0 +1,4 @@
#pragma once
class vrpn_Dial_Remote;
typedef void vrpn_DIALCB;

6
dtool/src/parser-inc/vrpn_Tracker.h Normal file
View File

@ -0,0 +1,6 @@
#pragma once
class vrpn_Tracker_Remote;
typedef void vrpn_TRACKERCB;
typedef void vrpn_TRACKERACCCB;
typedef void vrpn_TRACKERVELCB;

1
panda/src/physx/config_physx.h
View File

@ -19,6 +19,7 @@
#include "configVariableBool.h"
#include "configVariableEnum.h"
#include "configVariableInt.h"
#include "configVariableString.h"
#include "dconfig.h"
#include "physxEnums.h"

7
panda/src/vision/webcamVideoCursorOpenCV.cxx
View File

@ -11,12 +11,17 @@
* @date 2010-10-20
*/
#include "webcamVideoOpenCV.h"
#include "webcamVideoCursorOpenCV.h"
#ifdef HAVE_OPENCV
#include "webcamVideoOpenCV.h"
#include "movieVideoCursor.h"
#include "pStatTimer.h"
#include <opencv2/highgui/highgui.hpp>
TypeHandle WebcamVideoCursorOpenCV::_type_handle;
/**

1
panda/src/vision/webcamVideoCursorOpenCV.h
View File

@ -22,6 +22,7 @@
#include "movieVideoCursor.h"
class WebcamVideoOpenCV;
struct CvCapture;
/**
* The Video4Linux implementation of webcams.

5
panda/src/vision/webcamVideoCursorV4L.cxx
View File

@ -11,8 +11,13 @@
* @date 2010-06-11
*/
#include "webcamVideoCursorV4L.h"
#include "config_vision.h"
#include "webcamVideoV4L.h"
#include "movieVideoCursor.h"
#if defined(HAVE_VIDEO4LINUX) && !defined(CPPPARSER)
#include <fcntl.h>

10
panda/src/vrpn/vrpn_interface.h
View File

@ -16,16 +16,6 @@
#include "pandabase.h"
#ifdef CPPPARSER
// For correct interrogate parsing of UNC's vrpn library.
#if defined(WIN32_VC) || defined(WIN64_VC)
#define SOCKET int
#else
#define linux
typedef struct timeval timeval;
#endif
#endif
// VPRN misses an include to this in vrpn_Shared.h.
#include <stdint.h>