Changeset 526 for trunk

Timestamp:

10/29/16 01:35:14 (9 years ago)

Author:

epyon

Message:

• physics level mesh implementation

Location:

trunk/src

Files:

• engine/model_manager.cc (modified) (1 diff)
• gfx/mesh_creator.cc (modified) (7 diffs)

trunk/src/engine/model_manager.cc

@@ -38 +38 @@
                 else
                         gm->bind_data = m_animator_binds->add( id, new animator_bind_data( poses->get_tree(), *def_data.lock()->node_data ) );
+        }
+
+        if ( table.has_field( "phx_mesh" ) )
+        {
+                nv::string128 cpath( table.get_string128( "phx_mesh" ) );
+                gm->phx_mesh = m_mesh_datas->get_path( cpath, def_data );
         }
 

trunk/src/gfx/mesh_creator.cc

@@ -59 +59 @@
 void nv::mesh_nodes_creator::transform( float scale, const mat3& r33 )
 {
+        if ( !m_data ) return;
         mat3 ri33 = math::inverse( r33 );
         mat4 pre_transform ( scale * r33 );
@@ -79 +80 @@
 void nv::data_node_list_creator::transform( float scale, const mat3& r33 )
 {
+        if ( !m_data ) return;
         mat3 ri33 = math::inverse( r33 );
         mat4 pre_transform( scale * r33 );
@@ -114 +116 @@
 void nv::mesh_data_creator::transform( const vec3& pos, const mat3& r33, float scale /*= 1.0f */ )
 {
+        if ( !m_data ) return;
         vec3 vertex_offset = pos;
         mat3 vertex_transform = scale * r33;
@@ -298 +301 @@
 void nv::mesh_data_creator::rotate_quadrant( uint8 rotation )
 {
+        if ( !m_data ) return;
         if ( rotation % 4 == 0 ) return;
         NV_ASSERT( m_pos_type == FLOAT_VECTOR_3, "Unsupported position vector type!" );
@@ -350 +354 @@
 void nv::mesh_data_creator::mirror( bool x, bool z )
 {
+        if ( !m_data ) return;
         if ( !x && !z ) return;
         NV_ASSERT( m_pos_type == FLOAT_VECTOR_3, "Unsupported position vector type!" );
@@ -433 +438 @@
 void nv::mesh_data_creator::initialize()
 {
-        NV_ASSERT( m_data, "bad parameter!" );
+//      NV_ASSERT( m_data, "bad parameter!" );
         m_pos_channel = nullptr;
         m_nrm_channel = nullptr;
@@ -452 +457 @@
         m_idx_type = NONE;
 
+        if ( m_data )
         for ( uint32 c = 0; c < m_data->size(); ++c )
         {