publish PTA_double, PTA_LMatrix4f, PTA_LVecBase3f

panda/src/express/pta_float.h

@@ -29,8 +29,8 @@
 //               rather than defining the pta again.
 ////////////////////////////////////////////////////////////////////
 
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, RefCountObj<vector_float>);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase<ReferenceCountedVector<float> >)
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase<RefCountObj<vector_float> >);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase<float>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray<float>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray<float>)
 

panda/src/express/pta_int.h

@@ -29,8 +29,8 @@
 //               rather than defining the pta again.
 ////////////////////////////////////////////////////////////////////
 
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, RefCountObj<vector_int>);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase<ReferenceCountedVector<int> >)
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase<RefCountObj<vector_int> >);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase<int>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray<int>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray<int>)
 

panda/src/express/pta_uchar.h

@@ -29,8 +29,8 @@
 //               rather than defining the pta again.
 ////////////////////////////////////////////////////////////////////
 
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, RefCountObj<vector_uchar>);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase<ReferenceCountedVector<uchar> >)
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase<RefCountObj<vector_uchar> >);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase<uchar>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray<unsigned char>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray<unsigned char>)
 

panda/src/mathutil/Sources.pp

@@ -32,6 +32,7 @@
     perlinNoise2.h perlinNoise2.I \
     perlinNoise3.h perlinNoise3.I \
     plane.h plane_src.I plane_src.cxx plane_src.h \
+    pta_LMatrix4f.h pta_LVecBase3f.h \
     randomizer.h randomizer.I \
     rotate_to.h rotate_to_src.cxx \
     stackedPerlinNoise2.h stackedPerlinNoise2.I \
@@ -54,6 +55,7 @@
     perlinNoise2.cxx \
     perlinNoise3.cxx \
     plane.cxx \
+    pta_LMatrix4f.cxx pta_LVecBase3f.cxx \
     randomizer.cxx \
     rotate_to.cxx \
     stackedPerlinNoise2.cxx \

panda/src/mathutil/config_mathutil.N

@@ -0,0 +1,27 @@
+forcetype Frustumf
+renametype Frustumf Frustumf
+forcetype Frustumd
+renametype Frustumd Frustumd
+
+noinclude frustum_src.h
+noinclude look_at_src.h
+forcetype Planef
+renametype Planef Planef
+forcetype Planed
+renametype Planed Planed
+
+noinclude plane_src.h
+
+forcetype PointerToBase<ReferenceCountedVector<LMatrix4f> >
+forcetype PointerToArrayBase<LMatrix4f>
+forcetype PointerToArray<LMatrix4f>
+forcetype ConstPointerToArray<LMatrix4f>
+renametype PointerToArray<LMatrix4f> PTALMatrix4f
+renametype ConstPointerToArray<LMatrix4f> CPTALMatrix4f
+
+forcetype PointerToBase<ReferenceCountedVector<LVecBase3f> >
+forcetype PointerToArrayBase<LVecBase3f>
+forcetype PointerToArray<LVecBase3f>
+forcetype ConstPointerToArray<LVecBase3f>
+renametype PointerToArray<LVecBase3f> PTALVecBase3f
+renametype ConstPointerToArray<LVecBase3f> CPTALVecBase3f

panda/src/mathutil/frustum.N

@@ -1,7 +0,0 @@
-forcetype Frustumf
-renametype Frustumf Frustumf
-forcetype Frustumd
-renametype Frustumd Frustumd
-
-noinclude frustum_src.h
-noinclude look_at_src.h

panda/src/mathutil/mathutil_composite2.cxx

@@ -6,6 +6,8 @@
 #include "perlinNoise2.cxx"
 #include "perlinNoise3.cxx"
 #include "plane.cxx"
+#include "pta_LMatrix4f.cxx"
+#include "pta_LVecBase3f.cxx"
 #include "randomizer.cxx"
 #include "rotate_to.cxx"
 #include "stackedPerlinNoise2.cxx"

panda/src/mathutil/plane.N

@@ -1,6 +0,0 @@
-forcetype Planef
-renametype Planef Planef
-forcetype Planed
-renametype Planed Planed
-
-noinclude plane_src.h

panda/src/mathutil/pta_LMatrix4f.cxx

@@ -0,0 +1,20 @@
+// Filename: pta_LMatrix4f.cxx
+// Created by:  drose (27Feb10)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) Carnegie Mellon University.  All rights reserved.
+//
+// All use of this software is subject to the terms of the revised BSD
+// license.  You should have received a copy of this license along
+// with this source code in a file named "LICENSE."
+//
+////////////////////////////////////////////////////////////////////
+
+#include "pta_LMatrix4f.h"
+
+// Tell GCC that we'll take care of the instantiation explicitly here.
+#ifdef __GNUC__
+#pragma implementation
+#endif

panda/src/mathutil/pta_LMatrix4f.h

