diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Collision/Models/ModelInstance.h | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/Collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h index bba48669d00..75d78549754 100644 --- a/src/common/Collision/Models/ModelInstance.h +++ b/src/common/Collision/Models/ModelInstance.h @@ -46,7 +46,6 @@ namespace VMAP uint8 adtId; uint32 ID; G3D::Vector3 iPos; - G3D::Vector3 iRot; float iScale; G3D::AABox iBound; #ifdef VMAP_DEBUG @@ -59,6 +58,7 @@ namespace VMAP struct TC_COMMON_API ModelSpawn : public ModelMinimalData { + G3D::Vector3 iRot; #ifndef VMAP_DEBUG std::string name; #endif diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index a5c77fefe31..17b9d75ea0c 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -679,7 +679,7 @@ namespace MMAP // transform data float scale = instance.iScale; - G3D::Matrix3 rotation = G3D::Matrix3::fromEulerAnglesXYZ(G3D::pi()*instance.iRot.z / -180.f, G3D::pi() * instance.iRot.x / -180.f, G3D::pi() * instance.iRot.y / -180.f); + G3D::Matrix3 rotation = instance.GetInvRot(); G3D::Vector3 position = instance.iPos; position.x -= 32 * GRID_SIZE; position.y -= 32 * GRID_SIZE; |