add XR magic for fun
This commit is contained in:
parent
4f7b20a5ca
commit
4ac2bdbe6a
12 changed files with 1920 additions and 59 deletions
|
|
@ -10,8 +10,10 @@ export_filter="all_resources"
|
|||
include_filter=""
|
||||
exclude_filter=""
|
||||
export_path=""
|
||||
patches=PackedStringArray()
|
||||
encryption_include_filters=""
|
||||
encryption_exclude_filters=""
|
||||
seed=0
|
||||
encrypt_pck=false
|
||||
encrypt_directory=false
|
||||
script_export_mode=2
|
||||
|
|
@ -39,3 +41,70 @@ progressive_web_app/icon_144x144=""
|
|||
progressive_web_app/icon_180x180=""
|
||||
progressive_web_app/icon_512x512=""
|
||||
progressive_web_app/background_color=Color(0, 0, 0, 1)
|
||||
|
||||
[preset.1]
|
||||
|
||||
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="../../GodotExports/SCPCB/Windows/SCPCB.exe"
|
||||
patches=PackedStringArray()
|
||||
encryption_include_filters=""
|
||||
encryption_exclude_filters=""
|
||||
seed=0
|
||||
encrypt_pck=false
|
||||
encrypt_directory=false
|
||||
script_export_mode=2
|
||||
|
||||
[preset.1.options]
|
||||
|
||||
custom_template/debug=""
|
||||
custom_template/release=""
|
||||
debug/export_console_wrapper=1
|
||||
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 -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries
|
||||
$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}'"
|
||||
|
|
|
|||
1713
openxr_action_map.tres
Normal file
1713
openxr_action_map.tres
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -93,3 +93,7 @@ renderer/rendering_method="gl_compatibility"
|
|||
renderer/rendering_method.mobile="gl_compatibility"
|
||||
environment/defaults/default_clear_color=Color(0, 0, 0, 1)
|
||||
occlusion_culling/use_occlusion_culling=true
|
||||
|
||||
[xr]
|
||||
|
||||
shaders/enabled=true
|
||||
|
|
|
|||
25
scenes/world/Test.tscn
Normal file
25
scenes/world/Test.tscn
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
[gd_scene load_steps=3 format=3 uid="uid://gc8dmdpmhxk5"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://bxibyn63ycvwo" path="res://scenes/world/XrSetup.tscn" id="1_uel4q"]
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_b77k8"]
|
||||
|
||||
[node name="Test" type="Node3D"]
|
||||
|
||||
[node name="XrOrigin" parent="." instance=ExtResource("1_uel4q")]
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
|
||||
transform = Transform3D(0.873517, 0.486793, 0, -0.439843, 0.789269, -0.428478, -0.20858, 0.374283, 0.903552, -3.76044, 0, 0)
|
||||
mesh = SubResource("BoxMesh_b77k8")
|
||||
|
||||
[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
|
||||
transform = Transform3D(0.40947, -0.707359, 0.576175, -0.212914, 0.540017, 0.814279, -0.887131, -0.456099, 0.0705146, 0.354805, 0, -4.08396)
|
||||
mesh = SubResource("BoxMesh_b77k8")
|
||||
|
||||
[node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
|
||||
transform = Transform3D(-0.00492204, -0.0975042, -0.174553, -0.0879686, 0.157854, -0.0856956, 0.179548, 0.0746669, -0.0467713, -2.02994, -0.0159459, -0.577685)
|
||||
mesh = SubResource("BoxMesh_b77k8")
|
||||
|
||||
[node name="MeshInstance3D4" type="MeshInstance3D" parent="."]
|
||||
transform = Transform3D(0.150185, 0.124727, -0.0434474, -0.0425827, 0.108003, 0.162856, 0.125025, -0.113042, 0.107658, 0.849757, -0.0159459, 4.45435)
|
||||
mesh = SubResource("BoxMesh_b77k8")
|
||||
11
scenes/world/XrDynamicMap.tscn
Normal file
11
scenes/world/XrDynamicMap.tscn
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[gd_scene load_steps=2 format=3 uid="uid://bgvs6njbg352u"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://bc46lc1tdvrio" path="res://scenes/world/DynamicMap.tscn" id="1_2nwmf"]
|
||||
|
||||
[node name="XrDynamicMap" type="Node3D"]
|
||||
|
||||
[node name="SubViewport" type="SubViewport" parent="."]
|
||||
use_xr = true
|
||||
size = Vector2i(0, 0)
|
||||
|
||||
[node name="DynamicMap" parent="SubViewport" instance=ExtResource("1_2nwmf")]
|
||||
41
scenes/world/XrSetup.tscn
Normal file
41
scenes/world/XrSetup.tscn
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
[gd_scene load_steps=5 format=3 uid="uid://bxibyn63ycvwo"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cr0a5b6avy81f" path="res://src/XRSetup.gd" id="1_wg80d"]
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_547rj"]
|
||||
resource_local_to_scene = true
|
||||
transparency = 1
|
||||
shading_mode = 0
|
||||
texture_filter = 0
|
||||
|
||||
[sub_resource type="PlaneMesh" id="PlaneMesh_737xf"]
|
||||
material = SubResource("StandardMaterial3D_547rj")
|
||||
size = Vector2(1, 0.563)
|
||||
|
||||
[sub_resource type="CapsuleMesh" id="CapsuleMesh_vwp3e"]
|
||||
radius = 0.0025
|
||||
height = 0.05
|
||||
|
||||
[node name="XrOrigin" type="XROrigin3D"]
|
||||
world_scale = 0.5
|
||||
script = ExtResource("1_wg80d")
|
||||
|
||||
[node name="XRCamera3D" type="XRCamera3D" parent="."]
|
||||
|
||||
[node name="Screen" type="MeshInstance3D" parent="XRCamera3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, -0.75)
|
||||
visible = false
|
||||
mesh = SubResource("PlaneMesh_737xf")
|
||||
|
||||
[node name="XRControllerL" type="XRController3D" parent="."]
|
||||
tracker = &"left_hand"
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="XRControllerL"]
|
||||
mesh = SubResource("CapsuleMesh_vwp3e")
|
||||
|
||||
[node name="XRControllerR" type="XRController3D" parent="."]
|
||||
tracker = &"right_hand"
|
||||
|
||||
[node name="MeshInstance3D2" type="MeshInstance3D" parent="XRControllerR"]
|
||||
mesh = SubResource("CapsuleMesh_vwp3e")
|
||||
skeleton = NodePath("../../XRControllerL")
|
||||
|
|
@ -12,6 +12,8 @@ var player: Player
|
|||
|
||||
var FPSfactor: float
|
||||
|
||||
var VRMode: bool = false
|
||||
|
||||
func GetTextureFromCache(rawFileName:String):
|
||||
var fixedName = rawFileName.replace("\\", "/")
|
||||
if textureCache.has(fixedName):
|
||||
|
|
@ -165,7 +167,26 @@ var difficulties: Array = Utils.Init1DArray(4)
|
|||
|
||||
var SelectedDifficulty: Difficulty
|
||||
|
||||
var xrInterface: XRInterface
|
||||
var xrSetup: XrSetup
|
||||
|
||||
func _ready():
|
||||
if Global.VRMode:
|
||||
xrInterface = XRServer.find_interface("OpenXR")
|
||||
if xrInterface and xrInterface.is_initialized():
|
||||
print("OpenXR initialized successfully")
|
||||
|
||||
# Turn off v-sync!
|
||||
DisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_DISABLED)
|
||||
|
||||
# Change our main viewport to output to the HMD
|
||||
get_viewport().use_xr = true
|
||||
|
||||
#xrSetup = load("res://scenes/world/XrSetup.tscn").instantiate()
|
||||
#add_child(xrSetup)
|
||||
else:
|
||||
print("OpenXR not initialized, please check if your headset is connected")
|
||||
|
||||
options = INI.Load("res://options.ini")
|
||||
materials = INI.Load("res://Data/materials.ini")
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,18 @@ var sprintBar: Control
|
|||
var Hud: Control
|
||||
var map: Node3D
|
||||
|
||||
var xrSetup: XrSetup
|
||||
|
||||
func _ready() -> void:
|
||||
map = get_parent()
|
||||
Global.player = self
|
||||
head = $Head
|
||||
camera = $Head/Camera
|
||||
if Global.VRMode:
|
||||
camera.queue_free()
|
||||
xrSetup = load("res://scenes/world/XrSetup.tscn").instantiate()
|
||||
add_child(xrSetup)
|
||||
camera = xrSetup.camera
|
||||
floorRay = $FloorRay
|
||||
floorPick = $FloorPick
|
||||
blinkIconBG = $HUD/BlinkIconBG
|
||||
|
|
@ -35,8 +42,6 @@ func _ready() -> void:
|
|||
#End Select
|
||||
BlinkTimer = BLINKFREQ
|
||||
|
||||
|
||||
|
||||
var CurrSpeed: float
|
||||
var CrouchState: float
|
||||
var Crouch: float
|
||||
|
|
@ -281,8 +286,9 @@ func _process(delta: float) -> void:
|
|||
Crouch = 0
|
||||
|
||||
#RotateEntity Collider, WrapAngle(EntityPitch(Camera)), WrapAngle(EntityYaw(Camera)), 0
|
||||
camera.rotation.x = deg_to_rad(Rotation.x)
|
||||
head.rotation.y = deg_to_rad(Rotation.y)
|
||||
if not Global.VRMode:
|
||||
camera.rotation.x = deg_to_rad(Rotation.x)
|
||||
head.rotation.y = deg_to_rad(Rotation.y)
|
||||
|
||||
movementSpeed = movementSpeed * NoClipSpeed
|
||||
|
||||
|
|
@ -340,12 +346,13 @@ func _process(delta: float) -> void:
|
|||
var cameraRoll = max(min(Global.Sin(Shake / 2) * 2.5 * min(Injuries + 0.25, 3.0), 8.0), -8.0)
|
||||
var cameraBob = (Global.Sin(Shake) / (20.0 + CrouchState * 20.0)) * 0.6
|
||||
|
||||
camera.rotation.x = deg_to_rad(Rotation.x)
|
||||
camera.rotation.z = deg_to_rad(cameraRoll * 0.5)
|
||||
camera.position.y = cameraBob
|
||||
#head.position.y = 1.15 + 0.6 * (1 - CrouchState)
|
||||
head.position.y = cameraBob + 0.9 + CrouchState * -0.3
|
||||
head.rotation.y = deg_to_rad(Rotation.y)
|
||||
if not Global.VRMode:
|
||||
camera.rotation.x = deg_to_rad(Rotation.x)
|
||||
camera.rotation.z = deg_to_rad(cameraRoll * 0.5)
|
||||
camera.position.y = cameraBob
|
||||
#head.position.y = 1.15 + 0.6 * (1 - CrouchState)
|
||||
head.position.y = cameraBob + 0.9 + CrouchState * -0.3
|
||||
head.rotation.y = deg_to_rad(Rotation.y)
|
||||
|
||||
var CollidedFloor = false
|
||||
if floorRay.is_colliding():
|
||||
|
|
@ -455,12 +462,13 @@ func snapDownToFloorCheck():
|
|||
const CONTROLLER_DEADZONE = 0.20;
|
||||
func _input(event: InputEvent) -> void:
|
||||
if event is InputEventMouseMotion:
|
||||
Rotation.y -= event.relative.x / 2
|
||||
Rotation.x -= event.relative.y / 2
|
||||
if Rotation.x > 70:
|
||||
Rotation.x = 70
|
||||
if Rotation.x < -70:
|
||||
Rotation.x = -70
|
||||
if not Global.VRMode:
|
||||
Rotation.y -= event.relative.x / 2
|
||||
Rotation.x -= event.relative.y / 2
|
||||
if Rotation.x > 70:
|
||||
Rotation.x = 70
|
||||
if Rotation.x < -70:
|
||||
Rotation.x = -70
|
||||
#event.velocity
|
||||
if event is InputEventJoypadMotion:
|
||||
# LeftRight = 2, UpDown = 3
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
extends Node
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;~IDEal Editor Parameters:
|
||||
;~F#1#14#29#13B#343#535#545#5B1#630#68D#6B4#6C2#6CC#6D9#8CA#8EB#93F#976#983#9BD
|
||||
;~F#9CE#9EE#9F7#A01#A10#B0B#B2D#DE2#E29#E3F#E4B#E68#EB9#ED2#FA1#10A3#1123#113C#115B#11C6
|
||||
;~F#11D3#11EC#1284#1439#152D#1581#1633#16D4#1796#17A9#187A#18A7#18C4#18EB#191B#1941#1969#19BB#19F8#1A29
|
||||
;~F#1A3C#1AFD#1B6A#1B7D#1B8B#1BCF#1BF0#1CDE#1D53#1E50#1ED1#1F1F#1F24#1F73#1F79#213E
|
||||
;~B#10D3#1DD1
|
||||
;~C#Blitz3D
|
||||
|
|
@ -1 +0,0 @@
|
|||
uid://qgv7j32s51vr
|
||||
11
src/XRSetup.gd
Normal file
11
src/XRSetup.gd
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
extends XROrigin3D
|
||||
class_name XrSetup
|
||||
|
||||
@onready var camera = $XRCamera3D
|
||||
@onready var screen = $XRCamera3D/Screen
|
||||
|
||||
#func _ready() -> void:
|
||||
#var shit = ViewportTexture.new()
|
||||
#shit.viewport_path = get_viewport().get_path()
|
||||
#print(shit.viewport_path)
|
||||
#screen.mesh.material.albedo_texture = get_viewport().get_texture()
|
||||
1
src/XRSetup.gd.uid
Normal file
1
src/XRSetup.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://cr0a5b6avy81f
|
||||
Loading…
Add table
Reference in a new issue