Skip to content

Commit 9183007

Browse files
committed
feat: tv workie
The TV is now functional! I don't know what I did, but it doesn't really matter. If we need to do it again, we can just check the diff.
1 parent 29a30e6 commit 9183007

File tree

5 files changed

+55
-53
lines changed

5 files changed

+55
-53
lines changed

assets/Videos/IMG_8816.MOV

-341 KB
Binary file not shown.

assets/sky/sky.tscn

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ sky = SubResource("Sky_y574f")
3434
ambient_light_source = 3
3535
reflected_light_source = 2
3636
sdfgi_enabled = true
37+
glow_enabled = true
3738

3839
[node name="WorldEnvironment" type="WorldEnvironment"]
3940
environment = SubResource("Environment_ubvtl")

game/main.tscn

+3
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@
88
script = ExtResource("2_dmefr")
99
main_scene = "res://game/start_scene/start_scene.tscn"
1010

11+
[node name="Fade" parent="." index="0"]
12+
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0256014, 0)
13+
1114
[node name="LoadingScreen" parent="." index="2"]
1215
splash_screen = ExtResource("3_jlw5q")

game/start_scene/start_scene.tscn

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
resource_local_to_scene = true
1616
size = Vector2(3, 2)
1717

18-
[sub_resource type="ViewportTexture" id="ViewportTexture_fqqt1"]
18+
[sub_resource type="ViewportTexture" id="ViewportTexture_0u1ns"]
1919
viewport_path = NodePath("Viewport")
2020

21-
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_734jl"]
21+
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f8l0m"]
2222
transparency = 1
2323
cull_mode = 2
2424
shading_mode = 0
25-
albedo_texture = SubResource("ViewportTexture_fqqt1")
25+
albedo_texture = SubResource("ViewportTexture_0u1ns")
2626
texture_filter = 1
2727

2828
[sub_resource type="BoxShape3D" id="BoxShape3D_iru2p"]
@@ -59,7 +59,7 @@ unshaded = true
5959

6060
[node name="Screen" parent="Screen" index="1"]
6161
mesh = SubResource("QuadMesh_44p7b")
62-
surface_material_override/0 = SubResource("StandardMaterial3D_734jl")
62+
surface_material_override/0 = SubResource("StandardMaterial3D_f8l0m")
6363

6464
[node name="CollisionShape3D" parent="Screen/StaticBody3D" index="0"]
6565
shape = SubResource("BoxShape3D_iru2p")

game/zones/outside/outside_zone.tscn

+47-49
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
[ext_resource type="Texture2D" uid="uid://cbamap6i3aj2o" path="res://assets/Images/tropical_rush.png" id="75_2ujg7"]
7979
[ext_resource type="Terrain3DStorage" uid="uid://d4n4oxjw8hxo7" path="res://new_terrain_3d_storage.res" id="76_lrjdy"]
8080
[ext_resource type="Terrain3DMaterial" uid="uid://c4m48gihf1oxn" path="res://new_terrain_3d_material.tres" id="77_4wak6"]
81+
[ext_resource type="VideoStream" path="res://assets/Videos/Desktop-2024.03.22-12.48.14.01.ogv" id="77_xr2gm"]
8182
[ext_resource type="Terrain3DTextureList" uid="uid://cgq4iftxm46is" path="res://new_terrain_3d_texture_list.tres" id="78_wkllm"]
8283

8384
[sub_resource type="AnimationLibrary" id="AnimationLibrary_kw48d"]
@@ -119,34 +120,34 @@ _data = {
119120
"Thumb": ExtResource("37_kpb8w")
120121
}
121122

122-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lw02r"]
123+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_t63lx"]
123124
animation = &"Grip"
124125

125-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_kgyts"]
126+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lrucp"]
126127
animation = &"Grip"
127128

