Skip to content

Add Terrain layer option that paints both layers #126

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

Open
bjpicciano wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −3
Open

Add Terrain layer option that paints both layers #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion game/addons/base/Assets/shaders/terrain/cs_terrain_splat.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,19 @@ CS
{
material.BaseTextureId = PaintMaterialIndex;
}
else // Painting the Overlay layer
else if ( PaintLayer == 1 ) // Painting the Overlay layer
{
material.OverlayTextureId = PaintMaterialIndex;

// Increase blend to make overlay material more visible
float newBlend = saturate( material.GetNormalizedBlend() + brushValue );
material.BlendFactor = uint( newBlend * 255.0 );
}
else // Painting both layers
{
material.BaseTextureId = PaintMaterialIndex;
material.OverlayTextureId = PaintMaterialIndex;
}

// Write back
ControlMap[texel] = material.EncodeToFloat();
Expand Down
10 changes: 9 additions & 1 deletion game/addons/tools/Code/Scene/Terrain/TerrainEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,23 @@ public override Widget CreateToolSidebar()
// Create named pages so we can hook into tab changes
var basePage = new Widget();
var overlayPage = new Widget();
var bothPage = new Widget();

tabs.AddPage( "Base", "layers", basePage );
tabs.AddPage( "Overlay", "landscape", overlayPage );
tabs.AddPage( "Both", "cloud", bothPage );

// Hook into tab selection changes
var tabBar = tabs.Children.OfType<SegmentedControl>().FirstOrDefault();
tabBar.OnSelectedChanged += ( selectedName ) =>
{
PaintTextureTool.ActiveLayer = selectedName == "Base" ? TerrainLayer.Base : TerrainLayer.Overlay;
PaintTextureTool.ActiveLayer = selectedName switch
{
"Base" => TerrainLayer.Base,
"Overlay" => TerrainLayer.Overlay,
"Both" => TerrainLayer.Both,
_ => TerrainLayer.Base
};
};

group.Add( tabs );
Expand Down
3 changes: 2 additions & 1 deletion game/addons/tools/Code/Scene/Terrain/Tools/PaintTextureTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ namespace Editor.TerrainEditor;
public enum TerrainLayer
{
Base = 0,
Overlay = 1
Overlay = 1,
Both = 2
}

[Title( "Paint Texture" )]
Expand Down