Skip to content

Commit

Permalink
(Icon) Fixed icon.
Browse files Browse the repository at this point in the history
  • Loading branch information
innerviewer committed Apr 5, 2024
1 parent 4fd8e77 commit 97949f4
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Engine/Core/libs/Audio/src/Audio/Types/AudioSource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ namespace SR_AUDIO_NS {
}

void AudioSource::OnEnable() {
if (!m_path.Empty()) {
if (!m_path.IsEmpty()) {
m_handle = SoundManager::Instance().Play(m_path.ToString(),m_params);
}
Component::OnEnable();
Expand Down
2 changes: 1 addition & 1 deletion Engine/Core/libs/Physics/src/Physics/PhysicsMaterial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace SR_PTYPES_NS {
}

PhysicsMaterial* PhysicsMaterial::Load(const SR_UTILS_NS::Path& rawPath) {
if (rawPath.Empty()) {
if (rawPath.IsEmpty()) {
SRHalt("PhysicsMaterial::Load() : path is empty!");
return nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion Engine/Core/src/Core/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ namespace SR_CORE_NS {

SR_SYSTEM_LOG("Application::Init() : initializing application...");

if (m_resourcesPath.Empty()) {
if (m_resourcesPath.IsEmpty()) {
SR_ERROR("Application::Init() : resources path is empty!");
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions Engine/Core/src/Core/GUI/ComponentDrawer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace SR_CORE_NS::GUI {
if (path.Exists()) {
pBehaviour->SetRawBehaviour(path);
}
else if (!path.Empty()) {
else if (!path.IsEmpty()) {
SR_WARN("ComponentDrawer::DrawComponent() : behaviour is not found!\n\tPath: " + path.ToString());
}
}
Expand All @@ -96,7 +96,7 @@ namespace SR_CORE_NS::GUI {
path = pBehaviour->GetRawBehaviour()->GetResourcePath();
}

if (SR_GRAPH_GUI_NS::Button(path.ToStringRef(), index) && !path.Empty()) {
if (SR_GRAPH_GUI_NS::Button(path.ToStringRef(), index) && !path.IsEmpty()) {
auto&& resourceDirectory = SR_UTILS_NS::ResourceManager::Instance().GetResPath();
auto&& scriptPath = resourceDirectory.Concat(path);
if (!scriptPath.IsEmpty()) {
Expand Down
10 changes: 5 additions & 5 deletions Engine/Core/src/Core/GUI/EditorGUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ namespace SR_CORE_GUI_NS {
return;
}

if (scenePath.Empty()) {
if (scenePath.IsEmpty()) {
return;
}

Expand All @@ -398,7 +398,7 @@ namespace SR_CORE_GUI_NS {
auto&& marshal = SR_HTYPES_NS::Marshal::Load(m_cachedScenePath);
SR_UTILS_NS::Path scenePath = marshal.Read<std::string>();

if (scenePath.Empty()) {
if (scenePath.IsEmpty()) {
return false;
}

Expand Down Expand Up @@ -490,7 +490,7 @@ namespace SR_CORE_GUI_NS {
if (ImGui::MenuItem("Load")) {
auto&& scenesPath = SR_UTILS_NS::ResourceManager::Instance().GetResPath();

if (auto&& path = SR_UTILS_NS::FileDialog::Instance().OpenDialog(scenesPath.ToString(), { { "Scene", "scene,prefab" } }); !path.Empty()) {
if (auto&& path = SR_UTILS_NS::FileDialog::Instance().OpenDialog(scenesPath.ToString(), { { "Scene", "scene,prefab" } }); !path.IsEmpty()) {
path = path.RemoveSubPath(SR_UTILS_NS::ResourceManager::Instance().GetCachePath());
path = path.RemoveSubPath(SR_UTILS_NS::ResourceManager::Instance().GetResPath());

Expand Down Expand Up @@ -527,7 +527,7 @@ namespace SR_CORE_GUI_NS {
{
const auto scenesPath = SR_UTILS_NS::ResourceManager::Instance().GetResPath();

if (auto&& path = SR_UTILS_NS::FileDialog::Instance().SaveDialog(scenesPath.ToString(), { { "Scene", "scene,prefab" } }); !path.Empty())
if (auto&& path = SR_UTILS_NS::FileDialog::Instance().SaveDialog(scenesPath.ToString(), { { "Scene", "scene,prefab" } }); !path.IsEmpty())
{
path = path.RemoveSubPath(SR_UTILS_NS::ResourceManager::Instance().GetCachePath());
path = path.RemoveSubPath(SR_UTILS_NS::ResourceManager::Instance().GetResPath());
Expand Down Expand Up @@ -595,7 +595,7 @@ namespace SR_CORE_GUI_NS {
if (ImGui::MenuItem("Instance from file")) {
if (auto&& pScene = m_engine->GetScene(); pScene.RecursiveLockIfValid()) {
auto&& resourcesPath = SR_UTILS_NS::ResourceManager::Instance().GetResPath();
if (auto path = SR_UTILS_NS::FileDialog::Instance().OpenDialog(resourcesPath.ToString(), { { "Any model", "prefab,pmx,fbx,obj,blend,dae,abc,stl,ply,glb,gltf,x3d,sfg,bvh,3ds,gltf" } }); !path.Empty()) {
if (auto path = SR_UTILS_NS::FileDialog::Instance().OpenDialog(resourcesPath.ToString(), { { "Any model", "prefab,pmx,fbx,obj,blend,dae,abc,stl,ply,glb,gltf,x3d,sfg,bvh,3ds,gltf" } }); !path.IsEmpty()) {
/// TODO:Сделать обратимость
pScene->InstanceFromFile(path);
}
Expand Down
2 changes: 1 addition & 1 deletion Engine/Core/src/Core/GUI/PropertyDrawer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ namespace SR_CORE_GUI_NS {
auto&& resourcesFolder = SR_UTILS_NS::ResourceManager::Instance().GetResPath();
auto&& path = SR_UTILS_NS::FileDialog::Instance().OpenDialog(resourcesFolder, pProperty->GetFileFilter());

if (!path.Empty()) {
if (!path.IsEmpty()) {
pProperty->SetPath(path);
}
}
Expand Down
Binary file modified Resources/Engine/Textures/icon.ico
Binary file not shown.

0 comments on commit 97949f4

Please sign in to comment.