Merge branch 'master' into deploy-ng

dtool/src/parser-inc/vrpn_Analog.h

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

dtool/src/parser-inc/vrpn_Button.h

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

dtool/src/parser-inc/vrpn_Configure.h

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

dtool/src/parser-inc/vrpn_Connection.h

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

dtool/src/parser-inc/vrpn_Dial.h

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

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;

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"

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 <opencv2/highgui/highgui.hpp>
+
 TypeHandle WebcamVideoCursorOpenCV::_type_handle;
 
 /**

panda/src/vision/webcamVideoCursorOpenCV.h

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

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 <fcntl.h>

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 <stdint.h>