Changeset 1369Tweet

Timestamp:

May 12, 2012, 1:51:43 PM (9 years ago)

Author:

sam

Message:

math: replace len(vec) with length(vec) to match the GLSL naming.

Location:

trunk

Files:

• monsterz/board.cpp (modified) (2 diffs)
• monsterz/piece.cpp (modified) (4 diffs)
• src/lol/math/vector.h (modified) (6 diffs)
• test/tutorial/03_fractal.cpp (modified) (2 diffs)

trunk/monsterz/board.cpp

@@ -189 +189 @@
             if (cur_cell.x < 0 || cur_cell.x >= data->dim.x
                  || cur_cell.y < 0 || cur_cell.y >= data->dim.y
-                 || sqlen(cur_pos - cur_cell * data->size) > sqlen(data->size) / 8
-                 || sqlen(cur_cell - data->src_cell) != 1)
+                 || sqlength(cur_pos - cur_cell * data->size) > sqlength(data->size) / 8
+                 || sqlength(cur_cell - data->src_cell) != 1)
                 cur_cell = ivec2(-1);
             /* If potential target changed, update our cache. */
@@ -222 +222 @@
         /* Mouse released, or exited window, or dragged too far. */
         if (!buttons[0] || m_mousepos.x == -1 ||
-             sqlen(data->src_cell * data->size - data->grabbed.piece->GetPos()
+             sqlength(data->src_cell * data->size - data->grabbed.piece->GetPos()
                   - data->grabbed.piece->GetOffset()) > 100 * 100)
         {

trunk/monsterz/piece.cpp

@@ -201 +201 @@
     case PieceData::MOVE:
         /* Only allow swaps when piece is close enough to its target cell. */
-        if (sqlen(GetShift()) > sqlen(data->size) / 8)
+        if (sqlength(GetShift()) > sqlength(data->size) / 8)
             return 0;
         /* Fall through */
@@ -277 +277 @@
 
         ivec2 trip = data->pos_dst - data->pos_src;
-        float pos_time = len(trip) / data->speed;
+        float pos_time = length(trip) / data->speed;
         float t = pos_time ? data->timer / pos_time : 1.0f;
         if (t >= 1.0f)
@@ -283 +283 @@
         data->pos = vec2(data->pos_src) + t * vec2(trip) + vec2(0.5f);
 
-        float off_time = len(data->off_src) / data->speed;
+        float off_time = length(data->off_src) / data->speed;
         t = off_time ? data->timer / off_time : 1.0f;
         if (t >= 1.0f)
@@ -354 +354 @@
         break;
     case PieceData::UNGRAB:
-        if (sqlen(data->cell * data->size - data->pos_src)
-              > sqlen(data->size) / 8)
+        if (sqlength(data->cell * data->size - data->pos_src)
+              > sqlength(data->size) / 8)
             off = 7;
         z = 8;

trunk/src/lol/math/vector.h

@@ -269 +269 @@
     }
 
-    inline T norm() const { return len(*this); }
+    inline T norm() const { return length(*this); }
 #if !defined __ANDROID__
     template<typename U>
@@ -281 +281 @@
 static inline Cmplx<T> re(Cmplx<T> const &val)
 {
-    return ~val / sqlen(val);
+    return ~val / sqlength(val);
 }
 
@@ -1003 +1003 @@
 inline T norm(Quat<T> const &val)
 {
-    return sqlen(val);
+    return sqlength(val);
 }
 
@@ -1188 +1188 @@
     \
     tprefix \
-    inline type sqlen(tname<type> const &a) \
+    inline type sqlength(tname<type> const &a) \
     { \
         type acc = 0; \
@@ -1197 +1197 @@
     \
     tprefix \
-    inline double len(tname<type> const &a) \
+    inline double length(tname<type> const &a) \
     { \
         using std::sqrt; \
-        return sqrt((double)sqlen(a)); \
+        return sqrt((double)sqlength(a)); \
     } \
     \
@@ -1206 +1206 @@
     inline tname<type> normalize(tname<type> const &val) \
     { \
-        type norm = (type)len(val); \
+        type norm = (type)length(val); \
         return norm ? val / norm : val * (type)0; \
     }

trunk/test/tutorial/03_fractal.cpp

@@ -384 +384 @@
                 z3 = z2 * z2 + r0;
                 z0 = z3 * z3 + r0;
-                if (sqlen(z0) >= maxsqlen)
+                if (sqlength(z0) >= maxsqlen)
                     break;
                 iter -= 4;
@@ -393 +393 @@
             if (iter)
             {
-                double n = sqlen(z0);
-
-                if (sqlen(z1) >= maxsqlen) { iter += 3; n = sqlen(z1); }
-                else if (sqlen(z2) >= maxsqlen) { iter += 2; n = sqlen(z2); }
-                else if (sqlen(z3) >= maxsqlen) { iter += 1; n = sqlen(z3); }
+                double n = sqlength(z0);
+
+                if (sqlength(z1) >= maxsqlen) { iter += 3; n = sqlength(z1); }
+                else if (sqlength(z2) >= maxsqlen) { iter += 2; n = sqlength(z2); }
+                else if (sqlength(z3) >= maxsqlen) { iter += 1; n = sqlength(z3); }
 
                 if (n > maxsqlen * maxsqlen)