vr site

Author: jumpy-cat

.gitattributes

@@ -1,2 +1,3 @@
 godot/addons/** linguist-vendored
 godot/examples_dd3d/** linguist-vendored
+xrtest/data.gd linguist-generated

testbed/src/main.rs

@@ -61,11 +61,28 @@ fn desmos_list(name: &str, values: &[f64]) -> String {
 
 #[derive(Serialize)]
 struct PhysicsThing {
-    rails1: Vec<(f64, f64, f64)>,
-    rails2: Vec<(f64, f64, f64)>,
+    rails1: Vec<[f64; 3]>,
+    rails2: Vec<[f64; 3]>,
     cross_support: Vec<bool>,
-    hl_pos: Vec<(f64, f64, f64)>,
-    hl_up: Vec<(f64, f64, f64)>,
+    hl_pos: Vec<[f64; 3]>,
+    hl_up: Vec<[f64; 3]>,
+    hl_fwd: Vec<[f64; 3]>,
+    is_extra: Vec<bool>,
+}
+
+fn codegen(thing: &PhysicsThing) -> String {
+    format!(r#"
+class_name Data
+
+var rail1 = {:?}
+var rail2 = {:?}
+var cross = {:?}
+var pos = {:?}
+var up = {:?}
+var fwd = {:?}
+var is_extra = {:?}
+"#
+, thing.rails1, thing.rails2, thing.cross_support, thing.hl_pos, thing.hl_up, thing.hl_fwd, thing.is_extra)
 }
 
 fn main() {
@@ -139,29 +156,48 @@ fn main() {
         cross_support: Vec::new(),
         hl_pos: Vec::new(),
         hl_up: Vec::new(),
+        hl_fwd: Vec::new(),
+        is_extra: Vec::new(),
     };
     let mut phys = physics::PhysicsStateV3::new(1.0, -0.01, &curve, 0.5, MU);
     let mut i = 0;
+    const CROSS_DIST: f64 = 2.0;
+    let mut last_cl_pos: Option<MyVector3<f64>> = None;
+    let mut distance_since_last_cross = 0.0;
+    const RAIL_MULT: f64 = 0.75;
     while phys.step(&0.05, &curve).is_some() {
         i += 1;
-        if i % 20 != 0 {
+        if i % 5 != 0 {
             continue;
         }
-        let track_centerline = phys.x().inner() - phys.hl_normal().clone() * 1.0 * *phys.o();
+        let track_centerline = phys.x().inner() - phys.hl_normal().clone() * RAIL_MULT * *phys.o();
+        if let Some(p) = &last_cl_pos {
+            distance_since_last_cross += (track_centerline.clone() - p.clone()).magnitude();
+            if distance_since_last_cross > CROSS_DIST {
+                distance_since_last_cross = 0.0;
+                thing.cross_support.push(true);
+            } else {
+                thing.cross_support.push(false);
+            }
+        } else {
+            thing.cross_support.push(false);
+        }
+        last_cl_pos = Some(track_centerline.clone());
         let binormal = phys.v().inner().cross(phys.hl_normal()).normalize();
-        let rail1 = track_centerline.clone() + binormal.clone() * *phys.o();
-        let rail2 = track_centerline.clone() - binormal * *phys.o();
+        let rail1 = track_centerline.clone() + binormal.clone() * *phys.o() * RAIL_MULT;
+        let rail2 = track_centerline.clone() - binormal * *phys.o() * RAIL_MULT;
         println!("{:.4?} {:.4?} {:.4?}", track_centerline, rail1, rail2);
-        thing.rails1.push((rail1.x, rail1.y, rail1.z));
-        thing.rails2.push((rail2.x, rail2.y, rail2.z));
-        thing.cross_support.push(false);
+        thing.rails1.push([rail1.x, rail1.y, rail1.z]);
+        thing.rails2.push([rail2.x, rail2.y, rail2.z]);
         let hl_pos = curve.curve_at(phys.u()).unwrap();
-        thing.hl_pos.push((hl_pos.x, hl_pos.y, hl_pos.z));
+        thing.hl_pos.push([hl_pos.x, hl_pos.y, hl_pos.z]);
         let hl_up = phys.hl_normal();
-        thing.hl_up.push((hl_up.x, hl_up.y, hl_up.z));
+        thing.hl_up.push([hl_up.x, hl_up.y, hl_up.z]);
+        let hl_fwd = phys.v().inner();
+        thing.hl_fwd.push([hl_fwd.x, hl_fwd.y, hl_fwd.z]);
+        thing.is_extra.push(false);
     }
 
-    //let mut extras = vec![];
     for c in &curve.additional {
         let mut u = 0.0;
         while u <= 1.0 {
@@ -171,37 +207,67 @@ fn main() {
                 .make_ortho_to(&tangent)
                 .normalize();
             let com_pos = hl_pos.clone() - up.clone() * *phys.o();
-            let track_centerline = hl_pos.clone() - up.clone() * *phys.o() * 2.0;
+            let track_centerline = hl_pos.clone() - up.clone() * *phys.o() * (1.0 + RAIL_MULT);
+            if let Some(p) = &last_cl_pos {
+                distance_since_last_cross += (track_centerline.clone() - p.clone()).magnitude();
+                if distance_since_last_cross > CROSS_DIST {
+                    distance_since_last_cross = 0.0;
+                    thing.cross_support.push(true);
+                } else {
+                    thing.cross_support.push(false);
+                }
+            } else {
+                thing.cross_support.push(false);
+            }
+            last_cl_pos = Some(track_centerline.clone());
             let binormal = up.cross(&tangent).normalize();
-            let rail1 = track_centerline.clone() - binormal.clone() * *phys.o();
-            let rail2 = track_centerline.clone() + binormal.clone() * *phys.o();
+            let rail1 = track_centerline.clone() - binormal.clone() * *phys.o() * RAIL_MULT;
+            let rail2 = track_centerline.clone() + binormal.clone() * *phys.o() * RAIL_MULT;
 
-            thing.rails1.push((rail1.x, rail1.y, rail1.z));
-            thing.rails2.push((rail2.x, rail2.y, rail2.z));
-            thing.cross_support.push(false);
+            thing.rails1.push([rail1.x, rail1.y, rail1.z]);
+            thing.rails2.push([rail2.x, rail2.y, rail2.z]);
+            thing.is_extra.push(true);
 
             //let hl_pos = curve.curve_at(phys.u()).unwrap();
-            thing.hl_pos.push((hl_pos.x, hl_pos.y, hl_pos.z));
+            //thing.hl_pos.push((hl_pos.x, hl_pos.y, hl_pos.z));
             //let hl_up = phys.hl_normal();
-            thing.hl_up.push((up.x, up.y, up.z));
+            //thing.hl_up.push((up.x, up.y, up.z));
 
             /*extras.push((
                 Vector3::new(com_pos.x as f32, com_pos.y as f32, com_pos.z as f32),
                 0.0,
                 true,
             ));*/
