xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge pull request #338 from SHADE-DP/SP3-2-Physics 

Fixed crash occurring with editing collision tag file
This commit is contained in:
XiaoQiDigipen 2023-02-03 23:54:43 +08:00 committed by GitHub
parent 0281446538 b5b3761a6c
commit 36db5021ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SHADE_Engine/src/Physics/Collision/CollisionTags/SHCollisionTagMatrix.cpp
View File

@ -245,10 +245,9 @@ namespace SHADE
} }
else else
{ {
mask = static_cast<uint16_t>(std::stoi(maskString));
for (int i = 0; i < SHCollisionTag::NUM_LAYERS; ++i) for (int i = 0; i < SHCollisionTag::NUM_LAYERS; ++i)
{ {
const bool LAYER_STATE = mask & 1U << i; const bool LAYER_STATE = maskString[i] == '1';
collisionTags[tagIndex].SetLayerState(i, LAYER_STATE); collisionTags[tagIndex].SetLayerState(i, LAYER_STATE);
} }
} }