This commit is contained in:
aozhiwei 2023-01-01 17:04:56 +08:00
parent 03ab985b8b
commit 82a6b4ef01

View File

@ -269,7 +269,7 @@ void RoomObstacle::Active()
{ {
#if 0 #if 0
if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) { if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) {
SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP)); SetRotate(master.Get()->GetMoveDir().CalcAngleEx(GlmHelper::UP));
} }
CalcTempPassObjects(); CalcTempPassObjects();
#endif #endif
@ -279,7 +279,7 @@ void RoomObstacle::Active()
{ {
#if 0 #if 0
if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) { if (master.Get() && !GlmHelper::IsZero(master.Get()->GetMoveDir())) {
SetRotate(master.Get()->GetMoveDir().CalcAngleEx(a8::Vec2::UP)); SetRotate(master.Get()->GetMoveDir().CalcAngleEx(GlmHelper::UP));
} }
ActiveStrengthenWall(); ActiveStrengthenWall();
#endif #endif
@ -494,8 +494,8 @@ 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) {
a8::Vec2 born_dir = a8::Vec2::UP; glm::vec3 born_dir = Glmhelper::UP;
born_dir.Rotate(GetUniId()); GlmHelper::RotateY(born_dir, GetUniId());
// 999 // 999
#if 1 #if 1
#else #else