Skip to content

Commit

Permalink
added holodeck map
Browse files Browse the repository at this point in the history
this adds the replacement map in the visual style of a holodeck
*some scenes needed additional adjustments
  • Loading branch information
DigitalN8m4r3 committed Apr 29, 2023
1 parent f7072dd commit e89b0ef
Show file tree
Hide file tree
Showing 16 changed files with 259 additions and 84 deletions.
Binary file added assets/maps/holodeck/materials/floor.material
Binary file not shown.
Binary file added assets/maps/holodeck/materials/holodeck.material
Binary file not shown.
Binary file added assets/maps/holodeck/textures/grid.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions assets/maps/holodeck/textures/grid.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://6ob3gu7py2by"
path.s3tc="res://.godot/imported/grid.png-935ca1aeab7c6ccf1e96c746e682464c.s3tc.ctex"
path.etc2="res://.godot/imported/grid.png-935ca1aeab7c6ccf1e96c746e682464c.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}

[deps]

source_file="res://assets/maps/holodeck/textures/grid.png"
dest_files=["res://.godot/imported/grid.png-935ca1aeab7c6ccf1e96c746e682464c.s3tc.ctex", "res://.godot/imported/grid.png-935ca1aeab7c6ccf1e96c746e682464c.etc2.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
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=0
Binary file added assets/maps/holodeck/textures/grid_e.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions assets/maps/holodeck/textures/grid_e.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cqgup6g2prfq"
path.s3tc="res://.godot/imported/grid_e.png-1d5cd54a4f15f3a479f0e197a223a003.s3tc.ctex"
path.etc2="res://.godot/imported/grid_e.png-1d5cd54a4f15f3a479f0e197a223a003.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}

[deps]

source_file="res://assets/maps/holodeck/textures/grid_e.png"
dest_files=["res://.godot/imported/grid_e.png-1d5cd54a4f15f3a479f0e197a223a003.s3tc.ctex", "res://.godot/imported/grid_e.png-1d5cd54a4f15f3a479f0e197a223a003.etc2.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
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=0
102 changes: 102 additions & 0 deletions assets/maps/holodeck_map.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
[gd_scene load_steps=9 format=3 uid="uid://b1e34ivxmaoi7"]

[ext_resource type="Material" uid="uid://bhchqeutlu0os" path="res://assets/maps/holodeck/materials/floor.material" id="1_w8tvf"]
[ext_resource type="Material" uid="uid://vlw6a6r6sfsc" path="res://assets/maps/holodeck/materials/holodeck.material" id="2_0aesn"]

[sub_resource type="QuadMesh" id="7"]
size = Vector2(96, 96)

[sub_resource type="BoxShape3D" id="BoxShape3D_w36qy"]
size = Vector3(100, 2, 100)

[sub_resource type="QuadMesh" id="8"]
size = Vector2(24, 10)

[sub_resource type="BoxShape3D" id="BoxShape3D_v8rwh"]
size = Vector3(24, 10, 1)

[sub_resource type="QuadMesh" id="QuadMesh_xm3kd"]
flip_faces = true
size = Vector2(24, 24)
orientation = 1

[sub_resource type="BoxShape3D" id="BoxShape3D_1q432"]
size = Vector3(24, 24, 1)

[node name="HolodeckMap" type="Node3D"]

[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.814705, -0.576268, -0.0645869, 0.185005, 0.152748, 0.970794, -0.549572, -0.802859, 0.231057, 0, 5.09148, 0)
light_energy = 0.8

[node name="Ground" type="StaticBody3D" parent="."]

[node name="MeshInstance3D" type="MeshInstance3D" parent="Ground"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)
mesh = SubResource("7")
surface_material_override/0 = ExtResource("1_w8tvf")

[node name="CollisionShape3D" type="CollisionShape3D" parent="Ground"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
shape = SubResource("BoxShape3D_w36qy")

[node name="Wall1" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -12)

[node name="MeshInstance3D" type="MeshInstance3D" parent="Wall1"]
material_override = ExtResource("2_0aesn")
mesh = SubResource("8")
skeleton = NodePath("../..")

[node name="CollisionShape3D" type="CollisionShape3D" parent="Wall1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
shape = SubResource("BoxShape3D_v8rwh")

[node name="Wall2" type="StaticBody3D" parent="."]
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 12, 5, 0)

[node name="MeshInstance3D" type="MeshInstance3D" parent="Wall2"]
material_override = ExtResource("2_0aesn")
mesh = SubResource("8")
skeleton = NodePath("../..")

[node name="CollisionShape3D" type="CollisionShape3D" parent="Wall2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
shape = SubResource("BoxShape3D_v8rwh")

[node name="Wall3" type="StaticBody3D" parent="."]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 5, 12)

[node name="MeshInstance3D" type="MeshInstance3D" parent="Wall3"]
material_override = ExtResource("2_0aesn")
mesh = SubResource("8")
skeleton = NodePath("../..")

[node name="CollisionShape3D" type="CollisionShape3D" parent="Wall3"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
shape = SubResource("BoxShape3D_v8rwh")

[node name="Wall4" type="StaticBody3D" parent="."]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -12, 5, 0)

[node name="MeshInstance3D" type="MeshInstance3D" parent="Wall4"]
material_override = ExtResource("2_0aesn")
mesh = SubResource("8")
skeleton = NodePath("../..")

[node name="CollisionShape3D" type="CollisionShape3D" parent="Wall4"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
shape = SubResource("BoxShape3D_v8rwh")

[node name="Roof" type="StaticBody3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -12)

[node name="MeshInstance3D" type="MeshInstance3D" parent="Roof"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 12)
material_override = ExtResource("2_0aesn")
mesh = SubResource("QuadMesh_xm3kd")
skeleton = NodePath("../..")

[node name="CollisionShape3D" type="CollisionShape3D" parent="Roof"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 5.5, 12.5)
shape = SubResource("BoxShape3D_1q432")
8 changes: 4 additions & 4 deletions assets/meshes/plate/surface_objects.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ shape = SubResource("5")
surface_audio_type = SubResource("Resource_58enk")

[node name="plate_puddle" parent="." instance=ExtResource("3")]
transform = Transform3D(4, 0, 0, 0, 1, 0, 0, 0, 4, -7, 0, -12)
transform = Transform3D(4, 0, 0, 0, 1, 0, 0, 0, 4, -8, 0, -14)

[node name="Plane" parent="plate_puddle" index="0"]
material_override = ExtResource("6")
Expand All @@ -138,7 +138,7 @@ shape = SubResource("1")
surface_audio_type = SubResource("Resource_rpp4f")

[node name="plate_mud" parent="." instance=ExtResource("3")]
transform = Transform3D(4, 0, 0, 0, 1, 0, 0, 0, 4, 7, 0, 0)
transform = Transform3D(4, 0, 0, 0, 1, 0, 0, 0, 4, 8, 0, 2)

[node name="Plane" parent="plate_mud" index="0"]
material_override = ExtResource("4")
Expand All @@ -152,7 +152,7 @@ shape = SubResource("2")
surface_audio_type = SubResource("Resource_rwibv")

[node name="plate_grass" parent="." instance=ExtResource("3")]
transform = Transform3D(4, 0, 0, 0, 1, 0, 0, 0, 4, -7, 0, 1)
transform = Transform3D(4, 0, 0, 0, 1, 0, 0, 0, 4, -8, 0, 2)

[node name="Plane" parent="plate_grass" index="0"]
material_override = ExtResource("5")
Expand All @@ -166,7 +166,7 @@ shape = SubResource("3")
surface_audio_type = SubResource("Resource_53y85")

[node name="plate_snow" parent="." instance=ExtResource("3")]
transform = Transform3D(4, 0, 0, 0, 1, 0, 0, 0, 4, 7, 0, -12)
transform = Transform3D(4, 0, 0, 0, 1, 0, 0, 0, 4, 8, 0, -14)

[node name="Plane" parent="plate_snow" index="0"]
material_override = SubResource("StandardMaterial3D_qcyph")
Expand Down
10 changes: 5 additions & 5 deletions scenes/basic_movement_demo/basic_movement_demo.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=17 format=3]
[gd_scene load_steps=17 format=3 uid="uid://bbcamgruwhrq4"]

[ext_resource type="PackedScene" uid="uid://qbmx03iibuuu" path="res://addons/godot-xr-tools/staging/scene_base.tscn" id="1"]
[ext_resource type="Script" path="res://scenes/demo_scene_base.gd" id="2_5ptmo"]
Expand All @@ -9,13 +9,13 @@
[ext_resource type="PackedScene" uid="uid://clt88d5d1dje4" path="res://addons/godot-xr-tools/functions/movement_crouch.tscn" id="5_2ekvc"]
[ext_resource type="PackedScene" uid="uid://diyu06cw06syv" path="res://addons/godot-xr-tools/player/player_body.tscn" id="6"]
[ext_resource type="PackedScene" uid="uid://l2n30mpbkdyw" path="res://addons/godot-xr-tools/hands/scenes/lowpoly/right_hand_low.tscn" id="6_0hbex"]
[ext_resource type="PackedScene" uid="uid://rypqa6qcv0st" path="res://assets/maps/basic_map.tscn" id="7"]
[ext_resource type="PackedScene" uid="uid://bdc23valbh8gf" path="res://assets/meshes/ramps/ramps.tscn" id="8"]
[ext_resource type="PackedScene" uid="uid://dpjfart2qg8k7" path="res://assets/meshes/mound/mound.tscn" id="9"]
[ext_resource type="PackedScene" uid="uid://c2q5phg8w08o" path="res://addons/godot-xr-tools/functions/movement_jump.tscn" id="10"]
[ext_resource type="PackedScene" uid="uid://3a6wjr3a13vd" path="res://assets/meshes/teleport/teleport.tscn" id="11"]
[ext_resource type="Texture2D" uid="uid://ckw6nliyayo6a" path="res://scenes/main_menu/return to main menu.png" id="12"]
[ext_resource type="PackedScene" uid="uid://dipg8euybm3f1" path="res://scenes/basic_movement_demo/objects/instructions.tscn" id="12_qasi6"]
[ext_resource type="PackedScene" uid="uid://b1e34ivxmaoi7" path="res://assets/maps/holodeck_map.tscn" id="16_v54dt"]

[node name="BasicMovementDemo" instance=ExtResource("1")]
script = ExtResource("2_5ptmo")
Expand Down Expand Up @@ -49,7 +49,7 @@ crouch_type = 1

[node name="PlayerBody" parent="XROrigin3D" index="3" instance=ExtResource("6")]

[node name="BasicMap" parent="." index="1" instance=ExtResource("7")]
[node name="HolodeckMap" parent="." index="1" instance=ExtResource("16_v54dt")]

[node name="MainMenuTeleport" parent="." index="2" instance=ExtResource("11")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7)
Expand All @@ -60,7 +60,7 @@ title = ExtResource("12")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, -4)

[node name="Ramps" parent="." index="4" instance=ExtResource("8")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, -8)
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 6, 0, 0)

[node name="Mound" parent="." index="5" instance=ExtResource("9")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7, 0, -8)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7, 0, 0)
15 changes: 8 additions & 7 deletions scenes/footstep_movement_demo/footstep_movement_demo.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[gd_scene load_steps=20 format=3]
[gd_scene load_steps=20 format=3 uid="uid://dt5jsm43uk88b"]

[ext_resource type="PackedScene" uid="uid://qbmx03iibuuu" path="res://addons/godot-xr-tools/staging/scene_base.tscn" id="1"]
[ext_resource type="Script" path="res://scenes/demo_scene_base.gd" id="1_yauh3"]
[ext_resource type="PackedScene" uid="uid://rypqa6qcv0st" path="res://assets/maps/basic_map.tscn" id="2"]
[ext_resource type="PackedScene" uid="uid://clt88d5d1dje4" path="res://addons/godot-xr-tools/functions/movement_crouch.tscn" id="3"]
[ext_resource type="Environment" uid="uid://c75hc5t2ml5re" path="res://demo_env.tres" id="3_1ck1y"]
[ext_resource type="PackedScene" uid="uid://mnoirgubr2js" path="res://scenes/footstep_movement_demo/objects/instructions.tscn" id="3_8248t"]
Expand All @@ -18,6 +17,7 @@
[ext_resource type="AudioStream" uid="uid://cddgfn5xkknr4" path="res://assets/footsteps/default_footstep.wav" id="11_xknd6"]
[ext_resource type="PackedScene" uid="uid://54qovguk25i5" path="res://assets/meshes/plate/surface_objects.tscn" id="12"]
[ext_resource type="Script" path="res://addons/godot-xr-tools/audio/surface_audio_type.gd" id="14_cqr4a"]
[ext_resource type="PackedScene" uid="uid://b1e34ivxmaoi7" path="res://assets/maps/holodeck_map.tscn" id="18_qxr43"]

[sub_resource type="Resource" id="Resource_lclo7"]
script = ExtResource("14_cqr4a")
Expand Down Expand Up @@ -62,14 +62,15 @@ crouch_type = 1
[node name="MovementFootstep" parent="XROrigin3D" index="4" instance=ExtResource("10_e05iy")]
default_surface_audio_type = SubResource("Resource_lclo7")

[node name="BasicMap" parent="." index="1" instance=ExtResource("2")]

[node name="MainMenuTeleport" parent="." index="2" instance=ExtResource("11")]
[node name="MainMenuTeleport" parent="." index="1" instance=ExtResource("11")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7)
scene_base = NodePath("..")
title = ExtResource("10")

[node name="Instructions" parent="." index="3" instance=ExtResource("3_8248t")]
[node name="Instructions" parent="." index="2" instance=ExtResource("3_8248t")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, -16)

[node name="surface_objects" parent="." index="4" instance=ExtResource("12")]
[node name="surface_objects" parent="." index="3" instance=ExtResource("12")]
transform = Transform3D(1, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 6)

[node name="HolodeckMap" parent="." index="4" instance=ExtResource("18_qxr43")]
6 changes: 3 additions & 3 deletions scenes/interactables_demo/interactables_demo.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[gd_scene load_steps=26 format=3]
[gd_scene load_steps=26 format=3 uid="uid://bqx54elivcbcj"]

[ext_resource type="PackedScene" uid="uid://qbmx03iibuuu" path="res://addons/godot-xr-tools/staging/scene_base.tscn" id="1"]
[ext_resource type="PackedScene" uid="uid://rypqa6qcv0st" path="res://assets/maps/basic_map.tscn" id="2"]
[ext_resource type="Script" path="res://scenes/demo_scene_base.gd" id="2_a3nc2"]
[ext_resource type="PackedScene" uid="uid://bdwmserhqai5h" path="res://addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_hand_low.tscn" id="2_ho402"]
[ext_resource type="PackedScene" uid="uid://3a6wjr3a13vd" path="res://assets/meshes/teleport/teleport.tscn" id="3"]
Expand All @@ -25,6 +24,7 @@
[ext_resource type="PackedScene" uid="uid://dtrftty6i383g" path="res://assets/meshes/interactables/joystick_zero.tscn" id="19"]
[ext_resource type="PackedScene" uid="uid://d2td5hwh2oluy" path="res://assets/meshes/interactables/wheel_smooth.tscn" id="20"]
[ext_resource type="PackedScene" uid="uid://dbv1hvxufc1al" path="res://assets/meshes/interactables/push_button.tscn" id="21"]
[ext_resource type="PackedScene" uid="uid://b1e34ivxmaoi7" path="res://assets/maps/holodeck_map.tscn" id="25_f2g0r"]

[node name="InteractablesDemo" instance=ExtResource("1")]
script = ExtResource("2_a3nc2")
Expand Down Expand Up @@ -53,7 +53,7 @@ ranged_enable = false

[node name="PlayerBody" parent="XROrigin3D" index="3" instance=ExtResource("9")]

[node name="BasicMap" parent="." index="1" instance=ExtResource("2")]
[node name="HolodeckMap" parent="." index="1" instance=ExtResource("25_f2g0r")]

[node name="MainMenuTeleport" parent="." index="2" instance=ExtResource("3")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4)
Expand Down
Loading

0 comments on commit e89b0ef

Please sign in to comment.