mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-02-23 16:31:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix template generator issues

Browse Source
This commit is contained in:
JannisX11 2023-11-21 19:13:54 +01:00
parent 4665122d69
commit f339efe9fe
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/texturing/texture_generator.js
View File

@ -495,7 +495,7 @@ const TextureGenerator = {
border_color = background_color
color = undefined
}
var res_multiple = canvas.width / Project.getUVWidth(texture);
//res_multiple = canvas.width / Project.getUVWidth(texture);
var ctx = canvas.getContext('2d');
ctx.fillStyle = border_color;
ctx.fillRect(
@ -566,10 +566,10 @@ const TextureGenerator = {
let old_factor_y = (Format.per_texture_uv_size ? texture.getUVHeight() : TextureGenerator.old_project_resolution[1]) / texture.img.naturalHeight;
ctx.drawImage(
texture.img,
src.ax * old_factor_x,
src.ay * old_factor_y,
src.x * old_factor_x,
src.y * old_factor_y,
src.ax / old_factor_x,
src.ay / old_factor_y,
src.x / old_factor_x,
src.y / old_factor_y,
coords.x*res_multiple*flip[0],
coords.y*res_multiple*flip[1],
coords.w*res_multiple*flip[0],
@ -1724,6 +1724,7 @@ const TextureGenerator = {
if (texture) {
texture.uv_width = width;
texture.uv_height = height;
texture.flags.delete('update_uv_size_from_resolution');
}
let changed_elements = [];

6
js/texturing/textures.js
View File

@ -907,7 +907,7 @@ class Texture {
if (Texture.all.find(t => t.render_mode == 'layered')) {
this.render_mode = 'layered';
}
if (Format.per_texture_uv_size) {
if (Format.per_texture_uv_size && undo) {
this.flags.add('update_uv_size_from_resolution');
}
if (undo) {
@ -2117,9 +2117,7 @@ SharedActions.add('delete', {
})
Canvas.updateAllFaces();
TextureAnimator.updateButton();
if (UVEditor.texture == this) {
UVEditor.vue.updateTexture();
}
UVEditor.vue.updateTexture();
BARS.updateConditions();
Undo.finishEdit('Remove texture', {textures: []})
}