Changeset 1520 for trunk/orbital/snake.hTweet

Timestamp:

Jun 24, 2012, 4:03:14 PM (11 years ago)

Author:

sam

Message:

build: fix the VS2010 build and add build/ and binaries/ to the dist
tarball.

File:

• trunk/orbital/snake.h (modified) (2 diffs)

trunk/orbital/snake.h

@@ -94 +94 @@
         }
 
-        float test = sin(m_steer) * 200.f + 60.f;
+        float test = lol::sin(m_steer) * 200.f + 60.f;
         m_rotation *= quat::rotate(seconds * test, vec3(0, 1, 0));
 
@@ -167 +167 @@
         {
             pos += m_nodes[i].m1;
-            y_angle = (180.f / (float)M_PI) * atan2(m_nodes[i].m1.x, m_nodes[i].m1.z);
+            y_angle = (180.f / (float)M_PI) * lol::atan2(m_nodes[i].m1.x, m_nodes[i].m1.z);
             rot = quat::rotate(y_angle, 0.f, 1.f, 0.f)
                 * quat::rotate(m_nodes[i].m2, 0.f, 0.f, 1.f);
             model = mat4::translate(pos) * mat4(rot);
             if (i != m_nodes.Count() - 1 && m_nodes[i].m4)
-                m_body.Render(model, sin(2.f * m_nodes[i].m3) * .5f + .5f);
+                m_body.Render(model, lol::sin(2.f * m_nodes[i].m3) * .5f + .5f);
             else if (i != m_nodes.Count() - 1)
                 m_body.Render(model);