Commit before messing around with shaders

This commit is contained in:
2022-06-16 14:02:21 +01:00
parent 2bc30d0a6b
commit 55341f7caf
7 changed files with 17 additions and 15 deletions
+2 -1
View File
@@ -39,7 +39,8 @@ import Data.List (intersperse)
initialAnoTree :: Annotation
initialAnoTree = OnwardList
$ intersperse (AnTree corDoor)
[ IntAnno $ AnTree . startRoom
-- [ IntAnno $ AnTree . startRoom
[ AnRoom $ tanksRoom [] []
, AnRoom roomPillarsPassage
, AnRoom tanksPipesRoom
, AnTree firstBreather
+1 -1
View File
@@ -131,7 +131,7 @@ doDrawing pdata u = do
drawShader (_textureArrayShader pdata) nFls
--draw lightmap into its own buffer
bindFramebuffer Framebuffer $= fst (_fboLighting pdata)
createLightMap
createLightMap
pdata
lightPoints
nWalls
+1
View File
@@ -46,6 +46,7 @@ tanksRoom crs its = do
map (\it -> sps0 (PutFlIt it) & plSpot .~ anyUnusedSpot) its
++ map (\cr -> sps0 (PutCrit cr) & plSpot .~ unusedSpotAwayFromLink 50) crs
++ replicate ntanks thetank
++ [mntLightLnkCond $ resetPLUse $ rprBool $ \rp _ -> isOutLnk rp]
-- , sps0 $ PutShape $ colorSH orange $ pipePP 2 (V3 50 50 25) (V3 50 120 25)
hgshape <- takeOne [girder 96 20 10, girderZ 96 20 10, girderV 96 20 10]
addhighgirds <- takeOne $