Restore gib colours

This commit is contained in:
2022-07-03 16:59:52 +01:00
parent ffdfaa41c0
commit 02fcb5f072
4 changed files with 13 additions and 6 deletions
+4 -4
View File
@@ -77,14 +77,14 @@ baseDebris mt = case mt of
Metal -> do Metal -> do
sh <- jaggedShape sh <- jaggedShape
return $ metalDebris return $ metalDebris
& prDraw .~ (`drawMovingShape` sh) & prDraw .~ (`drawMovingShapeCol` sh)
stoneDebris :: Prop stoneDebris :: Prop
stoneDebris = PropZ stoneDebris = PropZ
{_prPos = 0 {_prPos = 0
,_pjStartPos = 0 ,_pjStartPos = 0
,_pjVel = 0 ,_pjVel = 0
,_prDraw = \pr -> drawMovingShape pr (cubeShape 4) ,_prDraw = \pr -> drawMovingShapeCol pr (cubeShape 4)
,_pjID = 0 ,_pjID = 0
,_pjUpdate = fallSmallBounceDamage ,_pjUpdate = fallSmallBounceDamage
,_pjPosZ = 10 ,_pjPosZ = 10
@@ -103,12 +103,12 @@ dirtColor = V4 (150/256) ( 75/256) 0 ( 250/256)
metalDebris :: Prop metalDebris :: Prop
metalDebris = stoneDebris metalDebris = stoneDebris
& prDraw .~ (\pr -> drawMovingShape pr (shardShape 4)) & prDraw .~ (\pr -> drawMovingShapeCol pr (shardShape 4))
& pjUpdate .~ fallSmallBounce & pjUpdate .~ fallSmallBounce
glassDebris :: Prop glassDebris :: Prop
glassDebris = stoneDebris glassDebris = stoneDebris
& prDraw .~ (\pr -> drawMovingShape pr (shardShape 4)) & prDraw .~ (\pr -> drawMovingShapeCol pr (shardShape 4))
& pjUpdate .~ fallSmallBounce & pjUpdate .~ fallSmallBounce
& pjColor .~ withAlpha 0.5 cyan & pjColor .~ withAlpha 0.5 cyan
crystalDebris :: Prop crystalDebris :: Prop
+1 -1
View File
@@ -42,7 +42,7 @@ initialAnoTree = OnwardList
$ intersperse (AnTree corDoor) $ intersperse (AnTree corDoor)
[ IntAnno $ AnTree . startRoom [ IntAnno $ AnTree . startRoom
, AnRoom $ return airlock0 , AnRoom $ return airlock0
, AnRoom $ roomCCrits 1 , AnRoom $ roomCCrits 10
, AnRoom slowDoorRoom , AnRoom slowDoorRoom
, AnTree firstBreather , AnTree firstBreather
, AnTree $ telRoomLev 1 >>= rToOnward "telRoomLev" . pure . cleatOnward , AnTree $ telRoomLev 1 >>= rToOnward "telRoomLev" . pure . cleatOnward
+7
View File
@@ -1,5 +1,6 @@
module Dodge.Prop.Moving module Dodge.Prop.Moving
( drawMovingShape ( drawMovingShape
, drawMovingShapeCol
, fallSmallBounceDamage , fallSmallBounceDamage
, fallSmallBounce , fallSmallBounce
) where ) where
@@ -67,4 +68,10 @@ drawMovingShape pr = noPic
. translateSHz (_pjPosZ pr) . translateSHz (_pjPosZ pr)
. uncurryV translateSHf (_prPos pr) . uncurryV translateSHf (_prPos pr)
. overPosSH (Q.rotate (_pjQuat pr)) . overPosSH (Q.rotate (_pjQuat pr))
drawMovingShapeCol :: Prop -> Shape -> SPic
drawMovingShapeCol pr = noPic
. translateSHz (_pjPosZ pr)
. uncurryV translateSHf (_prPos pr)
. overPosSH (Q.rotate (_pjQuat pr))
. colorSH (_pjColor pr) . colorSH (_pjColor pr)
+1 -1
View File
@@ -81,7 +81,7 @@ extraPics cfig w = pictures (_decorations w)
<> concatMapPic clDraw (_clouds w ) <> concatMapPic clDraw (_clouds w )
<> concatMapPic ppDraw (_pressPlates w ) <> concatMapPic ppDraw (_pressPlates w )
<> viewClipBounds cfig w <> viewClipBounds cfig w
<> debugDraw cfig w -- <> debugDraw cfig w
debugDraw :: Configuration -> World -> Picture debugDraw :: Configuration -> World -> Picture
{-# INLINE debugDraw #-} {-# INLINE debugDraw #-}