Compare commits

...

2 Commits

Author SHA1 Message Date
Rob Kelly 3d6ca8c12e Fixed clipping in seagull animation 2024-11-18 17:02:28 -07:00
Rob Kelly de5249699d Default resolution upped to 1080p 2024-11-18 15:04:07 -07:00
8 changed files with 185 additions and 179 deletions

Binary file not shown.

View File

@ -562,8 +562,8 @@
"output":26 "output":26
}, },
{ {
"input":7, "input":12,
"interpolation":"STEP", "interpolation":"LINEAR",
"output":27 "output":27
}, },
{ {
@ -2099,7 +2099,7 @@
{ {
"bufferView":27, "bufferView":27,
"componentType":5126, "componentType":5126,
"count":2, "count":90,
"type":"VEC3" "type":"VEC3"
}, },
{ {
@ -2985,598 +2985,598 @@
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":1080,
"byteOffset":17200 "byteOffset":17200
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":1440, "byteLength":1440,
"byteOffset":17224 "byteOffset":18280
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":18664 "byteOffset":19720
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":18688 "byteOffset":19744
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":1440, "byteLength":1440,
"byteOffset":18712 "byteOffset":19768
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":20152 "byteOffset":21208
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":20176 "byteOffset":21232
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":1440, "byteLength":1440,
"byteOffset":20200 "byteOffset":21256
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":21640 "byteOffset":22696
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":21664 "byteOffset":22720
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":1440, "byteLength":1440,
"byteOffset":21688 "byteOffset":22744
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":23128 "byteOffset":24184
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":1080, "byteLength":1080,
"byteOffset":23152 "byteOffset":24208
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":32, "byteLength":32,
"byteOffset":24232 "byteOffset":25288
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":24264 "byteOffset":25320
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":8, "byteLength":8,
"byteOffset":24288 "byteOffset":25344
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":24296 "byteOffset":25352
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":32, "byteLength":32,
"byteOffset":24320 "byteOffset":25376
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":24352 "byteOffset":25408
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":24376 "byteOffset":25432
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":1920, "byteLength":1920,
"byteOffset":24400 "byteOffset":25456
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":7680, "byteLength":7680,
"byteOffset":26320 "byteOffset":27376
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":34000 "byteOffset":35056
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":34024 "byteOffset":35080
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":7680, "byteLength":7680,
"byteOffset":34048 "byteOffset":35104
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":41728 "byteOffset":42784
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":41752 "byteOffset":42808
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":7680, "byteLength":7680,
"byteOffset":41776 "byteOffset":42832
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":49456 "byteOffset":50512
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":49480 "byteOffset":50536
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":7680, "byteLength":7680,
"byteOffset":49504 "byteOffset":50560
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":57184 "byteOffset":58240
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":5760, "byteLength":5760,
"byteOffset":57208 "byteOffset":58264
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":32, "byteLength":32,
"byteOffset":62968 "byteOffset":64024
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":63000 "byteOffset":64056
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":63024 "byteOffset":64080
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":7680, "byteLength":7680,
"byteOffset":63048 "byteOffset":64104
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":70728 "byteOffset":71784
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":70752 "byteOffset":71808
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":7680, "byteLength":7680,
"byteOffset":70776 "byteOffset":71832
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":78456 "byteOffset":79512
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":78480 "byteOffset":79536
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":7680, "byteLength":7680,
"byteOffset":78504 "byteOffset":79560
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":86184 "byteOffset":87240
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":86208 "byteOffset":87264
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":7680, "byteLength":7680,
"byteOffset":86232 "byteOffset":87288
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":93912 "byteOffset":94968
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":5760, "byteLength":5760,
"byteOffset":93936 "byteOffset":94992
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":32, "byteLength":32,
"byteOffset":99696 "byteOffset":100752
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":99728 "byteOffset":100784
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":4, "byteLength":4,
"byteOffset":99752 "byteOffset":100808
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99756 "byteOffset":100812
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":99768 "byteOffset":100824
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99784 "byteOffset":100840
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99796 "byteOffset":100852
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":99808 "byteOffset":100864
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99824 "byteOffset":100880
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99836 "byteOffset":100892
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":99848 "byteOffset":100904
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99864 "byteOffset":100920
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99876 "byteOffset":100932
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":99888 "byteOffset":100944
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99904 "byteOffset":100960
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99916 "byteOffset":100972
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":99928 "byteOffset":100984
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99944 "byteOffset":101000
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99956 "byteOffset":101012
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":99968 "byteOffset":101024
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99984 "byteOffset":101040
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":99996 "byteOffset":101052
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":100008 "byteOffset":101064
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100024 "byteOffset":101080
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100036 "byteOffset":101092
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":100048 "byteOffset":101104
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100064 "byteOffset":101120
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100076 "byteOffset":101132
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":100088 "byteOffset":101144
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100104 "byteOffset":101160
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100116 "byteOffset":101172
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":100128 "byteOffset":101184
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100144 "byteOffset":101200
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100156 "byteOffset":101212
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":16, "byteLength":16,
"byteOffset":100168 "byteOffset":101224
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":12, "byteLength":12,
"byteOffset":100184 "byteOffset":101240
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":8, "byteLength":8,
"byteOffset":100196 "byteOffset":101252
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":100204 "byteOffset":101260
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":32, "byteLength":32,
"byteOffset":100228 "byteOffset":101284
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":100260 "byteOffset":101316
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":100284 "byteOffset":101340
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":240, "byteLength":240,
"byteOffset":100308 "byteOffset":101364
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":960, "byteLength":960,
"byteOffset":100548 "byteOffset":101604
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":101508
},
{
"buffer":0,
"byteLength":24,
"byteOffset":101532
},
{
"buffer":0,
"byteLength":960,
"byteOffset":101556
},
{
"buffer":0,
"byteLength":24,
"byteOffset":102516
},
{
"buffer":0,
"byteLength":24,
"byteOffset":102540
},
{
"buffer":0,
"byteLength":960,
"byteOffset":102564 "byteOffset":102564
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":103524 "byteOffset":102588
},
{
"buffer":0,
"byteLength":24,
"byteOffset":103548
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":960, "byteLength":960,
"byteOffset":102612
},
{
"buffer":0,
"byteLength":24,
"byteOffset":103572 "byteOffset":103572
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":104532 "byteOffset":103596
},
{
"buffer":0,
"byteLength":960,
"byteOffset":103620
},
{
"buffer":0,
"byteLength":24,
"byteOffset":104580
},
{
"buffer":0,
"byteLength":24,
"byteOffset":104604
},
{
"buffer":0,
"byteLength":960,
"byteOffset":104628
},
{
"buffer":0,
"byteLength":24,
"byteOffset":105588
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":720, "byteLength":720,
"byteOffset":104556 "byteOffset":105612
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":960, "byteLength":960,
"byteOffset":105276 "byteOffset":106332
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":106236
},
{
"buffer":0,
"byteLength":24,
"byteOffset":106260
},
{
"buffer":0,
"byteLength":960,
"byteOffset":106284
},
{
"buffer":0,
"byteLength":24,
"byteOffset":107244
},
{
"buffer":0,
"byteLength":24,
"byteOffset":107268
},
{
"buffer":0,
"byteLength":960,
"byteOffset":107292 "byteOffset":107292
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":108252 "byteOffset":107316
},
{
"buffer":0,
"byteLength":24,
"byteOffset":108276
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":960, "byteLength":960,
"byteOffset":107340
},
{
"buffer":0,
"byteLength":24,
"byteOffset":108300 "byteOffset":108300
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":109260 "byteOffset":108324
},
{
"buffer":0,
"byteLength":24,
"byteOffset":109284
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":960, "byteLength":960,
"byteOffset":108348
},
{
"buffer":0,
"byteLength":24,
"byteOffset":109308 "byteOffset":109308
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":110268 "byteOffset":109332
},
{
"buffer":0,
"byteLength":720,
"byteOffset":110292
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":960, "byteLength":960,
"byteOffset":111012 "byteOffset":109356
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":24, "byteLength":24,
"byteOffset":111972 "byteOffset":110316
},
{
"buffer":0,
"byteLength":24,
"byteOffset":110340
},
{
"buffer":0,
"byteLength":960,
"byteOffset":110364
},
{
"buffer":0,
"byteLength":24,
"byteOffset":111324
},
{
"buffer":0,
"byteLength":720,
"byteOffset":111348
},
{
"buffer":0,
"byteLength":960,
"byteOffset":112068
},
{
"buffer":0,
"byteLength":24,
"byteOffset":113028
} }
], ],
"samplers":[ "samplers":[
@ -3587,7 +3587,7 @@
], ],
"buffers":[ "buffers":[
{ {
"byteLength":111996, "byteLength":113052,
"uri":"umineko.bin" "uri":"umineko.bin"
} }
] ]

