Skip to content

Commit 12080df

Browse files
committed
Updated text to include Linux
1 parent 4e464b5 commit 12080df

File tree

3 files changed

+30
-31
lines changed

3 files changed

+30
-31
lines changed

hdr_output/color_sweep/color_sweep.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ offset_top = 39.0
3131
offset_right = 825.0
3232
offset_bottom = 567.0
3333
tooltip_text = "The upper tick mark indicates
34-
output_max_linear_value.
34+
the output max linear value.
3535
3636
The other tick marks are multiples
3737
of 0.01, 0.1, 1.0, 10.0, etc., with

hdr_output/main.tscn

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ scale_curve = SubResource("CurveTexture_efxa6")
3939
color_ramp = SubResource("GradientTexture1D_efxa6")
4040

4141
[sub_resource type="ViewportTexture" id="ViewportTexture_efxa6"]
42-
viewport_path = NodePath("DemoScenes/EnvironmentScene/SubViewport")
42+
viewport_path = NodePath("DemoScenes/DemoScene_WorldEnvironment/SubViewport")
4343

4444
[sub_resource type="SystemFont" id="SystemFont_7mycd"]
4545
font_names = PackedStringArray("Monospace")
@@ -372,7 +372,7 @@ offset_right = 1152.0
372372
offset_bottom = 648.0
373373
color = Color(0.21568628, 0.21568628, 0.21568628, 1)
374374
script = ExtResource("6_272bh")
375-
scenes = [NodePath("output max linear value"), NodePath("EnvironmentScene"), NodePath("ColorSweep"), NodePath("SetupInstructions")]
375+
scenes = [NodePath("DemoScene_output_max_linear_value"), NodePath("DemoScene_WorldEnvironment"), NodePath("DemoScene_ColorSweep"), NodePath("DemoScene_SetupInstructions")]
376376

377377
[node name="Tab" type="ColorRect" parent="DemoScenes" unique_id=261230258]
378378
layout_mode = 0
@@ -389,9 +389,9 @@ offset_right = 234.0
389389
offset_bottom = 59.0
390390
selected = 0
391391
item_count = 4
392-
popup/item_0/text = "output max linear value"
392+
popup/item_0/text = "Output max linear value"
393393
popup/item_0/id = 0
394-
popup/item_1/text = "Environment"
394+
popup/item_1/text = "WorldEnvironment"
395395
popup/item_1/id = 1
396396
popup/item_2/text = "Color sweep"
397397
popup/item_2/id = 2
@@ -406,15 +406,15 @@ offset_right = 111.0
406406
offset_bottom = 26.0
407407
text = "Demo scene:"
408408

409-
[node name="output max linear value" type="Control" parent="DemoScenes" unique_id=1640634166]
409+
[node name="DemoScene_output_max_linear_value" type="Control" parent="DemoScenes" unique_id=1640634166]
410410
anchors_preset = 0
411411
offset_right = 828.0
412412
offset_bottom = 570.0
413413

414-
[node name="Mountain" type="Node2D" parent="DemoScenes/output max linear value" unique_id=1183547058]
414+
[node name="Mountain" type="Node2D" parent="DemoScenes/DemoScene_output_max_linear_value" unique_id=1183547058]
415415
position = Vector2(29, 27)
416416

417-
[node name="Sun" type="ColorRect" parent="DemoScenes/output max linear value/Mountain" unique_id=347517105]
417+
[node name="Sun" type="ColorRect" parent="DemoScenes/DemoScene_output_max_linear_value/Mountain" unique_id=347517105]
418418
offset_left = 73.0
419419
offset_top = 8.0
420420
offset_right = 239.0
@@ -424,21 +424,21 @@ script = ExtResource("13_ycdy4")
424424
sdr_color = Color(0.99215686, 0.7058824, 0.41568628, 1)
425425
linear_limit = 2.8
426426

427-
[node name="Mountain" type="Sprite2D" parent="DemoScenes/output max linear value/Mountain" unique_id=1827667879]
427+
[node name="Mountain" type="Sprite2D" parent="DemoScenes/DemoScene_output_max_linear_value/Mountain" unique_id=1827667879]
428428
texture_filter = 1
429429
texture_repeat = 1
430430
position = Vector2(160, 120)
431431
texture = ExtResource("7_5vw27")
432432

