Skip to content

restructure app code for modularizing and organization #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skim0119 merged 1 commit into from
Apr 15, 2026
Merged

restructure app code for modularizing and organization #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 3 additions & 174 deletions VR/client/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,175 +1,4 @@
import * as THREE from "three";
import { VRButton } from "three/addons/webxr/VRButton.js";
import { CHARACTER_MODES_REGISTRY } from "./modes/modes_registry.js";
import { createApp } from "./app/create_app.js";

const statusEl = document.getElementById("status");
const startButton = document.getElementById("start-btn");
const joinPanel = document.getElementById("join-panel");
const joinButton = document.getElementById("join-btn");
const characterModeSelect = document.getElementById("character-mode");
let selectedCharacterMode = "demo-spline";

const searchParams = new URLSearchParams(window.location.search);
const defaultWsScheme = window.location.protocol === "https:" ? "wss" : "ws";
const defaultWsHost = window.location.hostname || "127.0.0.1";
const defaultWsPort = searchParams.get("ws_port") ?? "8765";
const serverHost =
searchParams.get("ws") ??
`${defaultWsScheme}://${defaultWsHost}:${defaultWsPort}`;

const calibrationOffset = new THREE.Vector3(
Number(searchParams.get("ox") ?? 0.0),
Number(searchParams.get("oy") ?? 0.0),
Number(searchParams.get("oz") ?? 0.0)
);

let socket = null;
let userId = null;
let sessionRole = "vr_client";
let sessionMode = "vr_client";

const scene = new THREE.Scene();
scene.background = new THREE.Color(0x1a1f2b);
const worldRoot = new THREE.Group();
worldRoot.position.copy(calibrationOffset);
scene.add(worldRoot);

const camera = new THREE.PerspectiveCamera(
70,
window.innerWidth / window.innerHeight,
0.01,
50
);
camera.position.set(0, 1.4, 2.0);

const renderer = new THREE.WebGLRenderer({ antialias: true });
renderer.setSize(window.innerWidth, window.innerHeight);
renderer.xr.enabled = true;
document.body.appendChild(renderer.domElement);

const hemi = new THREE.HemisphereLight(0xffffff, 0x223344, 1.2);
scene.add(hemi);

const grid = new THREE.GridHelper(8, 16, 0x6c757d, 0x495057);
grid.position.y = 0;
worldRoot.add(grid);
const worldAxes = new THREE.AxesHelper(0.3);
worldRoot.add(worldAxes);

function setStatus(text) {
statusEl.textContent = text;
}

function applyCharacterMode(modeKey) {
// TODO: Implement character mode selection
}

function connect(joinConfig) {
socket = new WebSocket(serverHost);
sessionRole = joinConfig.serverRole ?? joinConfig.role;
sessionMode = joinConfig.role;

socket.onopen = () => {
setStatus(`connected: ${serverHost}`);
socket.send(
JSON.stringify({
version: 1,
type: "hello",
payload: {
client: "sparc-webxr",
role: sessionRole,
},
})
);
};

socket.onclose = (event) => {
setStatus(`disconnected: ${serverHost} (code=${event.code})`);
};
socket.onerror = () => {
setStatus(`error: failed to connect ${serverHost}`);
};

socket.onmessage = (event) => {
// TODO: Implement message handling

const message = JSON.parse(event.data);

if (message.type === "error") {
setStatus(`server error: ${message.payload?.reason ?? "unknown"}`);
}

};
}

function sendXRInput(frame) {
// TODO: Implement XR input sending
}

function animate() {
// TODO: Implement animation loop
let lastTime = performance.now() / 1000;
renderer.setAnimationLoop((_, frame) => {
const now = performance.now() / 1000;
const dt = Math.min(0.05, now - lastTime);
lastTime = now;

if (frame) sendXRInput(frame);

renderer.render(scene, camera);
});
}

startButton.addEventListener("click", () => {
document.body.appendChild(VRButton.createButton(renderer));
startButton.remove();
});

