swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-01 02:15:54 -04:00
Code Issues Projects Releases Wiki Activity

persister cleanup (still broke but logic is there for when it isn't); also replace all the SOE BS for forwarding stl port with native object classes because i thought that may be part of the problem...

Browse Source
This commit is contained in:
DarthArgus
2016-12-10 23:17:06 +00:00
parent 688ab3fc9e
commit 8e94519082
450 changed files with 1287 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedMath/src/shared/CompressedQuaternion.h
+2 -2
View File
@@ -19,8 +19,8 @@ class CompressedQuaternion
{
public:
typedef stdvector<Quaternion>::fwd QuaternionVector;
typedef stdvector<CompressedQuaternion>::fwd CompressedQuaternionVector;
typedef std::vector<Quaternion> QuaternionVector;
typedef std::vector<CompressedQuaternion> CompressedQuaternionVector;
public:
engine/shared/library/sharedMath/src/shared/IndexedTriangleList.h
+8 -8
View File
@@ -24,11 +24,11 @@ public:
explicit IndexedTriangleList(Iff &iff);
~IndexedTriangleList();
const stdvector<Vector>::fwd &getVertices() const;
const stdvector<int>::fwd &getIndices() const;
const std::vector<Vector> &getVertices() const;
const std::vector<int> &getIndices() const;
stdvector<Vector>::fwd &getVertices();
stdvector<int>::fwd &getIndices();
std::vector<Vector> &getVertices();
std::vector<int> &getIndices();
void load(Iff &iff);
void write(Iff &iff) const;
@@ -48,7 +48,7 @@ public:
void copy(const IndexedTriangleList *tris);
bool collide(Vector const & start, Vector const & end, Vector & result) const;
bool collide(Vector const & start, Vector const & end, stdvector<int>::fwd const & indices, Vector & result) const;
bool collide(Vector const & start, Vector const & end, std::vector<int> const & indices, Vector & result) const;
private:
@@ -60,14 +60,14 @@ private:
void load_0000(Iff &iff);
void addVertices(const Vector *vertices, int numberOfVertices, stdvector<int>::fwd &indices);
void addVertices(const Vector *vertices, int numberOfVertices, std::vector<int> &indices);
private:
bool m_mergeVertices;
float m_epsilon;
stdvector<Vector>::fwd * const m_vertices;
stdvector<int>::fwd * const m_indices;
std::vector<Vector> * const m_vertices;
std::vector<int> * const m_indices;
};
// ======================================================================
engine/shared/library/sharedMath/src/shared/PaletteArgb.h
+2 -2
View File
@@ -58,7 +58,7 @@ public:
public:
explicit PaletteArgb(int entryCount);
explicit PaletteArgb(stdvector<PackedArgb>::fwd const & packedArgbVector);
explicit PaletteArgb(std::vector<PackedArgb> const & packedArgbVector);
const CrcString &getName() const;
@@ -77,7 +77,7 @@ public:
private:
typedef stdvector<PackedArgb>::fwd PackedArgbVector;
typedef std::vector<PackedArgb> PackedArgbVector;
private:
engine/shared/library/sharedMath/src/shared/PaletteArgbList.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
private:
typedef stdmap<const CrcString *, PaletteArgb*, LessPointerComparator>::fwd ResourceMap;
typedef std::map<const CrcString *, PaletteArgb*, LessPointerComparator> ResourceMap;
private:
engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h
+1 -1
View File
@@ -19,7 +19,7 @@
class PositionVertexIndexer
{
public:
typedef stdvector<Vector>::fwd VectorVector;
typedef std::vector<Vector> VectorVector;
PositionVertexIndexer();
~PositionVertexIndexer();
engine/shared/library/sharedMath/src/shared/SpatialSubdivision.h
+4 -4
View File
@@ -81,10 +81,10 @@ public:
virtual ~SpatialSubdivision () = 0;
virtual SpatialSubdivisionHandle * addObject (ObjectType object) = 0;
virtual const bool canSee (SpatialSubdivisionHandle * target, const Vector & start, const float distance, const float fov=0.0f) const = 0; //lint !e1735 // virtual function has default parameter
virtual void findInRange (const Vector & origin, const float distance, typename stdvector<ObjectType>::fwd & results) const = 0;
virtual void findInRange (const Vector & origin, const float distance, const SpatialSubdivisionFilter<ObjectType> &filter, typename stdvector<ObjectType>::fwd & results) const = 0;
virtual void findOnRay (const Vector & begin, const Vector & dir, typename stdvector<ObjectType>::fwd & results) const = 0;
virtual void findOnSegment (const Vector & begin, const Vector & end, typename stdvector<ObjectType>::fwd & results) const = 0;
virtual void findInRange (const Vector & origin, const float distance, typename std::vector<ObjectType> & results) const = 0;
virtual void findInRange (const Vector & origin, const float distance, const SpatialSubdivisionFilter<ObjectType> &filter, typename std::vector<ObjectType> & results) const = 0;
virtual void findOnRay (const Vector & begin, const Vector & dir, typename std::vector<ObjectType> & results) const = 0;
virtual void findOnSegment (const Vector & begin, const Vector & end, typename std::vector<ObjectType> & results) const = 0;
virtual void move (SpatialSubdivisionHandle * object) = 0;
virtual void removeObject (SpatialSubdivisionHandle * object) = 0;
engine/shared/library/sharedMath/src/shared/Vector.h
+1 -1
View File
@@ -125,7 +125,7 @@ public:
// const Vector refract(const Vector &normal, real n1, real n2);
bool inPolygon (const Vector& v0, const Vector& v1, const Vector& v2) const;
bool inPolygon (const stdvector<Vector>::fwd &convexPolygonVertices) const;
bool inPolygon (const std::vector<Vector> &convexPolygonVertices) const;
public:
engine/shared/library/sharedMath/src/shared/core/AxialBox.h
+1 -1
View File
@@ -18,7 +18,7 @@ class AxialBox
{
public:
typedef stdvector<Vector>::fwd VertexList;
typedef std::vector<Vector> VertexList;
public:
engine/shared/library/sharedMath/src/shared/debug/DebugShapeRenderer.h
+1 -1
View File
@@ -21,7 +21,7 @@ class Vector;
class Object;
class Transform;
typedef stdvector<Vector>::fwd VectorVec;
typedef std::vector<Vector> VectorVec;
class DebugShapeRenderer
{