diff --git a/3D/Scenes/Utility/RenderSceneDither.tscn b/3D/Scenes/Utility/RenderSceneDither.tscn new file mode 100644 index 00000000..9464cb18 --- /dev/null +++ b/3D/Scenes/Utility/RenderSceneDither.tscn @@ -0,0 +1,43 @@ +[gd_scene load_steps=5 format=3 uid="uid://ds3ofl7h8ymq3"] + +[ext_resource type="PackedScene" uid="uid://ec4m3geediis" path="res://IsoTest/IsoMapTest2.tscn" id="1_w2cmq"] +[ext_resource type="Shader" uid="uid://di7y6sooqe3t4" path="res://Shaders/ursc/canvas_item/dithering.gdshader" id="1_wj3u4"] +[ext_resource type="Texture2D" uid="uid://skw25od4cono" path="res://Shaders/ursc/bayer_matrix/bayer16.png" id="2_xwg6r"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_rbnv5"] +shader = ExtResource("1_wj3u4") +shader_parameter/color_depth = 24.0 +shader_parameter/dithering_pattern_texture = ExtResource("2_xwg6r") + +[node name="RenderScene" type="Node2D"] + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="TextureRect" type="TextureRect" parent="CanvasLayer"] +visible = false +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 + +[node name="SubViewportContainer" type="SubViewportContainer" parent="CanvasLayer"] +material = SubResource("ShaderMaterial_rbnv5") +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +stretch = true + +[node name="SubViewport" type="SubViewport" parent="CanvasLayer/SubViewportContainer"] +handle_input_locally = false +snap_2d_transforms_to_pixel = true +snap_2d_vertices_to_pixel = true +size = Vector2i(384, 216) +size_2d_override = Vector2i(384, 216) +render_target_update_mode = 4 + +[node name="IsoMapTest2" parent="CanvasLayer/SubViewportContainer/SubViewport" instance=ExtResource("1_w2cmq")] diff --git a/IsoTest/Factory4.tscn b/IsoTest/Factory4.tscn index 233b8091..765714a2 100644 --- a/IsoTest/Factory4.tscn +++ b/IsoTest/Factory4.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=387 format=4 uid="uid://u3np1731pcoj"] +[gd_scene load_steps=389 format=4 uid="uid://u3np1731pcoj"] [ext_resource type="PackedScene" uid="uid://bv7tjma3g7nkf" path="res://Scenes/Actors/3D/game_controller.tscn" id="1_w3okp"] [ext_resource type="Resource" uid="uid://bwg6xki3d8yow" path="res://Resources/Maps/3D/Factory4_Map.tres" id="2_f1ieg"] @@ -106,6 +106,7 @@ [ext_resource type="Script" uid="uid://dgbkp4hgm0oxl" path="res://3D/TrenchBroom/EntityScripts/Solid/FuncShroud.cs" id="103_428r8"] [ext_resource type="PackedScene" uid="uid://bb2pjblwkb7ub" path="res://3D/Scenes/Props/Vending_Machine_3D.tscn" id="103_xfp8e"] [ext_resource type="PackedScene" uid="uid://bt8fwb313qf8n" path="res://3D/Scenes/Props/Interactables/Dialogue_Interactable_3D.tscn" id="104_fsha6"] +[ext_resource type="Shader" uid="uid://b0rycwqoft3cy" path="res://Shaders/GodotRetro/Screen Shaders/Aditional Shaders/Dithering.gdshader" id="107_5jxft"] [sub_resource type="Environment" id="Environment_d6hgs"] background_mode = 1 @@ -1689,6 +1690,12 @@ geometry_collision_mask = 49 geometry_source_geometry_mode = 1 agent_radius = 0.2 +[sub_resource type="ShaderMaterial" id="ShaderMaterial_uwu65"] +shader = ExtResource("107_5jxft") +shader_parameter/SCREEN_WIDTH = 96.0 +shader_parameter/COLOR_FACTOR = 10.0 +shader_parameter/DITHERING_STRENTH = 0.0150000007125 + [node name="Factory4" type="Node3D"] [node name="GameController" parent="." node_paths=PackedStringArray("_cameraTarget") instance=ExtResource("1_w3okp")] @@ -1724,7 +1731,7 @@ script = ExtResource("4_f1ieg") [node name="Camera3D" type="Camera3D" parent="."] physics_interpolation_mode = 1 -transform = Transform3D(0.70710677, -0.4156269, 0.5720614, 0, 0.809017, 0.58778524, -0.70710677, -0.4156269, 0.5720614, -3.7983856, 7.935, 5.0604153) +transform = Transform3D(0.7071068, -0.4156269, 0.5720614, 0, 0.809017, 0.58778524, -0.7071068, -0.4156269, 0.5720614, 4.336014, 7.935, 5.0604153) projection = 1 size = 8.0 script = ExtResource("5_unwtk") @@ -3508,3 +3515,12 @@ computer: From\\: J.S.\\ Subject\\: Pizza\\ Asdfg " + +[node name="ColorRect" type="ColorRect" parent="."] +visible = false +material = SubResource("ShaderMaterial_uwu65") +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 diff --git a/IsoTest/IsoMapTest2.tscn b/IsoTest/IsoMapTest2.tscn index 6c344994..b07f13de 100644 --- a/IsoTest/IsoMapTest2.tscn +++ b/IsoTest/IsoMapTest2.tscn @@ -65,12 +65,12 @@ script = ExtResource("16_e2nai") [node name="Camera3D" type="Camera3D" parent="."] physics_interpolation_mode = 1 -transform = Transform3D(0.70710677, -0.49999994, 0.5, 0, 0.7071068, 0.7071067, -0.70710677, -0.49999994, 0.5, 83.9836, 7.935, -24.00831) +transform = Transform3D(0.7071067, -0.41562688, 0.57206136, 0, 0.80901694, 0.5877852, -0.7071067, -0.41562688, 0.57206136, 83.9836, 7.935, -24.00831) projection = 1 size = 8.0 script = ExtResource("1_g4gcm") MaxAimOffsetDistance = 16.0 -CameraOffset = Vector3(8, 12, 8) +CameraOffset = Vector3(8, 8, 8) TargetPath = NodePath("../CameraTarget") [node name="TestLevel2" parent="." instance=ExtResource("18_e2nai")]