Changeset 251 for trunk

Timestamp:

06/12/14 11:07:08 (11 years ago)

Author:

epyon

Message:

• const correctness (in-progress)

Location:

trunk

Files:

• nv/gfx/keyframed_mesh.hh (modified) (1 diff)
• nv/interface/context.hh (modified) (2 diffs)
• src/gfx/keyframed_mesh.cc (modified) (1 diff)

trunk/nv/gfx/keyframed_mesh.hh

@@ -45 +45 @@
                 virtual void set_frame( uint32 frame );
                 virtual void update( uint32 ms );
-                virtual void update( program* a_program );
+                virtual void update( program* a_program ) const;
                 virtual ~keyframed_mesh();
         protected:

trunk/nv/interface/context.hh

@@ -39 +39 @@
                 explicit mesh_interface( vertex_array* array ) : m_va( array ) {}
                 virtual void update( uint32 ) {}
-                virtual void update( program* ) {}
+                virtual void update( program* ) const {}
                 virtual nv::vertex_array* get_vertex_array() const { return m_va; }
                 virtual size_t get_index_count() const { return 0; }
-                virtual nv::primitive get_primitive_type() { return nv::TRIANGLES; }
+                virtual nv::primitive get_primitive_type() const { return nv::TRIANGLES; }
                 virtual ~mesh_interface() {}
         protected:
@@ -62 +62 @@
                 virtual void draw( primitive prim, const render_state& rs, program* p, vertex_array* va, size_t count ) = 0;
 
-                virtual void draw( const render_state& rs, program* p, mesh_interface* mesh )
+                virtual void draw( const render_state& rs, program* p, const mesh_interface* mesh )
                 {
                         draw( mesh->get_primitive_type(), rs, p, mesh->get_vertex_array(), mesh->get_index_count() );
                 }
-                virtual void draw( const render_state& rs, const scene_state& s, program* p, mesh_interface* mesh )
+                virtual void draw( const render_state& rs, const scene_state& s, program* p, const mesh_interface* mesh )
                 {
                         p->apply_engine_uniforms( this, &s );

trunk/src/gfx/keyframed_mesh.cc

@@ -106 +106 @@
 }
 
-void nv::keyframed_mesh::update( program* a_program )
+void nv::keyframed_mesh::update( program* a_program ) const
 {
         a_program->set_opt_uniform( "nv_interpolate", m_interpolation );