collision layers not perfect but good enough to merge back into main branch

This commit is contained in:
derek
2024-10-01 13:45:29 -05:00
parent 884f0c5788
commit 291e27904b
15 changed files with 311 additions and 23 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 392 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://kifw7xxhd1ea"
path.s3tc="res://.godot/imported/table1.albedo.png-e903b7698b751ddba8068c74f1af4445.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/Models/table1.albedo.png"
dest_files=["res://.godot/imported/table1.albedo.png-e903b7698b751ddba8068c74f1af4445.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/Models/table1.blend Normal file

Binary file not shown.

View File

@@ -0,0 +1,51 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://hu7x1spr65s8"
path="res://.godot/imported/table1.blend-b2b24a4ce444347a6e596574b7184376.scn"
[deps]
source_file="res://assets/Models/table1.blend"
dest_files=["res://.godot/imported/table1.blend-b2b24a4ce444347a6e596574b7184376.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true

BIN
assets/Models/table1.blend1 Normal file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 554 KiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cibbunne71n1b"
path="res://.godot/imported/table1.normal.png-cac25b5742ca88493935b6dae683ea42.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Models/table1.normal.png"
dest_files=["res://.godot/imported/table1.normal.png-cac25b5742ca88493935b6dae683ea42.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ch7bb23jijoyv"
path.s3tc="res://.godot/imported/table1.roughness.png-5d4b0bf63738bf771dfa104836d1984b.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/Models/table1.roughness.png"
dest_files=["res://.godot/imported/table1.roughness.png-5d4b0bf63738bf771dfa104836d1984b.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -65,8 +65,8 @@ height = 1.21279
radius = 10.0
[node name="Rocket" type="RigidBody3D" node_paths=PackedStringArray("blast_radius_area", "radius_shape")]
collision_layer = 6
collision_mask = 7
collision_layer = 0
collision_mask = 105
center_of_mass_mode = 1
center_of_mass = Vector3(0, 0, -0.45)
continuous_cd = true
@@ -89,7 +89,7 @@ shape = SubResource("CapsuleShape3D_8v4gm")
[node name="BlastRadius" type="Area3D" parent="."]
collision_layer = 0
collision_mask = 13
collision_mask = 109
[node name="radiusShape" type="CollisionShape3D" parent="BlastRadius"]
shape = SubResource("SphereShape3D_vdo7n")

128
assets/table1.tscn Normal file

File diff suppressed because one or more lines are too long

View File

@@ -11,7 +11,7 @@ config_version=5
[application]
config/name="First Person Test"
run/main_scene="res://scenes/test_level_2v2.tscn"
run/main_scene="res://scenes/test_level_2v2NOENEMIES.tscn"
config/features=PackedStringArray("4.3", "Forward Plus")
config/icon="res://icon.svg"

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=118 format=4 uid="uid://bicj5x7nc8tby"]
[gd_scene load_steps=119 format=4 uid="uid://bicj5x7nc8tby"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_wls0y"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_8r4nh"]
@@ -38,6 +38,7 @@
[ext_resource type="PackedScene" uid="uid://0xs247hfvkml" path="res://assets/rat.tscn" id="36_clv86"]
[ext_resource type="PackedScene" uid="uid://6rhnl7vbvvr4" path="res://assets/rat_hole.tscn" id="37_kjvv4"]
[ext_resource type="PackedScene" uid="uid://b3t8fra7evqfb" path="res://assets/Models/building_1.tscn" id="38_8r1eg"]
[ext_resource type="PackedScene" uid="uid://dvlpc0mrx16l" path="res://assets/table1.tscn" id="39_wl4fl"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_nb6x7"]
sky_top_color = Color(0.500562, 0.697334, 0.809889, 1)
@@ -1167,6 +1168,7 @@ health_drop_enabled = false
[node name="Player" parent="." instance=ExtResource("4_1cxxb")]
transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166)
AUDIO = false
JUMP_VELOCITY = 6
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
@@ -1578,3 +1580,6 @@ transform = Transform3D(-1.39645, 0, 0.0996578, 0, 1.4, 0, -0.0996578, 0, -1.396
[node name="Building5" parent="Building4" instance=ExtResource("38_8r1eg")]
transform = Transform3D(-1.39645, 0, 0.0996578, 0, 1.4, 0, -0.0996578, 0, -1.39645, 7.03891, 0.0535234, 26.5338)
[node name="table1" parent="." instance=ExtResource("39_wl4fl")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.44938, 0.134235, 12.2243)