Small tweaks

- Added ambient lighting
- Corrected camera position
This commit is contained in:
Nolan A Casey 2024-01-18 14:24:44 -05:00
parent 77d1f93605
commit 6c99839ae0
34 changed files with 37 additions and 45 deletions

View File

@ -1,3 +1,4 @@
WorldEnvironment
Button
CheckBox
OptionButton
@ -12,21 +13,3 @@ AudioStreamPlayer
AudioStreamPlayer3D
AudioListener3D
OccluderInstance3D
MultiMeshInstance3D
LineEdit
Node3D
MeshInstance3D
Label3D
RichTextLabel
TextEdit
ProgressBar
TextureRect
RayCast3D
MultiplayerSynchronizer
MultiplayerSpawner
GPUParticles3D
AnimationPlayer
DirectionalLight3D
DirectionalLight2D
Camera3D
CollisionShape3D

View File

@ -29,15 +29,15 @@ dock_5="Inspector,Node,History"
open_scenes=PackedStringArray("res://Scenes/world.tscn", "res://Prefabs/player.tscn")
center_split_offset=-279
selected_default_debugger_tab_idx=1
selected_default_debugger_tab_idx=0
selected_main_editor_idx=1
current_scene="res://Prefabs/player.tscn"
selected_bottom_panel_item=1
current_scene="res://Scenes/world.tscn"
selected_bottom_panel_item=0
[ScriptEditor]
open_scripts=["res://Scripts/Player.gd", "res://Scripts/world.gd"]
selected_script="res://Scripts/Player.gd"
selected_script="res://Scripts/world.gd"
open_help=["CheckBox", "CheckButton", "FileAccess", "Input", "Label", "ResourceSaver"]
script_split_offset=70
list_split_offset=0

View File

@ -1,5 +1,5 @@
ea4bc82a6ad023ab7ee23ee620429895
::res://::1701742854
::res://::1705604851
export_presets.cfg::TextFile::-1::1699984723::0::1::::<><>::
icon.svg::CompressedTexture2D::8963615070695796116::1699485144::1699485149::1::::<><>::
::res://addons/::1699501524
@ -310,11 +310,11 @@ lambert1_metallicRoughness.png::CompressedTexture2D::8931258458639185901::169966
lambert1_normal.png::CompressedTexture2D::3998376482152544164::1699662585::1699662585::1::::<><>::
::res://Occlusion Data/::1699669336
environment.occ::ArrayOccluder3D::2660494726846166203::1699668360::0::1::::<><>::
::res://Prefabs/::1701491942
player.tscn::PackedScene::4444783912067201683::1701491942::0::1::::<><>::res://Scripts/Player.gd<>uid://da1qh4xri24f2::::res://Models/kimber_1911/scene.gltf<>uid://d164amgdtaa5k::::res://Models/funny_rubber_chicken/chicken.tscn<>uid://bx0esoasfh733::::res://addons/kenney_particle_pack/star_06.png<>uid://cfwx1moklfkfj::::res://Sound Effects/weapon_gun_1911_A_41.ogg
::res://Scenes/::1701491942
::res://Prefabs/::1701743584
player.tscn::PackedScene::4444783912067201683::1701743584::0::1::::<><>::res://Scripts/Player.gd<>uid://da1qh4xri24f2::::res://Models/kimber_1911/scene.gltf<>uid://d164amgdtaa5k::::res://Models/funny_rubber_chicken/chicken.tscn<>uid://bx0esoasfh733::::res://addons/kenney_particle_pack/star_06.png<>uid://cfwx1moklfkfj::::res://Sound Effects/weapon_gun_1911_A_41.ogg
::res://Scenes/::1701743584
environment.tscn::PackedScene::8256961957080777526::1699669972::0::1::::<><>::uid://ca0iv4endjdmn::::res://Models/environment.glb<>uid://ckhpjran4mily::::res://addons/kenney_prototype_textures/dark/texture_04.png<>uid://c4nnm6ptome8x::::res://addons/kenney_prototype_textures/red/texture_10.png<>uid://bd507vee6ic1p::::res://Occlusion Data/environment.occ
world.tscn::PackedScene::1877808985457939721::1701491942::0::1::::<><>::res://Scripts/world.gd<>uid://dpvy7sm57pjn7::::res://Scenes/environment.tscn<>uid://dhytg0w8gqdob::::res://addons/kenney_particle_pack/circle_05.png
world.tscn::PackedScene::1877808985457939721::1701743584::0::1::::<><>::res://Scripts/world.gd<>uid://dpvy7sm57pjn7::::res://Scenes/environment.tscn<>uid://dhytg0w8gqdob::::res://addons/kenney_particle_pack/circle_05.png
::res://Scripts/::1701489694
chicken.gd::GDScript::-1::1699544273::0::1::::<>Node3D<>::
HatHider.gd::GDScript::-1::1699664681::0::1::::<>Node3D<>::