128-
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_kto3q"]
129+
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_qlbid"]
129130
filter_enabled = true
130131
filters = ["Armature/Skeleton3D:Little_Distal_L", "Armature/Skeleton3D:Little_Intermediate_L", "Armature/Skeleton3D:Little_Metacarpal_L", "Armature/Skeleton3D:Little_Proximal_L", "Armature/Skeleton3D:Middle_Distal_L", "Armature/Skeleton3D:Middle_Intermediate_L", "Armature/Skeleton3D:Middle_Metacarpal_L", "Armature/Skeleton3D:Middle_Proximal_L", "Armature/Skeleton3D:Ring_Distal_L", "Armature/Skeleton3D:Ring_Intermediate_L", "Armature/Skeleton3D:Ring_Metacarpal_L", "Armature/Skeleton3D:Ring_Proximal_L", "Armature/Skeleton3D:Thumb_Distal_L", "Armature/Skeleton3D:Thumb_Metacarpal_L", "Armature/Skeleton3D:Thumb_Proximal_L", "Armature/Skeleton:Little_Distal_L", "Armature/Skeleton:Little_Intermediate_L", "Armature/Skeleton:Little_Proximal_L", "Armature/Skeleton:Middle_Distal_L", "Armature/Skeleton:Middle_Intermediate_L", "Armature/Skeleton:Middle_Proximal_L", "Armature/Skeleton:Ring_Distal_L", "Armature/Skeleton:Ring_Intermediate_L", "Armature/Skeleton:Ring_Proximal_L", "Armature/Skeleton:Thumb_Distal_L", "Armature/Skeleton:Thumb_Proximal_L"]
131132

132-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_yun08"]
133+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_80p6j"]
133134
animation = &"Grip 5"
134135

135-
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_apiop"]
136+
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_ew5b7"]
136137
filter_enabled = true
137138
filters = ["Armature/Skeleton3D:Index_Distal_L", "Armature/Skeleton3D:Index_Intermediate_L", "Armature/Skeleton3D:Index_Metacarpal_L", "Armature/Skeleton3D:Index_Proximal_L", "Armature/Skeleton:Index_Distal_L", "Armature/Skeleton:Index_Intermediate_L", "Armature/Skeleton:Index_Proximal_L"]
138139

139-
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_4ictb"]
140+
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_ap4oj"]
140141
graph_offset = Vector2(-536, 11)
141-
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_lw02r")
142+
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_t63lx")
142143
nodes/ClosedHand1/position = Vector2(-600, 300)
143-
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_kgyts")
144+
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_lrucp")
144145
nodes/ClosedHand2/position = Vector2(-360, 300)
145-
nodes/Grip/node = SubResource("AnimationNodeBlend2_kto3q")
146+
nodes/Grip/node = SubResource("AnimationNodeBlend2_qlbid")
146147
nodes/Grip/position = Vector2(0, 20)
147-
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_yun08")
148+
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_80p6j")
148149
nodes/OpenHand/position = Vector2(-600, 100)
149-
nodes/Trigger/node = SubResource("AnimationNodeBlend2_apiop")
150+
nodes/Trigger/node = SubResource("AnimationNodeBlend2_ew5b7")
150151
nodes/Trigger/position = Vector2(-360, 20)
151152
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]
152153

@@ -189,34 +190,34 @@ _data = {
189190
"Thumb": ExtResource("72_vpdgb")
190191
}
191192

192-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_cdrh3"]
193+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_vv27m"]
193194
animation = &"Grip"
194195

195-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_20vl0"]
196+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_c2fxh"]
196197
animation = &"Grip"
197198

198-
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_bqabr"]
199+
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_mcy83"]
199200
filter_enabled = true
200201
filters = ["Armature/Skeleton3D:Little_Distal_R", "Armature/Skeleton3D:Little_Intermediate_R", "Armature/Skeleton3D:Little_Metacarpal_R", "Armature/Skeleton3D:Little_Proximal_R", "Armature/Skeleton3D:Middle_Distal_R", "Armature/Skeleton3D:Middle_Intermediate_R", "Armature/Skeleton3D:Middle_Metacarpal_R", "Armature/Skeleton3D:Middle_Proximal_R", "Armature/Skeleton3D:Ring_Distal_R", "Armature/Skeleton3D:Ring_Intermediate_R", "Armature/Skeleton3D:Ring_Metacarpal_R", "Armature/Skeleton3D:Ring_Proximal_R", "Armature/Skeleton3D:Thumb_Distal_R", "Armature/Skeleton3D:Thumb_Metacarpal_R", "Armature/Skeleton3D:Thumb_Proximal_R", "Armature/Skeleton:Little_Distal_R", "Armature/Skeleton:Little_Intermediate_R", "Armature/Skeleton:Little_Proximal_R", "Armature/Skeleton:Middle_Distal_R", "Armature/Skeleton:Middle_Intermediate_R", "Armature/Skeleton:Middle_Proximal_R", "Armature/Skeleton:Ring_Distal_R", "Armature/Skeleton:Ring_Intermediate_R", "Armature/Skeleton:Ring_Proximal_R", "Armature/Skeleton:Thumb_Distal_R", "Armature/Skeleton:Thumb_Proximal_R"]
201202

