Merge pull request #19 from PolymorphEngine/dev

[merge] dev to master for alpha release

Author: 0xmemorygrinder

.idea/PolymorphEngine.iml

@@ -4,20 +4,40 @@ project(Engine)
 set(CMAKE_CXX_STANDARD 20)
 
 include_directories(
+        lib/myxmlpp/include
         include
-        include/Engine
-        include/Engine/component
-        include/Engine/entity
-        include/Engine/config
-        include/Engine/scene
-        include/Engine/Utilities
-        include/Engine/Utilities/Types
+        include/Core
+        include/Exceptions
+        include/Core/component
+        include/Core/component/builtins
+        include/Core/component/builtins/drawables
+        include/Core/component/builtins/colliders
+        include/Core/entity
+        include/Config
+        include/Core/scene
+        include/Core/settings
+        include/Utilities
+        include/Utilities/types
 )
 
+add_subdirectory(lib/myxmlpp)
+set_target_properties(myxmlpp PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
 file(GLOB_RECURSE SRC src/*.cpp)
 file(GLOB_RECURSE ICL include/*.hpp)
+file(GLOB_RECURSE ICL_HEADERS include/Polymorph/*.hpp)
 
-add_executable(Engine
+add_library(PolymorphEngine
         ${SRC}
         ${ICL}
-        )
+        ${ICL_HEADERS}
+)
+target_link_libraries(PolymorphEngine myxmlpp dl)
+target_link_options(PolymorphEngine PUBLIC "-Wl,--no-undefined")
+set_target_properties(PolymorphEngine PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+add_executable(TestMain EXCLUDE_FROM_ALL
+        SampleProject/test_main.cpp
+)
+
+target_link_libraries(TestMain PolymorphEngine)

.idea/inspectionProfiles/Project_Default.xml

@@ -871,7 +871,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = .
+INPUT                  = src include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -960,7 +960,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = docs clion-utilities
+EXCLUDE                =
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

.idea/misc.xml

@@ -0,0 +1,37 @@
+/*
+** EPITECH PROJECT, 2020
+** test_main.cpp
+** File description:
+** test_main.cpp
+*/
+
+#include <Polymorph/Core.hpp>
+#include <Polymorph/Debug.hpp>
+
+int main()
+{
+    std::string path = "./build";
+    std::string name = "Test";
+    
+    
+    try
+    {
+        Polymorph::Engine e = Polymorph::Engine(path, name);
+        e.loadGraphicalAPI("./lib/libarcade_sfml.so");
+        e.loadScriptingAPI(path + "/" +name + ".so");
+        e.loadEngine();
+        e.run();
+        e;
+    }
+    catch (ConfigurationException &e)
+    {
+        e.what();
+        return 84;
+    }
+    catch (std::exception& e)
+    {
+        std::cerr << e.what() << std::endl;
+        return 84;
+    }
+    return 0;
+}

.idea/modules.xml

@@ -5,20 +5,41 @@
 ** header for IComponentInitializer.c
 */
 
-#ifndef ENGINE_COMPONENTINITIALIZER_HPP
-#define ENGINE_COMPONENTINITIALIZER_HPP
+#ifndef ENGINE_ACOMPONENTINITIALIZER_HPP
+#define ENGINE_ACOMPONENTINITIALIZER_HPP
+
+#include <iostream>
+#include <memory>
 
-#include "config/XmlComponent.hpp"
-#include "config/XmlEntityRef.hpp"
-#include "Component.hpp"
 namespace Polymorph
 {
+    namespace Config {
+        class XmlComponent;
+    }
+    class Entity;
+
+    class Component;
     class AComponentInitializer {
+///////////////////////////////// Constructors /////////////////////////////////
+
+        public:
+            AComponentInitializer(std::string type, Config::XmlComponent &data, Entity &entity);
+
+///////////////////////////--------------------------///////////////////////////
+
+
+
+///////////////////////////////// Properties ///////////////////////////////////
+
+        protected:
+            std::shared_ptr<Component> component;
+            Config::XmlComponent &data;
+            std::string type;
+
 
         public:
-            AComponentInitializer(const std::string &type, Config::XmlComponent &data, Entity &entity)
-            : data(data), type(type){};
             virtual std::shared_ptr<Component> &build() = 0;
+
             virtual void reference() = 0;
 
             std::shared_ptr<Component> &get()
@@ -37,9 +58,10 @@ namespace Polymorph
             }
 
         protected:
-            std::shared_ptr<Component> component;
-            Config::XmlComponent &data;
-            std::string type;
+            void _init();
+///////////////////////////--------------------------///////////////////////////
     };
+
+
 }
-#endif //ENGINE_COMPONENTINITIALIZER_HPP
+#endif //ENGINE_ACOMPONENTINITIALIZER_HPP