feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -1,4 +1,5 @@
|
|||
#!/usr/bin/env python
|
||||
from misc.utility.scons_hints import *
|
||||
|
||||
Import("env")
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -299,17 +299,6 @@ int64_t MainTimerSync::DeltaSmoother::smooth_delta(int64_t p_delta) {
|
|||
// before advance_core considers changing the physics_steps return from
|
||||
// the typical values as defined by typical_physics_steps
|
||||
double MainTimerSync::get_physics_jitter_fix() {
|
||||
// Turn off jitter fix when using fixed timestep interpolation.
|
||||
// Note this shouldn't be on UNTIL 3d interpolation is implemented,
|
||||
// otherwise we will get people making 3d games with the physics_interpolation
|
||||
// set to on getting jitter fix disabled unexpectedly.
|
||||
#if 0
|
||||
if (Engine::get_singleton()->is_physics_interpolation_enabled()) {
|
||||
// Would be better to write a simple bypass for jitter fix but this will do to get started.
|
||||
return 0.0;
|
||||
}
|
||||
#endif
|
||||
|
||||
return Engine::get_singleton()->get_physics_jitter_fix();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -91,6 +91,12 @@ void Performance::_bind_methods() {
|
|||
BIND_ENUM_CONSTANT(NAVIGATION_EDGE_MERGE_COUNT);
|
||||
BIND_ENUM_CONSTANT(NAVIGATION_EDGE_CONNECTION_COUNT);
|
||||
BIND_ENUM_CONSTANT(NAVIGATION_EDGE_FREE_COUNT);
|
||||
BIND_ENUM_CONSTANT(NAVIGATION_OBSTACLE_COUNT);
|
||||
BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_CANVAS);
|
||||
BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_MESH);
|
||||
BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_SURFACE);
|
||||
BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_DRAW);
|
||||
BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_SPECIALIZATION);
|
||||
BIND_ENUM_CONSTANT(MONITOR_MAX);
|
||||
}
|
||||
|
||||
|
|
@ -126,11 +132,9 @@ String Performance::get_monitor_name(Monitor p_monitor) const {
|
|||
PNAME("physics_2d/active_objects"),
|
||||
PNAME("physics_2d/collision_pairs"),
|
||||
PNAME("physics_2d/islands"),
|
||||
#ifndef _3D_DISABLED
|
||||
PNAME("physics_3d/active_objects"),
|
||||
PNAME("physics_3d/collision_pairs"),
|
||||
PNAME("physics_3d/islands"),
|
||||
#endif // _3D_DISABLED
|
||||
PNAME("audio/driver/output_latency"),
|
||||
PNAME("navigation/active_maps"),
|
||||
PNAME("navigation/regions"),
|
||||
|
|
@ -141,8 +145,14 @@ String Performance::get_monitor_name(Monitor p_monitor) const {
|
|||
PNAME("navigation/edges_merged"),
|
||||
PNAME("navigation/edges_connected"),
|
||||
PNAME("navigation/edges_free"),
|
||||
|
||||
PNAME("navigation/obstacles"),
|
||||
PNAME("pipeline/compilations_canvas"),
|
||||
PNAME("pipeline/compilations_mesh"),
|
||||
PNAME("pipeline/compilations_surface"),
|
||||
PNAME("pipeline/compilations_draw"),
|
||||
PNAME("pipeline/compilations_specialization"),
|
||||
};
|
||||
static_assert((sizeof(names) / sizeof(const char *)) == MONITOR_MAX);
|
||||
|
||||
return names[p_monitor];
|
||||
}
|
||||
|
|
@ -183,6 +193,16 @@ double Performance::get_monitor(Monitor p_monitor) const {
|
|||
return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_TEXTURE_MEM_USED);
|
||||
case RENDER_BUFFER_MEM_USED:
|
||||
return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_BUFFER_MEM_USED);
|
||||
case PIPELINE_COMPILATIONS_CANVAS:
|
||||
return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_CANVAS);
|
||||
case PIPELINE_COMPILATIONS_MESH:
|
||||
return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_MESH);
|
||||
case PIPELINE_COMPILATIONS_SURFACE:
|
||||
return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_SURFACE);
|
||||
case PIPELINE_COMPILATIONS_DRAW:
|
||||
return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW);
|
||||
case PIPELINE_COMPILATIONS_SPECIALIZATION:
|
||||
return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION);
|
||||
case PHYSICS_2D_ACTIVE_OBJECTS:
|
||||
return PhysicsServer2D::get_singleton()->get_process_info(PhysicsServer2D::INFO_ACTIVE_OBJECTS);
|
||||
case PHYSICS_2D_COLLISION_PAIRS:
|
||||
|
|
@ -225,6 +245,8 @@ double Performance::get_monitor(Monitor p_monitor) const {
|
|||
return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_CONNECTION_COUNT);
|
||||
case NAVIGATION_EDGE_FREE_COUNT:
|
||||
return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_FREE_COUNT);
|
||||
case NAVIGATION_OBSTACLE_COUNT:
|
||||
return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_OBSTACLE_COUNT);
|
||||
|
||||
default: {
|
||||
}
|
||||
|
|
@ -257,11 +279,9 @@ Performance::MonitorType Performance::get_monitor_type(Monitor p_monitor) const
|
|||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
#ifndef _3D_DISABLED
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
#endif // _3D_DISABLED
|
||||
MONITOR_TYPE_TIME,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
|
|
@ -272,8 +292,15 @@ Performance::MonitorType Performance::get_monitor_type(Monitor p_monitor) const
|
|||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
MONITOR_TYPE_QUANTITY,
|
||||
|
||||
};
|
||||
static_assert((sizeof(types) / sizeof(MonitorType)) == MONITOR_MAX);
|
||||
|
||||
return types[p_monitor];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,6 +100,12 @@ public:
|
|||
NAVIGATION_EDGE_MERGE_COUNT,
|
||||
NAVIGATION_EDGE_CONNECTION_COUNT,
|
||||
NAVIGATION_EDGE_FREE_COUNT,
|
||||
NAVIGATION_OBSTACLE_COUNT,
|
||||
PIPELINE_COMPILATIONS_CANVAS,
|
||||
PIPELINE_COMPILATIONS_MESH,
|
||||
PIPELINE_COMPILATIONS_SURFACE,
|
||||
PIPELINE_COMPILATIONS_DRAW,
|
||||
PIPELINE_COMPILATIONS_SPECIALIZATION,
|
||||
MONITOR_MAX
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -92,14 +92,14 @@ SteamTracker::SteamTracker() {
|
|||
|
||||
if (steam_init_flat_function) {
|
||||
char err_msg[1024] = {};
|
||||
steam_initalized = (steam_init_flat_function(&err_msg[0]) == SteamAPIInitResult_OK);
|
||||
steam_initialized = (steam_init_flat_function(&err_msg[0]) == SteamAPIInitResult_OK);
|
||||
} else if (steam_init_function) {
|
||||
steam_initalized = steam_init_function();
|
||||
steam_initialized = steam_init_function();
|
||||
}
|
||||
}
|
||||
|
||||
SteamTracker::~SteamTracker() {
|
||||
if (steam_shutdown_function && steam_initalized) {
|
||||
if (steam_shutdown_function && steam_initialized) {
|
||||
steam_shutdown_function();
|
||||
}
|
||||
if (steam_library_handle) {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class SteamTracker {
|
|||
SteamAPI_InitFunction steam_init_function = nullptr;
|
||||
SteamAPI_InitFlatFunction steam_init_flat_function = nullptr;
|
||||
SteamAPI_ShutdownFunction steam_shutdown_function = nullptr;
|
||||
bool steam_initalized = false;
|
||||
bool steam_initialized = false;
|
||||
|
||||
public:
|
||||
SteamTracker();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue