Skip to content

Commit

Permalink
v3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
JannisX11 committed Jul 17, 2019
1 parent 7096c3a commit 5c5765f
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<script>
if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
const isApp = typeof require !== 'undefined';
const appVersion = '3.0.0';
const appVersion = '3.0.1';
</script>
<script src="lib/vue.min.js"></script>
<script src="lib/vue_sortable.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion js/desktop.js
Original file line number Diff line number Diff line change
Expand Up @@ -399,5 +399,5 @@ function closeBlockbenchWindow() {
}
setTimeout(function() {
currentwindow.close();
}, 240)
}, 12)
}
2 changes: 1 addition & 1 deletion js/interface/keyboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Keybind {
this.meta = false;
this.label = '';
if (keys) {
if (!exact && Blockbench.platform && keys.ctrl && !keys.meta) {
if (isApp && !exact && Blockbench.platform == 'darwin' && keys.ctrl && !keys.meta) {
keys.meta = true;
keys.ctrl = undefined;
}
Expand Down
11 changes: 6 additions & 5 deletions js/outliner/group.js
Original file line number Diff line number Diff line change
Expand Up @@ -446,22 +446,23 @@ function addGroup() {
Undo.initEdit({outliner: true});
var add_group = Group.selected
if (!add_group && selected.length) {
add_group = selected[0].parent
add_group = Cube.selected.last()
}
var base_group = new Group({
origin: add_group ? add_group.origin : undefined
}).sortInBefore(selected.last())
})
base_group.addTo(add_group)
base_group.isOpen = true

if (Format.bone_rig) {
base_group.createUniqueName()
}
selected.forEach(function(s, i) {
s.addTo(base_group)
if (i === 0) {
s.selected = false
//s.selected = false
}
})
base_group.addTo(add_group)
base_group.isOpen = true
base_group.init().select()
Undo.finishEdit('add_group');
loadOutlinerDraggable()
Expand Down
9 changes: 3 additions & 6 deletions js/preview/canvas.js
Original file line number Diff line number Diff line change
Expand Up @@ -357,26 +357,23 @@ const Canvas = {
})
mesh.geometry.from(from)
mesh.geometry.to(to)
mesh.geometry.computeBoundingSphere()

mesh.scale.set(1, 1, 1)
mesh.position.set(cube.origin[0], cube.origin[1], cube.origin[2])
mesh.geometry.translate(-cube.origin[0], -cube.origin[1], -cube.origin[2])
mesh.rotation.set(0, 0, 0)
mesh.position.set(0, 0, 0)
mesh.geometry.computeBoundingSphere()

if (Format.rotate_cubes) {
if (cube.rotation !== undefined) {

mesh.rotation.reorder('ZYX')
mesh.position.set(cube.origin[0], cube.origin[1], cube.origin[2])
mesh.geometry.translate(-cube.origin[0], -cube.origin[1], -cube.origin[2])

mesh.rotation.x = Math.PI / (180 /cube.rotation[0])
mesh.rotation.y = Math.PI / (180 /cube.rotation[1])
mesh.rotation.z = Math.PI / (180 /cube.rotation[2])

if (cube.rescale === true) {
var axis = cube.rotationAxis()||'y'

var rescale = getRescalingFactor(cube.rotation[getAxisNumber(axis)]);
mesh.scale.set(rescale, rescale, rescale)
mesh.scale[axis] = 1
Expand Down
2 changes: 1 addition & 1 deletion js/preview/transformer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@
}
selected.forEach(function(obj, i) {
if (obj.movable) {
obj.move(difference, axisNumber, false , _has_groups)
obj.move(difference, axisNumber, false , _has_groups||!Format.bone_rig)
}
})
scope.updateSelection()
Expand Down
1 change: 1 addition & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ function createWindow(second_instance) {
win.setMenu(null);
}

win.show()
win.maximize()
win.webContents.on('dom-ready', () => {
//win.maximize()
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "Blockbench",
"description": "Minecraft Block Model Editor",
"version": "3.0.0",
"version": "3.0.1",
"license": "MIT",
"author": {
"name": "JannisX11",
"email": "[email protected]"
},
"homepage": "https://blockbench.net",
"repository": {
"type": "git",
"url": "https://github.com/JannisX11/blockbench"
Expand Down

0 comments on commit 5c5765f

Please sign in to comment.