-            u += 0.1;
+            u += 0.001;
         }
     }
 
-    File::create("/tmp/rail1.json")
+    File::create("/tmp/data.gd").unwrap().write_all(codegen(&thing).as_bytes()).unwrap();
+    /*File::create("/tmp/rail1.json")
         .unwrap()
         .write_all(&format!("{:?}", thing.rails1).as_bytes())
         .unwrap();
     File::create("/tmp/rail2.json")
         .unwrap()
         .write_all(&format!("{:?}", thing.rails2).as_bytes())
         .unwrap();
+    File::create("/tmp/cross.json")
+        .unwrap()
+        .write_all(&format!("{:?}", thing.cross_support).as_bytes())
+        .unwrap();
+    File::create("/tmp/pos.json")
+        .unwrap()
+        .write_all(&format!("{:?}", thing.hl_pos).as_bytes())
+        .unwrap();
+    File::create("/tmp/fwd.json")
+        .unwrap()
+        .write_all(&format!("{:?}", thing.hl_fwd).as_bytes())
+        .unwrap();
+    File::create("/tmp/up.json")
+        .unwrap()
+        .write_all(&format!("{:?}", thing.hl_up).as_bytes())
+        .unwrap();*/
+
 
     println!("{}", thing.rails1.len());
     println!("{:?}", thing.rails1);

