FINALLY match and link CCharAnimTime

PrimeDecomp · Mar 20, 2024 · fb1a193 · fb1a193
1 parent 1e7dc88
commit fb1a193
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/configure.py b/configure.py
@@ -951,7 +951,7 @@ def Rel(lib_name, objects):
             Object(NonMatching, "Kyoto/Math/CFrustumPlanes.cpp"),
             Object(NonMatching, "Kyoto/Graphics/CCubeMaterial.cpp"),
             Object(Matching, "Kyoto/Graphics/CCubeSurface.cpp"),
-            Object(NonMatching, "Kyoto/Animation/CCharAnimTime.cpp"),
+            Object(Matching, "Kyoto/Animation/CCharAnimTime.cpp"),
             Object(Matching, "Kyoto/Animation/CSegIdList.cpp"),
             Object(Matching, "Kyoto/Input/CFinalInput.cpp"),
             Object(Matching, "Kyoto/Graphics/CColor.cpp"),

diff --git a/include/Kyoto/Animation/CCharAnimTime.hpp b/include/Kyoto/Animation/CCharAnimTime.hpp
@@ -36,10 +36,10 @@ class CCharAnimTime {
   bool GreaterThanZero() const;
   bool EqualsZero() const;
   void PutTo(COutputStream& out) const;
-  //static CCharAnimTime Infinity() { return CCharAnimTime(kT_Infinity, 1.0f); }
+  static CCharAnimTime Infinity() { return CCharAnimTime(kT_Infinity, 1.0f); }
   static CCharAnimTime ZeroFlat() { return CCharAnimTime(kT_ZeroSteady, 0.f); }
-  //static CCharAnimTime ZeroPlus() { return CCharAnimTime(kT_ZeroIncreasing, 0.f); }
-  //static CCharAnimTime ZeroMinus() { return CCharAnimTime(kT_ZeroDecreasing, 0.f); }
+  static CCharAnimTime ZeroPlus() { return CCharAnimTime(kT_ZeroIncreasing, 0.f); }
+  static CCharAnimTime ZeroMinus() { return CCharAnimTime(kT_ZeroDecreasing, 0.f); }
 
   int ZeroOrdering() const {
     if (x4_type == kT_ZeroDecreasing) {
@@ -62,6 +62,15 @@ class CCharAnimTime {
     return kT_ZeroIncreasing;
   }
 
+  CCharAnimTime ZeroSignScale(float other) const {
+    if (other > 0.f) {
+      return *this;
+    } else if (other < 0.f) {
+      return CCharAnimTime(ZeroTypeFromOrdering(-ZeroOrdering()), 0.f);
+    }
+    return ZeroFlat();
+  }
+
 private:
   float x0_time;
   EType x4_type;

diff --git a/src/Kyoto/Animation/CCharAnimTime.cpp b/src/Kyoto/Animation/CCharAnimTime.cpp
@@ -91,12 +91,7 @@ CCharAnimTime CCharAnimTime::operator*(const float& other) const {
   }
 
   if (EqualsZero()) {
-    if (other > 0.f) {
-      return *this;
-    } else if (other < 0.f) {
-      return CCharAnimTime(ZeroTypeFromOrdering(-ZeroOrdering()), 0.f);
-    }
-    return ZeroFlat();
+    return ZeroSignScale(other);
   }
 
   return CCharAnimTime(x0_time * other);