mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-01-30 15:42:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixup for missing return, adding stretch to last export formats.

Browse Source
This commit is contained in:
AaronWoodward 2023-04-17 15:33:29 -07:00
parent b1b7223c81
commit 5835a067d8
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/io/formats/collada.js
View File

@ -168,14 +168,18 @@ var codec = new Codec('collada', {
);
}
addPosition(cube.to[0] + cube.inflate, cube.to[1] + cube.inflate, cube.to[2] + cube.inflate);
addPosition(cube.to[0] + cube.inflate, cube.to[1] + cube.inflate, cube.from[2] - cube.inflate);
addPosition(cube.to[0] + cube.inflate, cube.from[1] - cube.inflate, cube.to[2] + cube.inflate);
addPosition(cube.to[0] + cube.inflate, cube.from[1] - cube.inflate, cube.from[2] - cube.inflate);
addPosition(cube.from[0] - cube.inflate, cube.to[1] + cube.inflate, cube.from[2] - cube.inflate);
addPosition(cube.from[0] - cube.inflate, cube.to[1] + cube.inflate, cube.to[2] + cube.inflate);
addPosition(cube.from[0] - cube.inflate, cube.from[1] - cube.inflate, cube.from[2] - cube.inflate);
addPosition(cube.from[0] - cube.inflate, cube.from[1] - cube.inflate, cube.to[2] + cube.inflate);
var adjustedFrom = cube.from.slice();
var adjustedTo = cube.to.slice();
adjustFromAndToForInflateAndStretch(adjustedFrom, adjustedTo, cube);
addPosition(adjustedTo[0], adjustedTo[1], adjustedTo[2] );
addPosition(adjustedTo[0], adjustedTo[1], adjustedFrom[2]);
addPosition(adjustedTo[0], adjustedFrom[1], adjustedTo[2] );
addPosition(adjustedTo[0], adjustedFrom[1], adjustedFrom[2]);
addPosition(adjustedFrom[0], adjustedTo[1], adjustedFrom[2]);
addPosition(adjustedFrom[0], adjustedTo[1], adjustedTo[2] );
addPosition(adjustedFrom[0], adjustedFrom[1], adjustedFrom[2]);
addPosition(adjustedFrom[0], adjustedFrom[1], adjustedTo[2] );
for (let fkey in cube.faces) {
let face = cube.faces[fkey];

20
js/io/formats/fbx.js
View File

@ -352,14 +352,18 @@ var codec = new Codec('fbx', {
);
}
addPosition(cube.to[0] + cube.inflate, cube.to[1] + cube.inflate, cube.to[2] + cube.inflate);
addPosition(cube.to[0] + cube.inflate, cube.to[1] + cube.inflate, cube.from[2] - cube.inflate);
addPosition(cube.to[0] + cube.inflate, cube.from[1] - cube.inflate, cube.to[2] + cube.inflate);
addPosition(cube.to[0] + cube.inflate, cube.from[1] - cube.inflate, cube.from[2] - cube.inflate);
addPosition(cube.from[0] - cube.inflate, cube.to[1] + cube.inflate, cube.from[2] - cube.inflate);
addPosition(cube.from[0] - cube.inflate, cube.to[1] + cube.inflate, cube.to[2] + cube.inflate);
addPosition(cube.from[0] - cube.inflate, cube.from[1] - cube.inflate, cube.from[2] - cube.inflate);
addPosition(cube.from[0] - cube.inflate, cube.from[1] - cube.inflate, cube.to[2] + cube.inflate);
var adjustedFrom = cube.from.slice();
var adjustedTo = cube.to.slice();
adjustFromAndToForInflateAndStretch(adjustedFrom, adjustedTo, cube);
addPosition(adjustedTo[0], adjustedTo[1], adjustedTo[2] );
addPosition(adjustedTo[0], adjustedTo[1], adjustedFrom[2]);
addPosition(adjustedTo[0], adjustedFrom[1], adjustedTo[2] );
addPosition(adjustedTo[0], adjustedFrom[1], adjustedFrom[2]);
addPosition(adjustedFrom[0], adjustedTo[1], adjustedFrom[2]);
addPosition(adjustedFrom[0], adjustedTo[1], adjustedTo[2] );
addPosition(adjustedFrom[0], adjustedFrom[1], adjustedFrom[2]);
addPosition(adjustedFrom[0], adjustedFrom[1], adjustedTo[2] );
let textures = [];

2
js/outliner/cube.js
View File

@ -807,7 +807,7 @@ class Cube extends OutlinerElement {
return this;
}
isStretched() {
!this.stretch.allEqual(1);
return !this.stretch.allEqual(1);
}
}
Cube.prototype.title = tl('data.cube');