mirror of
https://gitlab.com/open-fpsz/open-fpsz.git
synced 2026-07-16 00:44:50 +00:00
✨ jetpack stuttering, physics updates, deps upgrades
This commit is contained in:
parent
36168ed18c
commit
bbf551f3fa
101 changed files with 2302 additions and 1740 deletions
Binary file not shown.
|
|
@ -1,44 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="scene"
|
||||
importer_version=1
|
||||
type="PackedScene"
|
||||
uid="uid://b40ts3kdv4in0"
|
||||
path="res://.godot/imported/boundaries.glb-55bd84dc617756c38b0a32e84b5db1c6.scn"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://maps/desert/assets/boundaries.glb"
|
||||
dest_files=["res://.godot/imported/boundaries.glb-55bd84dc617756c38b0a32e84b5db1c6.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={
|
||||
"nodes": {
|
||||
"PATH:Cube-concave": {
|
||||
"generate/physics": true,
|
||||
"physics/mask": 9,
|
||||
"physics/shape_type": 2
|
||||
}
|
||||
}
|
||||
}
|
||||
gltf/naming_version=1
|
||||
gltf/embedded_image_handling=1
|
||||
BIN
maps/desert/data/terrain3d-01-01.res
Normal file
BIN
maps/desert/data/terrain3d-01-01.res
Normal file
Binary file not shown.
BIN
maps/desert/data/terrain3d-01_00.res
Normal file
BIN
maps/desert/data/terrain3d-01_00.res
Normal file
Binary file not shown.
BIN
maps/desert/data/terrain3d_00-01.res
Normal file
BIN
maps/desert/data/terrain3d_00-01.res
Normal file
Binary file not shown.
BIN
maps/desert/data/terrain3d_00_00.res
Normal file
BIN
maps/desert/data/terrain3d_00_00.res
Normal file
Binary file not shown.
|
|
@ -1,23 +1,35 @@
|
|||
[gd_scene load_steps=8 format=3 uid="uid://btlkog4b87p4x"]
|
||||
[gd_scene load_steps=12 format=3 uid="uid://btlkog4b87p4x"]
|
||||
|
||||
[ext_resource type="Terrain3DStorage" uid="uid://wgmg245njt8e" path="res://maps/desert/resources/storage.res" id="1_lmk23"]
|
||||
[ext_resource type="Script" path="res://maps/spawns.gd" id="2_kdipq"]
|
||||
[ext_resource type="Terrain3DMaterial" uid="uid://c3isipd4wqxpk" path="res://maps/desert/resources/material.tres" id="2_n44fh"]
|
||||
[ext_resource type="Terrain3DAssets" uid="uid://d1j24k8sq8qpj" path="res://maps/desert/resources/textures.tres" id="3_w6mwl"]
|
||||
[ext_resource type="Environment" uid="uid://nw62ce5cglvs" path="res://maps/desert/resources/env.tres" id="4_m7p64"]
|
||||
[ext_resource type="Script" path="res://maps/map.gd" id="4_o1mfe"]
|
||||
[ext_resource type="PackedScene" uid="uid://b40ts3kdv4in0" path="res://maps/desert/assets/boundaries.glb" id="5_dyuqn"]
|
||||
|
||||
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_wu2oa"]
|
||||
data = PackedVector3Array(-1024, -1024, 1024, -1024, 1024, -1024, -1024, 1024, 1024, -1024, -1024, 1024, -1024, -1024, -1024, -1024, 1024, -1024, -1024, -1024, -1024, 1024, 1024, -1024, -1024, 1024, -1024, -1024, -1024, -1024, 1024, -1024, -1024, 1024, 1024, -1024, 1024, -1024, -1024, 1024, 1024, 1024, 1024, 1024, -1024, 1024, -1024, -1024, 1024, -1024, 1024, 1024, 1024, 1024, 1024, -1024, 1024, -1024, 1024, 1024, 1024, 1024, 1024, 1024, -1024, 1024, -1024, -1024, 1024, -1024, 1024, 1024, -1024, -1024, -1024, 1024, -1024, 1024, 1024, -1024, -1024, -1024, -1024, -1024, -1024, -1024, 1024, 1024, -1024, 1024, 1024, 1024, -1024, -1024, 1024, 1024, -1024, 1024, -1024, 1024, 1024, -1024, 1024, 1024, 1024, -1024, 1024, 1024)
|
||||
backface_collision = true
|
||||
[sub_resource type="Resource" id="Resource_ti0hi"]
|
||||
script = ExtResource("2_kdipq")
|
||||
players = Array[NodePath]([NodePath("PlayerSpawns/Spawn1"), NodePath("PlayerSpawns/Spawn2")])
|
||||
objectives = Array[NodePath]([NodePath("FlagStand")])
|
||||
|
||||
[node name="Desert" type="Terrain3D"]
|
||||
storage = ExtResource("1_lmk23")
|
||||
material = ExtResource("2_n44fh")
|
||||
assets = ExtResource("3_w6mwl")
|
||||
collision_layer = 2147483648
|
||||
collision_mask = 2147483648
|
||||
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_p8eda"]
|
||||
bounce = 0.5
|
||||
|
||||
[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_1y05l"]
|
||||
plane = Plane(1, 0, 0, 0)
|
||||
|
||||
[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_r685f"]
|
||||
plane = Plane(-1, 0, 0, 0)
|
||||
|
||||
[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_yhtlb"]
|
||||
plane = Plane(0, 0, 1, 0)
|
||||
|
||||
[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_e5ob2"]
|
||||
plane = Plane(0, 0, -1, 0)
|
||||
|
||||
[node name="Desert" type="Node3D" node_paths=PackedStringArray("terrain")]
|
||||
script = ExtResource("4_o1mfe")
|
||||
terrain = NodePath("Terrain3D")
|
||||
spawns = SubResource("Resource_ti0hi")
|
||||
|
||||
[node name="Sunlight" type="DirectionalLight3D" parent="."]
|
||||
transform = Transform3D(0.5, 0.55667, -0.663414, 0, 0.766044, 0.642788, 0.866025, -0.321394, 0.383022, -1613.38, 2730.74, 446.64)
|
||||
|
|
@ -26,25 +38,43 @@ shadow_enabled = true
|
|||
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||
environment = ExtResource("4_m7p64")
|
||||
|
||||
[node name="Terrain3D" type="Terrain3D" parent="."]
|
||||
data_directory = "res://maps/desert/data"
|
||||
material = ExtResource("2_n44fh")
|
||||
assets = ExtResource("3_w6mwl")
|
||||
collision_layer = 2147483649
|
||||
collision_mask = 9
|
||||
collision_priority = 9.0
|
||||
cast_shadows = 0
|
||||
top_level = true
|
||||
metadata/_edit_lock_ = true
|
||||
|
||||
[node name="PlayerSpawns" type="Node" parent="."]
|
||||
|
||||
[node name="Spawn1" type="Marker3D" parent="PlayerSpawns"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1024, 172.13, 1024)
|
||||
transform = Transform3D(0.998641, 7.63963e-05, 0.0521093, -2.81251e-11, 0.999999, -0.00146608, -0.0521094, 0.00146408, 0.99864, 0, 59.1821, 0)
|
||||
|
||||
[node name="Spawn2" type="Marker3D" parent="PlayerSpawns"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1161.42, 174.535, 909.901)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 137.42, 75.6649, -114.099)
|
||||
|
||||
[node name="FlagStand" type="Marker3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 895.356, 145.367, 888.261)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -128.644, 66.6749, -135.739)
|
||||
|
||||
[node name="Camera3D" type="Camera3D" parent="."]
|
||||
transform = Transform3D(-0.642788, 0.586824, -0.492404, 0, 0.642788, 0.766044, 0.766044, 0.492404, -0.413176, 800, 320, 846.595)
|
||||
[node name="Boundaries" type="StaticBody3D" parent="."]
|
||||
physics_material_override = SubResource("PhysicsMaterial_p8eda")
|
||||
|
||||
[node name="Boundaries" parent="." instance=ExtResource("5_dyuqn")]
|
||||
transform = Transform3D(0.99, 0, 0, 0, 0.99, 0, 0, 0, 0.99, 1024, 1024, 1024)
|
||||
visible = false
|
||||
[node name="East" type="CollisionShape3D" parent="Boundaries"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -921.6, 0, 0)
|
||||
shape = SubResource("WorldBoundaryShape3D_1y05l")
|
||||
|
||||
[node name="CollisionShape3D" parent="Boundaries/Cube-concave/StaticBody3D" index="0"]
|
||||
shape = SubResource("ConcavePolygonShape3D_wu2oa")
|
||||
[node name="West" type="CollisionShape3D" parent="Boundaries"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 921.6, 0, 0)
|
||||
shape = SubResource("WorldBoundaryShape3D_r685f")
|
||||
|
||||
[editable path="Boundaries"]
|
||||
[node name="South" type="CollisionShape3D" parent="Boundaries"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -921.6)
|
||||
shape = SubResource("WorldBoundaryShape3D_yhtlb")
|
||||
|
||||
[node name="North" type="CollisionShape3D" parent="Boundaries"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 921.6)
|
||||
shape = SubResource("WorldBoundaryShape3D_e5ob2")
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@ noise = SubResource("FastNoiseLite_e3unr")
|
|||
_shader_parameters = {
|
||||
"_mouse_layer": 2147483648,
|
||||
"auto_base_texture": 0,
|
||||
"auto_height_reduction": 0.085,
|
||||
"auto_height_reduction": 0.1,
|
||||
"auto_overlay_texture": 1,
|
||||
"auto_slope": 1.0,
|
||||
"blend_sharpness": 0.85,
|
||||
"auto_slope": 2.25,
|
||||
"blend_sharpness": 0.69,
|
||||
"dual_scale_far": 100.0,
|
||||
"dual_scale_near": 0.0,
|
||||
"dual_scale_reduction": 0.3,
|
||||
|
|
@ -43,15 +43,14 @@ _shader_parameters = {
|
|||
"noise3_scale": 0.225,
|
||||
"noise_texture": SubResource("NoiseTexture2D_esvkc"),
|
||||
"tri_scale_reduction": 0.075,
|
||||
"vertex_normals_distance": 0.0,
|
||||
"world_noise_blend_far": 1.0,
|
||||
"world_noise_blend_near": 0.75,
|
||||
"world_noise_height": 50.0,
|
||||
"world_noise_lod_distance": 500.0,
|
||||
"world_noise_max_octaves": 6,
|
||||
"world_noise_min_octaves": 5,
|
||||
"vertex_normals_distance": 128.0,
|
||||
"world_noise_height": 64.0,
|
||||
"world_noise_lod_distance": 7500.0,
|
||||
"world_noise_max_octaves": 4,
|
||||
"world_noise_min_octaves": 2,
|
||||
"world_noise_offset": Vector3(0, 0, 0),
|
||||
"world_noise_scale": 7.5
|
||||
"world_noise_region_blend": 0.05,
|
||||
"world_noise_scale": 5.0
|
||||
}
|
||||
world_background = 2
|
||||
texture_filtering = 1
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue