runtime/blitz3d: Fixup C++ification
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
|
||||
#ifndef MESHCOLLIDER_H
|
||||
#define MESHCOLLIDER_H
|
||||
|
||||
#pragma once
|
||||
#include <vector>
|
||||
#include "collision.hpp"
|
||||
|
||||
class MeshCollider {
|
||||
@@ -13,7 +11,7 @@ class MeshCollider {
|
||||
void* surface;
|
||||
int verts[3], index;
|
||||
};
|
||||
MeshCollider(const vector<Vertex>& verts, const vector<Triangle>& tris);
|
||||
MeshCollider(const std::vector<Vertex>& verts, const std::vector<Triangle>& tris);
|
||||
~MeshCollider();
|
||||
|
||||
//sphere collision
|
||||
@@ -22,13 +20,13 @@ class MeshCollider {
|
||||
bool intersects(const MeshCollider& c, const Transform& t) const;
|
||||
|
||||
private:
|
||||
vector<Vertex> vertices;
|
||||
vector<Triangle> triangles;
|
||||
std::vector<Vertex> vertices;
|
||||
std::vector<Triangle> triangles;
|
||||
|
||||
struct Node {
|
||||
Box box;
|
||||
Node * left, *right;
|
||||
vector<int> triangles;
|
||||
std::vector<int> triangles;
|
||||
Node() : left(0), right(0) {}
|
||||
~Node()
|
||||
{
|
||||
@@ -38,13 +36,11 @@ class MeshCollider {
|
||||
};
|
||||
|
||||
Node* tree;
|
||||
vector<Node*> leaves;
|
||||
std::vector<Node*> leaves;
|
||||
|
||||
Box nodeBox(const vector<int>& tris);
|
||||
Node* createLeaf(const vector<int>& tris);
|
||||
Node* createNode(const vector<int>& tris);
|
||||
Box nodeBox(const std::vector<int>& tris);
|
||||
Node* createLeaf(const std::vector<int>& tris);
|
||||
Node* createNode(const std::vector<int>& tris);
|
||||
bool collide(const Box& box, const Line& line, float radius, const Transform& tform, Collision* curr_coll,
|
||||
Node* node);
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user