Skip to content

Commit

Permalink
Merge pull request #65 from PolyCatDev/alter-dev
Browse files Browse the repository at this point in the history
last commit
  • Loading branch information
AlterNStuff authored Nov 16, 2024
2 parents 5aff50f + 569fec5 commit c4f64c6
Show file tree
Hide file tree
Showing 25 changed files with 320 additions and 66 deletions.
2 changes: 1 addition & 1 deletion addons/godot-xr-tools/hands/materials/cleaning_glove.tres
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[ext_resource type="Texture2D" uid="uid://dt6k4nuvpo38o" path="res://addons/godot-xr-tools/hands/textures/glove_normal.png" id="2_uiqlw"]

[resource]
albedo_color = Color(0.858787, 0.873024, 0.955473, 1)
albedo_color = Color(0.893992, 0.846458, 0.764294, 1)
normal_enabled = true
normal_scale = 0.1
normal_texture = ExtResource("2_uiqlw")
Expand Down
24 changes: 12 additions & 12 deletions addons/godot-xr-tools/hands/scenes/lowpoly/left_fullglove_low.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,34 @@
[ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="5"]
[ext_resource type="Material" uid="uid://cdb40djkihelq" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.tres" id="6"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_hiejl"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_iq8y4"]
animation = &"Grip"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_r4pvg"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_cyxd2"]
animation = &"Grip"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_4hii7"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_q74a0"]
filter_enabled = true
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"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_qlffb"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_rnncx"]
animation = &"Grip 5"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_p5qua"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_0a734"]
filter_enabled = true
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"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_yvmoi"]
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_p75s1"]
graph_offset = Vector2(-536, 11)
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_hiejl")
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_iq8y4")
nodes/ClosedHand1/position = Vector2(-600, 300)
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_r4pvg")
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_cyxd2")
nodes/ClosedHand2/position = Vector2(-360, 300)
nodes/Grip/node = SubResource("AnimationNodeBlend2_4hii7")
nodes/Grip/node = SubResource("AnimationNodeBlend2_q74a0")
nodes/Grip/position = Vector2(0, 20)
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_qlffb")
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_rnncx")
nodes/OpenHand/position = Vector2(-600, 100)
nodes/Trigger/node = SubResource("AnimationNodeBlend2_p5qua")
nodes/Trigger/node = SubResource("AnimationNodeBlend2_0a734")
nodes/Trigger/position = Vector2(-360, 20)
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]

Expand Down Expand Up @@ -74,7 +74,7 @@ surface_material_override/0 = ExtResource("6")

