celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-09 20:08:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

can now load models through model panel

Browse Source
This commit is contained in:
a.pilote
2022-07-16 15:29:03 -04:00
parent de3434703d
commit 7d9e5b07b5
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Editor/src/ComponentsPanel/MeshPanel.h
View File

@@ -4,6 +4,7 @@
#include <src/Scene/Components/MeshComponent.h>
#include <src/Resource/ResourceLoader.h>
#include <src/Core/String.h>
class MeshPanel : ComponentPanel {
@@ -32,8 +33,15 @@ public:
std::string fullPath = std::string(file, 256);
fullPath = Nuake::FileSystem::AbsoluteToRelative(fullPath);
//component.ModelPath = path;
//component.LoadModel();
if (Nuake::String::EndsWith(fullPath, ".model"))
{
}
else
{
component.ModelPath = fullPath;
component.LoadModel();
}
}
ImGui::EndDragDropTarget();
}

2
Editor/src/Windows/EditorSelectionPanel.cpp
View File

@@ -28,7 +28,7 @@ void EditorSelectionPanel::ResolveFile(Ref<Nuake::File> file)
if (currentFile->GetExtension() == ".material")
{
Ref<Material> material = ResourceLoader::LoadResource(currentFile->GetRelativePath());
Ref<Material> material = ResourceLoader::LoadMaterial(currentFile->GetRelativePath());
selectedResource = material;
}
}