mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-04-06 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with generating MER map from existing texture

Browse Source 
Fix MER map display issues
Materials can no longer be created from textures that are already in a material
This commit is contained in:
JannisX11 2025-03-19 20:33:32 +01:00
parent e36c119082
commit b0f9bc9dc1
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/texturing/texture_groups.js
View File

@ -179,13 +179,16 @@ class TextureGroup {
}
function generateMap(source_channel, key) {
let canvas = material[key]?.image ?? document.createElement('canvas');
let canvas = material[key]?.image;
if (!canvas || key == 'emissiveMap') {
canvas = document.createElement('canvas');
}
let ctx = canvas.getContext('2d');
canvas.width = mer_tex.width;
canvas.height = mer_tex.height;
ctx.fillStyle = 'black';
ctx.fillRect(0, 0, mer_tex.width, mer_tex.height);
document.body.append(canvas);
// document.body.append(canvas);
ctx.putImageData(source_channel === 1 ? extractEmissiveChannel() : extractGrayscaleValue(source_channel), 0, 0);
@ -615,6 +618,7 @@ BARS.defineActions(function() {
new Action('create_material', {
icon: 'lightbulb_circle',
category: 'textures',
condition: () => !Texture.selected || !Texture.selected.getGroup()?.is_material,
click() {
let texture = Texture.selected;
let texture_group = new TextureGroup({is_material: true});
@ -653,7 +657,7 @@ BARS.defineActions(function() {
let new_data = ctx.getImageData(0, 0, canvas.width, canvas.height);
canvas.style.width = 256 + 'px';
canvas.style.height = 256 + 'px';
let original_image = new CanvasFrame(texture.canvas);
let original_image = new CanvasFrame(texture.canvas, true);
original_image.canvas.style.width = 256 + 'px';
original_image.canvas.style.height = 256 + 'px';
@ -799,7 +803,12 @@ BARS.defineActions(function() {
updateCanvas(result);
let textures = [];
Undo.initEdit({texture_groups: texture_group ? [texture_group] : null, textures});
let pbr_channel = result.channel;
let pbr_channel;
switch (result.channel) {
case 'height': pbr_channel = result.channel; break;
default: pbr_channel = 'mer'; break;
}
let new_texture = new Texture({
name: texture.name,
pbr_channel,

4
lib/CanvasFrame.js
View File

@ -5,11 +5,11 @@ class CanvasFrame {
/**
*
* @param {Number|HTMLCanvasElement|HTMLImageElement} [a] Image source
* @param {Number} [b]
* @param {Number|Boolean} [b]
*/
constructor(a, b) {
if (a && a.nodeName == 'CANVAS') {
if (a.getContext('2d')) {
if (a.getContext('2d') && b !== true) {
this.canvas = a;
} else {
this.createCanvas(a.width, a.height)