From 4c300dc73b1026dbd0cf467ee1082bbc3e85d9f5 Mon Sep 17 00:00:00 2001 From: Michael Mainguy Date: Mon, 17 Jun 2024 14:17:45 -0500 Subject: [PATCH] reformatted tool arrangement. Added diffusetexture to label. Added exportable to object parents. --- src/diagram/diagramObject.ts | 1 + src/diagram/functions/createLabel.ts | 16 ++++++++++------ src/toolbox/functions/buildColor.ts | 3 +-- src/util/customEnvironment.ts | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/diagram/diagramObject.ts b/src/diagram/diagramObject.ts index efae673..1299518 100644 --- a/src/diagram/diagramObject.ts +++ b/src/diagram/diagramObject.ts @@ -181,6 +181,7 @@ export class DiagramObject { } if (!this._baseTransform) { this._baseTransform = new TransformNode("base-" + this._mesh.id, this._scene); + this._baseTransform.metadata = {exportable: true}; } if (this._from && this._to) { if (!this._meshRemovedObserver) { diff --git a/src/diagram/functions/createLabel.ts b/src/diagram/functions/createLabel.ts index 648553d..62acdaa 100644 --- a/src/diagram/functions/createLabel.ts +++ b/src/diagram/functions/createLabel.ts @@ -1,4 +1,4 @@ -import {AbstractMesh, Color3, DynamicTexture, Material, MeshBuilder, StandardMaterial} from "@babylonjs/core"; +import {AbstractMesh, DynamicTexture, Material, MeshBuilder, StandardMaterial} from "@babylonjs/core"; import {DefaultScene} from "../../defaultScene"; function calculateDynamicTextureDimensions(text: string, font: string): { @@ -20,27 +20,31 @@ function calculateDynamicTextureDimensions(text: string, font: string): { } function createDynamicTexture(text: string, font: string, DTWidth: number, DTHeight: number): DynamicTexture { - const dynamicTexture = new DynamicTexture("DynamicTexture", { + const dynamicTexture = new DynamicTexture("text-text", { width: DTWidth, height: DTHeight }, DefaultScene.Scene, false); dynamicTexture.drawText(text, null, null, font, "#ffffff", "#000000", true); + dynamicTexture.metadata = {exportable: true}; return dynamicTexture; } function createMaterial(dynamicTexture: DynamicTexture): Material { - const mat = new StandardMaterial("mat", DefaultScene.Scene); - mat.diffuseColor = Color3.Black(); - mat.disableLighting = true; + const mat = new StandardMaterial("text-mat", DefaultScene.Scene); + //mat.diffuseColor = Color3.Black(); + mat.disableLighting = false; mat.backFaceCulling = false; mat.emissiveTexture = dynamicTexture; - mat.freeze(); + mat.diffuseTexture = dynamicTexture; + mat.metadata = {exportable: true}; + //mat.freeze(); return mat; } function createPlane(text: string, material: Material, planeWidth: number, height: number): AbstractMesh { const plane = MeshBuilder.CreatePlane("text" + text, {width: planeWidth, height: height}, DefaultScene.Scene); plane.material = material; + plane.metadata = {exportable: true}; return plane; } diff --git a/src/toolbox/functions/buildColor.ts b/src/toolbox/functions/buildColor.ts index 461063a..9617461 100644 --- a/src/toolbox/functions/buildColor.ts +++ b/src/toolbox/functions/buildColor.ts @@ -51,8 +51,7 @@ export async function buildColor(color: Color3, scene: Scene, parent: TransformN } - -const GRID_SIZE = 5; +const GRID_SIZE = 6; function calculatePosition(i: number) { return (i / GRID_SIZE) - .5 - (1 / GRID_SIZE / 2); diff --git a/src/util/customEnvironment.ts b/src/util/customEnvironment.ts index 082d00b..68ae481 100644 --- a/src/util/customEnvironment.ts +++ b/src/util/customEnvironment.ts @@ -47,7 +47,7 @@ export class CustomEnvironment { .then(() => { const ground = this.createGround(); new PhysicsAggregate(ground, PhysicsShapeType.BOX, {mass: 0}, this.scene); - createPoints(20, 20); + //createPoints(20, 20); this.createBackgroundAudio(); this._groundMeshObservable.notifyObservers(ground); this.createWalls();