From 9fc36ec54c2f4f53959be1f1c1bb74452237cd64 Mon Sep 17 00:00:00 2001 From: justin Date: Fri, 14 Nov 2025 11:48:00 +0000 Subject: [PATCH] Cleanup --- src/Dodge/Data/Distortion.hs | 3 +- src/Shader/Compile.hs | 9 - src/Shader/Data.hs | 3 +- tags | 338 +++++++++++++++++------------------ 4 files changed, 168 insertions(+), 185 deletions(-) diff --git a/src/Dodge/Data/Distortion.hs b/src/Dodge/Data/Distortion.hs index 83c704482..b4b67b9ef 100644 --- a/src/Dodge/Data/Distortion.hs +++ b/src/Dodge/Data/Distortion.hs @@ -7,8 +7,7 @@ import Geometry import Data.Aeson import Data.Aeson.TH -data Distortion - = RadialDistortion Point2 Point2 Point2 Float +data Distortion = RadialDistortion Point2 Point2 Point2 Float deriving (Eq, Ord, Show, Read) --Generic, Flat) deriveJSON defaultOptions ''Distortion diff --git a/src/Shader/Compile.hs b/src/Shader/Compile.hs index 215f6f402..34be145cf 100644 --- a/src/Shader/Compile.hs +++ b/src/Shader/Compile.hs @@ -1,13 +1,7 @@ module Shader.Compile ( --- makeShaderEBO, makeShaderVBO, --- makeShaderUsingVBO, makeShaderProgram, --- makeShaderUsingVAO, --- setupVAOUsingVBO, --- setupEBO, toFloatVAs, --- setupStaticVBOVAO, makeSourcedShader, ) where @@ -54,13 +48,10 @@ setupVBO vertexsize = do -- unclear whether this should also be multiplied by floatSize thePtr <- mallocBytes (vertexsize * numDrawableVertices) -- Allocate space - --glNamedBufferData glNamedBufferStorage vboname (fromIntegral $ floatSize * numDrawableVertices * vertexsize) - -- (fromIntegral $ numDrawableVertices * vertexsize) nullPtr - --GL_STREAM_DRAW GL_DYNAMIC_STORAGE_BIT return VBO{_vboName = vboname, _vboPtr = thePtr, _vboVertexBytes = vertexsize} diff --git a/src/Shader/Data.hs b/src/Shader/Data.hs index e145db6ff..f919cefc7 100644 --- a/src/Shader/Data.hs +++ b/src/Shader/Data.hs @@ -79,8 +79,7 @@ Vertex attributes are interleaved within the vbo. data VBO = VBO { _vboName :: GLuint , _vboPtr :: Ptr Float - , _vboVertexBytes :: Int - -- add int for AMOUNT of data poked! + , _vboVertexBytes :: Int -- size of one verx in bytes } data FloatBO = FloatBO diff --git a/tags b/tags index b769d18b1..72d64edd7 100644 --- a/tags +++ b/tags @@ -45,7 +45,7 @@ AimStance src/Dodge/Data/AimStance.hs 10;" t Aiming src/Dodge/Data/Creature/Stance.hs 34;" C AirFiltrationSS src/Dodge/Data/Scenario.hs 95;" C AlienContact src/Dodge/Data/Scenario.hs 30;" C -AllRoomClipBoundaries src/Dodge/Data/Config.hs 120;" C +AllRoomClipBoundaries src/Dodge/Data/Config.hs 121;" C AlteRifleSwitch src/Dodge/Data/Item/Params.hs 18;" C Ambush src/Dodge/Data/ActionPlan.hs 130;" C AmmoEffectSF src/Dodge/Data/ComposedItem.hs 33;" C @@ -137,7 +137,7 @@ Blunt src/Dodge/Data/Damage.hs 17;" C Boosting src/Dodge/Data/Creature/Stance.hs 27;" C BottomMenuOption src/Dodge/Data/Universe.hs 77;" C BounceBullet src/Dodge/Data/Bullet.hs 28;" C -Bound_box_screen src/Dodge/Data/Config.hs 93;" C +Bound_box_screen src/Dodge/Data/Config.hs 94;" C BoundaryCursor src/Dodge/Data/SelectionList.hs 20;" C Bounds src/Dodge/Data/Bounds.hs 10;" t BrigSS src/Dodge/Data/Scenario.hs 102;" C @@ -206,16 +206,16 @@ ChasmObstacle src/Dodge/Data/PathGraph.hs 51;" C ChemFuel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 14;" C ChooseMovementLtAuto src/Dodge/Data/CreatureEffect.hs 29;" C ChooseMovementSpreadGun src/Dodge/Data/CreatureEffect.hs 28;" C -Circ_collision_test src/Dodge/Data/Config.hs 97;" C +Circ_collision_test src/Dodge/Data/Config.hs 98;" C Climate src/Dodge/Data/Scenario.hs 32;" C CloseToMelee src/Dodge/Data/ActionPlan.hs 139;" C -Close_shape_culling src/Dodge/Data/Config.hs 91;" C +Close_shape_culling src/Dodge/Data/Config.hs 92;" C Cloud src/Dodge/Data/Cloud.hs 12;" t CloudType src/Dodge/Data/Cloud.hs 20;" t ClusterLink src/Dodge/Data/RoomCluster.hs 13;" t ClusterStatus src/Dodge/Data/RoomCluster.hs 9;" t Cognizant src/Dodge/Data/Creature/Perception.hs 65;" C -Collision_test src/Dodge/Data/Config.hs 96;" C +Collision_test src/Dodge/Data/Config.hs 97;" C Color src/Color/Data.hs 30;" t Color8 src/Color/Data.hs 32;" t ColorFaction src/Dodge/Data/Creature/State.hs 19;" C @@ -270,8 +270,8 @@ CrWdBFSThenReturn src/Dodge/Data/CreatureEffect.hs 27;" C CrWeaponFailSound src/Dodge/Data/SoundOrigin.hs 20;" C CrWeaponSound src/Dodge/Data/SoundOrigin.hs 18;" C CrWlID src/Dodge/Data/CrWlID.hs 10;" t -Cr_awareness src/Dodge/Data/Config.hs 84;" C -Cr_status src/Dodge/Data/Config.hs 83;" C +Cr_awareness src/Dodge/Data/Config.hs 85;" C +Cr_status src/Dodge/Data/Config.hs 84;" C CraftClust src/Dodge/Combine/Graph.hs 18;" C CraftType src/Dodge/Data/Item/Combine.hs 49;" t CreateFlame src/Dodge/Data/Item/Use/Consumption/Ammo.hs 17;" C @@ -284,7 +284,7 @@ Crushing src/Dodge/Data/Damage.hs 19;" C CryoReleaseCloud src/Dodge/Data/Cloud.hs 23;" C CryostatisSS src/Dodge/Data/Scenario.hs 91;" C Crystal src/Dodge/Data/Material.hs 16;" C -Cull_more_lights src/Dodge/Data/Config.hs 90;" C +Cull_more_lights src/Dodge/Data/Config.hs 91;" C CursorDisplay src/Dodge/Data/SelectionList.hs 19;" t Cylinder src/Shape/Data.hs 14;" C DETECTOR src/Dodge/Data/Item/Combine.hs 33;" C @@ -308,11 +308,11 @@ DamageType src/Dodge/Data/Damage/Type.hs 3;" t Debris src/Dodge/Data/Prop.hs 25;" t DebrisChunk src/Dodge/Data/Prop.hs 25;" C DebrisType src/Dodge/Data/Prop.hs 21;" t -DebugBool src/Dodge/Data/Config.hs 76;" t +DebugBool src/Dodge/Data/Config.hs 77;" t DebugItem src/Dodge/Data/Universe.hs 59;" t DebugLayer src/Picture/Data.hs 23;" C -Debug_get src/Dodge/Data/Config.hs 79;" C -Debug_put src/Dodge/Data/Config.hs 80;" C +Debug_get src/Dodge/Data/Config.hs 80;" C +Debug_put src/Dodge/Data/Config.hs 81;" C DecorationShape src/Dodge/Data/GenParams.hs 18;" t DefaultCrGroupUpdate src/Dodge/Data/CrGroupParams.hs 20;" C DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 11;" C @@ -325,7 +325,7 @@ Detector src/Dodge/Data/Item/Combine.hs 181;" t Dirt src/Dodge/Data/Material.hs 12;" C DisasterType src/Dodge/Data/Scenario.hs 24;" t DisplayTerminal src/Dodge/Data/HUD.hs 27;" C -Display_debug src/Dodge/Data/Config.hs 78;" C +Display_debug src/Dodge/Data/Config.hs 79;" C Distortion src/Dodge/Data/Distortion.hs 10;" t DivineRetribution src/Dodge/Data/Scenario.hs 35;" C DoActionIf src/Dodge/Data/ActionPlan.hs 87;" C @@ -346,7 +346,7 @@ DoorDoNothing src/Dodge/Data/Door.hs 43;" C DoorLerp src/Dodge/Data/Door.hs 43;" C DoorPart src/Dodge/Data/Wall/Structure.hs 12;" C DoorUpdate src/Dodge/Data/Door.hs 43;" t -DoubleRes src/Dodge/Data/Config.hs 110;" C +DoubleRes src/Dodge/Data/Config.hs 111;" C DoubleTreeNodeType src/Dodge/Data/DoubleTree.hs 14;" t DrawForceField src/Dodge/Data/Wall.hs 37;" C DrawnWall src/Dodge/Data/Wall.hs 33;" C @@ -364,7 +364,7 @@ Ears src/Dodge/Data/Creature/Perception.hs 45;" C East src/Dodge/Data/CardinalPoint.hs 8;" C East8 src/Dodge/Data/CardinalPoint.hs 30;" C EdgeObstacle src/Dodge/Data/PathGraph.hs 49;" t -EighthRes src/Dodge/Data/Config.hs 110;" C +EighthRes src/Dodge/Data/Config.hs 111;" C Eldritch src/Dodge/Data/Scenario.hs 34;" C ElectricSensor src/Dodge/Data/Machine/Sensor.hs 14;" C ElectricSpark src/Dodge/Data/Spark.hs 19;" C @@ -434,7 +434,7 @@ FlechetteTrajectoryType src/Dodge/Data/Bullet.hs 50;" C Flee src/Dodge/Data/ActionPlan.hs 143;" C Flesh src/Dodge/Data/Material.hs 17;" C FloatAbsCheckGreaterLess src/Dodge/Data/FloatFunction.hs 14;" C -FloatBO src/Shader/Data.hs 86;" t +FloatBO src/Shader/Data.hs 85;" t FloatConst src/Dodge/Data/FloatFunction.hs 15;" C FloatDistLinearNearFar src/Dodge/Data/FloatFunction.hs 13;" C FloatFOV src/Dodge/Data/FloatFunction.hs 11;" C @@ -453,7 +453,7 @@ ForceField src/Dodge/Data/Material.hs 19;" C ForceFieldType src/Dodge/Data/Item/Use/Consumption/Ammo.hs 11;" t ForegroundShape src/Dodge/Data/ForegroundShape.hs 12;" t FromEdge src/Dodge/Data/Room.hs 49;" C -FullRes src/Dodge/Data/Config.hs 110;" C +FullRes src/Dodge/Data/Config.hs 111;" C FullShadowFidelity src/Shape/Data.hs 19;" C FullSize src/Dodge/Data/Item/Params.hs 26;" C FullyVisible src/Dodge/Data/CamouflageStatus.hs 6;" C @@ -481,7 +481,7 @@ GenFloat src/Dodge/Data/GenFloat.hs 9;" t GenParams src/Dodge/Data/GenParams.hs 13;" t GenWorld src/Dodge/Data/GenWorld.hs 23;" t GenericFaction src/Dodge/Data/Creature/State.hs 13;" C -GeoObjShads src/Dodge/Data/Config.hs 114;" C +GeoObjShads src/Dodge/Data/Config.hs 115;" C GetTo src/Dodge/Data/ActionPlan.hs 141;" C GetToPoint src/Dodge/Data/Scenario.hs 12;" C Gib src/Dodge/Data/Prop.hs 22;" C @@ -511,7 +511,7 @@ HOMINGMODULE src/Dodge/Data/Item/Combine.hs 100;" C HOSE src/Dodge/Data/Item/Combine.hs 54;" C HP src/Dodge/Data/Creature.hs 63;" C HUD src/Dodge/Data/HUD.hs 29;" t -HalfRes src/Dodge/Data/Config.hs 110;" C +HalfRes src/Dodge/Data/Config.hs 111;" C HammerTrigger src/Dodge/Data/TriggerType.hs 10;" C HardQuit src/Dodge/Data/Universe.hs 70;" C HeavySmokeFlare src/Dodge/Data/Muzzle.hs 33;" C @@ -569,12 +569,12 @@ IncendiaryBall src/Dodge/Data/EnergyBall/Type.hs 11;" C InheritFloor src/Data/Tile.hs 12;" C Input src/Dodge/Data/Input.hs 33;" t InputScreen src/Dodge/Data/Universe.hs 92;" C -Inspect_wall src/Dodge/Data/Config.hs 104;" C +Inspect_wall src/Dodge/Data/Config.hs 105;" C Institution src/Dodge/Data/Scenario.hs 42;" t Int2 src/Geometry/Data.hs 21;" t IntID src/Dodge/Data/Universe.hs 110;" t Intention src/Dodge/Data/Creature.hs 68;" t -IntersectingRoomClipBoundaries src/Dodge/Data/Config.hs 120;" C +IntersectingRoomClipBoundaries src/Dodge/Data/Config.hs 121;" C IntroScanSF src/Dodge/Data/ComposedItem.hs 21;" C IntroScanType src/Dodge/Data/Item/Combine.hs 44;" t InvInt src/Dodge/Data/Item/Location.hs 16;" t @@ -763,7 +763,7 @@ MouseGameRotate src/Dodge/Data/Input.hs 29;" C MouseInGame src/Dodge/Data/Input.hs 16;" C MouseMenuClick src/Dodge/Data/Input.hs 17;" C MouseMenuCursor src/Dodge/Data/Input.hs 18;" C -Mouse_position src/Dodge/Data/Config.hs 85;" C +Mouse_position src/Dodge/Data/Config.hs 86;" C Move src/Dodge/Data/ActionPlan.hs 26;" C MoveEquipment src/Dodge/Data/RightButtonOptions.hs 20;" C MoveForward src/Dodge/Data/ActionPlan.hs 27;" C @@ -823,20 +823,20 @@ NoItTargeting src/Dodge/Data/Item.hs 44;" C NoItemScroll src/Dodge/Data/Item.hs 39;" C NoItemZone src/Dodge/Data/Machine/Sensor.hs 32;" C NoLightFlare src/Dodge/Data/Muzzle.hs 31;" C -NoLighting src/Dodge/Data/Config.hs 117;" C +NoLighting src/Dodge/Data/Config.hs 118;" C NoMouseContext src/Dodge/Data/Input.hs 14;" C NoMvType src/Dodge/Data/Creature/Misc.hs 27;" C -NoObjShads src/Dodge/Data/Config.hs 115;" C +NoObjShads src/Dodge/Data/Config.hs 116;" C NoParams src/Dodge/Data/Item/Params.hs 13;" C NoRightButtonState src/Dodge/Data/RightButtonOptions.hs 14;" C -NoRoomClipBoundaries src/Dodge/Data/Config.hs 120;" C +NoRoomClipBoundaries src/Dodge/Data/Config.hs 121;" C NoSF src/Dodge/Data/ComposedItem.hs 29;" C NoShadowFidelity src/Shape/Data.hs 20;" C -NoShadows src/Dodge/Data/Config.hs 116;" C +NoShadows src/Dodge/Data/Config.hs 117;" C NoSubInventory src/Dodge/Data/HUD.hs 15;" C NoTrigger src/Dodge/Data/TriggerType.hs 11;" C NoWorldEffect src/Dodge/Data/WorldEffect.hs 21;" C -Noclip src/Dodge/Data/Config.hs 82;" C +Noclip src/Dodge/Data/Config.hs 83;" C NodeMTree src/Dodge/Data/MetaTree.hs 16;" C NodeTree src/Dodge/Data/MetaTree.hs 15;" C NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 82;" C @@ -964,7 +964,7 @@ PathBetweenLeftRightClick src/Dodge/Data/Universe.hs 55;" C PathFromEdge src/Dodge/Data/Room.hs 77;" t PathShowType src/Dodge/Data/Universe.hs 54;" t PathTo src/Dodge/Data/ActionPlan.hs 70;" C -Pathing src/Dodge/Data/Config.hs 88;" C +Pathing src/Dodge/Data/Config.hs 89;" C Patrol src/Dodge/Data/ActionPlan.hs 132;" C PausedTimeFlow src/Dodge/Data/World.hs 79;" C Payload src/Dodge/Data/Payload.hs 9;" t @@ -998,7 +998,7 @@ PosInf src/Dodge/Data/CardinalPoint.hs 44;" C PosRooms src/Dodge/Tree/Shift.hs 28;" t Posture src/Dodge/Data/Creature/Stance.hs 33;" t PreloadData src/Data/Preload.hs 10;" t -PrimitiveMode src/Shader/Data.hs 108;" t +PrimitiveMode src/Shader/Data.hs 107;" t PrintMaterial src/Dodge/Data/AmmoType.hs 12;" C Prison src/Dodge/Data/Scenario.hs 65;" C Projectile src/Dodge/Data/Projectile.hs 15;" t @@ -1041,7 +1041,7 @@ PutTrigger src/Dodge/Data/GenWorld.hs 47;" C PutWall src/Dodge/Data/GenWorld.hs 54;" C PutWorldUpdate src/Dodge/Data/GenWorld.hs 58;" C QFloat src/Geometry/Data.hs 50;" t -QuarterRes src/Dodge/Data/Config.hs 110;" C +QuarterRes src/Dodge/Data/Config.hs 111;" C QuicksaveSlot src/Dodge/Data/SaveSlot.hs 8;" C RAM src/Dodge/Data/Item/Combine.hs 73;" C RED src/Color/Data.hs 12;" C @@ -1059,7 +1059,7 @@ RPLinkStatus src/Dodge/Data/Room.hs 58;" t RProps src/Dodge/Layout/Generate.hs 13;" C RadarBlip src/Dodge/Data/RadarBlip.hs 12;" t RadarSweep src/Dodge/Data/RadarSweep.hs 17;" t -RadialDistortion src/Dodge/Data/Distortion.hs 11;" C +RadialDistortion src/Dodge/Data/Distortion.hs 10;" C RandImpulse src/Dodge/Data/ActionPlan.hs 49;" t RandImpulseCircMove src/Dodge/Data/ActionPlan.hs 51;" C RandImpulseList src/Dodge/Data/ActionPlan.hs 50;" C @@ -1076,13 +1076,13 @@ Reload src/Dodge/Data/ActionPlan.hs 142;" C RemoteDetonatorSF src/Dodge/Data/ComposedItem.hs 27;" C RemoteScreenSF src/Dodge/Data/ComposedItem.hs 25;" C RemoveEquipment src/Dodge/Data/RightButtonOptions.hs 33;" C -Remove_LOS src/Dodge/Data/Config.hs 89;" C +Remove_LOS src/Dodge/Data/Config.hs 90;" C RenderData src/Data/Preload/Render.hs 13;" t ReplaceEquipment src/Dodge/Data/RightButtonOptions.hs 29;" C RequireDeadCreatures src/Dodge/Data/Machine/Sensor.hs 37;" C RequireEquipment src/Dodge/Data/Machine/Sensor.hs 36;" C RequireHealth src/Dodge/Data/Machine/Sensor.hs 35;" C -ResFactor src/Dodge/Data/Config.hs 110;" t +ResFactor src/Dodge/Data/Config.hs 111;" t ResearchFacility src/Dodge/Data/Scenario.hs 62;" C ResourceFailure src/Dodge/Data/Scenario.hs 29;" C RespawnDelay src/Dodge/Data/World.hs 61;" C @@ -1100,7 +1100,7 @@ RocketHoming src/Dodge/Data/Projectile.hs 39;" t RocketSmoke src/Dodge/Data/Projectile.hs 52;" t RocketSmoke src/Dodge/Data/Cloud.hs 22;" C Room src/Dodge/Data/GenWorld.hs 120;" t -RoomClipping src/Dodge/Data/Config.hs 120;" t +RoomClipping src/Dodge/Data/Config.hs 121;" t RoomInt src/Dodge/Tree/Shift.hs 26;" t RoomLink src/Dodge/Data/Room.hs 24;" t RoomLinkType src/Dodge/Data/Room.hs 43;" t @@ -1126,7 +1126,7 @@ SPEEDLEGS src/Dodge/Data/Item/Combine.hs 129;" C SPRING src/Dodge/Data/Item/Combine.hs 53;" C SPic src/ShapePicture/Data.hs 7;" t SQUARE src/Dodge/Data/GenParams.hs 18;" C -SSBO src/Shader/Data.hs 97;" t +SSBO src/Shader/Data.hs 96;" t SString src/ShortShow.hs 16;" C ST src/Dodge/Data/MetaTree.hs 20;" C STEELDRUM src/Dodge/Data/Item/Combine.hs 58;" C @@ -1160,9 +1160,9 @@ SetLSCol src/Dodge/Data/WorldEffect.hs 24;" C SetTrigger src/Dodge/Data/WorldEffect.hs 22;" C ShadNum src/Picture/Data.hs 31;" t Shader src/Shader/Data.hs 51;" t -ShaderTexture src/Shader/Data.hs 103;" t +ShaderTexture src/Shader/Data.hs 102;" t ShadowFidelity src/Shape/Data.hs 19;" t -ShadowRendering src/Dodge/Data/Config.hs 113;" t +ShadowRendering src/Dodge/Data/Config.hs 114;" t Shape src/Shape/Data.hs 48;" t ShapeProp src/Dodge/Data/Prop.hs 14;" C ShapeType src/Shape/Data.hs 11;" t @@ -1175,27 +1175,27 @@ ShockwaveDirection src/Dodge/Data/Shockwave.hs 12;" t ShootAt src/Dodge/Data/ActionPlan.hs 133;" C ShortShow src/ShortShow.hs 6;" c ShortString src/ShortShow.hs 16;" t -Show_bound_box src/Dodge/Data/Config.hs 92;" C -Show_dda_test src/Dodge/Data/Config.hs 95;" C -Show_far_wall_detect src/Dodge/Data/Config.hs 98;" C -Show_mouse_click_pos src/Dodge/Data/Config.hs 107;" C -Show_ms_frame src/Dodge/Data/Config.hs 77;" C -Show_path_between src/Dodge/Data/Config.hs 105;" C -Show_sound src/Dodge/Data/Config.hs 81;" C -Show_wall_search_rays src/Dodge/Data/Config.hs 94;" C -Show_walls_near_point_cursor src/Dodge/Data/Config.hs 99;" C -Show_walls_near_point_you src/Dodge/Data/Config.hs 100;" C -Show_walls_near_segment src/Dodge/Data/Config.hs 101;" C -Show_writable_values src/Dodge/Data/Config.hs 106;" C -Show_zone_circ src/Dodge/Data/Config.hs 103;" C -Show_zone_near_point_cursor src/Dodge/Data/Config.hs 102;" C +Show_bound_box src/Dodge/Data/Config.hs 93;" C +Show_dda_test src/Dodge/Data/Config.hs 96;" C +Show_far_wall_detect src/Dodge/Data/Config.hs 99;" C +Show_mouse_click_pos src/Dodge/Data/Config.hs 108;" C +Show_ms_frame src/Dodge/Data/Config.hs 78;" C +Show_path_between src/Dodge/Data/Config.hs 106;" C +Show_sound src/Dodge/Data/Config.hs 82;" C +Show_wall_search_rays src/Dodge/Data/Config.hs 95;" C +Show_walls_near_point_cursor src/Dodge/Data/Config.hs 100;" C +Show_walls_near_point_you src/Dodge/Data/Config.hs 101;" C +Show_walls_near_segment src/Dodge/Data/Config.hs 102;" C +Show_writable_values src/Dodge/Data/Config.hs 107;" C +Show_zone_circ src/Dodge/Data/Config.hs 104;" C +Show_zone_near_point_cursor src/Dodge/Data/Config.hs 103;" C ShrapnelBomb src/Dodge/Data/Payload.hs 10;" C ShrinkGunStatus src/Dodge/Data/Item/Params.hs 26;" t Shrunk src/Dodge/Data/Item/Params.hs 26;" C SideCluster src/Dodge/Data/RoomCluster.hs 13;" C SideEffect src/Dodge/Data/Universe.hs 64;" t SimpleEdge src/Dodge/Data/PathGraph.hs 43;" t -SixteenthRes src/Dodge/Data/Config.hs 110;" C +SixteenthRes src/Dodge/Data/Config.hs 111;" C Size src/Shape/Data.hs 23;" t SkiffBaySS src/Dodge/Data/Scenario.hs 108;" C SleepingQuatersSS src/Dodge/Data/Scenario.hs 90;" C @@ -1358,7 +1358,7 @@ TwoHandUnder src/Dodge/Data/AimStance.hs 11;" C Typical src/Shape/Data.hs 31;" C UNDERBARRELSLOT src/Dodge/Data/Item/Combine.hs 97;" C UNIGATE src/Dodge/Data/Item/Combine.hs 30;" C -UintBO src/Shader/Data.hs 92;" t +UintBO src/Shader/Data.hs 91;" t UnderBarrelPlatformSF src/Dodge/Data/ComposedItem.hs 16;" C UnderBarrelSlotSF src/Dodge/Data/ComposedItem.hs 15;" C UnderGround src/Dodge/Data/Scenario.hs 78;" C @@ -1406,7 +1406,7 @@ VIOLET src/Color/Data.hs 19;" C VOLLEYGUN src/Dodge/Data/Item/Combine.hs 151;" C VertexAttribute src/Shader/Data.hs 66;" t Verx src/Picture/Data.hs 11;" t -View_boundaries src/Dodge/Data/Config.hs 86;" C +View_boundaries src/Dodge/Data/Config.hs 87;" C ViewingDeckSS src/Dodge/Data/Scenario.hs 106;" C Vigilance src/Dodge/Data/Creature/Perception.hs 50;" t Vigilant src/Dodge/Data/Creature/Perception.hs 54;" C @@ -1435,7 +1435,7 @@ WallP src/Dodge/LevelGen/StaticWalls/Deprecated.hs 11;" t WallSound src/Dodge/Data/SoundOrigin.hs 24;" C WallStructure src/Dodge/Data/Wall/Structure.hs 10;" t WallWire src/Dodge/Data/Room.hs 55;" C -Walls_info src/Dodge/Data/Config.hs 87;" C +Walls_info src/Dodge/Data/Config.hs 88;" C War src/Dodge/Data/Scenario.hs 28;" C WarmTime src/Dodge/Data/Item/Params.hs 19;" C WarmUpCoolDown src/Dodge/Data/TriggerType.hs 14;" C @@ -1694,8 +1694,8 @@ _dbVel src/Dodge/Data/Prop.hs 28;" f _debris src/Dodge/Data/LWorld.hs 100;" f _debugFunction src/Dodge/Data/Universe.hs 61;" f _debugMessage src/Dodge/Data/Universe.hs 60;" f -_debug_booleans src/Dodge/Data/Config.hs 67;" f -_debug_view_clip_bounds src/Dodge/Data/Config.hs 66;" f +_debug_booleans src/Dodge/Data/Config.hs 68;" f +_debug_view_clip_bounds src/Dodge/Data/Config.hs 67;" f _delayedEvents src/Dodge/Data/LWorld.hs 130;" f _diCloseFilter src/Dodge/Data/HUD.hs 34;" f _diInvFilter src/Dodge/Data/HUD.hs 33;" f @@ -1787,9 +1787,9 @@ _flames src/Dodge/Data/LWorld.hs 105;" f _flankTarget src/Dodge/Data/ActionPlan.hs 129;" f _flares src/Dodge/Data/LWorld.hs 108;" f _flatShieldWlMIX src/Dodge/Data/Item/Params.hs 14;" f -_flboName src/Shader/Data.hs 87;" f -_flboPtr src/Shader/Data.hs 88;" f -_flboStride src/Shader/Data.hs 89;" f +_flboName src/Shader/Data.hs 86;" f +_flboPtr src/Shader/Data.hs 87;" f +_flboStride src/Shader/Data.hs 88;" f _floorItems src/Dodge/Data/LWorld.hs 127;" f _floorShader src/Data/Preload/Render.hs 45;" f _floorVBO src/Data/Preload/Render.hs 44;" f @@ -1800,7 +1800,7 @@ _fsSPic src/Dodge/Data/ForegroundShape.hs 15;" f _fullscreenShader src/Data/Preload/Render.hs 22;" f _futureWorlds src/Dodge/Data/World.hs 67;" f _futureWorlds src/Dodge/Data/World.hs 73;" f -_gameplay_rotate_to_wall src/Dodge/Data/Config.hs 65;" f +_gameplay_rotate_to_wall src/Dodge/Data/Config.hs 66;" f _genInts src/Dodge/Data/GenWorld.hs 27;" f _genPmnt src/Dodge/Data/GenWorld.hs 26;" f _genRooms src/Dodge/Data/GenWorld.hs 25;" f @@ -1822,13 +1822,14 @@ _grViewpoints src/Dodge/GameRoom.hs 13;" f _grViewpointsEx src/Dodge/GameRoom.hs 14;" f _gr_bloom src/Dodge/Data/Config.hs 54;" f _gr_cloud_shadows src/Dodge/Data/Config.hs 52;" f -_gr_distortion_res src/Dodge/Data/Config.hs 59;" f +_gr_distortion_res src/Dodge/Data/Config.hs 60;" f _gr_distortions src/Dodge/Data/Config.hs 53;" f -_gr_downsize_res src/Dodge/Data/Config.hs 57;" f -_gr_num_shadow_casters src/Dodge/Data/Config.hs 60;" f +_gr_downsize_res src/Dodge/Data/Config.hs 58;" f +_gr_num_shadow_casters src/Dodge/Data/Config.hs 61;" f _gr_shadow_rendering src/Dodge/Data/Config.hs 55;" f -_gr_shadow_size src/Dodge/Data/Config.hs 56;" f -_gr_world_res src/Dodge/Data/Config.hs 58;" f +_gr_shadow_size src/Dodge/Data/Config.hs 57;" f +_gr_shadows_on_clouds src/Dodge/Data/Config.hs 56;" f +_gr_world_res src/Dodge/Data/Config.hs 59;" f _gsZoning src/Dodge/Data/World.hs 54;" f _guID src/Dodge/Data/Gust.hs 12;" f _guPos src/Dodge/Data/Gust.hs 13;" f @@ -2273,8 +2274,8 @@ _ssItems src/Dodge/Data/SelectionList.hs 30;" f _ssOffset src/Dodge/Data/SelectionList.hs 31;" f _ssShownItems src/Dodge/Data/SelectionList.hs 32;" f _ssShownLength src/Dodge/Data/SelectionList.hs 33;" f -_ssboName src/Shader/Data.hs 98;" f -_ssboPtr src/Shader/Data.hs 99;" f +_ssboName src/Shader/Data.hs 97;" f +_ssboPtr src/Shader/Data.hs 98;" f _strideAmount src/Dodge/Data/Creature/Stance.hs 23;" f _strideLength src/Dodge/Data/Creature/Stance.hs 18;" f _stuckCrID src/Dodge/Data/Projectile.hs 48;" f @@ -2308,7 +2309,7 @@ _terminals src/Dodge/Data/LWorld.hs 122;" f _teslaArcs src/Dodge/Data/LWorld.hs 110;" f _testFloat src/Dodge/Data/World.hs 42;" f _textInput src/Dodge/Data/Input.hs 46;" f -_textureObject src/Shader/Data.hs 104;" f +_textureObject src/Shader/Data.hs 103;" f _tiText src/Dodge/Data/Terminal/Status.hs 14;" f _tileArrayZ src/Data/Tile.hs 24;" f _tilePoly src/Data/Tile.hs 17;" f @@ -2358,18 +2359,19 @@ _uScope src/Dodge/Data/Item/Use.hs 34;" f _uValue src/Dodge/Data/Item/Use.hs 33;" f _uaParams src/Dodge/Data/Item/Use.hs 30;" f _ubMod src/Dodge/Data/Item/Use.hs 35;" f -_uiboName src/Shader/Data.hs 93;" f -_uiboPtr src/Shader/Data.hs 94;" f +_uiboName src/Shader/Data.hs 92;" f +_uiboPtr src/Shader/Data.hs 93;" f _unCombEdge src/Dodge/Combine/Graph.hs 30;" f _unCombNode src/Dodge/Combine/Graph.hs 23;" f _unFBO src/Shader/Data.hs 57;" f _unNInt src/NewInt.hs 16;" f _unNIntMap src/NewInt.hs 22;" f _unNIntSet src/NewInt.hs 19;" f -_unPrimitiveMode src/Shader/Data.hs 108;" f +_unPrimitiveMode src/Shader/Data.hs 107;" f _unPutCrit src/Dodge/Data/GenWorld.hs 32;" f _unST src/Dodge/Data/MetaTree.hs 20;" f _unTO src/Shader/Data.hs 59;" f +_unVAO src/Shader/Data.hs 64;" f _unfiredBarrels src/Dodge/Data/Item/Params.hs 17;" f _unpauseClock src/Dodge/Data/World.hs 56;" f _unputTerminal src/Dodge/Data/GenWorld.hs 42;" f @@ -2403,7 +2405,6 @@ _vaCount src/Shader/Data.hs 67;" f _vaNormalize src/Shader/Data.hs 69;" f _vaOffset src/Shader/Data.hs 70;" f _vaType src/Shader/Data.hs 68;" f -_vaoName src/Shader/Data.hs 64;" f _vboName src/Shader/Data.hs 80;" f _vboPtr src/Shader/Data.hs 81;" f _vboShapes src/Data/Preload/Render.hs 43;" f @@ -2436,11 +2437,11 @@ _wanPos src/Dodge/Data/LWorld.hs 157;" f _warmMax src/Dodge/Data/TriggerType.hs 19;" f _warmStart src/Dodge/Data/TriggerType.hs 15;" f _winVBO src/Data/Preload/Render.hs 48;" f -_windowPosX src/Dodge/Data/Config.hs 63;" f -_windowPosY src/Dodge/Data/Config.hs 64;" f +_windowPosX src/Dodge/Data/Config.hs 64;" f +_windowPosY src/Dodge/Data/Config.hs 65;" f _windowPullShader src/Data/Preload/Render.hs 20;" f -_windowX src/Dodge/Data/Config.hs 61;" f -_windowY src/Dodge/Data/Config.hs 62;" f +_windowX src/Dodge/Data/Config.hs 62;" f +_windowY src/Dodge/Data/Config.hs 63;" f _wlHeight src/Dodge/Data/Wall.hs 25;" f _wlID src/Dodge/Data/Wall.hs 19;" f _wlLine src/Dodge/Data/Wall.hs 18;" f @@ -2549,8 +2550,8 @@ applyMagnetsToBul src/Dodge/Bullet.hs 32;" f applyPastDamages src/Dodge/Creature/State.hs 49;" f applyPosition src/Sound.hs 111;" f applyRecoil src/Dodge/HeldUse.hs 459;" f -applyResFactor src/Dodge/Data/Config.hs 123;" f -applyResFactorF src/Dodge/Data/Config.hs 132;" f +applyResFactor src/Dodge/Data/Config.hs 124;" f +applyResFactorF src/Dodge/Data/Config.hs 133;" f applySetTerminalString src/Dodge/Debug/Terminal.hs 83;" f applySidePush src/Dodge/HeldUse.hs 559;" f applySoundCME src/Dodge/HeldUse.hs 449;" f @@ -2595,7 +2596,7 @@ attachOnward src/Dodge/Tree/Compose.hs 95;" f attachOnward' src/Dodge/Tree/Compose.hs 98;" f attachTree src/Dodge/Tree/Compose.hs 38;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 75;" f -attribSize src/Shader/Compile.hs 304;" f +attribSize src/Shader/Compile.hs 196;" f autoAmr src/Dodge/Item/Held/Rod.hs 39;" f autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 488;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f @@ -2629,7 +2630,7 @@ baseItemTriggerType src/Dodge/BaseTriggerType.hs 21;" f baseRifleShape src/Dodge/Item/Draw/SPic.hs 326;" f baseRodShape src/Dodge/Item/Draw/SPic.hs 403;" f baseSMGShape src/Dodge/Item/Draw/SPic.hs 391;" f -baseShoulder src/Dodge/Creature/Picture.hs 116;" f +baseShoulder src/Dodge/Creature/Picture.hs 117;" f baseStickShape src/Dodge/Item/Draw/SPic.hs 300;" f baseStickShapeX src/Dodge/Item/Draw/SPic.hs 292;" f baseStickSpread src/Dodge/HeldUse.hs 319;" f @@ -2649,7 +2650,7 @@ beltMag src/Dodge/Item/Ammo.hs 39;" f bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 226;" f bgateCalc src/Dodge/Inventory/SelectionList.hs 118;" f bgunSound src/Dodge/HeldUse.hs 514;" f -bindFBO src/Render.hs 228;" f +bindFBO src/Render.hs 231;" f bingate src/Dodge/Item/Scope.hs 109;" f black src/Color.hs 27;" f blank src/Picture/Base.hs 59;" f @@ -2684,6 +2685,7 @@ bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 598;" f blowTorch src/Dodge/Item/Held/SprayGuns.hs 43;" f blue src/Color.hs 16;" f blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f +boolOption src/Dodge/Menu/OptionType.hs 12;" f bossKeyItems src/Dodge/LockAndKey.hs 12;" f bossRoom src/Dodge/Room/Boss.hs 58;" f bounceDir src/Dodge/Bullet.hs 111;" f @@ -2705,7 +2707,7 @@ brightX src/Color.hs 116;" f btSPic src/Dodge/Render/ShapePicture.hs 129;" f btText src/Dodge/Inventory/SelectionList.hs 237;" f bufferEBO src/Shader/Bind.hs 28;" f -bufferPerspectiveMatrixUBO src/Dodge/Render.hs 402;" f +bufferPerspectiveMatrixUBO src/Dodge/Render.hs 399;" f bufferPokedVBO src/Shader/Bind.hs 19;" f bufferShaderLayers src/Shader/Bind.hs 32;" f bulletBeltBracer src/Dodge/Item/Equipment.hs 67;" f @@ -2761,7 +2763,7 @@ checkConnection src/Dodge/Inventory/Swap.hs 66;" f checkDeath src/Dodge/Creature/Update.hs 70;" f checkDeath' src/Dodge/Creature/Update.hs 73;" f checkEndGame src/Dodge/Update.hs 766;" f -checkErrorGL src/Shader/Compile.hs 251;" f +checkErrorGL src/Shader/Compile.hs 143;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 14;" f checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 18;" f @@ -2790,7 +2792,7 @@ circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f clAlt src/Dodge/Cloud.hs 5;" f clClSpringVel src/Dodge/Update.hs 839;" f -clColor src/Shader/Poke/Cloud.hs 38;" f +clColor src/Shader/Poke/Cloud.hs 37;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 146;" f clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f @@ -2862,7 +2864,7 @@ compP2A src/Dodge/ShiftPoint.hs 11;" f compactDraw src/Dodge/LevelGen.hs 94;" f compactDraw' src/Dodge/LevelGen.hs 105;" f compactDrawTree src/Dodge/LevelGen.hs 88;" f -compileAndCheckShader src/Shader/Compile.hs 273;" f +compileAndCheckShader src/Shader/Compile.hs 165;" f composeNode src/Dodge/Tree/Compose.hs 76;" f composeTree src/Dodge/Tree/Compose.hs 47;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f @@ -2981,8 +2983,8 @@ cutWallsPoints src/Dodge/LevelGen/StaticWalls.hs 121;" f cutWallsRetry src/Dodge/LevelGen/StaticWalls.hs 39;" f cutWallsWithPoints src/Dodge/LevelGen/StaticWalls.hs 112;" f cyan src/Color.hs 18;" f -cycleDownEnum src/Dodge/Menu/OptionType.hs 27;" f -cycleEnum src/Dodge/Menu/OptionType.hs 22;" f +cycleDownEnum src/Dodge/Menu/OptionType.hs 31;" f +cycleEnum src/Dodge/Menu/OptionType.hs 26;" f cycleGT src/IntMapHelp.hs 94;" f cycleL src/DoubleStack.hs 28;" f cycleLT src/IntMapHelp.hs 97;" f @@ -3022,7 +3024,7 @@ deadEndRoom src/Dodge/Room/Room.hs 246;" f deadFeet src/Dodge/Creature/Picture.hs 68;" f deadRot src/Dodge/Creature/Picture.hs 84;" f deadScalp src/Dodge/Creature/Picture.hs 81;" f -deadUpperBody src/Dodge/Creature/Picture.hs 113;" f +deadUpperBody src/Dodge/Creature/Picture.hs 114;" f debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f debrisSPic src/Dodge/Prop/Draw.hs 16;" f debrisSize src/Dodge/Block/Debris.hs 83;" f @@ -3033,7 +3035,7 @@ debugItem src/Dodge/Debug.hs 40;" f debugMenu src/Dodge/Menu.hs 124;" f debugMenuOptions src/Dodge/Menu.hs 130;" f debugMouseClickPos src/Dodge/Debug.hs 145;" f -debugOn src/Dodge/Data/Config.hs 173;" f +debugOn src/Dodge/Data/Config.hs 175;" f debugPutDraw src/Dodge/Debug.hs 95;" f debugPutItems src/Dodge/Debug.hs 78;" f debugPutN src/Dodge/Debug.hs 84;" f @@ -3067,7 +3069,7 @@ defaultCWGen src/Dodge/Default/World.hs 59;" f defaultCWorld src/Dodge/Default/World.hs 84;" f defaultChaseMvType src/Dodge/Creature/MoveType.hs 25;" f defaultClusterStatus src/Dodge/Default/Room.hs 37;" f -defaultConfig src/Dodge/Data/Config.hs 149;" f +defaultConfig src/Dodge/Data/Config.hs 150;" f defaultCraftItem src/Dodge/Default/Item.hs 25;" f defaultCreature src/Dodge/Default/Creature.hs 12;" f defaultCreatureMemory src/Dodge/Default/Creature.hs 65;" f @@ -3130,8 +3132,8 @@ digitalRect src/Geometry.hs 302;" f dim src/Color.hs 112;" f dirtPoly src/Dodge/Room/RoadBlock.hs 74;" f disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" f -displayConfig src/Dodge/Menu.hs 224;" f -displayControls src/Dodge/Menu.hs 240;" f +displayConfig src/Dodge/Menu.hs 225;" f +displayControls src/Dodge/Menu.hs 241;" f displayFrameTicks src/Dodge/Render/Picture.hs 51;" f displayFreeSlots src/Dodge/DisplayInventory.hs 192;" f displayIndents src/Dodge/DisplayInventory.hs 110;" f @@ -3266,7 +3268,7 @@ drawDragSelected src/Dodge/Render/HUD.hs 137;" f drawDragSelecting src/Dodge/Render/HUD.hs 154;" f drawEmptySet src/Dodge/Render/Picture.hs 153;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 7;" f -drawEquipment src/Dodge/Creature/Picture.hs 127;" f +drawEquipment src/Dodge/Creature/Picture.hs 128;" f drawExamineInventory src/Dodge/Render/HUD.hs 199;" f drawExplosiveBall src/Dodge/EnergyBall/Draw.hs 15;" f drawFarWallDetect src/Dodge/Debug/Picture.hs 270;" f @@ -3323,8 +3325,8 @@ drawSelect src/Dodge/Render/Picture.hs 257;" f drawSelectionList src/Dodge/Render/List.hs 36;" f drawSelectionListBackground src/Dodge/Render/List.hs 52;" f drawSelectionSections src/Dodge/SelectionSections/Draw.hs 16;" f -drawShader src/Shader.hs 27;" f -drawShaderLay src/Shader.hs 16;" f +drawShader src/Shader.hs 26;" f +drawShaderLay src/Shader.hs 15;" f drawShadowsByImportance src/Dodge/Shadows.hs 8;" f drawShell src/Dodge/Projectile/Draw.hs 22;" f drawShockwave src/Dodge/Shockwave/Draw.hs 6;" f @@ -3376,7 +3378,7 @@ dtToLRAdjEither src/Dodge/DoubleTree.hs 181;" f dtToRootIntMap' src/Dodge/DoubleTree.hs 153;" f dtToUpDownAdj src/Dodge/DoubleTree.hs 158;" f dummyMenuOption src/Dodge/Menu/Option.hs 72;" f -dustColor src/Shader/Poke/Cloud.hs 45;" f +dustColor src/Shader/Poke/Cloud.hs 44;" f dustSpringVel src/Dodge/Update.hs 850;" f ebColor src/Dodge/EnergyBall.hs 77;" f ebDamage src/Dodge/EnergyBall.hs 85;" f @@ -3402,6 +3404,7 @@ endCombineRegex src/Dodge/Update/Input/InGame.hs 271;" f endRegex src/Dodge/Update/Input/InGame.hs 265;" f energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" f enterCombineInv src/Dodge/DisplayInventory.hs 317;" f +enumOption src/Dodge/Menu/OptionType.hs 17;" f epText src/Dodge/Inventory/SelectionList.hs 76;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 5;" f @@ -3446,7 +3449,7 @@ facesToVF src/Polyhedra/Geodesic.hs 69;" f farWallDistDirection src/Dodge/Update/Camera.hs 244;" f fdiv src/ShortShow.hs 41;" f feet src/Dodge/Creature/Picture.hs 51;" f -ffoldM src/Framebuffer/Update.hs 86;" f +ffoldM src/Framebuffer/Update.hs 85;" f filter3 src/FoldableHelp.hs 76;" f filterSectionsPair src/Dodge/DisplayInventory.hs 157;" f findBlips src/Dodge/RadarSweep.hs 63;" f @@ -3510,8 +3513,7 @@ forceSpine src/StrictHelp.hs 4;" f fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 29;" f fpsText src/Dodge/Render/Picture.hs 59;" f fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 145;" f -frag src/Shader/Data.hs 111;" f -freeShaderPointers' src/Shader.hs 37;" f +frag src/Shader/Data.hs 110;" f fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" f fromJust' src/MaybeHelp.hs 22;" f fromListL src/DoubleStack.hs 7;" f @@ -3528,7 +3530,7 @@ g src/ShortShow.hs 48;" f gLauncher src/Dodge/Item/Held/Launcher.hs 24;" f gRandify src/Dodge/Randify.hs 11;" f gadgetEffect src/Dodge/HeldUse.hs 47;" f -gameOverMenu src/Dodge/Menu.hs 201;" f +gameOverMenu src/Dodge/Menu.hs 202;" f gameRoomFromRoom src/Dodge/Layout.hs 152;" f gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomsFromRooms src/Dodge/Layout.hs 149;" f @@ -3540,7 +3542,7 @@ generateGraphs src/Dodge/Menu.hs 149;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f generateLevelFromRoomList src/Dodge/Layout.hs 35;" f generateWorldFromSeed src/Dodge/LevelGen.hs 17;" f -geom src/Shader/Data.hs 111;" f +geom src/Shader/Data.hs 110;" f geometryQuickCheckTests test/Spec.hs 55;" f geometryTests test/Spec.hs 17;" f geometryUnitTests test/Spec.hs 22;" f @@ -3559,7 +3561,7 @@ getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f getCrsFromRooms src/Dodge/Room/Tutorial.hs 357;" f getCrsFromRooms' src/Dodge/Room/Tutorial.hs 344;" f getDebugMouseOver src/Dodge/Update.hs 374;" f -getDistortions src/Dodge/Render.hs 414;" f +getDistortions src/Dodge/Render.hs 411;" f getEdgesCrossing src/Dodge/Path.hs 37;" f getGrenadeHitEffect src/Dodge/HeldUse.hs 1264;" f getInventoryPath src/Dodge/Inventory/Path.hs 9;" f @@ -3584,8 +3586,8 @@ getTiles src/Dodge/Layout.hs 199;" f getViewpoints src/Dodge/Viewpoints.hs 29;" f getVolleyBurst src/Dodge/HeldUse.hs 126;" f getWallPathing src/Dodge/Wall/Pathing.hs 7;" f -getWallSPic src/Dodge/Render/Walls.hs 53;" f -getWindowSize src/Dodge/WindowSize.hs 5;" f +getWallSPic src/Dodge/Render/Walls.hs 55;" f +getWindowSize src/Dodge/WindowSize.hs 6;" f gimbal src/Dodge/Item/Scope.hs 153;" f girder src/Dodge/Room/Foreground.hs 206;" f girderV src/Dodge/Room/Foreground.hs 177;" f @@ -3713,7 +3715,7 @@ initialisePlaying src/Sound.hs 77;" f initializeGLState src/Preload/Render.hs 234;" f initializeOptionMenu src/Dodge/Menu/Option.hs 17;" f initializeOptionMenuBO src/Dodge/Menu/Option.hs 30;" f -initializeTexture2D src/Framebuffer/Update.hs 218;" f +initializeTexture2D src/Framebuffer/Update.hs 214;" f inorderNumberTree src/TreeHelp.hs 190;" f insertAt src/Padding.hs 63;" f insertIMInZone src/Dodge/Base.hs 54;" f @@ -3949,8 +3951,8 @@ lineThick src/Picture/Base.hs 234;" f lineUp src/Dodge/Creature/Boid.hs 150;" f linksDAGToPath src/Dodge/Room/Path.hs 13;" f linksOnPath src/Dodge/Room/CheckConsistency.hs 6;" f -listConfig src/Dodge/Menu.hs 233;" f -listControls src/Dodge/Menu.hs 245;" f +listConfig src/Dodge/Menu.hs 234;" f +listControls src/Dodge/Menu.hs 246;" f listCursorChooseBorderScale src/Dodge/Render/List.hs 135;" f listGuard src/Dodge/Creature/ReaderUpdate.hs 196;" f listSelectionColorPicture src/Dodge/DisplayInventory.hs 302;" f @@ -4025,7 +4027,6 @@ makeArc src/Picture/Base.hs 157;" f makeAttach src/Dodge/Item/Attach.hs 10;" f makeBlip src/Dodge/RadarSweep.hs 70;" f makeBlockDebris src/Dodge/Block/Debris.hs 36;" f -makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f makeBullet src/Dodge/HeldUse.hs 979;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 7;" f @@ -4036,7 +4037,6 @@ makeDebris src/Dodge/Block/Debris.hs 48;" f makeDebrisDirected src/Dodge/Block/Debris.hs 51;" f makeDoorDebris src/Dodge/Block/Debris.hs 26;" f makeDustAt src/Dodge/WorldEvent/Cloud.hs 17;" f -makeEnumOption src/Dodge/Menu/OptionType.hs 13;" f makeExplosionAt src/Dodge/WorldEvent/Explosion.hs 72;" f makeFlak src/Dodge/Bullet.hs 146;" f makeFlame src/Dodge/Flame.hs 45;" f @@ -4053,16 +4053,13 @@ makePathBetweenPs src/Dodge/Path.hs 87;" f makePathUsing src/Dodge/Path.hs 51;" f makePoisonExplosionAt src/Dodge/WorldEvent/Explosion.hs 24;" f makeSelectionListPictures src/Dodge/Render/List.hs 66;" f -makeShaderEBO src/Shader/Compile.hs 55;" f -makeShaderProgram src/Shader/Compile.hs 237;" f -makeShaderUsingVAO src/Shader/Compile.hs 136;" f -makeShaderUsingVBO src/Shader/Compile.hs 71;" f -makeShaderVBO src/Shader/Compile.hs 34;" f +makeShaderProgram src/Shader/Compile.hs 129;" f +makeShaderVBO src/Shader/Compile.hs 24;" f makeShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 11;" f makeShrapnelAt src/Dodge/Payload.hs 24;" f -makeSourcedShader src/Shader/Compile.hs 157;" f +makeSourcedShader src/Shader/Compile.hs 62;" f makeSpark src/Dodge/Spark.hs 45;" f -makeSubmenuOption src/Dodge/Menu/OptionType.hs 19;" f +makeSubmenuOption src/Dodge/Menu/OptionType.hs 23;" f makeSwitch src/Dodge/LevelGen/Switch.hs 38;" f makeTermLine src/Dodge/Terminal.hs 96;" f makeTermPara src/Dodge/Terminal.hs 105;" f @@ -4156,9 +4153,9 @@ missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 674;" f mixColors src/Color.hs 86;" f mixColorsFrac src/Color.hs 82;" f mixColorsLinear src/Color.hs 95;" f -mkCloudCloudLike src/Shader/Poke/Cloud.hs 20;" f +mkCloudCloudLike src/Shader/Poke/Cloud.hs 19;" f mkCustomLenses src/ThirdPartyLens.hs 7;" f -mkDustCloudLike src/Shader/Poke/Cloud.hs 26;" f +mkDustCloudLike src/Shader/Poke/Cloud.hs 25;" f mkGraphFromEdges src/GraphHelp.hs 4;" f mkNode src/Dodge/Graph.hs 29;" f mkRectangle src/Dodge/LevelGen/DoorPane.hs 7;" f @@ -4170,7 +4167,7 @@ mntLightLnkCond' src/Dodge/Placement/Instance/LightSource.hs 148;" f modTo src/Geometry/Zone.hs 18;" f mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 60;" f mouseCursorType src/Dodge/Render/Picture.hs 92;" f -mouseWorldPos src/Dodge/Base/Coordinate.hs 35;" f +mouseWorldPos src/Dodge/Base/Coordinate.hs 37;" f moveBullet src/Dodge/Bullet.hs 197;" f moveCombineSel src/Dodge/Update/Scroll.hs 121;" f moveInverseShockwave src/Dodge/Shockwave/Update.hs 31;" f @@ -4335,7 +4332,7 @@ pincerP src/Dodge/Creature/Boid.hs 63;" f pincerP' src/Dodge/Creature/Boid.hs 96;" f pincerP'' src/Dodge/Creature/Boid.hs 106;" f pincerP''' src/Dodge/Creature/Boid.hs 77;" f -pingPongBetween src/Render.hs 203;" f +pingPongBetween src/Render.hs 206;" f pipe src/Dodge/Item/Craftable.hs 32;" f pistol src/Dodge/Item/Held/Stick.hs 40;" f pistolerRoom src/Dodge/Room/Room.hs 330;" f @@ -4364,16 +4361,16 @@ playSoundAndUpdate src/Sound.hs 54;" f playSoundQueue src/Sound.hs 132;" f playSoundUnlessRewinding appDodge/Main.hs 118;" f plusDecoration src/Dodge/Placement/TopDecoration.hs 35;" f -pmLineLoop src/Shader/Data.hs 116;" f -pmLineStrip src/Shader/Data.hs 116;" f -pmLines src/Shader/Data.hs 116;" f -pmLinesAdjacency src/Shader/Data.hs 116;" f -pmPatches src/Shader/Data.hs 116;" f -pmPoints src/Shader/Data.hs 116;" f -pmQuads src/Shader/Data.hs 116;" f -pmTriangleFan src/Shader/Data.hs 116;" f -pmTriangleStrip src/Shader/Data.hs 116;" f -pmTriangles src/Shader/Data.hs 116;" 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 pointIfNotClose src/Dodge/LevelGen/StaticWalls/Deprecated.hs 68;" f pointInCircle src/Geometry.hs 209;" f @@ -4395,11 +4392,11 @@ pokeBox src/Shader/Poke.hs 228;" f pokeBoxSurface src/Shader/Poke.hs 261;" f pokeChasm src/Shader/Poke/Floor.hs 25;" f pokeChasmVerx src/Shader/Poke/Floor.hs 28;" f -pokeCloud src/Shader/Poke/Cloud.hs 14;" f -pokeCloudLike src/Shader/Poke/Cloud.hs 32;" f +pokeCloud src/Shader/Poke/Cloud.hs 13;" f +pokeCloudLike src/Shader/Poke/Cloud.hs 31;" f pokeCylinder src/Shader/Poke.hs 173;" f pokeCylinderCaps src/Shader/Poke.hs 216;" f -pokeDust src/Shader/Poke/Cloud.hs 17;" f +pokeDust src/Shader/Poke/Cloud.hs 16;" f pokeF src/Shader/Poke.hs 68;" f pokeFlatV src/Shader/Poke.hs 447;" f pokeFloors src/Shader/Poke.hs 62;" f @@ -4606,24 +4603,24 @@ removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeLights src/Dodge/Room/Tutorial.hs 257;" f removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f -renderDataResizeUpdate src/Preload/Update.hs 26;" f -renderFlatLighting src/Render.hs 104;" f +renderDataResizeUpdate src/Preload/Update.hs 27;" f +renderFlatLighting src/Render.hs 105;" f renderInfoListAt src/Dodge/Render/InfoBox.hs 17;" f renderInfoListsAt src/Dodge/Render/InfoBox.hs 44;" f -renderLayer src/Render.hs 217;" f -renderLightingNoShadows src/Render.hs 51;" f +renderLayer src/Render.hs 220;" f +renderLightingNoShadows src/Render.hs 52;" f renderListAt src/Dodge/Render/List.hs 192;" f -renderShadows src/Render.hs 119;" f +renderShadows src/Render.hs 120;" f replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 168;" f replacePutID src/Dodge/Placement/Instance/Wall.hs 105;" f resetCrVocCoolDown src/Dodge/Creature/Vocalization.hs 47;" f resetPLUse src/Dodge/PlacementSpot.hs 92;" f resetStride src/Dodge/Creature/State/WalkCycle.hs 25;" f resetTerminal src/Dodge/WorldEffect.hs 109;" f -resizeFBOTO src/Framebuffer/Update.hs 200;" f -resizeFBOTO2 src/Framebuffer/Update.hs 148;" f -resizeFBOTO3 src/Framebuffer/Update.hs 172;" f -resizeRBO src/Framebuffer/Update.hs 89;" f +resizeFBOTO src/Framebuffer/Update.hs 196;" f +resizeFBOTO2 src/Framebuffer/Update.hs 144;" f +resizeFBOTO3 src/Framebuffer/Update.hs 168;" f +resizeRBO src/Framebuffer/Update.hs 88;" f respawn src/Dodge/SpawnAt.hs 12;" f restrictInLinks src/Dodge/RoomLink.hs 44;" f restrictLinkType src/Dodge/RoomLink.hs 34;" f @@ -4745,7 +4742,7 @@ screenBox src/Dodge/Base/Window.hs 53;" f screenPolygon src/Dodge/Base/Window.hs 17;" f screenPolygonBord src/Dodge/Base/Window.hs 27;" f screenPosAbs src/Dodge/ScreenPos.hs 15;" f -screenToWorldPos src/Dodge/Base/Coordinate.hs 38;" f +screenToWorldPos src/Dodge/Base/Coordinate.hs 40;" f scrollAugInvSel src/Dodge/Inventory.hs 191;" f scrollAugNextInSection src/Dodge/Inventory.hs 204;" f scrollRBOption src/Dodge/Update/Scroll.hs 202;" f @@ -4813,7 +4810,7 @@ setRBCreatureTargeting src/Dodge/Creature/State.hs 290;" f setRoomInt src/Dodge/Room/Tutorial.hs 91;" f setSelWhileDragging src/Dodge/Update/Input/InGame.hs 337;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f -setShaderSource src/Shader/Compile.hs 286;" f +setShaderSource src/Shader/Compile.hs 178;" f setShadowLimits src/Dodge/Shadows.hs 11;" f setSoundVolume src/Sound.hs 157;" f setTargetMv src/Dodge/Creature/ReaderUpdate.hs 83;" f @@ -4822,29 +4819,26 @@ setTiles src/Dodge/Layout.hs 67;" f setTreeInts src/Dodge/Room/Tutorial.hs 98;" f setViewDistance src/Dodge/Update/Camera.hs 239;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 69;" f -setViewport src/Dodge/Render.hs 419;" f +setViewport src/Dodge/Render.hs 416;" f setVol src/Dodge/Config.hs 47;" f setWristShieldPos src/Dodge/Equipment.hs 49;" f setWristShieldPos src/Dodge/Euse.hs 38;" f setupConLoop src/Loop.hs 103;" f setupConLoop' src/Loop.hs 193;" f -setupEBO src/Shader/Compile.hs 181;" f setupFramebuffer2GivenStencil src/Framebuffer/Setup.hs 46;" f setupFramebuffer3GivenStencil src/Framebuffer/Setup.hs 62;" f setupFramebufferGivenStencil src/Framebuffer/Setup.hs 31;" f setupLoop src/Loop.hs 30;" f setupShadowFramebuffer src/Framebuffer/Setup.hs 24;" f -setupStaticVBOVAO src/Shader/Compile.hs 104;" f -setupVAOUsingVBO src/Shader/Compile.hs 169;" f -setupVBO src/Shader/Compile.hs 85;" f -setupVBOStatic src/Shader/Compile.hs 121;" f -setupVBOVAO src/Shader/Compile.hs 193;" f -setupVertexAttribPointer src/Shader/Compile.hs 218;" f -setupVertexAttribs src/Shader/Compile.hs 212;" f +setupVAOUsingVBO src/Shader/Compile.hs 74;" f +setupVBO src/Shader/Compile.hs 45;" f +setupVBOVAO src/Shader/Compile.hs 86;" f +setupVertexAttribPointer src/Shader/Compile.hs 110;" f +setupVertexAttribs src/Shader/Compile.hs 104;" f setupWorldBounds src/Dodge/Layout.hs 116;" f sfInvColor src/Dodge/Item/InventoryColor.hs 12;" f -shadVBOptr src/Shader.hs 40;" f -shaderTypeExt src/Shader/Compile.hs 162;" f +shadVBOptr src/Shader.hs 36;" f +shaderTypeExt src/Shader/Compile.hs 67;" f shapeBounds src/Dodge/Room/Foreground.hs 147;" f shapePoints src/Dodge/Room/Foreground.hs 144;" f shapeVerxSize src/Shape/Parameters.hs 5;" f @@ -4896,7 +4890,7 @@ shortPoint2 src/Dodge/ShortShow.hs 4;" f shortShow src/ShortShow.hs 7;" f shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 68;" f -shoulderSH src/Dodge/Creature/Picture.hs 124;" f +shoulderSH src/Dodge/Creature/Picture.hs 125;" f showAttachItem src/Dodge/Item/Display.hs 92;" f showEquipItem src/Dodge/Item/Display.hs 107;" f showInt src/Dodge/Item/Info.hs 75;" f @@ -4921,7 +4915,7 @@ singleDT src/Dodge/DoubleTree.hs 10;" f singleLDT src/Dodge/DoubleTree.hs 13;" f singleton src/DoubleStack.hs 11;" f singletonTrie src/SimpleTrie.hs 20;" f -sizeFBOs src/Framebuffer/Update.hs 20;" f +sizeFBOs src/Framebuffer/Update.hs 21;" f skColor src/Dodge/Spark/Draw.hs 14;" f skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 512;" f slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 670;" f @@ -5155,7 +5149,7 @@ toBinary src/Dodge/Inventory/SelectionList.hs 141;" f toBothLnk src/Dodge/RoomLink.hs 136;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 148;" f -toFloatVAs src/Shader/Compile.hs 204;" f +toFloatVAs src/Shader/Compile.hs 96;" f toLabel src/Dodge/Cleat.hs 16;" f toMultiset src/Multiset.hs 64;" f toOnward src/Dodge/Tree/Compose.hs 101;" f @@ -5180,7 +5174,7 @@ topTestPart src/Dodge/TestString.hs 47;" f torchShape src/Dodge/Item/Draw/SPic.hs 276;" f torqueAmount src/Dodge/HeldUse.hs 581;" f torqueCr src/Dodge/WorldEffect.hs 77;" f -torso src/Dodge/Creature/Picture.hs 102;" f +torso src/Dodge/Creature/Picture.hs 103;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f tractorBeamAt src/Dodge/HeldUse.hs 833;" f @@ -5275,7 +5269,7 @@ unfoldrMID src/MonadHelp.hs 33;" f unigate src/Dodge/Item/Scope.hs 102;" f unitVectorAtAngle src/Geometry/Vector.hs 101;" f unlockInv src/Dodge/Inventory/Lock.hs 12;" f -unpause src/Dodge/Menu.hs 206;" f +unpause src/Dodge/Menu.hs 207;" f unsafeBlinkAction src/Dodge/Creature/Action/Blink.hs 57;" f unsafeBlinker src/Dodge/Item/Held/Utility.hs 33;" f unsafeSwapKeys src/IntMapHelp.hs 75;" f @@ -5326,9 +5320,9 @@ updateEnergyBall src/Dodge/EnergyBall.hs 31;" f updateEnergyBalls src/Dodge/Update.hs 658;" f updateEnterRegex src/Dodge/Update/Input/InGame.hs 505;" f updateExpBarrel src/Dodge/Barreloid.hs 21;" f -updateFBOTO src/Framebuffer/Update.hs 92;" f -updateFBOTO2 src/Framebuffer/Update.hs 110;" f -updateFBOTO3 src/Framebuffer/Update.hs 128;" f +updateFBOTO src/Framebuffer/Update.hs 91;" f +updateFBOTO2 src/Framebuffer/Update.hs 108;" f +updateFBOTO3 src/Framebuffer/Update.hs 125;" f updateFlame src/Dodge/Flame.hs 19;" f updateFlames src/Dodge/Update.hs 655;" f updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f @@ -5364,7 +5358,7 @@ updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 166;" f updateObjCatMaybes src/Dodge/Update.hs 547;" f updateObjMapMaybe src/Dodge/Update.hs 540;" f updatePastWorlds src/Dodge/Update.hs 422;" f -updatePreload src/Preload/Update.hs 20;" f +updatePreload src/Preload/Update.hs 21;" f updateProjectile src/Dodge/Projectile/Update.hs 26;" f updatePulse src/Dodge/Creature/Update.hs 146;" f updatePulseBall src/Dodge/Update.hs 447;" f @@ -5407,7 +5401,7 @@ updateWheelEvent src/Dodge/Update/Scroll.hs 25;" f updateWheelEvents src/Dodge/Update.hs 412;" f updateWorldEventFlag src/Dodge/Update.hs 120;" f updateWorldEventFlags src/Dodge/Update.hs 108;" f -upperBody src/Dodge/Creature/Picture.hs 120;" f +upperBody src/Dodge/Creature/Picture.hs 121;" f upperBox src/Shape.hs 156;" f upperBoxHalf src/Shape.hs 222;" f upperBoxMT src/Shape.hs 147;" f @@ -5453,10 +5447,10 @@ vShape src/Dodge/Placement/Instance/LightSource.hs 93;" f vToL src/MatrixHelper.hs 56;" f vToQuat src/Quaternion.hs 42;" f validTerminalCommands src/Dodge/Debug/Terminal.hs 137;" f -vasTightStride src/Shader/Compile.hs 293;" f +vasTightStride src/Shader/Compile.hs 185;" f vecBetweenSpeed src/Dodge/Base.hs 146;" f vecTurnTo src/Dodge/Movement/Turn.hs 19;" f -vert src/Shader/Data.hs 111;" f +vert src/Shader/Data.hs 110;" f vertScale src/MatrixHelper.hs 95;" f vertTrans src/MatrixHelper.hs 103;" f verticalPipe src/Dodge/Picture.hs 19;" f @@ -5518,10 +5512,10 @@ whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 522;" f wiToFloat src/Dodge/Room/Modify/Girder.hs 168;" f winConfig appDodge/Main.hs 56;" f windowLine src/Dodge/Placement/Instance/Wall.hs 59;" f -windowXFloat src/Dodge/Data/Config.hs 71;" f -windowYFloat src/Dodge/Data/Config.hs 73;" f +windowXFloat src/Dodge/Data/Config.hs 72;" f +windowYFloat src/Dodge/Data/Config.hs 74;" f withAlpha src/Color.hs 10;" f -withByteString src/Shader/Compile.hs 322;" f +withByteString src/Shader/Compile.hs 214;" f wlIXsNearCirc src/Dodge/Zoning/Wall.hs 32;" f wlIXsNearPoint src/Dodge/Zoning/Wall.hs 22;" f wlIXsNearRect src/Dodge/Zoning/Wall.hs 29;" f @@ -5540,8 +5534,8 @@ wlsNearPoint src/Dodge/Zoning/Wall.hs 39;" f wlsNearRect src/Dodge/Zoning/Wall.hs 46;" f wlsNearSeg src/Dodge/Zoning/Wall.hs 42;" f wordsBy src/ListHelp.hs 116;" f -worldPosToResOffset src/Dodge/Base/Coordinate.hs 28;" f -worldPosToScreen src/Dodge/Base/Coordinate.hs 21;" f +worldPosToResOffset src/Dodge/Base/Coordinate.hs 29;" f +worldPosToScreen src/Dodge/Base/Coordinate.hs 22;" f worldSPic src/Dodge/Render/ShapePicture.hs 22;" f worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f wpAdd src/Dodge/Room/RezBox.hs 148;" f