fixed cloud pop in and terrain textures

This commit is contained in:
derek
2025-04-11 15:46:23 -05:00
parent fb67ce392a
commit bcc9d788a9
22 changed files with 257 additions and 261 deletions

View File

@@ -32,7 +32,14 @@ animation/trimming=false
animation/remove_immutable_tracks=true animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false animation/import_rest_as_RESET=false
import_script/path="" import_script/path=""
_subresources={} _subresources={
"materials": {
"Ceiling": {
"use_external/enabled": true,
"use_external/path": "uid://isd7ca2ymvs8"
}
}
}
blender/nodes/visible=0 blender/nodes/visible=0
blender/nodes/active_collection_only=false blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true blender/nodes/punctual_lights=true

View File

@@ -85,6 +85,7 @@ _shader_parameters = {
&"world_space_normal_blend": true &"world_space_normal_blend": true
} }
world_background = 2 world_background = 2
texture_filtering = 1
auto_shader = true auto_shader = true
dual_scaling = true dual_scaling = true

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
[gd_resource type="VisualShader" load_steps=31 format=3 uid="uid://moixdam5rxx7"] [gd_resource type="VisualShader" load_steps=31 format=3 uid="uid://bif4rjooo7q2n"]
[sub_resource type="VisualShaderNodeFresnel" id="VisualShaderNodeFresnel_jqdis"] [sub_resource type="VisualShaderNodeFresnel" id="VisualShaderNodeFresnel_jqdis"]
default_input_values = [2, false, 3, 1.5] default_input_values = [2, false, 3, 1.5]

View File

@@ -2,7 +2,7 @@
[ext_resource type="Script" uid="uid://de6ivnxx0xbbk" path="res://scripts/JumpPlatform.gd" id="1_uy07y"] [ext_resource type="Script" uid="uid://de6ivnxx0xbbk" path="res://scripts/JumpPlatform.gd" id="1_uy07y"]
[ext_resource type="Texture2D" uid="uid://bbml5pkq7iyeo" path="res://assets/Models/SubstancePainterTest/jumppadbase-low_JumpPadBase_BaseColor.png" id="2_2wtw3"] [ext_resource type="Texture2D" uid="uid://bbml5pkq7iyeo" path="res://assets/Models/SubstancePainterTest/jumppadbase-low_JumpPadBase_BaseColor.png" id="2_2wtw3"]
[ext_resource type="Shader" uid="uid://bootgg1o64ovr" path="res://assets/jump_platform.tres" id="2_376hv"] [ext_resource type="Shader" uid="uid://moixdam5rxx7" path="res://assets/jump_platform.tres" id="2_376hv"]
[ext_resource type="AudioStream" uid="uid://ddrlaj0ghgepn" path="res://assets/Audio/bang-4-SBA-300001718.wav" id="2_na0u8"] [ext_resource type="AudioStream" uid="uid://ddrlaj0ghgepn" path="res://assets/Audio/bang-4-SBA-300001718.wav" id="2_na0u8"]
[ext_resource type="Texture2D" uid="uid://35xu75bar8i6" path="res://assets/Models/SubstancePainterTest/jumppadbase-low_JumpPadBase_Metallic.png" id="3_avkk8"] [ext_resource type="Texture2D" uid="uid://35xu75bar8i6" path="res://assets/Models/SubstancePainterTest/jumppadbase-low_JumpPadBase_Metallic.png" id="3_avkk8"]
[ext_resource type="Texture2D" uid="uid://bfkb76pnkm585" path="res://assets/Models/SubstancePainterTest/jumppadbase-low_JumpPadBase_Normal.png" id="4_hkrci"] [ext_resource type="Texture2D" uid="uid://bfkb76pnkm585" path="res://assets/Models/SubstancePainterTest/jumppadbase-low_JumpPadBase_Normal.png" id="4_hkrci"]
@@ -141,7 +141,7 @@ surface_material_override/0 = SubResource("ShaderMaterial_pouh8")
[node name="Area3D" type="Area3D" parent="."] [node name="Area3D" type="Area3D" parent="."]
collision_layer = 0 collision_layer = 0
collision_mask = 2 collision_mask = 4
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)

