justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Tweak picture shader verxs

Browse Source
This commit is contained in:
justin
2025-11-20 17:02:05 +00:00
parent cb64be4eeb
commit d0aef5cf39
7 changed files with 72 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shader/dualTwoD/arc.vert
+3 -3
View File
@@ -1,5 +1,5 @@
#version 450 core #version 450 core
layout (location = 0) in vec3 pos; layout (location = 0) in vec4 pos;
layout (location = 1) in vec4 col; layout (location = 1) in vec4 col;
layout (location = 2) in vec3 boxXboxYwidth; layout (location = 2) in vec3 boxXboxYwidth;
layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
@@ -7,8 +7,8 @@ out vec4 vCol;
out vec3 vPos; out vec3 vPos;
out vec3 vparams; out vec3 vparams;
void main() { void main() {
gl_Position = theMat * vec4(pos,1); gl_Position = theMat * pos;
vCol = col; vCol = col;
vparams = boxXboxYwidth; vparams = boxXboxYwidth;
vPos = pos; vPos = pos.xyz;
} }
shader/dualTwoD/basic.vert
+3 -3
View File
@@ -1,11 +1,11 @@
#version 450 core #version 450 core
layout (location = 0) in vec3 pos; layout (location = 0) in vec4 pos;
layout (location = 1) in vec4 col; layout (location = 1) in vec4 col;
layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
out vec4 vCol; out vec4 vCol;
out vec3 vPos; out vec3 vPos;
void main() { void main() {
gl_Position = theMat * vec4(pos,1); gl_Position = theMat * pos;
vCol = col; vCol = col;
vPos = pos; vPos = pos.xyz;
} }
shader/dualTwoD/ellipse.vert
+2 -2
View File
@@ -1,5 +1,5 @@
#version 450 core #version 450 core
layout (location = 0) in vec3 pos; layout (location = 0) in vec4 pos;
layout (location = 1) in vec4 col; layout (location = 1) in vec4 col;
layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ;
out vec4 vCol; out vec4 vCol;
@@ -10,6 +10,6 @@ out vec4 vCol;
// // // //
void main() void main()
{ {
gl_Position = vec4(pos,1); gl_Position = pos;
vCol = col; vCol = col;
} }
shader/picture/charArray.vert
+2 -2
View File
@@ -1,5 +1,5 @@
#version 450 core #version 450 core
layout (location = 0) in vec3 inPos; layout (location = 0) in vec4 pos;
layout (location = 1) in vec4 inColor; layout (location = 1) in vec4 inColor;
//layout (location = 2) in vec4 inTexCoord; //layout (location = 2) in vec4 inTexCoord;
layout (location = 2) in vec3 inTexCoord; layout (location = 2) in vec3 inTexCoord;
@@ -8,7 +8,7 @@ out vec4 vColor;
out vec3 vTexCoord; out vec3 vTexCoord;
void main() void main()
{ {
gl_Position = theMat * vec4(inPos.xyz, 1.0); gl_Position = theMat * pos;
vColor = inColor; vColor = inColor;
//vTexCoord = inTexCoord.xyz; //vTexCoord = inTexCoord.xyz;
vTexCoord = inTexCoord; vTexCoord = inTexCoord;
src/Preload/Render.hs
+4 -4
View File
@@ -104,10 +104,10 @@ preloadRender = do
ceilingstencilshader <- makeSourcedShader "ceiling/stencil" [vert] ceilingstencilshader <- makeSourcedShader "ceiling/stencil" [vert]
putStrLn "Setup 2D shaders" putStrLn "Setup 2D shaders"
bslist <- makeShaderVBO "dualTwoD/basic" [vert, frag] (toFloatVAs [3, 4]) bslist <- makeShaderVBO "dualTwoD/basic" [vert, frag] (toFloatVAs [4, 4])
aslist <- makeShaderVBO "dualTwoD/arc" [vert, frag] (toFloatVAs [3, 4, 3]) aslist <- makeShaderVBO "dualTwoD/arc" [vert, frag] (toFloatVAs [4, 4, 3])
eslist <- makeShaderVBO "dualTwoD/ellipse" [vert, geom, frag] (toFloatVAs [3, 4]) eslist <- makeShaderVBO "dualTwoD/ellipse" [vert, geom, frag] (toFloatVAs [4, 4])
cslist <- makeShaderVBO "picture/charArray" [vert, frag] (toFloatVAs [3, 4, 3]) cslist <- makeShaderVBO "picture/charArray" [vert, frag] (toFloatVAs [4, 4, 3])
shadV <- MV.new 4 shadV <- MV.new 4
zipWithM_ zipWithM_
(MV.write shadV) (MV.write shadV)
src/Shader/Poke.hs
+11 -10
View File
@@ -43,7 +43,7 @@ pokeVerx vbos offsets Verx{_vxPos = thePos, _vxCol = theCol, _vxExt = ext, _vxSh
basePtr <- _vboPtr . snd <$> MV.unsafeRead vbos sn basePtr <- _vboPtr . snd <$> MV.unsafeRead vbos sn
let thePtr = plusPtr basePtr (typeOff * pokeStride shadnum * floatSize) let thePtr = plusPtr basePtr (typeOff * pokeStride shadnum * floatSize)
poke34 thePtr thePos theCol poke34 thePtr thePos theCol
pokeArrayOff thePtr 7 ext pokeArrayOff thePtr 8 ext
UMV.unsafeModify offsets (+ 1) sn UMV.unsafeModify offsets (+ 1) sn
where where
sn = fromEnum shadnum sn = fromEnum shadnum
@@ -485,7 +485,7 @@ pokeLayVerx vbos counts vx = do
basePtr <- _vboPtr . snd <$> MV.unsafeRead vbos sn basePtr <- _vboPtr . snd <$> MV.unsafeRead vbos sn
let thePtr = plusPtr basePtr ((theOff + layOff) * theStride * floatSize) let thePtr = plusPtr basePtr ((theOff + layOff) * theStride * floatSize)
poke34 thePtr thePos theCol poke34 thePtr thePos theCol
pokeArrayOff thePtr 7 (_vxExt vx) pokeArrayOff thePtr 8 (_vxExt vx)
UMV.unsafeModify counts (+ 1) vecPos UMV.unsafeModify counts (+ 1) vecPos
where where
sn = fromEnum shadnum sn = fromEnum shadnum
@@ -499,11 +499,11 @@ pokeLayVerx vbos counts vx = do
pokeStride :: ShadNum -> Int pokeStride :: ShadNum -> Int
{-# INLINE pokeStride #-} {-# INLINE pokeStride #-}
pokeStride PolyShad = 7 pokeStride PolyShad = 7 + 1
--pokeStride TextShad = 11 --pokeStride TextShad = 11
pokeStride TextShad = 10 pokeStride TextShad = 10 + 1
pokeStride ArcShad = 10 pokeStride ArcShad = 10 + 1
pokeStride EllShad = 7 pokeStride EllShad = 7 + 1
poke34 :: Ptr Float -> Point3 -> Point4 -> IO () poke34 :: Ptr Float -> Point3 -> Point4 -> IO ()
{-# INLINE poke34 #-} {-# INLINE poke34 #-}
@@ -511,10 +511,11 @@ poke34 ptr (V3 a b c) (V4 d e f g) = do
pokeElemOff ptr 0 a pokeElemOff ptr 0 a
pokeElemOff ptr 1 b pokeElemOff ptr 1 b
pokeElemOff ptr 2 c pokeElemOff ptr 2 c
pokeElemOff ptr 3 d pokeElemOff ptr 3 1
pokeElemOff ptr 4 e pokeElemOff ptr 4 d
pokeElemOff ptr 5 f pokeElemOff ptr 5 e
pokeElemOff ptr 6 g pokeElemOff ptr 6 f
pokeElemOff ptr 7 g
pokeArrayOff :: Ptr Float -> Int -> [Float] -> IO () pokeArrayOff :: Ptr Float -> Int -> [Float] -> IO ()
{-# INLINE pokeArrayOff #-} {-# INLINE pokeArrayOff #-}
tags
+47 -59
View File
@@ -998,7 +998,6 @@ PosInf src/Dodge/Data/CardinalPoint.hs 44;" C
PosRooms src/Dodge/Tree/Shift.hs 28;" t PosRooms src/Dodge/Tree/Shift.hs 28;" t
Posture src/Dodge/Data/Creature/Stance.hs 33;" t Posture src/Dodge/Data/Creature/Stance.hs 33;" t
PreloadData src/Data/Preload.hs 10;" t PreloadData src/Data/Preload.hs 10;" t
PrimitiveMode src/Shader/Data.hs 107;" t
PrintMaterial src/Dodge/Data/AmmoType.hs 12;" C PrintMaterial src/Dodge/Data/AmmoType.hs 12;" C
Prison src/Dodge/Data/Scenario.hs 65;" C Prison src/Dodge/Data/Scenario.hs 65;" C
Projectile src/Dodge/Data/Projectile.hs 15;" t Projectile src/Dodge/Data/Projectile.hs 15;" t
@@ -1514,7 +1513,7 @@ _avMoveSpeed src/Dodge/Data/Creature/Misc.hs 65;" f
_avStrength src/Dodge/Data/Creature/Misc.hs 62;" f _avStrength src/Dodge/Data/Creature/Misc.hs 62;" f
_avatarMaterial src/Dodge/Data/Creature/Misc.hs 61;" f _avatarMaterial src/Dodge/Data/Creature/Misc.hs 61;" f
_avatarPulse src/Dodge/Data/Creature/Misc.hs 60;" f _avatarPulse src/Dodge/Data/Creature/Misc.hs 60;" f
_barrelShader src/Data/Preload/Render.hs 26;" f _barrelShader src/Data/Preload/Render.hs 25;" f
_barrelType src/Dodge/Data/Creature/Misc.hs 71;" f _barrelType src/Dodge/Data/Creature/Misc.hs 71;" f
_bdColor src/Dodge/Data/Prop.hs 23;" f _bdColor src/Dodge/Data/Prop.hs 23;" f
_bdMaxX src/Dodge/Data/Bounds.hs 12;" f _bdMaxX src/Dodge/Data/Bounds.hs 12;" f
@@ -1532,7 +1531,7 @@ _blPos src/Dodge/Data/Block.hs 26;" f
_blShadows src/Dodge/Data/Block.hs 24;" f _blShadows src/Dodge/Data/Block.hs 24;" f
_blWallIDs src/Dodge/Data/Block.hs 22;" f _blWallIDs src/Dodge/Data/Block.hs 22;" f
_blocks src/Dodge/Data/LWorld.hs 125;" f _blocks src/Dodge/Data/LWorld.hs 125;" f
_bloomBlurShader src/Data/Preload/Render.hs 25;" f _bloomBlurShader src/Data/Preload/Render.hs 24;" f
_bmColor src/Dodge/Data/Beam.hs 21;" f _bmColor src/Dodge/Data/Beam.hs 21;" f
_bmDamage src/Dodge/Data/Beam.hs 20;" f _bmDamage src/Dodge/Data/Beam.hs 20;" f
_bmDir src/Dodge/Data/Beam.hs 19;" f _bmDir src/Dodge/Data/Beam.hs 19;" f
@@ -1598,8 +1597,8 @@ _cdtUp src/Dodge/Data/DoubleTree.hs 92;" f
_ceSideEffect src/Dodge/Data/Universe.hs 66;" f _ceSideEffect src/Dodge/Data/Universe.hs 66;" f
_ceString src/Dodge/Data/Universe.hs 67;" f _ceString src/Dodge/Data/Universe.hs 67;" f
_ceilingStencilShader src/Data/Preload/Render.hs 19;" f _ceilingStencilShader src/Data/Preload/Render.hs 19;" f
_chasmShader src/Data/Preload/Render.hs 47;" f _chasmShader src/Data/Preload/Render.hs 46;" f
_chasmVBO src/Data/Preload/Render.hs 46;" f _chasmVBO src/Data/Preload/Render.hs 45;" f
_chasms src/Dodge/Data/CWorld.hs 33;" f _chasms src/Dodge/Data/CWorld.hs 33;" f
_ciFilter src/Dodge/Data/HUD.hs 25;" f _ciFilter src/Dodge/Data/HUD.hs 25;" f
_ciInvIDs src/Dodge/Data/Combine.hs 9;" f _ciInvIDs src/Dodge/Data/Combine.hs 9;" f
@@ -1628,8 +1627,8 @@ _clickPos src/Dodge/Data/Input.hs 42;" f
_clickWorldPos src/Dodge/Data/Input.hs 44;" f _clickWorldPos src/Dodge/Data/Input.hs 44;" f
_closeButtons src/Dodge/Data/HUD.hs 36;" f _closeButtons src/Dodge/Data/HUD.hs 36;" f
_closeItems src/Dodge/Data/HUD.hs 35;" f _closeItems src/Dodge/Data/HUD.hs 35;" f
_cloudShader src/Data/Preload/Render.hs 51;" f _cloudShader src/Data/Preload/Render.hs 50;" f
_cloudVBO src/Data/Preload/Render.hs 50;" f _cloudVBO src/Data/Preload/Render.hs 49;" f
_clouds src/Dodge/Data/LWorld.hs 96;" f _clouds src/Dodge/Data/LWorld.hs 96;" f
_coolEnd src/Dodge/Data/TriggerType.hs 17;" f _coolEnd src/Dodge/Data/TriggerType.hs 17;" f
_coolSound src/Dodge/Data/Item/Params.hs 22;" f _coolSound src/Dodge/Data/Item/Params.hs 22;" f
@@ -1758,7 +1757,7 @@ _dsZoning src/Dodge/Data/World.hs 48;" f
_dtLeft src/Dodge/Data/DoubleTree.hs 29;" f _dtLeft src/Dodge/Data/DoubleTree.hs 29;" f
_dtRight src/Dodge/Data/DoubleTree.hs 29;" f _dtRight src/Dodge/Data/DoubleTree.hs 29;" f
_dtValue src/Dodge/Data/DoubleTree.hs 29;" f _dtValue src/Dodge/Data/DoubleTree.hs 29;" f
_dummyVAO src/Data/Preload/Render.hs 52;" f _dummyVAO src/Data/Preload/Render.hs 51;" f
_dusts src/Dodge/Data/LWorld.hs 97;" f _dusts src/Dodge/Data/LWorld.hs 97;" f
_ebID src/Dodge/Data/EnergyBall/Type.hs 13;" f _ebID src/Dodge/Data/EnergyBall/Type.hs 13;" f
_ebPos src/Dodge/Data/EnergyBall.hs 17;" f _ebPos src/Dodge/Data/EnergyBall.hs 17;" f
@@ -1768,15 +1767,15 @@ _ebVel src/Dodge/Data/EnergyBall.hs 16;" f
_emoMenuOption src/Dodge/Data/Universe.hs 77;" f _emoMenuOption src/Dodge/Data/Universe.hs 77;" f
_energyBalls src/Dodge/Data/LWorld.hs 104;" f _energyBalls src/Dodge/Data/LWorld.hs 104;" f
_fbSize src/Dodge/Data/EnergyBall/Type.hs 12;" f _fbSize src/Dodge/Data/EnergyBall/Type.hs 12;" f
_fbo2 src/Data/Preload/Render.hs 31;" f _fbo2 src/Data/Preload/Render.hs 30;" f
_fboBase src/Data/Preload/Render.hs 34;" f _fboBase src/Data/Preload/Render.hs 33;" f
_fboBloom src/Data/Preload/Render.hs 37;" f _fboBloom src/Data/Preload/Render.hs 36;" f
_fboCloud src/Data/Preload/Render.hs 35;" f _fboCloud src/Data/Preload/Render.hs 34;" f
_fboHalf1 src/Data/Preload/Render.hs 32;" f _fboHalf1 src/Data/Preload/Render.hs 31;" f
_fboHalf2 src/Data/Preload/Render.hs 33;" f _fboHalf2 src/Data/Preload/Render.hs 32;" f
_fboLighting src/Data/Preload/Render.hs 39;" f _fboLighting src/Data/Preload/Render.hs 38;" f
_fboPos src/Data/Preload/Render.hs 38;" f _fboPos src/Data/Preload/Render.hs 37;" f
_fboWindow src/Data/Preload/Render.hs 36;" f _fboWindow src/Data/Preload/Render.hs 35;" f
_flItPos src/Dodge/Data/FloorItem.hs 11;" f _flItPos src/Dodge/Data/FloorItem.hs 11;" f
_flItRot src/Dodge/Data/FloorItem.hs 11;" f _flItRot src/Dodge/Data/FloorItem.hs 11;" f
_flPos src/Dodge/Data/Flame.hs 13;" f _flPos src/Dodge/Data/Flame.hs 13;" f
@@ -1790,8 +1789,8 @@ _flboName src/Shader/Data.hs 86;" f
_flboPtr src/Shader/Data.hs 87;" f _flboPtr src/Shader/Data.hs 87;" f
_flboStride src/Shader/Data.hs 88;" f _flboStride src/Shader/Data.hs 88;" f
_floorItems src/Dodge/Data/LWorld.hs 127;" f _floorItems src/Dodge/Data/LWorld.hs 127;" f
_floorShader src/Data/Preload/Render.hs 45;" f _floorShader src/Data/Preload/Render.hs 44;" f
_floorVBO src/Data/Preload/Render.hs 44;" f _floorVBO src/Data/Preload/Render.hs 43;" f
_foreShapes src/Dodge/Data/LWorld.hs 132;" f _foreShapes src/Dodge/Data/LWorld.hs 132;" f
_fsDir src/Dodge/Data/ForegroundShape.hs 14;" f _fsDir src/Dodge/Data/ForegroundShape.hs 14;" f
_fsPos src/Dodge/Data/ForegroundShape.hs 13;" f _fsPos src/Dodge/Data/ForegroundShape.hs 13;" f
@@ -1913,7 +1912,7 @@ _ldtRight src/Dodge/Data/DoubleTree.hs 35;" f
_ldtValue src/Dodge/Data/DoubleTree.hs 33;" f _ldtValue src/Dodge/Data/DoubleTree.hs 33;" f
_leadTargetBy src/Dodge/Data/ActionPlan.hs 115;" f _leadTargetBy src/Dodge/Data/ActionPlan.hs 115;" f
_lightSources src/Dodge/Data/LWorld.hs 133;" f _lightSources src/Dodge/Data/LWorld.hs 133;" f
_lightUBO src/Data/Preload/Render.hs 42;" f _lightUBO src/Data/Preload/Render.hs 41;" f
_lightingCapShader src/Data/Preload/Render.hs 16;" f _lightingCapShader src/Data/Preload/Render.hs 16;" f
_lightingCloudShader src/Data/Preload/Render.hs 18;" f _lightingCloudShader src/Data/Preload/Render.hs 18;" f
_lightingLineShadowShader src/Data/Preload/Render.hs 15;" f _lightingLineShadowShader src/Data/Preload/Render.hs 15;" f
@@ -1950,7 +1949,7 @@ _manObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" f
_mapInvItmID src/Dodge/Data/HUD.hs 20;" f _mapInvItmID src/Dodge/Data/HUD.hs 20;" f
_mapInvOffset src/Dodge/Data/HUD.hs 18;" f _mapInvOffset src/Dodge/Data/HUD.hs 18;" f
_mapInvZoom src/Dodge/Data/HUD.hs 19;" f _mapInvZoom src/Dodge/Data/HUD.hs 19;" f
_matUBO src/Data/Preload/Render.hs 41;" f _matUBO src/Data/Preload/Render.hs 40;" f
_mbAttach src/Dodge/Data/MetaTree.hs 18;" f _mbAttach src/Dodge/Data/MetaTree.hs 18;" f
_mbTree src/Dodge/Data/MetaTree.hs 18;" f _mbTree src/Dodge/Data/MetaTree.hs 18;" f
_mcColor src/Dodge/Data/Machine.hs 34;" f _mcColor src/Dodge/Data/Machine.hs 34;" f
@@ -2053,7 +2052,7 @@ _phRemoteID src/Dodge/Data/Projectile.hs 41;" f
_phTargetingID src/Dodge/Data/Projectile.hs 42;" f _phTargetingID src/Dodge/Data/Projectile.hs 42;" f
_pickUpLevel src/Dodge/Layout/Generate.hs 14;" f _pickUpLevel src/Dodge/Layout/Generate.hs 14;" f
_pickUps src/Dodge/Layout/Generate.hs 15;" f _pickUps src/Dodge/Layout/Generate.hs 15;" f
_pictureShaders src/Data/Preload/Render.hs 30;" f _pictureShaders src/Data/Preload/Render.hs 29;" f
_piercedPoints src/Dodge/Data/Creature/Misc.hs 87;" f _piercedPoints src/Dodge/Data/Creature/Misc.hs 87;" f
_pjBarrelSpin src/Dodge/Data/Projectile.hs 23;" f _pjBarrelSpin src/Dodge/Data/Projectile.hs 23;" f
_pjDetonatorID src/Dodge/Data/Projectile.hs 25;" f _pjDetonatorID src/Dodge/Data/Projectile.hs 25;" f
@@ -2135,7 +2134,7 @@ _rbPos src/Dodge/Data/RadarBlip.hs 17;" f
_rbRad src/Dodge/Data/RadarBlip.hs 16;" f _rbRad src/Dodge/Data/RadarBlip.hs 16;" f
_rbState src/Dodge/Data/World.hs 43;" f _rbState src/Dodge/Data/World.hs 43;" f
_rbTime src/Dodge/Data/RadarBlip.hs 14;" f _rbTime src/Dodge/Data/RadarBlip.hs 14;" f
_rboBaseBloom src/Data/Preload/Render.hs 40;" f _rboBaseBloom src/Data/Preload/Render.hs 39;" f
_rdDist1 src/Dodge/Data/Distortion.hs 13;" f _rdDist1 src/Dodge/Data/Distortion.hs 13;" f
_rdDist2 src/Dodge/Data/Distortion.hs 14;" f _rdDist2 src/Dodge/Data/Distortion.hs 14;" f
_rdPos src/Dodge/Data/Distortion.hs 12;" f _rdPos src/Dodge/Data/Distortion.hs 12;" f
@@ -2232,12 +2231,11 @@ _sfSize src/Shape/Data.hs 41;" f
_sfType src/Shape/Data.hs 37;" f _sfType src/Shape/Data.hs 37;" f
_sfVs src/Shape/Data.hs 38;" f _sfVs src/Shape/Data.hs 38;" f
_shadWallShader src/Data/Preload/Render.hs 14;" f _shadWallShader src/Data/Preload/Render.hs 14;" f
_shaderPrimitive src/Shader/Data.hs 53;" f
_shaderUINT src/Shader/Data.hs 52;" f _shaderUINT src/Shader/Data.hs 52;" f
_shaderVAO src/Shader/Data.hs 54;" f _shaderVAO src/Shader/Data.hs 54;" f
_shapeEBO src/Data/Preload/Render.hs 28;" f _shapeEBO src/Data/Preload/Render.hs 27;" f
_shapeHalfSize src/Shape/Data.hs 13;" f _shapeHalfSize src/Shape/Data.hs 13;" f
_shapeShader src/Data/Preload/Render.hs 27;" f _shapeShader src/Data/Preload/Render.hs 26;" f
_shellPayload src/Dodge/Data/Item/Combine.hs 101;" f _shellPayload src/Dodge/Data/Item/Combine.hs 101;" f
_shockwaves src/Dodge/Data/LWorld.hs 112;" f _shockwaves src/Dodge/Data/LWorld.hs 112;" f
_siColor src/Dodge/Data/SelectionList.hs 47;" f _siColor src/Dodge/Data/SelectionList.hs 47;" f
@@ -2249,7 +2247,7 @@ _siPictures src/Dodge/Data/SelectionList.hs 43;" f
_siWidth src/Dodge/Data/SelectionList.hs 45;" f _siWidth src/Dodge/Data/SelectionList.hs 45;" f
_sideEffect src/Loop/Data.hs 13;" f _sideEffect src/Loop/Data.hs 13;" f
_sideImpulses src/Dodge/Data/ActionPlan.hs 122;" f _sideImpulses src/Dodge/Data/ActionPlan.hs 122;" f
_silhouetteEBO src/Data/Preload/Render.hs 29;" f _silhouetteEBO src/Data/Preload/Render.hs 28;" f
_skOldPos src/Dodge/Data/Spark.hs 14;" f _skOldPos src/Dodge/Data/Spark.hs 14;" f
_skPos src/Dodge/Data/Spark.hs 13;" f _skPos src/Dodge/Data/Spark.hs 13;" f
_skType src/Dodge/Data/Spark.hs 15;" f _skType src/Dodge/Data/Spark.hs 15;" f
@@ -2373,7 +2371,6 @@ _unFBO src/Shader/Data.hs 57;" f
_unNInt src/NewInt.hs 16;" f _unNInt src/NewInt.hs 16;" f
_unNIntMap src/NewInt.hs 22;" f _unNIntMap src/NewInt.hs 22;" f
_unNIntSet src/NewInt.hs 19;" f _unNIntSet src/NewInt.hs 19;" f
_unPrimitiveMode src/Shader/Data.hs 107;" f
_unPutCrit src/Dodge/Data/GenWorld.hs 32;" f _unPutCrit src/Dodge/Data/GenWorld.hs 32;" f
_unST src/Dodge/Data/MetaTree.hs 20;" f _unST src/Dodge/Data/MetaTree.hs 20;" f
_unTO src/Shader/Data.hs 59;" f _unTO src/Shader/Data.hs 59;" f
@@ -2413,7 +2410,7 @@ _vaOffset src/Shader/Data.hs 70;" f
_vaType src/Shader/Data.hs 68;" f _vaType src/Shader/Data.hs 68;" f
_vboName src/Shader/Data.hs 80;" f _vboName src/Shader/Data.hs 80;" f
_vboPtr src/Shader/Data.hs 81;" f _vboPtr src/Shader/Data.hs 81;" f
_vboShapes src/Data/Preload/Render.hs 43;" f _vboShapes src/Data/Preload/Render.hs 42;" f
_vboVertexBytes src/Shader/Data.hs 82;" f _vboVertexBytes src/Shader/Data.hs 82;" f
_vcCoolDown src/Dodge/Data/Creature/Misc.hs 22;" f _vcCoolDown src/Dodge/Data/Creature/Misc.hs 22;" f
_vcMaxCoolDown src/Dodge/Data/Creature/Misc.hs 21;" f _vcMaxCoolDown src/Dodge/Data/Creature/Misc.hs 21;" f
@@ -2436,13 +2433,13 @@ _wTime src/Dodge/Data/Item/Params.hs 20;" f
_waitThenAction src/Dodge/Data/ActionPlan.hs 76;" f _waitThenAction src/Dodge/Data/ActionPlan.hs 76;" f
_waitThenTimer src/Dodge/Data/ActionPlan.hs 75;" f _waitThenTimer src/Dodge/Data/ActionPlan.hs 75;" f
_wallDamages src/Dodge/Data/LWorld.hs 119;" f _wallDamages src/Dodge/Data/LWorld.hs 119;" f
_wallVBO src/Data/Preload/Render.hs 49;" f _wallVBO src/Data/Preload/Render.hs 48;" f
_walls src/Dodge/Data/LWorld.hs 118;" f _walls src/Dodge/Data/LWorld.hs 118;" f
_wanID src/Dodge/Data/LWorld.hs 158;" f _wanID src/Dodge/Data/LWorld.hs 158;" f
_wanPos src/Dodge/Data/LWorld.hs 157;" f _wanPos src/Dodge/Data/LWorld.hs 157;" f
_warmMax src/Dodge/Data/TriggerType.hs 19;" f _warmMax src/Dodge/Data/TriggerType.hs 19;" f
_warmStart src/Dodge/Data/TriggerType.hs 15;" f _warmStart src/Dodge/Data/TriggerType.hs 15;" f
_winVBO src/Data/Preload/Render.hs 48;" f _winVBO src/Data/Preload/Render.hs 47;" f
_windowPosX src/Dodge/Data/Config.hs 64;" f _windowPosX src/Dodge/Data/Config.hs 64;" f
_windowPosY src/Dodge/Data/Config.hs 65;" f _windowPosY src/Dodge/Data/Config.hs 65;" f
_windowPullShader src/Data/Preload/Render.hs 21;" f _windowPullShader src/Data/Preload/Render.hs 21;" f
@@ -2602,7 +2599,7 @@ attachOnward src/Dodge/Tree/Compose.hs 95;" f
attachOnward' src/Dodge/Tree/Compose.hs 98;" f attachOnward' src/Dodge/Tree/Compose.hs 98;" f
attachTree src/Dodge/Tree/Compose.hs 38;" f attachTree src/Dodge/Tree/Compose.hs 38;" f
attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 75;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 75;" f
attribSize src/Shader/Compile.hs 196;" f attribSize src/Shader/Compile.hs 195;" f
autoAmr src/Dodge/Item/Held/Rod.hs 39;" f autoAmr src/Dodge/Item/Held/Rod.hs 39;" f
autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 488;" f autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 488;" f
autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f
@@ -2769,7 +2766,7 @@ checkConnection src/Dodge/Inventory/Swap.hs 66;" f
checkDeath src/Dodge/Creature/Update.hs 70;" f checkDeath src/Dodge/Creature/Update.hs 70;" f
checkDeath' src/Dodge/Creature/Update.hs 73;" f checkDeath' src/Dodge/Creature/Update.hs 73;" f
checkEndGame src/Dodge/Update.hs 766;" f checkEndGame src/Dodge/Update.hs 766;" f
checkErrorGL src/Shader/Compile.hs 143;" f checkErrorGL src/Shader/Compile.hs 142;" f
checkFBO src/Framebuffer/Check.hs 6;" f checkFBO src/Framebuffer/Check.hs 6;" f
checkGLError src/GLHelp.hs 14;" f checkGLError src/GLHelp.hs 14;" f
checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 18;" f checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 18;" f
@@ -2870,7 +2867,7 @@ compP2A src/Dodge/ShiftPoint.hs 11;" f
compactDraw src/Dodge/LevelGen.hs 94;" f compactDraw src/Dodge/LevelGen.hs 94;" f
compactDraw' src/Dodge/LevelGen.hs 105;" f compactDraw' src/Dodge/LevelGen.hs 105;" f
compactDrawTree src/Dodge/LevelGen.hs 88;" f compactDrawTree src/Dodge/LevelGen.hs 88;" f
compileAndCheckShader src/Shader/Compile.hs 165;" f compileAndCheckShader src/Shader/Compile.hs 164;" f
composeNode src/Dodge/Tree/Compose.hs 76;" f composeNode src/Dodge/Tree/Compose.hs 76;" f
composeTree src/Dodge/Tree/Compose.hs 47;" f composeTree src/Dodge/Tree/Compose.hs 47;" f
computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f
@@ -2891,7 +2888,7 @@ copier src/Dodge/Item/Scope.hs 88;" f
copierItemUpdate src/Dodge/Creature/State.hs 131;" f copierItemUpdate src/Dodge/Creature/State.hs 131;" f
copyItemToFloor src/Dodge/FloorItem.hs 14;" f copyItemToFloor src/Dodge/FloorItem.hs 14;" f
corDoor src/Dodge/Room/Room.hs 385;" f corDoor src/Dodge/Room/Room.hs 385;" f
cornerList src/Preload/Render.hs 221;" f cornerList src/Preload/Render.hs 219;" f
corpseOrGib src/Dodge/Creature/Update.hs 111;" f corpseOrGib src/Dodge/Creature/Update.hs 111;" f
corridor src/Dodge/Room/Corridor.hs 17;" f corridor src/Dodge/Room/Corridor.hs 17;" f
corridorBoss src/Dodge/LockAndKey.hs 133;" f corridorBoss src/Dodge/LockAndKey.hs 133;" f
@@ -3255,6 +3252,7 @@ drawCombFilter src/Dodge/Render/Picture.hs 269;" f
drawCombineInventory src/Dodge/Render/HUD.hs 183;" f drawCombineInventory src/Dodge/Render/HUD.hs 183;" f
drawConcurrentMessage src/Dodge/Render/Picture.hs 74;" f drawConcurrentMessage src/Dodge/Render/Picture.hs 74;" f
drawCoord src/Dodge/Debug/Picture.hs 386;" f drawCoord src/Dodge/Debug/Picture.hs 386;" f
drawCountMod src/Shader.hs 22;" f
drawCrInfo src/Dodge/Debug.hs 169;" f drawCrInfo src/Dodge/Debug.hs 169;" f
drawCrInfo' src/Dodge/Debug.hs 164;" f drawCrInfo' src/Dodge/Debug.hs 164;" f
drawCreature src/Dodge/Render/ShapePicture.hs 71;" f drawCreature src/Dodge/Render/ShapePicture.hs 71;" f
@@ -3717,7 +3715,7 @@ initWallZoning src/Dodge/Wall/Zone.hs 12;" f
initialRoomTree src/Dodge/Floor.hs 24;" f initialRoomTree src/Dodge/Floor.hs 24;" f
initialWorld src/Dodge/Initialisation.hs 15;" f initialWorld src/Dodge/Initialisation.hs 15;" f
initialisePlaying src/Sound.hs 77;" f initialisePlaying src/Sound.hs 77;" f
initializeGLState src/Preload/Render.hs 242;" f initializeGLState src/Preload/Render.hs 240;" f
initializeOptionMenu src/Dodge/Menu/Option.hs 17;" f initializeOptionMenu src/Dodge/Menu/Option.hs 17;" f
initializeOptionMenuBO src/Dodge/Menu/Option.hs 30;" f initializeOptionMenuBO src/Dodge/Menu/Option.hs 30;" f
initializeTexture2D src/Framebuffer/Update.hs 214;" f initializeTexture2D src/Framebuffer/Update.hs 214;" f
@@ -4058,11 +4056,11 @@ makePathBetweenPs src/Dodge/Path.hs 87;" f
makePathUsing src/Dodge/Path.hs 51;" f makePathUsing src/Dodge/Path.hs 51;" f
makePoisonExplosionAt src/Dodge/WorldEvent/Explosion.hs 24;" f makePoisonExplosionAt src/Dodge/WorldEvent/Explosion.hs 24;" f
makeSelectionListPictures src/Dodge/Render/List.hs 66;" f makeSelectionListPictures src/Dodge/Render/List.hs 66;" f
makeShaderProgram src/Shader/Compile.hs 129;" f makeShaderProgram src/Shader/Compile.hs 128;" f
makeShaderVBO src/Shader/Compile.hs 24;" f makeShaderVBO src/Shader/Compile.hs 24;" f
makeShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 11;" f makeShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 11;" f
makeShrapnelAt src/Dodge/Payload.hs 24;" f makeShrapnelAt src/Dodge/Payload.hs 24;" f
makeSourcedShader src/Shader/Compile.hs 62;" f makeSourcedShader src/Shader/Compile.hs 61;" f
makeSpark src/Dodge/Spark.hs 45;" f makeSpark src/Dodge/Spark.hs 45;" f
makeSubmenuOption src/Dodge/Menu/OptionType.hs 23;" f makeSubmenuOption src/Dodge/Menu/OptionType.hs 23;" f
makeSwitch src/Dodge/LevelGen/Switch.hs 38;" f makeSwitch src/Dodge/LevelGen/Switch.hs 38;" f
@@ -4366,16 +4364,6 @@ playSoundAndUpdate src/Sound.hs 54;" f
playSoundQueue src/Sound.hs 132;" f playSoundQueue src/Sound.hs 132;" f
playSoundUnlessRewinding appDodge/Main.hs 118;" f playSoundUnlessRewinding appDodge/Main.hs 118;" f
plusDecoration src/Dodge/Placement/TopDecoration.hs 35;" f plusDecoration src/Dodge/Placement/TopDecoration.hs 35;" f
pmLineLoop src/Shader/Data.hs 115;" f
pmLineStrip src/Shader/Data.hs 115;" f
pmLines src/Shader/Data.hs 115;" f
pmLinesAdjacency src/Shader/Data.hs 115;" f
pmPatches src/Shader/Data.hs 115;" f
pmPoints src/Shader/Data.hs 115;" f
pmQuads src/Shader/Data.hs 115;" f
pmTriangleFan src/Shader/Data.hs 115;" f
pmTriangleStrip src/Shader/Data.hs 115;" f
pmTriangles src/Shader/Data.hs 115;" f
pnZoneSize src/Dodge/Zoning/Pathing.hs 26;" f pnZoneSize src/Dodge/Zoning/Pathing.hs 26;" f
pointIfNotClose src/Dodge/LevelGen/StaticWalls/Deprecated.hs 68;" f pointIfNotClose src/Dodge/LevelGen/StaticWalls/Deprecated.hs 68;" f
pointInCircle src/Geometry.hs 209;" f pointInCircle src/Geometry.hs 209;" f
@@ -4392,7 +4380,7 @@ pointsToPoly src/Geometry/ConvexPoly.hs 35;" f
poisonSPic src/Dodge/Creature/Update.hs 125;" f poisonSPic src/Dodge/Creature/Update.hs 125;" f
poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f
poke34 src/Shader/Poke.hs 508;" f poke34 src/Shader/Poke.hs 508;" f
pokeArrayOff src/Shader/Poke.hs 519;" f pokeArrayOff src/Shader/Poke.hs 520;" f
pokeBox src/Shader/Poke.hs 228;" f pokeBox src/Shader/Poke.hs 228;" f
pokeBoxSurface src/Shader/Poke.hs 261;" f pokeBoxSurface src/Shader/Poke.hs 261;" f
pokeChasm src/Shader/Poke/Floor.hs 25;" f pokeChasm src/Shader/Poke/Floor.hs 25;" f
@@ -4816,7 +4804,7 @@ setRBCreatureTargeting src/Dodge/Creature/State.hs 290;" f
setRoomInt src/Dodge/Room/Tutorial.hs 91;" f setRoomInt src/Dodge/Room/Tutorial.hs 91;" f
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 337;" f setSelWhileDragging src/Dodge/Update/Input/InGame.hs 337;" f
setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f
setShaderSource src/Shader/Compile.hs 178;" f setShaderSource src/Shader/Compile.hs 177;" f
setShadowLimits src/Dodge/Shadows.hs 11;" f setShadowLimits src/Dodge/Shadows.hs 11;" f
setSoundVolume src/Sound.hs 157;" f setSoundVolume src/Sound.hs 157;" f
setTargetMv src/Dodge/Creature/ReaderUpdate.hs 83;" f setTargetMv src/Dodge/Creature/ReaderUpdate.hs 83;" f
@@ -4837,14 +4825,14 @@ setupFramebuffer3GivenStencil src/Framebuffer/Setup.hs 62;" f
setupFramebufferGivenStencil src/Framebuffer/Setup.hs 31;" f setupFramebufferGivenStencil src/Framebuffer/Setup.hs 31;" f
setupLoop src/Loop.hs 30;" f setupLoop src/Loop.hs 30;" f
setupShadowFramebuffer src/Framebuffer/Setup.hs 24;" f setupShadowFramebuffer src/Framebuffer/Setup.hs 24;" f
setupVAOUsingVBO src/Shader/Compile.hs 74;" f setupVAOUsingVBO src/Shader/Compile.hs 73;" f
setupVBO src/Shader/Compile.hs 45;" f setupVBO src/Shader/Compile.hs 44;" f
setupVBOVAO src/Shader/Compile.hs 86;" f setupVBOVAO src/Shader/Compile.hs 85;" f
setupVertexAttribPointer src/Shader/Compile.hs 110;" f setupVertexAttribPointer src/Shader/Compile.hs 109;" f
setupVertexAttribs src/Shader/Compile.hs 104;" f setupVertexAttribs src/Shader/Compile.hs 103;" f
setupWorldBounds src/Dodge/Layout.hs 116;" f setupWorldBounds src/Dodge/Layout.hs 116;" f
sfInvColor src/Dodge/Item/InventoryColor.hs 12;" f sfInvColor src/Dodge/Item/InventoryColor.hs 12;" f
shaderTypeExt src/Shader/Compile.hs 67;" f shaderTypeExt src/Shader/Compile.hs 66;" f
shapeBounds src/Dodge/Room/Foreground.hs 147;" f shapeBounds src/Dodge/Room/Foreground.hs 147;" f
shapePoints src/Dodge/Room/Foreground.hs 144;" f shapePoints src/Dodge/Room/Foreground.hs 144;" f
shapeVerxSize src/Shape/Parameters.hs 5;" f shapeVerxSize src/Shape/Parameters.hs 5;" f
@@ -5155,7 +5143,7 @@ toBinary src/Dodge/Inventory/SelectionList.hs 141;" f
toBothLnk src/Dodge/RoomLink.hs 136;" f toBothLnk src/Dodge/RoomLink.hs 136;" f
toClosestMultiple src/HelpNum.hs 3;" f toClosestMultiple src/HelpNum.hs 3;" f
toColor8 src/Color.hs 148;" f toColor8 src/Color.hs 148;" f
toFloatVAs src/Shader/Compile.hs 96;" f toFloatVAs src/Shader/Compile.hs 95;" f
toLabel src/Dodge/Cleat.hs 16;" f toLabel src/Dodge/Cleat.hs 16;" f
toMultiset src/Multiset.hs 64;" f toMultiset src/Multiset.hs 64;" f
toOnward src/Dodge/Tree/Compose.hs 101;" f toOnward src/Dodge/Tree/Compose.hs 101;" f
@@ -5453,7 +5441,7 @@ vShape src/Dodge/Placement/Instance/LightSource.hs 93;" f
vToL src/MatrixHelper.hs 56;" f vToL src/MatrixHelper.hs 56;" f
vToQuat src/Quaternion.hs 42;" f vToQuat src/Quaternion.hs 42;" f
validTerminalCommands src/Dodge/Debug/Terminal.hs 137;" f validTerminalCommands src/Dodge/Debug/Terminal.hs 137;" f
vasTightStride src/Shader/Compile.hs 185;" f vasTightStride src/Shader/Compile.hs 184;" f
vecBetweenSpeed src/Dodge/Base.hs 146;" f vecBetweenSpeed src/Dodge/Base.hs 146;" f
vecTurnTo src/Dodge/Movement/Turn.hs 19;" f vecTurnTo src/Dodge/Movement/Turn.hs 19;" f
vert src/Shader/Data.hs 110;" f vert src/Shader/Data.hs 110;" f
@@ -5521,7 +5509,7 @@ windowLine src/Dodge/Placement/Instance/Wall.hs 59;" f
windowXFloat src/Dodge/Data/Config.hs 72;" f windowXFloat src/Dodge/Data/Config.hs 72;" f
windowYFloat src/Dodge/Data/Config.hs 74;" f windowYFloat src/Dodge/Data/Config.hs 74;" f
withAlpha src/Color.hs 10;" f withAlpha src/Color.hs 10;" f
withByteString src/Shader/Compile.hs 214;" f withByteString src/Shader/Compile.hs 213;" f
wlIXsNearCirc src/Dodge/Zoning/Wall.hs 32;" f wlIXsNearCirc src/Dodge/Zoning/Wall.hs 32;" f
wlIXsNearPoint src/Dodge/Zoning/Wall.hs 22;" f wlIXsNearPoint src/Dodge/Zoning/Wall.hs 22;" f
wlIXsNearRect src/Dodge/Zoning/Wall.hs 29;" f wlIXsNearRect src/Dodge/Zoning/Wall.hs 29;" f