|
@@ -141,11 +141,11 @@ void World::update(float dt)
|
|
|
(*uu)->update();
|
|
(*uu)->update();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Update scene graphs
|
|
|
|
|
- //m_scenegraph_manager.update();
|
|
|
|
|
-
|
|
|
|
|
// Update physics world
|
|
// Update physics world
|
|
|
- m_physics_world.update(dt);
|
|
|
|
|
|
|
+ m_physics_world.update();
|
|
|
|
|
+
|
|
|
|
|
+ // Update scene graphs
|
|
|
|
|
+ m_scenegraph_manager.update();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
//-----------------------------------------------------------------------------
|
|
@@ -155,12 +155,6 @@ void World::render(Camera* camera)
|
|
|
camera->m_view_width, camera->m_view_height);
|
|
camera->m_view_width, camera->m_view_height);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-//-----------------------------------------------------------------------------
|
|
|
|
|
-RenderWorld& World::render_world()
|
|
|
|
|
-{
|
|
|
|
|
- return m_render_world;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
//-----------------------------------------------------------------------------
|
|
|
CameraId World::create_camera(SceneGraph& sg, int32_t node)
|
|
CameraId World::create_camera(SceneGraph& sg, int32_t node)
|
|
|
{
|
|
{
|
|
@@ -309,6 +303,12 @@ void World::set_sound_volume(SoundId id, const float vol)
|
|
|
sound.volume = vol;
|
|
sound.volume = vol;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+//-----------------------------------------------------------------------------
|
|
|
|
|
+RenderWorld& World::render_world()
|
|
|
|
|
+{
|
|
|
|
|
+ return m_render_world;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
//-----------------------------------------------------------------------------
|
|
//-----------------------------------------------------------------------------
|
|
|
PhysicsWorld* World::physics_world()
|
|
PhysicsWorld* World::physics_world()
|
|
|
{
|
|
{
|