mirror of
https://github.com/bailwillharr/engine.git
synced 2024-09-21 04:51:18 +00:00
Fix clang compilation
This commit is contained in:
parent
1206d4626c
commit
c6e0ce9eb7
@ -52,7 +52,7 @@ namespace engine {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
System(Scene* scene, std::set<size_t> requiredComponentHashes);
|
System(Scene* scene, std::set<size_t> requiredComponentHashes);
|
||||||
~System() {}
|
virtual ~System() {}
|
||||||
System(const System&) = delete;
|
System(const System&) = delete;
|
||||||
System& operator=(const System&) = delete;
|
System& operator=(const System&) = delete;
|
||||||
|
|
||||||
|
@ -23,6 +23,7 @@ namespace engine {
|
|||||||
// Event queue interface to allow for different type queues to be in the map
|
// Event queue interface to allow for different type queues to be in the map
|
||||||
class IEventQueue {
|
class IEventQueue {
|
||||||
public:
|
public:
|
||||||
|
virtual ~IEventQueue() {}
|
||||||
virtual void dispatchEvents() = 0;
|
virtual void dispatchEvents() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -61,6 +62,11 @@ namespace engine {
|
|||||||
std::unordered_map<uint32_t, EventHandler<T>*> m_subscribers;
|
std::unordered_map<uint32_t, EventHandler<T>*> m_subscribers;
|
||||||
|
|
||||||
struct QueuedEvent {
|
struct QueuedEvent {
|
||||||
|
|
||||||
|
QueuedEvent(EventHandler<T>* handler, T event) :
|
||||||
|
handler(handler),
|
||||||
|
event(event) {}
|
||||||
|
|
||||||
EventHandler<T>* handler;
|
EventHandler<T>* handler;
|
||||||
T event;
|
T event;
|
||||||
};
|
};
|
||||||
|
@ -46,6 +46,10 @@ namespace engine::gfx {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct VertexAttribDescription {
|
struct VertexAttribDescription {
|
||||||
|
VertexAttribDescription(uint32_t location, VertexAttribFormat format, uint32_t offset) :
|
||||||
|
location(location),
|
||||||
|
format(format),
|
||||||
|
offset(offset) {}
|
||||||
uint32_t location;
|
uint32_t location;
|
||||||
VertexAttribFormat format;
|
VertexAttribFormat format;
|
||||||
uint32_t offset;
|
uint32_t offset;
|
||||||
|
@ -33,6 +33,15 @@ namespace engine {
|
|||||||
std::vector<std::tuple<uint32_t, AABB, bool>> m_dynamicAABBs{};
|
std::vector<std::tuple<uint32_t, AABB, bool>> m_dynamicAABBs{};
|
||||||
|
|
||||||
struct PossibleCollision {
|
struct PossibleCollision {
|
||||||
|
|
||||||
|
PossibleCollision(uint32_t staticEntity, AABB staticAABB, bool staticTrigger, uint32_t dynamicEntity, AABB dynamicAABB, bool dynamicTrigger) :
|
||||||
|
staticEntity(staticEntity),
|
||||||
|
staticAABB(staticAABB),
|
||||||
|
staticTrigger(staticTrigger),
|
||||||
|
dynamicEntity(dynamicEntity),
|
||||||
|
dynamicAABB(dynamicAABB),
|
||||||
|
dynamicTrigger(dynamicTrigger) {}
|
||||||
|
|
||||||
uint32_t staticEntity;
|
uint32_t staticEntity;
|
||||||
AABB staticAABB;
|
AABB staticAABB;
|
||||||
bool staticTrigger;
|
bool staticTrigger;
|
||||||
|
@ -11,7 +11,7 @@ namespace engine::resources {
|
|||||||
Shader::Shader(GFXDevice* gfx, const char* vertPath, const char* fragPath, const VertexParams& vertexParams, bool alphaBlending, bool cullBackFace)
|
Shader::Shader(GFXDevice* gfx, const char* vertPath, const char* fragPath, const VertexParams& vertexParams, bool alphaBlending, bool cullBackFace)
|
||||||
: m_gfx(gfx)
|
: m_gfx(gfx)
|
||||||
{
|
{
|
||||||
int index = 0;
|
uint32_t index = 0;
|
||||||
uint32_t stride = 0;
|
uint32_t stride = 0;
|
||||||
gfx::VertexFormat vertFormat{};
|
gfx::VertexFormat vertFormat{};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user