Add adding components

TODO.md

@@ -2,19 +2,22 @@
 
 ## Fixme:
 
-- [*] The scene isn't render;
+- [ ] Move all 'Serialize' methods from the entities to the serializers;
 - [ ] Disable scroll like mouse for scene;
+- [ ] Fix lighting;
+- [*] The scene isn't render;
 - [*] Fix ImGui scene. Fit the render image to the scene;
 
 ## ImGui:
 
 - [ ] Make nice scene tree;
-  - [ ] Adding & removing nodes dialog;
   - [ ] Rename nodes;
   - [ ] Dragging nodes to change their position in the tree;
+  - [*] Adding & removing nodes dialog;
 - [ ] Make nice components editor;
-  - [ ] Adding & removing components;
+  - [ ] Removing components;
   - [ ] Enable/Disable components;
+  - [*] Adding components;
 - [ ] Change style;
 - [ ] Add Assets viewer;
 
@@ -31,4 +34,4 @@
 
 - [ ] Make build system faster;
 - [ ] Add CMakePresets & CI;
-- [ ] Add building for any platform;
+- [ ] Add building for any platform;

src/app_info/app_info.cpp

@@ -9,9 +9,9 @@
 
 #define LOG_LEVEL "Debug"
 
-#define GIT_COMMIT_HASH "0a2e0afbda0fbdf6d4d61a346aea3685539b0282-dirty"
-#define GIT_COMMIT_DATE "Tue Oct 25 08:48:22 2022"
-#define GIT_COMMIT_MESSAGE "Update TODO"
+#define GIT_COMMIT_HASH "2839200b4c78e1f0821554f940f78811b118071a-dirty"
+#define GIT_COMMIT_DATE "Tue Oct 25 14:32:22 2022"
+#define GIT_COMMIT_MESSAGE "Merge pull request #17 from seigtm/Golovinsky_Refactoring_And_improvements"
 
 namespace meov {
 

src/app_info/definitions.hpp

@@ -16,8 +16,8 @@ constexpr std::string_view Program_name{ "MEOV | Minimalistic Easy Object Viewer
 
 constexpr std::string_view LogLevel{ "Debug" };
 
-constexpr std::string_view GitCommitHash{ "0a2e0afbda0fbdf6d4d61a346aea3685539b0282-dirty" };
-constexpr std::string_view GitCommitDate{ "Tue Oct 25 08:48:22 2022" };
-constexpr std::string_view GitCommitMessage{ "Update TODO" };
+constexpr std::string_view GitCommitHash{ "2839200b4c78e1f0821554f940f78811b118071a-dirty" };
+constexpr std::string_view GitCommitDate{ "Tue Oct 25 14:32:22 2022" };
+constexpr std::string_view GitCommitMessage{ "Merge pull request #17 from seigtm/Golovinsky_Refactoring_And_improvements" };
 
 } // namespace meov::definitions

src/core/object/components/factory.cpp

@@ -0,0 +1,64 @@
+#include "factory.hpp"
+
+#include "object.hpp"
+#include "transform_component.hpp"
+#include "model_component.hpp"
+#include "move_component.hpp"
+#include "camera_component.hpp"
+#include "lighting_component.hpp"
+#include "skybox_component.hpp"
+#include "shader_component.hpp"
+
+
+namespace meov::core::components {
+
+template<class Component, class ...Argv>
+bool defaultGenerator(std::shared_ptr<Object> object, Argv &&...argv) {
+	return object->AddComponent<Component>(std::forward<Argv>(argv)...) != nullptr;
+}
+
+std::unordered_map<std::string, Factory::AddComponentMethod> Factory::mRegistry{
+	{ "transform", defaultGenerator<TransformComponent> },
+	{ "model", defaultGenerator<ModelComponent> },
+	{ "move", defaultGenerator<MoveComponent> },
+	// { "camera", defaultGenerator<CameraComponent> },
+	{ "directional_lighting", defaultGenerator<DirectionalLightingComponent> },
+	{ "point_lighting", defaultGenerator<PointLightingComponent> },
+	{ "spot_lighting", defaultGenerator<SpotLightingComponent> },
+	{ "skybox", defaultGenerator<SkyboxComponent> },
+	// { "shader", defaultGenerator<ShaderComponent> },
+};
+
+void Factory::Register(std::string &&name, AddComponentMethod &&method) {
+	if (!name.empty() && method);
+		mRegistry.emplace(std::move(name), std::move(method));
+}
+
+void Factory::Build(std::shared_ptr<Object> object, const std::vector<std::string> &components) {
+	if (object == nullptr || components.empty())
+		return;
+
+	for (const auto &component : components) {
+		Build(object, component);
+	}
+}
+
+void Factory::Build(std::shared_ptr<Object> object, const std::string &component) {
+	if (object == nullptr || component.empty())
+		return;
+	if (auto found{ mRegistry.find(component) }; found != mRegistry.end()) {
+		found->second(object);
+	}
+}
+
+std::vector<std::string> Factory::GetComponents() {
+	std::vector<std::string> components;
+	components.reserve(mRegistry.size());
+	std::transform(mRegistry.begin(), mRegistry.end(), std::back_inserter(components),
+		[] (const auto &pair) { return pair.first; });
+	return components;
+}
+
+} // namespace meov::core::components
+
+

src/core/object/components/factory.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <unordered_map>
+#include <functional>
+#include <string>
+#include <memory>
+#include <vector>
+
+namespace meov::core {
+class Object;
+} // namespace meov::core
+
+
+namespace meov::core::components {
+
+class Factory {
+public:
+	using AddComponentMethod = std::function<bool(std::shared_ptr<Object>)>;
+
+	static void Register(std::string &&name, AddComponentMethod &&method);
+
+	static void Build(std::shared_ptr<Object> object, const std::vector<std::string> &components);
+	static void Build(std::shared_ptr<Object> object, const std::string &component);
+
+	static std::vector<std::string> GetComponents();
+private:
+	static std::unordered_map<std::string, AddComponentMethod> mRegistry;
+};
+
+} // namespace meov::core::components

src/core/object/components/lighting_component/lighting_component.hpp

@@ -37,7 +37,7 @@ class LightingComponent : public Component {
 
 class DirectionalLightingComponent final : public LightingComponent {
 public:
-    explicit DirectionalLightingComponent(glm::vec3 &&dir);
+    explicit DirectionalLightingComponent(glm::vec3 &&dir = {});
     ~DirectionalLightingComponent() override;
 
     void PreDraw(Graphics &) override;
@@ -74,7 +74,7 @@ class PointLightingComponent final : public LightingComponent {
 
 class SpotLightingComponent final : public LightingComponent {
 public:
-    explicit SpotLightingComponent(glm::vec3 &&dir);
+    explicit SpotLightingComponent(glm::vec3 &&dir = {});
     ~SpotLightingComponent() override;
 
     void PreDraw(Graphics &) override;

src/core/object/components/model_component/model_component.cpp

@@ -9,6 +9,9 @@
 
 namespace meov::core::components {
 
+ModelComponent::ModelComponent()
+    : Component{ "Model component" } {}
+
 ModelComponent::ModelComponent(const fs::path &model)
     : Component{ "Model component" }
     , mModel{ RESOURCES->LoadModel(model) } {}

src/core/object/components/model_component/model_component.hpp

@@ -8,6 +8,7 @@ namespace meov::core::components {
 
 class ModelComponent : public Component {
 public:
+    ModelComponent();
     explicit ModelComponent(const fs::path &model);
     explicit ModelComponent(const std::shared_ptr<core::Model> &model);
     ~ModelComponent() override = default;

src/core/object/components/skybox_component/skybox_component.hpp

@@ -9,7 +9,7 @@ namespace meov::core::components {
 
 class SkyboxComponent : public Component {
 public:
-    explicit SkyboxComponent(const fs::path &path);
+    SkyboxComponent(const fs::path &path = "models/skybox");
     ~SkyboxComponent() override = default;
 
     void PreDraw(Graphics &g) override;

src/utils/scope_wrapper/scope_wrapper.hpp

@@ -9,6 +9,9 @@ class ScopeWrapper {
 		: mDestructorCallback{ std::move(dCallback) } {
 		cCallback();
 	}
+
+	explicit ScopeWrapper(DestructorCallback &&dCallback) : mDestructorCallback{ std::move(dCallback) } {}
+
 	~ScopeWrapper() {
 		mDestructorCallback();
 	}

src/windows/properties/properties_window.cpp

@@ -4,11 +4,15 @@
 
 #include "object.hpp"
 #include "component.hpp"
+#include "factory.hpp"
 
 namespace meov::Window {
 
 Properties::Properties(ImVec2 const &size, bool isClosable)
-    : Base{ "Properties", size, isClosable } {}
+    : Base{ "Properties", size, isClosable }
+    , mComponents{ core::components::Factory::GetComponents() }
+    , mSelectedComponent{ mComponents.begin() } {
+}
 
 void Properties::Select(std::vector<std::weak_ptr<core::Object>> &&object) {
     mObjects = std::move(object);
@@ -32,11 +36,10 @@ void Properties::DrawImpl() {
                 ImGui::Separator();
             });
 
-            if (ImGui::BeginCombo("Components", "transform")) {
-                ImGui::EndCombo();
-            }
+            DrawComponentsDropBox();
+            ImGui::SameLine();
             if (ImGui::Button("Add component")) {
-                // core::components::Factory::Build(obj, "component");
+                core::components::Factory::Build(obj, *mSelectedComponent);
             }
             ImGui::Unindent();
             ImGui::PopID();
@@ -45,4 +48,20 @@ void Properties::DrawImpl() {
     }
 }
 
+void Properties::DrawComponentsDropBox() {
+    if (!ImGui::BeginCombo("##Components", mSelectedComponent->c_str()))
+        return;
+    for (auto current{ mComponents.begin() }; current != mComponents.end(); ++current) {
+        const bool isSelected{ mSelectedComponent == current };
+        if (ImGui::Selectable(current->c_str(), isSelected))
+            mSelectedComponent = current;
+
+        // Set the initial focus when opening the combo (scrolling + keyboard navigation focus)
+        if (isSelected)
+            ImGui::SetItemDefaultFocus();
+    }
+
+    ImGui::EndCombo();
+}
+
 }  // namespace meov::Window

src/windows/properties/properties_window.hpp

@@ -18,8 +18,11 @@ class Properties final : public Base {
 
 private:
     std::vector<std::weak_ptr<core::Object>> mObjects;
+    const std::vector<std::string> mComponents;
+    std::vector<std::string>::const_iterator mSelectedComponent;
 
     void DrawImpl() override;
+    void DrawComponentsDropBox();
 };
 
 }  // namespace meov::Window