202-
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_n8i2g"]
203+
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ow3dl"]
203204
animation = &"Grip 5"
204205

205-
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_7k37v"]
206+
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_w4eck"]
206207
filter_enabled = true
207208
filters = ["Armature/Skeleton3D:Index_Distal_R", "Armature/Skeleton3D:Index_Intermediate_R", "Armature/Skeleton3D:Index_Metacarpal_R", "Armature/Skeleton3D:Index_Proximal_R", "Armature/Skeleton:Index_Distal_R", "Armature/Skeleton:Index_Intermediate_R", "Armature/Skeleton:Index_Proximal_R"]
208209

209-
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_s3yd6"]
210+
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_mxd21"]
210211
graph_offset = Vector2(-552.664, 107.301)
211-
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_cdrh3")
212+
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_vv27m")
212213
nodes/ClosedHand1/position = Vector2(-600, 300)
213-
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_20vl0")
214+
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_c2fxh")
214215
nodes/ClosedHand2/position = Vector2(-360, 300)
215-
nodes/Grip/node = SubResource("AnimationNodeBlend2_bqabr")
216+
nodes/Grip/node = SubResource("AnimationNodeBlend2_mcy83")
216217
nodes/Grip/position = Vector2(0, 40)
217-
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_n8i2g")
218+
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_ow3dl")
218219
nodes/OpenHand/position = Vector2(-600, 100)
219-
nodes/Trigger/node = SubResource("AnimationNodeBlend2_7k37v")
220+
nodes/Trigger/node = SubResource("AnimationNodeBlend2_w4eck")
220221
nodes/Trigger/position = Vector2(-360, 40)
221222
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]
222223

@@ -225,17 +226,14 @@ node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigge
225226
[sub_resource type="CylinderShape3D" id="CylinderShape3D_loupj"]
226227
radius = 5.08261
227228

228-
[sub_resource type="PlaneMesh" id="PlaneMesh_cwcs3"]
229+
[sub_resource type="PlaneMesh" id="PlaneMesh_dlrga"]
229230

230-
[sub_resource type="ViewportTexture" id="ViewportTexture_ytj8f"]
231+
[sub_resource type="ViewportTexture" id="ViewportTexture_arxkl"]
231232
viewport_path = NodePath("World/SubViewport")
232233

233-
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pxh4j"]
234+
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0ox5k"]
234235
resource_local_to_scene = true
235-
albedo_texture = SubResource("ViewportTexture_ytj8f")
236-
237-
[sub_resource type="VideoStreamTheora" id="VideoStreamTheora_u7tmm"]
238-
file = "res://assets/Videos/Desktop-2024.03.22-12.48.14.01.ogv"
236+
albedo_texture = SubResource("ViewportTexture_arxkl")
239237

240238
[node name="OutsideZone" instance=ExtResource("1_sk0kv")]
241239
zone_info = ExtResource("3_wyepd")
@@ -248,19 +246,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.23795, 0)
248246
current = true
249247

