mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2024-11-27 04:21:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

OptiFine CEM improvements:

Browse Source 
Invert root bone X axis pivots
Optimized mirrored sub group export
Automatically load bone textures
This commit is contained in:
JannisX11 2022-05-26 22:49:43 +02:00
parent 3eb971eb0d
commit 9069f9fc37
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/io/codec.js
View File

@ -19,6 +19,7 @@ class Codec {
Merge.string(this, data, 'extension');
Merge.boolean(this, data, 'remember');
Merge.boolean(this, data, 'multiple_per_file');
this.format = data.format;
this.load_filter = data.load_filter;
this.export_action = data.export_action;
}

49
js/io/formats/optifine_jem.js
View File

@ -31,10 +31,10 @@ var codec = new Codec('optifine_entity', {
part: g.name,
id: g.name,
invertAxis: 'xy',
mirrorTexture: undefined,
translate: g.origin.slice()
}
bone.translate[1] *= -1
bone.translate[2] *= -1
bone.translate.V3_multiply(-1);
if (!g.rotation.allEqual(0)) {
bone.rotate = g.rotation.slice()
@ -68,6 +68,9 @@ var codec = new Codec('optifine_entity', {
p_model.textureSize = group.texture_size;
}
let child_cubes = group.children.filter(obj => obj.export && obj.type === 'cube')
let has_different_mirrored_children = !!child_cubes.find(obj => obj.mirror_uv !== child_cubes[0].mirror_uv);
group.children.forEach(obj => {
if (!obj.export) return;
if (obj.type === 'cube') {
@ -106,19 +109,22 @@ var codec = new Codec('optifine_entity', {
box.sizeAdd = obj.inflate
}
if (obj.mirror_uv !== group.mirror_uv) {
if (obj.mirror_uv !== group.mirror_uv && has_different_mirrored_children) {
if (!mirror_sub) {
mirror_sub = {
invertAxis: 'xy',
mirrorTexture: 'u',//xxx
mirrorTexture: 'u',
boxes: []
}
if (!p_model.submodels) p_model.submodels = [];
p_model.submodels.splice(0, 0, mirror_sub)
}
mirror_sub.boxes.push(box)
mirror_sub.boxes.push(box);
} else {
if (!p_model.boxes) p_model.boxes = []
if (!p_model.boxes) p_model.boxes = [];
if (obj.mirror_uv !== group.mirror_uv) {
p_model.mirrorTexture = obj.mirror_uv ? 'u' : undefined;
}
p_model.boxes.push(box)
}
} else if (obj.type === 'group') {
@ -126,10 +132,11 @@ var codec = new Codec('optifine_entity', {
var bone = {
id: obj.name,
invertAxis: 'xy',
mirrorTexture: undefined,
translate: obj.origin.slice()
}
if (obj.mirror_uv) {
bone.mirrorTexture = 'u'
bone.mirrorTexture = 'u';
}
if (!obj.rotation.allEqual(0)) {
bone.rotate = obj.rotation.slice()
@ -165,6 +172,19 @@ var codec = new Codec('optifine_entity', {
},
parse(model, path) {
this.dispatchEvent('parse', {model});
function importTexture(string) {
if (typeof string !== 'string') return;
let texture_path = string.replace(/[\\/]/g, osfs);
if (texture_path.match(/^textures/)) {
texture_path = path.replace(/[\\/]optifine[\\/][\\\w .-]+$/i, '\\'+texture_path);
} else {
texture_path = path.replace(/\\[\w .-]+$/, '\\'+texture_path);
}
return new Texture().fromPath(texture_path).add(false);
}
if (model.textureSize) {
Project.texture_width = parseInt(model.textureSize[0])||16;
Project.texture_height = parseInt(model.textureSize[1])||16;
@ -187,8 +207,8 @@ var codec = new Codec('optifine_entity', {
texture: b.texture,
texture_size: b.textureSize,
})
group.origin[1] *= -1;
group.origin[2] *= -1;
group.origin.V3_multiply(-1);
importTexture(b.texture);
function readContent(submodel, p_group, depth) {
@ -258,6 +278,7 @@ var codec = new Codec('optifine_entity', {
texture: subsub.texture,
texture_size: subsub.textureSize,
})
importTexture(subsub.texture);
subcount++;
group.addTo(p_group).init()
readContent(subsub, group, depth+1)
@ -269,15 +290,7 @@ var codec = new Codec('optifine_entity', {
readContent(b, group, 0)
})
}
if (typeof model.texture == 'string') {
let texture_path = model.texture.replace(/[\\/]/g, osfs);
if (texture_path.match(/^textures/)) {
texture_path = path.replace(/[\\/]optifine[\\/][\\\w .-]+$/i, '\\'+texture_path);
} else {
texture_path = path.replace(/\\[\w .-]+$/, '\\'+texture_path);
}
new Texture().fromPath(texture_path).add(false);
}
importTexture(model.texture);
this.dispatchEvent('parsed', {model});
Canvas.updateAllBones();
}