equal
deleted
inserted
replaced
214 Gear^.State:= Gear^.State or gstCollision |
214 Gear^.State:= Gear^.State or gstCollision |
215 end |
215 end |
216 else if (Gear^.AdvBounce=1) and TestCollisionXwithGear(Gear, -hwSign(Gear^.dX)) then collH:= -hwSign(Gear^.dX); |
216 else if (Gear^.AdvBounce=1) and TestCollisionXwithGear(Gear, -hwSign(Gear^.dX)) then collH:= -hwSign(Gear^.dX); |
217 |
217 |
218 //if Gear^.AdvBounce and (collV <>0) and (collH <> 0) and (hwSqr(tdX) + hwSqr(tdY) > _0_08) then |
218 //if Gear^.AdvBounce and (collV <>0) and (collH <> 0) and (hwSqr(tdX) + hwSqr(tdY) > _0_08) then |
219 if (Gear^.AdvBounce=1) and (collV <>0) and (collH <> 0) and ((tdX.QWordValue + tdY.QWordValue) > _0_2.QWordValue) then |
219 if (Gear^.AdvBounce=1) and (collV <>0) and (collH <> 0) and ((collV=-1) or ((tdX.QWordValue + tdY.QWordValue) > _0_2.QWordValue)) then |
220 begin |
220 begin |
221 Gear^.dX:= tdY*Gear^.Elasticity*Gear^.Friction; |
221 Gear^.dX:= tdY*Gear^.Elasticity*Gear^.Friction; |
222 Gear^.dY:= tdX*Gear^.Elasticity;//*Gear^.Friction; |
222 Gear^.dY:= tdX*Gear^.Elasticity;//*Gear^.Friction; |
223 Gear^.dY.isNegative:= not tdY.isNegative; |
223 Gear^.dY.isNegative:= not tdY.isNegative; |
224 isFalling:= false; |
224 isFalling:= false; |