Various minor tweaks
This commit is contained in:
@@ -53,7 +53,7 @@ bool CreateJson::Create(const StringView& path, const StringAnsiView& data, cons
|
|||||||
{
|
{
|
||||||
if (FileSystem::CreateDirectory(directory))
|
if (FileSystem::CreateDirectory(directory))
|
||||||
{
|
{
|
||||||
LOG(Warning, "Failed to create directory");
|
LOG(Warning, "Failed to create directory '{}'", directory);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,29 +11,6 @@ String SceneInfo::ToString() const
|
|||||||
return TEXT("SceneInfo");
|
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)
|
void SceneInfo::Serialize(SerializeStream& stream, const void* otherObj)
|
||||||
{
|
{
|
||||||
SERIALIZE_GET_OTHER_OBJ(SceneInfo);
|
SERIALIZE_GET_OTHER_OBJ(SceneInfo);
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ public:
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="action">The action.</param>
|
/// <param name="action">The action.</param>
|
||||||
/// <param name="target">The target object.</param>
|
/// <param name="target">The target object.</param>
|
||||||
MainThreadActionTask(Function<void()>& action, Object* target = nullptr)
|
MainThreadActionTask(const Function<void()>& action, Object* target = nullptr)
|
||||||
: MainThreadTask()
|
: MainThreadTask()
|
||||||
, _action1(action)
|
, _action1(action)
|
||||||
, _target(target)
|
, _target(target)
|
||||||
@@ -90,7 +90,7 @@ public:
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="action">The action.</param>
|
/// <param name="action">The action.</param>
|
||||||
/// <param name="target">The target object.</param>
|
/// <param name="target">The target object.</param>
|
||||||
MainThreadActionTask(Function<bool()>& action, Object* target = nullptr)
|
MainThreadActionTask(const Function<bool()>& action, Object* target = nullptr)
|
||||||
: MainThreadTask()
|
: MainThreadTask()
|
||||||
, _action2(action)
|
, _action2(action)
|
||||||
, _target(target)
|
, _target(target)
|
||||||
|
|||||||
@@ -96,13 +96,13 @@ Task* Task::ContinueWith(const Action& action, Object* target)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
Task* Task::ContinueWith(Function<void()> action, Object* target)
|
Task* Task::ContinueWith(const Function<void()>& action, Object* target)
|
||||||
{
|
{
|
||||||
ASSERT(action.IsBinded());
|
ASSERT(action.IsBinded());
|
||||||
return ContinueWith(New<ThreadPoolActionTask>(action, target));
|
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());
|
ASSERT(action.IsBinded());
|
||||||
return ContinueWith(New<ThreadPoolActionTask>(action, target));
|
return ContinueWith(New<ThreadPoolActionTask>(action, target));
|
||||||
@@ -116,17 +116,17 @@ Task* Task::StartNew(Task* task)
|
|||||||
return 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));
|
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));
|
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));
|
return StartNew(New<ThreadPoolActionTask>(action, target));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ public:
|
|||||||
/// <param name="action">Action to run.</param>
|
/// <param name="action">Action to run.</param>
|
||||||
/// <param name="target">The action target object.</param>
|
/// <param name="target">The action target object.</param>
|
||||||
/// <returns>Enqueued task.</returns>
|
/// <returns>Enqueued task.</returns>
|
||||||
Task* ContinueWith(Function<void()> action, Object* target = nullptr);
|
Task* ContinueWith(const Function<void()>& action, Object* target = nullptr);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Continues that task execution with a given action (will spawn new async action).
|
/// 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="action">Action to run.</param>
|
||||||
/// <param name="target">The action target object.</param>
|
/// <param name="target">The action target object.</param>
|
||||||
/// <returns>Enqueued task.</returns>
|
/// <returns>Enqueued task.</returns>
|
||||||
Task* ContinueWith(Function<bool()> action, Object* target = nullptr);
|
Task* ContinueWith(const Function<bool()>& action, Object* target = nullptr);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@@ -246,7 +246,7 @@ public:
|
|||||||
/// <param name="action">The action.</param>
|
/// <param name="action">The action.</param>
|
||||||
/// <param name="target">The action target object.</param>
|
/// <param name="target">The action target object.</param>
|
||||||
/// <returns>Task</returns>
|
/// <returns>Task</returns>
|
||||||
static Task* StartNew(Function<void()>& action, Object* target = nullptr);
|
static Task* StartNew(const Function<void()>& action, Object* target = nullptr);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Starts the new task.
|
/// Starts the new task.
|
||||||
@@ -275,7 +275,7 @@ public:
|
|||||||
/// <param name="action">The action.</param>
|
/// <param name="action">The action.</param>
|
||||||
/// <param name="target">The action target object.</param>
|
/// <param name="target">The action target object.</param>
|
||||||
/// <returns>Task</returns>
|
/// <returns>Task</returns>
|
||||||
static Task* StartNew(Function<bool()>& action, Object* target = nullptr);
|
static Task* StartNew(const Function<bool()>& action, Object* target = nullptr);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Starts the new task.
|
/// Starts the new task.
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public:
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="action">The action.</param>
|
/// <param name="action">The action.</param>
|
||||||
/// <param name="target">The target object.</param>
|
/// <param name="target">The target object.</param>
|
||||||
ThreadPoolActionTask(Function<void()>& action, Object* target = nullptr)
|
ThreadPoolActionTask(const Function<void()>& action, Object* target = nullptr)
|
||||||
: ThreadPoolTask()
|
: ThreadPoolTask()
|
||||||
, _action1(action)
|
, _action1(action)
|
||||||
, _target(target)
|
, _target(target)
|
||||||
@@ -79,7 +79,7 @@ public:
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="action">The action.</param>
|
/// <param name="action">The action.</param>
|
||||||
/// <param name="target">The target object.</param>
|
/// <param name="target">The target object.</param>
|
||||||
ThreadPoolActionTask(Function<bool()>& action, Object* target = nullptr)
|
ThreadPoolActionTask(const Function<bool()>& action, Object* target = nullptr)
|
||||||
: ThreadPoolTask()
|
: ThreadPoolTask()
|
||||||
, _action2(action)
|
, _action2(action)
|
||||||
, _target(target)
|
, _target(target)
|
||||||
|
|||||||
Reference in New Issue
Block a user