Sfoglia il codice sorgente

Remove Device::last_delta_time()

Daniele Bartolini 8 anni fa
parent
commit
9a52b2b014
4 ha cambiato i file con 7 aggiunte e 27 eliminazioni
  1. 0 3
      docs/lua_api.rst
  2. 7 12
      src/device/device.cpp
  3. 0 4
      src/device/device.h
  4. 0 8
      src/lua/lua_api.cpp

+ 0 - 3
docs/lua_api.rst

@@ -872,9 +872,6 @@ Device
 	Returns a string identifying the engine version.
 	The form is "major.minor.micro".
 
-**last_delta_time** () : float
-	Returns the time in seconds needed to render the last frame
-
 **quit** ()
 	Quits the application.
 

+ 7 - 12
src/device/device.cpp

@@ -209,7 +209,6 @@ Device::Device(const DeviceOptions& opts, ConsoleServer& cs)
 	, _quit(false)
 	, _paused(false)
 	, _frame_count(0)
-	, _last_delta_time(0.0f)
 	, _time_since_start(0.0)
 {
 }
@@ -439,6 +438,7 @@ void Device::run()
 
 	s64 last_time = os::clocktime();
 	s64 curr_time;
+	f32 dt = 0.0f;
 
 	while (!process_events(_boot_config.vsync) && !_quit)
 	{
@@ -446,14 +446,14 @@ void Device::run()
 		const s64 time = curr_time - last_time;
 		last_time = curr_time;
 		const f64 freq = (f64)os::clockfrequency();
-		_last_delta_time = f32(time * (1.0 / freq));
-		_time_since_start += _last_delta_time;
+		dt = f32(time * (1.0 / freq));
+		_time_since_start += dt;
 
 		profiler_globals::clear();
 		_console_server->update();
 
-		RECORD_FLOAT("device.dt", _last_delta_time);
-		RECORD_FLOAT("device.fps", 1.0f/_last_delta_time);
+		RECORD_FLOAT("device.dt", dt);
+		RECORD_FLOAT("device.fps", 1.0f/dt);
 
 		if (!_paused)
 		{
@@ -461,13 +461,13 @@ void Device::run()
 
 			{
 				const s64 t0 = os::clocktime();
-				_lua_environment->call_global("update", 1, ARGUMENT_FLOAT, last_delta_time());
+				_lua_environment->call_global("update", 1, ARGUMENT_FLOAT, dt);
 				const s64 t1 = os::clocktime();
 				RECORD_FLOAT("lua.update", f32((t1 - t0)*(1.0 / freq)));
 			}
 			{
 				const s64 t0 = os::clocktime();
-				_lua_environment->call_global("render", 1, ARGUMENT_FLOAT, last_delta_time());
+				_lua_environment->call_global("render", 1, ARGUMENT_FLOAT, dt);
 				const s64 t1 = os::clocktime();
 				RECORD_FLOAT("lua.render", f32((t1 - t0)*(1.0 / freq)));
 			}
@@ -548,11 +548,6 @@ u64 Device::frame_count() const
 	return _frame_count;
 }
 
-f32 Device::last_delta_time() const
-{
-	return _last_delta_time;
-}
-
 f64 Device::time_since_start() const
 {
 	return _time_since_start;

+ 0 - 4
src/device/device.h

@@ -62,7 +62,6 @@ struct Device
 	bool _paused;
 
 	u64 _frame_count;
-	f32 _last_delta_time;
 	f64 _time_since_start;
 
 	bool process_events(bool vsync);
@@ -83,9 +82,6 @@ public:
 	/// Return the number of frames rendered.
 	u64 frame_count() const;
 
-	/// Returns the time in seconds needed to render the last frame.
-	f32 last_delta_time() const;
-
 	/// Returns the time in seconds since the the application started.
 	f64 time_since_start() const;
 

+ 0 - 8
src/lua/lua_api.cpp

@@ -2509,13 +2509,6 @@ static int device_version(lua_State* L)
 	return 1;
 }
 
-static int device_last_delta_time(lua_State* L)
-{
-	LuaStack stack(L);
-	stack.push_float(device()->last_delta_time());
-	return 1;
-}
-
 static int device_quit(lua_State* /*L*/)
 {
 	device()->quit();
@@ -3483,7 +3476,6 @@ void load_api(LuaEnvironment& env)
 	env.add_module_function("Device", "platform",                 device_platform);
 	env.add_module_function("Device", "architecture",             device_architecture);
 	env.add_module_function("Device", "version",                  device_version);
-	env.add_module_function("Device", "last_delta_time",          device_last_delta_time);
 	env.add_module_function("Device", "quit",                     device_quit);
 	env.add_module_function("Device", "resolution",               device_resolution);
 	env.add_module_function("Device", "create_world",             device_create_world);