swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-17 07:03:02 -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/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearance.h
+3 -3
View File
@@ -334,7 +334,7 @@ protected:
protected:
typedef stdmap<const Object*, ClearCollidableFloraEntry>::fwd ClearCollidableFloraMap;
typedef std::map<const Object*, ClearCollidableFloraEntry> ClearCollidableFloraMap;
protected:
@@ -386,7 +386,7 @@ protected:
const ProceduralTerrainAppearanceTemplate* proceduralTerrainAppearanceTemplate;
typedef stdvector<TerrainGenerator::Layer*>::fwd RunTimeRuleList;
typedef std::vector<TerrainGenerator::Layer*> RunTimeRuleList;
RunTimeRuleList* m_runTimeRuleList;
int m_chunksGeneratedThisFrame;
@@ -413,7 +413,7 @@ private:
bool m_server;
typedef stdmap<uint32, Object*>::fwd FloraMap;
typedef std::map<uint32, Object*> FloraMap;
FloraMap* const m_floraMap;
FloraMap* const m_cachedFloraMap;
engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.h
+3 -3
View File
@@ -157,13 +157,13 @@ protected:
TerrainGenerator* m_terrainGenerator;
BakedTerrain* m_bakedTerrain;
typedef stdvector<WaterTable>::fwd WaterTableList;
typedef std::vector<WaterTable> WaterTableList;
WaterTableList* m_waterTableList;
typedef stdvector<RibbonQuad>::fwd RibbonQuadList;
typedef std::vector<RibbonQuad> RibbonQuadList;
RibbonQuadList* m_ribbonQuadList;
typedef stdvector<RibbonEndCap>::fwd RibbonEndCapList;
typedef std::vector<RibbonEndCap> RibbonEndCapList;
RibbonEndCapList* m_ribbonEndCapList;
float m_floraTileWidthInMeters;
engine/shared/library/sharedTerrain/src/shared/appearance/SamplerProceduralTerrainAppearance.h
+4 -4
View File
@@ -110,10 +110,10 @@ public:
protected:
typedef stdmap<uint32, Chunk const *>::fwd ChunkMap;
typedef stdvector<Chunk const *>::fwd ChunkList;
typedef stdvector<SamplerChunk const *>::fwd SamplerChunkList;
typedef stdset<uint32>::fwd ChunkSet;
typedef std::map<uint32, Chunk const *> ChunkMap;
typedef std::vector<Chunk const *> ChunkList;
typedef std::vector<SamplerChunk const *> SamplerChunkList;
typedef std::set<uint32> ChunkSet;
protected:
engine/shared/library/sharedTerrain/src/shared/appearance/ServerProceduralTerrainAppearance.h
+4 -4
View File
@@ -103,10 +103,10 @@ public:
protected:
typedef stdmap<uint32, Chunk const *>::fwd ChunkMap;
typedef stdvector<Chunk const *>::fwd ChunkList;
typedef stdvector<ServerChunk const *>::fwd ServerChunkList;
typedef stdset<uint32>::fwd ChunkSet;
typedef std::map<uint32, Chunk const *> ChunkMap;
typedef std::vector<Chunk const *> ChunkList;
typedef std::vector<ServerChunk const *> ServerChunkList;
typedef std::set<uint32> ChunkSet;
protected:
engine/shared/library/sharedTerrain/src/shared/appearance/SpaceTerrainAppearanceTemplate.h
+3 -3
View File
@@ -128,7 +128,7 @@ private:
VectorArgb m_ambientColor;
typedef stdvector<LightData>::fwd LightDataList;
typedef std::vector<LightData> LightDataList;
LightDataList * const m_lightDataList;
PersistentCrcString m_environmentTextureName;
@@ -146,10 +146,10 @@ private:
bool m_skyBoxCubeMap;
PersistentCrcString m_skyBoxTextureNameMask;
typedef stdvector<CelestialData>::fwd CelestialDataList;
typedef std::vector<CelestialData> CelestialDataList;
CelestialDataList * const m_celestialDataList;
typedef stdvector<DistantAppearanceData>::fwd DistantAppearanceDataList;
typedef std::vector<DistantAppearanceData> DistantAppearanceDataList;
DistantAppearanceDataList * const m_distantAppearanceDataList;
float m_mapWidthInMeters;
engine/shared/library/sharedTerrain/src/shared/appearance/TerrainAppearance.h
+1 -1
View File
@@ -80,7 +80,7 @@ public:
virtual bool isDay () const;
virtual bool isTimeLocked() const;
typedef stdvector<std::pair<Vector, float> >::fwd ClearFloraEntryList;
typedef std::vector<std::pair<Vector, float> > ClearFloraEntryList;
virtual void addClearCollidableFloraObject (const Object* object, const Vector& position_o, float radius);
virtual void removeClearCollidableFloraObject (const Object* object);
virtual void addClearNonCollidableFloraObject (const Object* object, const ClearFloraEntryList& clearFloraEntryList);
engine/shared/library/sharedTerrain/src/shared/core/WaterTypeManager.h
+2 -2
View File
@@ -57,8 +57,8 @@ private:
};
typedef stdmap<int, WaterTypeDataRecord>::fwd WaterTypeDataType;
typedef stdmap<std::string, CreatureWaterTypeDataRecord>::fwd CreatureWaterTypeDataType;
typedef std::map<int, WaterTypeDataRecord> WaterTypeDataType;
typedef std::map<std::string, CreatureWaterTypeDataRecord> CreatureWaterTypeDataType;
static bool ms_installed;
static WaterTypeDataType * ms_waterTypeData;
engine/shared/library/sharedTerrain/src/shared/generator/BitmapGroup.h
+1 -1
View File
@@ -52,7 +52,7 @@ private:
//-- list of families
class Family;
typedef stdmap<int, Family*>::fwd FamilyMap;
typedef std::map<int, Family*> FamilyMap;
FamilyMap* m_familyMap;
private:
engine/shared/library/sharedTerrain/src/shared/generator/FractalGroup.h
+1 -1
View File
@@ -55,7 +55,7 @@ private:
//-- list of families
class Family;
typedef stdmap<int, Family*>::fwd FamilyMap;
typedef std::map<int, Family*> FamilyMap;
FamilyMap* m_familyMap;
private:
engine/shared/library/sharedTerrain/src/shared/generator/HeightData.h
+1 -1
View File
@@ -60,7 +60,7 @@ private:
private:
class Segment;
typedef stdvector<Segment*>::fwd SegmentList;
typedef std::vector<Segment*> SegmentList;
SegmentList* m_segmentList;
bool m_needsRecalculateExtents;
engine/shared/library/sharedTerrain/src/shared/object/TerrainObject.h
+1 -1
View File
@@ -103,7 +103,7 @@ public:
bool isDay () const;
bool isTimeLocked() const;
typedef stdvector<std::pair<Vector, float> >::fwd ClearFloraEntryList;
typedef std::vector<std::pair<Vector, float> > ClearFloraEntryList;
void addClearCollidableFloraObject (const Object* object, const Vector& position_w, float radius);
void removeClearCollidableFloraObject (const Object* object);
void addClearNonCollidableFloraObject (const Object* object, const ClearFloraEntryList& clearFloraEntryList);