Skip to content

Bug Fixes and Engine Enhancements #97

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

Open
brettfxio wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bug Fixes and Engine Enhancements #97

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9d44c3
Fix bugs and enhance 3D engine features
google-labs-jules[bot] Feb 23, 2026
92303c6
Fix bugs, enhance engine, and add workspace migration
google-labs-jules[bot] Feb 23, 2026
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
103 changes: 73 additions & 30 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ <h2>Asset Manager</h2>

let mimeType = 'application/octet-stream';
const extension = fileName.split('.').pop().toLowerCase();
if (extension === 'glb' || extension === 'gltf') {
if (extension === 'glb' || extension === 'gltf' || extension === 'vrm') {
mimeType = `model/${extension}`;
} else if (['png', 'jpg', 'jpeg', 'gif'].includes(extension)) {
mimeType = `image/${extension}`;
Expand Down Expand Up @@ -824,6 +824,39 @@ <h2>Asset Manager</h2>
});
}

migrateWorkspaceData(workspace) {
if (!workspace || !workspace.blocks || !workspace.blocks.blocks) return;

const migrateBlock = (block) => {
// Migrate 'apply_force' from field NAME to input OBJECT
if (block.type === 'apply_force' && block.fields && block.fields.NAME) {
const nameValue = block.fields.NAME;
delete block.fields.NAME;
block.inputs = block.inputs || {};
if (!block.inputs.OBJECT) {
block.inputs.OBJECT = {
block: {
type: 'text',
fields: { TEXT: nameValue }
}
};
}
}

// Recursively migrate children
if (block.next && block.next.block) migrateBlock(block.next.block);
if (block.inputs) {
for (const input in block.inputs) {
if (block.inputs[input] && block.inputs[input].block) {
migrateBlock(block.inputs[input].block);
}
}
}
};

workspace.blocks.blocks.forEach(migrateBlock);
}