250248
[node name="Skeleton3D" parent="XROrigin3D/LeftHand/CollisionHandLeft/LeftHand/Hand_Nails_low_L/Armature" index="0"]
251-
bones/1/rotation = Quaternion(0.323537, -2.56577e-05, -0.0272204, 0.945824)
249+
bones/1/rotation = Quaternion(0.323537, -2.56569e-05, -0.0272204, 0.945824)
252250
bones/2/rotation = Quaternion(-0.0904441, -0.0415175, -0.166293, 0.981042)
253251
bones/3/rotation = Quaternion(-0.0466199, 0.020971, 0.0103276, 0.998639)
254252
bones/5/rotation = Quaternion(-0.00128455, -0.0116081, -0.0168259, 0.99979)
255253
bones/6/rotation = Quaternion(0.102925, -0.00993208, -0.00794417, 0.994608)
256254
bones/7/rotation = Quaternion(-0.012859, -0.0236108, -0.323258, 0.945929)
257255
bones/8/rotation = Quaternion(0.0120575, -0.00929194, -0.247472, 0.968775)
258-
bones/10/rotation = Quaternion(-0.0357539, -0.000400032, 0.00636764, 0.99934)
256+
bones/10/rotation = Quaternion(-0.0357539, -0.000400033, 0.00636764, 0.99934)
259257
bones/11/rotation = Quaternion(-0.00264964, -0.00114471, -0.125992, 0.992027)
260-
bones/12/rotation = Quaternion(0.0394225, 0.00193393, -0.228074, 0.972843)
258+
bones/12/rotation = Quaternion(0.0394225, 0.00193392, -0.228074, 0.972843)
261259
bones/13/rotation = Quaternion(-0.0123395, -0.00881294, -0.280669, 0.959685)
262260
bones/15/rotation = Quaternion(-0.0702656, 0.0101908, -0.0243307, 0.99718)
263-
bones/16/rotation = Quaternion(-0.0320634, -0.00223624, -0.0686366, 0.997124)
261+
bones/16/rotation = Quaternion(-0.0320635, -0.00223624, -0.0686366, 0.997124)
264262
bones/17/rotation = Quaternion(0.0253452, 0.00812462, -0.249005, 0.968136)
265263
bones/18/rotation = Quaternion(0.00252232, 0.00788073, -0.243204, 0.96994)
266264
bones/20/rotation = Quaternion(-0.0917369, 0.0203027, -0.010183, 0.995524)
@@ -278,34 +276,34 @@ visible = false
278276
libraries = {
279277
"": SubResource("AnimationLibrary_kw48d")
280278
}
281-
tree_root = SubResource("AnimationNodeBlendTree_4ictb")
279+
tree_root = SubResource("AnimationNodeBlendTree_ap4oj")
282280

283281
[node name="WristUI" parent="XROrigin3D/LeftHand/CollisionHandLeft" index="7"]
284282
visible = false
285283

286284
[node name="Skeleton3D" parent="XROrigin3D/RightHand/CollisionHandRight/RightHand/Hand_Nails_low_R/Armature" index="0"]
287-
bones/1/rotation = Quaternion(0.323537, 2.56577e-05, 0.0272204, 0.945824)
285+
bones/1/rotation = Quaternion(0.323537, 2.56569e-05, 0.0272204, 0.945824)
288286
bones/2/rotation = Quaternion(-0.0904441, 0.0415175, 0.166293, 0.981042)
289287
bones/3/rotation = Quaternion(-0.0466199, -0.020971, -0.0103276, 0.998639)
290288
bones/5/rotation = Quaternion(-0.00128455, 0.0116081, 0.0168259, 0.99979)
291289
bones/6/rotation = Quaternion(0.102925, 0.00993208, 0.00794419, 0.994608)
292290
bones/7/rotation = Quaternion(-0.012859, 0.0236108, 0.323258, 0.945929)
293-
bones/8/rotation = Quaternion(0.0120575, 0.00929193, 0.247472, 0.968775)
294-
bones/10/rotation = Quaternion(-0.0357539, 0.000400032, -0.00636763, 0.99934)
291+
bones/8/rotation = Quaternion(0.0120575, 0.00929192, 0.247472, 0.968775)
292+
bones/10/rotation = Quaternion(-0.0357539, 0.000400033, -0.00636763, 0.99934)
295293
bones/11/rotation = Quaternion(-0.00264964, 0.00114471, 0.125992, 0.992027)
296294
bones/12/rotation = Quaternion(0.0394225, -0.00193393, 0.228074, 0.972843)
297295
bones/13/rotation = Quaternion(-0.0123395, 0.00881294, 0.280669, 0.959685)
298-
bones/15/rotation = Quaternion(-0.0702656, -0.0101908, 0.0243307, 0.99718)
299-
bones/16/rotation = Quaternion(-0.0320634, 0.00223624, 0.0686366, 0.997124)
296+
bones/15/rotation = Quaternion(-0.0702656, -0.0101908, 0.0243307, 0.997179)
297+
bones/16/rotation = Quaternion(-0.0320635, 0.00223624, 0.0686366, 0.997124)
300298
bones/17/rotation = Quaternion(0.0253452, -0.00812462, 0.249005, 0.968136)
301299
bones/18/rotation = Quaternion(0.00252233, -0.00788073, 0.243204, 0.96994)
302300
bones/20/rotation = Quaternion(-0.0917369, -0.0203027, 0.010183, 0.995524)
303301
bones/21/rotation = Quaternion(-0.0625182, 0.000225721, 0.115393, 0.991351)
304302
bones/22/rotation = Quaternion(0.0585786, -0.0216483, 0.269905, 0.96086)
305-
bones/23/rotation = Quaternion(0.00687177, 0.00357275, 0.211953, 0.977249)
303+
bones/23/rotation = Quaternion(0.00687176, 0.00357274, 0.211953, 0.977249)
306304

