do some testing

This commit is contained in:
Nitwel 2023-10-22 23:01:06 +02:00
parent 0142b3802d
commit ad48075af9
7 changed files with 419 additions and 388 deletions

View File

@ -17,6 +17,8 @@ operator = 2
[sub_resource type="VisualShader" id="VisualShader_wb0u4"] [sub_resource type="VisualShader" id="VisualShader_wb0u4"]
code = "shader_type spatial; code = "shader_type spatial;
render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_schlick_ggx;
uniform vec4 Color : source_color; uniform vec4 Color : source_color;

View File

@ -102,7 +102,7 @@ function = 12
[resource] [resource]
code = "shader_type spatial; code = "shader_type spatial;
render_mode unshaded; render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_schlick_ggx, unshaded;
uniform vec4 albedo : source_color; uniform vec4 albedo : source_color;
uniform float value; uniform float value;

View File

@ -63,7 +63,7 @@ condition = 1
[resource] [resource]
code = "shader_type spatial; code = "shader_type spatial;
render_mode unshaded; render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_schlick_ggx, unshaded;
uniform vec4 bar_color : source_color; uniform vec4 bar_color : source_color;
uniform sampler2D bar_texture : source_color; uniform sampler2D bar_texture : source_color;

View File

@ -43,9 +43,9 @@ var webxr_auto_primary := 0
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
var webxr_interface = XRServer.find_interface("WebXR") # var webxr_interface = XRServer.find_interface("WebXR")
if webxr_interface: # if webxr_interface:
XRServer.tracker_added.connect(self._on_webxr_tracker_added) # XRServer.tracker_added.connect(self._on_webxr_tracker_added)
_load() _load()

View File

@ -1,29 +1,49 @@
[gd_scene load_steps=4 format=3 uid="uid://18sldbn0hij8"] [gd_scene load_steps=6 format=3 uid="uid://eecv28y6jxk4"]
[ext_resource type="PackedScene" uid="uid://b4kad2kuba1yn" path="res://addons/godot-xr-tools/hands/scenes/lowpoly/left_hand_low.tscn" id="1_66jmx"] [ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="1_i4c04"]
[ext_resource type="PackedScene" uid="uid://l2n30mpbkdyw" path="res://addons/godot-xr-tools/hands/scenes/lowpoly/right_hand_low.tscn" id="2_3f5tl"]
[ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="3_iaq1p"] [sub_resource type="BoxMesh" id="BoxMesh_ir3co"]
size = Vector3(0.1, 0.1, 0.1)
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_p6hri"]
sky_top_color = Color(0.384314, 0.454902, 0.54902, 1)
use_debanding = false
[sub_resource type="Sky" id="Sky_vhymk"]
sky_material = SubResource("ProceduralSkyMaterial_p6hri")
[sub_resource type="Environment" id="Environment_7ghp0"]
background_mode = 1
background_color = Color(1, 1, 1, 0)
sky = SubResource("Sky_vhymk")
[node name="Main" type="Node3D"] [node name="Main" type="Node3D"]
[node name="XROrigin3D" type="XROrigin3D" parent="."] [node name="XROrigin3D" type="XROrigin3D" parent="."]
[node name="XRCamera3D" type="XRCamera3D" parent="XROrigin3D"] [node name="XRCamera3D" type="XRCamera3D" parent="XROrigin3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6555, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.798091, 0.311748)
[node name="LeftHand" type="XRController3D" parent="XROrigin3D"] [node name="XRControllerLeft" type="XRController3D" parent="XROrigin3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.341606, 0.506389, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.469893, 0.597213, -0.251112)
tracker = &"left_hand" tracker = &"left_hand"
pose = &"aim" pose = &"aim"
[node name="LeftHand" parent="XROrigin3D/LeftHand" instance=ExtResource("1_66jmx")] [node name="MeshInstance3D" type="MeshInstance3D" parent="XROrigin3D/XRControllerLeft"]
mesh = SubResource("BoxMesh_ir3co")
[node name="RightHand" type="XRController3D" parent="XROrigin3D"] [node name="XRControllerRight" type="XRController3D" parent="XROrigin3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.408271, 0.538159, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.488349, 0.559219, -0.2988)
tracker = &"right_hand" tracker = &"right_hand"
pose = &"aim" pose = &"aim"
[node name="RightHand" parent="XROrigin3D/RightHand" instance=ExtResource("2_3f5tl")] [node name="MeshInstance3D" type="MeshInstance3D" parent="XROrigin3D/XRControllerRight"]
mesh = SubResource("BoxMesh_ir3co")
[node name="StartXR" parent="." instance=ExtResource("3_iaq1p")] [node name="StartXR" parent="." instance=ExtResource("1_i4c04")]
enable_passthrough = true enable_passthrough = true
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_7ghp0")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]

File diff suppressed because it is too large Load Diff

View File

@ -11,9 +11,18 @@ config_version=5
[application] [application]
config/name="ImmersiveHome" config/name="ImmersiveHome"
run/main_scene="res://main.tscn"
config/features=PackedStringArray("4.1", "Mobile") config/features=PackedStringArray("4.1", "Mobile")
config/icon="res://icon.svg" config/icon="res://icon.svg"
[autoload]
XRToolsUserSettings="*res://addons/godot-xr-tools/user_settings/user_settings.gd"
[editor_plugins]
enabled=PackedStringArray("res://addons/godot-xr-tools/plugin.cfg")
[rendering] [rendering]
renderer/rendering_method="mobile" renderer/rendering_method="mobile"