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

Various minor tweaks

Browse Source
This commit is contained in:
Wojtek Figat
2023-12-03 14:09:23 +01:00
parent 1843689a88
commit d6dc1f9998
6 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/ContentImporters/CreateJson.cpp
View File

@@ -53,7 +53,7 @@ bool CreateJson::Create(const StringView& path, const StringAnsiView& data, cons
{
if (FileSystem::CreateDirectory(directory))
{
LOG(Warning, "Failed to create directory");
LOG(Warning, "Failed to create directory '{}'", directory);
return true;
}
}

23
Source/Engine/Level/SceneInfo.cpp
View File

@@ -11,29 +11,6 @@ String SceneInfo::ToString() const
return TEXT("SceneInfo");
}
const int32 lightmapAtlasSizes[] =
{
32,
64,
128,
256,
512,
1024,
2048,
4096
};
DECLARE_ENUM_8(LightmapAtlasSize, _32, _64, _128, _256, _512, _1024, _2048, _4096);
LightmapAtlasSize getLightmapAtlasSize(int32 size)
{
for (int32 i = 0; i < LightmapAtlasSize_Count; i++)
{
if (lightmapAtlasSizes[i] == size)
return (LightmapAtlasSize)i;
}
return LightmapAtlasSize::_1024;
}
void SceneInfo::Serialize(SerializeStream& stream, const void* otherObj)
{
SERIALIZE_GET_OTHER_OBJ(SceneInfo);

4
Source/Engine/Threading/MainThreadTask.h
View File

@@ -66,7 +66,7 @@ public:
/// </summary>
/// <param name="action">The action.</param>
/// <param name="target">The target object.</param>
MainThreadActionTask(Function<void()>& action, Object* target = nullptr)
MainThreadActionTask(const Function<void()>& action, Object* target = nullptr)
: MainThreadTask()
, _action1(action)
, _target(target)
@@ -90,7 +90,7 @@ public:
/// </summary>
/// <param name="action">The action.</param>
/// <param name="target">The target object.</param>
MainThreadActionTask(Function<bool()>& action, Object* target = nullptr)
MainThreadActionTask(const Function<bool()>& action, Object* target = nullptr)
: MainThreadTask()
, _action2(action)
, _target(target)

10
Source/Engine/Threading/Task.cpp
View File

@@ -96,13 +96,13 @@ Task* Task::ContinueWith(const Action& action, Object* target)
return result;
}
Task* Task::ContinueWith(Function<void()> action, Object* target)
Task* Task::ContinueWith(const Function<void()>& action, Object* target)
{
ASSERT(action.IsBinded());
return ContinueWith(New<ThreadPoolActionTask>(action, target));
}
Task* Task::ContinueWith(Function<bool()> action, Object* target)
Task* Task::ContinueWith(const Function<bool()>& action, Object* target)
{
ASSERT(action.IsBinded());
return ContinueWith(New<ThreadPoolActionTask>(action, target));
@@ -116,17 +116,17 @@ Task* Task::StartNew(Task* task)
return task;
}
Task* Task::StartNew(Function<void()>& action, Object* target)
Task* Task::StartNew(const Function<void()>& action, Object* target)
{
return StartNew(New<ThreadPoolActionTask>(action, target));
}
Task* Task::StartNew(Function<void()>::Signature action, Object* target)
Task* Task::StartNew(const Function<void()>::Signature action, Object* target)
{
return StartNew(New<ThreadPoolActionTask>(action, target));
}
Task* Task::StartNew(Function<bool()>& action, Object* target)
Task* Task::StartNew(const Function<bool()>& action, Object* target)
{
return StartNew(New<ThreadPoolActionTask>(action, target));
}

8
Source/Engine/Threading/Task.h
View File

@@ -221,7 +221,7 @@ public:
/// <param name="action">Action to run.</param>
/// <param name="target">The action target object.</param>
/// <returns>Enqueued task.</returns>
Task* ContinueWith(Function<void()> action, Object* target = nullptr);
Task* ContinueWith(const Function<void()>& action, Object* target = nullptr);
/// <summary>
/// Continues that task execution with a given action (will spawn new async action).
@@ -229,7 +229,7 @@ public:
/// <param name="action">Action to run.</param>
/// <param name="target">The action target object.</param>
/// <returns>Enqueued task.</returns>
Task* ContinueWith(Function<bool()> action, Object* target = nullptr);
Task* ContinueWith(const Function<bool()>& action, Object* target = nullptr);
public:
@@ -246,7 +246,7 @@ public:
/// <param name="action">The action.</param>
/// <param name="target">The action target object.</param>
/// <returns>Task</returns>
static Task* StartNew(Function<void()>& action, Object* target = nullptr);
static Task* StartNew(const Function<void()>& action, Object* target = nullptr);
/// <summary>
/// Starts the new task.
@@ -275,7 +275,7 @@ public:
/// <param name="action">The action.</param>
/// <param name="target">The action target object.</param>
/// <returns>Task</returns>
static Task* StartNew(Function<bool()>& action, Object* target = nullptr);
static Task* StartNew(const Function<bool()>& action, Object* target = nullptr);
/// <summary>
/// Starts the new task.

4
Source/Engine/Threading/ThreadPoolTask.h
View File

@@ -55,7 +55,7 @@ public:
/// </summary>
/// <param name="action">The action.</param>
/// <param name="target">The target object.</param>
ThreadPoolActionTask(Function<void()>& action, Object* target = nullptr)
ThreadPoolActionTask(const Function<void()>& action, Object* target = nullptr)
: ThreadPoolTask()
, _action1(action)
, _target(target)
@@ -79,7 +79,7 @@ public:
/// </summary>
/// <param name="action">The action.</param>
/// <param name="target">The target object.</param>
ThreadPoolActionTask(Function<bool()>& action, Object* target = nullptr)
ThreadPoolActionTask(const Function<bool()>& action, Object* target = nullptr)
: ThreadPoolTask()
, _action2(action)
, _target(target)