xrtest/data.gd

@@ -2,11 +2,50 @@ extends Node3D
 
 var webxr_interface
 var vr_supported = false
+var active = false
+var t = 0
+
+var pos = []
+var up = []
+var fwd = []
+
+@onready var mesh = $MeshInstance3D2
+
+func arr_to_vec(x):
+	return Vector3(x[0], x[1], x[2])
 
 func _ready():
+	# coaster setup
+	#var rail1 = JSON.parse_string(
+	#	FileAccess.open("/tmp/rail1.json", FileAccess.READ).get_as_text()
+	#)
+	var data = Data.new()
+	var rail1 = data.rail1
+	
+	var rail1pts = rail1.map(arr_to_vec)
+	var rail2pts = data.rail2.map(arr_to_vec)
+	pos = data.pos.map(arr_to_vec)
+	up = data.up.map(arr_to_vec)
+	fwd = data.fwd.map(arr_to_vec)
+
+	var m = mesh.mesh
+	m.surface_begin(Mesh.PRIMITIVE_TRIANGLES)
+	cylinder_line(m, rail1pts, 0.1)
+	cylinder_line(m, rail2pts, 0.1)
+
+	# cross
+	var cross = data.cross
+	for i in range(cross.size()):
+		if cross[i]:
+			cylinder_line(m, [rail1pts[i], rail2pts[i]], 0.1)
+	
+	m.surface_end()
+
 	# We assume this node has a button as a child.
 	# This button is for the user to consent to entering immersive VR mode.
 	$Button.pressed.connect(self._on_button_pressed)
+	$Button2.pressed.connect(self._on_normal_button_pressed)
+	$Button3.pressed.connect(self._on_reset_button_pressed)
 
 	webxr_interface = XRServer.find_interface("WebXR")
 	if webxr_interface:
@@ -26,10 +65,17 @@ func _webxr_session_supported(session_mode, supported):
 	if session_mode == 'immersive-vr':
 		vr_supported = supported
 
+func _on_normal_button_pressed():
+	active = not active
+
+func _on_reset_button_pressed():
+	t = 0
+
 func _on_button_pressed():
 	if not vr_supported:
 		OS.alert("Your browser doesn't support VR")
 		return
+	active = true
 
 	# We want an immersive VR session, as opposed to AR ('immersive-ar') or a
 	# simple 3DoF viewer ('viewer').
@@ -76,20 +122,60 @@ func _webxr_session_ended():
 func _webxr_session_failed(message):
 	OS.alert("Failed to initialize: " + message)
 
