celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/antopilo/Nuake

Browse Source
This commit is contained in:
Antoine Pilote
2023-09-16 12:11:14 -04:00
parent cfbc3fa2c1 c808d2f061
commit 480b130919
21 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,8 +101,7 @@ namespace Nuake
}
Logger::Log("Entity not found with id: " + std::to_string(id), "scene", CRITICAL);
assert("Entity not found");
return Entity{ (entt::entity)0, this };
}
bool Scene::OnInit()
@@ -388,7 +387,6 @@ namespace Nuake
sceneCopy->Path = Path;
json serializedScene = Serialize();
sceneCopy->Deserialize(serializedScene);
return sceneCopy;
}
@@ -485,7 +483,7 @@ namespace Nuake
Entity skeletonRootEntity = CreateEntity(skeletonRoot.Name);
skeletonRootEntity.AddComponent<BoneComponent>().Name = skeletonRoot.Name;
skeletonRoot.EntityHandle = skeletonRootEntity.GetHandle();
skeletonRoot.EntityHandle = skeletonRootEntity.GetID();
entity.AddChild(skeletonRootEntity);
Vector3 bonePosition;
@@ -510,7 +508,7 @@ namespace Nuake
boneEntity.AddComponent<BoneComponent>();
entity.AddChild(boneEntity);
c.EntityHandle = boneEntity.GetHandle();
c.EntityHandle = boneEntity.GetID();
Vector3 bonePosition;
Quat boneRotation;