From dda5d1a4a74fa5ab6a0acf09e0f99f0c2da3bc8e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 14 Oct 2023 11:42:08 +0800 Subject: [PATCH] 1 --- server/gameserver/collision.cc | 9 +++++++++ server/gameserver/collision.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/server/gameserver/collision.cc b/server/gameserver/collision.cc index 6eab81e2..7e9c49bb 100644 --- a/server/gameserver/collision.cc +++ b/server/gameserver/collision.cc @@ -143,3 +143,12 @@ bool Collision::Check2dRotationRectangle(float rx, float ry, float r, float dx, #endif return (tmp_dx1 - new_rx) * (tmp_dx1 - new_rx) + (tmp_dy1 - new_ry) * (tmp_dy1 - new_ry) <= r * r; } + +bool Collision::IsNearInRange(const glm::vec3& center, const glm::vec3& pos, float range) +{ + +} + +bool Collision::IsNearOutRange(const glm::vec3& center, const glm::vec3& pos, float range) { + +} diff --git a/server/gameserver/collision.h b/server/gameserver/collision.h index 9379f409..4b27050b 100644 --- a/server/gameserver/collision.h +++ b/server/gameserver/collision.h @@ -24,4 +24,7 @@ class Collision */ static bool Check2dRotationRectangle(float rx, float ry, float r, float dx, float dy, float dw, float dh, float dro); + static bool IsNearInRange(const glm::vec3& center, const glm::vec3& pos, float range); + static bool IsNearOutRange(const glm::vec3& center, const glm::vec3& pos, float range); + };