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

Add togglable dialog form fields

Browse Source 
Make color option in color generator optional
This commit is contained in:
JannisX11 2023-11-11 00:20:51 +01:00
parent 7e9dc29483
commit 5352bee157
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/dialogs.css
View File

@ -173,6 +173,7 @@
.dialog_bar .tool {
position: relative;
margin: 0;
margin-right: auto;
}
.dialog_bar.form_bar .tool > .tooltip {
display: none !important;
@ -199,6 +200,10 @@
padding-top: 4px;
margin-left: 5px;
}
.dialog_bar.form_toggle_disabled *:not(.form_input_toggle) {
pointer-events: none;
opacity: 0.6;
}
.tab_bar {
height: 30px;
display: flex;

19
js/interface/dialog.js
View File

@ -369,6 +369,21 @@ function buildForm(dialog) {
}
bar.append(icon);
}
if (data.toggle_enabled) {
let toggle = Interface.createElement('input', {
type: 'checkbox',
class: 'focusable_input form_input_toggle',
id: form_id + '_toggle',
})
toggle.checked = data.toggle_default != false;
bar.append(toggle);
bar.toggleClass('form_toggle_disabled', !toggle.checked);
toggle.addEventListener('input', () => {
dialog.updateFormValues();
bar.toggleClass('form_toggle_disabled', !toggle.checked);
});
data.input_toggle = toggle;
}
dialog_content.append(bar)
data.bar = bar;
}
@ -633,7 +648,9 @@ window.Dialog = class Dialog {
let result = {}
if (this.form) {
for (let form_id in this.form) {
let data = this.form[form_id]
let data = this.form[form_id];
if (data && data.input_toggle && data.input_toggle.checked == false) continue;
if (typeof data === 'object') {
switch (data.type) {
default:

27
js/texturing/texture_generator.js
View File

@ -23,7 +23,6 @@ const TextureGenerator = {
type_options.blank = 'dialog.create_texture.type.blank';
let resolution = Texture.getDefault() ? (Texture.getDefault().width/Texture.getDefault().getUVWidth())*16 : 16;
TextureGenerator.background_color.set('#00000000')
let resolution_presets = {
16: '16x',
32: '32x',
@ -44,7 +43,7 @@ const TextureGenerator = {
resolution: {label: 'dialog.create_texture.pixel_density', description: 'dialog.create_texture.pixel_density.desc', type: 'select', value: resolution_presets[resolution] ? resolution : undefined, condition: (form) => (form.type == 'template'), options: resolution_presets},
resolution_vec: {label: 'dialog.create_texture.resolution', type: 'vector', condition: (form) => (form.type == 'blank'), dimensions: 2, value: [Project.texture_width, Project.texture_height], min: 16, max: 2048},
color: {label: 'data.color', type: 'color', colorpicker: TextureGenerator.background_color},
color: {label: 'data.color', type: 'color', colorpicker: TextureGenerator.background_color, toggle_enabled: true, toggle_default: false},
rearrange_uv:{label: 'dialog.create_texture.rearrange_uv', description: 'dialog.create_texture.rearrange_uv.desc', type: 'checkbox', value: true, condition: (form) => (form.type == 'template')},
box_uv: {label: 'dialog.project.uv_mode.box_uv', type: 'checkbox', value: false, condition: (form) => (form.type == 'template' && !Project.box_uv && Cube.all.length)},
@ -57,11 +56,6 @@ const TextureGenerator = {
padding: {label: 'dialog.create_texture.padding', description: 'dialog.create_texture.padding.desc', type: 'checkbox', value: Mesh.selected.length > 0, condition: (form) => (form.type == 'template' && form.rearrange_uv)},
},
onFormChange(form) {
if (form.type == 'template' && TextureGenerator.background_color.get().toHex8() === 'ffffffff') {
TextureGenerator.background_color.set('#00000000')
}
},
onConfirm: function(results) {
results.particle = 'auto';
if (results.type == 'blank') {
@ -76,7 +70,6 @@ const TextureGenerator = {
appendToTemplateDialog() {
let texture = Texture.getDefault();
if (!texture) return;
TextureGenerator.background_color.set('#00000000');
var dialog = new Dialog({
id: 'add_bitmap',
title: tl('action.append_to_template'),
@ -92,11 +85,6 @@ const TextureGenerator = {
max_island_angle: {label: 'dialog.create_texture.max_island_angle', description: 'dialog.create_texture.max_island_angle.desc', type: 'number', value: 45, condition: (form) => Mesh.selected.length},
padding: {label: 'dialog.create_texture.padding', description: 'dialog.create_texture.padding.desc', type: 'checkbox', value: false, condition: (form) => (form.rearrange_uv)},
},
onFormChange(form) {
if (TextureGenerator.background_color.get().toHex8() === 'ffffffff') {
TextureGenerator.background_color.set('#00000000')
}
},
onConfirm(options) {
dialog.hide()
options.rearrange_uv = true;
@ -120,9 +108,6 @@ const TextureGenerator = {
if (!options.resolution || isNaN(options.resolution[0]) || isNaN(options.resolution[1])) {
options.resolution = [16, 16]
}
if (options.color === undefined) {
options.color = new tinycolor().toRgb()
}
if (Format.single_texture) {
options.texture = Texture.getDefault()
}
@ -169,8 +154,10 @@ const TextureGenerator = {
canvas.height = height;
var ctx = canvas.getContext('2d')
ctx.fillStyle = new tinycolor(color).toRgbString()
ctx.fillRect(0, 0, width, height)
if (color) {
ctx.fillStyle = new tinycolor(color).toRgbString();
ctx.fillRect(0, 0, width, height);
}
cb(canvas.toDataURL())
},
@ -403,7 +390,7 @@ const TextureGenerator = {
new_resolution = [Project.texture_width, Project.texture_height];
}
if (background_color.getAlpha() != 0) {
if (background_color) {
background_color = background_color.toRgbString()
}
let canvas = document.createElement('canvas');
@ -1217,7 +1204,7 @@ const TextureGenerator = {
})
}
if (background_color.getAlpha() != 0) {
if (background_color) {
background_color = background_color.toRgbString()
}
let canvas = document.createElement('canvas');