aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision/Models
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2011-09-15 14:08:17 +0200
committerSpp <spp@jorge.gr>2011-09-15 14:12:57 +0200
commitaf05915b9e36497eda8f2f061c29ffee0c8042b6 (patch)
treefa9e603e2a8d90b9842148ee9fa767f475566b67 /src/server/collision/Models
parent9006e4e8dc1c2cbf30303dd2d5e34f3d9a2380a9 (diff)
[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)
Diffstat (limited to 'src/server/collision/Models')
-rw-r--r--src/server/collision/Models/ModelInstance.cpp6
-rwxr-xr-xsrc/server/collision/Models/ModelInstance.h8
-rw-r--r--src/server/collision/Models/WorldModel.cpp14
-rwxr-xr-xsrc/server/collision/Models/WorldModel.h12
4 files changed, 20 insertions, 20 deletions
diff --git a/src/server/collision/Models/ModelInstance.cpp b/src/server/collision/Models/ModelInstance.cpp
index 957b15e9282..a86f6cac45a 100644
--- a/src/server/collision/Models/ModelInstance.cpp
+++ b/src/server/collision/Models/ModelInstance.cpp
@@ -26,7 +26,7 @@ using G3D::Ray;
namespace VMAP
{
- ModelInstance::ModelInstance(const ModelSpawn &spawn, WorldModel *model): ModelSpawn(spawn), iModel(model)
+ ModelInstance::ModelInstance(const ModelSpawn &spawn, WorldModel* model): ModelSpawn(spawn), iModel(model)
{
iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pi()*iRot.y/180.f, G3D::pi()*iRot.x/180.f, G3D::pi()*iRot.z/180.f).inverse();
iInvScale = 1.f/iScale;
@@ -151,7 +151,7 @@ namespace VMAP
return false;
}
- bool ModelSpawn::readFromFile(FILE *rf, ModelSpawn &spawn)
+ bool ModelSpawn::readFromFile(FILE* rf, ModelSpawn &spawn)
{
uint32 check = 0, nameLen;
check += fread(&spawn.flags, sizeof(uint32), 1, rf);
@@ -197,7 +197,7 @@ namespace VMAP
return true;
}
- bool ModelSpawn::writeToFile(FILE *wf, const ModelSpawn &spawn)
+ bool ModelSpawn::writeToFile(FILE* wf, const ModelSpawn &spawn)
{
uint32 check=0;
check += fwrite(&spawn.flags, sizeof(uint32), 1, wf);
diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h
index 289fd5ff3fe..c29f6756654 100755
--- a/src/server/collision/Models/ModelInstance.h
+++ b/src/server/collision/Models/ModelInstance.h
@@ -56,15 +56,15 @@ namespace VMAP
// temp?
const G3D::AABox& getBounds() const { return iBound; }
- static bool readFromFile(FILE *rf, ModelSpawn &spawn);
- static bool writeToFile(FILE *rw, const ModelSpawn &spawn);
+ static bool readFromFile(FILE* rf, ModelSpawn &spawn);
+ static bool writeToFile(FILE* rw, const ModelSpawn &spawn);
};
class ModelInstance: public ModelSpawn
{
public:
ModelInstance(): iModel(0) {}
- ModelInstance(const ModelSpawn &spawn, WorldModel *model);
+ ModelInstance(const ModelSpawn &spawn, WorldModel* model);
void setUnloaded() { iModel = 0; }
bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const;
void intersectPoint(const G3D::Vector3& p, AreaInfo &info) const;
@@ -73,7 +73,7 @@ namespace VMAP
protected:
G3D::Matrix3 iInvRot;
float iInvScale;
- WorldModel *iModel;
+ WorldModel* iModel;
};
} // namespace VMAP
diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp
index 501be416a26..3dad4a10174 100644
--- a/src/server/collision/Models/WorldModel.cpp
+++ b/src/server/collision/Models/WorldModel.cpp
@@ -202,7 +202,7 @@ namespace VMAP
iTilesX * iTilesY;
}
- bool WmoLiquid::writeToFile(FILE *wf)
+ bool WmoLiquid::writeToFile(FILE* wf)
{
bool result = true;
if (result && fwrite(&iTilesX, sizeof(uint32), 1, wf) != 1) result = false;
@@ -216,10 +216,10 @@ namespace VMAP
return result;
}
- bool WmoLiquid::readFromFile(FILE *rf, WmoLiquid *&out)
+ bool WmoLiquid::readFromFile(FILE* rf, WmoLiquid* &out)
{
bool result = true;
- WmoLiquid *liquid = new WmoLiquid();
+ WmoLiquid* liquid = new WmoLiquid();
if (result && fread(&liquid->iTilesX, sizeof(uint32), 1, rf) != 1) result = false;
if (result && fread(&liquid->iTilesY, sizeof(uint32), 1, rf) != 1) result = false;
if (result && fread(&liquid->iCorner, sizeof(Vector3), 1, rf) != 1) result = false;
@@ -254,7 +254,7 @@ namespace VMAP
meshTree.build(triangles, bFunc);
}
- bool GroupModel::writeToFile(FILE *wf)
+ bool GroupModel::writeToFile(FILE* wf)
{
bool result = true;
uint32 chunkSize, count;
@@ -300,7 +300,7 @@ namespace VMAP
return result;
}
- bool GroupModel::readFromFile(FILE *rf)
+ bool GroupModel::readFromFile(FILE* rf)
{
char chunk[8];
bool result = true;
@@ -501,7 +501,7 @@ namespace VMAP
bool WorldModel::writeFile(const std::string &filename)
{
- FILE *wf = fopen(filename.c_str(), "wb");
+ FILE* wf = fopen(filename.c_str(), "wb");
if (!wf)
return false;
@@ -535,7 +535,7 @@ namespace VMAP
bool WorldModel::readFile(const std::string &filename)
{
- FILE *rf = fopen(filename.c_str(), "rb");
+ FILE* rf = fopen(filename.c_str(), "rb");
if (!rf)
return false;
diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h
index e3b11ccef29..7acd3c80376 100755
--- a/src/server/collision/Models/WorldModel.h
+++ b/src/server/collision/Models/WorldModel.h
@@ -56,8 +56,8 @@ namespace VMAP
float *GetHeightStorage() { return iHeight; }
uint8 *GetFlagsStorage() { return iFlags; }
uint32 GetFileSize();
- bool writeToFile(FILE *wf);
- static bool readFromFile(FILE *rf, WmoLiquid *&liquid);
+ bool writeToFile(FILE* wf);
+ static bool readFromFile(FILE* rf, WmoLiquid* &liquid);
private:
WmoLiquid(): iHeight(0), iFlags(0) {};
uint32 iTilesX; //!< number of tiles in x direction, each
@@ -80,13 +80,13 @@ namespace VMAP
//! pass mesh data to object and create BIH. Passed vectors get get swapped with old geometry!
void setMeshData(std::vector<Vector3> &vert, std::vector<MeshTriangle> &tri);
- void setLiquidData(WmoLiquid *liquid) { iLiquid = liquid; }
+ void setLiquidData(WmoLiquid* liquid) { iLiquid = liquid; }
bool IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const;
bool IsInsideObject(const Vector3 &pos, const Vector3 &down, float &z_dist) const;
bool GetLiquidLevel(const Vector3 &pos, float &liqHeight) const;
uint32 GetLiquidType() const;
- bool writeToFile(FILE *wf);
- bool readFromFile(FILE *rf);
+ bool writeToFile(FILE* wf);
+ bool readFromFile(FILE* rf);
const G3D::AABox& GetBound() const { return iBound; }
uint32 GetMogpFlags() const { return iMogpFlags; }
uint32 GetWmoID() const { return iGroupWMOID; }
@@ -97,7 +97,7 @@ namespace VMAP
std::vector<Vector3> vertices;
std::vector<MeshTriangle> triangles;
BIH meshTree;
- WmoLiquid *iLiquid;
+ WmoLiquid* iLiquid;
};
/*! Holds a model (converted M2 or WMO) in its original coordinate space */
class WorldModel