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

Major cleanup.

Browse Source 
Moved to namespace
Cleanup includes
This commit is contained in:
Antoine Pilote
2021-07-11 18:56:44 -04:00
parent f77bef6b28
commit 0c6ed48bbd
174 changed files with 11772 additions and 11296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
Nuake/src/Scene/Entities/Entity.cpp
View File

@@ -1,5 +1,3 @@
#include "../Components/ParentComponent.h"
#include "Entity.h"
#include "../Components/NameComponent.h"
@@ -10,39 +8,42 @@
#include "../Components/QuakeMap.h"
#include "../Components/WrenScriptComponent.h"
#include "../Components/CharacterControllerComponent.h"
void Entity::AddChild(Entity ent)
namespace Nuake
{
if ((int)m_EntityHandle != ent.GetHandle())
void Entity::AddChild(Entity ent)
{
ent.GetComponent<ParentComponent>().HasParent = true;
ent.GetComponent<ParentComponent>().Parent = *this;
if ((int)m_EntityHandle != ent.GetHandle())
{
ent.GetComponent<ParentComponent>().HasParent = true;
ent.GetComponent<ParentComponent>().Parent = *this;
GetComponent<ParentComponent>().Children.push_back(ent);
GetComponent<ParentComponent>().Children.push_back(ent);
}
}
}
json Entity::Serialize()
{
BEGIN_SERIALIZE();
SERIALIZE_OBJECT_REF_LBL("NameComponent", GetComponent<NameComponent>());
SERIALIZE_OBJECT_REF_LBL("ParentComponent", GetComponent<ParentComponent>());
SERIALIZE_OBJECT_REF_LBL("TransformComponent", GetComponent<TransformComponent>());
if(HasComponent<CameraComponent>())
SERIALIZE_OBJECT_REF_LBL("CameraComponent", GetComponent<CameraComponent>());
if(HasComponent<QuakeMapComponent>())
SERIALIZE_OBJECT_REF_LBL("QuakeMapComponent", GetComponent<QuakeMapComponent>());
if (HasComponent<LightComponent>())
SERIALIZE_OBJECT_REF_LBL("LightComponent", GetComponent<LightComponent>());
if (HasComponent<WrenScriptComponent>())
SERIALIZE_OBJECT_REF_LBL("WrenScriptComponent", GetComponent<WrenScriptComponent>());
if (HasComponent<CharacterControllerComponent>())
SERIALIZE_OBJECT_REF_LBL("CharacterControllerComponent", GetComponent<CharacterControllerComponent>());
END_SERIALIZE();
}
json Entity::Serialize()
{
BEGIN_SERIALIZE();
SERIALIZE_OBJECT_REF_LBL("NameComponent", GetComponent<NameComponent>());
SERIALIZE_OBJECT_REF_LBL("ParentComponent", GetComponent<ParentComponent>());
SERIALIZE_OBJECT_REF_LBL("TransformComponent", GetComponent<TransformComponent>());
if (HasComponent<CameraComponent>())
SERIALIZE_OBJECT_REF_LBL("CameraComponent", GetComponent<CameraComponent>());
if (HasComponent<QuakeMapComponent>())
SERIALIZE_OBJECT_REF_LBL("QuakeMapComponent", GetComponent<QuakeMapComponent>());
if (HasComponent<LightComponent>())
SERIALIZE_OBJECT_REF_LBL("LightComponent", GetComponent<LightComponent>());
if (HasComponent<WrenScriptComponent>())
SERIALIZE_OBJECT_REF_LBL("WrenScriptComponent", GetComponent<WrenScriptComponent>());
if (HasComponent<CharacterControllerComponent>())
SERIALIZE_OBJECT_REF_LBL("CharacterControllerComponent", GetComponent<CharacterControllerComponent>());
END_SERIALIZE();
}
bool Entity::Deserialize(const std::string& str)
{
BEGIN_DESERIALIZE();
bool Entity::Deserialize(const std::string& str)
{
BEGIN_DESERIALIZE();
DESERIALIZE_COMPONENT(TransformComponent);
DESERIALIZE_COMPONENT(NameComponent);
DESERIALIZE_COMPONENT(ParentComponent);
@@ -51,20 +52,21 @@ bool Entity::Deserialize(const std::string& str)
DESERIALIZE_COMPONENT(LightComponent);
DESERIALIZE_COMPONENT(WrenScriptComponent);
DESERIALIZE_COMPONENT(CharacterControllerComponent);
return true;
return true;
}
Entity::Entity(entt::entity handle, Scene* scene)
{
m_EntityHandle = handle;
m_Scene = scene;
}
Entity::Entity(const Entity& ent)
{
this->m_EntityHandle = ent.m_EntityHandle;
this->m_Scene = ent.m_Scene;
}
Entity::Entity() {}
}
Entity::Entity(entt::entity handle, Scene* scene)
{
m_EntityHandle = handle;
m_Scene = scene;
}
Entity::Entity(const Entity& ent)
{
this->m_EntityHandle = ent.m_EntityHandle;
this->m_Scene = ent.m_Scene;
}
Entity::Entity(){}

