Changeset 525 for trunk

Timestamp:

10/28/16 22:33:56 (9 years ago)

Author:

epyon

Message:

• its true, I tell you

Location:

trunk

Files:

• nv/bullet/bullet_world.hh (modified) (1 diff)
• nv/engine/model_manager.hh (modified) (3 diffs)
• nv/interface/context.hh (modified) (1 diff)
• nv/interface/physics_world.hh (modified) (1 diff)
• src/bullet/bullet_world.cc (modified) (2 diffs)

trunk/nv/bullet/bullet_world.hh

@@ -29 +29 @@
                 virtual collision_shape create_box( const vec3& half_extens );
                 virtual collision_shape create_static_plane( const vec3& norm, float cst );
-                virtual collision_shape create_mesh( array_view< vec3 > vtx, array_view< int > idx );
+                virtual collision_shape create_mesh( array_view< vec3 > vtx, array_view< uint32 > idx );
                 virtual rigid_body create_rigid_body( float mass, const transform& tr, collision_shape shape, const vec3& com_offset = vec3() );
                 virtual constraint create_hinge_constraint( rigid_body a, const transform& ta, rigid_body b, const transform& tb, const vec2& low_high, const vec3& params = vec3( 0.9f, 0.3f, 1.0f ) );

trunk/nv/engine/model_manager.hh

@@ -85 +85 @@
                 resource< animator_data >      animator;
                 resource< animator_bind_data > bind_data;
+                resource< data_channel_set >   phx_mesh;
                 // TODO: change to resource
                 string32                       ragdoll_id;
@@ -106 +107 @@
         {
                 flat_model_element             elements[32];
+                resource< data_channel_set >   phx_mesh;
                 uint32                         count;
                 shash64                        attach;
@@ -160 +162 @@
                         result.flags = m->flags;
                         result.count = 0;
+                        result.phx_mesh = m->phx_mesh;
                         flatten( result, m, rng, control, transform(), -1, map, gen_flags, 0, select );
                         return result;

trunk/nv/interface/context.hh

@@ -261 +261 @@
                 vertex_array create_vertex_array( const VTX* v, size_t vcount, const IDX* i, size_t icount, buffer_hint hint )
                 {
-                        buffer       vb = create_buffer( VERTEX_BUFFER, hint, count * sizeof( VTX ), v );
-                        buffer       ib = create_buffer( INDEX_BUFFER, hint, icount * sizeof( IDX ), i );
+                        buffer       vb = this->create_buffer( VERTEX_BUFFER, hint, count * sizeof( VTX ), v );
+                        buffer       ib = this->create_buffer( INDEX_BUFFER, hint, icount * sizeof( IDX ), i );
                         vertex_array_desc desc;
                         desc.add_vertex_buffers< VTX >( vb, true );

trunk/nv/interface/physics_world.hh

@@ -68 +68 @@
         public:
                 virtual int step_simulation( float dtime, int max_sub_steps = 1, float fixed_time_step = 1.0f / 60.0f ) = 0;
-                virtual collision_shape create_mesh( array_view< vec3 > vtx, array_view< int > idx ) = 0;
+                virtual collision_shape create_mesh( array_view< vec3 > vtx, array_view< uint32 > idx ) = 0;
                 virtual collision_shape create_sphere( float radius ) = 0;
                 virtual collision_shape create_capsule( float radius, float height ) = 0;

trunk/src/bullet/bullet_world.cc

@@ -121 +121 @@
 }
 
-nv::collision_shape nv::bullet_world::create_mesh( array_view< vec3 > vtx, array_view< int > idx )
+nv::collision_shape nv::bullet_world::create_mesh( array_view< vec3 > vtx, array_view< uint32 > idx )
 {
         btTriangleMesh* mesh = new btTriangleMesh;
@@ -274 +274 @@
 {
         if ( !sh.internal ) return;
-        if ( sh.mesh );
+        if ( sh.mesh )
         {
                 btStridingMeshInterface* smi = static_cast<btStridingMeshInterface*>( sh.mesh );