View File

@@ -128,7 +128,7 @@ _data = {
[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder") groups=["persist", "player"]] [node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder") groups=["persist", "player"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0)
collision_layer = 6 collision_layer = 4
collision_mask = 523 collision_mask = 523
script = ExtResource("1_x7wms") script = ExtResource("1_x7wms")
SENSITIVITY = 0.008 SENSITIVITY = 0.008

View File

@@ -68,7 +68,7 @@ audio_explode = NodePath("Audio/Explosion")
[node name="dieParticles" type="GPUParticles3D" parent="."] [node name="dieParticles" type="GPUParticles3D" parent="."]
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 1.12633, 0, -0.00682099) transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 1.12633, 0, -0.00682099)
emitting = false emitting = false
amount = 500 amount = 10
lifetime = 4.0 lifetime = 4.0
one_shot = true one_shot = true
explosiveness = 1.0 explosiveness = 1.0

View File

@@ -2,5 +2,5 @@
[ext_resource type="Script" uid="uid://12l74jckdnpl" path="res://scripts/room_manager.gd" id="1_vdw54"] [ext_resource type="Script" uid="uid://12l74jckdnpl" path="res://scripts/room_manager.gd" id="1_vdw54"]
[node name="EnemyHivemind" type="Node" groups=["enemy_hivemind"]] [node name="EnemyHivemind" type="Node3D" groups=["enemy_hivemind"]]
script = ExtResource("1_vdw54") script = ExtResource("1_vdw54")

View File

@@ -65,7 +65,6 @@ radius = 0.256836
[node name="Tree1" type="StaticBody3D"] [node name="Tree1" type="StaticBody3D"]
[node name="Tree1_trunk" type="MeshInstance3D" parent="."] [node name="Tree1_trunk" type="MeshInstance3D" parent="."]
transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
mesh = SubResource("ArrayMesh_5x6iv") mesh = SubResource("ArrayMesh_5x6iv")
skeleton = NodePath("") skeleton = NodePath("")

View File

@@ -1,13 +1,21 @@
[gd_scene load_steps=5 format=3 uid="uid://b6d8oy7iuad4a"] [gd_scene load_steps=7 format=3 uid="uid://b6d8oy7iuad4a"]
[ext_resource type="Texture2D" uid="uid://cok8af7y2qrmo" path="res://assets/Textures/clouds/FX_CloudAlpha01.png" id="1_g3s35"] [ext_resource type="Texture2D" uid="uid://cok8af7y2qrmo" path="res://assets/Textures/clouds/FX_CloudAlpha01.png" id="1_g3s35"]
[sub_resource type="Gradient" id="Gradient_g3s35"]
colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1)
[sub_resource type="GradientTexture1D" id="GradientTexture1D_017xs"]
gradient = SubResource("Gradient_g3s35")
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_017xs"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_017xs"]
emission_shape = 3 emission_shape = 3
emission_box_extents = Vector3(40, 20, 30) emission_box_extents = Vector3(40, 20, 30)
angle_min = 1.07288e-05 angle_min = 1.07288e-05
angle_max = 360.0 angle_max = 360.0
gravity = Vector3(0, 0, 0) gravity = Vector3(0, 0, 0)
color_ramp = SubResource("GradientTexture1D_017xs")
turbulence_noise_speed = Vector3(0.345, 0, 0)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7tvac"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7tvac"]
transparency = 1 transparency = 1

View File

