Cleanup Scene file

- Introduce new class ComponentHandler which handles all the
  Serializing/Deserializing/Editor Gui of Components
- Currently only Deserializing and Editor Gui is implemented for
  existing components
This commit is contained in:
Thraix
2023-07-18 14:03:20 +02:00
parent ca61bae014
commit 3d82b12cbe
10 changed files with 599 additions and 388 deletions
+4
View File
@@ -201,6 +201,7 @@
<ClCompile Include="src\copium\event\ViewportResize.cpp" />
<ClCompile Include="src\copium\event\WindowFocusEvent.cpp" />
<ClCompile Include="src\copium\event\WindowResizeEvent.cpp" />
<ClCompile Include="src\copium\example\ComponentHandlerBase.cpp" />
<ClCompile Include="src\copium\mesh\Mesh.cpp" />
<ClCompile Include="src\copium\pipeline\ShaderBinding.cpp" />
<ClCompile Include="src\copium\renderer\Batch.cpp" />
@@ -262,6 +263,9 @@
<ClInclude Include="src\copium\ecs\EntitySet.h" />
<ClInclude Include="src\copium\event\ViewportResize.h" />
<ClInclude Include="src\copium\example\AnimationSystem.h" />
<ClInclude Include="src\copium\example\ComponentHandler.h" />
<ClInclude Include="src\copium\example\ComponentHandlerBase.h" />
<ClInclude Include="src\copium\example\ComponentHandlers.h" />
<ClInclude Include="src\copium\example\DebugSystem.h" />
<ClInclude Include="src\copium\example\LevelGeneratorComponentListener.h" />
<ClInclude Include="src\copium\example\PickupSystem.h" />
+12
View File
@@ -228,6 +228,9 @@
<ClCompile Include="src\copium\event\ViewportResize.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\copium\example\ComponentHandlerBase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\copium\sampler\DepthAttachment.h">
@@ -536,5 +539,14 @@
<ClInclude Include="src\copium\event\ViewportResize.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\copium\example\ComponentHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\copium\example\ComponentHandlers.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\copium\example\ComponentHandlerBase.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
+3 -3
View File
@@ -8,7 +8,7 @@ name=Level Generator
name=Block
[Transform]
position=2 -8.5
position=0 -8.5
size=1 1
[Texture]
@@ -49,7 +49,7 @@ size=0.2 0.2
[Texture]
texture-uuid=f49a5284-d666-0982-95ca-cf68cc3d4f45
[MouseFollow]
[MouseFollower]
[Renderable]
---
@@ -65,7 +65,7 @@ font=3e9ef1a2-59ba-2e4d-b2cd-f5efaa531af7
text=0 fps
font-size=20
[FrameCount]
[FrameCounter]
[UiRenderable]
---
@@ -21,7 +21,7 @@ namespace Copium
void IndexBuffer::Draw(const CommandBuffer& commandBuffer, int indices)
{
CP_ASSERT(indices > 0 && indices <= indexCount, "amount of indices is out of range");
CP_ASSERT(indices >= 0 && indices <= indexCount, "amount of indices is out of range");
vkCmdDrawIndexed(commandBuffer, indices, 1, 0, 0, 0);
}
}
+35 -350
View File
@@ -11,6 +11,7 @@
#include "copium/example/CameraFollowPlayerSystem.h"
#include "copium/example/CameraUpdateSystem.h"
#include "copium/example/ColliderSystem.h"
#include "copium/example/ComponentHandlers.h"
#include "copium/example/Components.h"
#include "copium/example/DebugSystem.h"
#include "copium/example/FrameCountSystem.h"
@@ -35,6 +36,7 @@
namespace Copium
{
Scene::Scene(CommandBuffer& commandBuffer, DescriptorPool& descriptorPool)
: viewport{-1, -1, 1, 1}
{
fileIcon = AssetManager::LoadAsset("fileicon.meta");
descriptorSetFileIcon = Vulkan::GetImGuiInstance().CreateDescriptorSet();
@@ -62,6 +64,26 @@ namespace Copium
ecs->SetComponentListener<HealthComponentListener>();
ecs->SetComponentListener<LevelGeneratorComponentListener>();
RegisterComponentHandler<NameComponentHandler>();
RegisterComponentHandler<TransformComponentHandler>();
RegisterComponentHandler<TextureComponentHandler>();
RegisterComponentHandler<TextComponentHandler>();
RegisterComponentHandler<StaticColliderComponentHandler>();
RegisterComponentHandler<DynamicColliderComponentHandler>();
RegisterComponentHandler<PlayerComponentHandler>();
RegisterComponentHandler<CameraComponentHandler>(&viewport);
RegisterComponentHandler<UuidComponentHandler>();
RegisterComponentHandler<PhysicsComponentHandler>();
RegisterComponentHandler<HealthComponentHandler>();
RegisterComponentHandler<AnimationComponentHandler>();
RegisterComponentHandler<DebugComponentHandler>();
RegisterFlagComponentHandler<MouseFollowC>("Mouse Follower");
RegisterFlagComponentHandler<RenderableC>("Renderable");
RegisterFlagComponentHandler<UiRenderableC>("Ui Renderable");
RegisterFlagComponentHandler<PickupC>("Pickup");
RegisterFlagComponentHandler<LevelGeneratorC>("Level Generator");
RegisterFlagComponentHandler<FrameCountC>("Frame Counter");
Deserialize("res/scenes/scene.meta");
}
@@ -95,8 +117,6 @@ namespace Copium
void Scene::Deserialize(const std::string& file)
{
float aspect = Vulkan::GetSwapChain().GetExtent().width / (float)Vulkan::GetSwapChain().GetExtent().height;
std::vector<MetaFile> metaFiles = MetaFile::ReadList(file);
for (auto& metaFile : metaFiles)
@@ -107,115 +127,17 @@ namespace Copium
{
try
{
char* endPtr;
if (name == "Transform")
bool found = false;
for (auto& componentHandler : componentHandlers)
{
TransformC transform;
transform.position = ReadVec2Opt(metaClass, "position", glm::vec2{0.0f, 0.0f});
transform.size = ReadVec2Opt(metaClass, "size", glm::vec2{1.0f, 1.0f});
entity.AddComponent<TransformC>(transform);
if (name == componentHandler->GetSerializedName())
{
componentHandler->Deserialize(entity, metaClass);
found = true;
break;
}
}
else if (name == "Texture")
{
TextureC texture;
texture.asset = AssetRef{AssetManager::LoadAsset(Uuid{metaClass.GetValue("texture-uuid")})};
texture.texCoord1 = ReadVec2Opt(metaClass, "tex-coord", glm::vec2{0.0f, 0.0f});
texture.texCoord2 = texture.texCoord1 + ReadVec2Opt(metaClass, "tex-size", glm::vec2{1.0f, 1.0f} - texture.texCoord1);
entity.AddComponent<TextureC>(texture);
}
else if (name == "StaticCollider")
{
StaticColliderC staticCollider;
staticCollider.resolveCollision = ReadBoolOpt(metaClass, "resolve-collision", true);
entity.AddComponent<StaticColliderC>(staticCollider);
}
else if (name == "DynamicCollider")
{
DynamicColliderC dynamicCollider;
dynamicCollider.resolveCollision = ReadBoolOpt(metaClass, "resolve-collision", true);
dynamicCollider.colliderOffset = ReadVec2Opt(metaClass, "collider-offset", glm::vec2{0.0f, 0.0f});
dynamicCollider.colliderSize = ReadVec2Opt(metaClass, "collider-size", glm::vec2{1.0f, 1.0f});
entity.AddComponent<DynamicColliderC>(dynamicCollider);
}
else if (name == "Text")
{
TextC text;
text.font = AssetRef{AssetManager::LoadAsset(Uuid{metaClass.GetValue("font")})};
text.text = metaClass.GetValue("text");
text.fontSize = std::strtof(metaClass.GetValue("font-size").c_str(), &endPtr);
entity.AddComponent<TextC>(text);
}
else if (name == "Camera")
{
CameraC camera;
camera.staticBoundingBox = ReadBoolOpt(metaClass, "static-bounding-box", false);
camera.uiCamera = ReadBoolOpt(metaClass, "ui-camera", false);
if (camera.uiCamera)
camera.projection = BoundingBox(0, 0, Vulkan::GetSwapChain().GetExtent().width, Vulkan::GetSwapChain().GetExtent().height);
else
camera.projection = BoundingBox(-aspect, -1.0f, aspect, 1.0f);
entity.AddComponent<CameraC>(camera);
}
else if (name == "Uuid")
{
UuidC uuid;
uuid.uuid = Uuid{metaClass.GetValue("uuid")};
entity.AddComponent<UuidC>(uuid);
}
else if (name == "Player")
{
PlayerC player;
player.camera = GetEntity(Uuid{metaClass.GetValue("camera-uuid")});
entity.AddComponent<PlayerC>(player);
}
else if (name == "Health")
{
HealthC health;
health.max = std::strtol(metaClass.GetValue("health").c_str(), &endPtr, 10);
health.current = health.max;
entity.AddComponent<HealthC>(health);
}
else if (name == "Physics")
{
PhysicsC physics;
physics.mass = std::strtof(metaClass.GetValue("mass").c_str(), &endPtr);
entity.AddComponent<PhysicsC>(physics);
}
else if (name == "Animation")
{
AnimationC animation;
animation.sheetCoord = ReadVec2Opt(metaClass, "sheet-coord", glm::ivec2{0, 0});
animation.sheetSize = ReadVec2Opt(metaClass, "sheet-size", glm::ivec2{1, 1});
animation.images = std::strtol(metaClass.GetValue("images").c_str(), &endPtr, 10);
animation.horizontal = ReadBoolOpt(metaClass, "horizontal", true);
animation.time = std::strtof(metaClass.GetValue("time").c_str(), &endPtr);
entity.AddComponent<AnimationC>(animation);
}
else if (name == "Debug")
{
DebugC debug;
debug.playerEntity = GetEntity(Uuid{metaClass.GetValue("player-uuid")});
entity.AddComponent<DebugC>(debug);
}
else if (name == "Name")
{
NameC name;
name.name = metaClass.GetValue("name");
entity.AddComponent<NameC>(name);
}
else if (name == "Renderable")
entity.AddComponent<RenderableC>();
else if (name == "Pickup")
entity.AddComponent<PickupC>();
else if (name == "FrameCount")
entity.AddComponent<FrameCountC>();
else if (name == "MouseFollow")
entity.AddComponent<MouseFollowC>();
else if (name == "UiRenderable")
entity.AddComponent<UiRenderableC>();
else if (name == "LevelGenerator")
entity.AddComponent<LevelGeneratorC>();
else
if (!found)
CP_WARN("Unknown component: %s", name.c_str());
}
catch (RuntimeException& exception) { CP_ERR("Invalid %s component: %s", name.c_str(), exception.GetErrorMessage().c_str()); }
@@ -261,25 +183,11 @@ namespace Copium
}
ImGui::SeparatorText("Components");
ComponentGui<NameC>(selectedEntity, "Name", Scene::NameGui, Scene::NameCreate);
ComponentGui<TransformC>(selectedEntity, "Transform", Scene::TransformGui, Scene::TransformCreate);
ComponentGui<TextureC>(selectedEntity, "Texture", Scene::TextureGui, Scene::TextureCreate);
ComponentGui<TextC>(selectedEntity, "Text", Scene::TextGui, Scene::TextCreate);
ComponentGui<PlayerC>(selectedEntity, "Player", Scene::PlayerGui, Scene::PlayerCreate);
ComponentGui<StaticColliderC>(selectedEntity, "Static Collider", Scene::StaticColliderGui, Scene::StaticColliderCreate);
ComponentGui<DynamicColliderC>(selectedEntity, "Dynamic Collider", Scene::DynamicColliderGui, Scene::DynamicColliderCreate);
ComponentGui<CameraC>(selectedEntity, "Camera", Scene::CameraGui, Scene::CameraCreate);
ComponentGui<HealthC>(selectedEntity, "Health", Scene::HealthGui, Scene::HealthCreate);
ComponentGui<PhysicsC>(selectedEntity, "Physics", Scene::PhysicsGui, Scene::PhysicsCreate);
ComponentGui<AnimationC>(selectedEntity, "Animation", Scene::AnimationGui, Scene::AnimationCreate);
ComponentGui<DebugC>(selectedEntity, "Debug Information", Scene::DebugGui, Scene::DebugCreate);
ComponentGui<MouseFollowC>(selectedEntity, "Mouse Follow");
ComponentGui<RenderableC>(selectedEntity, "Renderable");
ComponentGui<UiRenderableC>(selectedEntity, "Ui Renderable");
ComponentGui<PickupC>(selectedEntity, "Pickup");
ComponentGui<LevelGeneratorC>(selectedEntity, "Level Generator");
ComponentGui<FrameCountC>(selectedEntity, "Frame Count");
for (auto& componentHandler : componentHandlers)
{
componentHandler->ComponentGui(selectedEntity);
}
}
ImGui::End();
}
@@ -317,227 +225,4 @@ namespace Copium
style.ItemSpacing.x = defaultSpacing;
ImGui::End();
}
Entity Scene::GetEntity(const Uuid& uuid) const
{
Entity entity{ecs.get(),ecs->Find<UuidC>([&](EntityId entity, const UuidC& uuidArg) { return uuid == uuidArg.uuid; })};
CP_ASSERT(entity, "Failed to find entity with Uuid=%s", uuid.ToString().c_str());
return entity;
}
glm::vec2 Scene::ReadVec2Opt(const MetaFileClass& metaClass, const std::string& key, glm::vec2 vec)
{
if (!metaClass.HasValue(key))
return vec;
const std::string& value = metaClass.GetValue(key);
char* endPos;
vec.x = std::strtof(value.c_str(), &endPos);
vec.y = std::strtof(endPos, &endPos);
return vec;
}
glm::ivec2 Scene::ReadVec2Opt(const MetaFileClass& metaClass, const std::string& key, glm::ivec2 vec)
{
if (!metaClass.HasValue(key))
return vec;
const std::string& value = metaClass.GetValue(key);
char* endPos;
vec.x = std::strtof(value.c_str(), &endPos);
vec.y = std::strtof(endPos, &endPos);
return vec;
}
bool Scene::ReadBoolOpt(const MetaFileClass& metaClass, const std::string& key, bool vec)
{
if (!metaClass.HasValue(key))
return vec;
const std::string& value = metaClass.GetValue(key);
if (value == "true")
return true;
return false;
}
template <typename Component, typename FuncGui, typename FuncCreate>
void Scene::ComponentGui(Entity entity, const std::string& componentName, FuncGui funcGui, FuncCreate funcCreate)
{
if (entity.HasComponent<Component>())
{
Component& component = entity.GetComponent<Component>();
if (ImGui::CollapsingHeader(componentName.c_str(), ImGuiTreeNodeFlags_DefaultOpen))
{
funcGui(component);
if (ImGui::Button(std::string("Delete " + componentName).c_str()))
entity.RemoveComponent<Component>();
}
}
else
{
// TODO: These buttons should probably be in a context menu when you right-click the entity instead
if (ImGui::Button(std::string("Add " + componentName).c_str()))
funcCreate(entity);
}
}
template <typename Component>
void Scene::ComponentGui(Entity entity, const std::string& componentName)
{
if (entity.HasComponent<Component>())
{
Component& component = entity.GetComponent<Component>();
if (ImGui::Button(std::string("Delete " + componentName).c_str()))
entity.RemoveComponent<Component>();
}
else
{
// TODO: These buttons should probably be in a context menu when you right-click the entity instead
if (ImGui::Button(std::string("Add " + componentName).c_str()))
entity.AddComponent<Component>();
}
}
void Scene::TransformGui(TransformC& transform)
{
ImGui::DragFloat2("Position", (float*)&transform.position);
ImGui::DragFloat2("Size", (float*)&transform.size);
}
void Scene::TransformCreate(Entity entity)
{
entity.AddComponent<TransformC>(glm::vec2{0, 0}, glm::vec2{1, 1});
}
void Scene::TextureGui(TextureC& texture)
{
Asset& asset = AssetManager::GetAsset<Texture2D>(texture.asset);
ImGui::Text("Asset: %s", asset.GetName().c_str());
ImGui::DragFloat2("Tex Coord 1", (float*)&texture.texCoord1, 0.01, 0.0f, 1.0f);
ImGui::DragFloat2("Tex Coord 2", (float*)&texture.texCoord2, 0.01, 0.0f, 1.0f);
}
void Scene::TextureCreate(Entity entity)
{
entity.AddComponent<TextureC>(AssetRef{AssetManager::DuplicateAsset(Vulkan::GetEmptyTexture2D())}, glm::vec2{0, 0}, glm::vec2{1, 1});
}
void Scene::TextGui(TextC& text)
{
Asset& asset = AssetManager::GetAsset<Font>(text.font);
ImGui::Text(asset.GetName().c_str());
ImGui::InputTextMultiline("Text##Text", &text.text);
ImGui::DragFloat("Font Size", &text.fontSize);
}
void Scene::TextCreate(Entity entity)
{
entity.AddComponent<TextC>(AssetRef{AssetManager::LoadAsset<Font>("font.meta")}, "", 20.0f);
}
void Scene::PlayerGui(PlayerC& player)
{
if (player.camera)
ImGui::Text("Camera: %s", player.camera.GetComponent<NameC>().name.c_str());
else
ImGui::Text("No camera attached");
}
void Scene::PlayerCreate(Entity entity)
{
entity.AddComponent<PlayerC>();
}
void Scene::StaticColliderGui(StaticColliderC& staticCollider)
{
ImGui::Checkbox("StaticCollider##Resolve Collision", &staticCollider.resolveCollision);
}
void Scene::StaticColliderCreate(Entity entity)
{
entity.AddComponent<StaticColliderC>(false);
}
void Scene::DynamicColliderGui(DynamicColliderC& dynamicCollider)
{
ImGui::Checkbox("DynamicCollider##Resolve Collision", &dynamicCollider.resolveCollision);
ImGui::DragFloat2("Collider Offset", (float*)&dynamicCollider.colliderOffset, 0.01);
ImGui::DragFloat2("Collider Size", (float*)&dynamicCollider.colliderSize, 0.01);
}
void Scene::DynamicColliderCreate(Entity entity)
{
entity.AddComponent<DynamicColliderC>(true, glm::vec2{0, 0}, glm::vec2{1, 1});
}
void Scene::CameraGui(CameraC& camera)
{
ImGui::Checkbox("Static", &camera.staticBoundingBox);
ImGui::Checkbox("Ui camera", &camera.uiCamera); // TODO: If this changes, the bounding box should be modified if it is not static
}
void Scene::CameraCreate(Entity entity)
{
// TODO: Make the BoundingBox based on the viewport somehow
entity.AddComponent<CameraC>(BoundingBox{-1.0f, -1.0f, 1.0f, 1.0f}, false, false);
}
void Scene::HealthGui(HealthC& health)
{
ImGui::DragInt("Max Health", &health.max);
}
void Scene::HealthCreate(Entity entity)
{
entity.AddComponent<HealthC>(10, 10);
}
void Scene::PhysicsGui(PhysicsC& physics)
{
ImGui::DragFloat("Mass", &physics.mass);
}
void Scene::PhysicsCreate(Entity entity)
{
entity.AddComponent<PhysicsC>(10.0f);
}
void Scene::AnimationGui(AnimationC& animation)
{
ImGui::DragInt2("Sheet Size", (int*)&animation.sheetSize);
ImGui::DragInt2("Sheet Coord", (int*)&animation.sheetCoord, 1, 0, std::max(animation.sheetSize.x, animation.sheetSize.y));
ImGui::DragInt("Images", &animation.images);
ImGui::DragFloat("Frame time", &animation.time);
ImGui::Checkbox("Horizontal", &animation.horizontal);
}
void Scene::AnimationCreate(Entity entity)
{
entity.AddComponent<AnimationC>(glm::ivec2{0, 0}, glm::ivec2{1, 1}, 1, true, 1.0f);
}
void Scene::DebugGui(DebugC& debug)
{
if (debug.playerEntity)
ImGui::Text("Player: %s", debug.playerEntity.GetComponent<NameC>().name.c_str());
else
ImGui::Text("No player attached");
}
void Scene::DebugCreate(Entity entity)
{
entity.AddComponent<DebugC>();
}
void Scene::NameGui(NameC& name)
{
ImGui::InputText("Name##Name", &name.name);
}
void Scene::NameCreate(Entity entity)
{
entity.AddComponent<NameC>(String::Format("Entity %d", entity.GetId()));
}
}
+12 -34
View File
@@ -5,6 +5,8 @@
#include "copium/event/Event.h"
#include "copium/event/EventResult.h"
#include "copium/example/Components.h"
#include "copium/example/ComponentHandlerBase.h"
#include "copium/example/ComponentHandler.h"
#include "copium/renderer/Renderer.h"
#include "copium/util/Uuid.h"
@@ -20,6 +22,7 @@ namespace Copium
std::unique_ptr<ECSManager> ecs;
std::unique_ptr<DescriptorSet> descriptorSetRenderer;
std::unique_ptr<DescriptorSet> uiDescriptorSetRenderer;
std::vector<std::unique_ptr<ComponentHandlerBase>> componentHandlers;
AssetHandle fileIcon;
std::unique_ptr<DescriptorSet> descriptorSetFileIcon;
glm::mat4 projectionMatrix;
@@ -40,41 +43,16 @@ namespace Copium
void ComponentViewGui();
void AssetViewGui();
Entity GetEntity(const Uuid& uuid) const;
template <typename ComponentHandler, typename... Args>
void RegisterComponentHandler(const Args&... args)
{
componentHandlers.emplace_back(std::make_unique<ComponentHandler>(args...));
}
glm::vec2 ReadVec2Opt(const MetaFileClass& metaClass, const std::string& key, glm::vec2 vec);
glm::ivec2 ReadVec2Opt(const MetaFileClass& metaClass, const std::string& key, glm::ivec2 vec);
bool ReadBoolOpt(const MetaFileClass& metaClass, const std::string& key, bool vec);
template <typename Component, typename FuncGui, typename FuncCreate>
void ComponentGui(Entity entity, const std::string& componentName, FuncGui funcGui, FuncCreate funcCreate);
template <typename Component>
static void ComponentGui(Entity entity, const std::string& componentName);
// TODO: Make these a class instead?
static void TransformGui(TransformC& transform);
static void TransformCreate(Entity entity);
static void TextureGui(TextureC& texture);
static void TextureCreate(Entity entity);
static void TextGui(TextC& text);
static void TextCreate(Entity entity);
static void PlayerGui(PlayerC& player);
static void PlayerCreate(Entity entity);
static void StaticColliderGui(StaticColliderC& staticCollider);
static void StaticColliderCreate(Entity entity);
static void DynamicColliderGui(DynamicColliderC& dynamicCollider);
static void DynamicColliderCreate(Entity entity);
static void CameraGui(CameraC& camera);
static void CameraCreate(Entity entity);
static void PhysicsGui(PhysicsC& physics);
static void PhysicsCreate(Entity entity);
static void HealthGui(HealthC& health);
static void HealthCreate(Entity entity);
static void AnimationGui(AnimationC& animation);
static void AnimationCreate(Entity entity);
static void DebugGui(DebugC& debug);
static void DebugCreate(Entity entity);
static void NameGui(NameC& name);
static void NameCreate(Entity entity);
void RegisterFlagComponentHandler(const std::string& name)
{
componentHandlers.emplace_back(std::make_unique<ComponentHandler<Component>>(name, true));
}
};
}
@@ -0,0 +1,92 @@
#pragma once
#include "copium/example/ComponentHandlerBase.h"
#include <imgui.h>
namespace Copium
{
template <typename Component>
class ComponentHandler : public ComponentHandlerBase
{
protected:
std::string name;
std::string serializedName;
bool flagComponent;
public:
ComponentHandler(const std::string& name, bool flagComponent)
: name{name}, flagComponent{flagComponent}
{
serializedName = name;
serializedName.erase(std::remove(serializedName.begin(), serializedName.end(), ' '), serializedName.end());
CP_INFO("%s", serializedName.c_str());
}
void Serialize(Entity entity, MetaFile& metaFile) override
{
if(entity.HasComponent<Component>())
metaFile.AddMetaClass(serializedName, MetaFileClass{});
}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
entity.AddComponent<Component>();
}
void ComponentGui(Entity entity) override
{
if (flagComponent)
FlagComponentGui(entity);
else
DataComponentGui(entity);
}
const std::string& GetName() const override
{
return name;
}
const std::string& GetSerializedName() const override
{
return serializedName;
}
protected:
virtual void Gui(Component& component) {}
virtual Component Create(Entity entity) { return Component{}; }
void FlagComponentGui(Entity entity)
{
bool shouldHaveComponent = entity.HasComponent<Component>();
ImGui::Checkbox(name.c_str(), &shouldHaveComponent);
if(shouldHaveComponent == entity.HasComponent<Component>())
return;
if (shouldHaveComponent)
entity.AddComponent<Component>();
else
entity.RemoveComponent<Component>();
}
void DataComponentGui(Entity entity)
{
if (entity.HasComponent<Component>())
{
Component& component = entity.GetComponent<Component>();
if (ImGui::CollapsingHeader(name.c_str(), ImGuiTreeNodeFlags_DefaultOpen))
{
Gui(component);
if (ImGui::Button(std::string("Delete " + name).c_str()))
entity.RemoveComponent<Component>();
}
}
else
{
// TODO: These buttons should probably be in a context menu when you right-click the entity instead
if (ImGui::Button(std::string("Add " + name).c_str()))
entity.AddComponent<Component>(Create(entity));
}
}
};
}
@@ -0,0 +1,50 @@
#include "copium/example/ComponentHandlerBase.h"
#include "copium/example/Components.h"
namespace Copium
{
glm::vec2 ComponentHandlerBase::ReadVec2Opt(const MetaFileClass& metaClass, const std::string& key, glm::vec2 vec)
{
if (!metaClass.HasValue(key))
return vec;
const std::string& value = metaClass.GetValue(key);
char* endPos;
vec.x = std::strtof(value.c_str(), &endPos);
vec.y = std::strtof(endPos, &endPos);
return vec;
}
glm::ivec2 ComponentHandlerBase::ReadVec2Opt(const MetaFileClass& metaClass, const std::string& key, glm::ivec2 vec)
{
if (!metaClass.HasValue(key))
return vec;
const std::string& value = metaClass.GetValue(key);
char* endPos;
vec.x = std::strtof(value.c_str(), &endPos);
vec.y = std::strtof(endPos, &endPos);
return vec;
}
bool ComponentHandlerBase::ReadBoolOpt(const MetaFileClass& metaClass, const std::string& key, bool vec)
{
if (!metaClass.HasValue(key))
return vec;
const std::string& value = metaClass.GetValue(key);
if (value == "true")
return true;
return false;
}
Entity ComponentHandlerBase::GetEntity(ECSManager* ecs, const Uuid& uuid) const
{
Entity entity{ecs, ecs->Find<UuidC>([&](EntityId entity, const UuidC& uuidArg) { return uuid == uuidArg.uuid; })};
CP_ASSERT(entity, "Failed to find entity with Uuid=%s", uuid.ToString().c_str());
return entity;
}
}
@@ -0,0 +1,32 @@
#pragma once
#include "copium/ecs/Entity.h"
#include "copium/util/MetaFile.h"
#include "copium/util/Uuid.h"
#include <glm/glm.hpp>
#include <string>
namespace Copium
{
class ComponentHandlerBase
{
public:
virtual void Serialize(Entity entity, MetaFile& metaFile) = 0;
virtual void Deserialize(Entity entity, const MetaFileClass& metaClass) = 0;
virtual void ComponentGui(Entity entity) = 0;
virtual const std::string& GetName() const = 0;
virtual const std::string& GetSerializedName() const = 0;
protected:
glm::vec2 ReadVec2Opt(const MetaFileClass& metaClass, const std::string& key, glm::vec2 vec);
glm::ivec2 ReadVec2Opt(const MetaFileClass& metaClass, const std::string& key, glm::ivec2 vec);
bool ReadBoolOpt(const MetaFileClass& metaClass, const std::string& key, bool vec);
// TODO: I don't like this implementation at all.
// It shouldn't be the ComponentHandlerBases responsibility to know about entities
// But for now I don't know how to solve it in a cleaner way
Entity GetEntity(ECSManager* ecs, const Uuid& uuid) const;
};
}
@@ -0,0 +1,358 @@
#pragma once
#include "copium/example/ComponentHandler.h"
#include "copium/example/Components.h"
#include <misc/cpp/imgui_stdlib.h>
namespace Copium
{
class NameComponentHandler : public ComponentHandler<NameC>
{
public:
NameComponentHandler() : ComponentHandler{"Name", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
NameC name;
name.name = metaClass.GetValue("name");
entity.AddComponent<NameC>(name);
}
protected:
void Gui(NameC& name) override
{
ImGui::InputText("Name##Name", &name.name);
}
NameC Create(Entity entity) override
{
return NameC{String::Format("Entity %d", entity.GetId())};
}
};
class TransformComponentHandler : public ComponentHandler<TransformC>
{
public:
TransformComponentHandler() : ComponentHandler{"Transform", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
TransformC transform;
transform.position = ReadVec2Opt(metaClass, "position", glm::vec2{0.0f, 0.0f});
transform.size = ReadVec2Opt(metaClass, "size", glm::vec2{1.0f, 1.0f});
entity.AddComponent<TransformC>(transform);
}
protected:
void Gui(TransformC& transform) override
{
ImGui::DragFloat2("Position", (float*)&transform.position);
ImGui::DragFloat2("Size", (float*)&transform.size);
}
TransformC Create(Entity entity) override
{
return TransformC{glm::vec2{0, 0}, glm::vec2{1, 1}};
}
};
class TextureComponentHandler : public ComponentHandler<TextureC>
{
public:
TextureComponentHandler() : ComponentHandler{"Texture", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
TextureC texture;
texture.asset = AssetRef{AssetManager::LoadAsset(Uuid{metaClass.GetValue("texture-uuid")})};
texture.texCoord1 = ReadVec2Opt(metaClass, "tex-coord", glm::vec2{0.0f, 0.0f});
texture.texCoord2 = texture.texCoord1 + ReadVec2Opt(metaClass, "tex-size", glm::vec2{1.0f, 1.0f} - texture.texCoord1);
entity.AddComponent<TextureC>(texture);
}
protected:
void Gui(TextureC& texture) override
{
Asset& asset = AssetManager::GetAsset<Texture2D>(texture.asset);
ImGui::Text("Asset: %s", asset.GetName().c_str());
ImGui::DragFloat2("Tex Coord 1", (float*)&texture.texCoord1, 0.01, 0.0f, 1.0f);
ImGui::DragFloat2("Tex Coord 2", (float*)&texture.texCoord2, 0.01, 0.0f, 1.0f);
}
TextureC Create(Entity entity) override
{
return TextureC{AssetRef{AssetManager::DuplicateAsset(Vulkan::GetEmptyTexture2D())}, glm::vec2{0, 0}, glm::vec2{1, 1}};
}
};
class TextComponentHandler : public ComponentHandler<TextC>
{
public:
TextComponentHandler() : ComponentHandler{"Text", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
char* endPtr;
TextC text;
text.font = AssetRef{AssetManager::LoadAsset(Uuid{metaClass.GetValue("font")})};
text.text = metaClass.GetValue("text");
text.fontSize = std::strtof(metaClass.GetValue("font-size").c_str(), &endPtr);
entity.AddComponent<TextC>(text);
}
protected:
void Gui(TextC& text) override
{
Asset& asset = AssetManager::GetAsset<Font>(text.font);
ImGui::Text(asset.GetName().c_str());
ImGui::InputTextMultiline("Text##Text", &text.text);
ImGui::DragFloat("Font Size", &text.fontSize);
}
TextC Create(Entity entity) override
{
return TextC{AssetRef{AssetManager::LoadAsset<Font>("font.meta")}, "", 20.0f};
}
};
class StaticColliderComponentHandler : public ComponentHandler<StaticColliderC>
{
public:
StaticColliderComponentHandler() : ComponentHandler{"Static Collider", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
StaticColliderC staticCollider;
staticCollider.resolveCollision = ReadBoolOpt(metaClass, "resolve-collision", true);
entity.AddComponent<StaticColliderC>(staticCollider);
}
protected:
void Gui(StaticColliderC& staticCollider) override
{
ImGui::Checkbox("Resolve Collision##StaticCollider", &staticCollider.resolveCollision);
}
StaticColliderC Create(Entity entity) override
{
return StaticColliderC{false};
}
};
class DynamicColliderComponentHandler : public ComponentHandler<DynamicColliderC>
{
public:
DynamicColliderComponentHandler() : ComponentHandler{"Dynamic Collider", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
DynamicColliderC dynamicCollider;
dynamicCollider.resolveCollision = ReadBoolOpt(metaClass, "resolve-collision", true);
dynamicCollider.colliderOffset = ReadVec2Opt(metaClass, "collider-offset", glm::vec2{0.0f, 0.0f});
dynamicCollider.colliderSize = ReadVec2Opt(metaClass, "collider-size", glm::vec2{1.0f, 1.0f});
entity.AddComponent<DynamicColliderC>(dynamicCollider);
}
protected:
void Gui(DynamicColliderC& dynamicCollider) override
{
ImGui::Checkbox("Resolve Collision##DynamicCollider", &dynamicCollider.resolveCollision);
ImGui::DragFloat2("Collider Offset", (float*)&dynamicCollider.colliderOffset, 0.01);
ImGui::DragFloat2("Collider Size", (float*)&dynamicCollider.colliderSize, 0.01);
}
DynamicColliderC Create(Entity entity) override
{
return DynamicColliderC{true, glm::vec2{0, 0}, glm::vec2{1, 1}};
}
};
class PlayerComponentHandler : public ComponentHandler<PlayerC>
{
public:
PlayerComponentHandler() : ComponentHandler{"Player", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
PlayerC player;
player.camera = GetEntity(entity.GetManager(), Uuid{metaClass.GetValue("camera-uuid")});
entity.AddComponent<PlayerC>(player);
}
protected:
void Gui(PlayerC& player) override
{
if (player.camera)
ImGui::Text("Camera: %s", player.camera.GetComponent<NameC>().name.c_str());
else
ImGui::Text("No camera attached");
}
PlayerC Create(Entity entity) override
{
return PlayerC{};
}
};
class CameraComponentHandler : public ComponentHandler<CameraC>
{
private:
BoundingBox* viewport;
public:
CameraComponentHandler(BoundingBox* viewport) : ComponentHandler{"Camera", false}, viewport{viewport} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
float aspect = viewport->GetSize().x / viewport->GetSize().y;
CameraC camera;
camera.staticBoundingBox = ReadBoolOpt(metaClass, "static-bounding-box", false);
camera.uiCamera = ReadBoolOpt(metaClass, "ui-camera", false);
if (camera.uiCamera)
camera.projection = BoundingBox(0, 0, Vulkan::GetSwapChain().GetExtent().width, Vulkan::GetSwapChain().GetExtent().height);
else
camera.projection = BoundingBox(-aspect, -1.0f, aspect, 1.0f);
entity.AddComponent<CameraC>(camera);
}
protected:
void Gui(CameraC& camera) override
{
ImGui::Checkbox("Static", &camera.staticBoundingBox);
ImGui::Checkbox("Ui camera", &camera.uiCamera); // TODO: If this changes, the bounding box should be modified if it is not static
}
CameraC Create(Entity entity) override
{
return CameraC{BoundingBox{-1.0f, -1.0f, 1.0f, 1.0f}, false, false};
}
};
class UuidComponentHandler : public ComponentHandler<UuidC>
{
public:
UuidComponentHandler() : ComponentHandler{"Uuid", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
UuidC uuid;
uuid.uuid = Uuid{metaClass.GetValue("uuid")};
entity.AddComponent<UuidC>(uuid);
}
protected:
void ComponentGui(Entity entity) override {}
};
class HealthComponentHandler : public ComponentHandler<HealthC>
{
public:
HealthComponentHandler() : ComponentHandler{"Health", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
char* endPtr;
HealthC health;
health.max = std::strtol(metaClass.GetValue("health").c_str(), &endPtr, 10);
health.current = health.max;
entity.AddComponent<HealthC>(health);
}
protected:
void Gui(HealthC& health) override
{
ImGui::DragInt("Max Health", &health.max);
}
HealthC Create(Entity entity) override
{
return HealthC{10, 10};
}
};
class PhysicsComponentHandler : public ComponentHandler<PhysicsC>
{
public:
PhysicsComponentHandler() : ComponentHandler{"Physics", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
char* endPtr;
PhysicsC physics;
physics.mass = std::strtof(metaClass.GetValue("mass").c_str(), &endPtr);
entity.AddComponent<PhysicsC>(physics);
}
protected:
void Gui(PhysicsC& physics) override
{
ImGui::DragFloat("Mass", &physics.mass);
}
PhysicsC Create(Entity entity) override
{
return PhysicsC{10.0f};
}
};
class AnimationComponentHandler : public ComponentHandler<AnimationC>
{
public:
AnimationComponentHandler() : ComponentHandler{"Animation", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
char* endPtr;
AnimationC animation;
animation.sheetCoord = ReadVec2Opt(metaClass, "sheet-coord", glm::ivec2{0, 0});
animation.sheetSize = ReadVec2Opt(metaClass, "sheet-size", glm::ivec2{1, 1});
animation.images = std::strtol(metaClass.GetValue("images").c_str(), &endPtr, 10);
animation.horizontal = ReadBoolOpt(metaClass, "horizontal", true);
animation.time = std::strtof(metaClass.GetValue("time").c_str(), &endPtr);
entity.AddComponent<AnimationC>(animation);
}
protected:
void Gui(AnimationC& animation) override
{
ImGui::DragInt2("Sheet Size", (int*)&animation.sheetSize);
ImGui::DragInt2("Sheet Coord", (int*)&animation.sheetCoord, 1, 0, std::max(animation.sheetSize.x, animation.sheetSize.y));
ImGui::DragInt("Images", &animation.images);
ImGui::DragFloat("Frame time", &animation.time);
ImGui::Checkbox("Horizontal", &animation.horizontal);
}
AnimationC Create(Entity entity) override
{
return AnimationC{glm::ivec2{0, 0}, glm::ivec2{1, 1}, 1, true, 1.0f};
}
};
class DebugComponentHandler : public ComponentHandler<DebugC>
{
public:
DebugComponentHandler() : ComponentHandler{"Debug", false} {}
void Deserialize(Entity entity, const MetaFileClass& metaClass) override
{
DebugC debug;
debug.playerEntity = GetEntity(entity.GetManager(), Uuid{metaClass.GetValue("player-uuid")});
entity.AddComponent<DebugC>(debug);
}
protected:
void Gui(DebugC& debug) override
{
if (debug.playerEntity)
ImGui::Text("Player: %s", debug.playerEntity.GetComponent<NameC>().name.c_str());
else
ImGui::Text("No player attached");
}
DebugC Create(Entity entity) override
{
return DebugC{};
}
};
}