animmodel.cpp const -> constexpr for #210

also minor style fixes
project-imprimis · Jun 17, 2021 · 5b34875 · 5b34875
1 parent 03d04ae
commit 5b34875
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/engine/model/animmodel.cpp b/src/engine/model/animmodel.cpp
@@ -404,8 +404,8 @@ void animmodel::Mesh::genBIH(skin &s, vector<BIH::mesh> &bih, const matrix4x3 &t
 
 void animmodel::Mesh::fixqtangent(quat &q, float bt)
 {
-    static const float bias = -1.5f/65535,
-                       biasscale = sqrtf(1 - bias*bias);
+    static constexpr float bias = -1.5f/65535,
+                           biasscale = sqrtf(1 - bias*bias);
     if(bt < 0)
     {
         if(q.w >= 0)
@@ -1723,7 +1723,8 @@ void animmodel::calcbb(vec &center, vec &radius)
     {
         return;
     }
-    vec bbmin(1e16f, 1e16f, 1e16f), bbmax(-1e16f, -1e16f, -1e16f);
+    vec bbmin(1e16f, 1e16f, 1e16f),
+        bbmax(-1e16f, -1e16f, -1e16f);
     matrix4x3 m;
     initmatrix(m);
     parts[0]->calcbb(bbmin, bbmax, m);