@@ -55,6 +55,7 @@ normal_texture = SubResource("ImageTexture_cmr6o")
normal_depth = 1.0 normal_depth = 1.0
ao_strength = 2.0 ao_strength = 2.0
roughness = -0.05 roughness = -0.05
uv_scale = 0.2
[sub_resource type="Terrain3DTextureAsset" id="Terrain3DTextureAsset_od0q7"] [sub_resource type="Terrain3DTextureAsset" id="Terrain3DTextureAsset_od0q7"]
name = "Grass" name = "Grass"
@@ -65,7 +66,7 @@ normal_texture = ExtResource("4_adagb")
normal_depth = 2.0 normal_depth = 2.0
ao_strength = 2.0 ao_strength = 2.0
roughness = 1.0 roughness = 1.0
uv_scale = 0.2 uv_scale = 0.4
detiling_rotation = 0.161 detiling_rotation = 0.161
[resource] [resource]

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -14,7 +14,7 @@ shader_parameter/normal_threshold = 0.5
shader_parameter/normal_smoothing = 0.25 shader_parameter/normal_smoothing = 0.25
shader_parameter/max_thickness = 1.5 shader_parameter/max_thickness = 1.5
shader_parameter/min_thickness = 0.75 shader_parameter/min_thickness = 0.75
shader_parameter/max_distance = 75.0 shader_parameter/max_distance = 150.0
shader_parameter/min_distance = 2.0 shader_parameter/min_distance = 2.0
shader_parameter/grazing_fresnel_power = 5.0 shader_parameter/grazing_fresnel_power = 5.0
shader_parameter/grazing_angle_mask_power = 1.0 shader_parameter/grazing_angle_mask_power = 1.0

View File

@@ -5,7 +5,6 @@ func save_cloud_data(data,collection_id):
if auth.localid: if auth.localid:
var collection: FirestoreCollection = Firebase.Firestore.collection(collection_id) var collection: FirestoreCollection = Firebase.Firestore.collection(collection_id)
var document = await collection.get_doc(auth.localid) var document = await collection.get_doc(auth.localid)
if document: if document:
for key in data.keys(): for key in data.keys():
document.add_or_update_field(key,data[key]) document.add_or_update_field(key,data[key])
@@ -19,12 +18,9 @@ func save_cloud_data(data,collection_id):
func load_cloud_data(collection_id): func load_cloud_data(collection_id):
var auth = Firebase.Auth.auth var auth = Firebase.Auth.auth
if auth.localid: if auth.localid:
var collection : FirestoreCollection = Firebase.Firestore.collection(collection_id) var collection : FirestoreCollection = Firebase.Firestore.collection(collection_id)
var document = await collection.get_doc(auth.localid) var document = await collection.get_doc(auth.localid)
if document: if document:
print(document) print(document)
return document return document
@@ -40,15 +36,11 @@ func save_leaderboard_data():
"money" : GameGlobals.money, "money" : GameGlobals.money,
"deposited_money" : GameGlobals.deposited_money "deposited_money" : GameGlobals.deposited_money
} }
var leaderboard_name = get_leaderboard_name() var leaderboard_name = get_leaderboard_name()
var data = { var data = {
leaderboard_name : leaderboard_data leaderboard_name : leaderboard_data
} }
var collection = "leaderboard" var collection = "leaderboard"
save_cloud_data(data,collection) save_cloud_data(data,collection)
func load_leaderboard_data(): func load_leaderboard_data():
@@ -72,7 +64,6 @@ func save_user_data():
var data ={ var data ={
leaderboard_name : leaderboard_data leaderboard_name : leaderboard_data
} }
var collection = "user_data" var collection = "user_data"
save_cloud_data(data,collection) save_cloud_data(data,collection)

View File

@@ -11,7 +11,10 @@ func spawn_clouds():
number_of_clouds -= 1 number_of_clouds -= 1
var spawn_pos = random_box_pos() var spawn_pos = random_box_pos()
var set_pos = self.global_position + spawn_pos
var cloud = cloud.instantiate() var cloud = cloud.instantiate()
cloud.visible = false
add_child(cloud) add_child(cloud)
cloud.global_position = self.global_position + spawn_pos cloud.global_position = set_pos
await cloud.global_position == set_pos
cloud.visible = true