Changeset 534 for trunk/src/engine

Timestamp:

01/12/17 14:41:17 (8 years ago)

Author:

epyon

Message:

CONTINUED:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

Location:

trunk/src/engine

Files:

• mesh_manager.cc (modified) (1 diff)
• particle_engine.cc (modified) (1 diff)
• program_manager.cc (modified) (1 diff)

trunk/src/engine/mesh_manager.cc

@@ -35 +35 @@
         nv::string_view sub_mesh_name;
         nv::string128 base_mesh_name( path );
-        nv::size_t sub_mesh_pos = path.find( ":" );
-        nv::size_t dot_pos = path.find( "." );
+        nv::uint32 sub_mesh_pos = path.find( ":" );
+        nv::uint32 dot_pos = path.find( "." );
         if ( sub_mesh_pos != nv::string_view::npos )
         {

trunk/src/engine/particle_engine.cc

@@ -196 +196 @@
         datap->plane_normal = normalize_safe( datap->plane_normal, vec3(0.0f,1.0f,0.0f) );
         datap->bounce       = table->get<float>("bounce", 0.0f );
-        datap->distance     = -math::dot( datap->plane_normal, datap->plane_point ) / math::sqrt( math::dot( datap->plane_normal, datap->plane_normal ) );
+        datap->distance     = -math::dot( datap->plane_normal, datap->plane_point ) / static_cast<float>( math::sqrt( math::dot( datap->plane_normal, datap->plane_normal ) ) );
         return true;
 }

trunk/src/engine/program_manager.cc

@@ -50 +50 @@
         stream* fstream = open_stream( fs, path );
         if ( !fstream ) return const_string();
-        uint32 size = fstream->size();
+        uint32 size = static_cast< uint32 >( fstream->size() );
         const_string result( nullptr, size );
         fstream->read( const_cast<char*>( result.data() ), size, 1 );