Commit before attempting to remove bottom and mid picture layers

This commit is contained in:
2024-10-01 00:16:46 +01:00
parent c2214dae60
commit c3d112e52e
8 changed files with 28 additions and 14 deletions
+6 -2
View File
@@ -59,13 +59,17 @@ ammoMagSPic it = \case
TINMAG -> noPic $ upperPrismPolyTS 1 (reverse $ rectNSWE 0 (- y) (-1) 1)
DRUMMAG -> noPic $ upperPrismPolyTS 1 (reverse $ rectNSWE 0 (- y) (-1) 1)
CHEMFUELPOUCH -> (colorSH yellow (upperPrismPolyST 3 $ polyCirc 3 5)
, setLayer MidLayer . color black $ translate3 (V3 0 0 4) $ circleSolid (5 * am)
, mempty
-- , setLayer MidLayer . color black $ translate3 (V3 0 0 4) $ circleSolid (5 * am)
)
_ -> noPic $ upperPrismPolyTS 1 (reverse $ rectNSWE 0 (- y) (-1) 1)
where
y = fromIntegral y' * 0.3
y' = fromMaybe 0 $ it ^? itUse . amagLoadStatus . iaLoaded
am = fractionLoadedAmmo2 (it ^?! itUse . amagLoadStatus)
am = fractionLoadedAmmo (it ^?! itUse . amagLoadStatus)
fractionLoadedAmmo :: ReloadStatus -> Float
fractionLoadedAmmo rs = fromIntegral (_iaLoaded rs) / fromIntegral (_iaMax rs)
fractionLoadedAmmo2 :: ReloadStatus -> Float
fractionLoadedAmmo2 rs =
+2 -2
View File
@@ -162,7 +162,7 @@ doDrawing' win pdata u = do
0
(fromIntegral trueNWalls)
--draw object pictures onto base buffer (are there any?!)
renderLayer BottomLayer shadV layerCounts
-- renderLayer BottomLayer shadV layerCounts
--draw object shapes onto base buffer
let fs = _shapeShader pdata
glUseProgram (_shaderUINT fs)
@@ -251,7 +251,7 @@ doDrawing' win pdata u = do
GL_COLOR
0
ptr
renderLayer MidLayer shadV layerCounts
-- renderLayer MidLayer shadV layerCounts
glUseProgram (pdata ^. cloudShader . shaderUINT)
glBindVertexArray $ pdata ^. cloudShader . shaderVAO . vaoName
glDrawElements