define epvector

dtool/src/dtoolbase/pvector.h

@@ -51,9 +51,46 @@ public:
 
 #endif  // USE_STL_ALLOCATOR
 
-// Temporary.  We'll replace this with a vector that uses Eigen's
+#if defined(HAVE_EIGEN) && defined(_WIN32) && !defined(CPPPARSER)
-// allocator to avoid Win32 issues.
+
+#include <Eigen/StdVector>
+
+////////////////////////////////////////////////////////////////////
+//       Class : epvector
+// Description : Unfortunately, on Windows, std::vector can't be used
+//               for classes with explicitly alignment requirements,
+//               due to a minor mistake in the template definition
+//               (one of the vector methods receives a concrete
+//               object, which the compiler flags as an error, even if
+//               the method is never called).
+//
+//               As a workaround, Eigen provides their own
+//               specialization of vector, using their own aligned
+//               allocator.  We define that here as epvector, which is
+//               meant to be a drop-in replacement for pvector for
+//               classes that include a linmath object that requires
+//               alignment.  Unfortunately, this means we can't use
+//               the Panda allocator, so memory allocated for this
+//               vector class won't be tracked as part of Panda's
+//               memory tracking system.  Them's the breaks, kids.
+////////////////////////////////////////////////////////////////////
+template<class Type>
+class epvector : public vector<Type, Eigen::aligned_allocator<Type> > {
+public:
+  typedef Eigen::aligned_allocator<Type> allocator;
+  typedef vector<Type, allocator> base_class;
+  typedef TYPENAME base_class::size_type size_type;
+
+  epvector(TypeHandle type_handle = pvector_type_handle) : base_class(allocator()) { }
+  epvector(const epvector<Type> &copy) : base_class(copy) { }
+  epvector(size_type n, TypeHandle type_handle = pvector_type_handle) : base_class(n, Type(), allocator()) { }
+  epvector(size_type n, const Type &value, TypeHandle type_handle = pvector_type_handle) : base_class(n, value, allocator()) { }
+  epvector(const Type *begin, const Type *end, TypeHandle type_handle = pvector_type_handle) : base_class(begin, end, allocator()) { }
+};
+
+#else  // HAVE_EIGEN
 #define epvector pvector
+#endif  // HAVE_EIGEN
 
 #endif
 

dtool/src/parser-inc/Sources.pp

@@ -25,6 +25,6 @@
     WebCore.h WebView.h WebViewListener.h \
     Core/Core.h Forest/Forest.h Renderers/OpenGL/OpenGLRenderer.h \
     Renderers/DirectX9/DirectX9Renderer.h \
-    glew/glew.h Eigen/Dense
+    glew/glew.h Eigen/Dense Eigen/StdVector
 
 

dtool/src/parser-inc/StdVector

@@ -0,0 +1,6 @@
+namespace Eigen {
+  template<class Type>
+  class aligned_allocator {
+  };
+};
+

makepanda/makepanda.py

@@ -2036,6 +2036,7 @@ MakeDirectory(GetOutputDir()+'/include/parser-inc/Renderers')
 MakeDirectory(GetOutputDir()+'/include/parser-inc/Renderers/OpenGL')
 MakeDirectory(GetOutputDir()+'/include/parser-inc/Renderers/DirectX9')
 MakeDirectory(GetOutputDir()+'/include/parser-inc/glew')
+MakeDirectory(GetOutputDir()+'/include/parser-inc/Eigen')
 CopyAllFiles(GetOutputDir()+'/include/parser-inc/openssl/','dtool/src/parser-inc/')
 CopyAllFiles(GetOutputDir()+'/include/parser-inc/netinet/','dtool/src/parser-inc/')
 CopyFile(GetOutputDir()+'/include/parser-inc/Cg/','dtool/src/parser-inc/cg.h')
@@ -2045,6 +2046,8 @@ CopyFile(GetOutputDir()+'/include/parser-inc/Forest/','dtool/src/parser-inc/Fore
 CopyFile(GetOutputDir()+'/include/parser-inc/Renderers/OpenGL/','dtool/src/parser-inc/OpenGLRenderer.h')
 CopyFile(GetOutputDir()+'/include/parser-inc/Renderers/DirectX9/','dtool/src/parser-inc/DirectX9Renderer.h')
 CopyFile(GetOutputDir()+'/include/parser-inc/glew/','dtool/src/parser-inc/glew.h')
+CopyFile(GetOutputDir()+'/include/parser-inc/Eigen/','dtool/src/parser-inc/Dense')
+CopyFile(GetOutputDir()+'/include/parser-inc/Eigen/','dtool/src/parser-inc/StdVector')
 DeleteCVS(GetOutputDir()+'/include/parser-inc')
 
 ########################################################################