Finished basic gibs implementation.

remotes/1705377932733043820/tmp_refs/heads/unbroken
unfa 2021-09-08 23:28:37 +02:00
parent 68f50d1493
commit 4f9e5f294f
38 changed files with 158 additions and 54 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 KiB

After

Width:  |  Height:  |  Size: 131 B

View File

@ -1,3 +1,3 @@
[folding]
sections_unfolded=PackedStringArray( )
sections_unfolded=PackedStringArray()

View File

@ -4,10 +4,10 @@ Anim={
"visible": false
}
2D={
"grid_offset": Vector2( 0, 0 ),
"grid_offset": Vector2(0, 0),
"grid_snap_active": false,
"grid_step": Vector2( 8, 8 ),
"ofs": Vector2( -165, -110 ),
"grid_step": Vector2(8, 8),
"ofs": Vector2(-165, -110),
"primary_grid_steps": 8,
"show_edit_locks": true,
"show_grid": false,
@ -18,7 +18,6 @@ Anim={
"show_transformation_gizmos": true,
"show_viewport": true,
"show_zoom_control": true,
"skeleton_show_bones": true,
"smart_snap_active": false,
"snap_guides": true,
"snap_node_anchors": true,
@ -39,7 +38,6 @@ Anim={
"fov": 70.0,
"gizmos_status": {
"AudioStreamPlayer3D": 0,
"BakedLightmap": 0,
"CPUParticles3D": 0,
"CSGShape3D": 0,
"Camera3D": 0,
@ -47,11 +45,11 @@ Anim={
"CollisionPolygon3D": 0,
"CollisionShape3D": 0,
"Decal": 0,
"GIProbe": 0,
"GPUParticles3D": 0,
"GPUParticlesCollision3D": 0,
"Joint3D": 0,
"Light3D": 0,
"LightmapGI": 0,
"LightmapProbe": 0,
"NavigationRegion3D": 0,
"OccluderInstance3D": 0,
@ -64,7 +62,8 @@ Anim={
"SoftBody3D": 0,
"SpringArm3D": 0,
"VehicleWheel3D": 0,
"VisibilityNotifier3D": 0
"VisibleOnScreenNotifier3D": 0,
"VoxelGI": 0
},
"local_coords": false,
"preview_sun_env": {
@ -73,14 +72,14 @@ Anim={
"environ_energy": 1.0,
"environ_gi_enabled": false,
"environ_glow_enabled": true,
"environ_ground_color": Color( 0.121569, 0.121569, 0.129412, 1 ),
"environ_sky_color": Color( 0.568627, 0.698039, 0.807843, 1 ),
"environ_ground_color": Color(0.121569, 0.121569, 0.129412, 1),
"environ_sky_color": Color(0.568627, 0.698039, 0.807843, 1),
"environ_tonemap_enabled": true,
"sun_color": Color( 1, 1, 1, 1 ),
"sun_color": Color(1, 1, 1, 1),
"sun_disabled": false,
"sun_energy": 1.0,
"sun_max_distance": 250.0,
"sun_rotation": Basis( -0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, 0.5, -0.5 )
"sun_rotation": Vector2(0, 0)
},
"rotate_snap": 15.0,
"scale_snap": 10.0,
@ -89,7 +88,7 @@ Anim={
"snap_enabled": true,
"translate_snap": 1.0,
"viewport_mode": 1,
"viewports": [ {
"viewports": [{
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
@ -101,10 +100,10 @@ Anim={
"half_res": false,
"information": false,
"listener": true,
"position": Vector3( 11.5212, -1.69095, -7.72354 ),
"position": Vector3(11.5212, -1.69095, -7.72354),
"use_environment": false,
"use_orthogonal": false,
"view_name": "",
"view_type": 0,
"x_rotation": 0.292419,
"y_rotation": 7.13062
}, {
@ -119,10 +118,10 @@ Anim={
"half_res": false,
"information": false,
"listener": false,
"position": Vector3( 0, 0, 0 ),
"position": Vector3(0, 0, 0),
"use_environment": false,
"use_orthogonal": false,
"view_name": "",
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}, {
@ -137,10 +136,10 @@ Anim={
"half_res": false,
"information": false,
"listener": false,
"position": Vector3( 0, 0, 0 ),
"position": Vector3(0, 0, 0),
"use_environment": false,
"use_orthogonal": false,
"view_name": "",
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}, {
@ -155,19 +154,19 @@ Anim={
"half_res": false,
"information": false,
"listener": false,
"position": Vector3( 0, 0, 0 ),
"position": Vector3(0, 0, 0),
"use_environment": false,
"use_orthogonal": false,
"view_name": "",
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
} ],
}],
"zfar": 4000.0,
"znear": 0.05
}
TextureRegion={
"snap_mode": 0,
"snap_offset": Vector2( 0, 0 ),
"snap_separation": Vector2( 0, 0 ),
"snap_step": Vector2( 10, 10 )
"snap_offset": Vector2(0, 0),
"snap_separation": Vector2(0, 0),
"snap_step": Vector2(10, 10)
}

View File

@ -1,5 +1,5 @@
[folding]
node_unfolds=[ NodePath("."), PackedStringArray( "Process" ), NodePath("OmniLight3D"), PackedStringArray( "Light", "Omni", "Shadow" ), NodePath("DirectionalLight3D"), PackedStringArray( "Directional Shadow", "Light", "Shadow" ), NodePath("WorldEnvironment"), PackedStringArray( "environment" ), NodePath("Player/Head"), PackedStringArray( "Transform" ), NodePath("Player/Head/Camera3D"), PackedStringArray( "Transform" ), NodePath("Player/CollisionShape3D"), PackedStringArray( "shape" ), NodePath("Player/MeshInstance3D"), PackedStringArray( "mesh" ) ]
resource_unfolds=[ "res://Main.tscn::3", PackedStringArray( "Background", "Glow", "Glow/levels", "SDFGI", "Sky", "Tonemap", "Volumetric Fog", "Volumetric Fog/Temporal Reprojection", "sky" ), "res://Main.tscn::4", PackedStringArray( ), "res://Main.tscn::5", PackedStringArray( ), "res://Main.tscn::6", PackedStringArray( ) ]
nodes_folded=[ NodePath("Player"), NodePath("Player/Head") ]
node_unfolds=[NodePath("."), PackedStringArray("Process")]
resource_unfolds=["res://Map.tscn::GDScript_gjkl2", PackedStringArray()]
nodes_folded=[]

View File

@ -1,5 +1,6 @@
Timer
GPUParticles3D
ReflectionProbe
BakedLightmap
LightmapProbe
OmniLight3D
Node3D
@ -8,7 +9,6 @@ WorldEnvironment
Camera3D
MeshInstance3D
CollisionShape3D
KinematicBody3D
CSGBox3D
CSGCombiner3D
CSGTorus3D

View File

@ -1,3 +1,3 @@
[folding]
sections_unfolded=PackedStringArray( )
sections_unfolded=PackedStringArray()

View File

@ -10,26 +10,91 @@ dock_filesystem_file_list_display_mode=1
dock_split_2=0
dock_split_3=0
dock_hsplit_1=0
dock_hsplit_2=179
dock_hsplit_3=-176
dock_hsplit_2=114
dock_hsplit_3=-196
dock_hsplit_4=0
[EditorNode]
open_scenes=["res://Main.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn"]
open_scenes=["res://Main.tscn", "res://Assets/HUD/HUD.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn", "res://Assets/Effects/Gibs.tscn"]
[ScriptEditor]
open_scripts=[{
"path": "res://Assets/Weapons/Handgun/Casing.gd",
"state": {
"bookmarks": [],
"breakpoints": [],
"column": 0,
"folded_lines": [],
"h_scroll_position": 0,
"row": 9,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
}, {
"path": "res://Assets/HUD/Crosshair.gd",
"state": {
"bookmarks": [],
"breakpoints": [],
"column": 0,
"folded_lines": [],
"h_scroll_position": 0,
"row": 0,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
}, {
"path": "res://Assets/Weapons/Handgun/Flash.gd",
"state": {
"bookmarks": [],
"breakpoints": [],
"column": 0,
"folded_lines": [],
"h_scroll_position": 0,
"row": 0,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
}, {
"path": "res://Assets/Effects/Gibs.gd",
"state": {
"bookmarks": [],
"breakpoints": [],
"column": 13,
"folded_lines": [],
"h_scroll_position": 0,
"row": 19,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
}, {
"path": "res://Assets/Effects/Impact.gd",
"state": {
"bookmarks": [],
"breakpoints": [],
"column": 0,
"folded_lines": [],
"h_scroll_position": 0,
"row": 0,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
}, {
"path": "res://Main.gd",
"state": {
"bookmarks": [],
"breakpoints": [],
"column": 19,
"column": 40,
"folded_lines": [],
"h_scroll_position": 0,
"row": 76,
"scroll_position": 66.0,
"row": 3,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@ -38,11 +103,11 @@ open_scripts=[{
"state": {
"bookmarks": [],
"breakpoints": [],
"column": 0,
"column": 27,
"folded_lines": [],
"h_scroll_position": 0,
"row": 141,
"scroll_position": 141.0,
"row": 158,
"scroll_position": 154.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@ -51,14 +116,14 @@ open_scripts=[{
"state": {
"bookmarks": [],
"breakpoints": [],
"column": 32,
"column": 0,
"folded_lines": [],
"h_scroll_position": 0,
"row": 76,
"scroll_position": 57.0,
"row": 7,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
}]
open_help=["LightmapProbe"]
split_offset=39
open_help=["CharacterBody3D", "Engine", "LightmapProbe", "OS", "RigidBody3D"]
split_offset=18

View File

@ -1,4 +1,15 @@
res://Assets/Shaders/Base.tres
res://Assets/Characters/Player.gd
res://Assets/Characters/Player.tscn
res://Assets/Effects/Gibs.gd
res://Assets/Effects/Gibs.tscn
res://Assets/Effects/ImpactPlayer.tscn
res://Assets/Effects/ImpactWall.tscn
res://Assets/Effects/MuzzleFlash.tscn
res://Assets/HUD/HUD.tscn
res://Assets/HUD/Theme.tres
res://Assets/Weapons/Handgun/Flash.tscn
res://Assets/Weapons/Weapon.gd
res://Main.gd
res://Main.tscn
res://Player.gd
res://Map.tscn
res://default_env.tres

View File

@ -10,8 +10,8 @@ run_debug_instances=2
[recent_files]
scenes=["res://Main.tscn", "res://Assets/Characters/Player.tscn", "res://Assets/HUD/HUD.tscn", "res://Map.tscn", "res://Server.tscn", "res://Assets/Weapons/Handgun/Flash.tscn", "res://Assets/Weapons/Handgun/Casing.tscn", "res://Assets/Weapons/Weapon.tscn", "res://Assets/Maps/DM1/DM1.glb", "res://Assets/Props/BeerCan.glb"]
scripts=["Dictionary", "RigidBody3D", "OS", "Node3D", "Node", "MultiplayerAPI", "MeshInstance3D", "Input", "Callable", "@GlobalScope"]
scenes=["res://Assets/Effects/Gibs.tscn", "res://Map.tscn", "res://Assets/Characters/Player.tscn", "res://Assets/HUD/HUD.tscn", "res://Main.tscn", "res://Server.tscn", "res://Assets/Weapons/Handgun/Flash.tscn", "res://Assets/Weapons/Handgun/Casing.tscn", "res://Assets/Weapons/Weapon.tscn", "res://Assets/Maps/DM1/DM1.glb"]
scripts=["res://Assets/Effects/Gibs.gd", "Dictionary", "RigidBody3D", "OS", "Node3D", "Node", "MultiplayerAPI", "MeshInstance3D", "Input", "Callable"]
[script_setup]

View File

@ -1,4 +1,3 @@
res://Assets/Effects
res://Assets/Maps/DM1
res://Assets/Materials/
res://Assets/Materials
res://

View File

@ -1,3 +1,3 @@
source_md5="ce5f7f5df1790298675414be0f691d59"
dest_md5="0f2ecf7ca76edb18cd15678d57907521"
source_md5="4e5934d6814765401873169a2718dba3"
dest_md5="4a273f2e921918faafbc1e2eb88552ec"

View File

@ -0,0 +1,20 @@
extends CPUParticles3D
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
emitting = true
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
func _on_Timer_timeout():
queue_free()

View File

@ -1,4 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://egphnvwk6cg"]
[gd_scene load_steps=5 format=3 uid="uid://egphnvwk6cg"]
[ext_resource type="Script" path="res://Assets/Effects/Gibs.gd" id="1_o0guu"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3sp1q"]
albedo_color = Color(0.509804, 0.0235294, 0, 1)
@ -28,4 +30,12 @@ spread = 180.0
initial_velocity_min = 1.0
initial_velocity_max = 4.0
scale_amount_curve = SubResource( "Curve_0e5oj" )
script = ExtResource( "1_o0guu" )
[node name="Timer" type="Timer" parent="."]
wait_time = 5.0
one_shot = true
autostart = true
script = null
[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 129 B