Make clouds use specific upscale filter, break cloud render over walls

This commit is contained in:
2025-12-02 12:43:56 +00:00
parent 25efce7a89
commit c89d5af6a3
7 changed files with 168 additions and 40 deletions
+34 -33
View File
@@ -1513,7 +1513,7 @@ _avMoveSpeed src/Dodge/Data/Creature/Misc.hs 65;" f
_avStrength src/Dodge/Data/Creature/Misc.hs 62;" f
_avatarMaterial src/Dodge/Data/Creature/Misc.hs 61;" f
_avatarPulse src/Dodge/Data/Creature/Misc.hs 60;" f
_barrelShader src/Data/Preload/Render.hs 26;" f
_barrelShader src/Data/Preload/Render.hs 27;" f
_barrelType src/Dodge/Data/Creature/Misc.hs 71;" f
_bdColor src/Dodge/Data/Prop.hs 23;" f
_bdMaxX src/Dodge/Data/Bounds.hs 12;" f
@@ -1531,7 +1531,7 @@ _blPos src/Dodge/Data/Block.hs 26;" f
_blShadows src/Dodge/Data/Block.hs 24;" f
_blWallIDs src/Dodge/Data/Block.hs 22;" f
_blocks src/Dodge/Data/LWorld.hs 125;" f
_bloomBlurShader src/Data/Preload/Render.hs 25;" f
_bloomBlurShader src/Data/Preload/Render.hs 26;" f
_bmColor src/Dodge/Data/Beam.hs 21;" f
_bmDamage src/Dodge/Data/Beam.hs 20;" f
_bmDir src/Dodge/Data/Beam.hs 19;" f
@@ -1597,8 +1597,8 @@ _cdtUp src/Dodge/Data/DoubleTree.hs 92;" f
_ceSideEffect src/Dodge/Data/Universe.hs 66;" f
_ceString src/Dodge/Data/Universe.hs 67;" f
_ceilingStencilShader src/Data/Preload/Render.hs 19;" f
_chasmShader src/Data/Preload/Render.hs 47;" f
_chasmVBO src/Data/Preload/Render.hs 46;" f
_chasmShader src/Data/Preload/Render.hs 48;" f
_chasmVBO src/Data/Preload/Render.hs 47;" f
_chasms src/Dodge/Data/CWorld.hs 33;" f
_ciFilter src/Dodge/Data/HUD.hs 25;" f
_ciInvIDs src/Dodge/Data/Combine.hs 9;" f
@@ -1627,8 +1627,8 @@ _clickPos src/Dodge/Data/Input.hs 42;" f
_clickWorldPos src/Dodge/Data/Input.hs 44;" f
_closeButtons src/Dodge/Data/HUD.hs 36;" f
_closeItems src/Dodge/Data/HUD.hs 35;" f
_cloudShader src/Data/Preload/Render.hs 51;" f
_cloudVBO src/Data/Preload/Render.hs 50;" f
_cloudShader src/Data/Preload/Render.hs 52;" f
_cloudVBO src/Data/Preload/Render.hs 51;" f
_clouds src/Dodge/Data/LWorld.hs 96;" f
_coolEnd src/Dodge/Data/TriggerType.hs 17;" f
_coolSound src/Dodge/Data/Item/Params.hs 22;" f
@@ -1766,15 +1766,15 @@ _ebVel src/Dodge/Data/EnergyBall.hs 16;" f
_emoMenuOption src/Dodge/Data/Universe.hs 77;" f
_energyBalls src/Dodge/Data/LWorld.hs 104;" f
_fbSize src/Dodge/Data/EnergyBall/Type.hs 12;" f
_fboBase src/Data/Preload/Render.hs 34;" f
_fboBloom src/Data/Preload/Render.hs 37;" f
_fboCloud src/Data/Preload/Render.hs 35;" f
_fboFullscreen src/Data/Preload/Render.hs 31;" f
_fboHalf src/Data/Preload/Render.hs 32;" f
_fboLighting src/Data/Preload/Render.hs 39;" f
_fboPos src/Data/Preload/Render.hs 38;" f
_fboQuarter src/Data/Preload/Render.hs 33;" f
_fboWindow src/Data/Preload/Render.hs 36;" f
_fboBase src/Data/Preload/Render.hs 35;" f
_fboBloom src/Data/Preload/Render.hs 38;" f
_fboCloud src/Data/Preload/Render.hs 36;" f
_fboFullscreen src/Data/Preload/Render.hs 32;" f
_fboHalf src/Data/Preload/Render.hs 33;" f
_fboLighting src/Data/Preload/Render.hs 40;" f
_fboPos src/Data/Preload/Render.hs 39;" f
_fboQuarter src/Data/Preload/Render.hs 34;" f
_fboWindow src/Data/Preload/Render.hs 37;" f
_flItPos src/Dodge/Data/FloorItem.hs 11;" f
_flItRot src/Dodge/Data/FloorItem.hs 11;" f
_flPos src/Dodge/Data/Flame.hs 13;" f
@@ -1788,8 +1788,8 @@ _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
_floorShader src/Data/Preload/Render.hs 46;" f
_floorVBO src/Data/Preload/Render.hs 45;" f
_foreShapes src/Dodge/Data/LWorld.hs 132;" f
_fsDir src/Dodge/Data/ForegroundShape.hs 14;" f
_fsPos src/Dodge/Data/ForegroundShape.hs 13;" f
@@ -1911,7 +1911,7 @@ _ldtRight src/Dodge/Data/DoubleTree.hs 35;" f
_ldtValue src/Dodge/Data/DoubleTree.hs 33;" f
_leadTargetBy src/Dodge/Data/ActionPlan.hs 115;" f
_lightSources src/Dodge/Data/LWorld.hs 133;" f
_lightUBO src/Data/Preload/Render.hs 42;" f
_lightUBO src/Data/Preload/Render.hs 43;" f
_lightingCapShader src/Data/Preload/Render.hs 16;" f
_lightingCloudShader src/Data/Preload/Render.hs 18;" f
_lightingLineShadowShader src/Data/Preload/Render.hs 15;" f
@@ -1948,7 +1948,7 @@ _manObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" f
_mapInvItmID src/Dodge/Data/HUD.hs 20;" f
_mapInvOffset src/Dodge/Data/HUD.hs 18;" f
_mapInvZoom src/Dodge/Data/HUD.hs 19;" f
_matUBO src/Data/Preload/Render.hs 41;" f
_matUBO src/Data/Preload/Render.hs 42;" f
_mbAttach src/Dodge/Data/MetaTree.hs 18;" f
_mbTree src/Dodge/Data/MetaTree.hs 18;" f
_mcColor src/Dodge/Data/Machine.hs 34;" f
@@ -2051,7 +2051,7 @@ _phRemoteID src/Dodge/Data/Projectile.hs 41;" f
_phTargetingID src/Dodge/Data/Projectile.hs 42;" f
_pickUpLevel src/Dodge/Layout/Generate.hs 14;" f
_pickUps src/Dodge/Layout/Generate.hs 15;" f
_pictureShaders src/Data/Preload/Render.hs 30;" f
_pictureShaders src/Data/Preload/Render.hs 31;" f
_piercedPoints src/Dodge/Data/Creature/Misc.hs 87;" f
_pjBarrelSpin src/Dodge/Data/Projectile.hs 23;" f
_pjDetonatorID src/Dodge/Data/Projectile.hs 25;" f
@@ -2133,7 +2133,7 @@ _rbPos src/Dodge/Data/RadarBlip.hs 17;" f
_rbRad src/Dodge/Data/RadarBlip.hs 16;" f
_rbState src/Dodge/Data/World.hs 43;" f
_rbTime src/Dodge/Data/RadarBlip.hs 14;" f
_rboBaseBloom src/Data/Preload/Render.hs 40;" f
_rboBaseBloom src/Data/Preload/Render.hs 41;" f
_rdDist1 src/Dodge/Data/Distortion.hs 13;" f
_rdDist2 src/Dodge/Data/Distortion.hs 14;" f
_rdPos src/Dodge/Data/Distortion.hs 12;" f
@@ -2232,9 +2232,9 @@ _sfVs src/Shape/Data.hs 39;" f
_shadWallShader src/Data/Preload/Render.hs 14;" f
_shaderUINT src/Shader/Data.hs 52;" f
_shaderVAO src/Shader/Data.hs 54;" f
_shapeEBO src/Data/Preload/Render.hs 28;" f
_shapeEBO src/Data/Preload/Render.hs 29;" f
_shapeHalfSize src/Shape/Data.hs 13;" f
_shapeShader src/Data/Preload/Render.hs 27;" f
_shapeShader src/Data/Preload/Render.hs 28;" f
_shellPayload src/Dodge/Data/Item/Combine.hs 101;" f
_shockwaves src/Dodge/Data/LWorld.hs 112;" f
_siColor src/Dodge/Data/SelectionList.hs 47;" f
@@ -2246,7 +2246,7 @@ _siPictures src/Dodge/Data/SelectionList.hs 43;" f
_siWidth src/Dodge/Data/SelectionList.hs 45;" f
_sideEffect src/Loop/Data.hs 13;" f
_sideImpulses src/Dodge/Data/ActionPlan.hs 122;" f
_silhouetteEBO src/Data/Preload/Render.hs 29;" f
_silhouetteEBO src/Data/Preload/Render.hs 30;" f
_skOldPos src/Dodge/Data/Spark.hs 14;" f
_skPos src/Dodge/Data/Spark.hs 13;" f
_skType src/Dodge/Data/Spark.hs 15;" f
@@ -2378,6 +2378,7 @@ _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
_upscaleCloudShader src/Data/Preload/Render.hs 25;" f
_useExactly src/Dodge/Data/Muzzle.hs 62;" f
_useMapperLines src/Dodge/Data/Item/Use.hs 38;" f
_useMapperPoints src/Dodge/Data/Item/Use.hs 39;" f
@@ -2410,7 +2411,7 @@ _vaOffset src/Shader/Data.hs 70;" f
_vaType src/Shader/Data.hs 68;" f
_vboName src/Shader/Data.hs 80;" f
_vboPtr src/Shader/Data.hs 81;" f
_vboShapes src/Data/Preload/Render.hs 43;" f
_vboShapes src/Data/Preload/Render.hs 44;" f
_vboVertexBytes src/Shader/Data.hs 82;" f
_vcCoolDown src/Dodge/Data/Creature/Misc.hs 22;" f
_vcMaxCoolDown src/Dodge/Data/Creature/Misc.hs 21;" f
@@ -2433,13 +2434,13 @@ _wTime src/Dodge/Data/Item/Params.hs 20;" f
_waitThenAction src/Dodge/Data/ActionPlan.hs 76;" f
_waitThenTimer src/Dodge/Data/ActionPlan.hs 75;" f
_wallDamages src/Dodge/Data/LWorld.hs 119;" f
_wallVBO src/Data/Preload/Render.hs 49;" f
_wallVBO src/Data/Preload/Render.hs 50;" f
_walls src/Dodge/Data/LWorld.hs 118;" f
_wanID src/Dodge/Data/LWorld.hs 158;" f
_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
_winVBO src/Data/Preload/Render.hs 49;" f
_windowPosX src/Dodge/Data/Config.hs 64;" f
_windowPosY src/Dodge/Data/Config.hs 65;" f
_windowPullShader src/Data/Preload/Render.hs 21;" f
@@ -2709,7 +2710,7 @@ brightX src/Color.hs 116;" f
btSPic src/Dodge/Render/ShapePicture.hs 131;" f
btText src/Dodge/Inventory/SelectionList.hs 237;" f
bufferEBO src/Shader/Bind.hs 28;" f
bufferPerspectiveMatrixUBO src/Dodge/Render.hs 411;" f
bufferPerspectiveMatrixUBO src/Dodge/Render.hs 421;" f
bufferPokedVBO src/Shader/Bind.hs 19;" f
bufferShaderLayers src/Shader/Bind.hs 32;" f
bulletBeltBracer src/Dodge/Item/Equipment.hs 67;" f
@@ -2886,7 +2887,7 @@ copier src/Dodge/Item/Scope.hs 88;" f
copierItemUpdate src/Dodge/Creature/State.hs 131;" f
copyItemToFloor src/Dodge/FloorItem.hs 14;" f
corDoor src/Dodge/Room/Room.hs 385;" f
cornerList src/Preload/Render.hs 234;" f
cornerList src/Preload/Render.hs 236;" f
corpseOrGib src/Dodge/Creature/Update.hs 88;" f
corridor src/Dodge/Room/Corridor.hs 17;" f
corridorBoss src/Dodge/LockAndKey.hs 133;" f
@@ -3565,7 +3566,7 @@ getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f
getCrsFromRooms src/Dodge/Room/Tutorial.hs 338;" f
getCrsFromRooms' src/Dodge/Room/Tutorial.hs 325;" f
getDebugMouseOver src/Dodge/Update.hs 374;" f
getDistortions src/Dodge/Render.hs 423;" f
getDistortions src/Dodge/Render.hs 433;" f
getEdgesCrossing src/Dodge/Path.hs 37;" f
getGrenadeHitEffect src/Dodge/HeldUse.hs 1264;" f
getInventoryPath src/Dodge/Inventory/Path.hs 9;" f
@@ -3717,7 +3718,7 @@ initWallZoning src/Dodge/Wall/Zone.hs 12;" f
initialRoomTree src/Dodge/Floor.hs 24;" f
initialWorld src/Dodge/Initialisation.hs 15;" f
initialisePlaying src/Sound.hs 77;" f
initializeGLState src/Preload/Render.hs 253;" f
initializeGLState src/Preload/Render.hs 255;" f
initializeOptionMenu src/Dodge/Menu/Option.hs 17;" f
initializeOptionMenuBO src/Dodge/Menu/Option.hs 30;" f
initializeTexture2D src/Framebuffer/Update.hs 220;" f
@@ -4566,7 +4567,7 @@ randomTreeStructure src/Dodge/Layout/Generate.hs 18;" f
randsOnCirc src/RandomHelp.hs 127;" f
randsSpread src/RandomHelp.hs 120;" f
ratIntersectLineLine src/Geometry/Intersect.hs 216;" f
rdToVec2s src/Dodge/Render.hs 406;" f
rdToVec2s src/Dodge/Render.hs 416;" f
readSaveSlot src/Dodge/Save.hs 45;" f
recoilAmount src/Dodge/HeldUse.hs 467;" f
rectNSWE src/Geometry/Polygon.hs 15;" f
@@ -4821,7 +4822,7 @@ setTiles src/Dodge/Layout.hs 67;" f
setTreeInts src/Dodge/Room/Tutorial.hs 79;" f
setViewDistance src/Dodge/Update/Camera.hs 241;" f
setViewPos src/Dodge/Creature/ReaderUpdate.hs 69;" f
setViewport src/Dodge/Render.hs 428;" f
setViewport src/Dodge/Render.hs 438;" f
setVol src/Dodge/Config.hs 47;" f
setWindowColor src/Dodge/Render/Walls.hs 32;" f
setWristShieldPos src/Dodge/Equipment.hs 49;" f