Merge branch 'feat/env' into 'develop'

 Add simple skybox and base environment

See merge request open-fpsz/open-fpsz!45
This commit is contained in:
anyreso 2024-04-17 19:51:27 +00:00
commit 415caf3190
4 changed files with 45 additions and 31 deletions

View file

@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://entities/player/player.gd" id="1_mk68k"]
[ext_resource type="PackedScene" uid="uid://drbefw6akui2v" path="res://entities/player/assets/vanguard.tscn" id="2_beyex"]
[ext_resource type="Shape3D" uid="uid://cb8esdlnottdn" path="res://entities/player/collision_shape.tres" id="2_vjqny"]
[ext_resource type="Shape3D" path="res://entities/player/collision_shape.tres" id="2_vjqny"]
[ext_resource type="PackedScene" uid="uid://bcv81ku26xo" path="res://interfaces/hud/hud.tscn" id="3_ccety"]
[ext_resource type="PackedScene" uid="uid://c8co0qa2omjmh" path="res://weapons/space_gun/space_gun.tscn" id="4_lhn5w"]
[ext_resource type="PackedScene" uid="uid://dn1tcakam5egs" path="res://weapons/space_gun/projectile.tscn" id="5_lvaut"]

41
environments/default.tres Normal file
View file

@ -0,0 +1,41 @@
[gd_resource type="Environment" load_steps=4 format=3 uid="uid://d2ahijqqspw5f"]
[ext_resource type="Texture2D" uid="uid://dpv4ed5yhckxo" path="res://environments/skyboxes/kloppenheim_06_puresky_2k.hdr" id="1_uoygt"]
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_7tawh"]
panorama = ExtResource("1_uoygt")
[sub_resource type="Sky" id="Sky_iloxd"]
sky_material = SubResource("PanoramaSkyMaterial_7tawh")
process_mode = 1
radiance_size = 4
[resource]
background_mode = 2
background_energy_multiplier = 0.2
sky = SubResource("Sky_iloxd")
ambient_light_source = 3
tonemap_mode = 3
tonemap_exposure = 0.6
tonemap_white = 0.6
ssr_enabled = true
ssao_intensity = 5.0
ssil_enabled = true
ssil_intensity = 5.0
ssil_sharpness = 0.7
sdfgi_cascades = 6
sdfgi_max_distance = 819.2
sdfgi_y_scale = 0
glow_normalized = true
glow_intensity = 2.0
glow_strength = 0.96
fog_enabled = true
fog_light_color = Color(1, 1, 1, 1)
fog_light_energy = 0.15
fog_density = 0.0025
fog_sky_affect = 0.3
volumetric_fog_density = 0.003
volumetric_fog_albedo = Color(1, 0.380392, 0.380392, 1)
volumetric_fog_emission_energy = 192.23
volumetric_fog_length = 551.32
volumetric_fog_ambient_inject = 0.37

Binary file not shown.

View file

@ -1,37 +1,10 @@
[gd_scene load_steps=7 format=3 uid="uid://chbno00ugl6te"]
[gd_scene load_steps=5 format=3 uid="uid://chbno00ugl6te"]
[ext_resource type="Environment" uid="uid://d2ahijqqspw5f" path="res://environments/default.tres" id="1_3nr12"]
[ext_resource type="Terrain3DStorage" uid="uid://dyon4xda4k40d" path="res://maps/genesis/resources/storage.res" id="1_a88qe"]
[ext_resource type="Terrain3DMaterial" uid="uid://bd4lr5sxu8xu" path="res://maps/genesis/resources/material.res" id="2_o2y3d"]
[ext_resource type="Terrain3DTextureList" uid="uid://dnqa8kxgm3xuw" path="res://maps/genesis/resources/textures.res" id="3_1cww7"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_gi1uj"]
sky_top_color = Color(0.384314, 0.454902, 0.54902, 1)
sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
[sub_resource type="Sky" id="Sky_t5qlv"]
sky_material = SubResource("ProceduralSkyMaterial_gi1uj")
process_mode = 1
radiance_size = 4
[sub_resource type="Environment" id="Environment_6whfw"]
background_mode = 2
sky = SubResource("Sky_t5qlv")
tonemap_mode = 3
glow_normalized = true
glow_intensity = 2.0
glow_strength = 0.96
fog_light_color = Color(0.721569, 0.494118, 0.294118, 1)
fog_sun_scatter = 0.27
fog_density = 0.0001
fog_aerial_perspective = 0.602
fog_sky_affect = 0.518
volumetric_fog_density = 0.003
volumetric_fog_albedo = Color(1, 0.380392, 0.380392, 1)
volumetric_fog_emission_energy = 192.23
volumetric_fog_length = 551.32
volumetric_fog_ambient_inject = 0.37
[node name="Map" type="Node3D"]
[node name="Sunlight" type="DirectionalLight3D" parent="."]
@ -39,7 +12,7 @@ transform = Transform3D(-0.866024, -0.433016, 0.250001, 0, 0.499998, 0.866026, -
shadow_enabled = true
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_6whfw")
environment = ExtResource("1_3nr12")
[node name="Terrain3D" type="Terrain3D" parent="."]
storage = ExtResource("1_a88qe")