Update godot version and some changes i forgot about

RhubarbVR · Oct 17, 2023 · 6e986dc · 6e986dc
1 parent 0f0b2c5
commit 6e986dc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "dotnet.defaultSolution": "RhubarbVR.sln"
+}
diff --git a/RhuEngine/Components/Visuals/Viewport.cs b/RhuEngine/Components/Visuals/Viewport.cs
@@ -260,7 +260,6 @@ protected override void OnLoaded() {
 
 		}
 
-
 		public event Action<RTexture2D> OnAssetLoaded;
 
 		public RTexture2D Value { get; private set; }

diff --git a/RhubarbGodot/RhubarbVR.csproj b/RhubarbGodot/RhubarbVR.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.0.2">
+<Project Sdk="Godot.NET.Sdk/4.2.0-beta.1">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>

diff --git a/RhubarbGodot/engine.tscn b/RhubarbGodot/engine.tscn
@@ -6,8 +6,12 @@
 background_mode = 1
 background_color = Color(0.0980392, 0.0980392, 0.0980392, 1)
 
-[node name="RhubarbEngine" type="Node3D"]
+[node name="RhubarbEngine" type="Node3D" node_paths=PackedStringArray("ThowAway", "Camera", "Rigin", "AudioListener")]
 script = ExtResource("1_p4nju")
+ThowAway = NodePath("ThrowAway")
+Camera = NodePath("XrOrigin3d/XrCamera3d")
+Rigin = NodePath("XrOrigin3d")
+AudioListener = NodePath("XrOrigin3d/XrCamera3d/AudioListener3d")
 
 [node name="XrOrigin3d" type="XROrigin3D" parent="."]
 

diff --git a/RhubarbGodot/project.godot b/RhubarbGodot/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="RhubarbVR"
 run/main_scene="res://engine.tscn"
-config/features=PackedStringArray("4.0", "C#", "Forward Plus")
+config/features=PackedStringArray("4.2", "C#", "Forward Plus")
 boot_splash/bg_color=Color(0.0980392, 0.0980392, 0.0980392, 1)
 boot_splash/show_image=false
 boot_splash/image="res://RhubarbVR2.png"
@@ -38,4 +38,5 @@ import/fbx/enabled=false
 
 [xr]
 
+openxr/enabled=true
 shaders/enabled=true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -260,7 +260,6 @@ protected override void OnLoaded() {

		}


		public event Action<RTexture2D> OnAssetLoaded;

		public RTexture2D Value { get; private set; }
Expand Down