From b5bf6cd73c0d43f2caf32046143786d874e7227c Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sat, 3 Nov 2018 22:40:13 -0600 Subject: [PATCH 1/3] vision: Fix missing includes/declarations --- panda/src/vision/webcamVideoCursorOpenCV.cxx | 7 ++++++- panda/src/vision/webcamVideoCursorOpenCV.h | 1 + panda/src/vision/webcamVideoCursorV4L.cxx | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/panda/src/vision/webcamVideoCursorOpenCV.cxx b/panda/src/vision/webcamVideoCursorOpenCV.cxx index 444557fde8..629cd927ae 100644 --- a/panda/src/vision/webcamVideoCursorOpenCV.cxx +++ b/panda/src/vision/webcamVideoCursorOpenCV.cxx @@ -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 + TypeHandle WebcamVideoCursorOpenCV::_type_handle; /** diff --git a/panda/src/vision/webcamVideoCursorOpenCV.h b/panda/src/vision/webcamVideoCursorOpenCV.h index 6f7e0758f6..3ef1145bc2 100644 --- a/panda/src/vision/webcamVideoCursorOpenCV.h +++ b/panda/src/vision/webcamVideoCursorOpenCV.h @@ -22,6 +22,7 @@ #include "movieVideoCursor.h" class WebcamVideoOpenCV; +struct CvCapture; /** * The Video4Linux implementation of webcams. diff --git a/panda/src/vision/webcamVideoCursorV4L.cxx b/panda/src/vision/webcamVideoCursorV4L.cxx index 95565f9428..8bb77658f6 100644 --- a/panda/src/vision/webcamVideoCursorV4L.cxx +++ b/panda/src/vision/webcamVideoCursorV4L.cxx @@ -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 From 0b91b3eeb3b0b74e85aa3c7aaf396994e960bf49 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sat, 3 Nov 2018 22:45:34 -0600 Subject: [PATCH 2/3] vrpn: Add VRPN headers to parser-inc, remove CPPPARSER workarounds --- dtool/src/parser-inc/vrpn_Analog.h | 4 ++++ dtool/src/parser-inc/vrpn_Button.h | 4 ++++ dtool/src/parser-inc/vrpn_Configure.h | 3 +++ dtool/src/parser-inc/vrpn_Connection.h | 3 +++ dtool/src/parser-inc/vrpn_Dial.h | 4 ++++ dtool/src/parser-inc/vrpn_Tracker.h | 6 ++++++ panda/src/vrpn/vrpn_interface.h | 10 ---------- 7 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 dtool/src/parser-inc/vrpn_Analog.h create mode 100644 dtool/src/parser-inc/vrpn_Button.h create mode 100644 dtool/src/parser-inc/vrpn_Configure.h create mode 100644 dtool/src/parser-inc/vrpn_Connection.h create mode 100644 dtool/src/parser-inc/vrpn_Dial.h create mode 100644 dtool/src/parser-inc/vrpn_Tracker.h diff --git a/dtool/src/parser-inc/vrpn_Analog.h b/dtool/src/parser-inc/vrpn_Analog.h new file mode 100644 index 0000000000..f8951d032a --- /dev/null +++ b/dtool/src/parser-inc/vrpn_Analog.h @@ -0,0 +1,4 @@ +#pragma once + +class vrpn_Analog_Remote; +typedef void vrpn_ANALOGCB; diff --git a/dtool/src/parser-inc/vrpn_Button.h b/dtool/src/parser-inc/vrpn_Button.h new file mode 100644 index 0000000000..433c282a44 --- /dev/null +++ b/dtool/src/parser-inc/vrpn_Button.h @@ -0,0 +1,4 @@ +#pragma once + +class vrpn_Button_Remote; +typedef void vrpn_BUTTONCB; diff --git a/dtool/src/parser-inc/vrpn_Configure.h b/dtool/src/parser-inc/vrpn_Configure.h new file mode 100644 index 0000000000..9e4a950e73 --- /dev/null +++ b/dtool/src/parser-inc/vrpn_Configure.h @@ -0,0 +1,3 @@ +#pragma once + +#define VRPN_CALLBACK diff --git a/dtool/src/parser-inc/vrpn_Connection.h b/dtool/src/parser-inc/vrpn_Connection.h new file mode 100644 index 0000000000..c35b54de38 --- /dev/null +++ b/dtool/src/parser-inc/vrpn_Connection.h @@ -0,0 +1,3 @@ +#pragma once + +class vrpn_Connection; diff --git a/dtool/src/parser-inc/vrpn_Dial.h b/dtool/src/parser-inc/vrpn_Dial.h new file mode 100644 index 0000000000..34ae1269a7 --- /dev/null +++ b/dtool/src/parser-inc/vrpn_Dial.h @@ -0,0 +1,4 @@ +#pragma once + +class vrpn_Dial_Remote; +typedef void vrpn_DIALCB; diff --git a/dtool/src/parser-inc/vrpn_Tracker.h b/dtool/src/parser-inc/vrpn_Tracker.h new file mode 100644 index 0000000000..2fe1eecd9a --- /dev/null +++ b/dtool/src/parser-inc/vrpn_Tracker.h @@ -0,0 +1,6 @@ +#pragma once + +class vrpn_Tracker_Remote; +typedef void vrpn_TRACKERCB; +typedef void vrpn_TRACKERACCCB; +typedef void vrpn_TRACKERVELCB; diff --git a/panda/src/vrpn/vrpn_interface.h b/panda/src/vrpn/vrpn_interface.h index a788d7ae73..c85c05e31b 100644 --- a/panda/src/vrpn/vrpn_interface.h +++ b/panda/src/vrpn/vrpn_interface.h @@ -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 From 842667fd1a80fd6dfc74b8804756784b1012a21b Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 4 Nov 2018 15:22:54 +0100 Subject: [PATCH 3/3] physx: fix missing include [skip ci] --- panda/src/physx/config_physx.h | 1 + 1 file changed, 1 insertion(+) diff --git a/panda/src/physx/config_physx.h b/panda/src/physx/config_physx.h index f17af252b6..3c3925ec92 100644 --- a/panda/src/physx/config_physx.h +++ b/panda/src/physx/config_physx.h @@ -19,6 +19,7 @@ #include "configVariableBool.h" #include "configVariableEnum.h" #include "configVariableInt.h" +#include "configVariableString.h" #include "dconfig.h" #include "physxEnums.h"