From 5fd12c909b573775cbb26d6af9f2e077e94d0bbe Mon Sep 17 00:00:00 2001 From: Michael Mainguy Date: Thu, 13 Jul 2023 14:26:51 -0500 Subject: [PATCH] Updated scaling of buttons. --- src/menus/bmenu.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/menus/bmenu.ts b/src/menus/bmenu.ts index ebbda78..266f641 100644 --- a/src/menus/bmenu.ts +++ b/src/menus/bmenu.ts @@ -9,7 +9,7 @@ import { WebXRExperienceHelper, WebXRInputSource } from "@babylonjs/core"; -import {GUI3DManager, HolographicButton, PlanePanel} from "@babylonjs/gui"; +import {Button3D, GUI3DManager, HolographicButton, PlanePanel, TextBlock} from "@babylonjs/gui"; import {DiagramEntity, DiagramEvent, DiagramEventType, DiagramManager} from "../diagram/diagramManager"; export enum BmenuState { @@ -31,6 +31,7 @@ export class Bmenu { constructor(scene: Scene, xr: WebXRExperienceHelper) { this.scene = scene; this.manager = new GUI3DManager(scene); + this.xr = xr; DiagramManager.onDiagramEventObservable.add((event: DiagramEvent) => { if (event.type === DiagramEventType.DROPPED) { @@ -67,22 +68,19 @@ export class Bmenu { } else { const anchor = new TransformNode("bMenuAnchor"); anchor.rotation.y = Angle.FromDegrees(180).radians(); - const cam = this.xr.camera.getFrontPosition(2); + const cam = this.xr.camera.getFrontPosition(1); anchor.position = cam; const panel = new PlanePanel(); - panel.margin = .6; - //panel.scaling.y=.5; - //panel.orientation = Container3D.FACEFORWARDREVERSED_ORIENTATION; - - panel.columns = 5; + panel.margin = .06; this.manager.addControl(panel); panel.linkToTransformNode(anchor); - //panel.position.z = 2; - //panel.position.y = 4; - panel.addControl(this.makeButton("Add Box", "addBox")); panel.addControl(this.makeButton("Add Sphere", "addSphere")); panel.addControl(this.makeButton("Add Cylinder", "addCylinder")); + panel.addControl(this.makeButton("Done Adding", "doneAdding")); + for (const control of panel.children) { + control.scaling = new Vector3(.1, .1, .1); + } this.panel = panel; }