From 1cc0f4cf7c925b9e016563c5f72e333ba2cd0684 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Fri, 6 Dec 2024 23:28:05 -0700 Subject: [PATCH] Added funky gravity areas in debug level --- .../textures/wood/lacquered_planks.png.import | 4 +- levels/debug_level/debug_level.tscn | 257 +++++++++++++++++- project.godot | 2 +- .../effects/zephyr/zephyr_scale_curve.tres | 2 +- 4 files changed, 260 insertions(+), 5 deletions(-) diff --git a/assets/textures/wood/lacquered_planks.png.import b/assets/textures/wood/lacquered_planks.png.import index 64ac693..e1b368d 100644 --- a/assets/textures/wood/lacquered_planks.png.import +++ b/assets/textures/wood/lacquered_planks.png.import @@ -21,7 +21,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ 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 +detect_3d/compress_to=0 diff --git a/levels/debug_level/debug_level.tscn b/levels/debug_level/debug_level.tscn index 98e6f5c..425e67e 100644 --- a/levels/debug_level/debug_level.tscn +++ b/levels/debug_level/debug_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=3 uid="uid://bm2o3mex10v11"] +[gd_scene load_steps=60 format=3 uid="uid://bm2o3mex10v11"] [ext_resource type="Terrain3DAssets" uid="uid://cwl34gstabgrx" path="res://levels/debug_level/terrain_assets.res" id="1_5smdk"] [ext_resource type="Shader" path="res://src/shaders/psx_water.gdshader" id="6_0efu4"] @@ -12,8 +12,11 @@ [ext_resource type="PackedScene" uid="uid://cl0goj38u7r72" path="res://src/props/scenery/beach/sailboat.tscn" id="14_6reiy"] [ext_resource type="PackedScene" uid="uid://dwfckgdxnwwru" path="res://src/world/effects/zephyr/zephyr_particle.tscn" id="16_2kyww"] [ext_resource type="Texture2D" uid="uid://du3vk5nnksohs" path="res://assets/sprites/particles/sparkle.png" id="16_2m5yu"] +[ext_resource type="Shader" path="res://src/shaders/frosted_glass.gdshader" id="16_rat2n"] [ext_resource type="PackedScene" uid="uid://nqar1qcun8ax" path="res://src/props/scenery/highway/guard_rail/guard_rail.tscn" id="16_xtxyj"] [ext_resource type="PackedScene" uid="uid://d0tcr6uijpym5" path="res://src/props/scenery/highway/highway_road.tscn" id="17_amems"] +[ext_resource type="Texture2D" uid="uid://bq8dxuxfw1rwu" path="res://assets/textures/wood/lacquered_planks.png" id="17_xciuf"] +[ext_resource type="Texture2D" path="res://assets/textures/grass_green/grass_green_albedo.dds" id="18_scall"] [ext_resource type="PackedScene" uid="uid://cblsayfgirexr" path="res://src/characters/umineko/umineko.tscn" id="21_ch6qk"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_rpgb7"] @@ -185,6 +188,108 @@ _data = { } point_count = 5 +[sub_resource type="FastNoiseLite" id="FastNoiseLite_h2ddb"] + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_b16ga"] +seamless = true +as_normal_map = true +noise = SubResource("FastNoiseLite_h2ddb") + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_cct0w"] + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_qd4od"] +seamless = true +noise = SubResource("FastNoiseLite_cct0w") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_lwas5"] +render_priority = 0 +shader = ExtResource("16_rat2n") +shader_parameter/albedo = Color(0.263625, 0.1147, 0.37, 0.572549) +shader_parameter/roughness = 0.2 +shader_parameter/refraction = 0.200001 +shader_parameter/refraction_texture_channel = Vector4(1, 0, 0, 0) +shader_parameter/normal_strength = 0.552001 +shader_parameter/normal_map = SubResource("NoiseTexture2D_b16ga") +shader_parameter/subsurface_scattering_strength = 1.0 +shader_parameter/texture_subsurface_scattering = SubResource("NoiseTexture2D_qd4od") +shader_parameter/edge_color = Color(0, 0, 0, 1) +shader_parameter/surface_contribution = 6.655 +shader_parameter/specular_contribution = 2.0 +shader_parameter/refraction_contribution = 30.0 +shader_parameter/uv1_scale = Vector3(1, 1, 1) +shader_parameter/uv1_offset = Vector3(0, 0, 0) + +[sub_resource type="BoxMesh" id="BoxMesh_jpetf"] +material = SubResource("ShaderMaterial_lwas5") +size = Vector3(64, 64, 64) + +[sub_resource type="BoxShape3D" id="BoxShape3D_74f5g"] +size = Vector3(64, 64, 64) + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_axqqd"] +points = PackedVector3Array(-32, -16, -32, -64, 16, -64, 32, -16, -32, -32, -16, 32, -64, 16, 64, 64, 16, -64, 32, -16, 32, 64, 16, 64) + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_0mv06"] +noise_type = 2 +frequency = 0.015 +fractal_type = 3 +fractal_octaves = 1 +fractal_ping_pong_strength = 1.3 + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_vfmm3"] +seamless = true +as_normal_map = true +noise = SubResource("FastNoiseLite_0mv06") + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_qtehd"] +noise_type = 2 +frequency = 0.015 +fractal_type = 3 +fractal_octaves = 1 +fractal_ping_pong_strength = 1.3 + +[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_c7mgx"] +invert = true +seamless = true +noise = SubResource("FastNoiseLite_qtehd") + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0lxst"] +albedo_color = Color(1, 1, 0.968627, 1) +roughness_texture = SubResource("NoiseTexture2D_c7mgx") +normal_enabled = true +normal_scale = 2.0 +normal_texture = SubResource("NoiseTexture2D_vfmm3") +subsurf_scatter_enabled = true +subsurf_scatter_strength = 1.0 +uv1_scale = Vector3(10, 5, 10) + +[sub_resource type="SphereMesh" id="SphereMesh_ooxtq"] +material = SubResource("StandardMaterial3D_0lxst") +radius = 32.0 +height = 64.0 +radial_segments = 128 +rings = 64 + +[sub_resource type="SphereShape3D" id="SphereShape3D_ne5nm"] +radius = 32.0 + +[sub_resource type="SphereShape3D" id="SphereShape3D_avmlg"] +radius = 70.0 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_b7w2s"] +albedo_texture = ExtResource("17_xciuf") +uv1_scale = Vector3(32, 10, 20) +texture_filter = 4 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5pdkv"] +albedo_texture = ExtResource("18_scall") +uv1_scale = Vector3(4, 2, 1) +texture_filter = 4 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_sqfj0"] +height = 55.0 +radius = 100.0 + [node name="TestLevel" type="Node3D"] [node name="Terrain3D" type="Terrain3D" parent="."] @@ -203,6 +308,7 @@ camera_attributes = SubResource("CameraAttributesPractical_ypy22") transform = Transform3D(0.782608, -0.611691, 0.11558, 0, 0.185667, 0.982613, -0.622515, -0.769001, 0.145304, 0, 0, 0) shadow_enabled = true shadow_blur = 4.0 +directional_shadow_max_distance = 160.0 [node name="Course" type="Node3D" parent="."] @@ -380,3 +486,152 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -159.689, 62.5083, 1162.07) [node name="ZephyrParticle3" parent="GlobalEffects" instance=ExtResource("16_2kyww")] transform = Transform3D(0.258819, 0, -0.965926, 0, 1, 0, 0.965926, 0, 0.258819, -406.175, 99.5943, 417.273) + +[node name="GravityCube" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 138.031, 94.1383, -166.358) + +[node name="MeshInstance3D" type="MeshInstance3D" parent="GravityCube"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00137329, 0.104053, -0.00378418) +mesh = SubResource("BoxMesh_jpetf") + +[node name="StaticBody3D" type="StaticBody3D" parent="GravityCube/MeshInstance3D"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityCube/MeshInstance3D/StaticBody3D"] +shape = SubResource("BoxShape3D_74f5g") + +[node name="Area3D" type="Area3D" parent="GravityCube/MeshInstance3D"] +gravity_space_override = 3 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityCube/MeshInstance3D/Area3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 48, 0) +shape = SubResource("ConvexPolygonShape3D_axqqd") + +[node name="Area3D2" type="Area3D" parent="GravityCube/MeshInstance3D"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0) +gravity_space_override = 3 +gravity_point_center = Vector3(0, 0, -1) +gravity_direction = Vector3(0, 0, -1) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityCube/MeshInstance3D/Area3D2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 48, 0) +shape = SubResource("ConvexPolygonShape3D_axqqd") + +[node name="Area3D3" type="Area3D" parent="GravityCube/MeshInstance3D"] +transform = Transform3D(1, 0, 0, 0, -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0) +gravity_space_override = 3 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityCube/MeshInstance3D/Area3D3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 48, 0) +shape = SubResource("ConvexPolygonShape3D_axqqd") + +[node name="Area3D4" type="Area3D" parent="GravityCube/MeshInstance3D"] +transform = Transform3D(1, 0, 0, 0, 1.19249e-08, 1, 0, -1, 1.19249e-08, 0, 0, 0) +gravity_space_override = 3 +gravity_point_center = Vector3(0, 0, 1) +gravity_direction = Vector3(0, 0, 1) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityCube/MeshInstance3D/Area3D4"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 48, 0) +shape = SubResource("ConvexPolygonShape3D_axqqd") + +[node name="Area3D5" type="Area3D" parent="GravityCube/MeshInstance3D"] +transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 0, 0, 0) +gravity_space_override = 3 +gravity_point_center = Vector3(1, 0, 0) +gravity_direction = Vector3(1, 0, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityCube/MeshInstance3D/Area3D5"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 48, 0) +shape = SubResource("ConvexPolygonShape3D_axqqd") + +[node name="Area3D6" type="Area3D" parent="GravityCube/MeshInstance3D"] +transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 0, 0, 0) +gravity_space_override = 3 +gravity_point_center = Vector3(-1, 0, 0) +gravity_direction = Vector3(-1, 0, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityCube/MeshInstance3D/Area3D6"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 48, 0) +shape = SubResource("ConvexPolygonShape3D_axqqd") + +[node name="GravityOrb" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 380.514, 68.1495, 149.757) + +[node name="MeshInstance3D" type="MeshInstance3D" parent="GravityOrb"] +mesh = SubResource("SphereMesh_ooxtq") + +[node name="StaticBody3D" type="StaticBody3D" parent="GravityOrb/MeshInstance3D"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityOrb/MeshInstance3D/StaticBody3D"] +shape = SubResource("SphereShape3D_ne5nm") + +[node name="Area3D" type="Area3D" parent="GravityOrb/MeshInstance3D"] +priority = 1 +gravity_space_override = 3 +gravity_point = true +gravity_point_center = Vector3(0, 0, 0) +gravity_direction = Vector3(0, 0, 0) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityOrb/MeshInstance3D/Area3D"] +shape = SubResource("SphereShape3D_avmlg") + +[node name="GravityBowl" type="Node3D" parent="."] +transform = Transform3D(2.33934e-08, 0.535178, -0.844739, 1, -4.37114e-08, 0, -3.69247e-08, -0.844739, -0.535178, 346.094, 31.021, -73.4132) + +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="GravityBowl"] +use_collision = true + +[node name="OuterCylinder" type="CSGCylinder3D" parent="GravityBowl/CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 16, 0) +radius = 32.0 +height = 32.0 +sides = 64 +material = SubResource("StandardMaterial3D_b7w2s") + +[node name="InnerSphere" type="CSGSphere3D" parent="GravityBowl/CSGCombiner3D"] +operation = 2 +radius = 31.0 +radial_segments = 64 +rings = 32 +material = SubResource("StandardMaterial3D_5pdkv") + +[node name="Area3D" type="Area3D" parent="GravityBowl"] +gravity_space_override = 3 +gravity_point = true +gravity_point_center = Vector3(0, 0, 0) +gravity_direction = Vector3(0, 0, 0) +gravity = -9.8 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityBowl/Area3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 16, 0) +shape = SubResource("CylinderShape3D_sqfj0") + +[node name="GravityHalo" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 73.1897, 78.0923, 345.794) + +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="GravityHalo"] +use_collision = true + +[node name="OuterShell" type="CSGTorus3D" parent="GravityHalo/CSGCombiner3D"] +inner_radius = 32.0 +outer_radius = 108.0 +sides = 64 +ring_sides = 32 +material = SubResource("StandardMaterial3D_b7w2s") + +[node name="InnerSphere" type="CSGSphere3D" parent="GravityHalo/CSGCombiner3D"] +operation = 2 +radius = 100.0 +radial_segments = 64 +rings = 32 +material = SubResource("StandardMaterial3D_5pdkv") + +[node name="Area3D" type="Area3D" parent="GravityHalo"] +gravity_space_override = 3 +gravity_point = true +gravity_point_center = Vector3(0, 0, 0) +gravity_direction = Vector3(0, 0, 0) +gravity = -9.8 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GravityHalo/Area3D"] +shape = SubResource("CylinderShape3D_sqfj0") diff --git a/project.godot b/project.godot index 0a9a015..25e860c 100644 --- a/project.godot +++ b/project.godot @@ -196,7 +196,7 @@ ball_previous={ [layer_names] 3d_physics/layer_1="Collision Geometry" -3d_physics/layer_2="Layer 3" +3d_physics/layer_2="Layer 2" 3d_physics/layer_27="Glass Material" 3d_physics/layer_28="Metal Material" 3d_physics/layer_29="Rock Material" diff --git a/src/world/effects/zephyr/zephyr_scale_curve.tres b/src/world/effects/zephyr/zephyr_scale_curve.tres index 0fb06a3..8a7c329 100644 --- a/src/world/effects/zephyr/zephyr_scale_curve.tres +++ b/src/world/effects/zephyr/zephyr_scale_curve.tres @@ -1,4 +1,4 @@ -[gd_resource type="CurveTexture" load_steps=2 format=3 uid="uid://c0rf8luj8nbom"] +[gd_resource type="CurveTexture" load_steps=2 format=3 uid="uid://b1bfyk5c003se"] [sub_resource type="Curve" id="Curve_iycj4"] _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.1, 1), 0.0, 0.0, 0, 0, Vector2(0.65, 1), 0.0, 0.0, 0, 0, Vector2(0.75, 0), 0.0, 0.0, 0, 0]