mmainguy/immersive2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug with turn snap

Browse Source
This commit is contained in:
Michael Mainguy 2023-08-24 16:32:05 -05:00
parent 559108281f
commit 425a9e99e6
3 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/menus/configMenu.ts
View File

@ -1,6 +1,5 @@
import {AdvancedDynamicTexture, RadioGroup, SelectionPanel} from "@babylonjs/gui";
import {AbstractMesh, MeshBuilder, Scene, WebXRDefaultExperience} from "@babylonjs/core";
import log from "loglevel";
import {AppConfig} from "../util/appConfig";
import {ControllerEventType, Controllers} from "../controllers/controllers";
import {DiaSounds} from "../util/diaSounds";
@ -78,7 +77,7 @@ export class ConfigMenu extends AbstractMenu {
selectionPanel.addGroup(radio);
for (const [index, snap] of this.gridSnaps.entries()) {
const selected = this.config.current.createSnap == snap.value
const selected = (this.config.current.createSnap == snap.value);
radio.addRadio(snap.label, this.createVal.bind(this), selected);
}
return radio;
@ -88,7 +87,7 @@ export class ConfigMenu extends AbstractMenu {
const radio = new RadioGroup("Rotation Snap");
selectionPanel.addGroup(radio);
for (const [index, snap] of this.rotationSnaps.entries()) {
const selected = this.config.current.rotateSnap == snap.value
const selected = (this.config.current.rotateSnap == snap.value);
radio.addRadio(snap.label, this.rotateVal.bind(this), selected);
}
return radio;
@ -100,7 +99,7 @@ export class ConfigMenu extends AbstractMenu {
selectionPanel.addGroup(radio);
for (const [index, snap] of this.gridSnaps.entries()) {
const selected = this.config.current.gridSnap == snap.value;
const selected = (this.config.current.gridSnap == snap.value);
radio.addRadio(snap.label, this.gridVal.bind(this), selected);
}
@ -111,46 +110,26 @@ export class ConfigMenu extends AbstractMenu {
const radio = new RadioGroup("Turn Snap");
selectionPanel.addGroup(radio);
for (const [index, snap] of this.rotationSnaps.entries()) {
const selected = this.config.current.rotateSnap == snap.value;
const selected = (this.config.current.turnSnap == snap.value);
radio.addRadio(snap.label, this.turnVal.bind(this), selected);
}
return radio;
}
private createVal(value) {
const config = this.config.current;
if (config.createSnap != this.gridSnaps[value].value) {
config.createSnap = this.gridSnaps[value].value;
this.config.current = config;
log.debug("configMenu", "create Snap", value);
}
this.config.setCreateSnap(this.gridSnaps[value].value);
}
private rotateVal(value) {
const config = this.config.current;
if (config.rotateSnap != this.rotationSnaps[value].value) {
config.rotateSnap = this.rotationSnaps[value].value;
this.config.current = config;
log.debug("configMenu", "rotate Snap", value);
}
this.config.setRotateSnap(this.rotationSnaps[value].value);
}
private turnVal(value) {
const config = this.config.current;
config.turnSnap = this.rotationSnaps[value].value;
this.config.current = config;
log.debug("configMenu", "turn Snap", value);
this.config.setTurnSnap(this.rotationSnaps[value].value);
}
private gridVal(value) {
const config = this.config.current;
config.gridSnap = this.gridSnaps[value].value;
this.config.current = config;
log.debug("configMenu", "grid Snap", value);
this.config.setGridSnap(this.gridSnaps[value].value);
}
}

36
src/util/appConfig.ts
View File

@ -6,15 +6,6 @@ export class AppConfig {
private _currentConfig: AppConfigType;
constructor() {
this.onConfigChangedObservable.add((config, state) => {
console.log(state);
this._currentConfig = config;
}, -1);
}
public get current(): AppConfigType {
if (!this._currentConfig) {
this._currentConfig = {
id: 1,
gridSnap: .1,
@ -25,12 +16,37 @@ export class AppConfig {
newRelicAccount: null,
physicsEnabled: false,
demoCompleted: false,
};
this.onConfigChangedObservable.add((config, state) => {
console.log(state);
this._currentConfig = config;
}, -1);
}
}
public get current(): AppConfigType {
return this._currentConfig;
}
public setRotateSnap(value: number) {
this._currentConfig.rotateSnap = value;
this.onConfigChangedObservable.notifyObservers(this._currentConfig, 2);
}
public setCreateSnap(value: number) {
this._currentConfig.createSnap = value;
this.onConfigChangedObservable.notifyObservers(this._currentConfig, 2);
}
public setTurnSnap(value: number) {
this._currentConfig.turnSnap = value;
this.onConfigChangedObservable.notifyObservers(this._currentConfig, 2);
}
public setGridSnap(value: number) {
this._currentConfig.gridSnap = value;
this.onConfigChangedObservable.notifyObservers(this._currentConfig, 2);
}
public set current(config: AppConfigType) {
this._currentConfig = config;
this.onConfigChangedObservable.notifyObservers(config, 2);

2
src/worker.ts
View File

@ -37,6 +37,8 @@ ctx.onmessage = (event) => {
}
}
if (event.data.config) {
console.log('updateing config');
console.log(event.data.config);
persistenceManager.setConfig(event.data.config);
}