window.addEventListener("resize", () => {
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
renderer.setSize(window.innerWidth, window.innerHeight);
});

/* TODO: Implement key handling for desktop mode */
window.addEventListener("keydown", (event) => {
const key = event.key.toLowerCase();
// TODO: Implement key handling
});

window.addEventListener("keyup", (event) => {
const key = event.key.toLowerCase();
// TODO: Implement key handling
});
/* TODO */

renderer.domElement.addEventListener("click", () => {
if (!renderer.xr.isPresenting && document.pointerLockElement !== renderer.domElement) {
renderer.domElement.requestPointerLock();
}
});

document.addEventListener("mousemove", (event) => {
if (document.pointerLockElement !== renderer.domElement) return;
if (renderer.xr.isPresenting) return;

// TODO: Implement desktop mode mouse movement handling
});

function setupJoinPanel() {
// TODO: Implement join panel setup
}

function populateCharacterModeSelect() {
characterModeSelect.replaceChildren();
for (const { id, label } of CHARACTER_MODES_REGISTRY) {
const opt = document.createElement("option");
opt.value = id;
opt.textContent = label;
characterModeSelect.appendChild(opt);
}
}

populateCharacterModeSelect();
setupJoinPanel();
animate();
const app = createApp({ document, window });
app.start();
94 changes: 94 additions & 0 deletions VR/client/app/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import * as THREE from "three";


export function createWindowConfig({ window }) {
const searchParams = new URLSearchParams(window.location.search);
const defaultWsScheme = window.location.protocol === "https:" ? "wss" : "ws";
const defaultWsHost = window.location.hostname || "127.0.0.1";
const defaultWsPort = searchParams.get("ws_port") ?? "8765";
const serverHost =
searchParams.get("ws") ??
`${defaultWsScheme}://${defaultWsHost}:${defaultWsPort}`;

return {
searchParams,
serverHost,
};
}

export function createRunConfig({ windowConfig }) {
const calibrationOffset = new THREE.Vector3(
Number(windowConfig.searchParams.get("ox") ?? 0.0),
Number(windowConfig.searchParams.get("oy") ?? 0.0),
Number(windowConfig.searchParams.get("oz") ?? 0.0)
);

const demoArmIds = [
"left_arm",
"right_arm"
];

const armConfig = {
left_arm: {
color: "#ff6b6b",
base: new THREE.Vector3(-0.25, 0.95, -0.35),
hand: "left",
},
right_arm: {
color: "#74c0fc",
base: new THREE.Vector3(0.25, 0.95, -0.35),
hand: "right",
}
};

const characterModes = {
"demo-spline": {
allowsBaseControl: true,
leftBase: new THREE.Vector3(-0.25, 0.95, -0.35),
rightBase: new THREE.Vector3(0.25, 0.95, -0.35),
},
"two-cr": {
allowsBaseControl: false,
leftBase: new THREE.Vector3(-0.15, 1.0, -0.15),
rightBase: new THREE.Vector3(0.15, 1.0, -0.15),
}
};

// Initial director for controller forward direction
const initialControllerForward = new THREE.Vector3(0.0, -1.0, 0.0);

return {
calibrationOffset,
initialControllerForward,
demoArmIds,
armIds: demoArmIds,
armConfig,
characterModes,
curveSamples: 21,
tipDefaultRadius: 0.045,
maxContactPoints: 6000,

// Zoom configuration
zoomConfig: {
scale: 1.0,
min: 0.35,
max: 3.0,
step: 0.06,
},
baseControl: {
deadband: 0.12,
step: 0.012,
minX: -1.5,
maxX: 1.5,
minZ: -2.0,
maxZ: 1.5,
minY: 0.1,
maxY: 2.0,
heightStep: 0.02,
},
inputSendHz: Math.max(1.0, Number(windowConfig.searchParams.get("input_hz") ?? 30.0)),
defaultDemoArmColors: Object.fromEntries(
Object.entries(armConfig).map(([armId, arm]) => [armId, arm.color])
),
};
}
Loading