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 2023-01-02 09:20:43 +08:00
parent d77f09f2f0
commit 732e1fbe23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/collision.cc
View File

@ -36,6 +36,11 @@ bool Collision::CheckCB(Creature* c, Obstacle* b)
return false; return false;
} }
bool Collision::CheckCB(Creature* c, float c_radius, Obstacle* b, float b_radius)
{
return false;
}
static float TwoDistance(float x1, float y1, float x2, float y2) static float TwoDistance(float x1, float y1, float x2, float y2)
{ {
return pow(pow((x1 - x2), 2.0f) + pow((y1 - y2), 2.0f), 0.5); return pow(pow((x1 - x2), 2.0f) + pow((y1 - y2), 2.0f), 0.5);

1
server/gameserver/collision.h
View File

@ -12,6 +12,7 @@ class Collision
static bool CheckCC(Creature* a, Creature* b); static bool CheckCC(Creature* a, Creature* b);
static bool CheckCC(Creature* a, float radius, Creature* b, float radis); static bool CheckCC(Creature* a, float radius, Creature* b, float radis);
static bool CheckCB(Creature* c, Obstacle* b); static bool CheckCB(Creature* c, Obstacle* b);
static bool CheckCB(Creature* c, float c_radius, Obstacle* b, float b_radius);
/* /*
--圆与旋转矩形碰撞 --圆与旋转矩形碰撞

2
server/gameserver/roomobstacle.cc
View File

@ -494,7 +494,7 @@ void RoomObstacle::SummonAirDropBox(int box_id)
Position born_pos = GetPos(); Position born_pos = GetPos();
const mt::MapThing* thing_meta = mt::MapThing::GetById(box_id); const mt::MapThing* thing_meta = mt::MapThing::GetById(box_id);
if (thing_meta && thing_meta->summon_born_rad() > 0) { if (thing_meta && thing_meta->summon_born_rad() > 0) {
glm::vec3 born_dir = Glmhelper::UP; glm::vec3 born_dir = GlmHelper::UP;
GlmHelper::RotateY(born_dir, GetUniId()); GlmHelper::RotateY(born_dir, GetUniId());
// 999 // 999
#if 1 #if 1