Skip to content

Commit 0cef931

Browse files
committed
Set blocker, not world blocker
1 parent 6462e18 commit 0cef931

1 file changed

Lines changed: 26 additions & 28 deletions

File tree

src/physics/arcade/GetOverlapY.js

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,21 @@ var GetOverlapY = function (body1, body2, overlapOnly, bias)
6969
body1.setTouchingDown();
7070
body2.setTouchingUp();
7171

72-
// Soft blocks can be moved apart
73-
// body1.setBlockedDown(body2);
74-
// body2.setBlockedUp(body1);
72+
body1.setBlockedDown(body2);
73+
body2.setBlockedUp(body1);
7574

7675
// World blocks cannot be penetrated
77-
if (worldBlocked2.down || body2Immovable)
78-
{
79-
body1.setWorldBlockedDown();
80-
body1.setBlocker(body2);
81-
}
82-
83-
if (worldBlocked1.up || body1Immovable)
84-
{
85-
body2.setWorldBlockedUp();
86-
body2.setBlocker(body1);
87-
}
76+
// if (worldBlocked2.down || body2Immovable)
77+
// {
78+
// body1.setWorldBlockedDown();
79+
// body1.setBlocker(body2);
80+
// }
81+
82+
// if (worldBlocked1.up || body1Immovable)
83+
// {
84+
// body2.setWorldBlockedUp();
85+
// body2.setBlocker(body1);
86+
// }
8887
}
8988
}
9089
else
@@ -106,22 +105,21 @@ var GetOverlapY = function (body1, body2, overlapOnly, bias)
106105
body1.setTouchingUp();
107106
body2.setTouchingDown();
108107

109-
// Soft blocks can be moved apart
110-
// body1.setBlockedUp(body2);
111-
// body2.setBlockedDown(body1);
108+
body1.setBlockedUp(body2);
109+
body2.setBlockedDown(body1);
112110

113111
// World blocks cannot be penetrated
114-
if (worldBlocked2.up || body2Immovable)
115-
{
116-
body1.setWorldBlockedUp();
117-
body1.setBlocker(body2);
118-
}
119-
120-
if (worldBlocked1.down || body1Immovable)
121-
{
122-
body2.setWorldBlockedDown();
123-
body2.setBlocker(body1);
124-
}
112+
// if (worldBlocked2.up || body2Immovable)
113+
// {
114+
// body1.setWorldBlockedUp();
115+
// body1.setBlocker(body2);
116+
// }
117+
118+
// if (worldBlocked1.down || body1Immovable)
119+
// {
120+
// body2.setWorldBlockedDown();
121+
// body2.setBlocker(body1);
122+
// }
125123
}
126124
}
127125

0 commit comments

Comments
 (0)