pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 04:16:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switched out our kinda juryrigged vector types for glm::vec types since we use that as a 3d math library already but never switched out the types

Browse Source
This commit is contained in:
KimLS
2015-01-23 00:01:10 -08:00
parent 03286f540a
commit 269d56e1d0
68 changed files with 1524 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/water_map_v2.cpp
+6 -6
View File
@@ -6,30 +6,30 @@ WaterMapV2::WaterMapV2() {
WaterMapV2::~WaterMapV2() {
}
WaterRegionType WaterMapV2::ReturnRegionType(const xyz_location& location) const {
WaterRegionType WaterMapV2::ReturnRegionType(const glm::vec3& location) const {
size_t sz = regions.size();
for(size_t i = 0; i < sz; ++i) {
auto const &region = regions[i];
if (region.second.ContainsPoint(glm::vec3(location.m_X, location.m_Y, location.m_Z))) {
if (region.second.ContainsPoint(glm::vec3(location.x, location.y, location.z))) {
return region.first;
}
}
return RegionTypeNormal;
}
bool WaterMapV2::InWater(const xyz_location& location) const {
bool WaterMapV2::InWater(const glm::vec3& location) const {
return ReturnRegionType(location) == RegionTypeWater;
}
bool WaterMapV2::InVWater(const xyz_location& location) const {
bool WaterMapV2::InVWater(const glm::vec3& location) const {
return ReturnRegionType(location) == RegionTypeVWater;
}
bool WaterMapV2::InLava(const xyz_location& location) const {
bool WaterMapV2::InLava(const glm::vec3& location) const {
return ReturnRegionType(location) == RegionTypeLava;
}
bool WaterMapV2::InLiquid(const xyz_location& location) const {
bool WaterMapV2::InLiquid(const glm::vec3& location) const {
return InWater(location) || InLava(location);
}