@@ -0,0 +1,44 @@
+// Filename: pta_lmatrix4f.h
+// Created by:  drose (27Feb10)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) Carnegie Mellon University.  All rights reserved.
+//
+// All use of this software is subject to the terms of the revised BSD
+// license.  You should have received a copy of this license along
+// with this source code in a file named "LICENSE."
+//
+////////////////////////////////////////////////////////////////////
+
+#ifndef PTA_LMATRIX4F_H
+#define PTA_LMATRIX4F_H
+
+#include "pandabase.h"
+#include "luse.h"
+#include "pointerToArray.h"
+
+////////////////////////////////////////////////////////////////////
+//       Class : PTA_LMatrix4f
+// Description : A pta of LMatrix4fs.  This class is defined once here,
+//               and exported to PANDA.DLL; other packages that want
+//               to use a pta of this type (whether they need to
+//               export it or not) should include this header file,
+//               rather than defining the pta again.
+////////////////////////////////////////////////////////////////////
+
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToBase<ReferenceCountedVector<LMatrix4f> >)
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToArrayBase<LMatrix4f>)
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToArray<LMatrix4f>)
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, ConstPointerToArray<LMatrix4f>)
+
+typedef PointerToArray<LMatrix4f> PTA_LMatrix4f;
+typedef ConstPointerToArray<LMatrix4f> CPTA_LMatrix4f;
+
+// Tell GCC that we'll take care of the instantiation explicitly here.
+#ifdef __GNUC__
+#pragma interface
+#endif
+
+#endif

panda/src/mathutil/pta_LVecBase3f.cxx

@@ -0,0 +1,20 @@
+// Filename: pta_LVecBase3f.cxx
+// Created by:  drose (27Feb10)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) Carnegie Mellon University.  All rights reserved.
+//
+// All use of this software is subject to the terms of the revised BSD
+// license.  You should have received a copy of this license along
+// with this source code in a file named "LICENSE."
+//
+////////////////////////////////////////////////////////////////////
+
+#include "pta_LVecBase3f.h"
+
+// Tell GCC that we'll take care of the instantiation explicitly here.
+#ifdef __GNUC__
+#pragma implementation
+#endif

panda/src/mathutil/pta_LVecBase3f.h

@@ -0,0 +1,44 @@
+// Filename: pta_LVecBase3f.h
+// Created by:  drose (27Feb10)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) Carnegie Mellon University.  All rights reserved.
+//
+// All use of this software is subject to the terms of the revised BSD
+// license.  You should have received a copy of this license along
+// with this source code in a file named "LICENSE."
+//
+////////////////////////////////////////////////////////////////////
+
+#ifndef PTA_LVECBASE3F_H
+#define PTA_LVECBASE3F_H
+
+#include "pandabase.h"
+#include "luse.h"
+#include "pointerToArray.h"
+
+////////////////////////////////////////////////////////////////////
+//       Class : PTA_LVecBase3f
+// Description : A pta of LVecBase3fs.  This class is defined once here,
+//               and exported to PANDA.DLL; other packages that want
+//               to use a pta of this type (whether they need to
+//               export it or not) should include this header file,
+//               rather than defining the pta again.
+////////////////////////////////////////////////////////////////////
+
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToBase<ReferenceCountedVector<LVecBase3f> >)
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToArrayBase<LVecBase3f>)
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToArray<LVecBase3f>)
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, ConstPointerToArray<LVecBase3f>)
+
+typedef PointerToArray<LVecBase3f> PTA_LVecBase3f;
+typedef ConstPointerToArray<LVecBase3f> CPTA_LVecBase3f;
+
+// Tell GCC that we'll take care of the instantiation explicitly here.
+#ifdef __GNUC__
+#pragma interface
+#endif
+
+#endif

panda/src/putil/config_util.N

@@ -14,3 +14,17 @@ forcetype DoubleBitMaskNative
 renametype DoubleBitMaskNative DoubleBitMaskNative
 forcetype QuadBitMaskNative
 renametype QuadBitMaskNative QuadBitMaskNative
+
+forcetype PointerToBase<ReferenceCountedVector<double> >
+forcetype PointerToArrayBase<double>
+forcetype PointerToArray<double>
+forcetype ConstPointerToArray<double>
+renametype PointerToArray<double> PTADouble
+renametype ConstPointerToArray<double> CPTADouble
+
+forcetype PointerToBase<ReferenceCountedVector<ushort> >
+forcetype PointerToArrayBase<ushort>
+forcetype PointerToArray<ushort>
+forcetype ConstPointerToArray<ushort>
+renametype PointerToArray<ushort> PTAUshort
+renametype ConstPointerToArray<ushort> CPTAUshort

panda/src/putil/pta_double.h

@@ -29,8 +29,8 @@
 //               rather than defining the pta again.
 ////////////////////////////////////////////////////////////////////
 
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, RefCountObj<vector_double>);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase<ReferenceCountedVector<double> >)
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase<RefCountObj<vector_double> >);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArrayBase<double>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArray<double>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray<double>)
 

panda/src/putil/pta_ushort.h

@@ -29,8 +29,8 @@
 //               rather than defining the pta again.
 ////////////////////////////////////////////////////////////////////
 
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, RefCountObj<vector_ushort>);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase<ReferenceCountedVector<ushort> >)
-EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase<RefCountObj<vector_ushort> >);
+EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArrayBase<ushort>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArray<unsigned short>)
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray<unsigned short>)