Changeset 392 for trunk/src

Timestamp:

06/11/15 16:23:41 (10 years ago)

Author:

epyon

Message:

• massive shift towards nova STL
• include cleanups

Location:

trunk/src

Files:

• fmod/fmod_audio.cc (modified) (1 diff)
• formats/assimp_loader.cc (modified) (3 diffs)
• formats/md5_loader.cc (modified) (1 diff)
• gfx/skeletal_mesh.cc (modified) (3 diffs)
• gl/gl_context.cc (modified) (1 diff)
• gl/gl_device.cc (modified) (11 diffs)
• gui/gui_environment.cc (modified) (1 diff)
• io/string_table.cc (modified) (3 diffs)
• sdl/sdl_audio.cc (modified) (2 diffs)

trunk/src/fmod/fmod_audio.cc

@@ -88 +88 @@
 
 
-nv::sound fmod::audio::load_sound( const std::string& a_path )
+nv::sound fmod::audio::load_sound( const string_ref& a_path )
 {
         FMOD_SYSTEM* system = (FMOD_SYSTEM*)m_system;
         FMOD_SOUND* sample;
-        FMOD_RESULT fm_result = FMOD_System_CreateSound( system, a_path.c_str(), FMOD_3D, 0, &sample );
+        FMOD_RESULT fm_result = FMOD_System_CreateSound( system, a_path.data(), FMOD_3D, 0, &sample );
         if ( fm_result != FMOD_OK )
         {

trunk/src/formats/assimp_loader.cc

@@ -6 +6 @@
 
 #include "nv/formats/assimp_loader.hh"
-#include <unordered_map>
-#include "nv/io/std_stream.hh"
+#include "nv/stl/unordered_map.hh"
 #include "nv/gfx/mesh_creator.hh"
 #include "nv/lib/assimp.hh"
@@ -286 +285 @@
         const aiScene* scene = (const aiScene*)m_scene;
         vector< mesh_node_data > final_bones;
-        std::unordered_map< std::string, uint16 > names;
+        unordered_map< std::string, uint16 > names;
         for ( unsigned int m = 0; m < m_mesh_count; ++m )
         {
@@ -334 +333 @@
         }
         mesh_node_data* bones = new mesh_node_data[ final_bones.size() ];
-        nv::raw_copy( final_bones.begin(), final_bones.end(), bones );
+        raw_copy( final_bones.begin(), final_bones.end(), bones );
         return new mesh_nodes_data( "bones", final_bones.size(), bones );
 }

trunk/src/formats/md5_loader.cc

@@ -6 +6 @@
 
 #include "nv/core/logging.hh"
+#include "nv/stl/vector.hh"
 #include "nv/io/std_stream.hh"
 

trunk/src/gfx/skeletal_mesh.cc

@@ -7 +7 @@
 #include "nv/interface/context.hh"
 #include "nv/interface/device.hh"
+#include "nv/stl/unordered_map.hh"
 
 nv::skeletal_mesh_cpu::skeletal_mesh_cpu( context* a_context, const mesh_data* a_mesh_data, const mesh_nodes_data* bones )
@@ -89 +90 @@
         if ( !m_node_data->is_flat() )
         {
-                m_children = new std::vector< uint32 >[ node_count ];
+                m_children = new vector< uint32 >[ node_count ];
                 for ( uint32 n = 0; n < node_count; ++n )
                 {
@@ -132 +133 @@
 {
         if ( m_prepared ) return;
-        std::unordered_map< std::string, nv::uint16 > bone_names;
+        unordered_map< std::string, nv::uint16 > bone_names;
         m_offsets = new mat4[ bones->get_count() ];
         for ( nv::uint16 bi = 0; bi < bones->get_count(); ++bi )

trunk/src/gl/gl_context.cc

@@ -713 +713 @@
         if ( info )
         {
-                for ( auto u : info->m_engine_uniforms )
+                for ( auto& u : *info->m_engine_uniforms )
                 {
                         u->set( this, &s );

trunk/src/gl/gl_device.cc

@@ -17 +17 @@
         m_shader_header  = "#version 120\n";
         for ( auto& i : get_uniform_factory() ) 
-                m_shader_header += "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+i.first+";\n";
+                m_shader_header += "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+ i.first.to_string() +";\n";
         for ( auto& i : get_link_uniform_factory() ) 
-                m_shader_header += "uniform sampler2D "+i.first+";\n";
+                m_shader_header += "uniform sampler2D "+i.first.to_string() +";\n";
 }
 
@@ -26 +26 @@
         program result = m_programs.create();
         gl_program_info* info = m_programs.get( result );
+
+        info->m_attribute_map   = new attribute_map;
+        info->m_engine_uniforms = new engine_uniform_list;
+        info->m_uniform_map     = new uniform_map;
 
         info->glid = glCreateProgram();
@@ -179 +183 @@
         if ( info )
         {
-                for ( auto& i : info->m_uniform_map )
+                for ( auto& i : *info->m_uniform_map )
                         delete i.second;
 
@@ -188 +192 @@
                 glDeleteProgram( info->glid );
 
+                delete info->m_attribute_map;
+                delete info->m_engine_uniforms;
+                delete info->m_uniform_map;
+
                 m_programs.destroy( p );
         }
@@ -200 +208 @@
                 auto& lmap = get_link_uniform_factory();
 
-                for ( auto& i : info->m_uniform_map )
+                for ( auto& i : *info->m_uniform_map )
                 {
                         auto j = lmap.find( i.first );
@@ -211 +219 @@
                         if ( k != map.end() )
                         {
-                                info->m_engine_uniforms.push_back( k->second->create( i.second ) );
+                                info->m_engine_uniforms->push_back( k->second->create( i.second ) );
                         }                               
                 }
@@ -221 +229 @@
         const gl_program_info* info = m_programs.get( p );
         {
-                nv::uniform_map::const_iterator i = info->m_uniform_map.find( name );
-                if ( i != info->m_uniform_map.end() )
+                nv::uniform_map::const_iterator i = info->m_uniform_map->find( name );
+                if ( i != info->m_uniform_map->end() )
                 {
                         return i->second;
@@ -240 +248 @@
         if ( info )
         {
-                attribute_map::const_iterator i = info->m_attribute_map.find( name );
-                if ( i != info->m_attribute_map.end() )
+                attribute_map::const_iterator i = info->m_attribute_map->find( name );
+                if ( i != info->m_attribute_map->end() )
                 {
                         return i->second.location;
@@ -307 +315 @@
 void nv::gl_device::update_uniforms( gl_program_info* p )
 {
-        for ( uniform_map::iterator i = p->m_uniform_map.begin();       i != p->m_uniform_map.end(); ++i ) 
-        {
-                uniform_base* ubase = i->second;
+        for ( auto& i : *p->m_uniform_map )
+        {
+                uniform_base* ubase = i.second;
                 if ( ubase->is_dirty() )
                 {
@@ -354 +362 @@
                 int attr_loc = glGetAttribLocation( p->glid, name.c_str() );
 
-                attribute& attr = p->m_attribute_map[ name ];
+                attribute& attr = (*p->m_attribute_map)[ name ];
                 attr.name     = name;
                 attr.location = attr_loc;
@@ -393 +401 @@
                 uniform_base* u = uniform_base::create( utype, name, uni_loc, uni_len );
                 NV_ASSERT( u, "Unknown uniform type!" );
-                p->m_uniform_map[ name ] = u;
+                (*p->m_uniform_map)[ name ] = u;
         }
 }

trunk/src/gui/gui_environment.cc

@@ -14 +14 @@
         TODO: parse a lua stylesheet as per Trac wiki
 
-        IDEA: Store everything in std::unordered_maps, with lua_value's?
+        IDEA: Store everything in unordered_maps, with lua_value's?
 
         A lua_value is a variant stores strings as const char* that deletes them on destructor?

trunk/src/io/string_table.cc

@@ -6 +6 @@
 
 #include "nv/io/string_table.hh"
-#include <array>
 
 nv::string_table_creator::string_table_creator()
@@ -24 +23 @@
         NV_ASSERT( m_offsets.size() < index(-1), "Too many strings!" );
         index  result  = (index)m_offsets.size();
-        m_offsets.push_back( m_data.size() );
-        std::copy( cs, cs + cs_size, std::back_inserter( m_data ) );
+        size_t dsize = m_data.size();
+        m_offsets.push_back( dsize );
+        m_data.resize( dsize + cs_size );
+        raw_copy( cs, cs + cs_size, m_data.data() + dsize );
         m_map[ s ] = result;
         return result;
@@ -34 +35 @@
         offset* offsets = new offset[m_offsets.size()];
         char*   data    = new char [m_data.size()];
-        std::copy( m_offsets.begin(), m_offsets.end(), offsets );
-        std::copy( m_data.begin(),    m_data.end(),    data );
+        raw_copy( m_offsets.begin(), m_offsets.end(), offsets );
+        raw_copy( m_data.begin(),    m_data.end(),    data );
         return new string_table( data, m_data.size(), offsets, (index)m_offsets.size() );
 }

trunk/src/sdl/sdl_audio.cc

@@ -85 +85 @@
 }
 
-nv::sound nv::sdl::audio::load_sound( const std::string& a_path )
+nv::sound nv::sdl::audio::load_sound( const string_ref& a_path )
 {
         // TODO: this is a really weird error - if we remove this check, all hell gets loose
@@ -92 +92 @@
                 NV_LOG_ERROR( "SDL_mixer not loaded!" );
         }
-        Mix_Chunk *sample = Mix_LoadWAV_RW(SDL_RWFromFile(a_path.c_str(), "rb"), 1);
+        Mix_Chunk *sample = Mix_LoadWAV_RW(SDL_RWFromFile(a_path.data(), "rb"), 1);
         if ( sample == nullptr )
         {