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

Fix export scale setting not applying to OBJ format

Browse Source 
Auto export keyframe with slight rotation when bone is relative to entity
This commit is contained in:
JannisX11 2022-11-23 22:54:48 +01:00
parent 38f912cd16
commit a4c09f2a63
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/animations/animation.js
View File

@ -175,6 +175,7 @@ class Animation {
var channels = {};
if (animator.rotation_global) {
bone_tag.relative_to = {rotation: 'entity'};
bone_tag.rotation = [0, 0, 0.01];
}
//Saving Keyframes
animator.keyframes.forEach(function(kf) {
@ -183,6 +184,9 @@ class Animation {
}
let timecode = kf.getTimecodeString();
channels[kf.channel][timecode] = kf.compileBedrockKeyframe()
if (animator.rotation_global && kf.channel == 'rotation' && channels[kf.channel][timecode] instanceof Array && channels[kf.channel][timecode].allEqual(0)) {
channels[kf.channel][timecode][2] = 0.01;
}
})
// Sorting + compressing keyframes
for (var channel in Animator.possible_channels) {

7
js/io/formats/obj.js
View File

@ -47,6 +47,7 @@ var codec = new Codec('obj', {
const uv = new THREE.Vector2();
const face = [];
let face_export_mode = Settings.get('obj_face_export_mode');
let export_scale = Settings.get('model_export_scale');
output.push('mtllib ' + (options.mtl_name||'materials.mtl') +'\n');
@ -70,7 +71,7 @@ var codec = new Codec('obj', {
output.push(`o ${element.name||'cube'}`)
element.getGlobalVertexPositions().forEach((coords) => {
vertex.set(...coords.V3_subtract(8, 8, 8)).divideScalar(16);
vertex.set(...coords.V3_subtract(8, 8, 8)).divideScalar(export_scale);
output.push('v ' + vertex.x + ' ' + vertex.y + ' ' + vertex.z);
nbVertex++;
})
@ -156,7 +157,7 @@ var codec = new Codec('obj', {
let vertex_keys = [];
function addVertex(x, y, z) {
vertex.set(x, y, z);
vertex.applyMatrix4( mesh.matrixWorld ).divideScalar(16);
vertex.applyMatrix4( mesh.matrixWorld ).divideScalar(export_scale);
output.push('v ' + vertex.x + ' ' + vertex.y + ' ' + vertex.z);
nbVertex++;
}
@ -264,7 +265,7 @@ var codec = new Codec('obj', {
vertex.y = vertices.getY( i );
vertex.z = vertices.getZ( i ); // transform the vertex to world space
vertex.applyMatrix4( mesh.matrixWorld ).divideScalar(16); // transform the vertex to export format
vertex.applyMatrix4( mesh.matrixWorld ).divideScalar(export_scale); // transform the vertex to export format
output.push('v ' + vertex.x + ' ' + vertex.y + ' ' + vertex.z);