Skip to content

Fix #83: Change base texture of BloomCombine shader to a parameter #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rccarlson wants to merge 4 commits into from
Closed

Fix #83: Change base texture of BloomCombine shader to a parameter #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf2daba
Change base texture of BloomCombine shader to a parameter
rccarlson Mar 5, 2025
b1e0abe
Merge branch '3.8.2' into 3.8.2
rccarlson Apr 2, 2025
3bec669
Bump tools.json to 3.8.3
CartBlanche Apr 8, 2025
ead396b
Merge branch '3.8.2' into 3.8.2
rccarlson Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions AutoPong/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,19 @@
"isRoot": true,
"tools": {
"dotnet-mgcb": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb"
]
},
"dotnet-mgcb-editor": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor"
]
},
"dotnet-mgcb-editor-linux": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-linux"
]
},
"dotnet-mgcb-editor-windows": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-windows"
]
},
"dotnet-mgcb-editor-mac": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor-mac"
]
Expand Down
20 changes: 4 additions & 16 deletions FuelCell/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,22 @@
"isRoot": true,
"tools": {
"dotnet-mgcb": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb"
]
},
"dotnet-mgcb-editor": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor"
]
},
"dotnet-mgcb-editor-linux": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-linux"
]
},
"dotnet-mgcb-editor-windows": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-windows"
]
},
"dotnet-mgcb-editor-mac": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor-mac"
]
}
}
}
}
18 changes: 3 additions & 15 deletions NeonShooter/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,19 @@
"isRoot": true,
"tools": {
"dotnet-mgcb": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb"
]
},
"dotnet-mgcb-editor": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor"
]
},
"dotnet-mgcb-editor-linux": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-linux"
]
},
"dotnet-mgcb-editor-windows": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-windows"
]
},
"dotnet-mgcb-editor-mac": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor-mac"
]
Expand Down
8 changes: 7 additions & 1 deletion NeonShooter/NeonShooter.Core/Content/Shaders/BloomCombine.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
// This is the final step in applying a bloom postprocess.

sampler BloomSampler : register(s0);
sampler BaseSampler : register(s1);
sampler BaseSampler : register(s1)
{
Texture = (BaseTexture);
Filter = Linear;
AddressU = clamp;
AddressV = clamp;
};

float BloomIntensity;
float BaseIntensity;
Expand Down
2 changes: 1 addition & 1 deletion NeonShooter/NeonShooter.Core/Game/BloomComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public override void Draw(GameTime gameTime)
parameters["BloomSaturation"].SetValue(Settings.BloomSaturation);
parameters["BaseSaturation"].SetValue(Settings.BaseSaturation);

GraphicsDevice.Textures[1] = sceneRenderTarget;
bloomCombineEffect.Parameters["BaseTexture"].SetValue(sceneRenderTarget);

Viewport viewport = GraphicsDevice.Viewport;

Expand Down
18 changes: 3 additions & 15 deletions Platformer2D/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,19 @@
"isRoot": true,
"tools": {
"dotnet-mgcb": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb"
]
},
"dotnet-mgcb-editor": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor"
]
},
"dotnet-mgcb-editor-linux": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-linux"
]
},
"dotnet-mgcb-editor-windows": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-windows"
]
},
"dotnet-mgcb-editor-mac": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor-mac"
]
Expand Down
20 changes: 4 additions & 16 deletions ShipGame/.config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,22 @@
"isRoot": true,
"tools": {
"dotnet-mgcb": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb"
]
},
"dotnet-mgcb-editor": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor"
]
},
"dotnet-mgcb-editor-linux": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-linux"
]
},
"dotnet-mgcb-editor-windows": {
"version": "3.8.2.1105",
"commands": [
"mgcb-editor-windows"
]
},
"dotnet-mgcb-editor-mac": {
"version": "3.8.2.1105",
"version": "3.8.3",
"commands": [
"mgcb-editor-mac"
]
}
}
}
}