feat: cel-shaded look — toon shader, ink outlines, stylized environment
- toon.gdshader: banded diffuse with cool-tinted shadows (3 tones), stepped specular, rim light, and an optional world-triplanar albedo path so level geometry keeps the 0.5 m grid with no UVs - toon_outline.gdshader: inverted-hull ink outline, applied via material_overlay so it works on skinned (deforming) meshes - LevelMaterials: tinted() now returns toon grid materials; toonify()/ apply_toon_recursive() convert imported character/prop materials in place - SkinnedPlayerModel: characters get toon shading + outline on load - LevelEnvironment: shared stylized environment for all maps — saturated anime sky, linear tonemap (filmic/ACES crush cel bands), bloom for emissives, saturation+contrast grade, light depth haze; test level and dust2 now use it and the procedural arena (which had NO environment) gets it plus runtime toonification of its baked geometry Co-Authored-By: Claude Fable 5 <[email protected]>
This commit is contained in:
co-authored by
Claude Fable 5
parent
2c7b5a1aca
commit
37c15bed1a
@@ -0,0 +1,84 @@
|
||||
extends Object
|
||||
class_name LevelEnvironment
|
||||
|
||||
## Shared stylized environment for every level: saturated anime-sky gradient,
|
||||
## bloom for emissives (tracers, plasma), and a color grade that pushes the
|
||||
## cel-shaded look (high saturation, slight contrast lift). Builders call
|
||||
## add_to(level) instead of hand-rolling WorldEnvironment + sun.
|
||||
|
||||
|
||||
## Creates and adds a WorldEnvironment + key sun + cool fill light.
|
||||
## Returns the WorldEnvironment node.
|
||||
static func add_to(level: Node, sky_variant: String = "day") -> WorldEnvironment:
|
||||
var env := WorldEnvironment.new()
|
||||
env.name = "WorldEnvironment"
|
||||
env.environment = make_environment(sky_variant)
|
||||
level.add_child(env)
|
||||
|
||||
if not level.has_node("Sun"):
|
||||
var sun := DirectionalLight3D.new()
|
||||
sun.name = "Sun"
|
||||
sun.rotation_degrees = Vector3(-52, 38, 0)
|
||||
sun.light_color = Color(1.0, 0.97, 0.88)
|
||||
sun.light_energy = 1.4
|
||||
sun.shadow_enabled = true
|
||||
sun.directional_shadow_mode = DirectionalLight3D.SHADOW_PARALLEL_4_SPLITS
|
||||
sun.directional_shadow_max_distance = 120.0
|
||||
level.add_child(sun)
|
||||
|
||||
var fill := DirectionalLight3D.new()
|
||||
fill.name = "FillLight"
|
||||
fill.rotation_degrees = Vector3(-30, -142, 0)
|
||||
fill.light_color = Color(0.6, 0.7, 1.0)
|
||||
fill.light_energy = 0.25
|
||||
fill.shadow_enabled = false
|
||||
level.add_child(fill)
|
||||
return env
|
||||
|
||||
|
||||
static func make_environment(sky_variant: String = "day") -> Environment:
|
||||
var environment := Environment.new()
|
||||
environment.background_mode = Environment.BG_SKY
|
||||
var sky := Sky.new()
|
||||
var sky_mat := ProceduralSkyMaterial.new()
|
||||
match sky_variant:
|
||||
"sunset":
|
||||
sky_mat.sky_top_color = Color(0.25, 0.2, 0.5)
|
||||
sky_mat.sky_horizon_color = Color(0.95, 0.6, 0.45)
|
||||
sky_mat.ground_bottom_color = Color(0.18, 0.12, 0.2)
|
||||
sky_mat.ground_horizon_color = Color(0.85, 0.55, 0.45)
|
||||
sky_mat.sun_curve = 0.12
|
||||
_:
|
||||
# Bold anime day sky: deep saturated blue up top, bright cyan horizon.
|
||||
sky_mat.sky_top_color = Color(0.18, 0.4, 0.85)
|
||||
sky_mat.sky_horizon_color = Color(0.72, 0.88, 0.98)
|
||||
sky_mat.ground_bottom_color = Color(0.22, 0.2, 0.24)
|
||||
sky_mat.ground_horizon_color = Color(0.62, 0.7, 0.75)
|
||||
sky_mat.sun_curve = 0.1
|
||||
sky_mat.sun_angle_max = 20.0
|
||||
sky.sky_material = sky_mat
|
||||
environment.sky = sky
|
||||
|
||||
# Flat-ish ambient keeps toon shadow bands readable (sun does the shaping).
|
||||
environment.ambient_light_source = Environment.AMBIENT_SOURCE_SKY
|
||||
environment.ambient_light_energy = 0.55
|
||||
|
||||
# Filmic crushes the cel bands; linear-ish keeps them crisp.
|
||||
environment.tonemap_mode = Environment.TONE_MAPPER_LINEAR
|
||||
|
||||
# Bloom sells emissives (tracers, plasma, rim highlights).
|
||||
environment.glow_enabled = true
|
||||
environment.glow_intensity = 0.5
|
||||
environment.glow_bloom = 0.05
|
||||
environment.glow_hdr_threshold = 1.1
|
||||
|
||||
# Cel color grade: punchy saturation, hint of contrast.
|
||||
environment.adjustment_enabled = true
|
||||
environment.adjustment_saturation = 1.22
|
||||
environment.adjustment_contrast = 1.05
|
||||
|
||||
# A touch of depth haze for scale; far enough to not gray the arena.
|
||||
environment.fog_enabled = true
|
||||
environment.fog_light_color = Color(0.65, 0.75, 0.9)
|
||||
environment.fog_density = 0.0012
|
||||
return environment
|
||||
@@ -0,0 +1 @@
|
||||
uid://cpl4d7ndkc4ft
|
||||
@@ -1,41 +1,93 @@
|
||||
extends Object
|
||||
class_name LevelMaterials
|
||||
|
||||
## Shared prototype-grid materials for code-built levels.
|
||||
## Shared cel-shaded materials for code-built levels and characters.
|
||||
##
|
||||
## Every level builder makes its geometry from flat-colored boxes; this gives
|
||||
## them all the same world-space grid surface (0.5 m cells via triplanar
|
||||
## mapping) so speed and distance stay readable at movement-shooter velocity,
|
||||
## while keeping each builder's color coding as a tint.
|
||||
## Level geometry gets the toon shader with world-space triplanar grid
|
||||
## (0.5 m cells) tinted per surface; characters get the same toon shading
|
||||
## over their own textures via convert_to_toon(), plus an inverted-hull
|
||||
## outline overlay for the inked silhouette.
|
||||
|
||||
const GRID_GRAY := "res://assets/textures/prototype/grid_gray.png"
|
||||
const GRID_DARK := "res://assets/textures/prototype/grid_dark.png"
|
||||
const TOON_SHADER := "res://assets/shaders/toon.gdshader"
|
||||
const OUTLINE_SHADER := "res://assets/shaders/toon_outline.gdshader"
|
||||
|
||||
## One texture tile = 2 m of world, so one grid cell = 0.5 m.
|
||||
const WORLD_UNITS_PER_TILE := 2.0
|
||||
|
||||
static var _cache: Dictionary = {}
|
||||
static var _outline_cache: Dictionary = {}
|
||||
|
||||
|
||||
## A tinted grid material. Cached per (tint, dark) so identical surfaces share
|
||||
## one material (fewer draw-state changes, and edits apply everywhere).
|
||||
static func tinted(tint: Color, dark: bool = false) -> StandardMaterial3D:
|
||||
## A tinted toon grid material for level geometry. Cached per (tint, dark) so
|
||||
## identical surfaces share one material.
|
||||
static func tinted(tint: Color, dark: bool = false) -> Material:
|
||||
var key := "%s|%s" % [tint.to_html(), dark]
|
||||
if _cache.has(key):
|
||||
return _cache[key]
|
||||
var mat := StandardMaterial3D.new()
|
||||
var shader: Shader = load(TOON_SHADER)
|
||||
var mat := ShaderMaterial.new()
|
||||
mat.shader = shader
|
||||
var tex_path := GRID_DARK if dark else GRID_GRAY
|
||||
var tex: Texture2D = load(tex_path) if ResourceLoader.exists(tex_path) else null
|
||||
if tex:
|
||||
mat.albedo_texture = tex
|
||||
# World triplanar: boxes need no UVs and the grid stays world-scaled.
|
||||
mat.uv1_triplanar = true
|
||||
mat.uv1_world_triplanar = true
|
||||
mat.uv1_scale = Vector3.ONE / WORLD_UNITS_PER_TILE
|
||||
mat.set_shader_parameter("albedo_texture", tex)
|
||||
mat.set_shader_parameter("has_texture", true)
|
||||
mat.set_shader_parameter("use_triplanar", true)
|
||||
mat.set_shader_parameter("triplanar_tile", WORLD_UNITS_PER_TILE)
|
||||
else:
|
||||
mat.set_shader_parameter("has_texture", false)
|
||||
# The texture is grayscale ~mid value; multiply by ~2x-brightened tint to
|
||||
# land near the original flat color while keeping the grid contrast.
|
||||
mat.albedo_color = Color(
|
||||
minf(tint.r * 1.9, 1.0), minf(tint.g * 1.9, 1.0), minf(tint.b * 1.9, 1.0))
|
||||
mat.roughness = 0.85
|
||||
mat.set_shader_parameter("albedo_color", Color(
|
||||
minf(tint.r * 1.9, 1.0), minf(tint.g * 1.9, 1.0), minf(tint.b * 1.9, 1.0)))
|
||||
_cache[key] = mat
|
||||
return mat
|
||||
|
||||
|
||||
## Toon version of an arbitrary material (usually a character's imported
|
||||
## StandardMaterial3D): keeps its albedo texture/color, swaps the shading.
|
||||
static func toonify(src: Material) -> Material:
|
||||
var mat := ShaderMaterial.new()
|
||||
mat.shader = load(TOON_SHADER)
|
||||
var tex: Texture2D = null
|
||||
var col := Color.WHITE
|
||||
if src is BaseMaterial3D:
|
||||
tex = src.albedo_texture
|
||||
col = src.albedo_color
|
||||
mat.set_shader_parameter("albedo_texture", tex)
|
||||
mat.set_shader_parameter("has_texture", tex != null)
|
||||
mat.set_shader_parameter("use_triplanar", false)
|
||||
mat.set_shader_parameter("albedo_color", col)
|
||||
# Characters read best with a slightly wider lit band and stronger rim.
|
||||
mat.set_shader_parameter("rim_strength", 0.45)
|
||||
return mat
|
||||
|
||||
|
||||
## Swap every mesh surface under `node` to toon shading and add an
|
||||
## inverted-hull outline overlay. Safe on skinned meshes (material_overlay
|
||||
## re-renders the same deformed mesh).
|
||||
static func apply_toon_recursive(node: Node, outline_width: float = 0.015) -> void:
|
||||
if node is MeshInstance3D:
|
||||
var mi := node as MeshInstance3D
|
||||
var surface_count: int = mi.mesh.get_surface_count() if mi.mesh else 0
|
||||
for s in range(surface_count):
|
||||
var src := mi.get_active_material(s)
|
||||
if src and not (src is ShaderMaterial):
|
||||
mi.set_surface_override_material(s, toonify(src))
|
||||
if outline_width > 0.0:
|
||||
mi.material_overlay = outline(outline_width)
|
||||
for child in node.get_children():
|
||||
apply_toon_recursive(child, outline_width)
|
||||
|
||||
|
||||
static func outline(width: float = 0.015) -> ShaderMaterial:
|
||||
var key := "%.4f" % width
|
||||
if _outline_cache.has(key):
|
||||
return _outline_cache[key]
|
||||
var mat := ShaderMaterial.new()
|
||||
mat.shader = load(OUTLINE_SHADER)
|
||||
mat.set_shader_parameter("outline_width", width)
|
||||
_outline_cache[key] = mat
|
||||
return mat
|
||||
|
||||
@@ -18,7 +18,17 @@ var _debug_ui_panel: PanelContainer
|
||||
func _ready() -> void:
|
||||
# Hide mouse
|
||||
Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
|
||||
|
||||
|
||||
# Cel-shaded presentation: stylized sky/grade + toon materials over the
|
||||
# arena's baked geometry. The scene ships its own DirectionalLight3D;
|
||||
# rename it to Sun so the helper doesn't stack extra suns.
|
||||
var existing_light := get_node_or_null("DirectionalLight3D")
|
||||
if existing_light:
|
||||
existing_light.name = "Sun"
|
||||
if not has_node("WorldEnvironment"):
|
||||
LevelEnvironment.add_to(self)
|
||||
LevelMaterials.apply_toon_recursive(self, 0.0)
|
||||
|
||||
_build_hud()
|
||||
|
||||
# Multiplayer Spawning
|
||||
|
||||
Reference in New Issue
Block a user