소스 검색

*** empty log message ***

David Rose 25 년 전
부모
커밋
9709248862

+ 2 - 2
panda/src/egg/eggMaterialCollection.h

@@ -30,7 +30,7 @@ class EXPCL_PANDAEGG EggMaterialCollection {
   // EggMaterialCollection as an STL container.
 
 private:
-  typedef map<PT(EggMaterial), int> Materials;
+  typedef map<PT_EggMaterial, int> Materials;
   typedef vector_PT_EggMaterial OrderedMaterials;
 
 public:
@@ -38,7 +38,7 @@ public:
   typedef iterator const_iterator;
   typedef OrderedMaterials::size_type size_type;
 
-  typedef map<PT(EggMaterial),  PT(EggMaterial) > MaterialReplacement;
+  typedef map<PT_EggMaterial,  PT_EggMaterial > MaterialReplacement;
 
   // Here begins the actual public interface to EggMaterialCollection.
 

+ 2 - 2
panda/src/egg/eggTextureCollection.h

@@ -30,7 +30,7 @@ class EXPCL_PANDAEGG EggTextureCollection {
   // EggTextureCollection as an STL container.
 
 private:
-  typedef map<PT(EggTexture), int> Textures;
+  typedef map<PT_EggTexture, int> Textures;
   typedef vector_PT_EggTexture OrderedTextures;
 
 public:
@@ -38,7 +38,7 @@ public:
   typedef iterator const_iterator;
   typedef OrderedTextures::size_type size_type;
 
-  typedef map<PT(EggTexture),  PT(EggTexture) > TextureReplacement;
+  typedef map<PT_EggTexture,  PT_EggTexture > TextureReplacement;
 
   // Here begins the actual public interface to EggTextureCollection.
 

+ 1 - 1
panda/src/linmath/lmatrix3_src.I

@@ -851,7 +851,7 @@ rotate_mat(FLOATTYPE angle, FLOATNAME(LVecBase3) axis,
 //               Assumes axis has been normalized.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH FLOATNAME(LMatrix3) FLOATNAME(LMatrix3)::
-rotate_mat_normaxis(FLOATTYPE angle, FLOATNAME(LVecBase3) axis,
+rotate_mat_normaxis(FLOATTYPE angle, const FLOATNAME(LVecBase3) &axis,
 	   CoordinateSystem cs) {
   if (cs == CS_default) {
     cs = default_coordinate_system;

+ 1 - 1
panda/src/linmath/lmatrix3_src.h

@@ -120,7 +120,7 @@ PUBLISHED:
 				      FLOATNAME(LVecBase3) axis,
 				      CoordinateSystem cs = CS_default);
   static INLINE_LINMATH FLOATNAME(LMatrix3) rotate_mat_normaxis(FLOATTYPE angle,
-				      FLOATNAME(LVecBase3) axis,
+				      const FLOATNAME(LVecBase3) &axis,
 				      CoordinateSystem cs = CS_default);
 
   static INLINE_LINMATH FLOATNAME(LMatrix3) scale_mat(const FLOATNAME(LVecBase3) &scale);

+ 1 - 1
panda/src/linmath/lmatrix4_src.I

@@ -1205,7 +1205,7 @@ rotate_mat(FLOATTYPE angle, FLOATNAME(LVecBase3) axis,
 //               Assumes axis has been prenormalized.
 ////////////////////////////////////////////////////////////////////
 INLINE_LINMATH FLOATNAME(LMatrix4) FLOATNAME(LMatrix4)::
-rotate_mat_normaxis(FLOATTYPE angle, FLOATNAME(LVecBase3) axis,
+rotate_mat_normaxis(FLOATTYPE angle, const FLOATNAME(LVecBase3) &axis,
 	   CoordinateSystem cs) {
 
   if (cs == CS_default) {

+ 1 - 1
panda/src/linmath/lmatrix4_src.h

@@ -109,7 +109,7 @@ PUBLISHED:
 				      FLOATNAME(LVecBase3) axis,
 				      CoordinateSystem cs = CS_default);
   INLINE_LINMATH static FLOATNAME(LMatrix4) rotate_mat_normaxis(FLOATTYPE angle,
-				      FLOATNAME(LVecBase3) axis,
+				      const FLOATNAME(LVecBase3) &axis,
 				      CoordinateSystem cs = CS_default);
   INLINE_LINMATH static FLOATNAME(LMatrix4) scale_mat(const FLOATNAME(LVecBase3) &scale);
   INLINE_LINMATH static FLOATNAME(LMatrix4) scale_mat(FLOATTYPE sx, FLOATTYPE sy, FLOATTYPE sz);