307305
[node name="BoneAttachment3D" parent="XROrigin3D/RightHand/CollisionHandRight/RightHand/Hand_Nails_low_R/Armature/Skeleton3D" index="1"]
308-
transform = Transform3D(0.540829, -0.840813, 0.0231736, 0.0826268, 0.0805242, 0.993322, -0.837064, -0.535303, 0.113024, -0.039902, 0.0402828, -0.150096)
306+
transform = Transform3D(0.54083, -0.840813, 0.0231736, 0.0826267, 0.0805243, 0.993322, -0.837064, -0.535303, 0.113023, -0.039902, 0.0402828, -0.150096)
309307

310308
[node name="Poke" parent="XROrigin3D/RightHand/CollisionHandRight/RightHand/Hand_Nails_low_R/Armature/Skeleton3D/BoneAttachment3D" index="0"]
311309
visible = false
@@ -314,7 +312,7 @@ visible = false
314312
libraries = {
315313
"": SubResource("AnimationLibrary_reqae")
316314
}
317-
tree_root = SubResource("AnimationNodeBlendTree_s3yd6")
315+
tree_root = SubResource("AnimationNodeBlendTree_mxd21")
318316

319317
[node name="LeftPocket" parent="XROrigin3D/PlayerBody" index="0"]
320318
visible = false
@@ -414,22 +412,22 @@ wait_time = 4.0
414412

415413
[node name="Screen" type="MeshInstance3D" parent="World" index="19"]
416414
unique_name_in_owner = true
417-
transform = Transform3D(1.91069e-15, 4.37114e-08, 1.77, 1, -4.37114e-08, 0, 4.37114e-08, 1, -7.73692e-08, 0, 1.09446, -8.22262)
418-
mesh = SubResource("PlaneMesh_cwcs3")
419-
surface_material_override/0 = SubResource("StandardMaterial3D_pxh4j")
415+
transform = Transform3D(1.778, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.786794, -9.86936)
416+
mesh = SubResource("PlaneMesh_dlrga")
417+
surface_material_override/0 = SubResource("StandardMaterial3D_0ox5k")
420418

421419
[node name="SubViewport" type="SubViewport" parent="World" index="20"]
422420
size = Vector2i(1920, 1080)
423421

424422
[node name="SubViewportContainer" type="SubViewportContainer" parent="World/SubViewport" index="0"]
425-
offset_right = 40.0
426-
offset_bottom = 40.0
423+
offset_right = 1920.0
424+
offset_bottom = 1080.0
427425

428426
[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="World/SubViewport/SubViewportContainer" index="0"]
429427
unique_name_in_owner = true
430428
layout_mode = 2
431-
stream = SubResource("VideoStreamTheora_u7tmm")
432-
paused = true
429+
stream = ExtResource("77_xr2gm")
430+
autoplay = true
433431

434432
[node name="WinLabel1" type="Label3D" parent="World" index="21"]
435433
unique_name_in_owner = true

0 commit comments

Comments
 (0)