Changeset 1066Tweet

Timestamp:

Nov 14, 2011, 9:23:19 AM (11 years ago)

Author:

sam

Message:

tutorial: try to reduce the blur effect; now it's pixelated...

File:

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

trunk/test/tutorial/tut03.cpp

@@ -38 +38 @@
         m_size = size;
         m_pixels = new u8vec4[size.x * size.y];
+        m_tmppixels = new u8vec4[size.x / 2 * size.y / 2];
         m_frame = -1;
-        m_dirty = 8;
+        for (int i = 0; i < 4; i++)
+        {
+            m_deltashift[i] = 0.0;
+            m_deltascale[i] = 1.0;
+            m_dirty[i] = 2;
+        }
         m_center = -0.75;
-        //f64cmplx(0.001643721971153, 0.822467633298876);
-        //f64cmplx(-1.207205434596, 0.315432814901);
-        //f64cmplx(-0.79192956889854, -0.14632423080102);
-        //f64cmplx(0.3245046418497685, 0.04855101129280834);
-        //f64cmplx(0.28693186889504513, 0.014286693904085048);
         m_radius = 1.5;
         m_screenradius = 0.5 * (m_size.x < m_size.y ? m_size.x : m_size.y);
@@ -75 +76 @@
         Ticker::Unref(m_zoomtext);
         delete m_pixels;
+        delete m_tmppixels;
     }
 
     inline f64cmplx ScreenToWorldOffset(ivec2 pixel)
     {
-        f64cmplx tmp = f64cmplx(pixel.x - m_size.x / 2,
-                                m_size.y / 2 - pixel.y);
+        f64cmplx tmp = f64cmplx(0.5 + pixel.x - m_size.x / 2,
+                                0.5 + m_size.y / 2 - pixel.y);
         return tmp * (m_radius / m_screenradius);
     }
@@ -95 +97 @@
         if ((buttons[0] || buttons[2]) && mousepos.x != -1)
         {
+            f64cmplx oldcenter = m_center;
+            double oldradius = m_radius;
             double zoom = pow(2.0, (buttons[0] ? -deltams : deltams) * 0.0015);
             if (m_radius * zoom > 8.0)
@@ -103 +107 @@
             m_center = (m_center - worldmouse) * zoom + worldmouse;
             worldmouse = m_center + ScreenToWorldOffset(mousepos);
-            m_dirty = 8;
-        }
+
+            /* Store the transformation properties to go from m_frame-1
+             * to m_frame. */
+            m_deltashift[m_frame] = (oldcenter - m_center) / m_radius;
+            m_deltascale[m_frame] = oldradius / m_radius;
+            m_dirty[0] = m_dirty[1] = m_dirty[2] = m_dirty[3] = 2;
+        }
+        else
+        {
+            /* If settings didn't change, set transformation from previous
+             * frame to identity. */
+            m_deltashift[m_frame] = 0.0;
+            m_deltascale[m_frame] = 1.0;
+        }
+
+        if (buttons[1])
+            m_dirty[0] = m_dirty[1] = m_dirty[2] = m_dirty[3] = 2;
 
         char buf[128];
@@ -116 +135 @@
         u8vec4 *m_pixelstart = m_pixels + m_size.x * m_size.y / 4 * m_frame;
 
-        if (m_dirty)
-        {
-            m_dirty--;
+        if (m_dirty[m_frame])
+        {
+            m_dirty[m_frame]--;
 
             for (int j = ((m_frame + 1) % 4) / 2; j < m_size.y; j += 2)
@@ -130 +149 @@
                 //f64cmplx r0(0.28693186889504513, 0.014286693904085048);
                 //f64cmplx r0(0.001643721971153, 0.822467633298876);
+                //f64cmplx r0(-1.207205434596, 0.315432814901);
+                //f64cmplx r0(-0.79192956889854, -0.14632423080102);
+                //f64cmplx r0(0.3245046418497685, 0.04855101129280834);
                 f64cmplx z;
                 int iter = maxiter;
@@ -268 +290 @@
         glBindTexture(GL_TEXTURE_2D, m_texid);
 
-        if (m_dirty)
-        {
-            m_dirty--;
+        if (m_dirty[m_frame])
+        {
+            m_dirty[m_frame]--;
 
             glTexSubImage2D(GL_TEXTURE_2D, 0, 0, m_frame * m_size.y / 2,
@@ -282 +304 @@
                             m_pixels + m_size.x * m_size.y / 4 * m_frame);
         }
+
+/* If other frames are dirty, upload fake data for now */
+for (int i = 0; i < 4; i++)
+{
+    if (m_dirty[i])
+    {
+            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, i * m_size.y / 2,
+                            m_size.x / 2, m_size.y / 2,
+#if !defined __CELLOS_LV2__
+                            GL_RGBA, GL_UNSIGNED_BYTE,
+#else
+                            /* The PS3 is big-endian */
+                            GL_RGBA, GL_UNSIGNED_INT_8_8_8_8,
+#endif
+                            m_pixels + m_size.x * m_size.y / 4 * m_frame);
+    }
+}
 
         m_shader->Bind();
@@ -321 +360 @@
 private:
     ivec2 m_size;
-    u8vec4 *m_pixels;
+    u8vec4 *m_pixels, *m_tmppixels;
     Shader *m_shader;
     GLuint m_texid;
@@ -329 +368 @@
 #endif
     int m_vertexattrib, m_texattrib;
-    int m_frame, m_dirty;
+    int m_frame, m_dirty[4];
     bool m_ready;
 
     f64cmplx m_center;
     double m_radius, m_screenradius;
+    f64cmplx m_deltashift[4];
+    double m_deltascale[4];
 
     /* Debug information */