Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
ce2a4852d6

+ 3 - 1
panda/src/gobj/orthoProjection.h

@@ -17,8 +17,10 @@
 // Description : An orthographic-type projection, with a frustum.
 // Description : An orthographic-type projection, with a frustum.
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA OrthoProjection : public Projection {
 class EXPCL_PANDA OrthoProjection : public Projection {
-public:
+PUBLISHED:
   INLINE OrthoProjection(const Frustumf &frustum);
   INLINE OrthoProjection(const Frustumf &frustum);
+
+public:
   virtual Projection *make_copy() const;
   virtual Projection *make_copy() const;
   virtual LMatrix4f get_projection_mat(CoordinateSystem cs = CS_default) const;
   virtual LMatrix4f get_projection_mat(CoordinateSystem cs = CS_default) const;
 
 

+ 3 - 1
panda/src/gobj/perspectiveProjection.h

@@ -17,8 +17,10 @@
 // Description : A perspective-type projection, with a frustum.
 // Description : A perspective-type projection, with a frustum.
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA PerspectiveProjection : public Projection {
 class EXPCL_PANDA PerspectiveProjection : public Projection {
-public:
+PUBLISHED:
   INLINE PerspectiveProjection(const Frustumf &frustum);
   INLINE PerspectiveProjection(const Frustumf &frustum);
+
+public:
   virtual Projection *make_copy() const;
   virtual Projection *make_copy() const;
   virtual LMatrix4f get_projection_mat(CoordinateSystem cs = CS_default) const;
   virtual LMatrix4f get_projection_mat(CoordinateSystem cs = CS_default) const;
 
 

+ 3 - 1
panda/src/gobj/projection.h

@@ -21,9 +21,11 @@ class BoundingVolume;
 //               perspective and orthographic projections.
 //               perspective and orthographic projections.
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA Projection : public TypedReferenceCount {
 class EXPCL_PANDA Projection : public TypedReferenceCount {
+PUBLISHED:
+  virtual Projection *make_copy() const=0;
+
 public:
 public:
   virtual LMatrix4f get_projection_mat(CoordinateSystem cs = CS_default) const=0;
   virtual LMatrix4f get_projection_mat(CoordinateSystem cs = CS_default) const=0;
-  virtual Projection *make_copy() const=0;
   virtual Geom* make_geometry(const Colorf &color = Colorf(0.0, 1.0, 0.0, 1.0),
   virtual Geom* make_geometry(const Colorf &color = Colorf(0.0, 1.0, 0.0, 1.0),
 			      CoordinateSystem cs = CS_default) const;
 			      CoordinateSystem cs = CS_default) const;
 
 

+ 1 - 0
panda/src/mathutil/Sources.pp

@@ -16,6 +16,7 @@
     config_mathutil.h \
     config_mathutil.h \
     fftCompressor.cxx fftCompressor.h \
     fftCompressor.cxx fftCompressor.h \
     finiteBoundingVolume.cxx finiteBoundingVolume.h \
     finiteBoundingVolume.cxx finiteBoundingVolume.h \
+    frustum.I frustum.h \
     geometricBoundingVolume.I geometricBoundingVolume.cxx \
     geometricBoundingVolume.I geometricBoundingVolume.cxx \
     geometricBoundingVolume.h look_at.I look_at.cxx look_at.h \
     geometricBoundingVolume.h look_at.I look_at.cxx look_at.h \
     omniBoundingVolume.I omniBoundingVolume.cxx omniBoundingVolume.h \
     omniBoundingVolume.I omniBoundingVolume.cxx omniBoundingVolume.h \

+ 0 - 1
panda/src/mathutil/frustum.I

@@ -6,7 +6,6 @@
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 // Includes
 // Includes
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
-#include "frustum.h"
 #include "mathutil.h"
 #include "mathutil.h"
 #include "config_mathutil.h"
 #include "config_mathutil.h"
 
 

+ 2 - 0
panda/src/mathutil/frustum.N

@@ -0,0 +1,2 @@
+forcetype Frustum<float>
+forcetype Frustum<double>

+ 3 - 2
panda/src/mathutil/frustum.h

@@ -23,7 +23,7 @@
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 template<class P_numtype>
 template<class P_numtype>
 class EXPCL_PANDA Frustum {
 class EXPCL_PANDA Frustum {
-public:
+PUBLISHED:
   Frustum();
   Frustum();
  
  
   void make_ortho_2D(void);
   void make_ortho_2D(void);
@@ -44,7 +44,8 @@ public:
   void get_perspective_params(P_numtype &xfov, P_numtype &yfov,
   void get_perspective_params(P_numtype &xfov, P_numtype &yfov,
 			      P_numtype &aspect, P_numtype &fnear,
 			      P_numtype &aspect, P_numtype &fnear,
 			      P_numtype &ffar) const;
 			      P_numtype &ffar) const;
- 
+
+public: 
   LMatrix4<P_numtype>
   LMatrix4<P_numtype>
   get_perspective_projection_mat(CoordinateSystem cs = CS_default) const;
   get_perspective_projection_mat(CoordinateSystem cs = CS_default) const;