server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-12-28 14:45:00 +08:00
parent 97f9f3f760
commit 78a996cb8f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/mapinstance.cc
View File

@ -252,9 +252,9 @@ int MapInstance::AllocUniid()
} }
int MapInstance::FindStraightPath(int layer, int MapInstance::FindStraightPath(int layer,
const a8::Vec3& start, const glm::vec3& start,
const a8::Vec3& end, const glm::vec3& end,
std::vector<a8::Vec3>& paths) std::vector<glm::vec3>& paths)
{ {
float spos[3]; float spos[3];
spos[0] = start.x; spos[0] = start.x;
@ -321,7 +321,7 @@ int MapInstance::FindStraightPath(int layer,
&nstraightPath, &nstraightPath,
MAX_POLYS); MAX_POLYS);
for(int i = 0; i < nstraightPath * 3; ) { for(int i = 0; i < nstraightPath * 3; ) {
a8::Vec3 currpos; glm::vec3 currpos;
currpos.x = straightPath[i++]; currpos.x = straightPath[i++];
currpos.y = straightPath[i++]; currpos.y = straightPath[i++];
currpos.z = straightPath[i++]; currpos.z = straightPath[i++];

6
server/gameserver/mapinstance.h
View File

@ -26,9 +26,9 @@ class MapInstance : public std::enable_shared_from_this<MapInstance>
dtNavMesh* GetNavMesh() { return navmesh_; }; dtNavMesh* GetNavMesh() { return navmesh_; };
dtNavMeshQuery* GetNavMeshQuery() { return navmesh_query_; }; dtNavMeshQuery* GetNavMeshQuery() { return navmesh_query_; };
int FindStraightPath(int layer, int FindStraightPath(int layer,
const a8::Vec3& start, const glm::vec3& start,
const a8::Vec3& end, const glm::vec3& end,
std::vector<a8::Vec3>& paths); std::vector<glm::vec3>& paths);
int FindRandomPointAroundCircle(int layer, int FindRandomPointAroundCircle(int layer,
const glm::vec3& center_pos, const glm::vec3& center_pos,
float max_radius, float max_radius,