-"""extends Node3D
+func _process(_delta):
+	if t < len(pos):
+		$XROrigin3D.look_at_from_position(pos[t], pos[t] + fwd[t], up[t])
+	if active:
+		t += 1
+		#$XROrigin3D.global_position.z -= _delta
+
+
+## Adds 3d lines between [points] with the given [radius]
+static func cylinder_line(m, points, radius):
+	if len(points) > 1:
+		for i in range(1, len(points)):
+			# create cylinder
+			const NUM_QUADS = 10
+			var p = points[i-1]
+			var q = points[i]
+			var pq: Vector3 = q - p
+			var rot = Quaternion(pq.normalized(), Vector3.UP).normalized()
+			
+			for j in range(NUM_QUADS):
+				var theta0 = 2*PI * j / NUM_QUADS
+				var theta1 = 2*PI * (j+1) / NUM_QUADS
+				var offset0 = (Vector3(1, 0, 0) * Quaternion(Vector3.UP, theta0)) * rot
+				var offset1 = (Vector3(1, 0, 0) * Quaternion(Vector3.UP, theta1)) * rot
+				var quad = [
+					p + radius * (offset1),
+					q + radius * (offset1),
+					q + radius * (offset0),
+					p + radius * (offset0),
+					
+					offset1,
+					offset1,
+					offset0,
+					offset0,
+				]
+				add_quad(
+					m,
+					quad[0], quad[1], quad[2], quad[3],
+					quad[4], quad[5], quad[6], quad[7]
+				)
 
-var xr_interface: XRInterface
 
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
-	xr_interface = XRServer.find_interface("OpenXR")
-	if xr_interface and xr_interface.is_initialized():
-		print("OpenXR initialized successfully")
-		DisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_DISABLED)
-		get_viewport().use_xr = true
-	else:
-		print("OpenXR not initialized, please check if your headset is connected")
+## Adds a quad to ImmediateMesh
+## CCW winding order
+static func add_quad(m, p1, p2, p3, p4, n1, n2, n3, n4):
+	add_tri(m, p1, p2, p3, n1, n2, n3)
+	add_tri(m, p3, p4, p1, n3, n4, n1)
 
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	pass"""
+## Adds a triangle to ImmediateMesh
+## CCW winding order
+static func add_tri(m, p1, p2, p3, n1, n2, n3):
+	m.surface_set_normal(n1)
+	m.surface_add_vertex(p1)
+	m.surface_set_normal(n2)
+	m.surface_add_vertex(p2)
+	m.surface_set_normal(n3)
+	m.surface_add_vertex(p3)

xrtest/main.gd

@@ -1,16 +1,19 @@
-[gd_scene load_steps=3 format=3 uid="uid://7jpqye8u62tn"]
+[gd_scene load_steps=4 format=3 uid="uid://7jpqye8u62tn"]
 
 [ext_resource type="Script" path="res://main.gd" id="1_qulo4"]
 
-[sub_resource type="BoxMesh" id="BoxMesh_p5a7i"]
+[sub_resource type="PlaneMesh" id="PlaneMesh_sowto"]
+size = Vector2(100, 100)
+
+[sub_resource type="ImmediateMesh" id="ImmediateMesh_772bl"]
 
 [node name="Node3D" type="Node3D"]
 script = ExtResource("1_qulo4")
 
 [node name="XROrigin3D" type="XROrigin3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 30, 10)
 
 [node name="XRCamera3D" type="XRCamera3D" parent="XROrigin3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.7, 0)
 
 [node name="LeftHand" type="XRController3D" parent="XROrigin3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 1, -0.5)
@@ -22,13 +25,30 @@ tracker = &"right_hand"
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.598664, -7.24694)
-mesh = SubResource("BoxMesh_p5a7i")
+mesh = SubResource("PlaneMesh_sowto")
 skeleton = NodePath("../XROrigin3D")
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, -0.275084, 0.96142, 0, -0.96142, -0.275084, 0, 2.1761, -5.72324)
+transform = Transform3D(1, 0, 0, 0, 0.560104, 0.828423, 0, -0.828423, 0.560104, 0, 2.1761, -5.72324)
 
 [node name="Button" type="Button" parent="."]
 offset_right = 8.0
 offset_bottom = 8.0
-text = "PressMe"
+text = "Run in VR"
+
+[node name="Button2" type="Button" parent="."]
+offset_left = 1.0
+offset_top = 34.0
+offset_right = 116.0
+offset_bottom = 65.0
+text = "Run Normally"
+
+[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
+mesh = SubResource("ImmediateMesh_772bl")
+
+[node name="Button3" type="Button" parent="."]
+offset_left = 2.0
+offset_top = 69.0
+offset_right = 53.0
+offset_bottom = 100.0
+text = "Reset"

xrtest/node_3d.tscn

@@ -0,0 +1,3 @@
+extends Node
+
+class_name Util