Changeset 520 for trunk/src/engine/default_resource_manager.cc

Timestamp:

10/03/16 17:45:46 (9 years ago)

Author:

epyon

Message:

• ecs updates
• animation updates
• ragdoll manager
• lua has own random engine
• several minor fixes
• particle engine/particle group
• shitload of other stuff
• bullet world

File:

• trunk/src/engine/default_resource_manager.cc (modified) (2 diffs)

trunk/src/engine/default_resource_manager.cc

@@ -11 +11 @@
 default_resource_manager::default_resource_manager( context* context, bool clear_material_paths )
 {
-        m_images        = register_resource_handler< image_data >( new image_manager );
-        m_meshes        = register_resource_handler< data_channel_set >( new mesh_manager );
-        m_binds         = register_resource_handler< animator_bind_data >( new animator_bind_manager );
-        m_animators     = register_resource_handler< animator_data >( new animator_manager );
-        m_materials     = register_resource_handler< material >( new material_manager( clear_material_paths ) );
-        m_programs      = register_resource_handler< program >( new program_manager( context ) );
-        m_gpu_meshes    = register_resource_handler< gpu_mesh >( new gpu_mesh_manager( context, m_meshes ) );
-        m_mesh_datas    = register_resource_handler< mesh_data >( new mesh_data_manager( m_meshes ) );
+        m_images = register_resource_handler< image_data >( new image_manager );
+        m_meshes = register_resource_handler< data_channel_set >( new mesh_manager );
+        m_binds = register_resource_handler< animator_bind_data >( new animator_bind_manager );
+        m_animators = register_resource_handler< animator_data >( new animator_manager );
+        m_materials = register_resource_handler< material >( new material_manager( clear_material_paths ) );
+        m_programs = register_resource_handler< program >( new program_manager( context ) );
+        m_gpu_meshes = register_resource_handler< gpu_mesh >( new gpu_mesh_manager( context, m_meshes ) );
+        m_mesh_datas = register_resource_handler< mesh_data >( new mesh_data_manager( m_meshes ) );
         m_gpu_materials = register_resource_handler< gpu_material >( new gpu_material_manager( context, m_materials, m_images ) );
-        m_models        = register_resource_handler< model >( new model_manager( this, m_binds, m_mesh_datas ) );
-        m_particles     = register_resource_handler< particle_system_data >( new particle_manager );
+        m_models = register_resource_handler< model >( new model_manager( this, m_binds, m_mesh_datas ) );
+        m_particles = register_resource_handler< particle_system_data >( new particle_manager );
+        m_ragdolls = register_resource_handler< ragdoll_data >( new ragdoll_manager( m_models ) );
 }
 
-void default_resource_manager::initialize( lua::state* lua )
+void default_resource_manager::initialize( lua::state* lua, physics_world* world )
 {
         m_lua = lua;
@@ -72 +73 @@
         m_models->initialize( lua );
         m_particles->initialize( lua );
+        m_ragdolls->initialize( lua );
+        m_ragdolls->initialize( world );
 }