120
Nuake/src/Scene/Entities/Entity.h
View File

@@ -5,66 +5,70 @@
#include "../Components/BaseComponent.h"
#include "../Resource/Serializable.h"
#include "../Components/NameComponent.h"
class Entity : public ISerializable
namespace Nuake
{
public:
Entity(entt::entity handle, Scene* scene);
Entity(const Entity& ent);
Entity();
void AddChild(Entity ent);
int GetHandle() { return (int)m_EntityHandle; }
int GetID() { return GetComponent<NameComponent>().ID; }
template<typename T>
bool HasComponent() {
return m_Scene->m_Registry.all_of<T>(m_EntityHandle);
}
bool IsValid() {
return m_Scene->m_Registry.valid((entt::entity)GetHandle());
}
template<typename T>
T& AddComponent() {
T& component = m_Scene->m_Registry.emplace<T>(m_EntityHandle);
return component;
}
template<typename T>
void RemoveComponent() {
m_Scene->m_Registry.remove<T>(m_EntityHandle);
}
template<typename T>
T& GetComponent() {
T& component = m_Scene->m_Registry.get<T>(m_EntityHandle);
return component;
}
void Destroy() {
Logger::Log("Deleted eneity :" + std::to_string((int)m_EntityHandle));
m_Scene->m_Registry.destroy(m_EntityHandle);
}
bool operator==(const Entity& other) const
class Entity : public ISerializable
{
return m_EntityHandle == other.m_EntityHandle && m_Scene == other.m_Scene;
}
public:
Entity(entt::entity handle, Scene* scene);
Entity(const Entity& ent);
Entity();
bool operator!=(const Entity& other) const
{
return !(*this == other);
}
void AddChild(Entity ent);
json Serialize() override;
bool Deserialize(const std::string& str);
int GetHandle() { return (int)m_EntityHandle; }
int GetID() { return GetComponent<NameComponent>().ID; }
Scene* GetScene() {
return m_Scene;
}
private:
entt::entity m_EntityHandle;
Scene* m_Scene;
};
template<typename T>
bool HasComponent() {
return m_Scene->m_Registry.all_of<T>(m_EntityHandle);
}
bool IsValid() {
return m_Scene->m_Registry.valid((entt::entity)GetHandle());
}
template<typename T>
T& AddComponent() {
T& component = m_Scene->m_Registry.emplace<T>(m_EntityHandle);
return component;
}
template<typename T>
void RemoveComponent() {
m_Scene->m_Registry.remove<T>(m_EntityHandle);
}
template<typename T>
T& GetComponent() {
T& component = m_Scene->m_Registry.get<T>(m_EntityHandle);
return component;
}
void Destroy() {
Logger::Log("Deleted eneity :" + std::to_string((int)m_EntityHandle));
m_Scene->m_Registry.destroy(m_EntityHandle);
}
bool operator==(const Entity& other) const
{
return m_EntityHandle == other.m_EntityHandle && m_Scene == other.m_Scene;
}
bool operator!=(const Entity& other) const
{
return !(*this == other);
}
json Serialize() override;
bool Deserialize(const std::string& str);
Scene* GetScene() {
return m_Scene;
}
private:
entt::entity m_EntityHandle;
Scene* m_Scene;
};
}

9
Nuake/src/Scene/Entities/ScriptableEntity.h
View File

@@ -4,12 +4,3 @@
#include "../Components/ParentComponent.h"
#include "../Components/NameComponent.h"
class ScriptableEntity
{
public:
virtual void OnCreate() {}
virtual void OnDestroy() {}
virtual void OnUpdate(Timestep ts){}
};