Changeset 1218Tweet

Timestamp:

Apr 12, 2012, 12:59:26 AM (8 years ago)

Author:

sam

Message:

tutorial: fix a compilation error and remove now useless vector type casts.

File:

• trunk/test/tutorial/tut03.cpp (modified) (3 diffs)

trunk/test/tutorial/tut03.cpp

@@ -68 +68 @@
         m_size.x = (m_size.x + 15) & ~15;
         m_size.y = (m_size.y + 15) & ~15;
-        /* FIXME: casts are necessary because of missing operators */
-        m_texel_settings = vec4(1.0, 1.0, 2.0, 2.0) / (vec4)m_size.xyxy;
-        m_screen_settings = vec4(1.0, 1.0, 0.5, 0.5) * (vec4)m_size.xyxy;
+        m_texel_settings = vec4(1.0, 1.0, 2.0, 2.0) / m_size.xyxy;
+        m_screen_settings = vec4(1.0, 1.0, 0.5, 0.5) * m_size.xyxy;
 
         /* Window size decides the world aspect ratio. For instance, 640×480
@@ -84 +83 @@
         else
             m_window2world = 0.5 / m_window_size.x;
-        m_texel2world = (vec2)m_window_size / (vec2)m_size
-                                            * (vec2)m_window2world;
+        m_texel2world = (vec2)m_window_size / m_size * m_window2world;
 
         m_oldmouse = ivec2(0, 0);
@@ -868 +866 @@
 int main(int argc, char **argv)
 {
-    Application app("Tutorial 3: Fractal", ivec2(640, 480, 60.0f);
+    Application app("Tutorial 3: Fractal", ivec2(640, 480), 60.0f);
 
 #if defined _MSC_VER && !defined _XBOX