Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Main Menu options and fix misc bugs #166

Merged
merged 4 commits into from
Mar 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions default_env.tres

This file was deleted.

2 changes: 1 addition & 1 deletion door/model/door.dae.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/door.dae-7f8548364364a8c72d317db0aac6a97d.scn

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="DoorModel"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
2 changes: 1 addition & 1 deletion effects_shared/BlastMesh.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/BlastMesh.glb-b73267f06de3a944c01538e9fdef259

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
2 changes: 1 addition & 1 deletion enemies/red_robot/laser/BarrelSmoke.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/BarrelSmoke.glb-8e2d69c4951af8065240d2d52c721

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/LightRaysMesh.glb-7064e2802466cd2578058f8b016

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
2 changes: 1 addition & 1 deletion enemies/red_robot/parts/part_head.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/part_head.glb-8de207327aec4b1572370054a7354cf

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
2 changes: 1 addition & 1 deletion enemies/red_robot/parts/part_shield.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/part_shield.glb-d6c233d3d85ae961b022dca28194d

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
2 changes: 1 addition & 1 deletion enemies/red_robot/parts/ray.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/ray.glb-8e1d5bd28d6e0c01a107a5b661f05121.scn"

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/SparkParticle.glb-e3f6706407f31f2c4028af0147b

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
2 changes: 1 addition & 1 deletion enemies/red_robot/red_robot.gd
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func animate(delta:=0.0):
if target_position != Vector3.ZERO:
animation_tree["parameters/aiming/blend_amount"] = clamp(aim_preparing / AIM_PREPARE_TIME, 0, 1)

var to_cannon_local = target_position + Vector3.UP * ray_mesh.global_transform
var to_cannon_local = (target_position + Vector3.UP) * ray_mesh.global_transform
var h_angle = rad_to_deg(atan2( to_cannon_local.x, -to_cannon_local.z ))
var v_angle = rad_to_deg(atan2( to_cannon_local.y, -to_cannon_local.z ))
var blend_pos = animation_tree.get("parameters/aim/blend_position")
Expand Down
2 changes: 1 addition & 1 deletion level/forklift/flying_forklift.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/flying_forklift.glb-5fc3f6403d54a193b6e3b14c2

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="FlyingForkliftModel"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
23 changes: 8 additions & 15 deletions level/geometry/environment.tres
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
[gd_resource type="Environment" load_steps=3 format=3 uid="uid://cnn46umvf55rs"]

