mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-09-28 13:12:56 -04:00
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...
This commit is contained in:
DarthArgus
@@ -24,9 +24,9 @@ class VectorArgb;
|
||||
class BoxTreeNode;
|
||||
class Iff;
|
||||
|
||||
typedef stdvector<BoxTreeNode>::fwd BoxTreeNodeVec;
|
||||
typedef stdvector<AxialBox>::fwd BoxVec;
|
||||
typedef stdvector<int>::fwd IdVec;
|
||||
typedef std::vector<BoxTreeNode> BoxTreeNodeVec;
|
||||
typedef std::vector<AxialBox> BoxVec;
|
||||
typedef std::vector<int> IdVec;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@ class Range;
|
||||
class BoxTree;
|
||||
class FloorLocator;
|
||||
|
||||
typedef stdvector<Vector>::fwd VectorVector;
|
||||
typedef stdvector<int>::fwd IntVector;
|
||||
typedef std::vector<Vector> VectorVector;
|
||||
typedef std::vector<int> IntVector;
|
||||
|
||||
// ======================================================================
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ class SpatialDatabase;
|
||||
class SpatialSubdivisionHandle;
|
||||
class Transform;
|
||||
|
||||
typedef stdvector<CollisionProperty*>::fwd ColliderList;
|
||||
typedef std::vector<CollisionProperty*> ColliderList;
|
||||
|
||||
// ======================================================================
|
||||
|
||||
|
||||
@@ -65,11 +65,11 @@ struct CellPosition
|
||||
};
|
||||
|
||||
|
||||
typedef stdvector<CollisionProperty*>::fwd ColliderList;
|
||||
typedef stdvector<ObstacleInfo>::fwd ObstacleList;
|
||||
typedef stdvector<Contact>::fwd ContactList;
|
||||
typedef stdvector<FloorContactShape*>::fwd FloorContactList;
|
||||
typedef stdvector<CellPosition>::fwd CellPositionList;
|
||||
typedef std::vector<CollisionProperty*> ColliderList;
|
||||
typedef std::vector<ObstacleInfo> ObstacleList;
|
||||
typedef std::vector<Contact> ContactList;
|
||||
typedef std::vector<FloorContactShape*> FloorContactList;
|
||||
typedef std::vector<CellPosition> CellPositionList;
|
||||
|
||||
struct MoveSegment
|
||||
{
|
||||
|
||||
@@ -52,7 +52,7 @@ struct LineIntersectResult
|
||||
ContactPoint m_hitLoc;
|
||||
};
|
||||
|
||||
typedef stdvector<LineIntersectResult>::fwd LineIntersectResultVec;
|
||||
typedef std::vector<LineIntersectResult> LineIntersectResultVec;
|
||||
|
||||
// ======================================================================
|
||||
|
||||
|
||||
@@ -28,9 +28,9 @@ class CollisionProperty;
|
||||
class MultiShape;
|
||||
class BaseExtent;
|
||||
|
||||
typedef stdvector<Vector>::fwd VectorVector;
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef stdvector<BaseExtent const *>::fwd ExtentVec;
|
||||
typedef std::vector<Vector> VectorVector;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
typedef std::vector<BaseExtent const *> ExtentVec;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -28,9 +28,9 @@ class SpatialDatabase;
|
||||
class Sphere;
|
||||
class MultiShape;
|
||||
|
||||
typedef stdvector<Object*>::fwd ObjectVec;
|
||||
typedef stdvector<CollisionProperty*>::fwd ColliderList;
|
||||
typedef stdvector<Footprint*>::fwd FootprintList;
|
||||
typedef std::vector<Object*> ObjectVec;
|
||||
typedef std::vector<CollisionProperty*> ColliderList;
|
||||
typedef std::vector<Footprint*> FootprintList;
|
||||
|
||||
// ======================================================================
|
||||
|
||||
@@ -120,7 +120,7 @@ public:
|
||||
|
||||
// ----------
|
||||
|
||||
static bool findLocators ( CellProperty const * cell, Vector const & point, stdvector<FloorLocator>::fwd & outLocs );
|
||||
static bool findLocators ( CellProperty const * cell, Vector const & point, std::vector<FloorLocator> & outLocs );
|
||||
|
||||
static bool makeLocator ( CellProperty const * cell, Vector const & point, FloorLocator & outLoc);
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ class MultiShape;
|
||||
|
||||
#include "sharedCollision/CollisionEnums.h"
|
||||
|
||||
typedef stdvector<Vector>::fwd VectorVector;
|
||||
typedef std::vector<Vector> VectorVector;
|
||||
|
||||
// ----------
|
||||
// These methods should always be of the form
|
||||
|
||||
@@ -26,7 +26,7 @@ class Range;
|
||||
class Sphere;
|
||||
class MultiShape;
|
||||
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
|
||||
#include "sharedCollision/CollisionEnums.h"
|
||||
#include "sharedMath/Vector.h"
|
||||
|
||||
@@ -21,7 +21,7 @@ class DoorObject;
|
||||
class NeighborObject;
|
||||
class CollisionProperty;
|
||||
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ class Appearance;
|
||||
template<class T>
|
||||
class DataResourceList;
|
||||
typedef DataResourceList<FloorMesh> FloorMeshList;
|
||||
typedef stdvector<FloorTri>::fwd FloorTriVec;
|
||||
typedef std::vector<FloorTri> FloorTriVec;
|
||||
typedef std::pair<int,int> IntPair;
|
||||
|
||||
class FloorEdgeId
|
||||
@@ -47,9 +47,9 @@ public:
|
||||
int edgeId;
|
||||
};
|
||||
|
||||
typedef stdvector<FloorEdgeId>::fwd FloorEdgeIdVec;
|
||||
typedef std::vector<FloorEdgeId> FloorEdgeIdVec;
|
||||
|
||||
typedef stdvector<FloorLocator>::fwd FloorLocatorVec;
|
||||
typedef std::vector<FloorLocator> FloorLocatorVec;
|
||||
|
||||
// ======================================================================
|
||||
|
||||
@@ -281,7 +281,7 @@ protected:
|
||||
|
||||
typedef std::pair<int,int> EdgeId;
|
||||
|
||||
typedef stdvector<EdgeId>::fwd EdgeIdVec;
|
||||
typedef std::vector<EdgeId> EdgeIdVec;
|
||||
|
||||
void findAdjacentBoundaryEdges ( VectorVector const & polyVerts, EdgeIdVec & outIds ) const;
|
||||
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
|
||||
namespace FootprintForceReattachManagerNamespace
|
||||
{
|
||||
typedef stdvector<std::string>::fwd StringVector;
|
||||
typedef std::vector<std::string> StringVector;
|
||||
|
||||
StringVector ms_sceneIds;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ class Range;
|
||||
class Cylinder;
|
||||
class MultiShape;
|
||||
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
|
||||
// ======================================================================
|
||||
|
||||
|
||||
@@ -29,10 +29,10 @@ class Sphere;
|
||||
class Vector;
|
||||
class VectorArgb;
|
||||
|
||||
typedef stdvector<Floor*>::fwd FloorVec;
|
||||
typedef stdvector<Object*>::fwd ObjectVec;
|
||||
typedef stdvector<Object const *>::fwd ObjectConstVec;
|
||||
typedef stdvector<CollisionProperty*>::fwd ColliderList;
|
||||
typedef std::vector<Floor*> FloorVec;
|
||||
typedef std::vector<Object*> ObjectVec;
|
||||
typedef std::vector<Object const *> ObjectConstVec;
|
||||
typedef std::vector<CollisionProperty*> ColliderList;
|
||||
|
||||
|
||||
template<typename T, typename U>
|
||||
|
||||
@@ -57,7 +57,7 @@ protected:
|
||||
|
||||
// ----------
|
||||
|
||||
typedef stdvector< BaseExtent * >::fwd ExtentVec;
|
||||
typedef std::vector< BaseExtent * > ExtentVec;
|
||||
|
||||
ExtentVec * m_extents;
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
const Tag TAG_CMSH = TAG(C,M,S,H);
|
||||
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user