diff --git a/main.tscn b/main.tscn index 56b4c54..1f2dfe9 100644 --- a/main.tscn +++ b/main.tscn @@ -3,10 +3,10 @@ [ext_resource type="PackedScene" uid="uid://qb8cbljxgnub" path="res://world/killbrick.tscn" id="1_h2yge"] [ext_resource type="PackedScene" uid="uid://cfceg80unq0pe" path="res://player/player.tscn" id="1_ig7tw"] [ext_resource type="PackedScene" uid="uid://bcmrj6qkemrll" path="res://world/radiohead_cube.tscn" id="2_0xm2m"] -[ext_resource type="Texture2D" uid="uid://b3wpwmlq750rc" path="res://world/textures/grass.jpg" id="2_272bh"] +[ext_resource type="Texture2D" uid="uid://wdjmyv260he1" path="res://world/textures/grass.jpg" id="2_272bh"] [ext_resource type="PackedScene" uid="uid://of6tq8gpjxtu" path="res://gears/gear_pickup.tscn" id="3_lquwl"] [ext_resource type="PackedScene" uid="uid://bafl8q0r61xrg" path="res://gears/gear.tscn" id="4_7mycd"] -[ext_resource type="Shader" uid="uid://cbufc0lxtpjco" path="res://world/shaders/sky.gdshader" id="7_272bh"] +[ext_resource type="Texture2D" uid="uid://bkq72dydktldv" path="res://world/sky/kloofendal_48d_partly_cloudy_puresky_2k.hdr" id="8_5vw27"] [sub_resource type="BoxShape3D" id="BoxShape3D_7dm0k"] size = Vector3(1000, 2, 1000) @@ -19,18 +19,21 @@ albedo_color = Color(0, 1, 0, 1) albedo_texture = ExtResource("2_272bh") uv1_scale = Vector3(300, 300, 300) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_272bh"] -shader = ExtResource("7_272bh") -shader_parameter/skyColor = Color(0.4991548, 0.59654385, 0.98058206, 1) -shader_parameter/horizonColor = Color(0.64705884, 0.6901961, 0.8509804, 1) +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_272bh"] +panorama = ExtResource("8_5vw27") [sub_resource type="Sky" id="Sky_7mycd"] -sky_material = SubResource("ShaderMaterial_272bh") +sky_material = SubResource("PanoramaSkyMaterial_272bh") [sub_resource type="Environment" id="Environment_7mycd"] background_mode = 2 sky = SubResource("Sky_7mycd") sky_rotation = Vector3(6.2831855, 0, 0) +glow_enabled = true +glow_intensity = 0.1 +glow_bloom = 0.02 +glow_blend_mode = 0 +glow_hdr_luminance_cap = 0.0 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_272bh"] @@ -49,10 +52,6 @@ shape = SubResource("BoxShape3D_7dm0k") mesh = SubResource("BoxMesh_ig7tw") surface_material_override/0 = SubResource("StandardMaterial3D_272bh") -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(0.7071068, -0.49999994, 0.49999994, 0, 0.7071067, 0.7071067, -0.7071068, -0.49999994, 0.49999994, 50, 50, 50) -shadow_enabled = true - [node name="radiohead cube" parent="." instance=ExtResource("2_0xm2m")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16, 3, 0) @@ -78,3 +77,8 @@ transform = Transform3D(1, 0, 0, 0, -0.012967386, 0.9999159, 0, -0.9999159, -0.0 environment = SubResource("Environment_7mycd") camera_attributes = SubResource("CameraAttributesPractical_272bh") compositor = SubResource("Compositor_5vw27") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(0.70710665, 0.5, -0.5, 0, 0.7071067, 0.7071067, 0.7071069, -0.49999988, 0.49999988, -500, 200, 500) +light_color = Color(1, 0.87058824, 0.12941177, 1) +shadow_enabled = true diff --git a/world/shaders/sky.gdshader b/world/shaders/sky.gdshader deleted file mode 100644 index 504da4e..0000000 --- a/world/shaders/sky.gdshader +++ /dev/null @@ -1,9 +0,0 @@ -shader_type sky; -uniform vec3 skyColor : source_color; -uniform vec3 horizonColor : source_color; - -void sky() { - float col = clamp(EYEDIR.y / 0.05, 0.0, 1.0); - vec3 finalColor = mix(horizonColor,skyColor,col); - COLOR = finalColor; -} diff --git a/world/sky/kloofendal_48d_partly_cloudy_puresky_2k.hdr b/world/sky/kloofendal_48d_partly_cloudy_puresky_2k.hdr new file mode 100644 index 0000000..31843fc Binary files /dev/null and b/world/sky/kloofendal_48d_partly_cloudy_puresky_2k.hdr differ