mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-18 21:06:00 +01:00
Merge branch 'master' into feat/renderers-cleanup
This commit is contained in:
@@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
#include "simulation/simulation.h"
|
||||
#include "simulation/simulationtime.h"
|
||||
#include "simulation/simulationenvironment.h"
|
||||
#include "simulation/simulationtest.h"
|
||||
#include "scene/scene.h"
|
||||
#include "rendering/lightarray.h"
|
||||
#include "rendering/particles.h"
|
||||
@@ -317,6 +318,11 @@ bool driver_mode::update()
|
||||
Timer::subsystem.sim_lights.start();
|
||||
simulation::Lights.update();
|
||||
Timer::subsystem.sim_lights.stop();
|
||||
|
||||
if (Global.test.enabled && simulation::is_ready)
|
||||
{
|
||||
simulation::test().update(deltatime);
|
||||
}
|
||||
}
|
||||
|
||||
// render time routines follow:
|
||||
@@ -507,6 +513,13 @@ void driver_mode::enter()
|
||||
|
||||
Timer::ResetTimers();
|
||||
|
||||
if (Global.test.enabled)
|
||||
{
|
||||
// the test runs as fast as it can compute, in steps of fixed length, so that runs on different machines agree
|
||||
Timer::set_fixed_step(simulation::test_manager::frame_step);
|
||||
simulation::test().start();
|
||||
}
|
||||
|
||||
set_picking(!Global.captureonstart);
|
||||
|
||||
m_editorpending = Global.editor_session;
|
||||
|
||||
Reference in New Issue
Block a user