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

CreateEntity & AddPrefab method added to scripting API + other

Browse Source 
- New entity starts incrementing if an entity with the same name exists
- Better log message
This commit is contained in:
Antoine Pilote
2023-07-17 01:49:09 -04:00
parent 720b128688
commit 0534c0fd81
2 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Nuake/src/Scene/Scene.cpp
View File

@@ -197,16 +197,50 @@ namespace Nuake {
Entity Scene::CreateEntity(const std::string& name, int id)
{
if (name.empty())
{
Logger::Log("[Scene] Failed to create entity. Entity name cannot be empty.");
return Entity();
}
std::string entityName;
if (GetEntity(name) != Entity())
{
entityName = name;
}
else
{
// Try to generate a unique name
for (uint32_t i = 1; i < 2048; i++)
{
const std::string& entityEnumName = name + std::to_string(i);
const auto& entityId = GetEntity(entityEnumName).GetHandle();
if (entityId != -1)
{
entityName = entityEnumName;
break;
}
}
if (entityName.empty()) // We ran out of names!!!
{
Logger::Log("[Scene] Failed to create entity. Limit reached with name: " + name, CRITICAL);
return Entity();
}
}
Entity entity = { m_Registry.create(), this };
// Add all mandatory component. An entity cannot exist without these.
entity.AddComponent<TransformComponent>();
entity.AddComponent<ParentComponent>();
entity.AddComponent<VisibilityComponent>();
NameComponent& nameComponent = entity.AddComponent<NameComponent>();
nameComponent.Name = name;
nameComponent.Name = entityName;
nameComponent.ID = id;
Logger::Log("Created entity: " + nameComponent.Name, LOG_TYPE::VERBOSE);
Logger::Log("[Scene] Entity created with name: " + nameComponent.Name, LOG_TYPE::VERBOSE);
return entity;
}

42
Nuake/src/Scripting/Modules/SceneModule.h
View File

@@ -21,6 +21,7 @@
#include <src/Scene/Components/WrenScriptComponent.h>
#include <src/Scene/Components/TriggerZone.h>
#include <src/Scene/Components/BSPBrushComponent.h>
#include <src/Scene/Components/PrefabComponent.h>
namespace Nuake {
namespace ScriptAPI {
@@ -33,6 +34,8 @@ namespace Nuake {
void RegisterModule(WrenVM* vm) override
{
RegisterMethod("CreateEntity(_)", (void*)CreateEntity);
RegisterMethod("AddPrefab(_)", (void*)AddPrefab);
RegisterMethod("GetEntityID(_)", (void*)GetEntity);
RegisterMethod("EntityHasComponent(_,_)", (void*)EntityHasComponent);
@@ -61,6 +64,13 @@ namespace Nuake {
RegisterMethod("BrushGetTargetsCount_(_)", (void*)BrushGetTargetsCount);
}
static void CreateEntity(WrenVM* vm)
{
const std::string name = wrenGetSlotString(vm, 1);
const int entity = Engine::GetCurrentScene()->CreateEntity(name).GetHandle();
wrenSetSlotDouble(vm, 0, entity);
}
static void GetEntity(WrenVM* vm)
{
std::string name = wrenGetSlotString(vm, 1);
@@ -68,6 +78,38 @@ namespace Nuake {
wrenSetSlotDouble(vm, 0, handle);
}
static void AddPrefab(WrenVM* vm)
{
const std::string& prefabPath = wrenGetSlotString(vm, 1);
if (prefabPath.empty())
{
Logger::Log("[Scripting] Cannot add prefab with an empty path.", CRITICAL);
wrenSetSlotDouble(vm, 0, -1); // -1 is an empty entity.
return;
}
const std::string& prefabName = wrenGetSlotString(vm, 1);
if (prefabName.empty())
{
Logger::Log("[Scripting] Cannot add prefab with an empty name.", CRITICAL);
wrenSetSlotDouble(vm, 0, -1); // -1 is an empty entity.
return;
}
if (!FileSystem::FileExists(prefabPath))
{
Logger::Log("[Scripting] Cannot add prefab. File not found: " + prefabPath, CRITICAL);
return;
}
Entity& newEntity = Engine::GetCurrentScene()->CreateEntity(prefabName);
auto& prefabComponent = newEntity.AddComponent<PrefabComponent>();
prefabComponent.PrefabInstance = Prefab::New(prefabPath);
wrenSetSlotDouble(vm, 0, newEntity.GetHandle());
return;
}
static void EntityHasComponent(WrenVM* vm)
{
double handle = wrenGetSlotDouble(vm, 1);