Changeset 152 for trunk

Timestamp:

07/08/13 14:19:56 (12 years ago)

Author:

epyon

Message:

• cached_buffer has been renamed to sliced_buffer

Location:

trunk

Files:

• nv/gfx/sliced_buffer.hh (moved) (moved from trunk/nv/gfx/cached_buffer.hh) (11 diffs)
• nv/gui/gui_renderer.hh (modified) (1 diff)
• src/gui/gui_environment.cc (modified) (1 diff)
• src/gui/gui_renderer.cc (modified) (2 diffs)
• tests/cachebuf_test/nv_cachebuf_test.cc (modified) (2 diffs)

trunk/nv/gfx/sliced_buffer.hh

@@ -8 +8 @@
 // TODO : Multiple update support?
 
-#ifndef NV_CACHED_BUFFER_HH
-#define NV_CACHED_BUFFER_HH
+#ifndef NV_SLICED_BUFFER_HH
+#define NV_SLICED_BUFFER_HH
 
 #include <nv/common.hh>
@@ -18 +18 @@
 {
 
-        template< typename T > class cached_buffer;
+        template< typename T > class sliced_buffer;
 
         template< typename T >
@@ -24 +24 @@
         {
         public:
-                typedef cached_buffer<T> cache;
+                typedef sliced_buffer<T> cache;
                 typedef std::vector<T>  vector;
 
@@ -86 +86 @@
 
         template< typename T >
-        class cached_buffer
+        class sliced_buffer
         {
         public:
@@ -93 +93 @@
                 static const size_t value_type_size = sizeof(T);
 
-                cached_buffer( device* dev, buffer_hint hint, size_t initial_size, bool is_vertex = true ) 
+                sliced_buffer( device* dev, buffer_hint hint, size_t initial_size, bool is_vertex = true ) 
                         : m_device( dev )
                         , m_buffer( nullptr )
@@ -193 +193 @@
                 }
 
-                virtual ~cached_buffer() 
+                virtual ~sliced_buffer() 
                 {
                         delete m_buffer;
@@ -218 +218 @@
         };
 
-        template< typename T, typename I = uint16 > class indexed_cached_buffer;
+        template< typename T, typename I = uint16 > class indexed_sliced_buffer;
 
         template< typename T, typename I = uint16 >
@@ -224 +224 @@
         {
         public:
-                typedef indexed_cached_buffer<T,I> cache;
+                typedef indexed_sliced_buffer<T,I> cache;
                 typedef buffer_slice<T> vertex_slice;
                 typedef buffer_slice<I> index_slice;
@@ -266 +266 @@
 
         template< typename T, typename I >
-        class indexed_cached_buffer
+        class indexed_sliced_buffer
         {
         public:
-                typedef cached_buffer<T> cached_vertex_buffer;
-                typedef cached_buffer<I> cached_index_buffer;
+                typedef sliced_buffer<T> sliced_vertex_buffer;
+                typedef sliced_buffer<I> sliced_index_buffer;
                 static const int value_type_size = sizeof(T);
 
-                indexed_cached_buffer( device* dev, buffer_hint hint, int initial_size, int initial_index_size )
+                indexed_sliced_buffer( device* dev, buffer_hint hint, int initial_size, int initial_index_size )
                         : m_vertex_buffer( dev, hint, initial_size, true )
                         , m_index_buffer( dev, hint, initial_index_size, false )
@@ -299 +299 @@
                 vertex_buffer* get_vertex_buffer() { return static_cast<vertex_buffer*>( m_vertex_buffer.get_buffer() ); }
                 index_buffer*  get_index_buffer()  { return static_cast<index_buffer*>( m_index_buffer.get_buffer() ); }
-                cached_vertex_buffer& get_vertex_cache() { return m_vertex_buffer; }
-                cached_index_buffer&  get_index_cache()  { return m_index_buffer; }
+                sliced_vertex_buffer& get_vertex_cache() { return m_vertex_buffer; }
+                sliced_index_buffer&  get_index_cache()  { return m_index_buffer; }
 
         private:
-                cached_vertex_buffer m_vertex_buffer;
-                cached_index_buffer  m_index_buffer;
+                sliced_vertex_buffer m_vertex_buffer;
+                sliced_index_buffer  m_index_buffer;
         };
 
@@ -310 +310 @@
 } // namespace nv
 
-#endif // NV_CACHED_BUFFER_HH
+#endif // NV_SLICED_BUFFER_HH

trunk/nv/gui/gui_renderer.hh

@@ -22 +22 @@
 #include <nv/interface/device.hh>
 #include <nv/interface/context.hh>
-#include <nv/gfx/cached_buffer.hh>
+#include <nv/gfx/sliced_buffer.hh>
 #include <nv/gfx/texture_atlas.hh>
 #include <nv/gfx/texture_font.hh>

trunk/src/gui/gui_environment.cc

@@ -23 +23 @@
 
 #include "nv/interface/mesh.hh"
-#include "nv/gfx/cached_buffer.hh"
+#include "nv/gfx/sliced_buffer.hh"
 #include "nv/gfx/texture_atlas.hh"
 

trunk/src/gui/gui_renderer.cc

@@ -77 +77 @@
         }
 
-        nv::cached_buffer<gui_quad> buffer;
+        nv::sliced_buffer<gui_quad> buffer;
         nv::vertex_array* varray;
         nv::program*      shader;
@@ -90 +90 @@
 {
 public:
-        element_render_data( nv::cached_buffer<gui_quad>* cbuffer )
+        element_render_data( nv::sliced_buffer<gui_quad>* cbuffer )
                 : buffer( cbuffer ) {}
 

trunk/tests/cachebuf_test/nv_cachebuf_test.cc

@@ -17 +17 @@
 #include <ctime> // time
 
-#include <nv/gfx/cached_buffer.hh>
+#include <nv/gfx/sliced_buffer.hh>
 
 #define INDEXED_TEST
@@ -69 +69 @@
 
 #ifdef INDEXED_TEST
-typedef nv::indexed_cached_buffer<vertex> gcache;
+typedef nv::indexed_sliced_buffer<vertex> gcache;
 typedef nv::indexed_buffer_slice<vertex> gslice;
 #else
-typedef nv::cached_buffer<quad> gcache;
+typedef nv::sliced_buffer<quad> gcache;
 typedef nv::buffer_slice<quad> gslice;
 #endif