Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
231ca66d01

+ 0 - 14
panda/src/sgattrib/alphaTransformProperty.I

@@ -64,17 +64,3 @@ INLINE float AlphaTransformProperty::
 get_scale() const {
 get_scale() const {
   return _scale;
   return _scale;
 }
 }
-
-////////////////////////////////////////////////////////////////////
-//     Function: AlphaTransformProperty::compare_to
-//       Access: Public
-//  Description: 
-////////////////////////////////////////////////////////////////////
-INLINE int AlphaTransformProperty::
-compare_to(const AlphaTransformProperty &other) const {
-  if (_offset < other._offset)
-    return -1;
-  else if (_offset > other._offset)
-    return 1;
-  return 0;
-}

+ 18 - 0
panda/src/sgattrib/alphaTransformProperty.cxx

@@ -5,6 +5,24 @@
 
 
 #include "alphaTransformProperty.h"
 #include "alphaTransformProperty.h"
 
 
+////////////////////////////////////////////////////////////////////
+//     Function: AlphaTransformProperty::compare_to
+//       Access: Public
+//  Description: 
+////////////////////////////////////////////////////////////////////
+int AlphaTransformProperty::
+compare_to(const AlphaTransformProperty &other) const {
+  if (_offset < other._offset)
+    return -1;
+  else if (_offset > other._offset)
+    return 1;
+  if (_scale < other._scale)
+    return -1;
+  else if (_scale > other._scale)
+    return 1;
+  return 0;
+}
+
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: AlphaTransformProperty::output
 //     Function: AlphaTransformProperty::output
 //       Access: Public
 //       Access: Public

+ 1 - 1
panda/src/sgattrib/alphaTransformProperty.h

@@ -24,7 +24,7 @@ public:
   INLINE void set_scale(float scale);
   INLINE void set_scale(float scale);
   INLINE float get_scale() const;
   INLINE float get_scale() const;
 
 
-  INLINE int compare_to(const AlphaTransformProperty &other) const;
+  int compare_to(const AlphaTransformProperty &other) const;
   void output(ostream &out) const;
   void output(ostream &out) const;
 
 
 private:
 private: