Changeset 2191Tweet

Timestamp:

Jan 1, 2013, 8:11:43 PM (7 years ago)

Author:

sam

Message:

tutorial: minor tweaks.

Location:

trunk/tutorial

Files:

• 04_texture.cpp (modified) (2 diffs)
• 04_texture.lolfx (modified) (2 diffs)

trunk/tutorial/04_texture.cpp

@@ -19 +19 @@
 using namespace lol;
 
-static int const TEXTURE_WIDTH = 128;
+static int const TEXTURE_WIDTH = 512;
 
 extern char const *lolfx_04_texture;
@@ -58 +58 @@
 
         int height = m_heightmap[4 * (TEXTURE_WIDTH - 1)];
-        height = height / 2 + 255 / 4 + rand() % 97 - 48;
+        height = (height + 127 + 40 * lol::sin(m_frames * 0.03) + rand() % 97 - 38) / 2;
         height = std::max(15, std::min(height, 240));
         m_heightmap[4 * (TEXTURE_WIDTH - 1)] = height;

trunk/tutorial/04_texture.lolfx

@@ -32 +32 @@
     float width = 800.0;
     float height = 600.0;
-    float line_width = 1.8;
-    float dot_size = 2.0;
-    vec4 delta = vec4(1.0 / 128, 0.0,
-                      2.0 / 128, 0.0);
+    float texture_width = 512.0;
+    float line_width = 1.2;
+    float dot_size = 1.0;
+    vec4 delta = vec4(1.0 / 512, 0.0,
+                      2.0 / 512, 0.0);
 
     vec2 p = pass_Position.xy;
-    vec2 tc = vec2(floor(p.x * 128.0) / 128.0, p.y);
-    float t = p.x * 128.0 - floor(p.x * 128.0);
+    vec2 tc = vec2(floor(p.x * 512.0) / 512.0, p.y);
+    float t = p.x * 512.0 - floor(p.x * 512.0);
     vec4 c;
     c[0] = texture2D(u_Texture, tc - delta.xy).x;
@@ -46 +47 @@
     c[3] = texture2D(u_Texture, tc + delta.zw).x;
 
+    /* Find the 4 closest points in screen space */
     vec2 p0 = vec2((tc.x - delta.x) * width, c[0] * height);
     vec2 p1 = vec2((tc.x          ) * width, c[1] * height);