Changeset 527 for trunk/src

Timestamp:

11/03/16 00:51:07 (9 years ago)

Author:

epyon

Message:

• physics update

Location:

trunk/src

Files:

• bullet/bullet_world.cc (modified) (1 diff)
• engine/model_manager.cc (modified) (1 diff)

trunk/src/bullet/bullet_world.cc

@@ -88 +88 @@
 {
         return collision_shape{ ( void* )new btCapsuleShape( radius, height ) };
+}
+
+nv::collision_shape nv::bullet_world::create_cylinder( const vec3& half_extents )
+{
+        return collision_shape{ ( void* )new btCylinderShape( n2b( half_extents ) ) };
 }
 

trunk/src/engine/model_manager.cc

@@ -85 +85 @@
         }
 
+        if ( table.has_field( "phx_hextents" ) )
+                node->phx_hextents = table.get<vec3>( "phx_hextents", vec3() );
+        if ( table.has_field( "phx_offset" ) )
+                node->phx_offset = table.get<vec3>( "phx_offset", vec3() );
+        if ( table.has_field( "phx_mass" ) )
+                node->phx_mass = table.get<float>( "phx_mass", 0.0f);
+        if ( table.has_field( "phx_mass" ) )
+                node->phx_shape = nv::phx_shape( table.get<int>( "phx_shape", 0 ) );
+
         if ( table.has_field( "local_position" ) )
                 node->local.set_position( table.get<vec3>( "local_position", vec3() ) );