Changeset 1100Tweet

Timestamp:

Nov 30, 2011, 7:31:26 PM (11 years ago)

Author:

gary

Message:

test: minor tuning, esp. for the PS3.

File:

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

trunk/test/tutorial/tut03.cpp

@@ -89 +89 @@
         //m_center = f64cmplx(-.22815528839841, -1.11514249704382);
         //m_center = f64cmplx(0.001643721971153, 0.822467633298876);
-        m_center = f64cmplx(-0.65823419062254, .50221777363480);
-        m_zoom_speed = 0;//-0.0025;
+        m_center = f64cmplx(-0.65823419062254, 0.50221777363480);
+        m_zoom_speed = -0.000025;
 #else
         m_center = -0.75;
@@ -120 +120 @@
             uint8_t green = g * 255.99f;
             uint8_t blue = b * 255.99f;
-#if defined __native_client__
+#if defined __CELLOS_LV2__
+            m_palette[i] = u8vec4(255, red, green, blue);
+#elif defined __native_client__
             m_palette[i] = u8vec4(red, green, blue, 255);
 #else
@@ -313 +315 @@
                 helpers[slice].fractal = this;
                 helpers[slice].slice = slice;
-                helpers[slice].thread = new Thread(DoWorkHelper::Help,
-                                                   &helpers[slice]);
+//                helpers[slice].thread = new Thread(DoWorkHelper::Help,
+//                                                   &helpers[slice]);
+DoWork(slice);
             }
             for (int slice = 0; slice < m_slices; slice++)
             {
-                delete helpers[slice].thread;
+//                delete helpers[slice].thread;
             }
         }
@@ -383 +386 @@
             else
             {
+#if defined __CELLOS_LV2__
+                *m_pixelstart++ = u8vec4(255, 0, 0, 0);
+#else
                 *m_pixelstart++ = u8vec4(0, 0, 0, 255);
+#endif
             }
         }
@@ -477 +484 @@
                       * this value. We add or remove a slight offset to avoid
                       * rounding issues at the image's edges. */
-                "    v_IndexX = v_CenterX * u_ScreenSize.z - (offsets.zwzw + vec4(0.001, 0.002, 0.003, 0.004));"
-                "    v_IndexY = v_CenterY * u_ScreenSize.w - (offsets.zwwz + vec4(0.0015, 0.0025, 0.0035, 0.0045));"
+                "    v_IndexX = v_CenterX * u_ScreenSize.z - offsets.zwzw;"
+                "    v_IndexY = v_CenterY * u_ScreenSize.w - offsets.zwwz;"
                 "}",
 
@@ -587 +594 @@
                 "    v_CenterY = zoomscale * a_TexCoord.y - zoomty"
                 "              + offsets.xyyx * u_TexelSize.y;"
-                "    v_IndexX = v_CenterX * u_ScreenSize.z - (offsets.zwzw + float4(0.001, 0.002, 0.003, 0.004));"
-                "    v_IndexY = v_CenterY * u_ScreenSize.w - (offsets.zwwz + float4(0.0015, 0.0025, 0.0035, 0.0045));"
+                "    v_IndexX = v_CenterX * u_ScreenSize.z - offsets.zwzw;"
+                "    v_IndexY = v_CenterY * u_ScreenSize.w - offsets.zwwz;"
                 "}",
 
@@ -595 +602 @@
                 "          in float4 v_IndexX,"
                 "          in float4 v_IndexY,"
-                "          uniform float4 u_TexelSize,"
+                "          uniform float4 u_TexelSize2,"
                 "          uniform sampler2D u_Texture,"
                 "          out float4 out_FragColor : COLOR)"
@@ -601 +608 @@
                 "    float4 v05 = float4(0.5, 0.5, 0.5, 0.5);"
                 "    float4 rx, ry, t0, dx, dy, dd;"
-                "    rx = u_TexelSize.x + u_TexelSize.z * floor(v_IndexX);"
-                "    ry = u_TexelSize.y + u_TexelSize.w * floor(v_IndexY);"
+                "    rx = u_TexelSize2.x + u_TexelSize2.z * floor(v_IndexX);"
+                "    ry = u_TexelSize2.y + u_TexelSize2.w * floor(v_IndexY);"
                 "    t0 = step(abs(rx - v05), v05) * step(abs(ry - v05), v05);"
                 "    dx = rx - v_CenterX;"
@@ -614 +621 @@
                 "    float t2 = step(dd.x, dd.y);"
                 "    ret.xy = lerp(ret.xz, ret.yw, t2);"
-                     /* FIXME: above currently broken; fall back to this */
-                "    ret.xy = float2(v_CenterX.x, v_CenterY.x * 0.25);"
                 "    out_FragColor = tex2D(u_Texture, ret.xy);"
                 "}"
@@ -623 +628 @@
             m_texattrib = m_shader->GetAttribLocation("a_TexCoord");
             m_texeluni = m_shader->GetUniformLocation("u_TexelSize");
+#if defined __CELLOS_LV2__
+            m_texeluni2 = m_shader->GetUniformLocation("u_TexelSize2");
+#endif
             m_screenuni = m_shader->GetUniformLocation("u_ScreenSize");
             m_zoomuni = m_shader->GetUniformLocation("u_ZoomSettings");
@@ -670 +678 @@
         m_shader->Bind();
         m_shader->SetUniform(m_texeluni, m_texel_settings);
+#if defined __CELLOS_LV2__
+        m_shader->SetUniform(m_texeluni2, m_texel_settings);
+#endif
         m_shader->SetUniform(m_screenuni, m_screen_settings);
         m_shader->SetUniform(m_zoomuni, m_zoom_settings);
@@ -722 +733 @@
 #endif
     int m_vertexattrib, m_texattrib, m_texeluni, m_screenuni, m_zoomuni;
+#if defined __CELLOS_LV2__
+    int m_texeluni2;
+#endif
     int m_frame, m_slices, m_dirty[4];
     bool m_ready, m_drag;