This commit is contained in:
aozhiwei 2022-12-27 16:54:26 +08:00
parent f4abe82282
commit 79f0f163b1
2 changed files with 12 additions and 12 deletions

View File

@ -10,18 +10,18 @@ namespace mt
void SafeAreaPos::Init1() void SafeAreaPos::Init1()
{ {
std::vector<a8::Vec2> tmp_list; std::vector<glm::vec3> tmp_list;
{ {
tmp_list.push_back(a8::Vec2(x1(), y1())); tmp_list.push_back(glm::vec3(x1(), 0.0f, y1()));
tmp_list.push_back(a8::Vec2(x2(), y2())); tmp_list.push_back(glm::vec3(x2(), 0.0f, y2()));
tmp_list.push_back(a8::Vec2(x3(), y3())); tmp_list.push_back(glm::vec3(x3(), 0.0f, y3()));
tmp_list.push_back(a8::Vec2(x4(), y4())); tmp_list.push_back(glm::vec3(x4(), 0.0f, y4()));
tmp_list.push_back(a8::Vec2(x5(), y5())); tmp_list.push_back(glm::vec3(x5(), 0.0f, y5()));
tmp_list.push_back(a8::Vec2(x6(), y6())); tmp_list.push_back(glm::vec3(x6(), 0.0f, y6()));
tmp_list.push_back(a8::Vec2(x7(), y7())); tmp_list.push_back(glm::vec3(x7(), 0.0f, y7()));
tmp_list.push_back(a8::Vec2(x8(), y8())); tmp_list.push_back(glm::vec3(x8(), 0.0f, y8()));
tmp_list.push_back(a8::Vec2(x9(), y9())); tmp_list.push_back(glm::vec3(x9(), 0.0f, y9()));
tmp_list.push_back(a8::Vec2(x10(), y10())); tmp_list.push_back(glm::vec3(x10(), 0.0f, y10()));
} }
for (auto& pos : tmp_list) { for (auto& pos : tmp_list) {
if (pos.x < 1.0f || pos.y < 1.0f) { if (pos.x < 1.0f || pos.y < 1.0f) {

View File

@ -14,7 +14,7 @@ namespace mt
void Init1(); void Init1();
void Init2(); void Init2();
std::vector<a8::Vec2> _poses; std::vector<glm::vec3> _poses;
static const SafeAreaPos* RandSafeAreaPos(int area_id); static const SafeAreaPos* RandSafeAreaPos(int area_id);
static std::vector<mt::SafeAreaPos*>* GetSafeAreaPosList(int area_id); static std::vector<mt::SafeAreaPos*>* GetSafeAreaPosList(int area_id);