async loadProjectData(projectData) {
if (!projectData.workspace || !projectData.assets) {
throw new Error('Invalid project data format.');
Expand All @@ -843,6 +876,7 @@ <h2>Asset Manager</h2>
loadAssetsIntoView();

// 3. Load Workspace
this.migrateWorkspaceData(projectData.workspace);
Blockly.serialization.workspaces.load(projectData.workspace, this.workspace);

// 4. Run the loaded project
Expand Down Expand Up @@ -2190,6 +2224,10 @@ <h2>Asset Manager</h2>
this.resumeEngine();
}

setPopupText(target, text) {
this.uiManager.setPopupText(target, text);
}

setPopupTitle(target, title) {
let popup = null;
if (typeof target === 'string') {
Expand Down Expand Up @@ -2420,7 +2458,7 @@ <h2>Asset Manager</h2>
}

// If it's a VRM model, normalize its height to a sane default
if (url.toLowerCase().endsWith('.vrm')) {
if (url.toLowerCase().endsWith('.vrm') || name.toLowerCase().endsWith('.vrm')) {
const boundingInfo = rootMesh.getHierarchyBoundingVectors(true);
const height = boundingInfo.max.y - boundingInfo.min.y;
if (height > 0.001) { // Avoid division by zero or tiny values
Expand Down Expand Up @@ -3527,20 +3565,12 @@ <h2>Asset Manager</h2>
}

setPopupText(name, text) {
if (this.popups[name]) {
let textControl = this.popups[name].elements['text'];
if (textControl) {
textControl.text = text;
} else {
// If no text block exists, create one
const textBlock = new BABYLON.GUI.TextBlock(`${name}_text`, text);
textBlock.color = "white";
textBlock.fontSize = 24;
this.popups[name].container.addControl(textBlock);
this.popups[name].elements['text'] = textBlock;
}
const control = this.controls[`${name}_text`];
if (control) {
control.text = text;
control.isVisible = true;
}
}
}

createButton(name, text, options = {}) {
const button = BABYLON.GUI.Button.CreateSimpleButton(name, text);
Expand Down Expand Up @@ -3631,14 +3661,14 @@ <h2>Asset Manager</h2>
panel.maxWidth = "500px";
container.addControl(panel);

// Add Image if provided
if (options.image) {
const image = new BABYLON.GUI.Image(`${name}_image`, options.image);
image.width = "150px";
image.height = "150px";
image.paddingBottom = "20px";
panel.addControl(image);
}
// Add Image
const image = new BABYLON.GUI.Image(`${name}_image`, options.image || "");
image.width = "150px";
image.height = "150px";
image.paddingBottom = "20px";
image.isVisible = !!options.image;
panel.addControl(image);
this.controls[`${name}_image`] = image;

// Add Title
const titleBlock = new BABYLON.GUI.TextBlock(`${name}_title`, title);
Expand All @@ -3647,6 +3677,16 @@ <h2>Asset Manager</h2>
titleBlock.fontSize = 32;
titleBlock.paddingBottom = "20px";
panel.addControl(titleBlock);
this.controls[`${name}_title`] = titleBlock;

// Add Text
const textBlock = new BABYLON.GUI.TextBlock(`${name}_text`, options.text || "");
textBlock.resizeToFit = true;
textBlock.color = "white";
textBlock.fontSize = 24;
textBlock.paddingBottom = "20px";
panel.addControl(textBlock);
this.controls[`${name}_text`] = textBlock;

// Add Button 1 if text is provided
if (options.button1_text) {
Expand Down Expand Up @@ -3795,7 +3835,7 @@ <h2>Asset Manager</h2>

function getModelAssets() {
const modelOptions = assetManager.assets
.filter(asset => asset.type.startsWith('model/') || asset.name.endsWith('.glb') || asset.name.endsWith('.gltf'))
.filter(asset => asset.type.startsWith('model/') || asset.name.endsWith('.glb') || asset.name.endsWith('.gltf') || asset.name.endsWith('.vrm'))
.map(asset => [asset.name, asset.name]);
return modelOptions.length > 0 ? modelOptions : [['none', 'NONE']];
}
Expand Down Expand Up @@ -4450,9 +4490,9 @@ <h2>Asset Manager</h2>
},
{
type: 'apply_force',
message0: 'Apply force to %1 x: %2 y: %3 z: %4 at point x: %5 y: %6 z: %7',
message0: 'Apply force to %1 force x: %2 y: %3 z: %4 at point x: %5 y: %6 z: %7',
args0: [
{ type: 'field_input', name: 'NAME', text: 'object' },
{ type: 'input_value', name: 'OBJECT' },
{ type: 'input_value', name: 'FX', check: 'Number' },
{ type: 'input_value', name: 'FY', check: 'Number' },
{ type: 'input_value', name: 'FZ', check: 'Number' },
Expand Down Expand Up @@ -5756,12 +5796,15 @@ <h2>Asset Manager</h2>
};

javascript.javascriptGenerator.forBlock['apply_force'] = function (block, generator) {
// This is a more advanced physics function. A helper could be added if needed frequently.
const name = block.getFieldValue('NAME');
const target = generator.valueToCode(block, 'OBJECT', generator.ORDER_ATOMIC);
const fx = generator.valueToCode(block, 'FX', generator.ORDER_ATOMIC) || 0;
const fy = generator.valueToCode(block, 'FY', generator.ORDER_ATOMIC) || 0;
const fz = generator.valueToCode(block, 'FZ', generator.ORDER_ATOMIC) || 0;
return `// Apply force requires direct physics access, consider a high-level alternative.\n`;
const px = generator.valueToCode(block, 'PX', generator.ORDER_ATOMIC) || 0;
const py = generator.valueToCode(block, 'PY', generator.ORDER_ATOMIC) || 0;
const pz = generator.valueToCode(block, 'PZ', generator.ORDER_ATOMIC) || 0;

return `sceneManager.applyForce(${target}, new BABYLON.Vector3(${fx}, ${fy}, ${fz}), new BABYLON.Vector3(${px}, ${py}, ${pz}));\n`;
};

javascript.javascriptGenerator.forBlock['set_gravity'] = function (block, generator) {
Expand Down Expand Up @@ -6173,7 +6216,7 @@ <h2>Asset Manager</h2>
var num = Math.floor(Math.random() * 0x1000000);
return '#' + ('00000' + num.toString(16)).substr(-6);
}
`) + '()', generator.ORDER_FUNCTION_CALL];distin
`) + '()', generator.ORDER_FUNCTION_CALL];
};

javascript.javascriptGenerator.forBlock['colour_picker'] = function (block, generator) {
Expand Down