Polish meat elevator

This commit is contained in:
Spencer Killen 2022-11-27 17:25:59 -07:00
parent 3bed9348a0
commit 1ff01b01da
Signed by: sjkillen
GPG Key ID: F307025B65C860BA
55 changed files with 6160 additions and 193 deletions

BIN
blends/large_meat_tunnel.blend (Stored with Git LFS)

Binary file not shown.

BIN
blends/meat_elevator.blend (Stored with Git LFS) Normal file

Binary file not shown.

BIN
blends/meat_elevator_1024.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
blends/meat_elevator_entance.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,3 @@
source_md5="c193df76d60b0d81ce93a524a8615865"
dest_md5="04f43ec0d9e75f0eac06b400a27c9186"

View File

@ -0,0 +1,3 @@
source_md5="c193df76d60b0d81ce93a524a8615865"
dest_md5="cd333c19bd13ef5ac41160cee0ab7a6e"

View File

@ -0,0 +1,3 @@
source_md5="c193df76d60b0d81ce93a524a8615865"
dest_md5="d83b00b22358a827d5e3781cf3db52b9"

View File

@ -1,3 +1,3 @@
source_md5="84213c2ebf5cf5d100ded4c25f1c4e59" source_md5="c193df76d60b0d81ce93a524a8615865"
dest_md5="8bd0ed755a5902356a1236b7beee1c31" dest_md5="b622af127ab6bd278284f090a1149167"

View File

@ -0,0 +1,3 @@
source_md5="d8bf9843a0ea7a3908bcdedf59c31407"
dest_md5="14d16b3c702b9f29d990461c3f4bc1b4"

View File

@ -0,0 +1,3 @@
source_md5="f80a82ea17c361d29ac53a1d39720858"
dest_md5="da3b3a6dd66a27a827097049d4676d55"

View File

@ -0,0 +1,3 @@
source_md5="e55bb71268689e80e8179dc98a36f3d5"
dest_md5="5b14464029f30ecd5dd82201d098c938"

View File

@ -0,0 +1,3 @@
source_md5="e23296f31c36256c136782ca6adcef09"
dest_md5="4bdde3daba60b782a9de731a8a490c33"

View File

@ -0,0 +1,2 @@
45943
/home/squirrel/.local/bin/godot_mono

