Start of a movement system with collisions against AABBs
This commit is contained in:
@@ -1,3 +1,6 @@
|
||||
#ifndef CollidableOctreeSystem_h__
|
||||
#define CollidableOctreeSystem_h__
|
||||
|
||||
#include "../Core/System.h"
|
||||
#include "../Core/Octree.h"
|
||||
#include "Collision.h"
|
||||
@@ -16,4 +19,6 @@ public:
|
||||
|
||||
private:
|
||||
Octree* m_Octree;
|
||||
};
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -45,6 +45,12 @@ bool RayVsModel(const Ray& ray,
|
||||
float& outUCoord,
|
||||
float& outVCoord);
|
||||
|
||||
bool AABBvsTriangles(const AABB& box,
|
||||
const std::vector<RawModel::Vertex>& modelVertices,
|
||||
const std::vector<unsigned int>& 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.
|
||||
|
||||
Reference in New Issue
Block a user