View File

@ -1,2 +1,2 @@
res://Scenes/world.tscn
res://Prefabs/player.tscn
res://Scenes/world.tscn

View File

@ -98,7 +98,7 @@ Anim={
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 20,
"distance": 3.38573,
"distance": 2.90271,
"doppler": false,
"frame_time": false,
"gizmos": true,
@ -107,11 +107,11 @@ Anim={
"listener": true,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0.395137, 1.26521, 1.38015),
"position": Vector3(0.0378748, 1.06381, 0.00130387),
"use_environment": false,
"view_type": 0,
"x_rotation": 0.296704,
"y_rotation": 28.0169
"x_rotation": 0.492259,
"y_rotation": 3.42084
}, {
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
@ -174,4 +174,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([])
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/World/WorldEnvironment")])

View File

@ -1,5 +1,5 @@
[folding]
node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("chicken"), PackedStringArray("Transform"), NodePath("CollisionShape3D"), PackedStringArray("Transform"), NodePath("Camera3D/gun"), PackedStringArray("Transform"), NodePath("Camera3D/gun/MuzzleFlash"), PackedStringArray("Drawing", "Process Material", "process_material", "Draw Passes", "draw_pass_1", "Time"), NodePath("Username"), PackedStringArray("Text", "Flags"), NodePath("AudioListener3D"), PackedStringArray("Transform"), NodePath("CanvasLayer"), PackedStringArray("Layer", "Transform", "Follow Viewport")]
node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("chicken"), PackedStringArray("Transform"), NodePath("CollisionShape3D"), PackedStringArray("Transform"), NodePath("Camera3D"), PackedStringArray("Transform"), NodePath("Camera3D/gun"), PackedStringArray("Transform"), NodePath("Camera3D/gun/MuzzleFlash"), PackedStringArray("Drawing", "Process Material", "process_material", "Draw Passes", "draw_pass_1", "Time"), NodePath("Camera3D/RayCast3D"), PackedStringArray("Transform"), NodePath("Username"), PackedStringArray("Text", "Flags"), NodePath("AudioListener3D"), PackedStringArray("Transform"), NodePath("CanvasLayer"), PackedStringArray("Layer", "Transform", "Follow Viewport")]
resource_unfolds=["res://Prefabs/player.tscn::CapsuleShape3D_ruebo", PackedStringArray(), "res://Prefabs/player.tscn::ParticleProcessMaterial_qufyg", PackedStringArray(), "res://Prefabs/player.tscn::PlaneMesh_yxv4l", PackedStringArray()]
nodes_folded=[]

View File

@ -7,7 +7,7 @@ use_advanced_connections=false
run_live_debug=true
run_reload_scripts=true
run_debug_instances=1
run_debug_instances=2
[dialog_bounds]
@ -64,7 +64,7 @@ last_selected_language="GDScript"
[color_picker]
recent_presets=PackedColorArray(0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1.92523e-06, 0.718948, 0.35274, 1, 0, 1, 0.352941, 1, 0.603922, 1, 0.352941, 1, 0.603922, 0.313726, 0.352941, 1, 0.77841, 0.0249024, 0.12606, 1, 1, 0.0235294, 0.12549, 1)
recent_presets=PackedColorArray(0, 0, 0, 0, 1, 1, 1, 0, 1.92523e-06, 0.718948, 0.35274, 1, 0, 1, 0.352941, 1, 0.603922, 1, 0.352941, 1, 0.603922, 0.313726, 0.352941, 1, 0.77841, 0.0249024, 0.12606, 1, 1, 0.0235294, 0.12549, 1, 1, 1, 1, 1)
[export_options]

View File

@ -21,7 +21,7 @@ state={
"folded_lines": Array[int]([135, 175]),
"h_scroll_position": 0,
"row": 150,
"scroll_position": 127.0,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}

View File