[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_uefjr"]
sky_top_color = Color(0.411765, 0.305882, 0.0862745, 1)
sky_horizon_color = Color(0.458824, 0.431373, 0.137255, 1)
ground_bottom_color = Color(0, 0, 0, 1)
ground_horizon_color = Color(0.0392157, 0.0392157, 0.0392157, 1)

[sub_resource type="Sky" id="Sky_sicf0"]
sky_material = SubResource("ProceduralSkyMaterial_uefjr")
radiance_size = 1
[gd_resource type="Environment" format=3 uid="uid://cnn46umvf55rs"]

[resource]
background_mode = 1
background_energy_multiplier = 0.4
sky = SubResource("Sky_sicf0")
ambient_light_source = 3
ambient_light_source = 2
ambient_light_color = Color(0.258824, 0.203922, 0.152941, 1)
reflected_light_source = 2
reflected_light_source = 1
tonemap_mode = 3
tonemap_exposure = 3.0
tonemap_white = 6.0
Expand All @@ -26,7 +15,11 @@ ssao_light_affect = 0.59
ssao_ao_channel_affect = 1.0
sdfgi_use_occlusion = true
sdfgi_read_sky_light = false
glow_enabled = true
sdfgi_min_cell_size = 0.146484
sdfgi_cascade0_distance = 9.375
sdfgi_max_distance = 150.0
sdfgi_y_scale = 0
sdfgi_energy = 2.2
glow_levels/3 = 0.0
glow_levels/4 = 1.0
glow_levels/7 = 1.0
Expand Down
Binary file modified level/geometry/giprobe_data.res
Binary file not shown.
6 changes: 3 additions & 3 deletions level/geometry/models/core.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ dest_files=["res://.godot/imported/core.glb-6d1fe901749789ad3144bf80da386b2d.scn

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="CoreModel"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/light_baking=2
meshes/lightmap_texel_size=1.0
skins/use_named_skins=true
animation/import=false
animation/fps=15
Expand Down
Binary file added level/geometry/models/core.glb.unwrap_cache
Binary file not shown.
2 changes: 1 addition & 1 deletion level/geometry/models/lights.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/lights.glb-e682766b019cdb9ecca59a07b4749bef.s

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="LightsModel"
nodes/apply_root_scale=true
nodes/root_scale=1.0
Expand Down
4 changes: 2 additions & 2 deletions level/geometry/models/props.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ dest_files=["res://.godot/imported/props.glb-ef7d7320b04a8755385d61edb896d714.sc

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="PropsModel"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/light_baking=2
meshes/lightmap_texel_size=0.1
skins/use_named_skins=true
animation/import=false
Expand Down
Binary file added level/geometry/models/props.glb.unwrap_cache
Binary file not shown.
6 changes: 3 additions & 3 deletions level/geometry/models/structure.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ dest_files=["res://.godot/imported/structure.glb-21fe3543c920768091702bd64072075

[params]

nodes/root_type="Spatial"
nodes/root_type="Node3D"
nodes/root_name="StructureModel"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.1
meshes/light_baking=2
meshes/lightmap_texel_size=0.8
skins/use_named_skins=true
animation/import=false
animation/fps=15
Expand Down
Binary file added level/geometry/models/structure.glb.unwrap_cache
Binary file not shown.
37 changes: 13 additions & 24 deletions level/geometry/models/tile_glass.tres
Original file line number Diff line number Diff line change
@@ -1,35 +1,24 @@
[gd_resource type="StandardMaterial3D" load_steps=5 format=2]
[gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://x4yrasc8fraf"]

[ext_resource path="res://level/textures/structure/tile_glass_albedo.png" type="Texture2D" id=1]
[ext_resource path="res://level/textures/structure/tile_glass_normal.png" type="Texture2D" id=2]
[ext_resource path="res://level/textures/structure/tile_glass_orm.png" type="Texture2D" id=3]
[ext_resource path="res://level/textures/structure/tile_glass_emission.png" type="Texture2D" id=4]
[ext_resource type="Texture2D" uid="uid://b5imyb7wi7mgs" path="res://level/textures/structure/tile_glass_albedo.png" id="1"]
[ext_resource type="Texture2D" uid="uid://d2h1dgs37n1bn" path="res://level/textures/structure/tile_glass_normal.png" id="2"]
[ext_resource type="Texture2D" uid="uid://b8miefev3aipe" path="res://level/textures/structure/tile_glass_orm.png" id="3"]
[ext_resource type="Texture2D" uid="uid://cs0p6gx085bdj" path="res://level/textures/structure/tile_glass_emission.png" id="4"]

[resource]
resource_name = "tile_glass"
flags_transparent = true
albedo_color = Color( 0.0120779, 0.0427238, 0.0474042, 0.43502 )
albedo_texture = ExtResource( 1 )
transparency = 1
albedo_color = Color(0.0117647, 0.0431373, 0.0470588, 0.243137)
albedo_texture = ExtResource("1")
metallic = 0.5
metallic_texture = ExtResource( 3 )
metallic_texture = ExtResource("3")
metallic_texture_channel = 2
roughness = 0.5
roughness_texture = ExtResource( 3 )
roughness_texture = ExtResource("3")
roughness_texture_channel = 1
emission_enabled = true
emission = Color( 0, 0, 0, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false
emission_texture = ExtResource( 4 )
emission_texture = ExtResource("4")
normal_enabled = true
normal_scale = 1.0
normal_texture = ExtResource( 2 )
normal_texture = ExtResource("2")
ao_enabled = true
ao_light_affect = 0.0
ao_texture = ExtResource( 3 )
ao_on_uv2 = false
ao_texture_channel = 0
refraction_enabled = true
refraction_scale = 0.0
refraction_texture_channel = 0
ao_texture = ExtResource("3")
Binary file added level/geometry/scenes/occluder.occ
Binary file not shown.
6 changes: 5 additions & 1 deletion level/geometry/scenes/structure.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[gd_scene load_steps=34 format=3 uid="uid://bh1lh032pmey2"]
[gd_scene load_steps=35 format=3 uid="uid://bh1lh032pmey2"]

[ext_resource type="PackedScene" path="res://level/geometry/scenes/collision/stair_pillar.tscn" id="1"]
[ext_resource type="PackedScene" uid="uid://8fujwb58dav7" path="res://level/geometry/models/structure.glb" id="2"]
[ext_resource type="ArrayOccluder3D" uid="uid://d20dpr3pj0fn6" path="res://level/geometry/scenes/occluder.occ" id="3_2aako"]

[sub_resource type="BoxShape3D" id="1"]
size = Vector3(12, 18, 20)
Expand Down Expand Up @@ -1922,3 +1923,6 @@ shape = SubResource("30")
[node name="BridgePillar15" type="CollisionShape3D" parent="Bridge"]
transform = Transform3D(1, 0, -5.96046e-08, 0, 1, 0, 5.96046e-08, 0, 1, 3, -1.5, 0)
shape = SubResource("31")

[node name="OccluderInstance3D" type="OccluderInstance3D" parent="."]
occluder = ExtResource("3_2aako")
Binary file added level/level.exr
Binary file not shown.
27 changes: 27 additions & 0 deletions level/level.exr.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[remap]

importer="2d_array_texture"
type="CompressedTexture2DArray"
uid="uid://bwrkkvnq7ekgo"
path.bptc="res://.godot/imported/level.exr-f8692a9e8b90a50a8e781c95ee874290.bptc.ctexarray"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://level/level.exr"
dest_files=["res://.godot/imported/level.exr-f8692a9e8b90a50a8e781c95ee874290.bptc.ctexarray"]

[params]

compress/mode=2
compress/high_quality=true
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/channel_pack=1
mipmaps/generate=false
mipmaps/limit=-1
slices/horizontal=1
slices/vertical=64
Loading