Remove separate wall color, should be handled by material type

This commit is contained in:
2025-10-23 21:27:14 +01:00
parent 819f0d37ea
commit 3c6d269d00
24 changed files with 136 additions and 123 deletions
+4 -1
View File
@@ -1,8 +1,10 @@
module Dodge.Wall.Draw (drawWall) where
import Dodge.Material.Color
import Dodge.Data.Wall
import Picture.Base
import ShapePicture
import Control.Lens
drawWall :: WallDraw -> Wall -> SPic
drawWall wd = case wd of
@@ -11,7 +13,8 @@ drawWall wd = case wd of
drawForceField :: Wall -> SPic
drawForceField wl = noShape . setLayer BloomLayer
. setDepth 20
. color (_wlColor wl)
. color (materialColor (wl ^. wlMaterial))
-- . color (_wlColor wl)
$ thickLine 5 [a, b]
where
(a, b) = _wlLine wl
+2 -5
View File
@@ -1,17 +1,14 @@
module Dodge.Wall.ForceField where
import Color
import Dodge.Data.Wall
import Dodge.Default.Wall
forceField :: Wall
forceField =
defaultWall
{ _wlColor = orange
, _wlOpacity = DrawnWall DrawForceField
, _wlWalkable = True
, _wlFireThrough = False
{ _wlOpacity = DrawnWall DrawForceField
, _wlUnshadowed = True
, _wlRotateTo = False
, _wlStructure = StandaloneWall
, _wlMaterial = ForceField
}