BIN
godot/assets/models/Material_003.material (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/models/MeatElevatorEntrance.material (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/models/MeatElevatorExit.material (Stored with Git LFS) Normal file

Binary file not shown.

BIN
godot/assets/models/MeatTunellTop.material (Stored with Git LFS)

Binary file not shown.

BIN
godot/assets/models/meat_elevator.glb (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -2,12 +2,12 @@
importer="scene" importer="scene"
type="PackedScene" type="PackedScene"
path="res://.import/meat_tunnel.glb-fe91fe1cfbc2b5814b2c2d62f50f2ece.scn" path="res://.import/meat_elevator.glb-f7ba3fb8f722454b8513a29bdead6419.scn"
[deps] [deps]
source_file="res://assets/models/meat_tunnel.glb" source_file="res://assets/models/meat_elevator.glb"
dest_files=[ "res://.import/meat_tunnel.glb-fe91fe1cfbc2b5814b2c2d62f50f2ece.scn" ] dest_files=[ "res://.import/meat_elevator.glb-f7ba3fb8f722454b8513a29bdead6419.scn" ]
[params] [params]

File diff suppressed because it is too large Load Diff

BIN
godot/assets/models/meat_elevator_entrance.glb (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -2,12 +2,12 @@
importer="scene" importer="scene"
type="PackedScene" type="PackedScene"
path="res://.import/elevator_tracker_final.glb-4caa9dbb1e8a2375ce08e38802c02e98.scn" path="res://.import/meat_elevator_entrance.glb-8d6c8197bd1caf195e4bbcd33c347142.scn"
[deps] [deps]
source_file="res://tests/elevator/elevator_tracker_final.glb" source_file="res://assets/models/meat_elevator_entrance.glb"
dest_files=[ "res://.import/elevator_tracker_final.glb-4caa9dbb1e8a2375ce08e38802c02e98.scn" ] dest_files=[ "res://.import/meat_elevator_entrance.glb-8d6c8197bd1caf195e4bbcd33c347142.scn" ]
[params] [params]

File diff suppressed because one or more lines are too long

BIN
godot/assets/models/meat_elevator_exit.glb (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -2,12 +2,12 @@
importer="scene" importer="scene"
type="PackedScene" type="PackedScene"
path="res://.import/elevator_vertex_animation_final.glb-3661a7bc17c6e7eaaf0125bb2edae065.scn" path="res://.import/meat_elevator_exit.glb-5e980769f692fcc7ac29b92d6ae58ad0.scn"
[deps] [deps]
source_file="res://tests/elevator/elevator_vertex_animation_final.glb" source_file="res://assets/models/meat_elevator_exit.glb"
dest_files=[ "res://.import/elevator_vertex_animation_final.glb-3661a7bc17c6e7eaaf0125bb2edae065.scn" ] dest_files=[ "res://.import/meat_elevator_exit.glb-5e980769f692fcc7ac29b92d6ae58ad0.scn" ]
[params] [params]

File diff suppressed because one or more lines are too long

BIN
godot/assets/models/meat_elevator_tracker.glb (Stored with Git LFS) Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +1,13 @@
[gd_scene load_steps=6 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://tests/elevator/elevator_tracker_final.glb" type="PackedScene" id=1] [ext_resource path="res://assets/models/meat_elevator_tracker.glb" type="PackedScene" id=1]
[ext_resource path="res://tests/elevator/ElevatorTracker.gd" type="Script" id=2] [ext_resource path="res://effects/ElevatorTracker.gd" type="Script" id=2]
[ext_resource path="res://tests/elevator/elevator_vertex_animation_final.tscn" type="PackedScene" id=3]
[sub_resource type="Animation" id=1] [sub_resource type="Animation" id=1]
resource_name = "Action004" resource_name = "tracker_journey"
length = 8.33333 length = 8.33333
tracks/0/type = "transform" tracks/0/type = "transform"
tracks/0/path = NodePath("ElevatorFinalTracker") tracks/0/path = NodePath("MeatElevatorTracker")
tracks/0/interp = 1 tracks/0/interp = 1
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/imported = false tracks/0/imported = false
@ -17,22 +16,18 @@ tracks/0/keys = PoolRealArray( 0, 1, 0, -3.8147e-06, -7.45058e-09, 0, 0, 0, 1, 1
[sub_resource type="SphereShape" id=2] [sub_resource type="SphereShape" id=2]
[node name="elevator_tracker_final" instance=ExtResource( 1 )] [node name="meat_elevator_tracker" instance=ExtResource( 1 )]
[node name="ElevatorFinalTracker" parent="." index="0"] [node name="MeatElevatorTracker" parent="." index="0"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.8147e-06, -7.45058e-09 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.8147e-06, -7.45058e-09 )
script = ExtResource( 2 ) script = ExtResource( 2 )
track_animation_name = "Action004"
vertex_animation_name = "Key009Action001"
[node name="AnimationPlayer" type="AnimationPlayer" parent="ElevatorFinalTracker" index="0"] [node name="AnimationPlayer" type="AnimationPlayer" parent="MeatElevatorTracker" index="0"]
root_node = NodePath("../..") root_node = NodePath("../..")
anims/Action004 = SubResource( 1 ) anims/tracker_journey = SubResource( 1 )
[node name="ElevatorGrip" type="Area" parent="ElevatorFinalTracker" index="1"] [node name="ElevatorGrip" type="Area" parent="MeatElevatorTracker" index="1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7.45058e-09 )
[node name="CollisionShape" type="CollisionShape" parent="ElevatorFinalTracker/ElevatorGrip" index="0"] [node name="CollisionShape" type="CollisionShape" parent="MeatElevatorTracker/ElevatorGrip" index="0"]
transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
shape = SubResource( 2 ) shape = SubResource( 2 )
[node name="ElevatorVertexAnimation" parent="." index="1" instance=ExtResource( 3 )]

BIN
godot/assets/models/meat_tunnel.glb (Stored with Git LFS)

Binary file not shown.

View File

@ -3,6 +3,8 @@ extends Spatial
var at_top: bool = true var at_top: bool = true
export var track_animation_name = "" export var track_animation_name = ""
export var vertex_animation_name = "" export var vertex_animation_name = ""
export var vertex_animation_path: NodePath
export var playback_speed: float
signal arrived signal arrived
@ -17,12 +19,20 @@ func toggle():
at_top = not at_top at_top = not at_top
func descend(): func descend():
yield(get_tree().create_timer(0.1), "timeout")
$AnimationPlayer.play(track_animation_name) $AnimationPlayer.play(track_animation_name)
$"../ElevatorVertexAnimation/AnimationPlayer".play(vertex_animation_name) get_node(vertex_animation_path).play(vertex_animation_name)
$AnimationPlayer.playback_speed = playback_speed
get_node(vertex_animation_path).playback_speed = playback_speed
func ascend(): func ascend():
yield(get_tree().create_timer(0.1), "timeout")
$AnimationPlayer.play_backwards(track_animation_name) $AnimationPlayer.play_backwards(track_animation_name)
$"../ElevatorVertexAnimation/AnimationPlayer".play_backwards(vertex_animation_name) get_node(vertex_animation_path).play_backwards(vertex_animation_name)
$AnimationPlayer.playback_speed = playback_speed
get_node(vertex_animation_path).playback_speed = playback_speed
func _on_AnimationPlayer_animation_finished(_anim_name): func _on_AnimationPlayer_animation_finished(_anim_name):
emit_signal("arrived") emit_signal("arrived")

View File

@ -0,0 +1,42 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://assets/models/meat_elevator_tracker.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/models/meat_elevator.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/models/meat_elevator_exit.tscn" type="PackedScene" id=3]
[ext_resource path="res://assets/models/meat_elevator_entrance.tscn" type="PackedScene" id=4]
[sub_resource type="BoxShape" id=1]
extents = Vector3( 1, 0.215321, 1 )
[node name="elevator" type="Spatial"]
[node name="meat_elevator" parent="." instance=ExtResource( 2 )]
[node name="meat_elevator_entrance" parent="." instance=ExtResource( 4 )]
[node name="meat_elevator_exit" parent="." instance=ExtResource( 3 )]
[node name="meat_elevator_tracker" parent="." instance=ExtResource( 1 )]
[node name="MeatElevatorTracker" parent="meat_elevator_tracker" index="0"]
track_animation_name = "tracker_journey"
vertex_animation_name = "Key009Action001"
vertex_animation_path = NodePath("../../meat_elevator/MeatElevator/AnimationPlayer")
playback_speed = 0.5
[node name="TunnelBlockerUpper" type="StaticBody" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.28918, 0 )
[node name="CollisionShape" type="CollisionShape" parent="TunnelBlockerUpper"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.119834, 0 )
shape = SubResource( 1 )
[node name="TunnelBlockerLower" type="StaticBody" parent="."]
transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 3.85271, -39.2803, 0 )
[node name="CollisionShape" type="CollisionShape" parent="TunnelBlockerLower"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.08708, 0 )
shape = SubResource( 1 )
[editable path="meat_elevator"]
[editable path="meat_elevator_tracker"]

67
godot/effects/shader.tscn Normal file
View File

@ -0,0 +1,67 @@
[gd_scene load_steps=3 format=2]
[sub_resource type="Shader" id=1]
code = "/*
砂嵐エフェクト by あるる(きのもと 結衣)
Screen Noise Effect Shader by Yui Kinomoto @arlez80
MIT License
*/
shader_type canvas_item;
uniform float seed = 81.0;
uniform float power : hint_range( 0.0, 1.0 ) = 0.0022;
uniform float speed = 0.1;
vec2 random( vec2 pos )
{
return fract(
sin(
vec2(
dot(pos, vec2(12.9898,78.233))
, dot(pos, vec2(-148.998,-65.233))
)
) * 43758.5453
);
}
uniform float amount = 0.060;
void fragment( )
{
vec2 uv = SCREEN_UV + ( random( UV + vec2( seed - TIME * speed, TIME * speed ) ) - vec2( 0.5, 0.5 ) ) * power;
COLOR = textureLod( SCREEN_TEXTURE, uv, 0.0 );
vec2 buv = UV;
//buv.r = buv.r % 25.0
float factor = 200.0;
buv.r = round(buv.r * factor) / factor;
buv.g = round(buv.g * factor) / factor;
float a = fract(sin(dot(buv, vec2(12.9898, 78.233) * TIME)) * 438.5453) * 1.9;
a = a * amount;
COLOR.r -= a;
COLOR.g -= a;
COLOR.b -= a;
}"
[sub_resource type="ShaderMaterial" id=2]
shader = SubResource( 1 )
shader_param/seed = 81.0
shader_param/power = 0.0022
shader_param/speed = 0.1
shader_param/amount = 0.06
[node name="shader" type="Spatial"]
[node name="CanvasLayer" type="CanvasLayer" parent="."]
layer = 100
[node name="ColorRect" type="ColorRect" parent="CanvasLayer"]
material = SubResource( 2 )
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 2

View File

@ -1,6 +1,7 @@
extends Spatial extends Spatial
var elevator_tracker = null var elevator_tracker = null
var locked = false
func _on_Area_area_entered(area: Node): func _on_Area_area_entered(area: Node):
print(area) print(area)
@ -23,8 +24,14 @@ func disconnect_passenger():
elevator_tracker = null elevator_tracker = null
$"../".set_physics_node($"../OnFootPhysics") $"../".set_physics_node($"../OnFootPhysics")
func _process(_delta): func _process(delta):
if elevator_tracker == null: if elevator_tracker == null:
global_transform.origin = $"../OnFootPhysics".global_transform.origin global_transform.origin = $"../OnFootPhysics".global_transform.origin
locked = false
return return
global_transform.origin = elevator_tracker.global_transform.origin
global_transform.origin = lerp(global_transform.origin, elevator_tracker.global_transform.origin, delta*10)
if locked or (global_transform.origin - elevator_tracker.global_transform.origin).length() < 0.05:
locked = true
global_transform.origin = elevator_tracker.global_transform.origin

View File

@ -55,6 +55,7 @@ script = ExtResource( 7 )
[node name="Area" type="Area" parent="ElevatorPhysics"] [node name="Area" type="Area" parent="ElevatorPhysics"]
[node name="CollisionShape" type="CollisionShape" parent="ElevatorPhysics/Area"] [node name="CollisionShape" type="CollisionShape" parent="ElevatorPhysics/Area"]
transform = Transform( 0.325, 0, 0, 0, 0.78, 0, 0, 0, 0.325, 0.0029822, 0.0328078, -0.000828505 )
shape = SubResource( 5 ) shape = SubResource( 5 )
[node name="MovementInput" type="Node" parent="."] [node name="MovementInput" type="Node" parent="."]

BIN
godot/tests/elevator/Material.material (Stored with Git LFS)

Binary file not shown.

BIN
godot/tests/elevator/Material_004.material (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
godot/tests/elevator/MeatModule5.material (Stored with Git LFS)

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

BIN
godot/tests/elevator/meat_slide_2.mdd (Stored with Git LFS)

Binary file not shown.

File diff suppressed because one or more lines are too long