433-
[node name="Sparkles" type="GPUParticles2D" parent="DemoScenes/output max linear value" unique_id=817018124]
433+
[node name="Sparkles" type="GPUParticles2D" parent="DemoScenes/DemoScene_output_max_linear_value" unique_id=817018124]
434434
texture_filter = 1
435435
position = Vector2(534, 165)
436436
amount = 42
437437
texture = ExtResource("8_kek77")
438438
process_material = SubResource("ParticleProcessMaterial_dg77c")
439439
script = ExtResource("9_4c57u")
440440

441-
[node name="Label" type="Label" parent="DemoScenes/output max linear value" unique_id=558150534]
441+
[node name="Label" type="Label" parent="DemoScenes/DemoScene_output_max_linear_value" unique_id=558150534]
442442
layout_mode = 0
443443
offset_left = 95.0
444444
offset_top = 458.0
@@ -449,7 +449,7 @@ HELP WANTED
449449
Please let @allenwp know if you have a high quality demo for use in this scene."
450450
horizontal_alignment = 1
451451

452-
[node name="Label2" type="Label" parent="DemoScenes/output max linear value" unique_id=2086992899]
452+
[node name="Label2" type="Label" parent="DemoScenes/DemoScene_output_max_linear_value" unique_id=2086992899]
453453
layout_mode = 0
454454
offset_left = 315.0
455455
offset_top = 360.0
@@ -458,7 +458,7 @@ offset_bottom = 409.0
458458
text = "TODO: 3D model that uses
459459
output_max_linear_value"
460460

461-
[node name="EnvironmentScene" type="Control" parent="DemoScenes" unique_id=1160571939]
461+
[node name="DemoScene_WorldEnvironment" type="Control" parent="DemoScenes" unique_id=1160571939]
462462
visible = false
463463
anchors_preset = 0
464464
offset_left = 99.0
@@ -467,21 +467,21 @@ offset_right = 139.0
467467
offset_bottom = 430.0
468468
script = ExtResource("10_dg77c")
469469

470-
[node name="SubViewport" type="SubViewport" parent="DemoScenes/EnvironmentScene" unique_id=628806123]
470+
[node name="SubViewport" type="SubViewport" parent="DemoScenes/DemoScene_WorldEnvironment" unique_id=628806123]
471471
own_world_3d = true
472472
handle_input_locally = false
473473
msaa_3d = 2
474474
use_hdr_2d = true
475475
size = Vector2i(570, 570)
476476
render_target_update_mode = 4
477477

478-
[node name="Node3D" parent="DemoScenes/EnvironmentScene/SubViewport" unique_id=229028905 instance=ExtResource("11_dg77c")]
478+
[node name="Node3D" parent="DemoScenes/DemoScene_WorldEnvironment/SubViewport" unique_id=229028905 instance=ExtResource("11_dg77c")]
479479

480-
[node name="ViewportSprite" type="Sprite2D" parent="DemoScenes/EnvironmentScene" unique_id=448833630]
480+
[node name="ViewportSprite" type="Sprite2D" parent="DemoScenes/DemoScene_WorldEnvironment" unique_id=448833630]
481481
position = Vector2(315, -105)
482482
texture = SubResource("ViewportTexture_efxa6")
483483

484-
[node name="Label2" type="Label" parent="DemoScenes/EnvironmentScene" unique_id=476553587]
484+
[node name="Label2" type="Label" parent="DemoScenes/DemoScene_WorldEnvironment" unique_id=476553587]
485485
layout_mode = 0
486486
offset_left = 8.0
487487
offset_top = 96.0
@@ -492,7 +492,7 @@ HELP WANTED
492492
Please let @allenwp know if you have a high quality demo for use in this scene."
493493
horizontal_alignment = 1
494494

495-
[node name="Label" type="Label" parent="DemoScenes/EnvironmentScene" unique_id=524097135]
495+
[node name="Label" type="Label" parent="DemoScenes/DemoScene_WorldEnvironment" unique_id=524097135]
496496
layout_mode = 0
497497
offset_left = -88.0
498498
offset_top = -374.0
@@ -501,23 +501,21 @@ offset_bottom = -325.0
501501
text = "TODO: 2D thing that uses
502502
overbright colors"
503503

