nek0/wizard-wipeout
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add collision check with walls

Browse source
This commit is contained in:
Amedeo Molnár 2024-12-18 11:40:10 +01:00
parent f52fa7be48
commit fa3526fe2b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src-server/Server/Communication/Handler.hs
View file

@ -11,13 +11,15 @@ import Control.Monad.State
import Data.List import Data.List
import qualified Data.Matrix as M
import Data.Maybe import Data.Maybe
import Data.Time import Data.Time
import Data.UUID.V4 import Data.UUID.V4
import Linear (angle, perp) import Linear
import System.Random (randomRIO) import System.Random (randomRIO)
@ -142,6 +144,7 @@ handleMessage stateContainer readerContainer msg = do
(pure ()) (pure ())
(\player -> do (\player -> do
let wiz = playerWizard player let wiz = playerWizard player
mat = rcMap readerContainer
rotStep = pi / 18 rotStep = pi / 18
newRot = wizardRot wiz + case act of newRot = wizardRot wiz + case act of
TurnLeft -> -rotStep TurnLeft -> -rotStep
@ -155,9 +158,10 @@ handleMessage stateContainer readerContainer msg = do
StrifeLeft -> -(perp (angle (-newRot))) StrifeLeft -> -(perp (angle (-newRot)))
_ -> 0 _ -> 0
) )
doesCollide (V2 prow pcol) = (M.safeGet (floor prow) (floor pcol) mat) == Just Wall
newWiz = wiz newWiz = wiz
{ wizardRot = newRot { wizardRot = newRot
, wizardPos = newPos , wizardPos = if doesCollide newPos then wizardPos wiz else newPos
} }
newPlayer = player newPlayer = player
{ playerWizard = newWiz { playerWizard = newWiz