Fix normal map transformations for floor

src/Dodge/Layout.hs

@@ -30,7 +30,6 @@ import Dodge.Zoning.Pathing
 import Geometry
 import qualified IntMapHelp as IM
 import RandomHelp
-import Tile
 
 generateLevelFromRoomList :: IM.IntMap Room -> World -> GenWorld
 generateLevelFromRoomList gr' w =
@@ -42,7 +41,7 @@ generateLevelFromRoomList gr' w =
         . doInPlacements
         . doOutPlacements
         . doIndividualPlacements
-        . setFloors
+        . setTiles
         . worldToGenWorld rs'
         $ w & cWorld . lWorld . walls .~ wallsFromRooms rs
             & cWorld . cwGen . cwgGameRooms .~ gameRoomsFromRooms (IM.elems rs')
@@ -60,12 +59,6 @@ generateLevelFromRoomList gr' w =
 randomCompass :: World -> World
 randomCompass w = w & cWorld . camPos . camRot .~ (takeOne [0, 0.5 * pi, pi, 1.5 * pi] & evalState $ _randGen w)
 
-putFloorTiles :: GenWorld -> GenWorld
-putFloorTiles gw = gw & gwWorld . cWorld . floorTiles .~ floorsFromGenWorld gw
-
-setFloors :: GenWorld -> GenWorld
-setFloors = putFloorTiles . setTiles
-
 -- note the order of traversal of the rooms is important
 -- hence the reverse
 -- this is not ideal: should do this in some more sensible way
@@ -209,15 +202,9 @@ gameRoomFromRoom rm =
         _ -> getDir xs
     getDir _ = 0 -- fallback
 
-floorsFromRooms :: [Room] -> [(Point3, Point3)]
-floorsFromRooms = concatMap (concatMap tileToRenderList . getTiles . _rmFloor . doRoomShift)
-
 tilesFromRooms :: [Room] -> [Tile]
 tilesFromRooms = concatMap (getTiles . _rmFloor . doRoomShift)
 
-floorsFromGenWorld :: GenWorld -> [(Point3, Point3)]
-floorsFromGenWorld = floorsFromRooms . IM.elems . _genRooms
-
 getTiles :: Floor -> [Tile]
 getTiles fl = case fl of
     Tiled xs -> xs