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 settings to toggle 2D and 3D brush cursor

Browse Source 
Fix #1969 3D brush cursor visible in screenshots
This commit is contained in:
JannisX11 2023-07-29 17:06:42 +02:00
parent 4050753ff6
commit 650252a4b7
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/interface/settings.js
View File

@ -490,8 +490,12 @@ const Settings = {
new Setting('color_wheel', {category: 'paint', value: false, onChange(value) {
Interface.Panels.color.vue.picker_type = value ? 'wheel' : 'box';
}});
new Setting('pick_color_opacity', {category: 'paint', value: false});
new Setting('brush_cursor_2d', {category: 'paint', value: true});
new Setting('brush_cursor_3d', {category: 'paint', value: true, onChange(value) {
if (!value) scene.remove(Canvas.brush_outline);
}});
new Setting('outlines_in_paint_mode', {category: 'paint', value: true});
new Setting('pick_color_opacity', {category: 'paint', value: false});
new Setting('paint_through_transparency', {category: 'paint', value: true});
new Setting('paint_side_restrict', {category: 'paint', value: true});
new Setting('paint_with_stylus_only', {category: 'paint', value: false});

1
js/preview/canvas.js
View File

@ -655,6 +655,7 @@ const Canvas = {
alphaTest: 0.2
})
Canvas.brush_outline = new THREE.Mesh(new THREE.PlaneBufferGeometry(1, 1), brush_outline_material);
Canvas.gizmos.push(Canvas.brush_outline);
/*
// Vertex gizmos

2
js/preview/preview.js
View File

@ -1031,7 +1031,7 @@ class Preview {
var data = this.raycast(event);
updateCubeHighlights(data && data.element);
if (Toolbox.selected.brush?.size) {
if (Toolbox.selected.brush?.size && Settings.get('brush_cursor_3d')) {
if (!data) {
scene.remove(Canvas.brush_outline);
return;

2
js/texturing/uv.js
View File

@ -3177,7 +3177,7 @@ Interface.definePanels(function() {
return [...min, ...max];
},
getBrushOutlineStyle() {
if (Toolbox.selected.brush) {
if (Toolbox.selected.brush && Settings.get('brush_cursor_2d')) {
var pixel_size = this.inner_width / (this.texture ? this.texture.width : Project.texture_width);
//pos
let offset = 0;

4
lang/en.json
View File

@ -925,6 +925,10 @@
"settings.color_wheel.desc": "Use the color wheel as the main color picker",
"settings.pick_color_opacity": "Pick Color Opacity",
"settings.pick_color_opacity.desc": "Pick the color opacity with the Color Picker and set it as brush opacity",
"settings.brush_cursor_2d": "2D Brush Cursor",
"settings.brush_cursor_2d.desc": "Display an outline around the brush in the 2D workspace",
"settings.brush_cursor_3d": "3D Brush Cursor",
"settings.brush_cursor_3d.desc": "Display an outline around the brush in the 3D workspace",
"settings.outlines_in_paint_mode": "Selection Outlines in Paint Mode",
"settings.outlines_in_paint_mode.desc": "Display element selection outlines while in paint mode",
"settings.paint_through_transparency": "Paint Through Transparency",