Skip to content
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.

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

Feat/better toon and env #515

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion godot/assets/avatar/mask_material.gdshader
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ void fragment() {
float color_amt = mask.r * mask.a * mask_color.r;
vec4 mixed_color = mix(material_color, vec4(1.0), color_amt);
vec4 final_color = mixed_color * base;

ALBEDO = final_color.rgb;
ALPHA = final_color.a;
ALPHA_SCISSOR_THRESHOLD = 0.5;
Expand Down
10 changes: 10 additions & 0 deletions godot/assets/environment/cli_environment.tres
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,13 @@ sky_material = SubResource("ProceduralSkyMaterial_6yihh")
sky = SubResource("Sky_0qr0h")
ambient_light_source = 2
ambient_light_color = Color(1, 1, 1, 1)
ambient_light_energy = 0.2
glow_enabled = true
glow_levels/1 = 0.1
glow_levels/2 = 0.1
glow_levels/3 = 0.01
glow_levels/5 = 0.0
glow_normalized = true
glow_intensity = 1.0
glow_strength = 1.5
glow_blend_mode = 1
2 changes: 2 additions & 0 deletions godot/assets/environment/sky_base.gd
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ func _ready():


func _on_loading_started():
print("loading started")
world_environment.environment.background_energy_multiplier = 0.0
world_environment.environment.ambient_light_energy = 0.0
sun_light.light_energy = 0.0


func _on_loading_finished():
print("loading finished")
var tween = get_tree().create_tween().set_parallel(true)
world_environment.environment.background_energy_multiplier = 0.0
world_environment.environment.ambient_light_energy = 0.0
Expand Down
2 changes: 2 additions & 0 deletions godot/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ reflections/sky_reflections/ggx_samples=16
shading/overrides/force_vertex_shading=true
shading/overrides/force_lambert_over_burley=true
environment/glow/upscale_mode=0
anti_aliasing/quality/msaa_3d=1
anti_aliasing/quality/screen_space_aa=1
lights_and_shadows/positional_shadow/atlas_size=2048
lights_and_shadows/positional_shadow/atlas_quadrant_3_subdiv=3

Expand Down
105 changes: 50 additions & 55 deletions godot/src/decentraland_components/avatar/avatar.tscn

Large diffs are not rendered by default.

Loading
Loading