aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Models
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/Collision/Models')
-rw-r--r--src/common/Collision/Models/GameObjectModel.cpp22
-rw-r--r--src/common/Collision/Models/GameObjectModel.h16
-rw-r--r--src/common/Collision/Models/WorldModel.cpp60
3 files changed, 67 insertions, 31 deletions
diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp
index c4b8922da59..846b98ef837 100644
--- a/src/common/Collision/Models/GameObjectModel.cpp
+++ b/src/common/Collision/Models/GameObjectModel.cpp
@@ -31,11 +31,12 @@ using G3D::AABox;
struct GameobjectModelData
{
- GameobjectModelData(const std::string& name_, const AABox& box) :
- bound(box), name(name_) { }
+ GameobjectModelData(char const* name_, uint32 nameLength, Vector3 const& lowBound, Vector3 const& highBound, bool isWmo_) :
+ bound(lowBound, highBound), name(name_, nameLength), isWmo(isWmo_) { }
AABox bound;
std::string name;
+ bool isWmo;
};
typedef std::unordered_map<uint32, GameobjectModelData> ModelList;
@@ -52,7 +53,16 @@ void LoadGameObjectModelList(std::string const& dataPath)
return;
}
+ char magic[8];
+ if (fread(magic, 1, 8, model_list_file) != 8
+ || memcmp(magic, VMAP::VMAP_MAGIC, 8) != 0)
+ {
+ TC_LOG_ERROR("misc", "File '%s' has wrong header, expected %s.", VMAP::GAMEOBJECT_MODELS, VMAP::VMAP_MAGIC);
+ return;
+ }
+
uint32 name_length, displayId;
+ uint8 isWmo;
char buff[500];
while (true)
{
@@ -61,7 +71,8 @@ void LoadGameObjectModelList(std::string const& dataPath)
if (feof(model_list_file)) // EOF flag is only set after failed reading attempt
break;
- if (fread(&name_length, sizeof(uint32), 1, model_list_file) != 1
+ if (fread(&isWmo, sizeof(uint8), 1, model_list_file) != 1
+ || fread(&name_length, sizeof(uint32), 1, model_list_file) != 1
|| name_length >= sizeof(buff)
|| fread(&buff, sizeof(char), name_length, model_list_file) != name_length
|| fread(&v1, sizeof(Vector3), 1, model_list_file) != 1
@@ -77,10 +88,7 @@ void LoadGameObjectModelList(std::string const& dataPath)
continue;
}
- model_list.insert
- (
- ModelList::value_type(displayId, GameobjectModelData(std::string(buff, name_length), AABox(v1, v2)))
- );
+ model_list.emplace(std::piecewise_construct, std::forward_as_tuple(displayId), std::forward_as_tuple(&buff[0], name_length, v1, v2, isWmo != 0));
}
fclose(model_list_file);
diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h
index bb6c3fbc109..e6211cd0243 100644
--- a/src/common/Collision/Models/GameObjectModel.h
+++ b/src/common/Collision/Models/GameObjectModel.h
@@ -42,14 +42,14 @@ class TC_COMMON_API GameObjectModelOwnerBase
public:
virtual ~GameObjectModelOwnerBase() = default;
- virtual bool IsSpawned() const { return false; }
- virtual uint32 GetDisplayId() const { return 0; }
- virtual uint8 GetNameSetId() const { return 0; }
- virtual bool IsInPhase(PhaseShift const& /*phaseShift*/) const { return false; }
- virtual G3D::Vector3 GetPosition() const { return G3D::Vector3::zero(); }
- virtual float GetOrientation() const { return 0.0f; }
- virtual float GetScale() const { return 1.0f; }
- virtual void DebugVisualizeCorner(G3D::Vector3 const& /*corner*/) const { }
+ virtual bool IsSpawned() const = 0;
+ virtual uint32 GetDisplayId() const = 0;
+ virtual uint8 GetNameSetId() const = 0;
+ virtual bool IsInPhase(PhaseShift const& /*phaseShift*/) const = 0;
+ virtual G3D::Vector3 GetPosition() const = 0;
+ virtual float GetOrientation() const = 0;
+ virtual float GetScale() const = 0;
+ virtual void DebugVisualizeCorner(G3D::Vector3 const& /*corner*/) const = 0;
};
class TC_COMMON_API GameObjectModel /*, public Intersectable*/
diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp
index 33c4b10985a..beab8f80a1c 100644
--- a/src/common/Collision/Models/WorldModel.cpp
+++ b/src/common/Collision/Models/WorldModel.cpp
@@ -103,8 +103,16 @@ namespace VMAP
WmoLiquid::WmoLiquid(uint32 width, uint32 height, const Vector3 &corner, uint32 type):
iTilesX(width), iTilesY(height), iCorner(corner), iType(type)
{
- iHeight = new float[(width+1)*(height+1)];
- iFlags = new uint8[width*height];
+ if (width && height)
+ {
+ iHeight = new float[(width + 1) * (height + 1)];
+ iFlags = new uint8[width * height];
+ }
+ else
+ {
+ iHeight = new float[1];
+ iFlags = nullptr;
+ }
}
WmoLiquid::WmoLiquid(const WmoLiquid &other): iHeight(nullptr), iFlags(nullptr)
@@ -126,8 +134,8 @@ namespace VMAP
iTilesY = other.iTilesY;
iCorner = other.iCorner;
iType = other.iType;
- delete iHeight;
- delete iFlags;
+ delete[] iHeight;
+ delete[] iFlags;
if (other.iHeight)
{
iHeight = new float[(iTilesX+1)*(iTilesY+1)];
@@ -147,6 +155,13 @@ namespace VMAP
bool WmoLiquid::GetLiquidHeight(const Vector3 &pos, float &liqHeight) const
{
+ // simple case
+ if (!iFlags)
+ {
+ liqHeight = iHeight[0];
+ return true;
+ }
+
float tx_f = (pos.x - iCorner.x)/LIQUID_TILE_SIZE;
uint32 tx = uint32(tx_f);
if (tx_f < 0.0f || tx >= iTilesX)
@@ -198,8 +213,8 @@ namespace VMAP
{
return 2 * sizeof(uint32) +
sizeof(Vector3) +
- (iTilesX + 1)*(iTilesY + 1) * sizeof(float) +
- iTilesX * iTilesY;
+ sizeof(uint32) +
+ (iFlags ? ((iTilesX + 1) * (iTilesY + 1) * sizeof(float) + iTilesX * iTilesY) : sizeof(float));
}
bool WmoLiquid::writeToFile(FILE* wf)
@@ -210,12 +225,17 @@ namespace VMAP
fwrite(&iCorner, sizeof(Vector3), 1, wf) == 1 &&
fwrite(&iType, sizeof(uint32), 1, wf) == 1)
{
- uint32 size = (iTilesX + 1) * (iTilesY + 1);
- if (fwrite(iHeight, sizeof(float), size, wf) == size)
+ if (iTilesX && iTilesY)
{
- size = iTilesX*iTilesY;
- result = fwrite(iFlags, sizeof(uint8), size, wf) == size;
+ uint32 size = (iTilesX + 1) * (iTilesY + 1);
+ if (fwrite(iHeight, sizeof(float), size, wf) == size)
+ {
+ size = iTilesX * iTilesY;
+ result = fwrite(iFlags, sizeof(uint8), size, wf) == size;
+ }
}
+ else
+ result = fwrite(iHeight, sizeof(float), 1, wf) == 1;
}
return result;
@@ -231,13 +251,21 @@ namespace VMAP
fread(&liquid->iCorner, sizeof(Vector3), 1, rf) == 1 &&
fread(&liquid->iType, sizeof(uint32), 1, rf) == 1)
{
- uint32 size = (liquid->iTilesX + 1) * (liquid->iTilesY + 1);
- liquid->iHeight = new float[size];
- if (fread(liquid->iHeight, sizeof(float), size, rf) == size)
+ if (liquid->iTilesX && liquid->iTilesY)
+ {
+ uint32 size = (liquid->iTilesX + 1) * (liquid->iTilesY + 1);
+ liquid->iHeight = new float[size];
+ if (fread(liquid->iHeight, sizeof(float), size, rf) == size)
+ {
+ size = liquid->iTilesX * liquid->iTilesY;
+ liquid->iFlags = new uint8[size];
+ result = fread(liquid->iFlags, sizeof(uint8), size, rf) == size;
+ }
+ }
+ else
{
- size = liquid->iTilesX * liquid->iTilesY;
- liquid->iFlags = new uint8[size];
- result = fread(liquid->iFlags, sizeof(uint8), size, rf) == size;
+ liquid->iHeight = new float[1];
+ result = fread(liquid->iHeight, sizeof(float), 1, rf) == 1;
}
}