Changeset 118 for trunk/tests/cachebuf_test

Timestamp:

06/12/13 04:01:20 (12 years ago)

Author:

epyon

Message:

• cached_buffer - size caching, partial updates
• cached_buffer - you can now freely change the size of locked vector, the cache will update accordingly
• nv_cachebuf_test - added test for complexity change

File:

• trunk/tests/cachebuf_test/nv_cachebuf_test.cc (modified) (7 diffs)

trunk/tests/cachebuf_test/nv_cachebuf_test.cc

@@ -67 +67 @@
 {
         app_window( nv::cached_buffer<quad>* cache, const glm::ivec2& a, const glm::ivec2& b, const glm::vec4& color )
-                : m_slice( cache )
-        {
-                glm::vec4 dcolor( color.x * 0.5, color.y * 0.5, color.z * 0.5, 1.0 );
-                std::vector<quad>& v = m_slice.lock();
-                nv::ivec2 a2( a.x, b.y );
-                nv::ivec2 b2( b.x, a.y );
-                nv::ivec2 t1( 10, 10 );
-                nv::ivec2 t2( -10, 10 );
-                v.emplace_back( a - t1, a,       b2, b2 - t2, dcolor );
-                v.emplace_back( a - t1, a2 + t2, a2, a,       dcolor );
-                v.emplace_back( a2 + t2, b + t1, b, a2, dcolor );
-                v.emplace_back( b + t1, b2 - t2, b2, b, dcolor );
-                v.emplace_back( a, b, color );
+                : m_slice( cache ), m_a( a ), m_b( b ), m_c( color )
+        {
+                create_complex();
         }
 
         void change_color( const glm::vec4& color )
         {
+                m_c = color;
                 glm::vec4 dcolor( color.x * 0.5, color.y * 0.5, color.z * 0.5, 1.0 );
                 std::vector<quad>& v = m_slice.lock();
                 vertex* vtx = (vertex*)v.data();
-                for (size_t i = 0; i < (v.size() - 1) * 6; ++i )
-                        vtx[i].color = color;
-                for (size_t i = (v.size() - 1) * 6; i < (v.size()) * 6; ++i )
-                        vtx[i].color = dcolor;
+                if ( v.size() > 1 )
+                {
+                        for (size_t i = 0; i < (v.size() - 1) * 6; ++i )
+                                vtx[i].color = dcolor;
+                        for (size_t i = (v.size() - 1) * 6; i < (v.size()) * 6; ++i )
+                                vtx[i].color = color;
+                }
+                else
+                {
+                        for (size_t i = 0; i < 6; ++i )
+                                vtx[i].color = color;
+                }
+        }
+
+        void simplify_toggle()
+        {
+                if ( m_slice.data().size() > 1 )
+                {
+                        NV_LOG( nv::LOG_INFO, "Simplifing" );
+                        create_simple();
+                }
+                else
+                {
+                        NV_LOG( nv::LOG_INFO, "Complexifing" );
+                        create_complex();
+                }
+        }
+
+        void create_simple()
+        {
+                std::vector<quad>& v = m_slice.lock();
+                v.clear();
+                v.emplace_back( m_a, m_b, m_c );
+        }
+
+        void create_complex()
+        {
+                glm::vec4 dcolor( m_c.x * 0.5, m_c.y * 0.5, m_c.z * 0.5, 1.0 );
+                std::vector<quad>& v = m_slice.lock();
+                v.clear();
+                nv::ivec2 a2( m_a.x, m_b.y );
+                nv::ivec2 b2( m_b.x, m_a.y );
+                nv::ivec2 t1( 10, 10 );
+                nv::ivec2 t2( -10, 10 );
+                v.emplace_back( m_a - t1, m_a,       b2, b2 - t2, dcolor );
+                v.emplace_back( m_a - t1, a2 + t2, a2, m_a,       dcolor );
+                v.emplace_back( a2 + t2, m_b + t1, m_b, a2, dcolor );
+                v.emplace_back( m_b + t1, b2 - t2, b2, m_b, dcolor );
+                v.emplace_back( m_a, m_b, m_c );
         }
 
@@ -99 +135 @@
 
         nv::buffer_slice<quad> m_slice;
+        nv::ivec2 m_a;
+        nv::ivec2 m_b;
+        nv::vec4 m_c;
 };
 
@@ -109 +148 @@
         void kill_window();
         void spawn_window();
+        void simplify_window();
         void recolor_window();
         ~application();
@@ -180 +220 @@
                 m_program->bind();
 //              m_program->set_uniform( "tex", 0 );
-                m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_program, m_va, m_windows.size() * 5 * 6 );
+                m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_program, m_va, m_quad_cache->get_size() * 6 );
                 m_window->swap_buffers();
 
@@ -197 +237 @@
                                         {
                                         case nv::KEY_N      : spawn_window(); break;
+                                        case nv::KEY_S      : simplify_window(); break;
                                         case nv::KEY_C      : recolor_window(); break;
                                         case nv::KEY_K      : kill_window(); break;
@@ -223 +264 @@
         m_windows.erase( m_windows.begin() + index );
 }
+
 void application::recolor_window()
 {
@@ -228 +270 @@
         size_t index = rand() % m_windows.size();
         m_windows[ index ].change_color( nv::vec4( (float)rand() / float(RAND_MAX), (float)rand() / float(RAND_MAX), (float)rand() / float(RAND_MAX), 1.0 ) );
+}
+
+void application::simplify_window()
+{
+        if ( m_windows.size() == 0 ) return;
+        size_t index = rand() % m_windows.size();
+        NV_LOG( nv::LOG_INFO, "Simplify " << index );
+        m_windows[ index ].simplify_toggle();
 }