diff --git a/panda/src/express/pta_float.h b/panda/src/express/pta_float.h index 7dea9e9f69..c0dab32949 100644 --- a/panda/src/express/pta_float.h +++ b/panda/src/express/pta_float.h @@ -29,8 +29,8 @@ // rather than defining the pta again. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, RefCountObj); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase) EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray) EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray) diff --git a/panda/src/express/pta_int.h b/panda/src/express/pta_int.h index 7fbd99e770..5c1552b8ff 100644 --- a/panda/src/express/pta_int.h +++ b/panda/src/express/pta_int.h @@ -29,8 +29,8 @@ // rather than defining the pta again. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, RefCountObj); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase) EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray) EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray) diff --git a/panda/src/express/pta_uchar.h b/panda/src/express/pta_uchar.h index d192209189..40cc9763fe 100644 --- a/panda/src/express/pta_uchar.h +++ b/panda/src/express/pta_uchar.h @@ -29,8 +29,8 @@ // rather than defining the pta again. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, RefCountObj); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArrayBase) EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, PointerToArray) EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEXPRESS, EXPTP_PANDAEXPRESS, ConstPointerToArray) diff --git a/panda/src/mathutil/Sources.pp b/panda/src/mathutil/Sources.pp index 7fe52e2090..180e96ff9c 100644 --- a/panda/src/mathutil/Sources.pp +++ b/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 \ diff --git a/panda/src/mathutil/config_mathutil.N b/panda/src/mathutil/config_mathutil.N new file mode 100644 index 0000000000..88c96347d3 --- /dev/null +++ b/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 > +forcetype PointerToArrayBase +forcetype PointerToArray +forcetype ConstPointerToArray +renametype PointerToArray PTALMatrix4f +renametype ConstPointerToArray CPTALMatrix4f + +forcetype PointerToBase > +forcetype PointerToArrayBase +forcetype PointerToArray +forcetype ConstPointerToArray +renametype PointerToArray PTALVecBase3f +renametype ConstPointerToArray CPTALVecBase3f diff --git a/panda/src/mathutil/frustum.N b/panda/src/mathutil/frustum.N deleted file mode 100644 index fd8a62819a..0000000000 --- a/panda/src/mathutil/frustum.N +++ /dev/null @@ -1,7 +0,0 @@ -forcetype Frustumf -renametype Frustumf Frustumf -forcetype Frustumd -renametype Frustumd Frustumd - -noinclude frustum_src.h -noinclude look_at_src.h diff --git a/panda/src/mathutil/mathutil_composite2.cxx b/panda/src/mathutil/mathutil_composite2.cxx index b70623a959..5badd6368c 100644 --- a/panda/src/mathutil/mathutil_composite2.cxx +++ b/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" diff --git a/panda/src/mathutil/plane.N b/panda/src/mathutil/plane.N deleted file mode 100644 index 2ac43a7735..0000000000 --- a/panda/src/mathutil/plane.N +++ /dev/null @@ -1,6 +0,0 @@ -forcetype Planef -renametype Planef Planef -forcetype Planed -renametype Planed Planed - -noinclude plane_src.h diff --git a/panda/src/mathutil/pta_LMatrix4f.cxx b/panda/src/mathutil/pta_LMatrix4f.cxx new file mode 100644 index 0000000000..0f5e137ac6 --- /dev/null +++ b/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 diff --git a/panda/src/mathutil/pta_LMatrix4f.h b/panda/src/mathutil/pta_LMatrix4f.h new file mode 100644 index 0000000000..f43de2231e --- /dev/null +++ b/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 >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToArrayBase) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, ConstPointerToArray) + +typedef PointerToArray PTA_LMatrix4f; +typedef ConstPointerToArray CPTA_LMatrix4f; + +// Tell GCC that we'll take care of the instantiation explicitly here. +#ifdef __GNUC__ +#pragma interface +#endif + +#endif diff --git a/panda/src/mathutil/pta_LVecBase3f.cxx b/panda/src/mathutil/pta_LVecBase3f.cxx new file mode 100644 index 0000000000..ebbe6e5e56 --- /dev/null +++ b/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 diff --git a/panda/src/mathutil/pta_LVecBase3f.h b/panda/src/mathutil/pta_LVecBase3f.h new file mode 100644 index 0000000000..16c83a6aa7 --- /dev/null +++ b/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 >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToArrayBase) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, PointerToArray) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_MATHUTIL, EXPTP_PANDA_MATHUTIL, ConstPointerToArray) + +typedef PointerToArray PTA_LVecBase3f; +typedef ConstPointerToArray CPTA_LVecBase3f; + +// Tell GCC that we'll take care of the instantiation explicitly here. +#ifdef __GNUC__ +#pragma interface +#endif + +#endif diff --git a/panda/src/putil/config_util.N b/panda/src/putil/config_util.N index fa7a71d260..4d1474fba6 100644 --- a/panda/src/putil/config_util.N +++ b/panda/src/putil/config_util.N @@ -14,3 +14,17 @@ forcetype DoubleBitMaskNative renametype DoubleBitMaskNative DoubleBitMaskNative forcetype QuadBitMaskNative renametype QuadBitMaskNative QuadBitMaskNative + +forcetype PointerToBase > +forcetype PointerToArrayBase +forcetype PointerToArray +forcetype ConstPointerToArray +renametype PointerToArray PTADouble +renametype ConstPointerToArray CPTADouble + +forcetype PointerToBase > +forcetype PointerToArrayBase +forcetype PointerToArray +forcetype ConstPointerToArray +renametype PointerToArray PTAUshort +renametype ConstPointerToArray CPTAUshort diff --git a/panda/src/putil/pta_double.h b/panda/src/putil/pta_double.h index d047e34949..14bd6724c8 100644 --- a/panda/src/putil/pta_double.h +++ b/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); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArrayBase) EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArray) EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray) diff --git a/panda/src/putil/pta_ushort.h b/panda/src/putil/pta_ushort.h index 81f44bc4b9..e141e136a9 100644 --- a/panda/src/putil/pta_ushort.h +++ b/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); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase >); +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToBase >) +EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArrayBase) EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, PointerToArray) EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL, ConstPointerToArray)