celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-01-04 22:10:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Now instancing prefab from trenchbroom correctly

Browse Source
This commit is contained in:
antopilo
2024-12-01 13:49:06 -05:00
parent 5b4d6d915a
commit 82459a6e4c
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Nuake/src/FileSystem/FileSystem.cpp
View File

@@ -69,7 +69,7 @@ std::vector<Ref<File>> FileSystem::GetAllFiles(const FileType fileType)
std::vector<Ref<File>> foundFiles;
std::function<void(Ref<Directory>)> scanDir;
scanDir = [scanDir, &foundFiles, fileType](Ref<Directory> dir)
scanDir = [&scanDir, &foundFiles, &fileType](Ref<Directory> dir)
{
// All the files matching the filetype
for (auto& f : dir->Files)

2
Nuake/src/Resource/Project.cpp
View File

@@ -224,7 +224,7 @@ namespace Nuake
FGDPointEntity pointEntity = FGDPointEntity(name);
pointEntity.Description = "A Prefab entity";
pointEntity.Prefab = p->GetRelativePath();
file->PointEntities.push_back(pointEntity);
}

27
Nuake/src/Scene/Systems/QuakeMapBuilder.cpp
View File

@@ -211,22 +211,23 @@ namespace Nuake {
}
}
}
else
else if(!pointEntity->Prefab.empty())
{
Entity newPrefab = Engine::GetCurrentScene()->CreateEntity(pointEntity->Name);
pointEntities[pointEntity->Name].AddChild(newPrefab);
auto& prefabComponent = currentNonWorldEntity.AddComponent<PrefabComponent>();
Ref<Prefab> prefab = Prefab::InstanceInScene(pointEntity->Prefab, m_Scene);
auto& prefabComponent = newPrefab.AddComponent<PrefabComponent>();
prefabComponent.SetPrefab(Prefab::New(pointEntity->Prefab));
newPrefab.GetComponent<TransformComponent>().SetLocalPosition(brushLocalPosition);
prefabComponent.SetPrefab(prefab);
prefabComponent.isInitialized = true;
currentNonWorldEntity.AddChild(prefabComponent.PrefabInstance->Root);
currentNonWorldEntity.GetComponent<TransformComponent>().SetLocalPosition(brushLocalPosition);
for (auto& e : prefabComponent.PrefabInstance->Entities)
{
if (!e.GetComponent<ParentComponent>().HasParent)
{
newPrefab.AddChild(e);
}
}
//for (auto& e : prefabComponent.PrefabInstance->Entities)
//{
// if (!e.GetComponent<ParentComponent>().HasParent)
// {
// newPrefab.AddChild(e);
// }
//}
}
}
else