Skip to content

Commit

Permalink
Update 4.5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
nimadez committed Nov 2, 2024
1 parent ae28c36 commit f9226ee
Show file tree
Hide file tree
Showing 21 changed files with 890 additions and 970 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,6 @@ Browser storage is limited, use Electron for much higher capacity.
```

## FAQ
How to go back to the previous version?
```
git clone https://github.com/nimadez/voxel-builder
cd voxel-builder
git log -2 (copy the hash of the previous commit)
git reset --hard $HASH
```
How to merge vertices after export to GLB?
```
1- Open exported GLB file in Blender
Expand All @@ -138,6 +131,13 @@ How to run Blender importer script?
3- Click "Open" and select "blender-importer.py"
4- Run the script and select a JSON file
```
How to go back to the previous version?
```
git clone https://github.com/nimadez/voxel-builder
cd voxel-builder
git log -2 (copy the hash of the previous commit)
git reset --hard $HASH
```

## History
```
Expand Down
Binary file modified media/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "voxel-builder",
"version": "4.5.5",
"version": "4.5.6",
"description": "Voxel-based 3D modeling application",
"main": "electron.js",
"scripts": {
Expand All @@ -11,8 +11,8 @@
"license": "MIT",
"devDependencies": {
"electron": "^30.0.0",
"babylonjs": "^7.29.0",
"three": "^0.169.0",
"babylonjs": "^7.32.0",
"three": "^0.170.0",
"three-mesh-bvh": "^0.8.2",
"three-gpu-pathtracer": "^0.0.23",
"@tweenjs/tween.js": "^25.0.0"
Expand Down
Binary file modified src/assets/appicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 21 additions & 32 deletions src/index.html

Large diffs are not rendered by default.

28 changes: 22 additions & 6 deletions src/libs/addons/TransformControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ class TransformControls extends Controls {
defineProperty( 'showX', true );
defineProperty( 'showY', true );
defineProperty( 'showZ', true );
defineProperty( 'minX', - Infinity );
defineProperty( 'maxX', Infinity );
defineProperty( 'minY', - Infinity );
defineProperty( 'maxY', Infinity );
defineProperty( 'minZ', - Infinity );
defineProperty( 'maxZ', Infinity );

// Reusable utility variables

Expand Down Expand Up @@ -372,6 +378,10 @@ class TransformControls extends Controls {

}

object.position.x = Math.max( this.minX, Math.min( this.maxX, object.position.x ) );
object.position.y = Math.max( this.minY, Math.min( this.maxY, object.position.y ) );
object.position.z = Math.max( this.minZ, Math.min( this.maxZ, object.position.z ) );

} else if ( mode === 'scale' ) {

if ( axis.search( 'XYZ' ) !== - 1 ) {
Expand Down Expand Up @@ -536,12 +546,7 @@ class TransformControls extends Controls {

this.disconnect();

this.traverse( function ( child ) {

if ( child.geometry ) child.geometry.dispose();
if ( child.material ) child.material.dispose();

} );
this._root.dispose();

}

Expand Down Expand Up @@ -811,6 +816,17 @@ class TransformControlsRoot extends Object3D {

}

dispose() {

this.traverse( function ( child ) {

if ( child.geometry ) child.geometry.dispose();
if ( child.material ) child.material.dispose();

} );

}

}

class TransformControlsGizmo extends Object3D {
Expand Down
2 changes: 1 addition & 1 deletion src/libs/babylon.inspector.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/libs/babylon.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/libs/babylonjs.loaders.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/libs/babylonjs.serializers.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/libs/three.module.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/manifest.webmanifest

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/modules/babylon.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ export function Vector3Project(target, scene, camera) {
BABYLON.Matrix.IdentityReadOnly,
scene.getTransformMatrix(),
camera.viewport.toGlobal(
scene.getEngine().getRenderWidth(),
scene.getEngine().getRenderHeight()));
window.innerWidth,
window.innerHeight));
}


Expand Down
71 changes: 0 additions & 71 deletions src/modules/bakery/bakery.js

This file was deleted.

Loading

0 comments on commit f9226ee

Please sign in to comment.