diff --git a/include/Engine/Collision/CollidableOctreeSystem.h b/include/Engine/Collision/CollidableOctreeSystem.h new file mode 100644 index 00000000..8fa1f0a4 --- /dev/null +++ b/include/Engine/Collision/CollidableOctreeSystem.h @@ -0,0 +1,24 @@ +#ifndef CollidableOctreeSystem_h__ +#define CollidableOctreeSystem_h__ + +#include "../Core/System.h" +#include "../Core/Octree.h" +#include "Collision.h" + +class CollidableOctreeSystem : public ImpureSystem, public PureSystem +{ +public: + CollidableOctreeSystem(EventBroker* eventBroker, Octree* octree) + : System(eventBroker) + , PureSystem("Collidable") + , m_Octree(octree) + { } + + virtual void Update(World* world, double dt) override; + virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override; + +private: + Octree* m_Octree; +}; + +#endif \ No newline at end of file diff --git a/include/Engine/Collision/Collision.h b/include/Engine/Collision/Collision.h index a441c998..148f688d 100644 --- a/include/Engine/Collision/Collision.h +++ b/include/Engine/Collision/Collision.h @@ -6,11 +6,14 @@ //or you will get "fatal error C1189: #error: gl.h included before glew.h" #include +#include #include "../Core/Ray.h" #include "../Core/AABB.h" #include "../Rendering/RawModel.h" +#include "../Core/Transform.h" #include "../Core/Entity.h" +#include "../Core/EntityWrapper.h" class World; struct ComponentWrapper; @@ -43,6 +46,12 @@ bool RayVsModel(const Ray& ray, float& outUCoord, float& outVCoord); +bool AABBvsTriangles(const AABB& box, + const std::vector& modelVertices, + const std::vector& modelIndices, + const glm::mat4& modelMatrix, + glm::vec3& outResolutionVector); + //Return true if the boxes are intersecting. bool AABBVsAABB(const AABB& a, const AABB& b); //Return true if the boxes are intersecting. @@ -50,9 +59,8 @@ bool AABBVsAABB(const AABB& a, const AABB& b); bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation); bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon = 0.0001f); -//Returns true if the entity has a boundingbox. Outputs the aabb in [outBox]. -bool GetEntityBox(World* world, EntityID entity, AABB& outBox, bool forceBoxFromModel = false); -bool GetEntityBox(World* world, ComponentWrapper& AABBComponent, AABB& outBox); +// Calculates an absolute AABB from an entity AABB component +boost::optional EntityAbsoluteAABB(EntityWrapper& entity); } diff --git a/include/Engine/Collision/CollisionSystem.h b/include/Engine/Collision/CollisionSystem.h index f4752ecf..561c5158 100644 --- a/include/Engine/Collision/CollisionSystem.h +++ b/include/Engine/Collision/CollisionSystem.h @@ -8,22 +8,27 @@ #include "../Core/System.h" #include "../Core/EventBroker.h" #include "../Core/EKeyUp.h" +#include "../Core/Octree.h" class CollisionSystem : public PureSystem { public: - CollisionSystem(EventBroker* eventBroker) - : PureSystem(eventBroker, "AABB") + CollisionSystem(EventBroker* eventBroker, Octree* octree) + : System(eventBroker) + , PureSystem("Collidable") + , m_Octree(octree) , zPress(false) { //TODO: Debug stuff, remove later. EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &CollisionSystem::OnKeyUp); } - virtual void UpdateComponent(World* world, ComponentWrapper& cAABB, double dt) override; + virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override; private: + Octree* m_Octree; bool zPress; + EventRelay m_EKeyUp; bool OnKeyUp(const Events::KeyUp &event); }; diff --git a/include/Engine/Collision/TriggerSystem.h b/include/Engine/Collision/TriggerSystem.h index dfb56a2c..65e7c271 100644 --- a/include/Engine/Collision/TriggerSystem.h +++ b/include/Engine/Collision/TriggerSystem.h @@ -6,6 +6,7 @@ #include "../Core/System.h" #include "../Core/EventBroker.h" +#include "../Core/Octree.h" #include "ETrigger.h" class AABB; @@ -13,16 +14,31 @@ class AABB; class TriggerSystem : public PureSystem { public: - TriggerSystem(EventBroker* eventBroker) - : PureSystem(eventBroker, "Trigger") - {} + TriggerSystem(EventBroker* eventBroker, Octree* octree) + : System(eventBroker) + , PureSystem("Trigger") + , m_Octree(octree) + { + EVENT_SUBSCRIBE_MEMBER(m_ETouch, &TriggerSystem::OnTouch); + EVENT_SUBSCRIBE_MEMBER(m_EEnter, &TriggerSystem::OnEnter); + EVENT_SUBSCRIBE_MEMBER(m_ELeave, &TriggerSystem::OnLeave); + } - virtual void UpdateComponent(World* world, ComponentWrapper& collision, double dt) override; + virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override; private: + Octree* m_Octree; std::unordered_map> m_EntitiesTouchingTrigger; std::unordered_map> m_EntitiesCompletelyInTrigger; + //TODO: Only exists for debug purposes, remove later. + EventRelay m_EEnter; + bool OnEnter(const Events::TriggerEnter &event); + EventRelay m_ETouch; + bool OnTouch(const Events::TriggerTouch &event); + EventRelay m_ELeave; + bool OnLeave(const Events::TriggerLeave &event); + //True if leave event was thrown. bool throwLeaveIfWasInTrigger(std::unordered_set& triggerSet, EntityID pId, EntityID tId); template diff --git a/include/Engine/Common.h b/include/Engine/Common.h index ebdc90d0..7d6f520d 100644 --- a/include/Engine/Common.h +++ b/include/Engine/Common.h @@ -1,5 +1,6 @@ #include #include +#include #include #include #include diff --git a/include/Engine/Core/AABB.h b/include/Engine/Core/AABB.h index c8e05248..5b9c6485 100644 --- a/include/Engine/Core/AABB.h +++ b/include/Engine/Core/AABB.h @@ -11,18 +11,18 @@ public: AABB(const glm::vec3& minPos, const glm::vec3& maxPos); AABB(const glm::vec4& minPos, const glm::vec4& maxPos); //No checks are made. Size must consist of non-negative numbers. - virtual void CreateFromCenter(const glm::vec3& center, const glm::vec3& size); + static AABB FromOriginSize(const glm::vec3& origin, const glm::vec3& size); virtual ~AABB(); const glm::vec3& MinCorner() const { return m_MinCorner; } const glm::vec3& MaxCorner() const { return m_MaxCorner; } - const glm::vec3& Center() const { return m_Center; } + const glm::vec3& Origin() const { return m_Origin; } const glm::vec3 Size() const { return 2.0f * m_HalfSize; } const glm::vec3& HalfSize() const { return m_HalfSize; } private: glm::vec3 m_MinCorner; glm::vec3 m_MaxCorner; - glm::vec3 m_Center; + glm::vec3 m_Origin; glm::vec3 m_HalfSize; }; diff --git a/include/Engine/Core/ComponentInfo.h b/include/Engine/Core/ComponentInfo.h index 985a057e..def2a323 100644 --- a/include/Engine/Core/ComponentInfo.h +++ b/include/Engine/Core/ComponentInfo.h @@ -9,7 +9,8 @@ struct ComponentInfo { std::string Annotation; unsigned int Allocation = 0; - unsigned int Stride = 0; + std::map FieldAnnotations; + std::map> FieldEnumDefinitions; }; struct Field_t @@ -23,8 +24,9 @@ struct ComponentInfo std::string Name; std::unordered_map Fields; std::vector FieldsInOrder; - Meta_t Meta; + unsigned int Stride = 0; std::shared_ptr Defaults = nullptr; + std::shared_ptr Meta = nullptr; }; template<> diff --git a/include/Engine/Core/ComponentPool.h b/include/Engine/Core/ComponentPool.h index 619aade8..ed81d72e 100644 --- a/include/Engine/Core/ComponentPool.h +++ b/include/Engine/Core/ComponentPool.h @@ -43,7 +43,7 @@ public: ComponentPool(const ::ComponentInfo& ci) : m_ComponentInfo(ci) - , m_Pool(ci.Meta.Allocation, sizeof(EntityID) + ci.Meta.Stride) + , m_Pool(ci.Meta->Allocation, sizeof(EntityID) + ci.Stride) { } ComponentPool(const ComponentPool& other) = delete; ComponentPool(const ComponentPool&& other) = delete; diff --git a/include/Engine/Core/ComponentWrapper.h b/include/Engine/Core/ComponentWrapper.h index 922b3d79..f124d3d5 100644 --- a/include/Engine/Core/ComponentWrapper.h +++ b/include/Engine/Core/ComponentWrapper.h @@ -18,22 +18,32 @@ struct ComponentWrapper const ::EntityID EntityID; char* Data; - template - T& Property(std::string name) + int Enum(const char* fieldName, const char* enumKey) { - unsigned int offset = Info.Fields.at(name).Offset; - return *reinterpret_cast(&Data[offset]); + return Info.Meta->FieldEnumDefinitions.at(fieldName).at(enumKey); } template - void SetProperty(std::string name, const T value) { Property(name) = value; } + T& Field(std::string name) + { + const ComponentInfo::Field_t& field = Info.Fields.at(name); + if (sizeof(T) > field.Stride) { + std::stringstream message; + message << "Type size of \"" << typeid(T).name() << "\" doesn't match size of component field \"" << Info.Name << "." << name << "\"!"; + throw new std::runtime_error(message.str().c_str()); + } + return *reinterpret_cast(&Data[field.Offset]); + } + + template + void SetField(std::string name, const T value) { Field(name) = value; } //template - //void SetProperty(std::string name, T& value) { Property(name) = value; } + //void SetField(std::string name, T& value) { Field(name) = value; } // Specialization for string literals template - void SetProperty(std::string name, const char(&value)[N]) { Property(name) = std::string(value); } - + void SetField(std::string name, const char(&value)[N]) { Field(name) = std::string(value); } + struct SubscriptProxy { friend struct ComponentWrapper; @@ -47,18 +57,21 @@ struct ComponentWrapper std::string m_PropertyName; public: - template - operator T&() { return m_Component->Property(m_PropertyName); } + // Return the integer value of an enum type key for this field + int Enum(const char* enumKey) { return m_Component->Enum(m_PropertyName.c_str(), enumKey); } template - void operator=(const T val) { m_Component->SetProperty(m_PropertyName, val); } + operator T&() { return m_Component->Field(m_PropertyName); } + + template + void operator=(const T val) { m_Component->SetField(m_PropertyName, val); } // TODO: Pass by reference and rvalue (universal reference?) //template - //void operator=(T& val) { m_Component->SetProperty(m_PropertyName, val); } + //void operator=(T& val) { m_Component->SetField(m_PropertyName, val); } // Specialization for string literals - template - void operator=(const char(&val)[N]) { m_Component->SetProperty(m_PropertyName, val); } + template + void operator=(const char(&val)[N]) { m_Component->SetField(m_PropertyName, val); } }; SubscriptProxy operator[](std::string propertyName) { return SubscriptProxy(this, propertyName); } }; @@ -71,7 +84,7 @@ public: ComponentWrapperFactory(std::string componentTypeName, std::size_t allocation = 0) { m_ComponentInfo.Name = componentTypeName; - m_ComponentInfo.Meta.Allocation = allocation; + m_ComponentInfo.Meta->Allocation = allocation; } template @@ -79,14 +92,14 @@ public: { m_DefaultValues.push_back(defaultValue); m_ComponentInfo.Fields[fieldName].Name = typeid(T).name(); - m_ComponentInfo.Fields[fieldName].Offset = m_ComponentInfo.Meta.Stride; + m_ComponentInfo.Fields[fieldName].Offset = m_ComponentInfo.Stride; m_ComponentInfo.Fields[fieldName].Stride = sizeof(T); - m_ComponentInfo.Meta.Stride += sizeof(T); + m_ComponentInfo.Stride += sizeof(T); } ComponentInfo& Finalize() { - m_ComponentInfo.Defaults = std::shared_ptr(new char[m_ComponentInfo.Meta.Stride]); + m_ComponentInfo.Defaults = std::shared_ptr(new char[m_ComponentInfo.Stride]); std::size_t offset = 0; for (auto& val : m_DefaultValues) { memcpy(m_ComponentInfo.Defaults.get() + offset, val.Data.get(), val.Size); diff --git a/include/Engine/Core/EComponentAttached.h b/include/Engine/Core/EComponentAttached.h new file mode 100644 index 00000000..b4ab9f78 --- /dev/null +++ b/include/Engine/Core/EComponentAttached.h @@ -0,0 +1,20 @@ +#ifndef EComponentAttached_h__ +#define EComponentAttached_h__ + +#include "EventBroker.h" +#include "World.h" +#include "Entity.h" +#include "ComponentWrapper.h" + +namespace Events +{ + +struct ComponentAttached : Event +{ + EntityWrapper Entity; + ComponentWrapper Component; +}; + +} + +#endif \ No newline at end of file diff --git a/include/Engine/Core/Entity.h b/include/Engine/Core/Entity.h index 1f40b9b7..653ba650 100644 --- a/include/Engine/Core/Entity.h +++ b/include/Engine/Core/Entity.h @@ -4,4 +4,5 @@ typedef unsigned int EntityID; const static unsigned int EntityID_Invalid = -1; + #endif \ No newline at end of file diff --git a/include/Engine/Core/EntityFactory.h b/include/Engine/Core/EntityFactory.h index d1dbce03..c3c964bc 100644 --- a/include/Engine/Core/EntityFactory.h +++ b/include/Engine/Core/EntityFactory.h @@ -285,7 +285,7 @@ private: XSValue::Status status; XSValue* val = XSValue::getActualValue(child->getNodeValue(), XSValue::dt_integer, status); - compInfo.Meta.Allocation += val->fData.fValue.f_int; + compInfo.Meta->Allocation += val->fData.fValue.f_int; } // Save documentation string @@ -293,11 +293,11 @@ private: if (documentationTags->getLength() != 0) { auto child = documentationTags->item(0)->getFirstChild(); if (child != nullptr) { - compInfo.Meta.Annotation = XSTR(child->getNodeValue()); + compInfo.Meta->Annotation = XSTR(child->getNodeValue()); } } // TODO: Parse annotation string XML - // compInfo.Meta.Allocation = ... + // compInfo.Meta->Allocation = ... } else { std::cout << "Warning: Component is missing an annotation!" << std::endl; } @@ -344,7 +344,7 @@ private: fieldOffset += getTypeStride(type); } - compInfo.Meta.Stride = fieldOffset; + compInfo.Stride = fieldOffset; m_ComponentInfo[compInfo.Name] = compInfo; } } @@ -367,14 +367,14 @@ private: std::string componentName = XSTR(component->getLocalName()); auto& compInfo = m_ComponentInfo.at(componentName); - compInfo.Meta.Allocation += 1; + 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 << "Component: " << ci.Name << " (" << ci.Meta->Annotation << ")" << std::endl; + std::cout << " Allocation: " << ci.Meta->Allocation << std::endl; std::cout << " Fields:" << std::endl; // Calculate component size @@ -393,7 +393,7 @@ private: cs.ComponentName = ci.Name; cs.Stride = stride; cs.Info = ci; - cs.Data = new char[stride*ci.Meta.Allocation]; + cs.Data = new char[stride*ci.Meta->Allocation]; m_ComponentStore[cs.ComponentName] = cs; } } diff --git a/include/Engine/Core/EntityFile.h b/include/Engine/Core/EntityFile.h index 27115264..2549ed06 100644 --- a/include/Engine/Core/EntityFile.h +++ b/include/Engine/Core/EntityFile.h @@ -73,88 +73,15 @@ public: 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); - } + EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader); - 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); + void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override; + void characters(const XMLCh* const chars, const XMLSize_t length) override; + void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override; - 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; - } + void warning(const xercesc::SAXParseException& e); + void error(const xercesc::SAXParseException& e); + void fatalError(const xercesc::SAXParseException& e); private: const EntityFileHandler* m_Handler; @@ -168,73 +95,14 @@ private: 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); - } + void onStartEntity(const xercesc::Attributes& attrs); + void onEndEntity(); + void onStartEntityRef(const xercesc::Attributes& attrs); + void onStartComponent(const std::string& name); + void onEndComponent(const std::string& name); + void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs); + void onEndComponentField(const std::string& field); + void onFieldData(char* data); }; class EntityFileXMLErrorHandler : public xercesc::ErrorHandler @@ -269,6 +137,7 @@ private: class EntityFile : public Resource { friend class ResourceManager; + friend class EntityFileSAXHandler; private: EntityFile(boost::filesystem::path path); ~EntityFile(); @@ -288,6 +157,8 @@ private: xercesc::SAX2XMLReader* m_SAX2XMLReader; //std::map m_ComponentInfo; //std::vector m_EntityReferences; + + static void setReaderFeatures(xercesc::SAX2XMLReader* reader); }; #endif \ No newline at end of file diff --git a/include/Engine/Core/EntityFileParser.h b/include/Engine/Core/EntityFileParser.h index d46b508b..b4eee5b2 100644 --- a/include/Engine/Core/EntityFileParser.h +++ b/include/Engine/Core/EntityFileParser.h @@ -9,12 +9,13 @@ class EntityFileParser public: EntityFileParser(const EntityFile* entityFile); - void MergeEntities(World* world); + EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid); private: const EntityFile* m_EntityFile; EntityFileHandler m_Handler; World* m_World = nullptr; + EntityID m_FirstEntity = EntityID_Invalid; // 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; diff --git a/include/Engine/Core/EntityFilePreprocessor.h b/include/Engine/Core/EntityFilePreprocessor.h index 3c3998b1..3139169f 100644 --- a/include/Engine/Core/EntityFilePreprocessor.h +++ b/include/Engine/Core/EntityFilePreprocessor.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -31,6 +32,7 @@ private: void onStartComponent(EntityID entity, std::string type); void parseComponentInfo(); void parseDefaults(); + std::string parseAnnotationXML(const XMLCh* xml); }; #endif \ No newline at end of file diff --git a/include/Engine/Core/EntityWrapper.h b/include/Engine/Core/EntityWrapper.h new file mode 100644 index 00000000..55b64c6f --- /dev/null +++ b/include/Engine/Core/EntityWrapper.h @@ -0,0 +1,32 @@ +#ifndef EntityWrapper_h__ +#define EntityWrapper_h__ + +#include +#include "ComponentWrapper.h" + +class World; +struct EntityWrapper +{ + EntityWrapper() + : World(nullptr) + , ID(EntityID_Invalid) + { } + + EntityWrapper(::World* world, EntityID id) + : World(world) + , ID(id) + { } + + ::World* World; + EntityID ID; + + static const EntityWrapper Invalid; + + bool HasComponent(const std::string& componentName); + + ComponentWrapper operator[](const std::string& componentName); + bool operator==(const EntityWrapper& e); + explicit operator EntityID(); +}; + +#endif diff --git a/include/Engine/Core/EventBroker.h b/include/Engine/Core/EventBroker.h index dde5242a..dc1babc0 100644 --- a/include/Engine/Core/EventBroker.h +++ b/include/Engine/Core/EventBroker.h @@ -43,7 +43,7 @@ template class EventRelay : public BaseEventRelay { public: - typedef std::function CallbackType; + typedef std::function CallbackType; EventRelay() : m_Callback(nullptr) @@ -65,7 +65,7 @@ template bool EventRelay::Receive(const std::shared_ptr event) { if (m_Callback != nullptr) { - return m_Callback(*static_cast(event.get())); + return m_Callback(*static_cast(event.get())); } else { return false; } diff --git a/include/Engine/Core/OctTree.h b/include/Engine/Core/Octree.h similarity index 64% rename from include/Engine/Core/OctTree.h rename to include/Engine/Core/Octree.h index cdb21fbb..954dbcbc 100644 --- a/include/Engine/Core/OctTree.h +++ b/include/Engine/Core/Octree.h @@ -1,11 +1,12 @@ -#ifndef OctTree_h__ -#define OctTree_h__ +#ifndef Octree_h__ +#define Octree_h__ -#include "Core/AABB.h" +#include "../Common.h" +#include "AABB.h" class Ray; -class OctTree +class Octree { public: struct Output @@ -13,16 +14,16 @@ public: float CollideDistance; }; - OctTree(); - ~OctTree(); - //For the root OctTree, [octTreeBounds] should be a box containing the entire level. - OctTree(const AABB& octTreeBounds, int subDivisions); + Octree() = delete; + ~Octree(); + //For the root Octree, [octreeBounds] should be a box containing the entire level. + Octree(const AABB& octreeBounds, int subDivisions); - //We cannot copy the OctTree as of now, because of the recursive dynamic allocation. - //Define these if the OctTree suddenly needs to be copied, think of the children OctChild* ptrs. - OctTree(const OctTree& other) = delete; - OctTree(const OctTree&& other) = delete; - OctTree& operator= (const OctTree& other) = delete; + //We cannot copy the Octree as of now, because of the recursive dynamic allocation. + //Define these if the Octree suddenly needs to be copied, think of the children Child* ptrs. + Octree(const Octree& other) = delete; + Octree(const Octree&& other) = delete; + Octree& operator= (const Octree& other) = delete; //Add a dynamic object (one that moves around) into the tree. void AddDynamicObject(const AABB& box); //Add a static object (that does not move) into the tree. @@ -42,7 +43,7 @@ public: bool BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected); private: - struct OctChild; //Fwd declaration; + struct Child; //Fwd declaration; struct ContainedObject { ContainedObject() @@ -56,7 +57,7 @@ private: AABB Box; bool Checked; }; - OctChild* m_Root; + Child* m_Root; std::vector m_StaticObjects; std::vector m_DynamicObjects; @@ -67,16 +68,16 @@ private: void falsifyObjectChecks(); - struct OctChild + struct Child { - ~OctChild(); - OctChild(const AABB& octTreeBounds, + ~Child(); + Child(const AABB& octTreeBounds, int subDivisions, - std::vector& staticObjects, - std::vector& dynamicObjects); - OctChild(const OctChild& other) = delete; - OctChild(const OctChild&& other) = delete; - OctChild& operator= (const OctChild& other) = delete; + std::vector& staticObjects, + std::vector& dynamicObjects); + Child(const Child& other) = delete; + Child(const Child&& other) = delete; + Child& operator= (const Child& other) = delete; void AddDynamicObject(const AABB& box); void AddStaticObject(const AABB& box); void BoxesInSameRegion(const AABB& box, std::vector& outBoxes) const; @@ -85,14 +86,14 @@ private: bool RayCollides(const Ray& ray, Output& data) const; bool BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) const; - OctChild* m_Children[8]; - //Indices into the lists in OctTree. + Child* m_Children[8]; + //Indices into the lists in Octree. std::vector m_StaticObjIndices; std::vector m_DynamicObjIndices; AABB m_Box; - //Reference to the lists in OctTree. - std::vector& m_StaticObjectsRef; - std::vector& m_DynamicObjectsRef; + //Reference to the lists in Octree. + std::vector& m_StaticObjectsRef; + std::vector& m_DynamicObjectsRef; inline bool hasChildren() const; int childIndexContainingPoint(const glm::vec3& point) const; diff --git a/include/Engine/Core/System.h b/include/Engine/Core/System.h index 75bd3882..b7de9dc2 100644 --- a/include/Engine/Core/System.h +++ b/include/Engine/Core/System.h @@ -3,6 +3,7 @@ #include "EventBroker.h" #include "World.h" +#include "EntityWrapper.h" #include "ComponentWrapper.h" class System @@ -10,6 +11,9 @@ class System friend class SystemPipeline; protected: + System() + : m_EventBroker(nullptr) + { } System(EventBroker* eventBroker) : m_EventBroker(eventBroker) { } @@ -18,30 +22,27 @@ protected: EventBroker* m_EventBroker; }; -class PureSystem : public System +class PureSystem : public virtual System { friend class SystemPipeline; protected: - PureSystem(EventBroker* eventBroker, std::string componentType) - : System(eventBroker) - , m_ComponentType(componentType) + PureSystem(std::string componentType) + : m_ComponentType(componentType) { } virtual ~PureSystem() = default; const std::string m_ComponentType; - virtual void UpdateComponent(World* world, ComponentWrapper& component, double dt) = 0; + virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) = 0; }; -class ImpureSystem : public System +class ImpureSystem : public virtual System { friend class SystemPipeline; protected: - ImpureSystem(EventBroker* eventBroker) - : System(eventBroker) - { } + ImpureSystem() = default; virtual ~ImpureSystem() = default; virtual void Update(World* world, double dt) = 0; diff --git a/include/Engine/Core/SystemPipeline.h b/include/Engine/Core/SystemPipeline.h index d6a6b371..c0cd8ed6 100644 --- a/include/Engine/Core/SystemPipeline.h +++ b/include/Engine/Core/SystemPipeline.h @@ -32,8 +32,8 @@ public: System* system = new T(m_EventBroker, args...); group.Systems[typeid(T).name()] = system; - if (std::is_base_of::value) { - PureSystem* pureSystem = static_cast(system); + PureSystem* pureSystem = dynamic_cast(system); + if (pureSystem != nullptr) { if (!pureSystem->m_ComponentType.empty()) { group.PureSystems[pureSystem->m_ComponentType].push_back(pureSystem); } else { @@ -41,8 +41,8 @@ public: } } - if (std::is_base_of::value) { - ImpureSystem* impureSystem = static_cast(system); + ImpureSystem* impureSystem = dynamic_cast(system); + if (impureSystem != nullptr) { group.ImpureSystems.push_back(impureSystem); } } @@ -56,6 +56,9 @@ public: } // Update + for (auto& system : group.ImpureSystems) { + system->Update(world, dt); + } for (auto& pair : group.PureSystems) { const std::string& componentName = pair.first; auto& systems = pair.second; @@ -65,13 +68,10 @@ public: } for (auto& component : *pool) { for (auto& system : systems) { - system->UpdateComponent(world, component, dt); + system->UpdateComponent(world, EntityWrapper(world, component.EntityID), component, dt); } } } - for (auto& system : group.ImpureSystems) { - system->Update(world, dt); - } } } diff --git a/include/Engine/Core/World.h b/include/Engine/Core/World.h index 0a121728..b201d4ac 100644 --- a/include/Engine/Core/World.h +++ b/include/Engine/Core/World.h @@ -21,19 +21,21 @@ public: // 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); + ComponentWrapper AttachComponent(EntityID entity, const std::string& componentType); // Check if an entity has a component - bool HasComponent(EntityID entity, std::string componentType) const; + bool HasComponent(EntityID entity, const std::string& componentType) const; // Get a component of an entity - ComponentWrapper GetComponent(EntityID entity, std::string componentType); + ComponentWrapper GetComponent(EntityID entity, const std::string& componentType); // Delete a component off an entity - void DeleteComponent(EntityID entity, std::string componentType); + void DeleteComponent(EntityID entity, const std::string& componentType); // Get all components of the specified type - const ComponentPool* GetComponents(std::string componentType); + const ComponentPool* GetComponents(const std::string& componentType); // Get entity parent EntityID GetParent(EntityID entity); // Change the parent of an entity void SetParent(EntityID entity, EntityID parent); + // Get children of an entity + const std::pair::const_iterator, std::unordered_multimap::const_iterator> GetChildren(EntityID entity); // Get all component pools const std::unordered_map& GetComponentPools() const { return m_ComponentPools; } // Get the entity children map diff --git a/include/Engine/Input/InputProxy.h b/include/Engine/Input/InputProxy.h index c7817c22..c9ba5ada 100644 --- a/include/Engine/Input/InputProxy.h +++ b/include/Engine/Input/InputProxy.h @@ -1,6 +1,7 @@ #ifndef InputProxy_h__ #define InputProxy_h__ +#include #include "../Common.h" #include "../Core/ResourceManager.h" #include "../Core/ConfigFile.h" diff --git a/include/Game/Events/ESpawnerSpawn.h b/include/Game/Events/ESpawnerSpawn.h new file mode 100644 index 00000000..7af4f63e --- /dev/null +++ b/include/Game/Events/ESpawnerSpawn.h @@ -0,0 +1,18 @@ +#ifndef ESpawnerSpawn_h__ +#define ESpawnerSpawn_h__ + +#include "Core/Event.h" +#include "Core/EntityWrapper.h" + +namespace Events +{ + +struct SpawnerSpawn : Event +{ + EntityWrapper Spawner; + EntityWrapper Parent; +}; + +} + +#endif \ No newline at end of file diff --git a/include/Game/Game.h b/include/Game/Game.h index d09d3260..dbc2ed45 100644 --- a/include/Game/Game.h +++ b/include/Game/Game.h @@ -14,12 +14,11 @@ #include "Core/EKeyDown.h" #include "Core/EntityFilePreprocessor.h" #include "Core/SystemPipeline.h" -#include "RaptorCopterSystem.h" -#include "PlayerSystem.h" #include "Editor/EditorSystem.h" #include "Core/EntityFile.h" #include "Rendering/RenderSystem.h" #include "Core/EntityFileParser.h" +#include "Core/Octree.h" // Network #include @@ -48,6 +47,8 @@ private: InputProxy* m_InputProxy; GUI::Frame* m_FrameStack; World* m_World; + Octree* m_OctreeCollision; + Octree* m_OctreeFrustrumCulling; SystemPipeline* m_SystemPipeline; RenderFrame* m_RenderFrame; // Network variables diff --git a/include/Game/PlayerSystem.h b/include/Game/PlayerSystem.h deleted file mode 100644 index 577fbbb0..00000000 --- a/include/Game/PlayerSystem.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef PlayerSystem_h__ -#define PlayerSystem_h__ - -#include -#include - -#include "Common.h" -#include "Core/System.h" -#include "Collision/ETrigger.h" - -class PlayerSystem : public PureSystem -{ -public: - PlayerSystem(EventBroker* eventBroker) - : PureSystem(eventBroker, "Player") - { - EVENT_SUBSCRIBE_MEMBER(m_ETouch, &PlayerSystem::OnTouch); - EVENT_SUBSCRIBE_MEMBER(m_EEnter, &PlayerSystem::OnEnter); - EVENT_SUBSCRIBE_MEMBER(m_ELeave, &PlayerSystem::OnLeave); - } - - virtual void UpdateComponent(World* world, ComponentWrapper& player, double dt) override; -private: - float m_Speed = 5; - EventRelay m_EEnter; - bool OnEnter(const Events::TriggerEnter &event); - EventRelay m_ETouch; - bool PlayerSystem::OnTouch(const Events::TriggerTouch &event); - EventRelay m_ELeave; - bool PlayerSystem::OnLeave(const Events::TriggerLeave &event); -}; - -#endif \ No newline at end of file diff --git a/include/Game/RaptorCopterSystem.h b/include/Game/RaptorCopterSystem.h deleted file mode 100644 index 913efdb3..00000000 --- a/include/Game/RaptorCopterSystem.h +++ /dev/null @@ -1,16 +0,0 @@ -#include "Common.h" -#include "Core/System.h" - -class RaptorCopterSystem : public PureSystem -{ -public: - RaptorCopterSystem(EventBroker* eventBroker) - : PureSystem(eventBroker, "RaptorCopter") - { } - - virtual void UpdateComponent(World* world, ComponentWrapper& raptorCopter, double dt) override - { - ComponentWrapper& transform = world->GetComponent(raptorCopter.EntityID, "Transform"); - (glm::vec3&)transform["Orientation"] += (float)(double)raptorCopter["Speed"] * (float)dt * (glm::vec3)raptorCopter["Axis"]; - } -}; \ No newline at end of file diff --git a/include/Game/HealthSystem.h b/include/Game/Systems/HealthSystem.h similarity index 78% rename from include/Game/HealthSystem.h rename to include/Game/Systems/HealthSystem.h index a836e797..0db3ec41 100644 --- a/include/Game/HealthSystem.h +++ b/include/Game/Systems/HealthSystem.h @@ -6,9 +6,9 @@ #include "Common.h" #include "Core/System.h" -#include "Core\EPlayerDamage.h"; -#include "Core\EPlayerHealthPickup.h"; -#include "Core\EPlayerDeath.h"; +#include "Core/EPlayerDamage.h" +#include "Core/EPlayerHealthPickup.h" +#include "Core/EPlayerDeath.h" #include #include @@ -19,7 +19,7 @@ public: HealthSystem(EventBroker* eventBroker); //updatecomponent - virtual void UpdateComponent(World* world, ComponentWrapper& health, double dt) override; + virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override; private: //methods which will take care of specific events diff --git a/include/Game/Systems/PlayerMovementSystem.h b/include/Game/Systems/PlayerMovementSystem.h new file mode 100644 index 00000000..6dc2dc31 --- /dev/null +++ b/include/Game/Systems/PlayerMovementSystem.h @@ -0,0 +1,14 @@ +#include "Common.h" +#include "GLM.h" +#include "Core/System.h" + +class PlayerMovementSystem : public PureSystem +{ +public: + PlayerMovementSystem(EventBroker* eventBroker) + : System(eventBroker) + , PureSystem("Player") + { } + + virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt); +}; \ No newline at end of file diff --git a/include/Game/Systems/PlayerSpawnSystem.h b/include/Game/Systems/PlayerSpawnSystem.h new file mode 100644 index 00000000..f0e10949 --- /dev/null +++ b/include/Game/Systems/PlayerSpawnSystem.h @@ -0,0 +1,18 @@ +#include "Core/System.h" +#include "Input/EInputCommand.h" +#include "Systems/SpawnerSystem.h" +#include "Events/ESpawnerSpawn.h" + +class PlayerSpawnSystem : public ImpureSystem +{ +public: + PlayerSpawnSystem(EventBroker* eventBroker); + + virtual void Update(World* world, double dt) override; + +private: + EventRelay m_OnInputCommand; + bool OnInputCommand(const Events::InputCommand& e); + + std::vector m_SpawnRequests; +}; \ No newline at end of file diff --git a/include/Game/Systems/RaptorCopterSystem.h b/include/Game/Systems/RaptorCopterSystem.h new file mode 100644 index 00000000..57a8de86 --- /dev/null +++ b/include/Game/Systems/RaptorCopterSystem.h @@ -0,0 +1,17 @@ +#include "Common.h" +#include "Core/System.h" + +class RaptorCopterSystem : public PureSystem +{ +public: + RaptorCopterSystem(EventBroker* eventBroker) + : System(eventBroker) + , PureSystem("RaptorCopter") + { } + + virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override + { + ComponentWrapper& transform = world->GetComponent(component.EntityID, "Transform"); + (glm::vec3&)transform["Orientation"] += (float)(double)component["Speed"] * (float)dt * (glm::vec3)component["Axis"]; + } +}; \ No newline at end of file diff --git a/include/Game/Systems/SpawnerSystem.h b/include/Game/Systems/SpawnerSystem.h new file mode 100644 index 00000000..2c094528 --- /dev/null +++ b/include/Game/Systems/SpawnerSystem.h @@ -0,0 +1,25 @@ +#ifndef SpawnerSystem_h__ +#define SpawnerSystem_h__ + +#include +#include "Common.h" +#include "GLM.h" +#include "Core/System.h" +#include "Events/ESpawnerSpawn.h" +#include "Core/Transform.h" +#include "Core/ResourceManager.h" +#include "Core/EntityFileParser.h" + +class SpawnerSystem : public System +{ +public: + SpawnerSystem(EventBroker* eventBroker); + + static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid); + +private: + EventRelay m_OnSpawnerSpawn; + bool OnSpawnerSpawn(Events::SpawnerSpawn& e); +}; + +#endif \ No newline at end of file diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini index 95ebbc22..5ed46241 100644 --- a/resources/DefaultInput.ini +++ b/resources/DefaultInput.ini @@ -6,10 +6,10 @@ InvertPitch=false MouseLeft=PrimaryFire MouseX=Yaw MouseY=Pitch -W=+Forward -S=-Forward -D=+Right -A=-Right +W=Forward,1 +S=Forward,-1 +D=Right,1 +A=Right,-1 R=Reload Space=Jump LeftControl=Crouch diff --git a/resources/Schema/Components.xsd b/resources/Schema/Components.xsd index aa62683f..8d837aea 100644 --- a/resources/Schema/Components.xsd +++ b/resources/Schema/Components.xsd @@ -2,8 +2,8 @@ + - @@ -13,4 +13,9 @@ + + + + + \ No newline at end of file diff --git a/resources/Schema/Components/AABB.xml b/resources/Schema/Components/AABB.xml index 341d1d0d..9c909ea1 100644 --- a/resources/Schema/Components/AABB.xml +++ b/resources/Schema/Components/AABB.xml @@ -1,4 +1,5 @@ - - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/resources/Schema/Components/AABB.xsd b/resources/Schema/Components/AABB.xsd index 8fac860e..daa633a6 100644 --- a/resources/Schema/Components/AABB.xsd +++ b/resources/Schema/Components/AABB.xsd @@ -6,8 +6,12 @@ - - + + Middle point of the bounding box + + + Size of the bounding box + diff --git a/resources/Schema/Components/Camera.xml b/resources/Schema/Components/Camera.xml index 92225dde..ccb12f01 100644 --- a/resources/Schema/Components/Camera.xml +++ b/resources/Schema/Components/Camera.xml @@ -1,6 +1,7 @@ - + + cam - 60.0 + 45 0.01 5000 - \ No newline at end of file + \ No newline at end of file diff --git a/resources/Schema/Components/Camera.xsd b/resources/Schema/Components/Camera.xsd index 4f02deb0..2b896c74 100644 --- a/resources/Schema/Components/Camera.xsd +++ b/resources/Schema/Components/Camera.xsd @@ -10,7 +10,9 @@ - + + Vertical Field of View in degrees + diff --git a/resources/Schema/Components/Collidable.xml b/resources/Schema/Components/Collidable.xml new file mode 100644 index 00000000..9046ea99 --- /dev/null +++ b/resources/Schema/Components/Collidable.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/Schema/Components/Collidable.xsd b/resources/Schema/Components/Collidable.xsd new file mode 100644 index 00000000..84c66f11 --- /dev/null +++ b/resources/Schema/Components/Collidable.xsd @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/resources/Schema/Components/Health.xml b/resources/Schema/Components/Health.xml index 143a91d1..f53217b9 100644 --- a/resources/Schema/Components/Health.xml +++ b/resources/Schema/Components/Health.xml @@ -1,4 +1,5 @@ - + + 100 100 - \ No newline at end of file + \ No newline at end of file diff --git a/resources/Schema/Components/Listener.xml b/resources/Schema/Components/Listener.xml index 7d1fac13..d7e20f92 100644 --- a/resources/Schema/Components/Listener.xml +++ b/resources/Schema/Components/Listener.xml @@ -1,3 +1,2 @@ - - - \ No newline at end of file + + \ No newline at end of file diff --git a/resources/Schema/Components/Model.xml b/resources/Schema/Components/Model.xml index bd20147f..8f78b9ee 100644 --- a/resources/Schema/Components/Model.xml +++ b/resources/Schema/Components/Model.xml @@ -1,5 +1,6 @@ - + + true - \ No newline at end of file + \ No newline at end of file diff --git a/resources/Schema/Components/Physics.xml b/resources/Schema/Components/Physics.xml new file mode 100644 index 00000000..7dce027c --- /dev/null +++ b/resources/Schema/Components/Physics.xml @@ -0,0 +1,4 @@ + + + + diff --git a/resources/Schema/Components/Physics.xsd b/resources/Schema/Components/Physics.xsd new file mode 100644 index 00000000..001dd2c8 --- /dev/null +++ b/resources/Schema/Components/Physics.xsd @@ -0,0 +1,16 @@ + + + + + + + + Physics stuff + + + + + + + + diff --git a/resources/Schema/Components/Player.xml b/resources/Schema/Components/Player.xml index 190f2ed0..caefd6e6 100644 --- a/resources/Schema/Components/Player.xml +++ b/resources/Schema/Components/Player.xml @@ -1,7 +1,8 @@ - + + false false false false - \ No newline at end of file + \ No newline at end of file diff --git a/resources/Schema/Components/PlayerSpawn.xml b/resources/Schema/Components/PlayerSpawn.xml new file mode 100644 index 00000000..edc1394e --- /dev/null +++ b/resources/Schema/Components/PlayerSpawn.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/resources/Schema/Components/PlayerSpawn.xsd b/resources/Schema/Components/PlayerSpawn.xsd new file mode 100644 index 00000000..6e321724 --- /dev/null +++ b/resources/Schema/Components/PlayerSpawn.xsd @@ -0,0 +1,11 @@ + + + + + + + + Combined with a Spawner and a Team component, defines a spawn point for a player team. + + + diff --git a/resources/Schema/Components/PointLight.xml b/resources/Schema/Components/PointLight.xml index 6b1382db..814d7f4c 100644 --- a/resources/Schema/Components/PointLight.xml +++ b/resources/Schema/Components/PointLight.xml @@ -1,7 +1,8 @@ - + + 1.0 0.8 0.3 true - \ No newline at end of file + \ No newline at end of file diff --git a/resources/Schema/Components/PointLight.xsd b/resources/Schema/Components/PointLight.xsd index 039e7117..9b802d8c 100644 --- a/resources/Schema/Components/PointLight.xsd +++ b/resources/Schema/Components/PointLight.xsd @@ -12,7 +12,14 @@ - + + + + + + + + diff --git a/resources/Schema/Components/RaptorCopter.xml b/resources/Schema/Components/RaptorCopter.xml index cc1ece52..1dec4a44 100644 --- a/resources/Schema/Components/RaptorCopter.xml +++ b/resources/Schema/Components/RaptorCopter.xml @@ -1,4 +1,5 @@ - + + 0 - \ No newline at end of file + \ No newline at end of file diff --git a/resources/Schema/Components/SoundEmitter.xml b/resources/Schema/Components/SoundEmitter.xml index 11093e37..e0a38d2f 100644 --- a/resources/Schema/Components/SoundEmitter.xml +++ b/resources/Schema/Components/SoundEmitter.xml @@ -1,4 +1,5 @@ - + + 1.0 1.0 @@ -6,4 +7,4 @@ 20.0 1.0 1.0 - \ No newline at end of file + \ No newline at end of file diff --git a/resources/Schema/Components/SoundEmitter.xsd b/resources/Schema/Components/SoundEmitter.xsd index c734e6ba..9a73949b 100644 --- a/resources/Schema/Components/SoundEmitter.xsd +++ b/resources/Schema/Components/SoundEmitter.xsd @@ -7,18 +7,24 @@ - - The "volume" of the emitter. A value betweeen 0-1 - - The pitch of the emitter. A value betweeen 0-1 - - If the sound should loop or not. - - The distance where there will no longer be any attenuation. - - The rolloff rate of the source. - - The distance that the source will be the loudest. + + The "volume" of the emitter. A value betweeen 0-1 + + + The pitch of the emitter. A value betweeen 0-1 + + + If the sound should loop or not. + + + The distance where there will no longer be any attenuation. + + + The rolloff rate of the source. + + + The distance that the source will be the loudest. + diff --git a/resources/Schema/Components/SpawnPoint.xml b/resources/Schema/Components/SpawnPoint.xml new file mode 100644 index 00000000..6b2f7ae3 --- /dev/null +++ b/resources/Schema/Components/SpawnPoint.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/resources/Schema/Components/SpawnPoint.xsd b/resources/Schema/Components/SpawnPoint.xsd new file mode 100644 index 00000000..67169a9c --- /dev/null +++ b/resources/Schema/Components/SpawnPoint.xsd @@ -0,0 +1,11 @@ + + + + + + + + Defines this entity as a spawn point for a parent Spawner + + + diff --git a/resources/Schema/Components/Spawner.xml b/resources/Schema/Components/Spawner.xml new file mode 100644 index 00000000..da659c69 --- /dev/null +++ b/resources/Schema/Components/Spawner.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/resources/Schema/Components/Spawner.xsd b/resources/Schema/Components/Spawner.xsd new file mode 100644 index 00000000..dcf74aea --- /dev/null +++ b/resources/Schema/Components/Spawner.xsd @@ -0,0 +1,18 @@ + + + + + + + + Randomly selects a child SpawnPoint component and spawns a copy of an entity template when receiving a SpawnerSpawn event. If no SpawnPoint is found it spawns from its own position. + + + + + The entity template to spawn + + + + + diff --git a/resources/Schema/Components/Team.xml b/resources/Schema/Components/Team.xml new file mode 100755 index 00000000..3eeb93bf --- /dev/null +++ b/resources/Schema/Components/Team.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/resources/Schema/Components/Team.xsd b/resources/Schema/Components/Team.xsd new file mode 100755 index 00000000..163d4a7f --- /dev/null +++ b/resources/Schema/Components/Team.xsd @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + Represents entity team affiliation + + + + + + + + diff --git a/resources/Schema/Components/Transform.xml b/resources/Schema/Components/Transform.xml index 00202aa4..7e2bcd83 100644 --- a/resources/Schema/Components/Transform.xml +++ b/resources/Schema/Components/Transform.xml @@ -1,5 +1,6 @@ - + + - \ No newline at end of file + \ No newline at end of file diff --git a/resources/Schema/Components/Transform.xsd b/resources/Schema/Components/Transform.xsd index b8d24777..f0db2472 100644 --- a/resources/Schema/Components/Transform.xsd +++ b/resources/Schema/Components/Transform.xsd @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/resources/Schema/Components/Trigger.xml b/resources/Schema/Components/Trigger.xml index 4c8aad58..38c6fce9 100644 --- a/resources/Schema/Components/Trigger.xml +++ b/resources/Schema/Components/Trigger.xml @@ -1,2 +1,3 @@ - - \ No newline at end of file + + + \ No newline at end of file diff --git a/resources/Schema/Entities/CollisionTest1.xml b/resources/Schema/Entities/CollisionTest1.xml new file mode 100644 index 00000000..f0b310e1 --- /dev/null +++ b/resources/Schema/Entities/CollisionTest1.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + false + + + + + + + + + + + false + + + Models/Core/UnitCube.obj + + + + + + + + + + + diff --git a/resources/Schema/Entities/Empty.xml b/resources/Schema/Entities/Empty.xml index 70581847..6efd8318 100644 --- a/resources/Schema/Entities/Empty.xml +++ b/resources/Schema/Entities/Empty.xml @@ -1,6 +1,10 @@ - + + - \ No newline at end of file + + + + diff --git a/resources/Schema/Entities/MovementTest.xml b/resources/Schema/Entities/MovementTest.xml new file mode 100644 index 00000000..93b4d374 --- /dev/null +++ b/resources/Schema/Entities/MovementTest.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + Models/Core/UnitCube.obj + + + + + + + + + + + + + + + + + + + Models/Assault.obj + + + + + + + + + + + + + + + + + + Models/Core/UnitCube.obj + + + + + + + + + + + + + diff --git a/resources/Schema/Entities/OctreeTest.xml b/resources/Schema/Entities/OctreeTest.xml new file mode 100644 index 00000000..4d7fe709 --- /dev/null +++ b/resources/Schema/Entities/OctreeTest.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + Models/Core/UnitCube.obj + + + + + + + + + + + + + false + + + Models/Core/UnitCube.obj + + + + + + + + + + + + false + + + Models/Core/UnitCube.obj + + + + + + + + + + + diff --git a/resources/Schema/Entities/Player.xml b/resources/Schema/Entities/Player.xml new file mode 100644 index 00000000..6c3b39c3 --- /dev/null +++ b/resources/Schema/Entities/Player.xml @@ -0,0 +1,18 @@ + + + + + + + + + Models/Core/UnitSphere.obj + + + + + + + + + diff --git a/resources/Schema/Entities/SpawnTest.xml b/resources/Schema/Entities/SpawnTest.xml new file mode 100644 index 00000000..a5574027 --- /dev/null +++ b/resources/Schema/Entities/SpawnTest.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + Schema/Entities/Player.xml + + + 2 + + + + + + + + + + + Models/Core/UnitSphere.obj + + + + + + + + + + + + + Models/Core/UnitSphere.obj + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/Schema/Entities/TeamTest.xml b/resources/Schema/Entities/TeamTest.xml new file mode 100755 index 00000000..69be6141 --- /dev/null +++ b/resources/Schema/Entities/TeamTest.xml @@ -0,0 +1,13 @@ + + + + + + 3 + + + + + + + diff --git a/resources/Schema/Types.xsd b/resources/Schema/Types.xsd index cd464201..fb584c64 100644 --- a/resources/Schema/Types.xsd +++ b/resources/Schema/Types.xsd @@ -4,6 +4,9 @@ + + + diff --git a/resources/Schema/Types/Entity.xsd b/resources/Schema/Types/Entity.xsd index 040a21ea..1aaa8497 100644 --- a/resources/Schema/Types/Entity.xsd +++ b/resources/Schema/Types/Entity.xsd @@ -11,14 +11,22 @@ + - + + + + + + + + diff --git a/src/Engine/Collision/CollidableOctreeSystem.cpp b/src/Engine/Collision/CollidableOctreeSystem.cpp new file mode 100644 index 00000000..62d742f5 --- /dev/null +++ b/src/Engine/Collision/CollidableOctreeSystem.cpp @@ -0,0 +1,18 @@ +#include "Collision/CollidableOctreeSystem.h" + +void CollidableOctreeSystem::Update(World* world, double dt) +{ + m_Octree->ClearDynamicObjects(); +} + +void CollidableOctreeSystem::UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) +{ + if (entity.HasComponent("AABB")) { + boost::optional absoluteAABB = Collision::EntityAbsoluteAABB(entity); + if (absoluteAABB) { + m_Octree->AddDynamicObject(*absoluteAABB); + } + } else if (entity.HasComponent("Model")) { + // TODO: Derive AABB from model + } +} \ No newline at end of file diff --git a/src/Engine/Collision/Collision.cpp b/src/Engine/Collision/Collision.cpp index c74af3ad..b30ae927 100644 --- a/src/Engine/Collision/Collision.cpp +++ b/src/Engine/Collision/Collision.cpp @@ -13,7 +13,7 @@ bool RayAABBIntr(const Ray& ray, const AABB& box) { glm::vec3 w = 75.0f * ray.Direction(); glm::vec3 v = glm::abs(w); - glm::vec3 c = ray.Origin() - box.Center() + w; + glm::vec3 c = ray.Origin() - box.Origin() + w; glm::vec3 half = box.HalfSize(); if (abs(c.x) > v.x + half.x) { @@ -68,8 +68,8 @@ bool RayVsAABB(const Ray& ray, const AABB& box, float& outDistance) bool AABBVsAABB(const AABB& a, const AABB& b) { - const glm::vec3& aCenter = a.Center(); - const glm::vec3& bCenter = b.Center(); + const glm::vec3& aCenter = a.Origin(); + const glm::vec3& bCenter = b.Origin(); const glm::vec3& aHSize = a.HalfSize(); const glm::vec3& bHSize = b.HalfSize(); //Test will probably exit because of the X and Z axes more often, so test them first. @@ -199,11 +199,51 @@ bool RayVsModel(const Ray& ray, return hit; } +bool AABBvsTriangles(const AABB& box, const std::vector& modelVertices, const std::vector& modelIndices, const glm::mat4& modelMatrix, glm::vec3& outResolutionVector) +{ + bool hit = false; + + const glm::vec3& origin = box.Origin(); + const glm::vec3& min = box.MinCorner(); + const glm::vec3& max = box.MaxCorner(); + + outResolutionVector.x = INFINITY; + + for (int i = 0; i < modelIndices.size(); ++i) { + glm::vec3 p = modelVertices[i].Position; + p = glm::vec3(modelMatrix * glm::vec4(p.x, p.y, p.z, 1)); + + float distFromOrigin = glm::abs(origin.x - p.x); + float penetration = box.HalfSize().x - distFromOrigin; + if (penetration > 0 && penetration < glm::abs(outResolutionVector.x)) { + if (p.x > origin.x) { + outResolutionVector.x = -penetration; + } else { + outResolutionVector.x = penetration; + } + hit = true; + } + //glm::vec3 pLocal = origin - p; + //for (int axis = 0; axis < 3; ++axis) { + // if (p[axis] < min[axis] || p[axis] > max[axis]) { + // continue; + // } + + // if (glm::abs(pLocal[axis]) < box.HalfSize()[axis]) { + // outResolutionVector[axis] = (glm::sign(pLocal[axis]) * box.HalfSize()[axis]) - pLocal[axis]; + // hit = true; + // } + //} + } + + return hit; +} + bool IsSameBoxProbably(const AABB& first, const AABB& second, const float epsilon) { const glm::vec3& ma1 = first.MaxCorner(); - const glm::vec3& ma2 = first.MaxCorner(); - const glm::vec3& mi1 = second.MinCorner(); + const glm::vec3& ma2 = second.MaxCorner(); + const glm::vec3& mi1 = first.MinCorner(); const glm::vec3& mi2 = second.MinCorner(); return (std::abs(ma1.x - ma2.x) < epsilon) && (std::abs(mi1.x - mi2.x) < epsilon) && @@ -238,45 +278,23 @@ bool attachAABBComponentFromModel(World* world, EntityID id) mini.y = std::min(wPos.y, mini.y); mini.z = std::min(wPos.z, mini.z); } - collision["BoxCenter"] = 0.5f * (maxi + mini); - collision["BoxSize"] = maxi - mini; + collision["Origin"] = 0.5f * (maxi + mini); + collision["Size"] = maxi - mini; return true; } -bool GetEntityBox(World* world, ComponentWrapper& AABBComponent, AABB& outBox) +boost::optional EntityAbsoluteAABB(EntityWrapper& entity) { - ComponentWrapper& cTrans = world->GetComponent(AABBComponent.EntityID, "Transform"); - ComponentWrapper model = world->GetComponent(AABBComponent.EntityID, "Model"); - Model* modelRes = ResourceManager::Load(model["Resource"]); - outBox.CreateFromCenter(AABBComponent["BoxCenter"], AABBComponent["BoxSize"]); - glm::vec3 mini = outBox.MinCorner(); - glm::vec3 maxi = outBox.MaxCorner(); - - if (modelRes == nullptr) { - return false; - } - glm::mat4 modelMatrix = modelRes->Matrix() * - glm::translate(glm::mat4(), (glm::vec3)cTrans["Position"]) * - glm::scale((glm::vec3)cTrans["Scale"]); - - outBox = AABB(modelMatrix * glm::vec4(mini.x, mini.y, mini.z, 1), - modelMatrix * glm::vec4(maxi.x, maxi.y, maxi.z, 1)); - return true; -} - -bool GetEntityBox(World* world, EntityID entity, AABB& outBox, bool forceBoxFromModel) -{ - if (!world->HasComponent(entity, "AABB")) { - if (forceBoxFromModel) { - if (!attachAABBComponentFromModel(world, entity)) - return false; - } else { - return false; - } + if (!entity.HasComponent("AABB")) { + return boost::none; } - ComponentWrapper& cBox = world->GetComponent(entity, "AABB"); - return GetEntityBox(world, cBox, outBox); + ComponentWrapper& cAABB = entity["AABB"]; + glm::vec3 absPosition = Transform::AbsolutePosition(entity.World, entity.ID); + glm::vec3 absScale = Transform::AbsoluteScale(entity.World, entity.ID); + glm::vec3 origin = absPosition + (glm::vec3)cAABB["Origin"]; + glm::vec3 size = (glm::vec3)cAABB["Size"] * absScale; + return AABB::FromOriginSize(origin, size); } } diff --git a/src/Engine/Collision/CollisionSystem.cpp b/src/Engine/Collision/CollisionSystem.cpp index 69929c6d..d841c75e 100644 --- a/src/Engine/Collision/CollisionSystem.cpp +++ b/src/Engine/Collision/CollisionSystem.cpp @@ -2,33 +2,60 @@ #include "Collision/CollisionSystem.h" #include "Core/AABB.h" -void CollisionSystem::UpdateComponent(World * world, ComponentWrapper & cAABB, double dt) +void CollisionSystem::UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) { - //Right now, cAABB is a component attached to any entity that should be collideable. - AABB thisBox; - if (!Collision::GetEntityBox(world, cAABB, thisBox)) { + if (!entity.HasComponent("Physics")) { return; } + ComponentWrapper& cPhysics = entity["Physics"]; + + boost::optional boundingBox = Collision::EntityAbsoluteAABB(entity); + if (!boundingBox) { + return; + } + ComponentWrapper& cTransform = entity["Transform"]; + AABB& boxA = *boundingBox; + //Press 'Z' to enable/disable collision. if (zPress) { return; } - //Here, mover should be an object that moves, currently only players. - for (auto& mover : *world->GetComponents("Player")) { - if (cAABB.EntityID == mover.EntityID) { + + // Collide against octree + std::vector octreeResult; + m_Octree->BoxesInSameRegion(*boundingBox, octreeResult); + for (auto& boxB : octreeResult) { + glm::vec3 resolutionVector; + if (Collision::IsSameBoxProbably(boxA, boxB)) { continue; } - AABB otherBox; - if (!Collision::GetEntityBox(world, mover.EntityID, otherBox)) { - continue; - } - glm::vec3 resolveTranslation; - if (Collision::AABBVsAABB(otherBox, thisBox, resolveTranslation)) { - ComponentWrapper& trans = world->GetComponent(mover.EntityID, "Transform"); - //TODO: Special treatment if both are movers. - trans["Position"] = (glm::vec3)trans["Position"] + resolveTranslation; + if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) { + (glm::vec3&)cTransform["Position"] += resolutionVector; + cPhysics["Velocity"] = glm::vec3(0, 0, 0); } } + + // HACK: Temporarily collide against all collidable models since they're not in the octree yet + //auto otherCollidables = world->GetComponents("Model"); + //for (auto& cModel : *otherCollidables) { + // if (cModel.EntityID == entity) { + // continue; + // } + // if (!world->HasComponent(cModel.EntityID, "Collidable")) { + // continue; + // } + + // auto absPosition = RenderQueueFactory::AbsolutePosition(world, cModel.EntityID); + // auto absOrientation = RenderQueueFactory::AbsoluteOrientation(world, cModel.EntityID); + // auto absScale = RenderQueueFactory::AbsoluteScale(world, cModel.EntityID); + // glm::mat4 modelMatrix = glm::translate(absPosition); // *glm::toMat4(absOrientation) * glm::scale(absScale); + + // auto model = ResourceManager::Load(cModel["Resource"]); + // glm::vec3 resolutionVector; + // if (Collision::AABBvsTriangles(boxA, model->m_Vertices, model->m_Indices, modelMatrix, resolutionVector)) { + // (glm::vec3&)cTransform["Position"] += resolutionVector; + // } + //} } bool CollisionSystem::OnKeyUp(const Events::KeyUp & event) diff --git a/src/Engine/Collision/TriggerSystem.cpp b/src/Engine/Collision/TriggerSystem.cpp index 09092461..0ff4345e 100644 --- a/src/Engine/Collision/TriggerSystem.cpp +++ b/src/Engine/Collision/TriggerSystem.cpp @@ -3,27 +3,27 @@ #include "Core/AABB.h" #include "Rendering/Model.h" -void TriggerSystem::UpdateComponent(World* world, ComponentWrapper& trigger, double dt) +void TriggerSystem::UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) { //Currently only players can trigger things. auto players = world->GetComponents("Player"); if (players == nullptr) { return; } - EntityID tId = trigger.EntityID; - AABB triggerBox; + EntityID tId = component.EntityID; + boost::optional triggerBox = Collision::EntityAbsoluteAABB(entity); //The trigger *should* have a bounding box, or something, to test against so it can be triggered. - if (!Collision::GetEntityBox(world, tId, triggerBox, true)) { + if (!triggerBox) { return; } for (auto& pc : *players) { EntityID pId = pc.EntityID; - AABB playerBox; + boost::optional playerBox = Collision::EntityAbsoluteAABB(EntityWrapper(world, pId)); //The player can't trigger anything without an AABB. - if (!Collision::GetEntityBox(world, pId, playerBox, true)) { + if (!playerBox) { continue; } - if (!Collision::AABBVsAABB(triggerBox, playerBox)) { + if (!Collision::AABBVsAABB(*triggerBox, *playerBox)) { //Entity is not touching the trigger, //Throw event if it was previously. if (throwLeaveIfWasInTrigger(m_EntitiesTouchingTrigger[tId], pId, tId)) { @@ -34,10 +34,9 @@ void TriggerSystem::UpdateComponent(World* world, ComponentWrapper& trigger, dou throwLeaveIfWasInTrigger(m_EntitiesCompletelyInTrigger[tId], pId, tId); } else { //Entity is at least touching the trigger. - AABB completelyInsideBox; - completelyInsideBox.CreateFromCenter(triggerBox.Center(), triggerBox.Size() - 2.0f * playerBox.Size()); - if (Collision::AABBVsAABB(completelyInsideBox, playerBox) && - glm::all(glm::greaterThan(triggerBox.Size(), playerBox.Size()))) { + AABB completelyInsideBox = AABB::FromOriginSize((*triggerBox).Origin(), (*triggerBox).Size() - 2.0f * (*playerBox).Size()); + if (Collision::AABBVsAABB(completelyInsideBox, *playerBox) && + glm::all(glm::greaterThan((*triggerBox).Size(), (*playerBox).Size()))) { //Entity is completely inside the trigger. //If it was only touching before, it is erased. m_EntitiesTouchingTrigger[tId].erase(pId); @@ -79,3 +78,20 @@ bool TriggerSystem::throwLeaveIfWasInTrigger(std::unordered_set& trigg return false; } +bool TriggerSystem::OnTouch(const Events::TriggerTouch &event) +{ + LOG_INFO("Player entity %i touched trigger entity %i.", event.Entity, event.Trigger); + return true; +} + +bool TriggerSystem::OnEnter(const Events::TriggerEnter &event) +{ + LOG_INFO("Player entity %i entered trigger entity %i.", event.Entity, event.Trigger); + return true; +} + +bool TriggerSystem::OnLeave(const Events::TriggerLeave &event) +{ + LOG_INFO("Player entity %i left trigger entity %i.", event.Entity, event.Trigger); + return true; +} \ No newline at end of file diff --git a/src/Engine/Core/AABB.cpp b/src/Engine/Core/AABB.cpp index 0df56229..22272104 100644 --- a/src/Engine/Core/AABB.cpp +++ b/src/Engine/Core/AABB.cpp @@ -4,7 +4,7 @@ AABB::AABB(const glm::vec3& minPos, const glm::vec3& maxPos) : m_MinCorner(minPos) , m_MaxCorner(maxPos) - , m_Center(0.5f * (maxPos + minPos)) + , m_Origin(0.5f * (maxPos + minPos)) , m_HalfSize(0.5f * (maxPos - minPos)) { DEBUG_IF(glm::any(glm::lessThan(m_MaxCorner, m_MinCorner))) { @@ -20,15 +20,12 @@ AABB::AABB(const glm::vec3& minPos, const glm::vec3& maxPos) AABB::AABB(const glm::vec4& minPos, const glm::vec4& maxPos) : AABB(glm::vec3(minPos), glm::vec3(maxPos)) -{} +{ } -void AABB::CreateFromCenter(const glm::vec3& center, const glm::vec3& size) +AABB AABB::FromOriginSize(const glm::vec3& origin, const glm::vec3& size) { - m_Center = center; - m_HalfSize = 0.5f * size; - m_MinCorner = m_Center - m_HalfSize; - m_MaxCorner = m_Center + m_HalfSize; + return AABB(origin - (size/2.f), origin + (size/2.f)); } AABB::~AABB() -{} +{ } diff --git a/src/Engine/Core/EntityFile.cpp b/src/Engine/Core/EntityFile.cpp index 1e381df5..c1125e10 100644 --- a/src/Engine/Core/EntityFile.cpp +++ b/src/Engine/Core/EntityFile.cpp @@ -21,14 +21,24 @@ 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); + setReaderFeatures(m_SAX2XMLReader); m_SAX2XMLReader->setContentHandler(&saxHandler); m_SAX2XMLReader->setErrorHandler(&saxHandler); m_SAX2XMLReader->setDeclarationHandler(&saxHandler); m_SAX2XMLReader->parse(m_FilePath.string().c_str()); } +void EntityFile::setReaderFeatures(xercesc::SAX2XMLReader* reader) +{ + using namespace xercesc; + reader->setFeature(XMLUni::fgXercesCacheGrammarFromParse, true); + reader->setFeature(XMLUni::fgXercesUseCachedGrammarInParse, true); + reader->setFeature(XMLUni::fgSAX2CoreValidation, true); + reader->setFeature(XMLUni::fgSAX2CoreNameSpaces, true); + reader->setFeature(XMLUni::fgXercesSchema, true); + reader->setFeature(XMLUni::fgXercesSchemaFullChecking, true); +} + std::size_t EntityFile::GetTypeStride(std::string typeName) { std::map typeStrides{ @@ -37,6 +47,7 @@ std::size_t EntityFile::GetTypeStride(std::string typeName) { "float", sizeof(float) }, { "double", sizeof(double) }, { "string", sizeof(std::string) }, + { "enum", sizeof(int) }, { "Vector", sizeof(glm::vec3) }, { "Quaternion", sizeof(glm::quat) }, { "Color", sizeof(glm::vec4) } @@ -75,7 +86,7 @@ void EntityFile::WriteAttributeData(char* outData, const ComponentInfo::Field_t& void EntityFile::WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData) { - if (field.Type == "int") { + if (field.Type == "int" || field.Type == "enum") { int value = boost::lexical_cast(valueData); memcpy(outData, reinterpret_cast(&value), field.Stride); } else if (field.Type == "float") { @@ -93,3 +104,171 @@ void EntityFile::WriteValueData(char* outData, const ComponentInfo::Field_t& fie LOG_WARNING("Unknown value data type: %s", field.Type.c_str()); } } + +EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) : m_Handler(handler) +, m_Reader(reader) +{ + // 0 is imaginary base parent + m_EntityStack.push(0); + m_StateStack.push(State::Unknown); +} + +void EntityFileSAXHandler::startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) +{ + 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 EntityFileSAXHandler::endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) +{ + 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 EntityFileSAXHandler::characters(const XMLCh* const chars, const XMLSize_t length) +{ + if (m_StateStack.top() == State::ComponentField) { + char* transcoded = xercesc::XMLString::transcode(chars); + onFieldData(transcoded); + } +} + +void EntityFileSAXHandler::fatalError(const xercesc::SAXParseException& e) +{ + XS::ToString s(e.getMessage()); + LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str()); + //throw e; +} + +void EntityFileSAXHandler::error(const xercesc::SAXParseException& e) +{ + XS::ToString s(e.getMessage()); + LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str()); +} + +void EntityFileSAXHandler::warning(const xercesc::SAXParseException& e) +{ + XS::ToString s(e.getMessage()); + LOG_ERROR("SAXParseException: %s", ((std::string)s).c_str()); +} + +void EntityFileSAXHandler::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 EntityFileSAXHandler::onEndEntity() +{ + m_EntityStack.pop(); +} + +void EntityFileSAXHandler::onStartEntityRef(const xercesc::Attributes& attrs) +{ + std::string path = XS::ToString(attrs.getValue(XS::ToXMLCh("file"))); + + xercesc::SAX2XMLReader* reader = xercesc::XMLReaderFactory::createXMLReader(); + EntityFile::setReaderFeatures(reader); + reader->setContentHandler(this); + reader->setErrorHandler(this); + reader->parse(path.c_str()); + delete reader; +} + +void EntityFileSAXHandler::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 EntityFileSAXHandler::onEndComponent(const std::string& name) { } + +void EntityFileSAXHandler::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 EntityFileSAXHandler::onEndComponentField(const std::string& field) { } + +void EntityFileSAXHandler::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); +} diff --git a/src/Engine/Core/EntityFileParser.cpp b/src/Engine/Core/EntityFileParser.cpp index 541da01d..1633bbc7 100644 --- a/src/Engine/Core/EntityFileParser.cpp +++ b/src/Engine/Core/EntityFileParser.cpp @@ -9,17 +9,21 @@ EntityFileParser::EntityFileParser(const EntityFile* entityFile) 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) +EntityID EntityFileParser::MergeEntities(World* world, EntityID baseParent /*= EntityID_Invalid */) { m_World = world; - m_EntityIDMapper[0] = 0; + m_EntityIDMapper[0] = baseParent; m_EntityFile->Parse(&m_Handler); + return m_FirstEntity; } void EntityFileParser::onStartEntity(EntityID entity, EntityID parent, const std::string& name) { EntityID realParent = m_EntityIDMapper.at(parent); EntityID realEntity = m_World->CreateEntity(realParent); + if (m_FirstEntity == EntityID_Invalid) { + m_FirstEntity = realEntity; + } if (!name.empty()) { m_World->SetName(realEntity, name); } @@ -38,7 +42,12 @@ void EntityFileParser::onStartComponentField(EntityID entity, const std::string& { EntityID realEntity = m_EntityIDMapper.at(entity); ComponentWrapper component = m_World->GetComponent(realEntity, componentType); - auto& field = component.Info.Fields.at(fieldName); + auto fieldIt = component.Info.Fields.find(fieldName); + if (fieldIt == component.Info.Fields.end()) { + LOG_ERROR("Tried to set unknown field \"%s\" of component type \"%s\"! Ignoring.", fieldName.c_str(), componentType.c_str()); + return; + } + auto& field = fieldIt->second; LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str()); LOG_DEBUG("Attributes:"); @@ -54,7 +63,11 @@ void EntityFileParser::onFieldData(EntityID entity, const std::string& component { EntityID realEntity = m_EntityIDMapper.at(entity); ComponentWrapper component = m_World->GetComponent(realEntity, componentType); - auto& field = component.Info.Fields.at(fieldName); + auto fieldIt = component.Info.Fields.find(fieldName); + if (fieldIt == component.Info.Fields.end()) { + return; + } + auto& field = fieldIt->second; 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 index ca445042..90151941 100644 --- a/src/Engine/Core/EntityFilePreprocessor.cpp +++ b/src/Engine/Core/EntityFilePreprocessor.cpp @@ -16,12 +16,12 @@ EntityFilePreprocessor::EntityFilePreprocessor(const EntityFile* entityFile) 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); + LOG_DEBUG("Component: %s (%s)", info.Name.c_str(), info.Meta->Annotation.c_str()); + LOG_DEBUG("Stride: %i", info.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()); + LOG_DEBUG("\t%i\t%s %s", field.Offset, field.Type.c_str(), kv.first.c_str()); } } @@ -62,62 +62,36 @@ void EntityFilePreprocessor::parseComponentInfo() } ComponentInfo compInfo; + compInfo.Meta = std::make_shared(); // Name compInfo.Name = XS::ToString(element->getName()); // Known allocation - compInfo.Meta.Allocation = m_ComponentCounts[compInfo.Name]; + 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()); - } - } + compInfo.Meta->Annotation = parseAnnotationXML(componentAnnotation->getAnnotationString()); } else { - LOG_WARNING("Component is missing an annotation!"); + LOG_WARNING("Component \"%s\" is missing an annotation!", compInfo.Name.c_str()); } // auto typeDefinition = element->getTypeDefinition(); + // Allow empty components + if (typeDefinition == nullptr) { + continue; + } if (typeDefinition->getTypeCategory() != XSTypeDefinition::COMPLEX_TYPE) { - LOG_ERROR("Type definition wasn't COMPLEX_TYPE! Skipping."); + LOG_ERROR("Failed to parse component definition for \"%s\": Type definition wasn't COMPLEX_TYPE!", compInfo.Name.c_str()); 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."); + if (modelGroupParticle == nullptr || modelGroupParticle->getTermType() != XSParticle::TERM_MODELGROUP) { + LOG_ERROR("Failed to parse component definition for \"%s\": Model group particle was null or wasn't TERM_MODELGROUP!", compInfo.Name.c_str()); continue; } auto modelGroup = modelGroupParticle->getModelGroupTerm(); @@ -129,31 +103,65 @@ void EntityFilePreprocessor::parseComponentInfo() 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."); + LOG_ERROR("Failed to parse a field definition in component \"%s\": Particle wasn't TERM_ELEMENT! Skipping.", compInfo.Name.c_str()); continue; } auto elementDeclaration = particle->getElementTerm(); std::string name = XS::ToString(elementDeclaration->getName()); std::string type = XS::ToString(elementDeclaration->getTypeDefinition()->getName()); + std::string typeNamespace = XS::ToString(elementDeclaration->getTypeDefinition()->getNamespace()); + std::string baseType = XS::ToString(elementDeclaration->getTypeDefinition()->getBaseType()->getName()); + std::string effectiveType = type; 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; + stride = EntityFile::GetTypeStride(baseType); + if (stride == 0) { + LOG_WARNING("Field \"%s\" in component \"%s\" uses unexpected field type \"%s\" with base type \"%s\". Skipping.", name.c_str(), compInfo.Name.c_str(), type.c_str(), baseType.c_str()); + continue; + } + effectiveType = baseType; + } + + // Annotation + auto fieldAnnotation = elementDeclaration->getAnnotation(); + if (fieldAnnotation != nullptr) { + compInfo.Meta->FieldAnnotations[name] = parseAnnotationXML(fieldAnnotation->getAnnotationString()); + } else { + LOG_WARNING("Component field \"%s.%s\" is missing an annotation!", compInfo.Name.c_str(), name.c_str()); + } + + if (effectiveType == "enum") { + // Parse potential enum type definition for field type + if (compInfo.Meta->FieldEnumDefinitions.count(name) == 0) { + auto enumTypeDefinition = xsModel->getTypeDefinition(XS::ToXMLCh(type), XS::ToXMLCh("components")); + auto xsComplexType = dynamic_cast(enumTypeDefinition); + auto xsComplexContent = xsComplexType->getParticle(); + auto xsExtension = xsComplexContent->getModelGroupTerm(); + auto xsExtensionParticles = xsExtension->getParticles(); + auto xsChoice = xsExtensionParticles->elementAt(0)->getModelGroupTerm(); + auto xsChoiceParticles = xsChoice->getParticles(); + for (int i = 0; i < xsChoiceParticles->size(); ++i) { + auto enumElement = xsChoiceParticles->elementAt(i)->getElementTerm(); + std::string enumName = XS::ToString(enumElement->getName()); + std::string enumValue = XS::ToString(enumElement->getConstraintValue()); + compInfo.Meta->FieldEnumDefinitions[name][enumName] = boost::lexical_cast(enumValue); + LOG_DEBUG("ENUM %s = %s", enumName.c_str(), enumValue.c_str()); + } + } } auto& field = compInfo.Fields[name]; field.Name = name; - field.Type = type; + field.Type = effectiveType; field.Offset = fieldOffset; field.Stride = stride; compInfo.FieldsInOrder.push_back(name); - fieldOffset += stride; } - compInfo.Meta.Stride = fieldOffset; + compInfo.Stride = fieldOffset; m_ComponentInfo[compInfo.Name] = compInfo; } } @@ -166,13 +174,22 @@ void EntityFilePreprocessor::parseDefaults() 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); + ci.second.Defaults = std::shared_ptr(new char[ci.second.Stride]); + memset(ci.second.Defaults.get(), 0, ci.second.Stride); std::string componentName = ci.first; + + XercesDOMParser parser(nullptr, XMLPlatformUtils::fgMemoryManager); + parser.setDoSchema(true); + parser.setDoNamespaces(true); + parser.setErrorHandler(&errorHandler); + parser.setValidationScheme(XercesDOMParser::Val_Always); + parser.setValidationSchemaFullChecking(true); + //parser.setDoNamespaces(true); + //boost::filesystem::path schemaLocation = "Schema/Components/" + componentName + ".xsd"; + //std::string namespaceSchema = schemaLocation.string(); + //parser.setExternalNoNamespaceSchemaLocation("Teamasdasdasdasd.xsd"); + LOG_DEBUG("Parsing defaults for component %s", componentName.c_str()); boost::filesystem::path defaultsFile = "Schema/Components/" + componentName + ".xml"; @@ -184,7 +201,7 @@ void EntityFilePreprocessor::parseDefaults() } // Find the node in the components namespace matching the component name - std::string tagName = "c:" + componentName; + std::string tagName = 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()); @@ -217,9 +234,19 @@ void EntityFilePreprocessor::parseDefaults() EntityFile::WriteAttributeData(data, field, attributes); } - // Handle potential field values auto childNode = fieldElement->getFirstChild(); - if (childNode != nullptr && childNode->getNodeType() == DOMNode::TEXT_NODE) { + if (childNode == nullptr) { + continue; + } + + // An enum will either have an element node with a text node inside, + // or contain a text node directly. + if (childNode->getNodeType() == DOMNode::ELEMENT_NODE) { + childNode = childNode->getFirstChild(); + } + + // Handle potential field values + if (childNode->getNodeType() == DOMNode::TEXT_NODE) { char* cstrValue = XMLString::transcode(childNode->getNodeValue()); EntityFile::WriteValueData(data, field, cstrValue); XMLString::release(&cstrValue); @@ -228,3 +255,27 @@ void EntityFilePreprocessor::parseDefaults() } } +std::string EntityFilePreprocessor::parseAnnotationXML(const XMLCh* xml) +{ + using namespace xercesc; + + // Parse annotation XML + char* annotationString = XMLString::transcode(xml); + MemBufInputSource annotationInput(reinterpret_cast(annotationString), strlen(annotationString), "MemBuf: Annotation String"); + XercesDOMParser parser(nullptr, XMLPlatformUtils::fgMemoryManager); + //parser.setErrorHandler(&errorHandler); + parser.parse(annotationInput); + XMLString::release(&annotationString); + auto doc = parser.getDocument(); + + // Save documentation string + auto documentationTags = doc->getElementsByTagName(XS::ToXMLCh("xs:documentation")); + if (documentationTags->getLength() != 0) { + auto child = documentationTags->item(0)->getFirstChild(); + if (child != nullptr) { + return XS::ToString(child->getNodeValue()); + } + } + + return std::string(); +} diff --git a/src/Engine/Core/EntityFileWriter.cpp b/src/Engine/Core/EntityFileWriter.cpp index 5b6c466d..4d46be06 100644 --- a/src/Engine/Core/EntityFileWriter.cpp +++ b/src/Engine/Core/EntityFileWriter.cpp @@ -114,7 +114,7 @@ void EntityFileWriter::appentEntityComponents(xercesc::DOMElement* parentElement 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") { + } else if (field.Type == "int" || field.Type == "enum") { const int& value = c[fieldName]; fieldElement->appendChild(doc->createTextNode(X(boost::lexical_cast(value)))); } else if (field.Type == "float") { diff --git a/src/Engine/Core/EntityWrapper.cpp b/src/Engine/Core/EntityWrapper.cpp new file mode 100644 index 00000000..7b321a63 --- /dev/null +++ b/src/Engine/Core/EntityWrapper.cpp @@ -0,0 +1,30 @@ +#include "Core/EntityWrapper.h" +#include "Core/World.h" + +const EntityWrapper EntityWrapper::Invalid = EntityWrapper(nullptr, EntityID_Invalid); + +bool EntityWrapper::operator==(const EntityWrapper& e) +{ + return (this->World == e.World) && (this->ID == e.ID); +} + +bool EntityWrapper::HasComponent(const std::string& componentName) +{ + return World->HasComponent(ID, componentName); +} + +ComponentWrapper EntityWrapper::operator[](const std::string& componentName) +{ + if (World->HasComponent(ID, componentName)) { + return World->GetComponent(ID, componentName); + } else { + LOG_WARNING("EntityWrapper implicitly attached \"%s\" component to #%i as a result of a fetch request!", componentName.c_str(), ID); + return World->AttachComponent(ID, componentName); + } +} + +EntityWrapper::operator EntityID() +{ + return this->ID; +} + diff --git a/src/Engine/Core/OctTree.cpp b/src/Engine/Core/Octree.cpp similarity index 84% rename from src/Engine/Core/OctTree.cpp rename to src/Engine/Core/Octree.cpp index c1d8c64e..47d06add 100644 --- a/src/Engine/Core/OctTree.cpp +++ b/src/Engine/Core/Octree.cpp @@ -2,7 +2,7 @@ #include #include -#include "Core/OctTree.h" +#include "Core/Octree.h" #include "Collision/Collision.h" namespace @@ -21,65 +21,61 @@ bool isFirstLower(const ChildInfo& first, const ChildInfo& second) } -OctTree::OctTree() - : OctTree(AABB(), 0) -{} - -OctTree::OctTree(const AABB& octTreeBounds, int subDivisions) - : m_Root(new OctChild(octTreeBounds, subDivisions, m_StaticObjects, m_DynamicObjects)) +Octree::Octree(const AABB& octTreeBounds, int subDivisions) + : m_Root(new Child(octTreeBounds, subDivisions, m_StaticObjects, m_DynamicObjects)) , m_UpdatedOnce(false) -{} +{ } -OctTree::~OctTree() +Octree::~Octree() { delete m_Root; } -void OctTree::AddDynamicObject(const AABB& box) +void Octree::AddDynamicObject(const AABB& box) { m_Root->AddDynamicObject(box); m_DynamicObjects.push_back(box); } -void OctTree::AddStaticObject(const AABB& box) +void Octree::AddStaticObject(const AABB& box) { m_Root->AddStaticObject(box); m_StaticObjects.push_back(box); } -void OctTree::BoxesInSameRegion(const AABB& box, std::vector& outBoxes) +void Octree::BoxesInSameRegion(const AABB& box, std::vector& outBoxes) { falsifyObjectChecks(); m_Root->BoxesInSameRegion(box, outBoxes); } -void OctTree::ClearObjects() +void Octree::ClearObjects() { m_StaticObjects.clear(); m_DynamicObjects.clear(); m_Root->ClearObjects(); } -void OctTree::ClearDynamicObjects() +void Octree::ClearDynamicObjects() { m_DynamicObjects.clear(); m_Root->ClearDynamicObjects(); } -bool OctTree::RayCollides(const Ray& ray, Output& data) +bool Octree::RayCollides(const Ray& ray, Output& data) { falsifyObjectChecks(); data.CollideDistance = -1; return m_Root->RayCollides(ray, data); } -bool OctTree::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) +bool Octree::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) { falsifyObjectChecks(); return m_Root->BoxCollides(boxToTest, outBoxIntersected); } -void OctTree::falsifyObjectChecks() +void Octree::falsifyObjectChecks() { for (auto& obj : m_StaticObjects) { obj.Checked = false; @@ -89,7 +85,7 @@ void OctTree::falsifyObjectChecks() } } -OctTree::OctChild::OctChild(const AABB& octTreeBounds, +Octree::Child::Child(const AABB& octTreeBounds, int subDivisions, std::vector& staticObjects, std::vector& dynamicObjects) @@ -98,7 +94,7 @@ OctTree::OctChild::OctChild(const AABB& octTreeBounds, , m_DynamicObjectsRef(dynamicObjects) { if (subDivisions == 0) { - for (OctChild*& c : m_Children) { + for (Child*& c : m_Children) { c = nullptr; } } else { @@ -107,7 +103,7 @@ OctTree::OctChild::OctChild(const AABB& octTreeBounds, glm::vec3 minPos, maxPos; const glm::vec3& parentMin = m_Box.MinCorner(); const glm::vec3& parentMax = m_Box.MaxCorner(); - const glm::vec3& parentCenter = m_Box.Center(); + const glm::vec3& parentCenter = m_Box.Origin(); std::bitset<3> bits(i); //If child is 4,5,6,7. if (bits.test(2)) { @@ -134,14 +130,14 @@ OctTree::OctChild::OctChild(const AABB& octTreeBounds, minPos.z = parentMin.z; maxPos.z = parentCenter.z; } - m_Children[i] = new OctChild(AABB(minPos, maxPos), subDivisions, m_StaticObjectsRef, m_DynamicObjectsRef); + m_Children[i] = new Child(AABB(minPos, maxPos), subDivisions, m_StaticObjectsRef, m_DynamicObjectsRef); } } } -OctTree::OctChild::~OctChild() +Octree::Child::~Child() { - for (OctChild*& c : m_Children) { + for (Child*& c : m_Children) { if (c != nullptr) { delete c; c = nullptr; @@ -149,7 +145,7 @@ OctTree::OctChild::~OctChild() } } -bool OctTree::OctChild::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) const +bool Octree::Child::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersected) const { if (hasChildren()) { for (int i : childIndicesContainingBox(boxToTest)) { @@ -182,7 +178,7 @@ bool OctTree::OctChild::BoxCollides(const AABB& boxToTest, AABB& outBoxIntersect return false; } -bool OctTree::OctChild::RayCollides(const Ray& ray, Output& data) const +bool Octree::Child::RayCollides(const Ray& ray, Output& data) const { //If the node AABB is missed, everything it contains is missed. if (Collision::RayAABBIntr(ray, m_Box)) { @@ -192,7 +188,7 @@ bool OctTree::OctChild::RayCollides(const Ray& ray, Output& data) const std::vector childInfos; childInfos.reserve(8); for (int i = 0; i < 8; ++i) { - childInfos.push_back({ i, glm::distance(ray.Origin(), m_Children[i]->m_Box.Center()) }); + childInfos.push_back({ i, glm::distance(ray.Origin(), m_Children[i]->m_Box.Origin()) }); } std::sort(childInfos.begin(), childInfos.end(), isFirstLower); //Loop through the children, starting with the one closest to the ray origin. I.e the first to be hit. @@ -234,7 +230,7 @@ bool OctTree::OctChild::RayCollides(const Ray& ray, Output& data) const } -void OctTree::OctChild::AddDynamicObject(const AABB& box) +void Octree::Child::AddDynamicObject(const AABB& box) { if (hasChildren()) { for (auto i : childIndicesContainingBox(box)) { @@ -246,7 +242,7 @@ void OctTree::OctChild::AddDynamicObject(const AABB& box) } } -void OctTree::OctChild::AddStaticObject(const AABB& box) +void Octree::Child::AddStaticObject(const AABB& box) { if (hasChildren()) { for (auto i : childIndicesContainingBox(box)) { @@ -258,7 +254,7 @@ void OctTree::OctChild::AddStaticObject(const AABB& box) } } -void OctTree::OctChild::BoxesInSameRegion(const AABB& box, std::vector& outBoxes) const +void Octree::Child::BoxesInSameRegion(const AABB& box, std::vector& outBoxes) const { if (hasChildren()) { for (auto i : childIndicesContainingBox(box)) { @@ -292,10 +288,10 @@ void OctTree::OctChild::BoxesInSameRegion(const AABB& box, std::vector& ou } } -void OctTree::OctChild::ClearObjects() +void Octree::Child::ClearObjects() { if (hasChildren()) { - for (OctChild*& c : m_Children) { + for (Child*& c : m_Children) { c->ClearObjects(); } } else { @@ -304,10 +300,10 @@ void OctTree::OctChild::ClearObjects() } } -void OctTree::OctChild::ClearDynamicObjects() +void Octree::Child::ClearDynamicObjects() { if (hasChildren()) { - for (OctChild*& c : m_Children) { + for (Child*& c : m_Children) { c->ClearObjects(); } } else { @@ -327,13 +323,13 @@ void OctTree::OctChild::ClearDynamicObjects() // x : - - - - + + + + // y : - - + + - - + + // z : - + - + - + - + -int OctTree::OctChild::childIndexContainingPoint(const glm::vec3& point) const +int Octree::Child::childIndexContainingPoint(const glm::vec3& point) const { - const glm::vec3& c = m_Box.Center(); + const glm::vec3& c = m_Box.Origin(); return (1 << 2) * (point.x >= c.x) | (1 << 1) * (point.y >= c.y) | (point.z >= c.z); } -std::vector OctTree::OctChild::childIndicesContainingBox(const AABB& box) const +std::vector Octree::Child::childIndicesContainingBox(const AABB& box) const { int minInd = childIndexContainingPoint(box.MinCorner()); int maxInd = childIndexContainingPoint(box.MaxCorner()); @@ -371,7 +367,7 @@ std::vector OctTree::OctChild::childIndicesContainingBox(const AABB& box) c } } -inline bool OctTree::OctChild::hasChildren() const +inline bool Octree::Child::hasChildren() const { return m_Children[0] != nullptr; } \ No newline at end of file diff --git a/src/Engine/Core/World.cpp b/src/Engine/Core/World.cpp index c94cb8b3..477e2ab2 100644 --- a/src/Engine/Core/World.cpp +++ b/src/Engine/Core/World.cpp @@ -66,7 +66,7 @@ void World::RegisterComponent(ComponentInfo& ci) } } -ComponentWrapper World::AttachComponent(EntityID entity, std::string componentType) +ComponentWrapper World::AttachComponent(EntityID entity, const std::string& componentType) { // TODO: Allocate dynamic pool if component isn't registered ComponentPool* pool = m_ComponentPools.at(componentType); @@ -75,31 +75,31 @@ ComponentWrapper World::AttachComponent(EntityID entity, std::string componentTy // Allocate space for the component ComponentWrapper c = pool->Allocate(entity); // Write default values - memcpy(c.Data, ci.Defaults.get(), ci.Meta.Stride); + memcpy(c.Data, ci.Defaults.get(), ci.Stride); return c; } -bool World::HasComponent(EntityID entity, std::string componentType) const +bool World::HasComponent(EntityID entity, const std::string& componentType) const { ComponentPool* pool = m_ComponentPools.at(componentType); return pool->KnowsEntity(entity); } -ComponentWrapper World::GetComponent(EntityID entity, std::string componentType) +ComponentWrapper World::GetComponent(EntityID entity, const std::string& componentType) { ComponentPool* pool = m_ComponentPools.at(componentType); return pool->GetByEntity(entity); } -void World::DeleteComponent(EntityID entity, std::string componentType) +void World::DeleteComponent(EntityID entity, const std::string& componentType) { ComponentPool* pool = m_ComponentPools.at(componentType); ComponentWrapper c = pool->GetByEntity(entity); return pool->Delete(c); } -const ComponentPool* World::GetComponents(std::string componentType) +const ComponentPool* World::GetComponents(const std::string& componentType) { auto it = m_ComponentPools.find(componentType); return (it != m_ComponentPools.end()) ? it->second : nullptr; @@ -125,6 +125,11 @@ void World::SetParent(EntityID entity, EntityID parent) m_EntityChildren.insert(std::make_pair(parent, entity)); } +const std::pair::const_iterator, std::unordered_multimap::const_iterator> World::GetChildren(EntityID entity) +{ + return m_EntityChildren.equal_range(entity); +} + void World::SetName(EntityID entity, const std::string& name) { m_EntityNames[entity] = name; diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index 94e848c0..d5863814 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -3,7 +3,8 @@ #include EditorSystem::EditorSystem(EventBroker* eventBroker, IRenderer* renderer) - : ImpureSystem(eventBroker) + : System(eventBroker) + , ImpureSystem() , m_Renderer(renderer) { auto config = ResourceManager::Load("Config.ini"); @@ -483,8 +484,8 @@ void EditorSystem::drawUI(World* world, double dt) } if (ImGui::CollapsingHeader(componentType.c_str())) { - if (!ci.Meta.Annotation.empty()) { - ImGui::Text(ci.Meta.Annotation.c_str()); + if (!ci.Meta->Annotation.empty()) { + ImGui::Text(ci.Meta->Annotation.c_str()); } auto& component = world->GetComponent(m_Selection, componentType); @@ -492,9 +493,10 @@ void EditorSystem::drawUI(World* world, double dt) const std::string& fieldName = kv.first; auto& field = kv.second; - ImGui::PushID(fieldName.c_str()); + std::string uniqueID = componentType + fieldName; + ImGui::PushID(uniqueID.c_str()); if (field.Type == "Vector") { - auto& val = component.Property(fieldName); + auto& val = component.Field(fieldName); if (fieldName == "Scale") { ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, 0.f, std::numeric_limits::max()); } else if (fieldName == "Orientation") { @@ -506,10 +508,10 @@ void EditorSystem::drawUI(World* world, double dt) ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, std::numeric_limits::lowest(), std::numeric_limits::max()); } } else if (field.Type == "Color") { - auto& val = component.Property(fieldName); + auto& val = component.Field(fieldName); ImGui::ColorEdit4("", glm::value_ptr(val), true); } else if (field.Type == "string") { - std::string& val = component.Property(fieldName); + std::string& val = component.Field(fieldName); char tempString[1024]; memcpy(tempString, val.c_str(), std::min(val.length() + 1, sizeof(tempString))); if (ImGui::InputText("", tempString, sizeof(tempString))) { @@ -523,12 +525,32 @@ void EditorSystem::drawUI(World* world, double dt) } } else if (field.Type == "double") { - float tempVal = static_cast(component.Property(fieldName)); + float tempVal = static_cast(component.Field(fieldName)); if (ImGui::InputFloat("", &tempVal, 0.01f, 1.f)) { - component.SetProperty(fieldName, static_cast(tempVal)); + component.SetField(fieldName, static_cast(tempVal)); + } + } else if (field.Type == "int") { + int val = component.Field(fieldName); + ImGui::InputInt("", &val); + } else if (field.Type == "enum") { + int currentValue = component.Field(fieldName); + int item = -1; + std::stringstream enumKeys; + std::vector enumValues; + int i = 0; + for (auto& kv : ci.Meta->FieldEnumDefinitions.at(fieldName)) { + enumKeys << kv.first << " (" << kv.second << ")" << '\0'; + enumValues.push_back(kv.second); + if (currentValue == kv.second) { + item = i; + } + i++; + } + if (ImGui::Combo("", &item, enumKeys.str().c_str())) { + component.SetField(fieldName, enumValues.at(item)); } } else if (field.Type == "bool") { - auto& val = component.Property(fieldName); + auto& val = component.Field(fieldName); ImGui::Checkbox("", &val); } else { ImGui::TextDisabled(field.Type.c_str()); diff --git a/src/Engine/Input/InputProxy.cpp b/src/Engine/Input/InputProxy.cpp index ad589df3..6c3591e3 100644 --- a/src/Engine/Input/InputProxy.cpp +++ b/src/Engine/Input/InputProxy.cpp @@ -20,15 +20,16 @@ void InputProxy::LoadBindings(std::string file) for (auto& origin : config->GetAll("Bindings")) { Events::BindOrigin e; e.Origin = origin.first; - e.Command = origin.second; - e.Value = 1.f; - if (!e.Command.empty()) { - char prefix = e.Command.at(0); - if (prefix == '+' || prefix == '-') { - e.Command = e.Command.substr(1); - if (prefix == '-') { - e.Value *= -1.f; - } + const std::string& command = origin.second; + if (!command.empty()) { + boost::char_separator separator(", "); + boost::tokenizer tokenizer(command, separator); + auto token = tokenizer.begin(); + e.Command = *token; + if (++token != tokenizer.end()) { + e.Value = boost::lexical_cast(*token); + } else { + e.Value = 1.f; } OnBindOrigin(e); } diff --git a/src/Engine/Rendering/RenderSystem.cpp b/src/Engine/Rendering/RenderSystem.cpp index c8def2b9..38b80ea2 100644 --- a/src/Engine/Rendering/RenderSystem.cpp +++ b/src/Engine/Rendering/RenderSystem.cpp @@ -1,14 +1,15 @@ #include "Rendering/RenderSystem.h" -RenderSystem::RenderSystem(EventBroker* eventBrokerer, const IRenderer* renderer, RenderFrame* renderFrame) :ImpureSystem(eventBrokerer) +RenderSystem::RenderSystem(EventBroker* eventBroker, const IRenderer* renderer, RenderFrame* renderFrame) + : System(eventBroker) + , m_Renderer(renderer) + , m_RenderFrame(renderFrame) { - m_Renderer = renderer; - m_RenderFrame = renderFrame; EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera); EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand); m_Camera = new Camera((float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height, glm::radians(45.f), 0.01f, 5000.f); - m_DebugCameraInputController = new DebugCameraInputController(eventBrokerer, -1); + m_DebugCameraInputController = new DebugCameraInputController(eventBroker, -1); } RenderSystem::~RenderSystem() diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt index 04146670..4aaff273 100644 --- a/src/Game/CMakeLists.txt +++ b/src/Game/CMakeLists.txt @@ -10,17 +10,23 @@ include_directories( ${Boost_INCLUDE_DIRS} ) -file(GLOB SOURCE_FILES - "${INCLUDE_PATH}/*.h" - #"*.cpp" +file(GLOB SOURCE_FILES_Systems + "${INCLUDE_PATH}/Systems/*.h" + "Systems/*.cpp" ) -#source_group(Core FILES ${SOURCE_FILES}) +source_group(Systems FILES ${SOURCE_FILES_Systems}) + +file(GLOB SOURCE_FILES_Events + "${INCLUDE_PATH}/Events/*.h" + "Events/*.cpp" +) +source_group(Events FILES ${SOURCE_FILES_Events}) set(SOURCE_FILES ${SOURCE_FILES} "Game.cpp" - "HealthSystem.cpp" - "PlayerSystem.cpp" + ${SOURCE_FILES_Systems} + ${SOURCE_FILES_Events} ) set(LIBRARIES diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index 80b45eb8..54f7b69d 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -1,7 +1,12 @@ #include "Game.h" +#include "Collision/CollidableOctreeSystem.h" #include "Collision/TriggerSystem.h" #include "Collision/CollisionSystem.h" -#include "Game/HealthSystem.h" +#include "Systems/RaptorCopterSystem.h" +#include "Systems/HealthSystem.h" +#include "Systems/PlayerMovementSystem.h" +#include "Systems/SpawnerSystem.h" +#include "Systems/PlayerSpawnSystem.h" #include "Core/EntityFileWriter.h" Game::Game(int argc, char* argv[]) @@ -62,21 +67,27 @@ Game::Game(int argc, char* argv[]) //SO MUCH TEMP PLEASE REMOVE ME OMFG VIKTOR HELP m_Renderer->m_World = m_World; + // Create Octrees + m_OctreeCollision = new Octree(AABB(glm::vec3(-100), glm::vec3(100)), 4); + m_OctreeFrustrumCulling = new Octree(AABB(glm::vec3(-100), glm::vec3(100)), 4); // Create system pipeline m_SystemPipeline = new SystemPipeline(m_EventBroker); - - //All systems with orderlevel 0 will be updated first. + // 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. + m_SystemPipeline->AddSystem(updateOrderLevel); + m_SystemPipeline->AddSystem(updateOrderLevel); + m_SystemPipeline->AddSystem(updateOrderLevel); + // Populate Octree with collidables ++updateOrderLevel; - m_SystemPipeline->AddSystem(updateOrderLevel); - m_SystemPipeline->AddSystem(updateOrderLevel); + m_SystemPipeline->AddSystem(updateOrderLevel, m_OctreeCollision); + // Collision and TriggerSystem should update after player. + ++updateOrderLevel; + m_SystemPipeline->AddSystem(updateOrderLevel, m_OctreeCollision); + m_SystemPipeline->AddSystem(updateOrderLevel, m_OctreeCollision); ++updateOrderLevel; m_SystemPipeline->AddSystem(updateOrderLevel, m_Renderer, m_RenderFrame); @@ -96,6 +107,8 @@ Game::~Game() { delete m_SystemPipeline; delete m_SoundSystem; + delete m_OctreeFrustrumCulling; + delete m_OctreeCollision; delete m_World; delete m_FrameStack; delete m_InputProxy; diff --git a/src/Game/PlayerSystem.cpp b/src/Game/PlayerSystem.cpp deleted file mode 100644 index 17b9a7f5..00000000 --- a/src/Game/PlayerSystem.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "PlayerSystem.h" - -void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, double dt) -{ - player["Velocity"] = glm::vec3(0.f, 0.f, 0.f); - if ((bool&)player["Forward"] == true) { - ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt) * -1; - - } - if ((bool&)player["Left"] == true) { - ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt) * -1; - } - if ((bool&)player["Back"] == true) { - ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt); - } - if ((bool&)player["Right"] == true) { - ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt); - } - - if ((glm::vec3)player["Velocity"] != glm::vec3(0.f)) { - ComponentWrapper& transform = world->GetComponent(player.EntityID, "Transform"); - (glm::vec3&)transform["Position"] += (glm::vec3)player["Velocity"]; - } -} - -bool PlayerSystem::OnTouch(const Events::TriggerTouch &event) -{ - LOG_INFO("Player entity %i touched widget (entity %i).", event.Entity, event.Trigger); - return false; -} - -bool PlayerSystem::OnEnter(const Events::TriggerEnter &event) -{ - LOG_INFO("Player entity %i entered widget (entity %i).", event.Entity, event.Trigger); - return false; -} - -bool PlayerSystem::OnLeave(const Events::TriggerLeave &event) -{ - LOG_INFO("Player entity %i left widget (entity %i).", event.Entity, event.Trigger); - return false; -} \ No newline at end of file diff --git a/src/Game/HealthSystem.cpp b/src/Game/Systems/HealthSystem.cpp similarity index 76% rename from src/Game/HealthSystem.cpp rename to src/Game/Systems/HealthSystem.cpp index 7a1d5005..b6d46dc9 100644 --- a/src/Game/HealthSystem.cpp +++ b/src/Game/Systems/HealthSystem.cpp @@ -1,32 +1,32 @@ -#include "HealthSystem.h" -#include +#include "Systems/HealthSystem.h" HealthSystem::HealthSystem(EventBroker* eventBroker) - : PureSystem(eventBroker, "Health") + : System(eventBroker) + , PureSystem("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) +void HealthSystem::UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, 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"]; + ComponentWrapper player = world->GetComponent(component.EntityID, "Player"); + double maxHealth = (double)component["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) { + if (std::get<0>(deltaHP) == player.EntityID && (double)component["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; + double newHealth = std::min((double)component["Health"] + (double)std::get<1>(deltaHP), maxHealth); + component["Health"] = newHealth; m_DeltaHealthVector.erase(m_DeltaHealthVector.begin() + i - 1); //check if health is <= 0 - if ((double)health["Health"] <= 0.0f) { + if ((double)component["Health"] <= 0.0f) { //publish death event Events::PlayerDeath e; e.PlayerID = player.EntityID; diff --git a/src/Game/Systems/PlayerMovementSystem.cpp b/src/Game/Systems/PlayerMovementSystem.cpp new file mode 100644 index 00000000..536624b3 --- /dev/null +++ b/src/Game/Systems/PlayerMovementSystem.cpp @@ -0,0 +1,16 @@ +#include "Systems/PlayerMovementSystem.h" + +void PlayerMovementSystem::UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) +{ + ComponentWrapper& cTransform = entity["Transform"]; + if (!entity.HasComponent("Physics")) { + return; + } + ComponentWrapper& cPhysics = entity["Physics"]; + + glm::vec3& velocity = cPhysics["Velocity"]; + velocity.y -= 9.82 * dt; + + glm::vec3& position = cTransform["Position"]; + position += velocity * (float)dt; +} \ No newline at end of file diff --git a/src/Game/Systems/PlayerSpawnSystem.cpp b/src/Game/Systems/PlayerSpawnSystem.cpp new file mode 100644 index 00000000..0bf5bdea --- /dev/null +++ b/src/Game/Systems/PlayerSpawnSystem.cpp @@ -0,0 +1,51 @@ +#include "Systems/PlayerSpawnSystem.h" + +PlayerSpawnSystem::PlayerSpawnSystem(EventBroker* eventBroker) + : System(eventBroker) +{ + EVENT_SUBSCRIBE_MEMBER(m_OnInputCommand, &PlayerSpawnSystem::OnInputCommand); +} + +void PlayerSpawnSystem::Update(World* world, double dt) +{ + auto playerSpawns = world->GetComponents("PlayerSpawn"); + if (playerSpawns == nullptr) { + return; + } + + for (auto& team : m_SpawnRequests) { + for (auto& cPlayerSpawn : *playerSpawns) { + EntityWrapper spawner(world, cPlayerSpawn.EntityID); + if (!spawner.HasComponent("Spawner")) { + continue; + } + + // If the spawner has a team affiliation, check it + if (spawner.HasComponent("Team")) { + if ((int)spawner["Team"]["Team"] != team) { + continue; + } + } + + // Spawn the player! + EntityWrapper player = SpawnerSystem::Spawn(spawner); + // Set the player team affiliation + player["Team"]["Team"] = team; + } + } + m_SpawnRequests.clear(); +} + +bool PlayerSpawnSystem::OnInputCommand(const Events::InputCommand& e) +{ + if (e.Command != "PickTeam") { + return false; + } + + if (e.Value != 0) { + m_SpawnRequests.push_back((int)e.Value); + } + + return true; +} + diff --git a/src/Game/Systems/SpawnerSystem.cpp b/src/Game/Systems/SpawnerSystem.cpp new file mode 100644 index 00000000..3454c58b --- /dev/null +++ b/src/Game/Systems/SpawnerSystem.cpp @@ -0,0 +1,61 @@ +#include "Systems/SpawnerSystem.h" + +SpawnerSystem::SpawnerSystem(EventBroker* eventBroker) : System(eventBroker) +{ + EVENT_SUBSCRIBE_MEMBER(m_OnSpawnerSpawn, &SpawnerSystem::OnSpawnerSpawn); +} + +EntityWrapper SpawnerSystem::Spawn(EntityWrapper spawner, EntityWrapper parent /*= EntityWrapper::Invalid*/) +{ + // Spawn the entity in the parent's world if it exists, otherwise in the spawner's world + World* world = parent.World; + if (world == nullptr) { + world = spawner.World; + } + + // Find any SpawnPoints existing as children of spawner + auto children = spawner.World->GetChildren(spawner.ID); + std::vector spawnPoints; + for (auto kv = children.first; kv != children.second; ++kv) { + const EntityID& child = kv->second; + if (spawner.World->HasComponent(child, "SpawnPoint")) { + spawnPoints.push_back(EntityWrapper(spawner.World, child)); + } + } + + // Choose a random SpawnPoint + EntityWrapper spawnPoint = spawner; + if (!spawnPoints.empty()) { + if (spawnPoints.size() > 1) { + static std::random_device randomDevice; + static std::mt19937 randomGenerator(randomDevice()); + std::uniform_int_distribution<> distribution(0, std::distance(spawnPoints.begin(), spawnPoints.end()) - 1); + auto randomSpawnPointIt = spawnPoints.begin(); + std::advance(randomSpawnPointIt, distribution(randomGenerator)); + spawnPoint = *randomSpawnPointIt; + } else { + spawnPoint = spawnPoints.front(); + } + } + + // Load the entity file and parse it + const std::string& entityFilePath = spawner["Spawner"]["EntityFile"]; + auto entityFile = ResourceManager::Load(entityFilePath); + if (entityFile == nullptr) { + return EntityWrapper::Invalid; + } + EntityFileParser parser(entityFile); + EntityWrapper spawnedEntity(world, parser.MergeEntities(world, parent.ID)); + + // Set its position and orientation to that of the SpawnPoint + spawnedEntity["Transform"]["Position"] = Transform::AbsolutePosition(spawnPoint.World, spawnPoint.ID); + spawnedEntity["Transform"]["Orientation"] = glm::eulerAngles(Transform::AbsoluteOrientation(spawnPoint.World, spawnPoint.ID)); + + return spawnedEntity; +} + +bool SpawnerSystem::OnSpawnerSpawn(Events::SpawnerSpawn& e) +{ + EntityWrapper spawnedEntity = Spawn(e.Spawner, e.Parent); + return true; +} \ No newline at end of file diff --git a/src/Tests/CollisionTest.cpp b/src/Tests/CollisionTest.cpp index e6a29298..9f400330 100644 --- a/src/Tests/CollisionTest.cpp +++ b/src/Tests/CollisionTest.cpp @@ -7,7 +7,7 @@ using boost::unit_test_framework::test_case; #include "Engine/Core/AABB.h" #include "Engine/Core/Ray.h" #include //srand -#include "Engine/Core/OctTree.h" +#include "Engine/Core/Octree.h" //vs model #include #include @@ -205,9 +205,9 @@ BOOST_AUTO_TEST_CASE(octTest) { glm::vec3 mini = glm::vec3(-1, -1, -1); glm::vec3 maxi = glm::vec3(1, 1, 1); - OctTree tree(AABB(mini, maxi), 2); + Octree tree(AABB(mini, maxi), 2); tree.AddDynamicObject(AABB(mini, -0.9f*maxi)); - OctTree::Output data; + Octree::Output data; glm::vec3 origin = 3.0f * mini; bool rayIntersected = tree.RayCollides(Ray(origin , mini - origin), data); BOOST_CHECK(rayIntersected); diff --git a/src/Tests/ComponentPoolTest.cpp b/src/Tests/ComponentPoolTest.cpp index 25bdf1d3..1df13c10 100644 --- a/src/Tests/ComponentPoolTest.cpp +++ b/src/Tests/ComponentPoolTest.cpp @@ -10,8 +10,8 @@ BOOST_AUTO_TEST_CASE(ComponentPoolTest) //ci.Name = "Test"; //ci.FieldTypes["Field"] = "int"; //ci.FieldOffsets["Field"] = 0; - //ci.Meta.Allocation = 3; - //ci.Meta.Stride = sizeof(EntityID) + sizeof(int); + //ci.Meta->Allocation = 3; + //ci.Stride = sizeof(EntityID) + sizeof(int); //std::vector wrappers; //ComponentPool pool(ci); diff --git a/src/Tests/OctTreeTest.cpp b/src/Tests/OctTreeTest.cpp index 0206ce50..3a130354 100644 --- a/src/Tests/OctTreeTest.cpp +++ b/src/Tests/OctTreeTest.cpp @@ -3,7 +3,7 @@ using boost::unit_test_framework::test_suite; using boost::unit_test_framework::test_case; #include //srand -#include "Engine/Core/OctTree.h" +#include "Engine/Core/Octree.h" #include "Engine/Core/Ray.h" #include "OldOctTree.h" @@ -13,7 +13,7 @@ BOOST_AUTO_TEST_CASE(octSameRegionTest) { glm::vec3 mini = glm::vec3(-1, -1, -1); glm::vec3 maxi = glm::vec3(1, 1, 1); - OctTree tree(AABB(mini, maxi), 2); + Octree tree(AABB(mini, maxi), 2); AABB firstQuadrant(mini, 0.8f*mini); tree.AddStaticObject(firstQuadrant); AABB testBox(0.9f*mini, 0.8f*mini); @@ -21,9 +21,9 @@ BOOST_AUTO_TEST_CASE(octSameRegionTest) tree.BoxesInSameRegion(testBox, region); BOOST_REQUIRE(region.size() == 1); AABB& box = region[0]; - BOOST_CHECK_CLOSE_FRACTION(box.Center().x, firstQuadrant.Center().x, 0.00001f); - BOOST_CHECK_CLOSE_FRACTION(box.Center().y, firstQuadrant.Center().y, 0.00001f); - BOOST_CHECK_CLOSE_FRACTION(box.Center().z, firstQuadrant.Center().z, 0.00001f); + BOOST_CHECK_CLOSE_FRACTION(box.Origin().x, firstQuadrant.Origin().x, 0.00001f); + BOOST_CHECK_CLOSE_FRACTION(box.Origin().y, firstQuadrant.Origin().y, 0.00001f); + BOOST_CHECK_CLOSE_FRACTION(box.Origin().z, firstQuadrant.Origin().z, 0.00001f); BOOST_CHECK_CLOSE_FRACTION(box.HalfSize().x, firstQuadrant.HalfSize().x, 0.00001f); BOOST_CHECK_CLOSE_FRACTION(box.HalfSize().y, firstQuadrant.HalfSize().y, 0.00001f); BOOST_CHECK_CLOSE_FRACTION(box.HalfSize().z, firstQuadrant.HalfSize().z, 0.00001f); @@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE(octRegionPerfTestWithDuplicates) BOOST_AUTO_TEST_CASE(octRegionPerfTestNoDuplicates) { - TestLoop(RegionTest); + TestLoop(RegionTest); BOOST_CHECK(true); } @@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE(octBoxPerfTestWithDuplicates) BOOST_AUTO_TEST_CASE(octBoxPerfTestNoDuplicates) { - TestLoop(BoxTest); + TestLoop(BoxTest); BOOST_CHECK(true); } @@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE(octRayPerfTestWithDuplicates) BOOST_AUTO_TEST_CASE(octRayPerfTestNoDuplicates) { - TestLoop(RayTest); + TestLoop(RayTest); BOOST_CHECK(true); } @@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE(octNopPerfTestWithDuplicates) BOOST_AUTO_TEST_CASE(octNopPerfTestNoDuplicates) { - TestLoop(NopTest); + TestLoop(NopTest); BOOST_CHECK(true); } diff --git a/src/Tests/OctTreeTestGameClass.cpp b/src/Tests/OctTreeTestGameClass.cpp index 10d4d6a5..2c45d897 100644 --- a/src/Tests/OctTreeTestGameClass.cpp +++ b/src/Tests/OctTreeTestGameClass.cpp @@ -91,7 +91,7 @@ void Game::Tick() frameCounter = 0; } ComponentWrapper transform = m_World->GetComponent(m_World->anotherBoxTransformId, "Transform"); - transform["Position"] = boxi.Center(); + transform["Position"] = boxi.Origin(); //check all children again in the tree if they have a box in them or not, and colormark them if they do //contentboxarna får man ut - inte childboxarna! @@ -110,7 +110,7 @@ void Game::Tick() //REQUIRED: childIndicesContainingBox must be public to test this! for each (auto someBoxIndex in boxIndex) { - glm::vec3 pos = m_World->someOctTree.m_Root->m_Children[someBoxIndex]->m_Box.Center(); + glm::vec3 pos = m_World->someOctTree.m_Root->m_Children[someBoxIndex]->m_Box.Origin(); if (abs(pos.x - oneLinkedObject.posxyz.x) < 0.005f && abs(pos.y - oneLinkedObject.posxyz.y) < 0.005f && abs(pos.z - oneLinkedObject.posxyz.z) < 0.005f) { diff --git a/src/Tests/OctTreeTestGameClass.h b/src/Tests/OctTreeTestGameClass.h index 6dc9404e..4cce489f 100644 --- a/src/Tests/OctTreeTestGameClass.h +++ b/src/Tests/OctTreeTestGameClass.h @@ -55,7 +55,7 @@ private: glm::quat m_PrevOri; glm::vec3 worldSize = glm::vec3(50, 50, 50); - OctTree someOctTree; + Octree someOctTree; }; diff --git a/src/Tests/OctTreeTestGameMain.cpp b/src/Tests/OctTreeTestGameMain.cpp index 43789cea..a248ac43 100644 --- a/src/Tests/OctTreeTestGameMain.cpp +++ b/src/Tests/OctTreeTestGameMain.cpp @@ -7,7 +7,7 @@ using boost::unit_test_framework::test_case; #include "Engine/Core/AABB.h" #include "Engine/Core/Ray.h" #include //srand -#include "Engine/Core/OctTree.h" +#include "Engine/Core/Octree.h" //vs memleaks //#define _CRTDBG_MAP_ALLOC diff --git a/src/Tests/OctTreeTestHardCodedTestWorld.h b/src/Tests/OctTreeTestHardCodedTestWorld.h index 512716df..db0b3b3c 100644 --- a/src/Tests/OctTreeTestHardCodedTestWorld.h +++ b/src/Tests/OctTreeTestHardCodedTestWorld.h @@ -16,9 +16,9 @@ class HardcodedTestWorld : public World public: struct LinkOctTreeAndModel { EntityID entId; - OctTree::OctChild* child; + Octree::Child* child; glm::vec3 posxyz; - LinkOctTreeAndModel(EntityID eId, OctTree::OctChild* ch, glm::vec3 pos) + LinkOctTreeAndModel(EntityID eId, Octree::Child* ch, glm::vec3 pos) { entId = eId; child = ch; @@ -27,7 +27,7 @@ public: }; EntityID anotherBoxTransformId; std::vector linkOM; - OctTree someOctTree; + Octree someOctTree; //constructor HardcodedTestWorld() @@ -77,7 +77,7 @@ private: auto someAABB = AABB(glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(1.0f, 1.0f, 1.0f)); //draw main box first - AddBoxModel(someAABB.Center(), someAABB.HalfSize().x, someOctTree.m_Root, tempId); + AddBoxModel(someAABB.Origin(), someAABB.HalfSize().x, someOctTree.m_Root, tempId); //add anotherbox in octTree auto anotherBox = AABB(glm::vec3(0.1f, 0.1f, 0.1f), glm::vec3(0.2f, 0.2f, 0.2f)); @@ -85,19 +85,19 @@ private: someOctTree.AddDynamicObject(anotherBox); //draw anotherbox and save it in anotherBoxTransformId - AddBoxModel(anotherBox.Center(), anotherBox.HalfSize().x, someOctTree.m_Root, anotherBoxTransformId); + AddBoxModel(anotherBox.Origin(), anotherBox.HalfSize().x, someOctTree.m_Root, anotherBoxTransformId); //draw the octTree for (size_t j = 0; j < 8; j++) { - AddBoxModel(someOctTree.m_Root->m_Children[j]->m_Box.Center(), + AddBoxModel(someOctTree.m_Root->m_Children[j]->m_Box.Origin(), someOctTree.m_Root->m_Children[j]->m_Box.HalfSize().x, someOctTree.m_Root->m_Children[j], tempId); auto someChild = someOctTree.m_Root->m_Children[j]; for (size_t i = 0; i < 8; i++) { - AddBoxModel(someChild->m_Children[i]->m_Box.Center(), + AddBoxModel(someChild->m_Children[i]->m_Box.Origin(), someChild->m_Children[i]->m_Box.HalfSize().x, someChild->m_Children[i], tempId); } } @@ -115,7 +115,7 @@ private: model["Resource"] = "Models/Core/UnitBox.obj"; } - void AddBoxModel(const glm::vec3 ¢er, const float &halfSize, OctTree::OctChild* child, EntityID &outEntityId) { + void AddBoxModel(const glm::vec3 ¢er, const float &halfSize, Octree::Child* child, EntityID &outEntityId) { World& world = *this; EntityID entityDummyScene = world.CreateEntity(); diff --git a/src/Tests/OldOctTree.cpp b/src/Tests/OldOctTree.cpp index d3738ee6..0fb92e18 100644 --- a/src/Tests/OldOctTree.cpp +++ b/src/Tests/OldOctTree.cpp @@ -54,7 +54,7 @@ OctTree::OctTree(const AABB& octTreeBounds, int subDivisions) glm::vec3 minPos, maxPos; const glm::vec3& parentMin = m_Box.MinCorner(); const glm::vec3& parentMax = m_Box.MaxCorner(); - const glm::vec3& parentCenter = m_Box.Center(); + const glm::vec3& parentCenter = m_Box.Origin(); std::bitset<3> bits(i); //If child is 4,5,6,7. if (bits.test(2)) { @@ -172,7 +172,7 @@ bool OctTree::RayCollides(const Ray& ray, Output& data) const std::vector childInfos; childInfos.reserve(8); for (int i = 0; i < 8; ++i) { - childInfos.push_back({ i, glm::distance(ray.Origin(), m_Children[i]->m_Box.Center()) }); + childInfos.push_back({ i, glm::distance(ray.Origin(), m_Children[i]->m_Box.Origin()) }); } std::sort(childInfos.begin(), childInfos.end(), isFirstLower); //Loop through the children, starting with the one closest to the ray origin. I.e the first to be hit. @@ -279,7 +279,7 @@ void OctTree::ClearDynamicObjects() // z : - + - + - + - + int OctTree::childIndexContainingPoint(const glm::vec3& point) const { - const glm::vec3& c = m_Box.Center(); + const glm::vec3& c = m_Box.Origin(); return (1 << 2) * (point.x >= c.x) | (1 << 1) * (point.y >= c.y) | (point.z >= c.z); } diff --git a/src/Tests/WorldTest.cpp b/src/Tests/WorldTest.cpp index 8d92a328..03008562 100644 --- a/src/Tests/WorldTest.cpp +++ b/src/Tests/WorldTest.cpp @@ -20,7 +20,7 @@ BOOST_AUTO_TEST_CASE(WorldTestSingleAllocation, * boost::unit_test::tolerance(0. ComponentWrapper c = w.AttachComponent(e, "Test"); // Check default values - BOOST_TEST((int)c["TestInteger"] == c.Property("TestInteger")); + BOOST_TEST((int)c["TestInteger"] == c.Field("TestInteger")); BOOST_TEST((int)c["TestInteger"] == 1337); BOOST_TEST((double)c["TestDouble"] == 13.37); BOOST_TEST((std::string)c["TestString"] == "Carlito");