[node name="AnimationTree" type="AnimationTree" parent="."]
root_node = NodePath("../Hand_low_L")
tree_root = SubResource("AnimationNodeBlendTree_yvmoi")
tree_root = SubResource("AnimationNodeBlendTree_p75s1")
anim_player = NodePath("../Hand_low_L/AnimationPlayer")
parameters/Grip/blend_amount = 0.0
parameters/Trigger/blend_amount = 0.0
Expand Down
Binary file added assets/image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions assets/image.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://mbl6aogavx8c"
path="res://.godot/imported/image.png-7a7bd711b5b4054e846c70397f9ba855.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/image.png"
dest_files=["res://.godot/imported/image.png-7a7bd711b5b4054e846c70397f9ba855.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added assets/krwj5e8u.bmp
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/krwj5e8u.bmp.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bah86c5sqk3i8"
path="res://.godot/imported/krwj5e8u.bmp-b110c419ae73e2f176c709803884a18c.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/krwj5e8u.bmp"
dest_files=["res://.godot/imported/krwj5e8u.bmp-b110c419ae73e2f176c709803884a18c.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added assets/switchdiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions assets/switchdiagram.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bf00y54extemi"
path="res://.godot/imported/switchdiagram.png-deddb5ca23a142d51951d4842ba09352.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/switchdiagram.png"
dest_files=["res://.godot/imported/switchdiagram.png-deddb5ca23a142d51951d4842ba09352.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
64 changes: 64 additions & 0 deletions export_presets.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
[preset.0]

name="Windows Desktop"
platform="Windows Desktop"
runnable=true
advanced_options=false
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="../NetLabs.exe"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
script_export_mode=2

[preset.0.options]

custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=0
binary_format/embed_pck=true
texture_format/s3tc_bptc=true
texture_format/etc2_astc=false
binary_format/architecture="x86_64"
codesign/enable=false
codesign/timestamp=true
codesign/timestamp_server_url=""
codesign/digest_algorithm=1
codesign/description=""
codesign/custom_options=PackedStringArray()
application/modify_resources=true
application/icon=""
application/console_wrapper_icon=""
application/icon_interpolation=4
application/file_version=""
application/product_version=""
application/company_name=""
application/product_name=""
application/file_description=""
application/copyright=""
application/trademarks=""
application/export_angle=0
application/export_d3d12=0
application/d3d12_agility_sdk_multiarch=true
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
ssh_remote_deploy/port="22"
ssh_remote_deploy/extra_args_ssh=""
ssh_remote_deploy/extra_args_scp=""
ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
$trigger = New-ScheduledTaskTrigger -Once -At 00:00
$settings = New-ScheduledTaskSettingsSet
$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
Start-ScheduledTask -TaskName godot_remote_debug
while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
Remove-Item -Recurse -Force '{temp_dir}'"
Binary file added image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions image.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bhwvgsbccrnpp"
path="res://.godot/imported/image.png-2de165adb17dfebcee8a7cd6c9833936.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://image.png"
dest_files=["res://.godot/imported/image.png-2de165adb17dfebcee8a7cd6c9833936.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
3 changes: 3 additions & 0 deletions levels/main.gd
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,8 @@ func _ready():
func spawn_objects(slide):
if slide > 0:
var playnet = net[slide].instantiate()
playnet.position = Vector3(0.0, 1.065, -1.8)
playnet.rotation.y = deg_to_rad(-90) #-1.57
playnet.scale = Vector3(0.8, 0.8, 0.8)
add_child(playnet)

55 changes: 35 additions & 20 deletions levels/main.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=17 format=3 uid="uid://by0xcr14rdghl"]
[gd_scene load_steps=21 format=3 uid="uid://by0xcr14rdghl"]

[ext_resource type="Script" path="res://levels/main.gd" id="1_mq88t"]
[ext_resource type="PackedScene" uid="uid://c7sg65ao6ed6i" path="res://enviourment/wall.tscn" id="2_a55se"]
Expand All @@ -12,10 +12,26 @@
[ext_resource type="PackedScene" uid="uid://dsvsflcjh1if2" path="res://objects/simple table/sketchfab_scene.tscn" id="9_2xjkr"]
[ext_resource type="Resource" uid="uid://bkt6oisr41nb3" path="res://screens/main/slide_1.tres" id="9_r2lvh"]
[ext_resource type="Resource" uid="uid://l7w06371gstw" path="res://screens/main/slide_2.tres" id="10_k2f35"]
[ext_resource type="PackedScene" uid="uid://dksmtpbcoav0b" path="res://objects/lamp.tscn" id="12_vf087"]
[ext_resource type="PackedScene" uid="uid://b728wniofsrrk" path="res://objects/lan_net.tscn" id="13_6fskl"]
[ext_resource type="PackedScene" uid="uid://wnik7qatydba" path="res://objects/private_net.tscn" id="13_svqck"]
[ext_resource type="PackedScene" uid="uid://dq2d7y1nt7e8c" path="res://objects/button.tscn" id="13_vn8pb"]
[ext_resource type="PackedScene" uid="uid://duq0n8xmlqc21" path="res://levels/start.tscn" id="14_sj26u"]
[ext_resource type="PackedScene" uid="uid://sy6ja7j5ipvy" path="res://objects/cardboard_boxes/scene.gltf" id="15_p8prk"]

[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_3y2um"]
sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)

[sub_resource type="Sky" id="Sky_wc2tn"]
sky_material = SubResource("ProceduralSkyMaterial_3y2um")

[sub_resource type="Environment" id="Environment_gl11v"]
background_mode = 2
sky = SubResource("Sky_wc2tn")
tonemap_mode = 2
glow_enabled = true

[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ucxkm"]
albedo_color = Color(0.91664, 0.91664, 0.91664, 1)

[node name="Node3D" type="Node3D"]
script = ExtResource("1_mq88t")
Expand All @@ -24,30 +40,34 @@ net = Array[PackedScene]([null, ExtResource("13_svqck"), ExtResource("13_6fskl")
[node name="Player" parent="." instance=ExtResource("4_sr7gr")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.9)

[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_gl11v")

[node name="floor" parent="." instance=ExtResource("2_g1jgc")]
transform = Transform3D(-6.87209e-08, 0, 1.57215, 0, 1.57215, 0, -1.57215, 0, -6.87209e-08, 0.0106039, 4.76837e-07, 0.445307)

[node name="Boxes" parent="floor" instance=ExtResource("15_p8prk")]
transform = Transform3D(0.616377, 0, -0.584204, 0, 0.849244, 0, 0.584204, 0, 0.616377, 1.26999, -3.03302e-07, -1.66108)

[node name="Boxes2" parent="floor" instance=ExtResource("15_p8prk")]
transform = Transform3D(-0.632484, 0, -0.0674592, 0, 0.636072, 0, 0.0674592, 0, -0.632484, 1.0287, -3.03302e-07, 1.0508)

[node name="MainScreen" parent="." instance=ExtResource("6_cbrw6")]
transform = Transform3D(0.471397, 0, 0, 0, 0.471397, 0, 0, 0, 0.471397, 0, 1.81131, -2.4)
collision_layer = 49153
scene = ExtResource("6_xprjj")
viewport_size = Vector2(1152, 648)
input_gamepad = true
material = SubResource("StandardMaterial3D_ucxkm")
transparent = 0
scene_properties_keys = PackedStringArray("main_screen.gd", "resource")
resource = Array[ExtResource("7_wdhgb")]([ExtResource("8_v7117"), ExtResource("9_r2lvh"), ExtResource("10_k2f35")])

[node name="SpotLight3D" type="SpotLight3D" parent="."]
transform = Transform3D(1, 8.35189e-23, 4.37114e-08, -4.37114e-08, 1.91069e-15, 1, 0, -1, 1.91069e-15, -0.214427, 2.58065, -1.25739)
light_color = Color(1, 0.776471, 0.592157, 1)
shadow_enabled = true
shadow_bias = 0.0
shadow_reverse_cull_face = true
spot_range = 17.759
spot_attenuation = 0.39
spot_angle = 80.0

[node name="Table" parent="." groups=["router", "small_cube"] instance=ExtResource("9_2xjkr")]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1.2, 0, -1, 0, -4.37114e-08, 0, -0.0775461, -1.85)

[node name="floor" parent="." instance=ExtResource("2_g1jgc")]
transform = Transform3D(-6.87209e-08, 0, 1.57215, 0, 1.57215, 0, -1.57215, 0, -6.87209e-08, 0.0106039, 4.76837e-07, 0.445307)
[node name="Lamp" parent="Table" instance=ExtResource("12_vf087")]
transform = Transform3D(1, 0, -8.88178e-15, 0, 1, 0, 8.88178e-15, 0, 1, -1.27338, 2.28121, -5.56614e-08)

[node name="Walls" type="Node3D" parent="."]

Expand All @@ -68,8 +88,3 @@ transform = Transform3D(-2, -3.01992e-07, 1.32005e-14, 0, -8.74228e-08, -2, 3.01

[node name="celing" parent="Walls" instance=ExtResource("2_a55se")]
transform = Transform3D(-1.27795e-07, 2.55591e-07, 2.92362, 0, -2.92362, 2.55591e-07, 2.92362, 1.11722e-14, 1.27795e-07, 2.993, 3.37583, 1.003)

[node name="Button" parent="." instance=ExtResource("13_vn8pb")]
transform = Transform3D(0.3, 0, 0, 0, -0.3, 2.62268e-08, 0, -2.62268e-08, -0.3, 0, 0.85479, -1.76294)
change_scene = true
scene = ExtResource("14_sj26u")
Loading

0 comments on commit c4f64c6

Please sign in to comment.