View File

@ -414,3 +414,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.4011, 0.530239, -13.6932)
[node name="Umineko3" parent="Lakeside/Flock2" instance=ExtResource("21_ch6qk")] [node name="Umineko3" parent="Lakeside/Flock2" instance=ExtResource("21_ch6qk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.56348, -0.274033, -7.70535) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.56348, -0.274033, -7.70535)
[node name="DemoCamera" type="Camera3D" parent="."]
transform = Transform3D(-0.317113, 0.433573, -0.843477, 0, 0.88938, 0.457168, 0.948388, 0.144974, -0.282034, 461.268, 30.8271, 256.17)

View File

@ -30,8 +30,8 @@ gdscript/warnings/unsafe_call_argument=2
[display] [display]
window/size/viewport_width=1280 window/size/viewport_width=1920
window/size/viewport_height=720 window/size/viewport_height=1080
window/size/borderless=true window/size/borderless=true
window/stretch/aspect="ignore" window/stretch/aspect="ignore"
@ -42,6 +42,7 @@ project/assembly_name="Gfolf2"
[editor] [editor]
movie_writer/movie_file="demos/demo.avi" movie_writer/movie_file="demos/demo.avi"
movie_writer/fps=40
[editor_plugins] [editor_plugins]

View File

@ -50,6 +50,7 @@ bones/4/rotation = Quaternion(-2.06306e-08, 9.3445e-15, -0.13663, 0.990622)
bones/5/position = Vector3(1.46719, 0.319025, -2.26868e-07) bones/5/position = Vector3(1.46719, 0.319025, -2.26868e-07)
bones/5/rotation = Quaternion(1.45288e-07, 2.54822e-14, 0.9622, -0.272343) bones/5/rotation = Quaternion(1.45288e-07, 2.54822e-14, 0.9622, -0.272343)
bones/5/scale = Vector3(1, 1, 1) bones/5/scale = Vector3(1, 1, 1)
bones/6/position = Vector3(-3.69807e-09, 1, 4.25861e-10)
bones/6/rotation = Quaternion(1.78182e-14, 1.00686e-07, 0.745227, 0.66681) bones/6/rotation = Quaternion(1.78182e-14, 1.00686e-07, 0.745227, 0.66681)
bones/6/scale = Vector3(1, 1, 1) bones/6/scale = Vector3(1, 1, 1)
bones/7/rotation = Quaternion(-1.21153e-08, -4.65491e-15, 0.0802357, 0.996776) bones/7/rotation = Quaternion(-1.21153e-08, -4.65491e-15, 0.0802357, 0.996776)

View File

@ -98,6 +98,7 @@ _data = {
[node name="Game" type="Node" groups=["GameGroup"]] [node name="Game" type="Node" groups=["GameGroup"]]
process_mode = 3 process_mode = 3
script = ExtResource("1_4qa87") script = ExtResource("1_4qa87")
start_scene = "res://levels/debug_level/debug_level.tscn"
[node name="RootControl" type="Control" parent="."] [node name="RootControl" type="Control" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
@ -187,7 +188,7 @@ handle_input_locally = false
msaa_3d = 3 msaa_3d = 3
screen_space_aa = 1 screen_space_aa = 1
use_taa = true use_taa = true
size = Vector2i(1280, 720) size = Vector2i(1920, 1080)
render_target_update_mode = 4 render_target_update_mode = 4
[node name="Content" type="Node" parent="RootControl/Rumbler/ViewportContainer/Viewport"] [node name="Content" type="Node" parent="RootControl/Rumbler/ViewportContainer/Viewport"]