@ -107,11 +107,11 @@ Anim={
"listener": true,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(-6.71659, 1.08598, -5.00314),
"position": Vector3(-10.9724, -6.21596, -8.25517),
"use_environment": false,
"view_type": 0,
"x_rotation": 0.700714,
"y_rotation": 2.38853
"x_rotation": 0.626538,
"y_rotation": 2.13109
}, {
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
@ -173,4 +173,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([])
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/World/WorldEnvironment")])

View File

@ -1,5 +1,5 @@
[folding]
node_unfolds=[NodePath("environment"), PackedStringArray("Transform"), NodePath("DirectionalLight3D"), PackedStringArray("Shadow", "Light"), NodePath("CanvasLayer"), PackedStringArray("Layer", "Follow Viewport", "Transform"), NodePath("CanvasLayer/MainMenu"), PackedStringArray("Theme Overrides", "Theme Overrides/styles"), NodePath("CanvasLayer/MainMenu/MarginContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/OptionMenu/Reset"), PackedStringArray("Text Behavior", "Theme Overrides", "Theme Overrides/font_sizes"), NodePath("CanvasLayer/HUD"), PackedStringArray("Mouse"), NodePath("CanvasLayer/HUD/TextureRect"), PackedStringArray("Layout", "Layout/Transform"), NodePath("CanvasLayer/HUD/HealthBar"), PackedStringArray("Theme Overrides", "Theme Overrides/styles", "theme_override_styles/fill", "theme_override_styles/background"), NodePath("MultiplayerSpawner"), PackedStringArray("_spawnable_scene_count_array")]
resource_unfolds=["res://Scenes/world.tscn::StyleBoxFlat_cdng2", PackedStringArray(), "res://Scenes/world.tscn::StyleBoxFlat_ufa2v", PackedStringArray()]
node_unfolds=[NodePath("environment"), PackedStringArray("Transform"), NodePath("DirectionalLight3D"), PackedStringArray("Shadow", "Light"), NodePath("CanvasLayer"), PackedStringArray("Layer", "Follow Viewport", "Transform"), NodePath("CanvasLayer/MainMenu"), PackedStringArray("Theme Overrides", "Theme Overrides/styles"), NodePath("CanvasLayer/MainMenu/MarginContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer"), PackedStringArray("Theme Overrides", "Theme Overrides/constants"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/OptionMenu/Reset"), PackedStringArray("Text Behavior", "Theme Overrides", "Theme Overrides/font_sizes"), NodePath("CanvasLayer/HUD"), PackedStringArray("Mouse"), NodePath("CanvasLayer/HUD/TextureRect"), PackedStringArray("Layout", "Layout/Transform"), NodePath("CanvasLayer/HUD/HealthBar"), PackedStringArray("Theme Overrides", "Theme Overrides/styles", "theme_override_styles/fill", "theme_override_styles/background"), NodePath("MultiplayerSpawner"), PackedStringArray("_spawnable_scene_count_array"), NodePath("WorldEnvironment"), PackedStringArray("environment")]
resource_unfolds=["res://Scenes/world.tscn::StyleBoxFlat_cdng2", PackedStringArray(), "res://Scenes/world.tscn::StyleBoxFlat_ufa2v", PackedStringArray(), "res://Scenes/world.tscn::Environment_8h625", PackedStringArray("Background", "Fog", "Reflected Light", "Adjustments", "Glow", "SDFGI", "SSIL", "SSAO", "SSR", "Tonemap", "Volumetric Fog")]
nodes_folded=[NodePath("CanvasLayer"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining"), NodePath("CanvasLayer/MainMenu/MarginContainer/VBoxContainer/BaseMenu"), NodePath("CanvasLayer/HUD"), NodePath("CanvasLayer/PauseMenu")]

View File

@ -176,7 +176,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
shape = SubResource("CapsuleShape3D_ruebo")
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.105975, 1.46831, 0.0121291)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.76622e-05, 1.46831, 0.0121291)
[node name="gun" parent="Camera3D" instance=ExtResource("2_0x8c2")]
transform = Transform3D(-0.3, -3.72707e-07, 6.5866e-07, 6.55671e-09, 0.259808, 0.15, -7.56769e-07, 0.15, -0.259808, 0.40064, -0.313696, -0.50908)

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=6 format=3 uid="uid://10vifa1pd4gb"]
[gd_scene load_steps=7 format=3 uid="uid://10vifa1pd4gb"]
[ext_resource type="Script" path="res://Scripts/world.gd" id="1_iice2"]
[ext_resource type="PackedScene" uid="uid://dpvy7sm57pjn7" path="res://Scenes/environment.tscn" id="1_jscbm"]
@ -9,6 +9,11 @@
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ufa2v"]
bg_color = Color(1, 0.0235294, 0.12549, 1)
[sub_resource type="Environment" id="Environment_8h625"]
ambient_light_source = 2
ambient_light_color = Color(1, 1, 1, 1)
ambient_light_energy = 0.35
[node name="World" type="Node"]
script = ExtResource("1_iice2")
spawnpoint = Vector3(0, 0, 0)
@ -19,6 +24,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -6.5, 0)
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.726647, -0.512797, 0.457191, 0, 0.665478, 0.746418, -0.687011, -0.542382, 0.483567, 0, 39.4589, 0)
light_energy = 1.821
light_bake_mode = 1
shadow_enabled = true
[node name="CanvasLayer" type="CanvasLayer" parent="."]
@ -628,6 +634,9 @@ spawn_path = NodePath("..")
[node name="Music" type="AudioStreamPlayer" parent="."]
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_8h625")
[connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting/HostButton" to="." method="_on_host_button_pressed"]
[connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Hosting/Back" to="." method="_on_back_pressed_1"]
[connection signal="pressed" from="CanvasLayer/MainMenu/MarginContainer/VBoxContainer/Joining/JoinButton" to="." method="_on_join_button_pressed"]