diff --git a/README.md b/README.md index 7a488299..a5681631 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,18 @@ #### Bundled libraries Libraries bundled along with binaries for Windows (MSVC14), available as a submodule in the *deps* directory of the source tree. -| Project | Version | License | -| ------------------------------------------------------------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| **[GLFW](http://www.glfw.org)** | 3.1.2 | [zlib/libpng License](http://www.glfw.org/license.html) | -| **[GLM](http://glm.g-truc.net/0.9.5/index.html)** | 0.9.7.1 | [MIT License](http://glm.g-truc.net/copying.txt) | -| **[GLEW](http://glew.sourceforge.net)** | 1.13.0 | [Modified BSD License](http://glew.sourceforge.net/glew.txt), [Mesa 3-D License](http://glew.sourceforge.net/mesa.txt), [Khronos License](http://glew.sourceforge.net/khronos.txt) | -| **[Assimp](http://assimp.sourceforge.net)** | 3.1.1 | [BSD 3-Clause License](http://assimp.sourceforge.net/main_license.html) | -| **[zlib](http://www.zlib.net)** | 1.28 | [zlib License](http://www.zlib.net/zlib_license.html) | -| **[libpng](http://www.libpng.org/pub/png/libpng.html)** | 1.6.19 | [libpng License](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt) | -| **[Xerces-C++](https://xerces.apache.org/xerces-c)** | 3.1.2 | [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) | -| **[ImGui](https://github.com/ocornut/imgui)** | 2015-12-12 | [MIT License](https://github.com/ocornut/imgui/blob/de3a154f3801de22c8e0bd2aeabf663a70c05972/LICENSE) -| **[OpenAL](https://www.openal.org/)** | 1.1 | [OpenAL License](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt) | +| Project | Version | License | +| ---------------------------------------------------------------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **[GLFW](http://www.glfw.org)** | 3.1.2 | [zlib/libpng License](http://www.glfw.org/license.html) | +| **[GLM](http://glm.g-truc.net/0.9.5/index.html)** | 0.9.7.1 | [MIT License](http://glm.g-truc.net/copying.txt) | +| **[GLEW](http://glew.sourceforge.net)** | 1.13.0 | [Modified BSD License](http://glew.sourceforge.net/glew.txt), [Mesa 3-D License](http://glew.sourceforge.net/mesa.txt), [Khronos License](http://glew.sourceforge.net/khronos.txt) | +| **[Assimp](http://assimp.sourceforge.net)** | 3.1.1 | [BSD 3-Clause License](http://assimp.sourceforge.net/main_license.html) | +| **[zlib](http://www.zlib.net)** | 1.28 | [zlib License](http://www.zlib.net/zlib_license.html) | +| **[libpng](http://www.libpng.org/pub/png/libpng.html)** | 1.6.19 | [libpng License](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt) | +| **[Xerces-C++](https://xerces.apache.org/xerces-c)** | 3.1.2 | [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) | +| **[ImGui](https://github.com/ocornut/imgui)** | 2015-12-12 | [MIT License](https://github.com/ocornut/imgui/blob/de3a154f3801de22c8e0bd2aeabf663a70c05972/LICENSE) | +| **[nativefiledialog](https://github.com/mlabbe/nativefiledialog) | 2016-01-08 | https://github.com/mlabbe/nativefiledialog/blob/master/LICENSE | +| **[OpenAL](https://www.openal.org/)** | 1.1 | [OpenAL License]() | #### External libraries Libraries that are too big to be bundled with the project. diff --git a/deps b/deps index 293516d6..bf83f099 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit 293516d671b97de26594fe979b7898b7e271e24c +Subproject commit bf83f099ba16f0a87f9bebe8cfc5fd4e59fee805 diff --git a/include/Engine/Core/ComponentInfo.h b/include/Engine/Core/ComponentInfo.h index ee5f1a11..abf4ff15 100644 --- a/include/Engine/Core/ComponentInfo.h +++ b/include/Engine/Core/ComponentInfo.h @@ -12,9 +12,16 @@ struct ComponentInfo unsigned int Stride = 0; }; + struct Field_t + { + std::string Type; + unsigned int Offset; + unsigned int Stride; + }; + std::string Name; - std::unordered_map FieldTypes; - std::unordered_map FieldOffsets; + std::unordered_map Fields; + std::vector FieldsInOrder; Meta_t Meta; std::shared_ptr Defaults = nullptr; }; diff --git a/include/Engine/Core/ComponentWrapper.h b/include/Engine/Core/ComponentWrapper.h index 56ae943f..922b3d79 100644 --- a/include/Engine/Core/ComponentWrapper.h +++ b/include/Engine/Core/ComponentWrapper.h @@ -21,7 +21,7 @@ struct ComponentWrapper template T& Property(std::string name) { - unsigned int offset = Info.FieldOffsets.at(name); + unsigned int offset = Info.Fields.at(name).Offset; return *reinterpret_cast(&Data[offset]); } @@ -78,8 +78,9 @@ public: void AddProperty(std::string fieldName, T defaultValue) { m_DefaultValues.push_back(defaultValue); - m_ComponentInfo.FieldTypes[fieldName] = typeid(T).name(); - m_ComponentInfo.FieldOffsets[fieldName] = m_ComponentInfo.Meta.Stride; + m_ComponentInfo.Fields[fieldName].Name = typeid(T).name(); + m_ComponentInfo.Fields[fieldName].Offset = m_ComponentInfo.Meta.Stride; + m_ComponentInfo.Fields[fieldName].Stride = sizeof(T); m_ComponentInfo.Meta.Stride += sizeof(T); } diff --git a/include/Engine/Core/EPlayerDamage.h b/include/Engine/Core/EPlayerDamage.h new file mode 100644 index 00000000..87ad67aa --- /dev/null +++ b/include/Engine/Core/EPlayerDamage.h @@ -0,0 +1,20 @@ +#ifndef EPlayerDamage_h__ +#define EPlayerDamage_h__ + +#include "EventBroker.h" +#include "../Core/Entity.h" + +namespace Events +{ + +struct PlayerDamage : Event +{ + double DamageAmount; + EntityID PlayerDamagedID; + //optional TypeOfDamage + std::string TypeOfDamage; +}; + +} + +#endif \ No newline at end of file diff --git a/include/Engine/Core/EPlayerDeath.h b/include/Engine/Core/EPlayerDeath.h new file mode 100644 index 00000000..00ede5ed --- /dev/null +++ b/include/Engine/Core/EPlayerDeath.h @@ -0,0 +1,20 @@ +#ifndef EPlayerDeath_h__ +#define EPlayerDeath_h__ + +#include "EventBroker.h" +#include "../Core/Entity.h" + +namespace Events +{ + +struct PlayerDeath : Event +{ + //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system + EntityID KilledBy; + EntityID PlayerID; + std::string KilledByWhat; +}; + +} + +#endif \ No newline at end of file diff --git a/include/Engine/Core/EPlayerHealthPickup.h b/include/Engine/Core/EPlayerHealthPickup.h new file mode 100644 index 00000000..f3158f92 --- /dev/null +++ b/include/Engine/Core/EPlayerHealthPickup.h @@ -0,0 +1,18 @@ +#ifndef EPlayerHealthPickup_h__ +#define EPlayerHealthPickup_h__ + +#include "EventBroker.h" +#include "../Core/Entity.h" + +namespace Events +{ + +struct PlayerHealthPickup : Event +{ + double HealthAmount; + EntityID PlayerHealedID; +}; + +} + +#endif \ No newline at end of file diff --git a/include/Engine/Core/Entity.h b/include/Engine/Core/Entity.h index c6a475e3..1f40b9b7 100644 --- a/include/Engine/Core/Entity.h +++ b/include/Engine/Core/Entity.h @@ -2,5 +2,6 @@ #define Entity_h__ typedef unsigned int EntityID; +const static unsigned int EntityID_Invalid = -1; #endif \ No newline at end of file diff --git a/include/Engine/Core/EntityFile.h b/include/Engine/Core/EntityFile.h new file mode 100644 index 00000000..27115264 --- /dev/null +++ b/include/Engine/Core/EntityFile.h @@ -0,0 +1,293 @@ +#ifndef EntityFile_h__ +#define EntityFile_h__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../GLM.h" +#include "Util/XercesString.h" +#include "ResourceManager.h" +#include "Entity.h" +#include "ComponentInfo.h" + +class EntityFileHandler +{ + friend class EntityFileSAXHandler; +public: + // @param EntityID The entity found + // @param EntityID The parent of the entity + typedef std::function OnStartEntityCallback; + void SetStartEntityCallback(OnStartEntityCallback c) { m_OnStartEntityCallback = c; } + // @param EntityID The entity the component corresponds to + // @param std::string Type name of the component + typedef std::function OnStartComponentCallback; + void SetStartComponentCallback(OnStartComponentCallback c) { m_OnStartComponentCallback = c; } + // @param EntityID Entity + // @param std::string Component name + // @param std::string Field name + // @param std::map Field attribute names and values + typedef std::function&)> OnStartFieldCallback; + void SetStartFieldCallback(OnStartFieldCallback c) { m_OnStartFieldCallback = c; } + // @param EntityID Entity + // @param std::string Component name + // @param std::string Field name + // @param char* Field data + typedef std::function OnStartFieldDataCallback; + void SetStartFieldDataCallback(OnStartFieldDataCallback c) { m_OnStartFieldDataCallback = c; } + +private: + OnStartEntityCallback m_OnStartEntityCallback = nullptr; + OnStartComponentCallback m_OnStartComponentCallback = nullptr; + OnStartFieldCallback m_OnStartFieldCallback = nullptr; + OnStartFieldDataCallback m_OnStartFieldDataCallback = nullptr; +}; + +class EntityFileSAXHandler : public xercesc::DefaultHandler +{ +public: + enum class State + { + Unknown, + Entity, + Component, + ComponentField + }; + + EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) + : m_Handler(handler) + , m_Reader(reader) + { + // 0 is imaginary world entity + m_EntityStack.push(0); + m_StateStack.push(State::Unknown); + } + + void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override + { + std::string name = XS::ToString(_localName); + + if (m_StateStack.top() == State::Unknown || m_StateStack.top() == State::Entity) { + if (name == "Entity") { + m_StateStack.push(State::Entity); + onStartEntity(attrs); + return; + } + if (name == "EntityRef") { + onStartEntityRef(attrs); + return; + } + } + + std::string uri = XS::ToString(_uri); + if (m_StateStack.top() == State::Entity) { + if (uri == "components") { + m_StateStack.push(State::Component); + onStartComponent(name); + return; + } + } + + if (m_StateStack.top() == State::Component) { + m_StateStack.push(State::ComponentField); + onStartComponentField(name, attrs); + return; + } + } + + void characters(const XMLCh* const chars, const XMLSize_t length) override + { + if (m_StateStack.top() == State::ComponentField) { + char* transcoded = xercesc::XMLString::transcode(chars); + onFieldData(transcoded); + } + } + + void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override + { + std::string name = XS::ToString(_localName); + if (m_StateStack.top() == State::Entity) { + if (name == "Entity") { + m_StateStack.pop(); + onEndEntity(); + return; + } + } + + std::string uri = XS::ToString(_uri); + if (m_StateStack.top() == State::Component) { + //if (uri == "components") { + m_StateStack.pop(); + onEndComponent(name); + return; + //} + } + + if (m_StateStack.top() == State::ComponentField) { + m_StateStack.pop(); + onEndComponentField(name); + return; + } + } + + void fatalError(const xercesc::SAXParseException& e) + { + XS::ToString s(e.getMessage()); + LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str()); + //throw e; + } + +private: + const EntityFileHandler* m_Handler; + xercesc::XMLGrammarPool* m_GrammarPool; + xercesc::SAX2XMLReader* m_Reader; + //State m_CurrentScope = State::Unknown; + std::stack m_StateStack; + unsigned int m_NextEntityID = 0; + std::stack m_EntityStack; + std::string m_CurrentComponent; + std::string m_CurrentField; + std::map m_CurrentAttributes; + + void onStartEntity(const xercesc::Attributes& attrs) + { + EntityID parent = m_EntityStack.top(); + + if (m_Handler->m_OnStartEntityCallback) { + std::string name; + auto xName = attrs.getValue(XS::ToXMLCh("name")); + if (xName != nullptr) { + name = XS::ToString(xName); + } + m_Handler->m_OnStartEntityCallback(m_NextEntityID, parent, name); + } + + m_EntityStack.push(m_NextEntityID); + m_NextEntityID++; + } + void onEndEntity() + { + m_EntityStack.pop(); + } + void onStartEntityRef(const xercesc::Attributes& attrs) + { + std::string path = XS::ToString(attrs.getValue(XS::ToXMLCh("file"))); + + xercesc::SAX2XMLReader* parser = xercesc::XMLReaderFactory::createXMLReader(); + parser->setContentHandler(this); + parser->setErrorHandler(this); + parser->parse(path.c_str()); + delete parser; + } + void onStartComponent(const std::string& name) + { + //LOG_DEBUG(" Component: %s", name.c_str()); + m_CurrentComponent = name; + if (m_Handler->m_OnStartComponentCallback) { + m_Handler->m_OnStartComponentCallback(m_EntityStack.top(), name); + } + } + void onEndComponent(const std::string& name) { } + void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs) + { + //LOG_DEBUG(" Field: %s", field.c_str()); + m_CurrentField = field; + m_CurrentAttributes.clear(); + for (int i = 0; i < attrs.getLength(); i++) { + auto name = attrs.getQName(i); + auto value = attrs.getValue(name); + //LOG_DEBUG(" %s = %s", (char*)XS::ToString(name), (char*)XS::ToString(value)); + m_CurrentAttributes[XS::ToString(name).operator std::string()] = XS::ToString(value).operator std::string(); + } + + if (m_Handler->m_OnStartFieldCallback) { + m_Handler->m_OnStartFieldCallback(m_EntityStack.top(), m_CurrentComponent, field, m_CurrentAttributes); + } + } + void onEndComponentField(const std::string& field) { } + + void onFieldData(char* data) + { + //LOG_DEBUG(" Data: %s", data); + + if (m_Handler->m_OnStartFieldDataCallback) { + m_Handler->m_OnStartFieldDataCallback(m_EntityStack.top(), m_CurrentComponent, m_CurrentField, data); + } + + xercesc::XMLString::release(&data); + } +}; + +class EntityFileXMLErrorHandler : public xercesc::ErrorHandler +{ +public: + void warning(const xercesc::SAXParseException& e) override + { + reportParseException("Warning", e); + } + void error(const xercesc::SAXParseException& e) override + { + reportParseException("Error", e); + } + void fatalError(const xercesc::SAXParseException& e) override + { + reportParseException("FATAL ERROR", e); + } + void resetErrors() override { } + +private: + void reportParseException(std::string type, const xercesc::SAXParseException& e) + { + char* message = xercesc::XMLString::transcode(e.getMessage()); + char* systemID = xercesc::XMLString::transcode(e.getSystemId()); + std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl; + std::cerr << type << ": " << message << std::endl; + xercesc::XMLString::release(&systemID); + xercesc::XMLString::release(&message); + } +}; + +class EntityFile : public Resource +{ + friend class ResourceManager; +private: + EntityFile(boost::filesystem::path path); + ~EntityFile(); + +public: + static std::size_t GetTypeStride(std::string typeName); + static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map& attributes); + static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData); + + xercesc::XMLGrammarPool* GrammarPool() const { return m_GrammarPool; } + + void Parse(const EntityFileHandler* handler) const; + +private: + boost::filesystem::path m_FilePath; + xercesc::XMLGrammarPool* m_GrammarPool; + xercesc::SAX2XMLReader* m_SAX2XMLReader; + //std::map m_ComponentInfo; + //std::vector m_EntityReferences; +}; + +#endif \ No newline at end of file diff --git a/include/Engine/Core/EntityFileParser.h b/include/Engine/Core/EntityFileParser.h new file mode 100644 index 00000000..d46b508b --- /dev/null +++ b/include/Engine/Core/EntityFileParser.h @@ -0,0 +1,28 @@ +#ifndef EntityFileParser_h__ +#define EntityFileParser_h__ + +#include "EntityFile.h" +#include "World.h" + +class EntityFileParser +{ +public: + EntityFileParser(const EntityFile* entityFile); + + void MergeEntities(World* world); + +private: + const EntityFile* m_EntityFile; + EntityFileHandler m_Handler; + World* m_World = nullptr; + // Maps EntityIDs local to the file to real IDs in the world after they've been + // created in order to resolve parent-child relationships. + std::map m_EntityIDMapper; + + void onStartEntity(EntityID entity, EntityID parent, const std::string& name); + void onStartComponent(EntityID entity, const std::string& component); + void onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map& attributes); + void onFieldData(EntityID entity, const std::string& componentType, const std::string& fieldName, const char* fieldData); +}; + +#endif \ No newline at end of file diff --git a/include/Engine/Core/EntityFilePreprocessor.h b/include/Engine/Core/EntityFilePreprocessor.h new file mode 100644 index 00000000..3c3998b1 --- /dev/null +++ b/include/Engine/Core/EntityFilePreprocessor.h @@ -0,0 +1,36 @@ +#ifndef EntityFilePreprocessor_h__ +#define EntityFilePreprocessor_h__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Util/XercesString.h" +#include "ResourceManager.h" +#include "World.h" +#include "EntityFile.h" + +class EntityFilePreprocessor +{ +public: + EntityFilePreprocessor(const EntityFile* entityFile); + + void RegisterComponents(World* world); + +private: + const EntityFile* m_EntityFile; + std::map m_ComponentCounts; + std::map m_ComponentInfo; + + void onStartComponent(EntityID entity, std::string type); + void parseComponentInfo(); + void parseDefaults(); +}; + +#endif \ No newline at end of file diff --git a/include/Engine/Core/EntityFileWriter.h b/include/Engine/Core/EntityFileWriter.h new file mode 100644 index 00000000..b75bc145 --- /dev/null +++ b/include/Engine/Core/EntityFileWriter.h @@ -0,0 +1,39 @@ +#ifndef EntityFileWriter_h__ +#define EntityFileWriter_h__ + +#include +#include +#include +#include +#include + +#include "Util/XercesString.h" +#include "EntityFile.h" +#include "World.h" + +class EntityFileWriter +{ +public: + EntityFileWriter(boost::filesystem::path file) + : m_FilePath(file) + { + using namespace xercesc; + m_DOMImplementation = DOMImplementationRegistry::getDOMImplementation(XS::ToXMLCh("LS")); + m_DOMLSSerializer = static_cast(m_DOMImplementation)->createLSSerializer(); + m_DOMLSSerializer->getDomConfig()->setParameter(XMLUni::fgDOMWRTDiscardDefaultContent, true); + m_DOMLSSerializer->getDomConfig()->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, true); + } + + void WriteWorld(World* world); + void WriteEntity(World* world, EntityID entity); + +private: + boost::filesystem::path m_FilePath; + xercesc::DOMImplementation* m_DOMImplementation; + xercesc::DOMLSSerializer* m_DOMLSSerializer; + + void appendEntityChildren(xercesc::DOMElement* parentElement, const World* world, EntityID entity); + void appentEntityComponents(xercesc::DOMElement* parentElemetn, const World* world, EntityID entity); +}; + +#endif \ No newline at end of file diff --git a/include/Engine/Core/EntityXMLFile.h b/include/Engine/Core/EntityXMLFile.h deleted file mode 100644 index 6fa71dad..00000000 --- a/include/Engine/Core/EntityXMLFile.h +++ /dev/null @@ -1,141 +0,0 @@ -#ifndef EntityXMLFile_h__ -#define EntityXMLFile_h__ - -#include - -#include "../Common.h" -#include "../GLM.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ResourceManager.h" -#include "Entity.h" -#include "ComponentInfo.h" -class World; - -class EntityPreprocessorXMLErrorHandler : public xercesc::DOMErrorHandler -{ -public: - bool handleError(const xercesc::DOMError &e) override - { - char* message = xercesc::XMLString::transcode(e.getMessage()); - std::cerr << "Preprocessor DOMError: " << message << std::endl; - xercesc::XMLString::release(&message); - return false; - } -}; - -class EntityParserXMLErrorHandler : public xercesc::ErrorHandler -{ -public: - void warning(const xercesc::SAXParseException& e) override - { - reportParseException("Warning", e); - } - void error(const xercesc::SAXParseException& e) override - { - reportParseException("Error", e); - } - void fatalError(const xercesc::SAXParseException& e) override - { - reportParseException("FATAL ERROR", e); - } - void resetErrors() override { } - -private: - void reportParseException(std::string type, const xercesc::SAXParseException& e) - { - char* message = xercesc::XMLString::transcode(e.getMessage()); - char* systemID = xercesc::XMLString::transcode(e.getSystemId()); - std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl; - std::cerr << type << ": " << message << std::endl; - xercesc::XMLString::release(&systemID); - xercesc::XMLString::release(&message); - } -}; - -class XSTR -{ -public: - XSTR(const XMLCh* const xmlString) - { - m_AsChar = xercesc::XMLString::transcode(xmlString); - } - - XSTR(const char* normalString) - { - m_AsXMLCh = xercesc::XMLString::transcode(normalString); - } - - ~XSTR() - { - if (m_AsChar != nullptr) { - xercesc::XMLString::release(&m_AsChar); - } - if (m_AsXMLCh != nullptr) { - xercesc::XMLString::release(&m_AsXMLCh); - } - } - - operator const char*() const { return m_AsChar; } - operator const XMLCh*() const { return m_AsXMLCh; } - -private: - char* m_AsChar = nullptr; - XMLCh* m_AsXMLCh = nullptr; -}; - -class EntityXMLFile : public Resource -{ - friend class ResourceManager; - -private: - EntityXMLFile(std::string path); - -public: - ~EntityXMLFile(); - - void PopulateWorld(World* world); - -private: - static unsigned int InstanceCount; - - std::string m_EntityFile; - xercesc::XMLGrammarPool* m_GrammarPool = nullptr; - EntityParserXMLErrorHandler* m_ErrorHandler = nullptr; - xercesc::XercesDOMParser* m_DOMParser = nullptr; - xercesc::DOMDocument* m_DOMDocument = nullptr; - std::map m_ComponentInfo; - - // Preprocesses the entity file to insert include-by-copy child entities - // TODO: Make this work in memory instead of saving to file - void preprocess(std::string inPath, std::string outPath); - - void parseComponentInfo(); - void parseDefaults(); - void predictComponentAllocation(); - void parseEntityGraph(World* world, xercesc::DOMElement* parent, EntityID parentEntity); - std::size_t getTypeStride(std::string typeName); - float getFloatAttribute(const xercesc::DOMElement* element, const char* attribute) const; - void writeData(const xercesc::DOMElement* element, std::string typeName, char* outData); -}; - -#endif \ No newline at end of file diff --git a/include/Engine/Core/SystemPipeline.h b/include/Engine/Core/SystemPipeline.h index 4aaa5163..d6a6b371 100644 --- a/include/Engine/Core/SystemPipeline.h +++ b/include/Engine/Core/SystemPipeline.h @@ -14,21 +14,28 @@ public: { } ~SystemPipeline() { - for (auto& pair : m_Systems) { - delete pair.second; + for (UnorderedSystems& group : m_OrderedSystemGroups) { + for (auto& pair : group.Systems) { + delete pair.second; + } } } template - void AddSystem(Arguments... args) + //All systems with orderlevel 0 will be updated first, then 1, 2, etc. + void AddSystem(int updateOrderLevel, Arguments... args) { + if (updateOrderLevel + 1 > m_OrderedSystemGroups.size()) { + m_OrderedSystemGroups.resize(updateOrderLevel + 1); + } + UnorderedSystems& group = m_OrderedSystemGroups[updateOrderLevel]; System* system = new T(m_EventBroker, args...); - m_Systems[typeid(T).name()] = system; + group.Systems[typeid(T).name()] = system; if (std::is_base_of::value) { PureSystem* pureSystem = static_cast(system); if (!pureSystem->m_ComponentType.empty()) { - m_PureSystems[pureSystem->m_ComponentType].push_back(pureSystem); + group.PureSystems[pureSystem->m_ComponentType].push_back(pureSystem); } else { LOG_ERROR("Failed to add pure system \"%s\": Missing component type!", typeid(T).name()); } @@ -36,41 +43,47 @@ public: if (std::is_base_of::value) { ImpureSystem* impureSystem = static_cast(system); - m_ImpureSystems.push_back(impureSystem); + group.ImpureSystems.push_back(impureSystem); } } void Update(World* world, double dt) { - // Process events - for (auto& pair : m_Systems) { - m_EventBroker->Process(pair.first); - } - - // Update - for (auto& pair : m_PureSystems) { - const std::string& componentName = pair.first; - auto& systems = pair.second; - const ComponentPool* pool = world->GetComponents(componentName); - if (pool == nullptr) { - continue; + for (UnorderedSystems& group : m_OrderedSystemGroups) { + // Process events + for (auto& pair : group.Systems) { + m_EventBroker->Process(pair.first); } - for (auto& component : *pool) { - for (auto& system : systems) { - system->UpdateComponent(world, component, dt); + + // Update + for (auto& pair : group.PureSystems) { + const std::string& componentName = pair.first; + auto& systems = pair.second; + const ComponentPool* pool = world->GetComponents(componentName); + if (pool == nullptr) { + continue; + } + for (auto& component : *pool) { + for (auto& system : systems) { + system->UpdateComponent(world, component, dt); + } } } - } - for (auto& system : m_ImpureSystems) { - system->Update(world, dt); + for (auto& system : group.ImpureSystems) { + system->Update(world, dt); + } } } private: EventBroker* m_EventBroker; - std::map m_Systems; - std::map> m_PureSystems; - std::vector m_ImpureSystems; + struct UnorderedSystems + { + std::map Systems; + std::map> PureSystems; + std::vector ImpureSystems; + }; + std::vector m_OrderedSystemGroups; }; #endif \ No newline at end of file diff --git a/include/Engine/Core/Util/XercesString.h b/include/Engine/Core/Util/XercesString.h new file mode 100644 index 00000000..b0b6fa76 --- /dev/null +++ b/include/Engine/Core/Util/XercesString.h @@ -0,0 +1,46 @@ +#ifndef Util_XercesString_h__ +#define Util_XercesString_h__ + +#include +#include +#include + +namespace XS +{ + +class ToString +{ +public: + ToString(const XMLCh* const str) { m_AsChar = xercesc::XMLString::transcode(str); } + ~ToString() + { + if (m_AsChar != nullptr) { + xercesc::XMLString::release(&m_AsChar); + } + } + + operator std::string() const { return std::string(m_AsChar); } +private: + char* m_AsChar = nullptr; +}; + +class ToXMLCh +{ +public: + ToXMLCh(const std::string str) { m_Transcoded = xercesc::XMLString::transcode(str.c_str()); } + ToXMLCh(const char* str) { m_Transcoded = xercesc::XMLString::transcode(str); } + ~ToXMLCh() + { + if (m_Transcoded != nullptr) { + xercesc::XMLString::release(&m_Transcoded); + } + } + + operator const XMLCh*() const { return m_Transcoded; } +private: + XMLCh* m_Transcoded = nullptr; +}; + +} + +#endif diff --git a/include/Engine/Core/World.h b/include/Engine/Core/World.h index 92378816..0a121728 100644 --- a/include/Engine/Core/World.h +++ b/include/Engine/Core/World.h @@ -16,13 +16,14 @@ public: EntityID CreateEntity(EntityID parent = 0); // Delete entity and all components within void DeleteEntity(EntityID entity); - + // Check if an entity exists + bool ValidEntity(EntityID entity) const; // Register a component type and allocate space for it void RegisterComponent(ComponentInfo& ci); // Attach a component to an entity and fill it with default values ComponentWrapper AttachComponent(EntityID entity, std::string componentType); // Check if an entity has a component - bool HasComponent(EntityID entity, std::string componentType); + bool HasComponent(EntityID entity, std::string componentType) const; // Get a component of an entity ComponentWrapper GetComponent(EntityID entity, std::string componentType); // Delete a component off an entity @@ -37,14 +38,19 @@ public: const std::unordered_map& GetComponentPools() const { return m_ComponentPools; } // Get the entity children map const std::unordered_multimap& GetEntityChildren() const { return m_EntityChildren; } + // Set the textual name of an entity + void SetName(EntityID entity, const std::string& name); + // Get the textual name of an entity + std::string GetName(EntityID entity) const; private: - EntityID m_CurrentEntityID = 1; + EntityID m_CurrentEntityID = 0; std::unordered_map m_EntityParents; // TODO: This should be a more effective structure std::unordered_multimap m_EntityChildren; std::unordered_map m_ComponentPools; + std::unordered_map m_EntityNames; EntityID generateEntityID(); }; diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index 779b7f97..6b9b7a21 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -1,6 +1,7 @@ #include #include #include +#include #include "../Core/System.h" #include "../Core/EMousePress.h" #include "../Core/EMouseRelease.h" @@ -11,6 +12,9 @@ #include "../Rendering/EPicking.h" #include "../Core/EFileDropped.h" #include "../Rendering/RenderQueueFactory.h" +#include "../Core/EntityFilePreprocessor.h" +#include "../Core/EntityFileParser.h" +#include "../Core/EntityFileWriter.h" class EditorSystem : public ImpureSystem { @@ -25,6 +29,8 @@ private: bool m_Enabled; bool m_Visible; + boost::filesystem::path m_DefaultEntityDir; + boost::filesystem::path m_CurrentFile; std::vector m_PickingQueue; enum class WidgetMode @@ -41,22 +47,26 @@ private: Global } m_WidgetSpace = WidgetSpace::Global; - EntityID m_Widget = 0; - EntityID m_WidgetX = 0; - EntityID m_WidgetPlaneX = 0; - EntityID m_WidgetY = 0; - EntityID m_WidgetPlaneY = 0; - EntityID m_WidgetZ = 0; - EntityID m_WidgetPlaneZ = 0; - EntityID m_WidgetOrigin = 0; + EntityID m_Widget = EntityID_Invalid; + EntityID m_WidgetX = EntityID_Invalid; + EntityID m_WidgetPlaneX = EntityID_Invalid; + EntityID m_WidgetY = EntityID_Invalid; + EntityID m_WidgetPlaneY = EntityID_Invalid; + EntityID m_WidgetZ = EntityID_Invalid; + EntityID m_WidgetPlaneZ = EntityID_Invalid; + EntityID m_WidgetOrigin = EntityID_Invalid; glm::vec3 m_WidgetCurrentAxis; float m_WidgetPickingDepth = 0.f; - EntityID m_Selection = 0; - EntityID m_LastSelection = 0; + EntityID m_Selection = EntityID_Invalid; + EntityID m_LastSelection = EntityID_Invalid; + EntityID m_UIDraggingEntity = EntityID_Invalid; glm::vec3 m_Position; std::string m_LastDroppedFile; + static boost::filesystem::path openDialog(boost::filesystem::path defaultPath); + static boost::filesystem::path saveDialog(boost::filesystem::path defaultPath); + EventRelay m_EInputCommand; bool OnInputCommand(const Events::InputCommand& e); EventRelay m_EMouseRelease; @@ -70,10 +80,15 @@ private: EventRelay m_EFileDropped; bool OnFileDropped(const Events::FileDropped& e); + void createWidget(); void updateWidget(); void setWidgetMode(WidgetMode newMode); void setWidgetSpace(WidgetSpace space); void drawUI(World* world, double dt); bool createDeleteButton(std::string componentType); + bool createEntityNode(World* world, EntityID entity); void changeParent(EntityID entity, EntityID newParent); + void fileImport(World* world); + void fileSave(World* world); + void fileSaveAs(World* world); }; \ No newline at end of file diff --git a/include/Engine/Rendering/EPicking.h b/include/Engine/Rendering/EPicking.h index 85c4b629..8ee252f0 100644 --- a/include/Engine/Rendering/EPicking.h +++ b/include/Engine/Rendering/EPicking.h @@ -51,7 +51,7 @@ public: if (it != PickingColorsToEntity->end()) { pickData.Entity = it->second; } else { - pickData.Entity = 0; + pickData.Entity = EntityID_Invalid; } pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, screenCoord.y, data.Depth, Resolution, ProjectionMatrix, ViewMatrix); diff --git a/include/Game/Game.h b/include/Game/Game.h index a4264840..eb854350 100644 --- a/include/Game/Game.h +++ b/include/Game/Game.h @@ -13,11 +13,13 @@ #include "Input/KeyboardInputHandler.h" #include "Input/MouseInputHandler.h" #include "Core/EKeyDown.h" -#include "Core/EntityXMLFile.h" +#include "Core/EntityFilePreprocessor.h" #include "Core/SystemPipeline.h" #include "RaptorCopterSystem.h" #include "PlayerSystem.h" #include "Editor/EditorSystem.h" +#include "Core/EntityFile.h" +#include "Core/EntityFileParser.h" // Network #include diff --git a/include/Game/HealthSystem.h b/include/Game/HealthSystem.h new file mode 100644 index 00000000..a836e797 --- /dev/null +++ b/include/Game/HealthSystem.h @@ -0,0 +1,36 @@ +#ifndef HealthSystem_h__ +#define HealthSystem_h__ + +#include +#include + +#include "Common.h" +#include "Core/System.h" +#include "Core\EPlayerDamage.h"; +#include "Core\EPlayerHealthPickup.h"; +#include "Core\EPlayerDeath.h"; + +#include +#include + +class HealthSystem : public PureSystem +{ +public: + HealthSystem(EventBroker* eventBroker); + + //updatecomponent + virtual void UpdateComponent(World* world, ComponentWrapper& health, double dt) override; + +private: + //methods which will take care of specific events + EventRelay m_EPlayerDamage; + bool HealthSystem::OnPlayerDamaged(const Events::PlayerDamage& e); + EventRelay m_EPlayerHealthPickup; + bool HealthSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup& e); + + //vector which will keep track of health changes + std::vector> m_DeltaHealthVector; + +}; + +#endif \ No newline at end of file diff --git a/resources/Schema/Components.xsd b/resources/Schema/Components.xsd index a287431c..10959882 100644 --- a/resources/Schema/Components.xsd +++ b/resources/Schema/Components.xsd @@ -8,6 +8,7 @@ + \ No newline at end of file diff --git a/resources/Schema/Components/Health.xml b/resources/Schema/Components/Health.xml new file mode 100644 index 00000000..143a91d1 --- /dev/null +++ b/resources/Schema/Components/Health.xml @@ -0,0 +1,4 @@ + + 100 + 100 + \ No newline at end of file diff --git a/resources/Schema/Components/Health.xsd b/resources/Schema/Components/Health.xsd new file mode 100644 index 00000000..0da80c1f --- /dev/null +++ b/resources/Schema/Components/Health.xsd @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/Schema/Entities/Empty.xml b/resources/Schema/Entities/Empty.xml new file mode 100644 index 00000000..70581847 --- /dev/null +++ b/resources/Schema/Entities/Empty.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/resources/Schema/Entities/RaptorCopter.xml b/resources/Schema/Entities/RaptorCopter.xml new file mode 100644 index 00000000..0ee62368 --- /dev/null +++ b/resources/Schema/Entities/RaptorCopter.xml @@ -0,0 +1,68 @@ + + + + + + + + + + Models/Core/UnitRaptor.obj + + + + + + + + + + + + 20 + + + + + + + + + + + + Models/Core/UnitCylinder.obj + + + + + + + + + + + + + Models/Core/UnitCube.obj + + + + + + + + + + + + + Models/Core/UnitCube.obj + + + + + + + + \ No newline at end of file diff --git a/resources/Schema/Types/Entity.xsd b/resources/Schema/Types/Entity.xsd index 67612935..75f5310f 100644 --- a/resources/Schema/Types/Entity.xsd +++ b/resources/Schema/Types/Entity.xsd @@ -15,6 +15,7 @@ + @@ -25,11 +26,19 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt index 40bc9cb0..277cb617 100644 --- a/src/Engine/CMakeLists.txt +++ b/src/Engine/CMakeLists.txt @@ -97,12 +97,27 @@ set(SOURCE_FILES ${SOURCE_FILES_Rendering} ${SOURCE_FILES_Rendering_Util} ${SOURCE_FILES_Collision} + ${SOURCE_FILES_Editor} ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui.cpp ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_draw.cpp ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_demo.cpp - ${SOURCE_FILES_Editor} + ${CMAKE_SOURCE_DIR}/deps/include/nativefiledialog/nfd_common.c ) +# nativefiledialog +if(WIN32) + set(SOURCE_FILES ${SOURCE_FILES} + ${CMAKE_SOURCE_DIR}/deps/include/nativefiledialog/nfd_win.cpp + ) +endif() +if(UNIX) + set(SOURCE_FILES ${SOURCE_FILES} + ${CMAKE_SOURCE_DIR}/deps/include/nativefiledialog/nfd_gtk.c + # TODO: Link with GTK+ here! + ) +endif() + + set(LIBRARIES ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} diff --git a/src/Engine/Collision/CollisionSystem.cpp b/src/Engine/Collision/CollisionSystem.cpp index dec33a20..69929c6d 100644 --- a/src/Engine/Collision/CollisionSystem.cpp +++ b/src/Engine/Collision/CollisionSystem.cpp @@ -4,8 +4,6 @@ void CollisionSystem::UpdateComponent(World * world, ComponentWrapper & cAABB, double dt) { - //TODO: Update CollisionSystem system after PlayerSystem. - //Right now, cAABB is a component attached to any entity that should be collideable. AABB thisBox; if (!Collision::GetEntityBox(world, cAABB, thisBox)) { diff --git a/src/Engine/Core/EntityFile.cpp b/src/Engine/Core/EntityFile.cpp new file mode 100644 index 00000000..1e381df5 --- /dev/null +++ b/src/Engine/Core/EntityFile.cpp @@ -0,0 +1,95 @@ +#include "Core/EntityFile.h" + +EntityFile::EntityFile(boost::filesystem::path path) + : m_FilePath(path) +{ + using namespace xercesc; + XMLPlatformUtils::Initialize(); + m_GrammarPool = new XMLGrammarPoolImpl(); + m_SAX2XMLReader = XMLReaderFactory::createXMLReader(XMLPlatformUtils::fgMemoryManager, m_GrammarPool); +} + +EntityFile::~EntityFile() +{ + delete m_SAX2XMLReader; + delete m_GrammarPool; + xercesc::XMLPlatformUtils::Terminate(); +} + +void EntityFile::Parse(const EntityFileHandler* handler) const +{ + using namespace xercesc; + + EntityFileSAXHandler saxHandler(handler, nullptr); + m_SAX2XMLReader->setFeature(XMLUni::fgXercesCacheGrammarFromParse, true); + m_SAX2XMLReader->setFeature(XMLUni::fgXercesUseCachedGrammarInParse, true); + m_SAX2XMLReader->setContentHandler(&saxHandler); + m_SAX2XMLReader->setErrorHandler(&saxHandler); + m_SAX2XMLReader->setDeclarationHandler(&saxHandler); + m_SAX2XMLReader->parse(m_FilePath.string().c_str()); +} + +std::size_t EntityFile::GetTypeStride(std::string typeName) +{ + std::map typeStrides{ + { "bool", sizeof(bool) }, + { "int", sizeof(int) }, + { "float", sizeof(float) }, + { "double", sizeof(double) }, + { "string", sizeof(std::string) }, + { "Vector", sizeof(glm::vec3) }, + { "Quaternion", sizeof(glm::quat) }, + { "Color", sizeof(glm::vec4) } + }; + + auto it = typeStrides.find(typeName); + return (it != typeStrides.end()) ? it->second : 0; +} + +void EntityFile::WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map& attributes) +{ + if (field.Type == "Vector") { + glm::vec3 vec; + vec.x = boost::lexical_cast(attributes.at("X")); + vec.y = boost::lexical_cast(attributes.at("Y")); + vec.z = boost::lexical_cast(attributes.at("Z")); + memcpy(outData, reinterpret_cast(&vec), field.Stride); + } else if (field.Type == "Color") { + glm::vec4 vec; + vec.r = boost::lexical_cast(attributes.at("R")); + vec.g = boost::lexical_cast(attributes.at("G")); + vec.b = boost::lexical_cast(attributes.at("B")); + vec.a = boost::lexical_cast(attributes.at("A")); + memcpy(outData, reinterpret_cast(&vec), field.Stride); + } else if (field.Type == "Quaternion") { + glm::quat q; + q.x = boost::lexical_cast(attributes.at("X")); + q.y = boost::lexical_cast(attributes.at("Y")); + q.z = boost::lexical_cast(attributes.at("Z")); + q.w = boost::lexical_cast(attributes.at("W")); + memcpy(outData, reinterpret_cast(&q), field.Stride); + } else if (!attributes.empty()) { + LOG_WARNING("%i attributes not handled by any type conversion!", attributes.size()); + } +} + +void EntityFile::WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData) +{ + if (field.Type == "int") { + int value = boost::lexical_cast(valueData); + memcpy(outData, reinterpret_cast(&value), field.Stride); + } else if (field.Type == "float") { + float value = boost::lexical_cast(valueData); + memcpy(outData, reinterpret_cast(&value), field.Stride); + } else if (field.Type == "double") { + double value = boost::lexical_cast(valueData); + memcpy(outData, reinterpret_cast(&value), field.Stride); + } else if (field.Type == "bool") { + bool value = (valueData[0] == 't'); // Lazy bool evaluation + memcpy(outData, reinterpret_cast(&value), field.Stride); + } else if (field.Type == "string") { + new (outData) std::string(valueData); + } else { + LOG_WARNING("Unknown value data type: %s", field.Type.c_str()); + } +} diff --git a/src/Engine/Core/EntityFileParser.cpp b/src/Engine/Core/EntityFileParser.cpp new file mode 100644 index 00000000..541da01d --- /dev/null +++ b/src/Engine/Core/EntityFileParser.cpp @@ -0,0 +1,61 @@ +#include "Core/EntityFileParser.h" + +EntityFileParser::EntityFileParser(const EntityFile* entityFile) + : m_EntityFile(entityFile) +{ + m_Handler.SetStartEntityCallback(std::bind(&EntityFileParser::onStartEntity, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); + m_Handler.SetStartComponentCallback(std::bind(&EntityFileParser::onStartComponent, this, std::placeholders::_1, std::placeholders::_2)); + m_Handler.SetStartFieldCallback(std::bind(&EntityFileParser::onStartComponentField, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4)); + m_Handler.SetStartFieldDataCallback(std::bind(&EntityFileParser::onFieldData, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4)); +} + +void EntityFileParser::MergeEntities(World* world) +{ + m_World = world; + m_EntityIDMapper[0] = 0; + m_EntityFile->Parse(&m_Handler); +} + +void EntityFileParser::onStartEntity(EntityID entity, EntityID parent, const std::string& name) +{ + EntityID realParent = m_EntityIDMapper.at(parent); + EntityID realEntity = m_World->CreateEntity(realParent); + if (!name.empty()) { + m_World->SetName(realEntity, name); + } + m_EntityIDMapper[entity] = realEntity; + LOG_DEBUG("Created entity #%i (%i) with parent %i (%i)", entity, realEntity, parent, realParent); +} + +void EntityFileParser::onStartComponent(EntityID entity, const std::string& component) +{ + EntityID realEntity = m_EntityIDMapper.at(entity); + m_World->AttachComponent(realEntity, component); + LOG_DEBUG("Attached component of type \"%s\" to entity #%i (%i)", component.c_str(), entity, realEntity); +} + +void EntityFileParser::onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map& attributes) +{ + EntityID realEntity = m_EntityIDMapper.at(entity); + ComponentWrapper component = m_World->GetComponent(realEntity, componentType); + auto& field = component.Info.Fields.at(fieldName); + + LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str()); + LOG_DEBUG("Attributes:"); + for (auto& kv : attributes) { + LOG_DEBUG("\t%s = %s", kv.first.c_str(), kv.second.c_str()); + } + + char* data = component.Data + field.Offset; + EntityFile::WriteAttributeData(data, field, attributes); +} + +void EntityFileParser::onFieldData(EntityID entity, const std::string& componentType, const std::string& fieldName, const char* fieldData) +{ + EntityID realEntity = m_EntityIDMapper.at(entity); + ComponentWrapper component = m_World->GetComponent(realEntity, componentType); + auto& field = component.Info.Fields.at(fieldName); + + char* data = component.Data + field.Offset; + EntityFile::WriteValueData(data, field, fieldData); +} diff --git a/src/Engine/Core/EntityFilePreprocessor.cpp b/src/Engine/Core/EntityFilePreprocessor.cpp new file mode 100644 index 00000000..83e2fe28 --- /dev/null +++ b/src/Engine/Core/EntityFilePreprocessor.cpp @@ -0,0 +1,229 @@ +#include "Core/EntityFilePreprocessor.h" + +EntityFilePreprocessor::EntityFilePreprocessor(const EntityFile* entityFile) + : m_EntityFile(entityFile) +{ + EntityFileHandler handler; + handler.SetStartComponentCallback(std::bind(&EntityFilePreprocessor::onStartComponent, this, std::placeholders::_1, std::placeholders::_2)); + m_EntityFile->Parse(&handler); + + LOG_DEBUG("___ COMPONENT DEFINITIONS ___"); + for (auto& kv : m_ComponentCounts) { + LOG_DEBUG("%s: %i", kv.first.c_str(), kv.second); + } + + parseComponentInfo(); + + for (auto& kv : m_ComponentInfo) { + auto& info = kv.second; + LOG_DEBUG("Component: %s (%s)", info.Name.c_str(), info.Meta.Annotation.c_str()); + LOG_DEBUG("Stride: %i", info.Meta.Stride); + LOG_DEBUG("Allocation: %i", info.Meta.Allocation); + for (auto& kv : info.Fields) { + auto& field = kv.second; + LOG_DEBUG("\t%i\t%s %s", field.Offset, field.Type, kv.first.c_str()); + } + } + + parseDefaults(); +} + +void EntityFilePreprocessor::RegisterComponents(World* world) +{ + for (auto& kv : m_ComponentInfo) { + world->RegisterComponent(kv.second); + } +} + +void EntityFilePreprocessor::onStartComponent(EntityID entity, std::string type) +{ + //LOG_DEBUG("Component: %s", type.c_str()); + m_ComponentCounts[type]++; +} + +void EntityFilePreprocessor::parseComponentInfo() +{ + using namespace xercesc; + EntityFileXMLErrorHandler errorHandler; + auto grammarPool = m_EntityFile->GrammarPool(); + bool whateverTheFuckThisIs; + auto xsModel = grammarPool->getXSModel(whateverTheFuckThisIs); + + // Find component xsd element declarations + std::cout << "Enumerating components..." << std::endl; + // + auto topLevelElements = xsModel->getComponents(XSConstants::ELEMENT_DECLARATION); + for (unsigned int i = 0; i < topLevelElements->getLength(); ++i) { + auto element = static_cast(topLevelElements->item(i)); + + std::string nameSpace = XS::ToString(element->getNamespace()); + if (nameSpace != "components") { + continue; + } + + ComponentInfo compInfo; + + // Name + compInfo.Name = XS::ToString(element->getName()); + // Known allocation + compInfo.Meta.Allocation = m_ComponentCounts[compInfo.Name]; + // Annotation + auto componentAnnotation = element->getAnnotation(); + if (componentAnnotation != nullptr) { + // Parse annotation XML + char* annotationString = XMLString::transcode(componentAnnotation->getAnnotationString()); + MemBufInputSource annotationInput(reinterpret_cast(annotationString), strlen(annotationString), "MemBuf: Annotation String"); + XercesDOMParser parser(nullptr, XMLPlatformUtils::fgMemoryManager, grammarPool); + parser.setErrorHandler(&errorHandler); + parser.parse(annotationInput); + XMLString::release(&annotationString); + auto doc = parser.getDocument(); + + // TODO: Add allocation estimations from external file on map-to-map basis + // Add allocation estimation(s) + //auto allocationTags = doc->getElementsByTagName(XSTR("meta:allocation")); + //for (int i = 0; i < allocationTags->getLength(); ++i) { + // auto allocation = dynamic_cast(allocationTags->item(i)); + // auto child = allocation->getFirstChild(); + // if (child == nullptr) { + // continue; + // } + + // XSValue::Status status; + // XSValue* val = XSValue::getActualValue(child->getNodeValue(), XSValue::dt_integer, status); + // compInfo.Meta.Allocation += val->fData.fValue.f_int; + //} + + // Save documentation string + auto documentationTags = doc->getElementsByTagName(XS::ToXMLCh("xs:documentation")); + if (documentationTags->getLength() != 0) { + auto child = documentationTags->item(0)->getFirstChild(); + if (child != nullptr) { + compInfo.Meta.Annotation = XS::ToString(child->getNodeValue()); + } + } + } else { + LOG_WARNING("Component is missing an annotation!"); + } + + // + auto typeDefinition = element->getTypeDefinition(); + if (typeDefinition->getTypeCategory() != XSTypeDefinition::COMPLEX_TYPE) { + LOG_ERROR("Type definition wasn't COMPLEX_TYPE! Skipping."); + continue; + } + auto complexTypeDefinition = dynamic_cast(typeDefinition); + + // + auto modelGroupParticle = complexTypeDefinition->getParticle(); + if (modelGroupParticle->getTermType() != XSParticle::TERM_MODELGROUP) { + LOG_ERROR("Model group particle wasn't TERM_MODELGROUP! Skipping."); + continue; + } + auto modelGroup = modelGroupParticle->getModelGroupTerm(); + + // getParticles(); + for (unsigned int i = 0; i < particles->size(); ++i) { + auto particle = particles->elementAt(i); + if (particle->getTermType() != XSParticle::TERM_ELEMENT) { + LOG_ERROR("Particle wasn't TERM_ELEMENT! Skipping."); + continue; + } + auto elementDeclaration = particle->getElementTerm(); + + std::string name = XS::ToString(elementDeclaration->getName()); + std::string type = XS::ToString(elementDeclaration->getTypeDefinition()->getName()); + + size_t stride = EntityFile::GetTypeStride(type); + if (stride == 0) { + std::cout << "Warning: Field \"" << name << "\" in component \"" << compInfo.Name << "\" uses unexpected field type \"" << type << "\". Skipping." << std::endl; + continue; + } + + auto& field = compInfo.Fields[name]; + field.Type = type; + field.Offset = fieldOffset; + field.Stride = stride; + compInfo.FieldsInOrder.push_back(&field); + + fieldOffset += stride; + } + + compInfo.Meta.Stride = fieldOffset; + m_ComponentInfo[compInfo.Name] = compInfo; + } +} + +void EntityFilePreprocessor::parseDefaults() +{ + using namespace xercesc; + + EntityFileXMLErrorHandler errorHandler; + + for (auto& ci : m_ComponentInfo) { + // Allocate memory for default values + ci.second.Defaults = std::shared_ptr(new char[ci.second.Meta.Stride]); + memset(ci.second.Defaults.get(), 0, ci.second.Meta.Stride); + + XercesDOMParser parser(nullptr, XMLPlatformUtils::fgMemoryManager); + parser.setErrorHandler(&errorHandler); + + std::string componentName = ci.first; + LOG_DEBUG("Parsing defaults for component %s", componentName.c_str()); + boost::filesystem::path defaultsFile = "Schema/Components/" + componentName + ".xml"; + + parser.parse(defaultsFile.string().c_str()); + auto doc = parser.getDocument(); + if (doc == nullptr) { + LOG_ERROR("%s not found! Skipping.", defaultsFile.string().c_str()); + continue; + } + + // Find the node in the components namespace matching the component name + std::string tagName = "c:" + componentName; + auto rootNodes = doc->getElementsByTagName(XS::ToXMLCh(tagName)); + if (rootNodes->getLength() == 0) { + LOG_ERROR("Couldn't find defaults for component \"%s\"! Skipping.", componentName.c_str()); + continue; + } + auto componentElement = dynamic_cast(rootNodes->item(0)); + + // Fill the default value buffer with values + for (auto& kv : ci.second.Fields) { + std::string fieldName = kv.first; + auto& field = kv.second; + auto fieldNodes = componentElement->getElementsByTagName(XS::ToXMLCh(fieldName)); + auto fieldNode = fieldNodes->item(0); + if (fieldNode == nullptr) { + LOG_ERROR("Defaults for component \"%s\" is missing field \"%s\"!", componentName.c_str(), fieldName.c_str()); + continue; + } + auto fieldElement = dynamic_cast(fieldNode); + + char* data = ci.second.Defaults.get() + field.Offset; + + // Handle potential field attributes + if (fieldElement->hasAttributes()) { + std::map attributes; + auto attributeMap = fieldElement->getAttributes(); + for (int i = 0; i < attributeMap->getLength(); ++i) { + auto attribItem = attributeMap->item(i); + attributes[XS::ToString(attribItem->getNodeName())] = XS::ToString(attribItem->getNodeValue()); + } + EntityFile::WriteAttributeData(data, field, attributes); + } + + // Handle potential field values + auto childNode = fieldElement->getFirstChild(); + if (childNode != nullptr && childNode->getNodeType() == DOMNode::TEXT_NODE) { + char* cstrValue = XMLString::transcode(childNode->getNodeValue()); + EntityFile::WriteValueData(data, field, cstrValue); + XMLString::release(&cstrValue); + } + } + } +} + diff --git a/src/Engine/Core/EntityFileWriter.cpp b/src/Engine/Core/EntityFileWriter.cpp new file mode 100644 index 00000000..5b6c466d --- /dev/null +++ b/src/Engine/Core/EntityFileWriter.cpp @@ -0,0 +1,140 @@ +#include "Core/EntityFileWriter.h" + +#define X(str) XS::ToXMLCh(str) + +void EntityFileWriter::WriteWorld(World* world) +{ + WriteEntity(world, 0); +} + +void EntityFileWriter::WriteEntity(World* world, EntityID entity) +{ + using namespace xercesc; + DOMDocument* doc = m_DOMImplementation->createDocument(nullptr, X("Entity"), nullptr); + DOMElement* root = doc->getDocumentElement(); + root->setAttribute(X("xmlns:xsi"), X("http://www.w3.org/2001/XMLSchema-instance")); + root->setAttribute(X("xsi:noNamespaceSchemaLocation"), X("../Types/Entity.xsd")); + root->setAttribute(X("xmlns:c"), X("components")); + const std::string& name = world->GetName(entity); + if (!name.empty()) { + root->setAttribute(X("name"), X(name)); + } + + DOMElement* componentsElement = doc->createElement(X("Components")); + root->appendChild(componentsElement); + appentEntityComponents(componentsElement, world, entity); + + DOMElement* childrenElement = doc->createElement(X("Children")); + root->appendChild(childrenElement); + appendEntityChildren(childrenElement, world, entity); + + try { + LocalFileFormatTarget* target = new LocalFileFormatTarget(X(m_FilePath.string())); + DOMLSOutput* output = static_cast(m_DOMImplementation)->createLSOutput(); + output->setByteStream(target); + m_DOMLSSerializer->write(doc, output); + delete target; + } catch (const std::runtime_error& e) { + LOG_ERROR("Failed to save \"%s\": %s", m_FilePath.c_str(), e.what()); + } + + doc->release(); +} + +void EntityFileWriter::appendEntityChildren(xercesc::DOMElement* parentElement, const World* world, EntityID entity) +{ + using namespace xercesc; + DOMDocument* doc = parentElement->getOwnerDocument(); + + auto childrenRange = world->GetEntityChildren().equal_range(entity); + for (auto it = childrenRange.first; it != childrenRange.second; ++it) { + EntityID childEntity = it->second; + + DOMElement* entityElement = doc->createElement(X("Entity")); + const std::string& name = world->GetName(childEntity); + if (!name.empty()) { + entityElement->setAttribute(X("name"), X(name)); + } + parentElement->appendChild(entityElement); + + DOMElement* componentsElement = doc->createElement(X("Components")); + entityElement->appendChild(componentsElement); + appentEntityComponents(componentsElement, world, childEntity); + + DOMElement* childrenElement = doc->createElement(X("Children")); + entityElement->appendChild(childrenElement); + appendEntityChildren(childrenElement, world, childEntity); + } +} + +void EntityFileWriter::appentEntityComponents(xercesc::DOMElement* parentElement, const World* world, EntityID entity) +{ + using namespace xercesc; + DOMDocument* doc = parentElement->getOwnerDocument(); + auto& componentPools = world->GetComponentPools(); + + // Step through all component pools to get an entity's components + // HACK: This is sloooow. + for (auto& kv : componentPools) { + const std::string& componentName = kv.first; + if (!world->HasComponent(entity, componentName)) { + continue; + } + std::string qualifiedComponentName = "c:" + componentName; + DOMElement* componentElement = doc->createElement(X(qualifiedComponentName)); + parentElement->appendChild(componentElement); + ComponentWrapper c = kv.second->GetByEntity(entity); + for (auto& kv : c.Info.Fields) { + std::string fieldName = kv.first; + auto& field = kv.second; + + // Ignore fields that are equal to the default + // HACK: This is probably sloooooow, but it's okay. + if (memcmp(c.Data + field.Offset, c.Info.Defaults.get() + field.Offset, field.Stride) == 0) { + continue; + } + + DOMElement* fieldElement = doc->createElement(X(fieldName)); + componentElement->appendChild(fieldElement); + + if (field.Type == "Vector") { + const glm::vec3& vec = c[fieldName]; + fieldElement->setAttribute(X("X"), X(boost::lexical_cast(vec.x))); + fieldElement->setAttribute(X("Y"), X(boost::lexical_cast(vec.y))); + fieldElement->setAttribute(X("Z"), X(boost::lexical_cast(vec.z))); + } else if (field.Type == "Color") { + const glm::vec4& vec = c[fieldName]; + fieldElement->setAttribute(X("R"), X(boost::lexical_cast(vec.r))); + fieldElement->setAttribute(X("G"), X(boost::lexical_cast(vec.g))); + fieldElement->setAttribute(X("B"), X(boost::lexical_cast(vec.b))); + fieldElement->setAttribute(X("A"), X(boost::lexical_cast(vec.a))); + } else if (field.Type == "Quaternion") { + const glm::quat& q = c[fieldName]; + fieldElement->setAttribute(X("X"), X(boost::lexical_cast(q.x))); + fieldElement->setAttribute(X("Y"), X(boost::lexical_cast(q.y))); + fieldElement->setAttribute(X("Z"), X(boost::lexical_cast(q.z))); + fieldElement->setAttribute(X("W"), X(boost::lexical_cast(q.w))); + } else if (field.Type == "int") { + const int& value = c[fieldName]; + fieldElement->appendChild(doc->createTextNode(X(boost::lexical_cast(value)))); + } else if (field.Type == "float") { + const float& value = c[fieldName]; + fieldElement->appendChild(doc->createTextNode(X(boost::lexical_cast(value)))); + } else if (field.Type == "double") { + const double& value = c[fieldName]; + fieldElement->appendChild(doc->createTextNode(X(boost::lexical_cast(value)))); + } else if (field.Type == "bool") { + const bool& value = c[fieldName]; + if (value) { + fieldElement->appendChild(doc->createTextNode(X("true"))); + } else { + fieldElement->appendChild(doc->createTextNode(X("false"))); + } + } else if (field.Type == "string") { + const std::string& value = c[fieldName]; + fieldElement->appendChild(doc->createTextNode(X(value))); + } + } + } +} + diff --git a/src/Engine/Core/EntityXMLFile.cpp b/src/Engine/Core/EntityXMLFile.cpp deleted file mode 100644 index c6e00a1b..00000000 --- a/src/Engine/Core/EntityXMLFile.cpp +++ /dev/null @@ -1,495 +0,0 @@ -#include "Core/EntityXMLFile.h" -#include "Core/World.h" - -unsigned int EntityXMLFile::InstanceCount = 0; - -EntityXMLFile::EntityXMLFile(std::string path) - : m_EntityFile(path) -{ - using namespace xercesc; - - if (InstanceCount == 0) { - XMLPlatformUtils::Initialize(); - } - InstanceCount++; - - m_GrammarPool = new XMLGrammarPoolImpl(); - m_ErrorHandler = new EntityParserXMLErrorHandler(); - m_DOMParser = new XercesDOMParser(nullptr, XMLPlatformUtils::fgMemoryManager, m_GrammarPool); - m_DOMParser->setErrorHandler(m_ErrorHandler); - m_DOMParser->setDoNamespaces(true); - m_DOMParser->setDoXInclude(true); - m_DOMParser->setDoSchema(true); - m_DOMParser->setValidationSchemaFullChecking(true); - m_DOMParser->setValidationScheme(xercesc::XercesDOMParser::Val_Auto); - m_DOMParser->setValidationSchemaFullChecking(true); - m_DOMParser->setValidationConstraintFatal(false); - m_DOMParser->setIncludeIgnorableWhitespace(false); - // Make sure schema grammar is kept after validation - m_DOMParser->cacheGrammarFromParse(true); - - // HACK: Use Sax2 parser instead so the entire DOM doesn't have to reside in memory - m_DOMParser->parse(m_EntityFile.c_str()); - m_DOMDocument = m_DOMParser->getDocument(); - - // 1. Fill in ComponentInfo name, fields, default values and metadata from PSVI - parseComponentInfo(); - // 2. Parse default value files for those components - parseDefaults(); - // 3. Allocate component structures - predictComponentAllocation(); -} - -EntityXMLFile::~EntityXMLFile() -{ - using namespace xercesc; - - if (m_DOMParser != nullptr) { - delete m_DOMParser; - } - if (m_ErrorHandler != nullptr) { - delete m_ErrorHandler; - } - if (m_GrammarPool != nullptr) { - delete m_GrammarPool; - } - - InstanceCount--; - if (InstanceCount == 0) { - XMLPlatformUtils::Terminate(); - } -} - -void EntityXMLFile::PopulateWorld(World* world) -{ - for (auto& pair : m_ComponentInfo) { - world->RegisterComponent(pair.second); - } - - // 4. Parse entity hierarchy - auto root = m_DOMDocument->getDocumentElement(); - parseEntityGraph(world, root, 0); -} - - -void EntityXMLFile::preprocess(std::string inPath, std::string outPath) -{ - using namespace xercesc; - - static const XMLCh gLS[] = { 'L', 'S', '\0' }; - DOMImplementationLS* di = static_cast(DOMImplementationRegistry::getDOMImplementation(gLS)); - - // Parse the file - DOMLSParser* parser = di->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, nullptr); - DOMConfiguration* config = parser->getDomConfig(); - config->setParameter(XMLUni::fgDOMNamespaces, true); - config->setParameter(XMLUni::fgXercesSchema, true); - config->setParameter(XMLUni::fgXercesHandleMultipleImports, true); - config->setParameter(XMLUni::fgXercesSchemaFullChecking, true); - config->setParameter(XMLUni::fgXercesDoXInclude, true); - auto errHandler = new EntityPreprocessorXMLErrorHandler(); - config->setParameter(XMLUni::fgDOMErrorHandler, errHandler); - - auto source = new LocalFileInputSource(XSTR(inPath.c_str())); - Wrapper4InputSource* domSourceWrapper = new Wrapper4InputSource(source); - DOMDocument* doc = parser->parse(dynamic_cast(domSourceWrapper)); - - // Serialize and output the new XML - DOMLSSerializer* writer = di->createLSSerializer(); - DOMLSOutput* output = di->createLSOutput(); - XMLFormatTarget* formatTarget = new LocalFileFormatTarget(outPath.c_str()); - // TODO: MemBufFormatTarget* formatTarget = new MemBufFormatTarget() - output->setByteStream(formatTarget); - writer->write(doc, output); - - delete formatTarget; - output->release(); - writer->release(); - parser->release(); -} - -void EntityXMLFile::parseComponentInfo() -{ - using namespace xercesc; - bool wasChanged; - XSModel* xsModel = m_GrammarPool->getXSModel(wasChanged); - - // Find component xsd element declarations - std::cout << "Enumerating components..." << std::endl; - // - auto topLevelElements = xsModel->getComponents(XSConstants::ELEMENT_DECLARATION); - for (unsigned int i = 0; i < topLevelElements->getLength(); ++i) { - auto element = static_cast(topLevelElements->item(i)); - - std::string nameSpace(XSTR(element->getNamespace())); - if (nameSpace != "components") { - continue; - } - - ComponentInfo compInfo; - - // Name - compInfo.Name = XSTR(element->getName()); - // Annotation - auto componentAnnotation = element->getAnnotation(); - if (componentAnnotation != nullptr) { - // Parse annotation XML - char* annotationString = XMLString::transcode(componentAnnotation->getAnnotationString()); - MemBufInputSource annotationInput(reinterpret_cast(annotationString), strlen(annotationString), "MemBuf: Annotation String"); - XercesDOMParser parser(nullptr, XMLPlatformUtils::fgMemoryManager, m_GrammarPool); - parser.setErrorHandler(m_ErrorHandler); - parser.parse(annotationInput); - XMLString::release(&annotationString); - auto doc = parser.getDocument(); - - // Add allocation estimation(s) - auto allocationTags = doc->getElementsByTagName(XSTR("meta:allocation")); - for (int i = 0; i < allocationTags->getLength(); ++i) { - auto allocation = dynamic_cast(allocationTags->item(i)); - auto child = allocation->getFirstChild(); - if (child == nullptr) { - continue; - } - - XSValue::Status status; - XSValue* val = XSValue::getActualValue(child->getNodeValue(), XSValue::dt_integer, status); - compInfo.Meta.Allocation += val->fData.fValue.f_int; - } - - // Save documentation string - auto documentationTags = doc->getElementsByTagName(XSTR("xs:documentation")); - if (documentationTags->getLength() != 0) { - auto child = documentationTags->item(0)->getFirstChild(); - if (child != nullptr) { - compInfo.Meta.Annotation = XSTR(child->getNodeValue()); - } - } - // TODO: Parse annotation string XML - // compInfo.Meta.Allocation = ... - } else { - std::cout << "Warning: Component is missing an annotation!" << std::endl; - } - - // - auto typeDefinition = element->getTypeDefinition(); - if (typeDefinition->getTypeCategory() != XSTypeDefinition::COMPLEX_TYPE) { - std::cerr << "Error: Type definition wasn't COMPLEX_TYPE! Skipping." << std::endl; - continue; - } - auto complexTypeDefinition = dynamic_cast(typeDefinition); - - // - auto modelGroupParticle = complexTypeDefinition->getParticle(); - if (modelGroupParticle->getTermType() != XSParticle::TERM_MODELGROUP) { - std::cerr << "Error: Model group particle wasn't TERM_MODELGROUP! Skipping." << std::endl; - continue; - } - auto modelGroup = modelGroupParticle->getModelGroupTerm(); - - // getParticles(); - for (unsigned int i = 0; i < particles->size(); ++i) { - auto particle = particles->elementAt(i); - if (particle->getTermType() != XSParticle::TERM_ELEMENT) { - std::cerr << "Error: Particle wasn't TERM_ELEMENT! Skipping." << std::endl; - continue; - } - auto elementDeclaration = particle->getElementTerm(); - - std::string name = XSTR(elementDeclaration->getName()); - std::string type = XSTR(elementDeclaration->getTypeDefinition()->getName()); - - size_t stride = getTypeStride(type); - if (stride == 0) { - std::cout << "Warning: Field \"" << name << "\" in component \"" << compInfo.Name << "\" uses unexpected field type \"" << type << "\". Skipping." << std::endl; - continue; - } - - compInfo.FieldTypes[name] = type; - compInfo.FieldOffsets[name] = fieldOffset; - fieldOffset += getTypeStride(type); - } - - compInfo.Meta.Stride = fieldOffset; - m_ComponentInfo[compInfo.Name] = compInfo; - } -} - -void EntityXMLFile::parseDefaults() -{ - using namespace xercesc; - - for (auto& ci : m_ComponentInfo) { - // Allocate memory for default values - ci.second.Defaults = std::shared_ptr(new char[ci.second.Meta.Stride]); - memset(ci.second.Defaults.get(), 0, ci.second.Meta.Stride); - - XercesDOMParser parser(nullptr, XMLPlatformUtils::fgMemoryManager); - parser.setErrorHandler(m_ErrorHandler); - - std::string componentName = ci.first; - LOG_DEBUG("Parsing defaults for component %s", componentName.c_str()); - boost::filesystem::path defaultsFile = "Schema/Components/" + componentName + ".xml"; - - parser.parse(defaultsFile.string().c_str()); - auto doc = parser.getDocument(); - if (doc == nullptr) { - LOG_ERROR("%s not found! Skipping.", defaultsFile.string().c_str()); - continue; - } - - // Find the node in the components namespace matching the component name - std::string tagName = "c:" + componentName; - auto rootNodes = doc->getElementsByTagName(XSTR(tagName.c_str())); - if (rootNodes->getLength() == 0) { - LOG_ERROR("Couldn't find defaults for component \"%s\"! Skipping.", componentName.c_str()); - continue; - } - auto componentElement = dynamic_cast(rootNodes->item(0)); - - // Fill the default value buffer with values - for (auto& field : ci.second.FieldOffsets) { - std::string fieldName = field.first; - auto fieldNodes = componentElement->getElementsByTagName(XSTR(fieldName.c_str())); - auto fieldNode = fieldNodes->item(0); - if (fieldNode == nullptr) { - LOG_ERROR("Defaults for component \"%s\" is missing field \"%s\"!", componentName.c_str(), fieldName.c_str()); - continue; - } - auto fieldElement = dynamic_cast(fieldNode); - - std::string fieldType = ci.second.FieldTypes.at(fieldName); - unsigned int fieldOffset = ci.second.FieldOffsets.at(fieldName); - writeData(fieldElement, fieldType, ci.second.Defaults.get() + fieldOffset); - } - } -} - -void EntityXMLFile::predictComponentAllocation() -{ - using namespace xercesc; - - auto root = m_DOMDocument->getDocumentElement(); - - // Count static instances of components present in entity hierarchy - auto components = m_DOMDocument->getElementsByTagNameNS(XSTR("components"), XSTR("*")); - for (int i = 0; i < components->getLength(); ++i) { - auto component = dynamic_cast(components->item(i)); - - std::string componentName = XSTR(component->getLocalName()); - auto& compInfo = m_ComponentInfo.at(componentName); - compInfo.Meta.Allocation += 1; - } - - std::cout << "COMPONENT INFO" << std::endl; - for (auto& pair : m_ComponentInfo) { - ComponentInfo& ci = pair.second; - std::cout << "Component: " << ci.Name << " (" << ci.Meta.Annotation << ")" << std::endl; - std::cout << " Allocation: " << ci.Meta.Allocation << std::endl; - std::cout << " Fields:" << std::endl; - - // Calculate component size - std::size_t stride = 0; - // Add size of fields - for (auto& field : ci.FieldTypes) { - std::cout << " " << field.second << " " << field.first << " (" << getTypeStride(field.second) << " byte)" << std::endl; - stride += getTypeStride(field.second); - } - std::cout << " Stride: " << ci.Meta.Stride << std::endl; - } -} - -void EntityXMLFile::parseEntityGraph(World* world, xercesc::DOMElement* element, EntityID parentEntity) -{ - using namespace xercesc; - - // Create entity - EntityID entity = world->CreateEntity(parentEntity); - LOG_DEBUG("Created entity %i, parent %i", entity, parentEntity); - - // Add components - auto components = m_DOMDocument->evaluate(XSTR("Components/*"), element, nullptr, DOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE, nullptr); - for (int i = 0; i < components->getSnapshotLength(); i++) { - components->snapshotItem(i); - auto componentElement = dynamic_cast(components->getNodeValue()); - std::string componentName = XSTR(componentElement->getLocalName()); - auto& ci = m_ComponentInfo.at(componentName); - - // Attach the component - auto c = world->AttachComponent(entity, componentName); - LOG_DEBUG("Attached %s component", componentName.c_str()); - - // Write field data - auto fields = componentElement->getChildNodes(); - for (int j = 0; j < fields->getLength(); ++j) { - auto fieldNode = fields->item(j); - auto nodeType = fieldNode->getNodeType(); - if (nodeType != DOMNode::ELEMENT_NODE) { - continue; - } - auto field = dynamic_cast(fields->item(j)); - //const XMLCh* value = fields->item(j)->getTextContent(); - std::string fieldName(XSTR(field->getLocalName())); - if (ci.FieldTypes.find(fieldName) == ci.FieldTypes.end()) { - std::cout << "Warning: Component \"" << componentName << "\" contains invalid field \"" << fieldName << "\". Skipping." << std::endl; - continue; - } - - std::string fieldType = ci.FieldTypes.at(fieldName); - unsigned int fieldOffset = ci.FieldOffsets.at(fieldName); - std::string fieldValue(XSTR(field->getTextContent())); - LOG_DEBUG(" %s %s = %s", fieldType.c_str(), fieldName.c_str(), fieldValue.c_str()); - writeData(field, fieldType, c.Data + fieldOffset); - } - } - - // Recurse children - auto children = m_DOMDocument->evaluate(XSTR("Children/Entity"), element, nullptr, DOMXPathResult::ORDERED_NODE_SNAPSHOT_TYPE, nullptr); - for (int i = 0; i < children->getSnapshotLength(); i++) { - children->snapshotItem(i); - parseEntityGraph(world, dynamic_cast(children->getNodeValue()), entity); - } - - //auto components = m_DOMDocument->getElementsByTagNameNS(XSTR("components"), XSTR("*")); - //for (int i = 0; i < components->getLength(); ++i) { - // auto component = dynamic_cast(components->item(i)); - - // std::string componentName = XSTR(component->getLocalName()); - // auto& compStore = m_ComponentStore.at(componentName); - // auto& compInfo = compStore.Info; - - // char* data = &compStore.Data[compStore.Size*compStore.Stride]; - // compStore.Size += 1; - - // auto fields = component->getChildNodes(); - // for (int j = 0; j < fields->getLength(); ++j) { - // auto field = fields->item(j); - // auto nodeType = field->getNodeType(); - // if (nodeType != DOMNode::ELEMENT_NODE) { - // continue; - // } - // //auto field = dynamic_cast(fields->item(j)); - // //const XMLCh* value = fields->item(j)->getTextContent(); - // std::string fieldName = XSTR(field->getLocalName()); - // if (compInfo.FieldTypes.find(fieldName) == compInfo.FieldTypes.end()) { - // std::cout << "Warning: Component \"" << componentName << "\" contains invalid field \"" << fieldName << "\". Skipping." << std::endl; - // continue; - // } - - // std::string fieldType = compInfo.FieldTypes.at(fieldName); - // unsigned int fieldOffset = compInfo.FieldOffsets.at(fieldName); - - // XSValue::DataType dataType = XSValue::getDataType(XSTR(fieldType.c_str())); - // if (dataType == XSValue::DataType::dt_MAXCOUNT) { - // // TODO: - // continue; - // } - // if (dataType == XSValue::DataType::dt_string) { - // char* str = XMLString::transcode(field->getTextContent()); - // std::string standardString(str); - // XMLString::release(&str); - // memcpy(&data[fieldOffset], reinterpret_cast(&standardString), getTypeStride(fieldType)); - // } else { - // XSValue::Status status; - // XSValue* val = XSValue::getActualValue(field->getTextContent(), dataType, status); - // memcpy(&data[fieldOffset], reinterpret_cast(&val->fData.fValue), getTypeStride(fieldType)); - // } - // } - //} - - //auto entities = m_DOMDocument->getElementsByTagName(XSTR("Entity")); - //for (int i = 0; i < entities->getLength(); ++i) { - // auto entity = dynamic_cast(entities->item(i)); - - - // //entity->setIdAttribute() - - // std::cout << "ENTITY " << i + 1 << std::endl; - //} -} - -std::size_t EntityXMLFile::getTypeStride(std::string typeName) -{ - std::map typeStrides{ - { "bool", sizeof(bool) }, - { "int", sizeof(int) }, - { "float", sizeof(float) }, - { "double", sizeof(double) }, - { "string", sizeof(std::string) }, - { "Vector", sizeof(glm::vec3) }, - { "Quaternion", sizeof(glm::quat) }, - { "Color", sizeof(glm::vec4) } - }; - - auto it = typeStrides.find(typeName); - return (it != typeStrides.end()) ? it->second : 0; -} - -float EntityXMLFile::getFloatAttribute(const xercesc::DOMElement* element, const char* attribute) const -{ - using namespace xercesc; - XSValue::Status status; - XSValue* val = XSValue::getActualValue(element->getAttribute(XSTR(attribute)), xercesc::XSValue::DataType::dt_double, status); - if (val == nullptr) { - LOG_ERROR("Element \"%s\" doesn't have an \"%s\" attribute!", XSTR(element->getTagName()), attribute); - return 0.f; - } else { - return static_cast(val->fData.fValue.f_double); - } -} - -void EntityXMLFile::writeData(const xercesc::DOMElement* element, std::string typeName, char* outData) -{ - using namespace xercesc; - - if (typeName == "Vector") { - glm::vec3 vec; - vec.x = getFloatAttribute(element, "X"); - vec.y = getFloatAttribute(element, "Y"); - vec.z = getFloatAttribute(element, "Z"); - memcpy(outData, reinterpret_cast(&vec), getTypeStride(typeName)); - } else if (typeName == "Color") { - glm::vec4 vec; - vec.r = getFloatAttribute(element, "R"); - vec.g = getFloatAttribute(element, "G"); - vec.b = getFloatAttribute(element, "B"); - vec.a = getFloatAttribute(element, "A"); - memcpy(outData, reinterpret_cast(&vec), getTypeStride(typeName)); - } else if (typeName == "Quaternion") { - glm::quat q; - q.x = getFloatAttribute(element, "X"); - q.y = getFloatAttribute(element, "Y"); - q.z = getFloatAttribute(element, "Z"); - q.w = getFloatAttribute(element, "W"); - memcpy(outData, reinterpret_cast(&q), getTypeStride(typeName)); - } else if (typeName == "float") { - XSValue::Status status; - XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_float, status); - memcpy(outData, reinterpret_cast(&val->fData.fValue.f_float), getTypeStride(typeName)); - } else if (typeName == "double") { - XSValue::Status status; - XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_double, status); - memcpy(outData, reinterpret_cast(&val->fData.fValue.f_double), getTypeStride(typeName)); - } else if (typeName == "bool") { - XSValue::Status status; - XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_boolean, status); - memcpy(outData, reinterpret_cast(&val->fData.fValue.f_bool), getTypeStride(typeName)); - } else { - XSValue::DataType dataType = XSValue::getDataType(XSTR(typeName.c_str())); - if (dataType == XSValue::DataType::dt_string) { - char* str = XMLString::transcode(element->getTextContent()); - std::string standardString(str); - new (outData) std::string(str); - XMLString::release(&str); - //memcpy(outData, reinterpret_cast(&standardString), getTypeStride(typeName)); - } else { - //XSValue::Status status; - //XSValue* val = XSValue::getActualValue(element->getTextContent(), dataType, status); - //memcpy(outData, reinterpret_cast(&val->fData.fValue), getTypeStride(typeName)); - LOG_WARNING("Unknown native data type: %s", typeName.c_str()); - } - } -} - diff --git a/src/Engine/Core/EventBroker.cpp b/src/Engine/Core/EventBroker.cpp index 6767878f..d847e1a2 100644 --- a/src/Engine/Core/EventBroker.cpp +++ b/src/Engine/Core/EventBroker.cpp @@ -3,7 +3,7 @@ BaseEventRelay::~BaseEventRelay() { if (m_Broker != nullptr) { - m_Broker->Unsubscribe(*this); + m_Broker->Unsubscribe(*this); } } diff --git a/src/Engine/Core/World.cpp b/src/Engine/Core/World.cpp index 5443d388..c94cb8b3 100644 --- a/src/Engine/Core/World.cpp +++ b/src/Engine/Core/World.cpp @@ -10,12 +10,15 @@ World::~World() EntityID World::CreateEntity(EntityID parent /*= 0*/) { EntityID newEntity = generateEntityID(); + if (newEntity == parent) { + LOG_WARNING("Invalid parent #%i of Entity#%i", newEntity, parent); + parent = EntityID_Invalid; + } m_EntityParents[newEntity] = parent; m_EntityChildren.insert(std::make_pair(parent, newEntity)); return newEntity; } - void World::DeleteEntity(EntityID entity) { // Delete components @@ -46,15 +49,26 @@ void World::DeleteEntity(EntityID entity) break; } } + + // Erase potential name + m_EntityNames.erase(entity); +} + +bool World::ValidEntity(EntityID entity) const +{ + return m_EntityParents.find(entity) != m_EntityParents.end(); } void World::RegisterComponent(ComponentInfo& ci) { - m_ComponentPools[ci.Name] = new ComponentPool(ci); + if (m_ComponentPools.find(ci.Name) == m_ComponentPools.end()) { + m_ComponentPools[ci.Name] = new ComponentPool(ci); + } } ComponentWrapper World::AttachComponent(EntityID entity, std::string componentType) { + // TODO: Allocate dynamic pool if component isn't registered ComponentPool* pool = m_ComponentPools.at(componentType); const ComponentInfo& ci = pool->ComponentInfo(); @@ -66,8 +80,7 @@ ComponentWrapper World::AttachComponent(EntityID entity, std::string componentTy return c; } - -bool World::HasComponent(EntityID entity, std::string componentType) +bool World::HasComponent(EntityID entity, std::string componentType) const { ComponentPool* pool = m_ComponentPools.at(componentType); return pool->KnowsEntity(entity); @@ -79,7 +92,6 @@ ComponentWrapper World::GetComponent(EntityID entity, std::string componentType) return pool->GetByEntity(entity); } - void World::DeleteComponent(EntityID entity, std::string componentType) { ComponentPool* pool = m_ComponentPools.at(componentType); @@ -93,13 +105,11 @@ const ComponentPool* World::GetComponents(std::string componentType) return (it != m_ComponentPools.end()) ? it->second : nullptr; } - EntityID World::GetParent(EntityID entity) { return m_EntityParents.at(entity); } - void World::SetParent(EntityID entity, EntityID parent) { EntityID lastParent = m_EntityParents.at(entity); @@ -115,6 +125,25 @@ void World::SetParent(EntityID entity, EntityID parent) m_EntityChildren.insert(std::make_pair(parent, entity)); } +void World::SetName(EntityID entity, const std::string& name) +{ + m_EntityNames[entity] = name; +} + +std::string World::GetName(EntityID entity) const +{ + if (entity == EntityID_Invalid) { + return "EntityID_Invalid"; + } + + auto it = m_EntityNames.find(entity); + if (it != m_EntityNames.end()) { + return it->second; + } else { + return std::string(); + } +} + EntityID World::generateEntityID() { // TODO: Make EntityID generation smarter diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index a43ca900..b49cf555 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -9,6 +9,7 @@ EditorSystem::EditorSystem(EventBroker* eventBroker, IRenderer* renderer) auto config = ResourceManager::Load("Config.ini"); m_Enabled = config->Get("Debug.EditorEnabled", false); m_Visible = m_Enabled; + m_DefaultEntityDir = boost::filesystem::path("Schema") / boost::filesystem::path("Entities"); if (!m_Enabled) { return; @@ -44,6 +45,35 @@ void EditorSystem::Update(World* world, double dt) } } + +boost::filesystem::path EditorSystem::openDialog(boost::filesystem::path defaultPath) +{ + namespace bfs = boost::filesystem; + auto absolutePath = bfs::absolute(defaultPath); + nfdchar_t* outPath = nullptr; + nfdresult_t result = NFD_OpenDialog(NULL, absolutePath.string().c_str(), &outPath); + if (result == NFD_ERROR) { + LOG_ERROR("NFD Error: %s", NFD_GetError()); + return bfs::path(); + } + + return bfs::absolute(outPath); +} + +boost::filesystem::path EditorSystem::saveDialog(boost::filesystem::path defaultPath) +{ + namespace bfs = boost::filesystem; + auto absolutePath = bfs::absolute(defaultPath); + nfdchar_t* outPath = nullptr; + nfdresult_t result = NFD_SaveDialog(NULL, absolutePath.string().c_str(), &outPath); + if (result == NFD_ERROR) { + LOG_ERROR("NFD Error: %s", NFD_GetError()); + return bfs::path(); + } + + return bfs::absolute(outPath); +} + bool EditorSystem::OnInputCommand(const Events::InputCommand& e) { if (e.Command == "ToggleEditor" && e.Value > 0) { @@ -81,17 +111,24 @@ bool EditorSystem::OnMousePress(const Events::MousePress& e) bool EditorSystem::OnMouseMove(const Events::MouseMove& e) { - if (m_Widget == 0) { + if (m_Widget == EntityID_Invalid) { return false; } - + if (m_Selection == EntityID_Invalid) { + return false; + } + if (m_Selection == m_Widget) { + return false; + } + // TODO: No widgets for root entity until widgets reside in thier own world, + // or the widgets will move relative to the root entity being moved, which is WEEEIRD. if (m_Selection == 0) { return false; } + auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); glm::vec3 widgetOrientation = widgetTransform["Orientation"]; - - glm::quat totalOrientation = m_Renderer->Camera()->Orientation() * glm::inverse(glm::quat(widgetOrientation)); + glm::quat totalOrientation = m_Renderer->Camera()->Orientation() * glm::inverse(glm::quat(widgetOrientation)); int width; int height; @@ -122,9 +159,9 @@ bool EditorSystem::OnMouseMove(const Events::MouseMove& e) if (m_WidgetSpace == WidgetSpace::Global) { EntityID parent = m_World->GetParent(m_Selection); glm::quat inverseParentOrientation; - if (parent != 0) { + //if (parent != 0) { inverseParentOrientation = glm::inverse(RenderQueueFactory::AbsoluteOrientation(m_World, parent)); - } + //} (glm::vec3&)m_World->GetComponent(m_Selection, "Transform")["Position"] += inverseParentOrientation * movement; } else if (m_WidgetSpace == WidgetSpace::Local) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); @@ -138,12 +175,12 @@ bool EditorSystem::OnMouseMove(const Events::MouseMove& e) if (m_WidgetSpace == WidgetSpace::Global) { EntityID parent = m_World->GetParent(m_Selection); glm::quat parentOrientation; - if (parent != 0) { - parentOrientation = RenderQueueFactory::AbsoluteOrientation(m_World, parent); - } + //if (parent != 0) { + // parentOrientation = RenderQueueFactory::AbsoluteOrientation(m_World, parent); + //} glm::vec3& selectionOrientation = m_World->GetComponent(m_Selection, "Transform")["Orientation"]; - //glm::quat currentOrientation = RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection); - glm::quat currentOrientation = parentOrientation * glm::quat(selectionOrientation); + glm::quat currentOrientation = RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection); + //glm::quat currentOrientation = parentOrientation * glm::quat(selectionOrientation); glm::quat deltaOrientation(finalMovement); selectionOrientation = glm::eulerAngles(glm::inverse(parentOrientation) * (deltaOrientation * currentOrientation)); } else if (m_WidgetSpace == WidgetSpace::Local) { @@ -204,9 +241,10 @@ bool EditorSystem::OnPicking(const Events::Picking& e) auto result = e.Pick(pos); EntityID entity = result.Entity; if (glm::length2(m_WidgetCurrentAxis) > 0.f) { + // ??? } else { LOG_INFO("Selected %i", entity); - if (entity != 0) { + if (entity != EntityID_Invalid) { EntityID parent = m_World->GetParent(entity); if (parent == m_Widget) { m_WidgetCurrentAxis = glm::vec3( @@ -221,11 +259,12 @@ bool EditorSystem::OnPicking(const Events::Picking& e) //widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"]; } else { ImGui::SetActiveID(0, nullptr); - m_Selection = entity; + if (m_WidgetMode == WidgetMode::None) { + m_WidgetMode = WidgetMode::Translate; + } setWidgetMode(m_WidgetMode); + m_Selection = entity; } - } else { - m_Selection = 0; } } } @@ -240,9 +279,9 @@ bool EditorSystem::OnFileDropped(const Events::FileDropped& e) return true; } -void EditorSystem::updateWidget() +void EditorSystem::createWidget() { - if (m_Widget == 0) { + if (m_Widget == EntityID_Invalid) { m_Widget = m_World->CreateEntity(); m_World->AttachComponent(m_Widget, "Transform"); m_WidgetX = m_World->CreateEntity(m_Widget); @@ -269,10 +308,20 @@ void EditorSystem::updateWidget() m_WidgetOrigin = m_World->CreateEntity(m_Widget); m_World->AttachComponent(m_WidgetOrigin, "Transform"); m_World->AttachComponent(m_WidgetOrigin, "Model"); - setWidgetMode(WidgetMode::Translate); + setWidgetMode(WidgetMode::None); + } +} + +void EditorSystem::updateWidget() +{ + if (m_Widget == EntityID_Invalid) { + return; + } + if (m_Selection == m_Widget) { + return; } - if (m_Selection != 0) { + if (m_Selection != EntityID_Invalid) { auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); glm::vec3 selectionPosition = RenderQueueFactory::AbsolutePosition(m_World, m_Selection); widgetTransform["Position"] = selectionPosition; @@ -284,7 +333,7 @@ void EditorSystem::updateWidget() void EditorSystem::setWidgetMode(WidgetMode newMode) { - if (m_Widget == 0) { + if (m_Widget == EntityID_Invalid) { return; } @@ -309,7 +358,7 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) m_World->GetComponent(m_WidgetPlaneY, "Model")["Visible"] = true; m_World->GetComponent(m_WidgetPlaneZ, "Model")["Visible"] = true; } - if (m_Selection != 0) { + if (m_Selection != EntityID_Invalid) { if (m_WidgetSpace == WidgetSpace::Local) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection)); @@ -321,7 +370,7 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/ScaleWidgetZ.obj"; m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = true; m_World->GetComponent(m_WidgetOrigin, "Model")["Resource"] = "Models/ScaleWidgetOrigin.obj"; - if (m_Selection != 0) { + if (m_Selection != EntityID_Invalid) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection)); } @@ -329,7 +378,7 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/RotationWidgetX.obj"; m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/RotationWidgetY.obj"; m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/RotationWidgetZ.obj"; - if (m_Selection != 0) { + if (m_Selection != EntityID_Invalid) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); if (m_WidgetSpace == WidgetSpace::Local) { widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection)); @@ -339,7 +388,6 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) m_WidgetMode = newMode; } - void EditorSystem::setWidgetSpace(WidgetSpace space) { m_WidgetSpace = space; @@ -348,16 +396,23 @@ void EditorSystem::setWidgetSpace(WidgetSpace space) void EditorSystem::drawUI(World* world, double dt) { + namespace bfs = boost::filesystem; + ImGui::ShowTestWindow(); //ImGui::ShowStyleEditor(); if (ImGui::BeginMainMenuBar()) { if (ImGui::BeginMenu("File")) { - - if (ImGui::MenuItem("New")) { } - if (ImGui::MenuItem("Open", "Ctrl+O")) { } - if (ImGui::MenuItem("Save", "Ctrl+S")) { } - if (ImGui::MenuItem("Save As...", "Ctrl+Shift+S")) { } + //if (ImGui::MenuItem("New")) { } + if (ImGui::MenuItem("Import", "Ctrl+O")) { + fileImport(world); + } + if (ImGui::MenuItem("Save", "Ctrl+S")) { + fileSave(world); + } + if (ImGui::MenuItem("Save As...", "Ctrl+Shift+S")) { + fileSaveAs(world); + } ImGui::Separator(); if (ImGui::MenuItem("Close Editor", "F1")) { } @@ -392,7 +447,7 @@ void EditorSystem::drawUI(World* world, double dt) std::string title = std::string("Components #") + std::to_string(m_Selection) + std::string("###Components"); if (ImGui::Begin(title.c_str())) { - if (m_Selection != 0) { + if (m_Selection != EntityID_Invalid) { auto& pools = world->GetComponentPools(); std::vector componentTypes; @@ -432,16 +487,16 @@ void EditorSystem::drawUI(World* world, double dt) } auto& component = world->GetComponent(m_Selection, componentType); - for (auto& pair : ci.FieldTypes) { - const std::string& field = pair.first; - const std::string& type = pair.second; + for (auto& kv : ci.Fields) { + const std::string& fieldName = kv.first; + auto& field = kv.second; - ImGui::PushID(field.c_str()); - if (type == "Vector") { - auto& val = component.Property(field); - if (field == "Scale") { + ImGui::PushID(fieldName.c_str()); + if (field.Type == "Vector") { + auto& val = component.Property(fieldName); + if (fieldName == "Scale") { ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, 0.f, std::numeric_limits::max()); - } else if (field == "Orientation") { + } else if (fieldName == "Orientation") { glm::vec3 tempVal = glm::fmod(val, glm::vec3(glm::two_pi())); if (ImGui::SliderFloat3("", glm::value_ptr(tempVal), 0.f, glm::two_pi())) { val = tempVal; @@ -449,16 +504,16 @@ void EditorSystem::drawUI(World* world, double dt) } else { ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, std::numeric_limits::lowest(), std::numeric_limits::max()); } - } else if (type == "Color") { - auto& val = component.Property(field); + } else if (field.Type == "Color") { + auto& val = component.Property(fieldName); ImGui::ColorEdit4("", glm::value_ptr(val), true); - } else if (type == "string") { - std::string& val = component.Property(field); + } else if (field.Type == "string") { + std::string& val = component.Property(fieldName); char tempString[1024]; memcpy(tempString, val.c_str(), std::min(val.length() + 1, sizeof(tempString))); if (ImGui::InputText("", tempString, sizeof(tempString))) { val = std::string(tempString); - LOG_DEBUG("%s::%s changed!", componentType.c_str(), field.c_str()); + LOG_DEBUG("%s::%s changed!", componentType.c_str(), fieldName.c_str()); } // DROP STUFF if (ImGui::IsItemHovered() && !m_LastDroppedFile.empty()) { @@ -466,21 +521,21 @@ void EditorSystem::drawUI(World* world, double dt) m_LastDroppedFile = ""; } - } else if (type == "double") { - float tempVal = static_cast(component.Property(field)); + } else if (field.Type == "double") { + float tempVal = static_cast(component.Property(fieldName)); if (ImGui::InputFloat("", &tempVal, 0.01f, 1.f)) { - component.SetProperty(field, static_cast(tempVal)); + component.SetProperty(fieldName, static_cast(tempVal)); } - } else if (type == "bool") { - auto& val = component.Property(field); + } else if (field.Type == "bool") { + auto& val = component.Property(fieldName); ImGui::Checkbox("", &val); } else { - ImGui::TextDisabled(type.c_str()); + ImGui::TextDisabled(field.Type.c_str()); } ImGui::PopID(); ImGui::SameLine(); - ImGui::Text(field.c_str()); + ImGui::Text(fieldName.c_str()); if (ImGui::IsItemHovered()) { ImGui::SetTooltip("field annotation goes here"); } @@ -492,74 +547,93 @@ void EditorSystem::drawUI(World* world, double dt) } ImGui::End(); - if (ImGui::Begin("Entitites")) { - static EntityID draggingEntity = 0; + if (ImGui::Begin("Entities")) { auto entityChildren = world->GetEntityChildren(); std::function recurse = [&](EntityID parent) { auto range = entityChildren.equal_range(parent); for (auto it = range.first; it != range.second; it++) { - - ImVec2 pos = ImGui::GetCursorScreenPos(); - float width = ImGui::GetContentRegionAvailWidth(); - ImRect bb(pos + ImVec2(20, 0), pos + ImVec2(width, 13)); - auto window = ImGui::GetCurrentWindow(); - if (m_Selection == it->second) { - const ImU32 col = window->Color(ImGuiCol_HeaderActive); - window->DrawList->AddRectFilled(bb.Min, bb.Max, col); - } - ImGuiID id = window->GetID((std::string("#SelectButton") + std::to_string(it->second)).c_str()); - bool hovered = false; - bool held = false; - if (ImGui::ButtonBehavior(bb, id, &hovered, &held)) { - m_Selection = it->second; - } - if (held) { - ImVec2 entityDragDelta = ImGui::GetMouseDragDelta(0); - if (std::abs(entityDragDelta.x) > 0 && std::abs(entityDragDelta.y) > 0) { - if (draggingEntity == 0) { - draggingEntity = it->second; - LOG_DEBUG("Started drag of entity %i", draggingEntity); - } - ImGui::SetNextWindowPos(ImGui::GetIO().MousePos + ImVec2(20, 0)); - ImGui::Begin("Change parent", nullptr, ImVec2(0, 0), 0.3f, ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoSavedSettings); - ImGui::Text("#%i", draggingEntity); - ImGui::End(); - } - } - - ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once); - if (ImGui::TreeNode((std::string("#") + std::to_string(it->second)).c_str())) { - if (draggingEntity != 0 && ImGui::IsItemHoveredRect() && ImGui::IsMouseReleased(0)) { - LOG_DEBUG("Changed parent of %i to %i", draggingEntity, it->second); - changeParent(draggingEntity, it->second); - draggingEntity = 0; - } - - if (ImGui::BeginPopupContextItem("item context menu")) { - if (ImGui::Button("Add")) { - EntityID entity = world->CreateEntity(it->second); - world->AttachComponent(entity, "Transform"); - } - ImGui::SameLine(); - if (ImGui::Button("Delete")) { - world->DeleteEntity(it->second); - ImGui::CloseCurrentPopup(); - if (m_Selection == it->second) { - m_Selection = 0; - } - } - ImGui::EndPopup(); - } + if (createEntityNode(world, it->second)) { recurse(it->second); ImGui::TreePop(); } } }; - recurse(0); + recurse(EntityID_Invalid); } ImGui::End(); } +bool EditorSystem::createEntityNode(World* world, EntityID entity) +{ + // HACK: Don't show the widget entities in the entity tree + if (entity == m_Widget) { + return false; + } + + ImVec2 pos = ImGui::GetCursorScreenPos(); + float width = ImGui::GetContentRegionAvailWidth(); + ImRect bb(pos + ImVec2(20, 0), pos + ImVec2(width, 13)); + auto window = ImGui::GetCurrentWindow(); + if (m_Selection == entity) { + const ImU32 col = window->Color(ImGuiCol_HeaderActive); + window->DrawList->AddRectFilled(bb.Min, bb.Max, col); + } + ImGuiID id = window->GetID((std::string("#SelectButton") + std::to_string(entity)).c_str()); + bool hovered = false; + bool held = false; + if (ImGui::ButtonBehavior(bb, id, &hovered, &held)) { + m_Selection = entity; + } + if (held) { + ImVec2 entityDragDelta = ImGui::GetMouseDragDelta(0); + if (std::abs(entityDragDelta.x) > 0 && std::abs(entityDragDelta.y) > 0) { + if (m_UIDraggingEntity == EntityID_Invalid) { + m_UIDraggingEntity = entity; + LOG_DEBUG("Started drag of entity %i", m_UIDraggingEntity); + } + ImGui::SetNextWindowPos(ImGui::GetIO().MousePos + ImVec2(20, 0)); + ImGui::Begin("Change parent", nullptr, ImVec2(0, 0), 0.3f, ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoSavedSettings); + ImGui::Text("#%i", m_UIDraggingEntity); + ImGui::End(); + } + } + + ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once); + std::string nodeTitle; + const std::string& entityName = world->GetName(entity); + if (!entityName.empty()) { + nodeTitle = entityName; + } else { + nodeTitle = std::string("#") + std::to_string(entity); + } + if (ImGui::TreeNode(nodeTitle.c_str())) { + if (m_UIDraggingEntity != EntityID_Invalid && ImGui::IsItemHoveredRect() && ImGui::IsMouseReleased(0)) { + LOG_DEBUG("Changed parent of %i to %i", m_UIDraggingEntity, entity); + changeParent(m_UIDraggingEntity, entity); + m_UIDraggingEntity = EntityID_Invalid; + } + + if (ImGui::BeginPopupContextItem("item context menu")) { + if (ImGui::Button("Add")) { + EntityID newEntity = world->CreateEntity(entity); + world->AttachComponent(newEntity, "Transform"); + } + ImGui::SameLine(); + if (ImGui::Button("Delete")) { + world->DeleteEntity(entity); + ImGui::CloseCurrentPopup(); + if (!world->ValidEntity(m_Selection)) { + m_Selection = EntityID_Invalid; + } + } + ImGui::EndPopup(); + } + return true; + } else { + return false; + } +} + bool EditorSystem::createDeleteButton(std::string componentType) { float width = ImGui::GetContentRegionAvailWidth(); @@ -594,3 +668,48 @@ void EditorSystem::changeParent(EntityID entity, EntityID newParent) m_World->SetParent(entity, newParent); } + +void EditorSystem::fileImport(World* world) +{ + m_CurrentFile = openDialog(m_DefaultEntityDir); + auto file = ResourceManager::Load(m_CurrentFile.string()); + EntityFilePreprocessor fpp(file); + fpp.RegisterComponents(world); + EntityFileParser fp(file); + fp.MergeEntities(world); + createWidget(); + updateWidget(); +} + +void EditorSystem::fileSave(World* world) +{ + if (boost::filesystem::exists(m_CurrentFile)) { + // HACK: Delete the widgets so they don't appear in the saved file + world->DeleteEntity(m_Widget); + m_Widget = EntityID_Invalid; + + EntityFileWriter writer(m_CurrentFile.string()); + writer.WriteWorld(world); + + createWidget(); + } else { + fileSaveAs(world); + } +} + +void EditorSystem::fileSaveAs(World* world) +{ + auto filePath = saveDialog(m_DefaultEntityDir); + if (filePath.empty()) { + return; + } + + // HACK: Delete the widgets so they don't appear in the saved file + world->DeleteEntity(m_Widget); + m_Widget = EntityID_Invalid; + + EntityFileWriter writer(filePath.string()); + writer.WriteWorld(world); + + createWidget(); +} diff --git a/src/Engine/Rendering/RenderQueueFactory.cpp b/src/Engine/Rendering/RenderQueueFactory.cpp index 8d5bb420..14e55320 100644 --- a/src/Engine/Rendering/RenderQueueFactory.cpp +++ b/src/Engine/Rendering/RenderQueueFactory.cpp @@ -27,16 +27,16 @@ glm::vec3 RenderQueueFactory::AbsolutePosition(World* world, EntityID entity) { glm::vec3 position; - do { + while (entity != EntityID_Invalid) { ComponentWrapper transform = world->GetComponent(entity, "Transform"); EntityID parent = world->GetParent(entity); - if (parent != 0) { + //if (parent != EntityID_Invalid) { position += AbsoluteOrientation(world, parent) * (glm::vec3)transform["Position"]; - } else { - position += (glm::vec3)transform["Position"]; - } + //} else { + // position += (glm::vec3)transform["Position"]; + //} entity = parent; - } while (entity != 0); + } return position; } @@ -45,11 +45,11 @@ glm::quat RenderQueueFactory::AbsoluteOrientation(World* world, EntityID entity) { glm::quat orientation; - do { + while (entity != EntityID_Invalid) { ComponentWrapper transform = world->GetComponent(entity, "Transform"); orientation = glm::quat((glm::vec3)transform["Orientation"]) * orientation; entity = world->GetParent(entity); - } while (entity != 0); + } return orientation; } @@ -58,11 +58,11 @@ glm::vec3 RenderQueueFactory::AbsoluteScale(World* world, EntityID entity) { glm::vec3 scale(1.f); - do { + while (entity != EntityID_Invalid) { ComponentWrapper transform = world->GetComponent(entity, "Transform"); scale *= (glm::vec3)transform["Scale"]; entity = world->GetParent(entity); - } while (entity != 0); + } return scale; } diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt index 18b80f93..04146670 100644 --- a/src/Game/CMakeLists.txt +++ b/src/Game/CMakeLists.txt @@ -19,6 +19,7 @@ file(GLOB SOURCE_FILES set(SOURCE_FILES ${SOURCE_FILES} "Game.cpp" + "HealthSystem.cpp" "PlayerSystem.cpp" ) diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index d02b480d..95846e52 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -1,6 +1,8 @@ #include "Game.h" #include "Collision/TriggerSystem.h" #include "Collision/CollisionSystem.h" +#include "Game/HealthSystem.h" +#include "Core/EntityFileWriter.h" Game::Game(int argc, char* argv[]) { @@ -8,8 +10,8 @@ Game::Game(int argc, char* argv[]) ResourceManager::RegisterType("Sound"); ResourceManager::RegisterType("Model"); ResourceManager::RegisterType("Texture"); - ResourceManager::RegisterType("EntityXMLFile"); ResourceManager::RegisterType("ShaderProgram"); + ResourceManager::RegisterType("EntityFile"); m_Config = ResourceManager::Load("Config.ini"); LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get("Debug.LogLevel", 1)); @@ -28,7 +30,7 @@ Game::Game(int argc, char* argv[]) 0, m_Config->Get("Video.Width", 1280), m_Config->Get("Video.Height", 720) - )); + )); m_Renderer->Initialize(); m_Renderer->Camera()->SetFOV(glm::radians(m_Config->Get("Video.FOV", 90.f))); @@ -48,16 +50,27 @@ Game::Game(int argc, char* argv[]) m_World = new World(); std::string mapToLoad = m_Config->Get("Debug.LoadMap", ""); if (!mapToLoad.empty()) { - ResourceManager::Load(mapToLoad)->PopulateWorld(m_World); + auto file = ResourceManager::Load(mapToLoad); + EntityFilePreprocessor fpp(file); + fpp.RegisterComponents(m_World); + EntityFileParser fp(file); + fp.MergeEntities(m_World); } // Create system pipeline m_SystemPipeline = new SystemPipeline(m_EventBroker); - m_SystemPipeline->AddSystem(); - m_SystemPipeline->AddSystem(); - m_SystemPipeline->AddSystem(m_Renderer); - m_SystemPipeline->AddSystem(); - m_SystemPipeline->AddSystem(); + + //All systems with orderlevel 0 will be updated first. + unsigned int updateOrderLevel = 0; + m_SystemPipeline->AddSystem(updateOrderLevel); + m_SystemPipeline->AddSystem(updateOrderLevel); + m_SystemPipeline->AddSystem(updateOrderLevel, m_Renderer); + m_SystemPipeline->AddSystem(updateOrderLevel); + + //Collision and TriggerSystem should update after player. + ++updateOrderLevel; + m_SystemPipeline->AddSystem(updateOrderLevel); + m_SystemPipeline->AddSystem(updateOrderLevel); // Invoke network if (m_Config->Get("Networking.StartNetwork", false)) { diff --git a/src/Game/HealthSystem.cpp b/src/Game/HealthSystem.cpp new file mode 100644 index 00000000..7a1d5005 --- /dev/null +++ b/src/Game/HealthSystem.cpp @@ -0,0 +1,59 @@ +#include "HealthSystem.h" +#include + +HealthSystem::HealthSystem(EventBroker* eventBroker) + : PureSystem(eventBroker, "Health") +{ + //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker) + EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &HealthSystem::OnPlayerDamaged); + EVENT_SUBSCRIBE_MEMBER(m_EPlayerHealthPickup, &HealthSystem::OnPlayerHealthPickup); +} + +void HealthSystem::UpdateComponent(World *world, ComponentWrapper &health, double dt) +{ + //if entityID of health is 9 then the players ID is also 9 (player,health are connected to the same entity) + ComponentWrapper player = world->GetComponent(health.EntityID, "Player"); + double maxHealth = (double)health["MaxHealth"]; + + //process the DeltaHealthVector and change the entitys health accordingly + for (size_t i = m_DeltaHealthVector.size(); i > 0; i--) + { + auto deltaHP = m_DeltaHealthVector[i - 1]; + //if we have a healthchange for the current player and health is greater than 0, then apply it + if (std::get<0>(deltaHP) == player.EntityID && (double)health["Health"] > 0.0f) { + //get the deltaHP value from the tuple and make sure you dont get more than maxHealth + double newHealth = std::min((double)health["Health"] + (double)std::get<1>(deltaHP), maxHealth); + health["Health"] = newHealth; + m_DeltaHealthVector.erase(m_DeltaHealthVector.begin() + i - 1); + //check if health is <= 0 + if ((double)health["Health"] <= 0.0f) { + //publish death event + Events::PlayerDeath e; + e.PlayerID = player.EntityID; + m_EventBroker->Publish(e); + //clear the remaining hpDeltas for the dead player + for (size_t j = m_DeltaHealthVector.size(); j > 0; j--) + { + if (std::get<0>(m_DeltaHealthVector[j - 1]) == player.EntityID) + m_DeltaHealthVector.erase(m_DeltaHealthVector.begin() + j - 1); + } + //break the loop if the player is dead + break; + } + } + } +} + +bool HealthSystem::OnPlayerDamaged(const Events::PlayerDamage& e) +{ + //save the changed HP to a vector. it will be taken care of in UpdateComponent + m_DeltaHealthVector.push_back(std::make_tuple(e.PlayerDamagedID, -e.DamageAmount)); + return true; +} + +bool HealthSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup& e) +{ + //save the changed HP to a vector. it will be taken care of in UpdateComponent + m_DeltaHealthVector.push_back(std::make_tuple(e.PlayerHealedID, e.HealthAmount)); + return true; +} diff --git a/src/Tests/ConfigFileTest.cpp b/src/Tests/ConfigFileTest.cpp new file mode 100644 index 00000000..28be5589 --- /dev/null +++ b/src/Tests/ConfigFileTest.cpp @@ -0,0 +1,66 @@ +#include +#include +using boost::unit_test_framework::test_suite; +using boost::unit_test_framework::test_case; +#include //srand + +//#define private public +#include "Engine\Core\ConfigFile.h" + +#define _CRTDBG_MAP_ALLOC +#include +#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__) +#define new DEBUG_CLIENTBLOCK + +BOOST_AUTO_TEST_SUITE(confTest) + +BOOST_AUTO_TEST_CASE(configFileTest) +{ + //note: this ConfigFileclass currently has memleaks! + + ResourceManager::RegisterType("ConfigFile"); + auto m_Config = ResourceManager::Load("ConfigTest.ini"); + + //bägge måste vara av samma typ, T typen är string + //http://www.boost.org/doc/libs/1_42_0/doc/html/boost_propertytree/tutorial.html + //"Note that we construct the path to the value by separating the individual keys with dots" + + //get from tree tests + auto getSomething = m_Config->Get("Test.Test1", 0); + BOOST_CHECK(getSomething == 423); + + auto getSomething2 = m_Config->Get("fsdfdsfd.T", std::string("")); + BOOST_CHECK(getSomething2 == "\"gfdjakflsdl!\""); + + //set/get tests + m_Config->Set("Test.4321", 123); + auto getSomething3 = m_Config->Get("Test.4321", 0); + BOOST_CHECK(getSomething3 == 123); + + m_Config->Set("3_2_1_0_5", "t454j54hj5k32"); + auto getSomething4 = m_Config->Get("3_2_1_0_5", std::string("")); + BOOST_CHECK(getSomething4 == "t454j54hj5k32"); + + //***check so outputwindow says: EE: Failed to find "DefaultConfigTestNotExists.ini"! Relying on hardcoded default values! + auto m_Config2 = ResourceManager::Load("ConfigTestNotExists.ini"); + + //set value/savetodisk/load/checkvalue... + m_Config->SaveToDisk(); + m_Config->Set("Test.4321", 145); + m_Config->SaveToDisk(); + auto m_Config3 = ResourceManager::Load("ConfigTest.ini"); + auto getSomething5 = m_Config->Get("Test.4321", 0); + BOOST_CHECK(getSomething5 == 145); + + //***check so outputwindow says: EE: Failed to parse "DefaultConfigTestFailed.ini" + //***check so outputwindow says: EE: Failed to parse "ConfigTestFailed.ini": + auto m_Config4 = ResourceManager::Load("ConfigTestFailed.ini"); + + //reload,onchildreload unimplemented + + //NOTE:still massive amount of memoryleaks from this method + _CrtDumpMemoryLeaks(); +} + +BOOST_AUTO_TEST_SUITE_END() + diff --git a/src/Tests/EventFixture.h b/src/Tests/EventFixture.h new file mode 100644 index 00000000..42258932 --- /dev/null +++ b/src/Tests/EventFixture.h @@ -0,0 +1,54 @@ +#ifndef EVENTFIXTURE_H +#define EVENTFIXTURE_H + +#include +#include "Core\EventBroker.h" + +template +struct EventFixture +{ + EventFixture() + { + this->ventBroker = new EventBroker(); + m_EEventType = decltype(m_EEventType)(std::bind(&EventFixture::OnEvent, this, std::placeholders::_1)); + this->ventBroker->Subscribe(m_EEventType); + Run(); + Check(); + } + ~EventFixture() + { + this->ventBroker->Unsubscribe(m_EEventType); + delete this->ventBroker; + } + + EventBroker* ventBroker = nullptr; + EventRelay m_EEventType; + bool m_EventRecieved = false; + EventType Before; + EventType After; + + bool OnEvent(const EventType& event) + { + m_EventRecieved = true; + After = event; + + return true; + } + + void Run() + { + // Publish the event + this->ventBroker->Publish(Before); + // Clear to swap buffers + this->ventBroker->Swap(); + // Process the event + this->ventBroker->template Process(); + } + + void Check() + { + BOOST_CHECK(m_EventRecieved); + } +}; + +#endif \ No newline at end of file diff --git a/src/Tests/EventTest.cpp b/src/Tests/EventTest.cpp new file mode 100644 index 00000000..4a030055 --- /dev/null +++ b/src/Tests/EventTest.cpp @@ -0,0 +1,19 @@ +#include +#include "EventFixture.h" + +struct ETestEvent : public Event +{ + int Int = 5; + float Float = 1.33333f; + double Double = 1.33333; + std::string String = "Hello World"; +}; + +BOOST_AUTO_TEST_CASE(EventBrokerTest) +{ + EventFixture f; + BOOST_CHECK(f.Before.Int == f.After.Int); + BOOST_CHECK_CLOSE(f.Before.Float, f.After.Float, 0.00001f); + BOOST_CHECK_CLOSE(f.Before.Double, f.After.Double, 0.00001f); + BOOST_CHECK(f.Before.String == f.After.String); +} \ No newline at end of file diff --git a/src/Tests/HealthSystemTest.cpp b/src/Tests/HealthSystemTest.cpp new file mode 100644 index 00000000..84d6199d --- /dev/null +++ b/src/Tests/HealthSystemTest.cpp @@ -0,0 +1,114 @@ +#include +using boost::unit_test_framework::test_suite; +using boost::unit_test_framework::test_case; + +#include "HealthSystemTest.h" +#include "Game/HealthSystem.h" + +BOOST_AUTO_TEST_SUITE(HealthSystemSuite) + +BOOST_AUTO_TEST_CASE(HealthSystemTest) +{ + //this tests 2 healthevents and the healthsystem + GameHealthSystemTest game; + //100 loops will be more than enough to do the test + int loops = 100; + bool success = false; + while (loops > 0) { + game.Tick(); + if (game.TestSucceeded) { + success = true; + break; + } + loops--; + } + //The system will process the events, hence it will take a while before we can read anything + BOOST_TEST(success); +} +BOOST_AUTO_TEST_SUITE_END() + +GameHealthSystemTest::GameHealthSystemTest() +{ + ResourceManager::RegisterType("ConfigFile"); + ResourceManager::RegisterType("EntityXMLFile"); + + m_Config = ResourceManager::Load("Config.ini"); + LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get("Debug.LogLevel", 1)); + + // Create the core event broker + m_EventBroker = new EventBroker(); + + // Create a world + m_World = new World(); + std::string mapToLoad = m_Config->Get("Debug.LoadMap", ""); + if (!mapToLoad.empty()) { + ResourceManager::Load(mapToLoad)->PopulateWorld(m_World); + } + + // Create system pipeline + m_SystemPipeline = new SystemPipeline(m_EventBroker); + m_SystemPipeline->AddSystem(0); + m_SystemPipeline->AddSystem(0); + + //The Test + //create entity which has transorm,player,model,health in it. i.e. is a player + EntityID playerID = m_World->CreateEntity(); + ComponentWrapper transform = m_World->AttachComponent(playerID, "Transform"); + ComponentWrapper model = m_World->AttachComponent(playerID, "Model"); + model["Resource"] = "Models/Core/UnitSphere.obj"; + ComponentWrapper player = m_World->AttachComponent(playerID, "Player"); + ComponentWrapper health = m_World->AttachComponent(playerID, "Health"); + healthsID = playerID; + double currentHealth = (double)m_World->GetComponent(healthsID, "Health")["Health"]; + + //heal player with 40 + Events::PlayerHealthPickup e3; + e3.HealthAmount = 40.0f; + e3.PlayerHealedID = healthsID; + m_EventBroker->Publish(e3); + //damage player with 50 + Events::PlayerDamage e; + e.DamageAmount = 50.0f; + e.PlayerDamagedID = healthsID; + m_EventBroker->Publish(e); + //heal some other player with 40 + Events::PlayerHealthPickup e2; + e2.HealthAmount = 40.0f; + e2.PlayerHealedID = healthsID+1; + m_EventBroker->Publish(e2); + + EntityID playerID2 = m_World->CreateEntity(); + ComponentWrapper transform2 = m_World->AttachComponent(playerID2, "Transform"); + ComponentWrapper model2 = m_World->AttachComponent(playerID2, "Model"); + model2["Resource"] = "Models/Core/UnitSphere.obj"; + ComponentWrapper player2 = m_World->AttachComponent(playerID2, "Player"); + ComponentWrapper health2 = m_World->AttachComponent(playerID2, "Health"); + //END TEST +} + +GameHealthSystemTest::~GameHealthSystemTest() +{ + delete m_SystemPipeline; + delete m_World; + delete m_EventBroker; +} + +void GameHealthSystemTest::Tick() +{ + glfwPollEvents(); + + double currentTime = glfwGetTime(); + double dt = currentTime - m_LastTime; + m_LastTime = currentTime; + + // Iterate through systems and update world! + m_SystemPipeline->Update(m_World, dt); + + m_EventBroker->Swap(); + m_EventBroker->Clear(); + + //if health reaches 90 then we know the test has succeeded (start with 100hp, remove 50hp, add 40hp) + double currentHealth = (double)m_World->GetComponent(healthsID, "Health")["Health"]; + if (currentHealth==90) + TestSucceeded = true; +} diff --git a/src/Tests/HealthSystemTest.h b/src/Tests/HealthSystemTest.h new file mode 100644 index 00000000..664d2ef3 --- /dev/null +++ b/src/Tests/HealthSystemTest.h @@ -0,0 +1,40 @@ +#ifndef HealthTest_h__ +#define HealthTest_h__ + +#include "Core/ResourceManager.h" +#include "Core/ConfigFile.h" +#include "Core/EventBroker.h" +#include "Rendering/Renderer.h" +#include "Core/InputManager.h" +#include "GUI/Frame.h" +#include "Core/World.h" +#include "Rendering/RenderQueueFactory.h" +#include "Input/InputProxy.h" +#include "Input/KeyboardInputHandler.h" +#include "Input/MouseInputHandler.h" +#include "Core/EKeyDown.h" +#include "Core/EntityXMLFile.h" +#include "Core/SystemPipeline.h" +#include "RaptorCopterSystem.h" +#include "PlayerSystem.h" +#include "Editor/EditorSystem.h" + +class GameHealthSystemTest +{ +public: + GameHealthSystemTest(); + ~GameHealthSystemTest(); + + void Tick(); + bool TestSucceeded = false; + +private: + double m_LastTime; + ConfigFile* m_Config = nullptr; + EventBroker* m_EventBroker; + World* m_World; + SystemPipeline* m_SystemPipeline; + int healthsID; +}; + +#endif diff --git a/src/Tests/InputManagerTest.cpp b/src/Tests/InputManagerTest.cpp new file mode 100644 index 00000000..5b447c2b --- /dev/null +++ b/src/Tests/InputManagerTest.cpp @@ -0,0 +1,12 @@ +#include + +#include "Engine\Core\InputManager.h" + +BOOST_AUTO_TEST_SUITE(inputManagerTests) + +BOOST_AUTO_TEST_CASE(inputManagerTest) +{ + //already tested eventbroker so inputManager is indirectly already tested +} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/Tests/OctTreeTestAnders.cpp b/src/Tests/OctTreeTestAnders.cpp index 12a122ea..b61caead 100644 --- a/src/Tests/OctTreeTestAnders.cpp +++ b/src/Tests/OctTreeTestAnders.cpp @@ -34,16 +34,12 @@ BOOST_AUTO_TEST_CASE(octTreeTest) BOOST_CHECK(someAABB.MaxCorner() == maxCorner); BOOST_CHECK(someAABB.Center() == 0.5f * (minCorner + maxCorner)); - //simple OctTree constructor check - //OctTree someOctTree(someAABB, 5); - //BOOST_CHECK(someOctTree.m_Children[0] != nullptr); - //simple destructor check in the end, just look for memleaks, then it didnt clear the AABB structure } BOOST_AUTO_TEST_CASE(octTreeTest2) { - //octtree ritningen osv + //octtree draw etc Game game(0, nullptr); while (game.Running()) { game.Tick(); diff --git a/src/Tests/OctTreeTestGameClass.cpp b/src/Tests/OctTreeTestGameClass.cpp index 1a7deb3f..10d4d6a5 100644 --- a/src/Tests/OctTreeTestGameClass.cpp +++ b/src/Tests/OctTreeTestGameClass.cpp @@ -5,6 +5,8 @@ Game::Game(int argc, char* argv[]) : someOctTree(AABB(-0.5f*worldSize, 0.5f*worl ResourceManager::RegisterType("ConfigFile"); ResourceManager::RegisterType("Model"); ResourceManager::RegisterType("Texture"); + ResourceManager::RegisterType("EntityXMLFile"); + ResourceManager::RegisterType("ShaderProgram"); m_Config = ResourceManager::Load("Config.ini"); LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get("Debug.LogLevel", 1)); @@ -25,9 +27,14 @@ Game::Game(int argc, char* argv[]) : someOctTree(AABB(-0.5f*worldSize, 0.5f*worl m_Config->Get("Video.Height", 720) )); m_Renderer->Initialize(); + m_Renderer->Camera()->SetFOV(glm::radians(m_Config->Get("Video.FOV", 90.f))); // Create input manager m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker); + m_InputProxy = new InputProxy(m_EventBroker); + m_InputProxy->AddHandler(); + m_InputProxy->AddHandler(); + m_InputProxy->LoadBindings("Input.ini"); // Create the root level GUI frame m_FrameStack = new GUI::Frame(m_EventBroker); @@ -37,6 +44,9 @@ Game::Game(int argc, char* argv[]) : someOctTree(AABB(-0.5f*worldSize, 0.5f*worl // Create a TEST WORLD m_World = new HardcodedTestWorld(); + m_SystemPipeline = new SystemPipeline(m_EventBroker); + m_SystemPipeline->AddSystem(0); + m_LastTime = glfwGetTime(); } @@ -52,9 +62,14 @@ void Game::Tick() double dt = currentTime - m_LastTime; m_LastTime = currentTime; + // Handle input in a weird looking but responsive way + m_EventBroker->Process(); m_EventBroker->Swap(); m_InputManager->Update(dt); - m_Renderer->Update(dt); + m_EventBroker->Swap(); + m_InputProxy->Update(dt); + m_EventBroker->Swap(); + m_InputProxy->Process(); m_EventBroker->Swap(); #define TEST1 @@ -70,7 +85,7 @@ void Game::Tick() AABB boxi; boxi.CreateFromCenter(pos, maxPos - minPos); frameCounter++; - if (frameCounter > 50) { + if (frameCounter > 1) { m_World->someOctTree.ClearDynamicObjects(); m_World->someOctTree.AddDynamicObject(boxi); frameCounter = 0; @@ -149,8 +164,8 @@ void Game::Tick() if (someOctTree.BoxCollides(redBox, AABB())) { //this checks AABB vs AABB //if (Collision::AABBVsAABB(redBox, aabb)) { - m_Renderer->Camera()->SetPosition(m_PrevPos); - m_Renderer->Camera()->SetOrientation(m_PrevOri); + //m_Renderer->Camera()->SetPosition(m_PrevPos); + //m_Renderer->Camera()->SetOrientation(m_PrevOri); model["Color"] = greenCol; } else { @@ -163,8 +178,14 @@ void Game::Tick() m_RenderQueueFactory->Update(m_World); #endif - m_Renderer->Draw(m_RenderQueueFactory->RenderQueues()); + // Iterate through systems and update world! + m_SystemPipeline->Update(m_World, dt); + m_Renderer->Update(dt); + m_RenderQueueFactory->Update(m_World); + GLERROR("Game::Tick m_RenderQueueFactory->Update"); + m_Renderer->Draw(m_RenderQueueFactory->RenderQueues()); + GLERROR("Game::Tick m_Renderer->Draw"); m_EventBroker->Swap(); m_EventBroker->Clear(); diff --git a/src/Tests/OctTreeTestGameClass.h b/src/Tests/OctTreeTestGameClass.h index 985d34d4..6dc9404e 100644 --- a/src/Tests/OctTreeTestGameClass.h +++ b/src/Tests/OctTreeTestGameClass.h @@ -9,11 +9,19 @@ #include "GUI/Frame.h" #include "Core/World.h" #include "Rendering/RenderQueueFactory.h" +#include "Input/InputProxy.h" +#include "Input/KeyboardInputHandler.h" +#include "Input/MouseInputHandler.h" +#include "Core/EKeyDown.h" +#include "Core/EntityXMLFile.h" +#include "Core/SystemPipeline.h" +#include "RaptorCopterSystem.h" +#include "PlayerSystem.h" +#include "Editor/EditorSystem.h" #include "OctTreeTestHardCodedTestWorld.h" #include "Collision/Collision.h" - class Game { public: @@ -32,6 +40,8 @@ private: GUI::Frame* m_FrameStack; HardcodedTestWorld* m_World; RenderQueueFactory* m_RenderQueueFactory; + InputProxy* m_InputProxy; + SystemPipeline* m_SystemPipeline; //Test1 int frameCounter = 0; diff --git a/src/Tests/ResourceManagerTest.cpp b/src/Tests/ResourceManagerTest.cpp new file mode 100644 index 00000000..a3edb7b8 --- /dev/null +++ b/src/Tests/ResourceManagerTest.cpp @@ -0,0 +1,36 @@ +#include +#include "Core/World.h" + +//private->public hack doesnt work, tons of link errors +//so there is currently no good way to test this class +//#define private public +#include "Core/ResourceManager.h" +#include "Core/ConfigFile.h" +#include "Rendering/Renderer.h" +#include "Core/EntityXMLFile.h" +#include "Engine\Rendering\Texture.h" + +BOOST_AUTO_TEST_SUITE(resourceManagerTests) + +BOOST_AUTO_TEST_CASE(resourceManagerTest) +{ + World m_World; + + //private static metoder/variabler + + ResourceManager::RegisterType("ConfigFile"); + BOOST_CHECK(!ResourceManager::IsResourceLoaded("ConfigFile", "Config.ini")); + auto m_Config = ResourceManager::Load("Config.ini"); + BOOST_CHECK(ResourceManager::IsResourceLoaded("ConfigFile", "Config.ini")); + ResourceManager::Release("ConfigFile", "Config.ini"); + BOOST_CHECK(!ResourceManager::IsResourceLoaded("ConfigFile", "Config.ini")); + + //configfile without register + //check so output says "EE failed to load: type not registered..." + auto m_ScreenQuadNoRegister = ResourceManager::Load("Models/Core/ScreenQuad.obj"); + BOOST_CHECK(!ResourceManager::IsResourceLoaded("Model", "Models/Core/ScreenQuad.obj")); + + //there is no error feedback to check if you try to release the wrong resources - hence that cant be tested either +} + +BOOST_AUTO_TEST_SUITE_END()