GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into sdl_platform

Browse Source
This commit is contained in:
Ari Vuollet
2025-06-02 18:15:16 +03:00
parent 5e8fdf879d fa89e710d8
commit b1fd86e6b5
124 changed files with 1244 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Engine/Engine/Engine.cpp
View File

@@ -443,6 +443,15 @@ bool Engine::IsEditor()
#endif
}
bool Engine::IsPlayMode()
{
#if USE_EDITOR
return Editor::IsPlayMode;
#else
return true;
#endif
}
int32 Engine::GetFramesPerSecond()
{
return EngineImpl::Fps;

5
Source/Engine/Engine/Engine.h
View File

@@ -178,6 +178,11 @@ public:
/// </summary>
API_PROPERTY() static bool IsEditor();
/// <summary>
/// Returns whether the editor is in play mode or will always return true in a shipped applications.
/// </summary>
API_PROPERTY() static bool IsPlayMode();
/// <summary>
/// Gets the amount of frames rendered during last second known as Frames Per Second. User scripts updates or fixed updates for physics may run at a different frequency than scene rendering. Use this property to get an accurate amount of frames rendered during the last second.
/// </summary>

35
Source/Engine/Engine/EngineService.cpp
View File

@@ -37,6 +37,21 @@ DEFINE_ENGINE_SERVICE_EVENT(LateFixedUpdate);
DEFINE_ENGINE_SERVICE_EVENT(Draw);
DEFINE_ENGINE_SERVICE_EVENT_INVERTED(BeforeExit);
#if TRACY_ENABLE
StringView FillEventNameBuffer(Char* buffer, StringView name, StringView postfix)
{
int32 size = 0;
for (int32 j = 0; j < name.Length(); j++)
if (name[j] != ' ')
buffer[size++] = name[j];
Platform::MemoryCopy(buffer + size, postfix.Get(), (postfix.Length() + 1) * sizeof(Char));
size += postfix.Length();
return StringView(buffer, size);
}
#endif
EngineService::EngineServicesArray& EngineService::GetServices()
{
static EngineServicesArray Services;
@@ -78,14 +93,9 @@ void EngineService::OnInit()
const StringView name(service->Name);
#if TRACY_ENABLE
ZoneScoped;
int32 nameBufferLength = 0;
Char nameBuffer[100];
for (int32 j = 0; j < name.Length(); j++)
if (name[j] != ' ')
nameBuffer[nameBufferLength++] = name[j];
Platform::MemoryCopy(nameBuffer + nameBufferLength, TEXT("::Init"), 7 * sizeof(Char));
nameBufferLength += 7;
ZoneName(nameBuffer, nameBufferLength);
StringView zoneName = FillEventNameBuffer(nameBuffer, name, StringView(TEXT("::Init"), 6));
ZoneName(zoneName.Get(), zoneName.Length());
#endif
LOG(Info, "Initialize {0}...", name);
service->IsInitialized = true;
@@ -114,15 +124,10 @@ void EngineService::OnDispose()
{
#if TRACY_ENABLE
ZoneScoped;
const StringView name(service->Name);
int32 nameBufferLength = 0;
Char nameBuffer[100];
for (int32 j = 0; j < name.Length(); j++)
if (name[j] != ' ')
nameBuffer[nameBufferLength++] = name[j];
Platform::MemoryCopy(nameBuffer + nameBufferLength, TEXT("::Dispose"), 10 * sizeof(Char));
nameBufferLength += 10;
ZoneName(nameBuffer, nameBufferLength);
const StringView name(service->Name);
StringView zoneName = FillEventNameBuffer(nameBuffer, name, StringView(TEXT("::Dispose"), 9));
ZoneName(zoneName.Get(), zoneName.Length());
#endif
service->IsInitialized = false;
service->Dispose();