504-
[node name="ColorSweep" parent="DemoScenes" unique_id=784950953 instance=ExtResource("6_7mycd")]
504+
[node name="DemoScene_ColorSweep" parent="DemoScenes" unique_id=784950953 instance=ExtResource("6_7mycd")]
505505
visible = false
506506
layout_mode = 0
507507

508-
[node name="SetupInstructions" type="RichTextLabel" parent="DemoScenes" unique_id=660978631]
508+
[node name="DemoScene_SetupInstructions" type="RichTextLabel" parent="DemoScenes" unique_id=660978631]
509509
visible = false
510510
layout_mode = 0
511511
offset_left = 55.0
512-
offset_top = 5.0
512+
offset_top = 8.0
513513
offset_right = 776.0
514-
offset_bottom = 551.0
514+
offset_bottom = 552.0
515515
focus_mode = 2
516516
theme_override_fonts/mono_font = SubResource("SystemFont_7mycd")
517517
bbcode_enabled = true
518-
text = "[font_size=20]Steps to enable HDR output in your project:[/font_size]
519-
520-
1) Ensure [i]no[/i] Environment resources use SDR-only features:
518+
text = "1) Ensure [i]no[/i] Environment resources use SDR-only features:
521519
- Tonemap Mode: Filmic or ACES
522520
- Glow Blend Mode: Soft Light
523521
- Adjustments: Color Correction
@@ -527,13 +525,15 @@ text = "[font_size=20]Steps to enable HDR output in your project:[/font_size]
527525
- iOS: metal
528526
- Windows: d3d12
529527
530-
3) Turn on the [code]rendering/viewport/hdr_2d[/code] project setting and enable [code]use_hdr_2d[/code] for all Subviewports and Windows that should support HDR output.
528+
3) Configure the [code]display/display_server/driver.linuxbsd[/code] project setting to [code]wayland[/code] and enable the [code]run/platforms/linuxbsd/prefer_wayland[/code] editor setting.
529+
530+
4) Turn on the [code]rendering/viewport/hdr_2d[/code] project setting and enable [code]use_hdr_2d[/code] for all SubViewports and Windows that should support HDR output.
531531
532-
4) Turn on the [code]display/window/hdr/request_hdr_output[/code] project setting and enable [code]hdr_output_requested[/code] for all other Windows that should support HDR output.
532+
5) Turn on the [code]display/window/hdr/request_hdr_output[/code] project setting and enable [code]hdr_output_requested[/code] for all other Windows that should support HDR output.
533533
534-
5) [Optional] Provide in-game settings for the player to adjust HDR brightness and maximum luminance by copying [code]in_game_hdr_settings[/code] from this demo to your project.
534+
6) [Optional] Provide in-game settings for the player to adjust HDR brightness and maximum luminance by copying [code]in_game_hdr_settings[/code] from this demo to your project.
535535
536-
View the [url=\"https://github.com/godotengine/godot-docs/pull/11548\"]manual page[/url] to learn more about HDR output."
536+
View the [url=\"https://docs.godotengine.org/en/stable/tutorials/rendering/hdr_output.html\"]manual page[/url] to learn more about HDR output."
537537
context_menu_enabled = true
538538
vertical_alignment = 1
539539
selection_enabled = true
@@ -542,4 +542,4 @@ script = ExtResource("13_w48qg")
542542

543543
[connection signal="pressed" from="VBoxContainer/ColorRect2/DeveloperSettings/Button" to="VBoxContainer/ColorRect/InGameHDRSettings" method="erase_settings"]
544544
[connection signal="item_selected" from="DemoScenes/Tab/OptionButton" to="DemoScenes" method="_on_demo_scene_item_selected"]
545-
[connection signal="meta_clicked" from="DemoScenes/SetupInstructions" to="DemoScenes/SetupInstructions" method="_on_meta_clicked"]
545+
[connection signal="meta_clicked" from="DemoScenes/DemoScene_SetupInstructions" to="DemoScenes/DemoScene_SetupInstructions" method="_on_meta_clicked"]

hdr_output/max_color.gd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@tool
21
extends Node
32

43
@export var sdr_color: Color = Color.WHITE

0 commit comments

Comments
 (0)