+>
+
+#### Toggle Corrected Lighting
+
+- Use the _Correct Lights_ toggle to enable or disable physically-corrected
+ lighting in the preview scene. This may improve the appearance of reflective
+ and emissive materials in the preview scene, but will dim the albedo/base
+ color texture.
+
+#### Tone Mapping
+
+- The _Tone Mapping_ select will apply various tone mapping techniques to the
+ preview scene. Use the _Linear_ option to match the tone map used by most
+ Bedrock shaders.
+
+#### Exposure
+
+- The scene exposure can be adjusted once a tone map technique is selected.
+ Values range from -2.0 to 2.0.
+
+### Channel Management
+
+Control which textures or texture layers are used for PBR channels using the
+following methods:
+
+#### Create Material Texture
+
+- Use the _Create Material Texture_ action to create a blank texture with PBR
+ material layers initialized.\
+ If an existing texture is selected, it will be used as the albedo channel in
+ the PBR material. If the project has other textures, include those textures in
+ the selection to have them automatically assigned to the new material's PBR
+ channels.
+
+Follow these naming conventions to ensure the textures are assigned to the
+appropriate channels when creating a new material:
+
+#### Channel Naming Convention
+
+The plugin will assume that textures and layers which end in an underscore and a
+channel name are intended to be used as that channel. For example,
+`texture_roughness` will be used as the roughness map unless the channel has
+been manually assigned a texture.
+
+##### Supported Channels
+
+| Channel | Description | Colorspace |
+| ----------- | --------------------- | ----------------------------------------------------------------- |
+| `ao` | Ambient Occlusion | **BW** |
+| `albedo` | Albedo / Base Color | **RGB** |
+| `normal` | DirectX Normal Map | **RGB** |
+| `metalness` | Metallic map | **BW** |
+| `roughness` | Roughness map | **BW** |
+| `emissive` | Emissive map | Displayed in **RGB**; Exported as **BW** in MER |
+| `sss` | Subsurface Scattering | **BW**; Not supported by shader but exported in MER alpha channel |
+
+###### Supported Minecraft Shader Channels
+
+RenderDragon and labPBR textures are automatically decoded and displayed when
+the channels can be inferred based on the existence of MER, specular, or normal
+maps. Some features are not supported by the Blockbench preview's shader, such
+as AO and POM, but can still be decoded/encoded during texture import/export
+
+#### Explicit Channel Assignment
+
+Create a Texture Layer in Blockbench to enable channel assignment in PBR
+previews. Each channel can be selected from a menu and applied to the current
+material. The menu is visible in the _PBR Controls_ panel when in Paint mode.
+The menu options are available in the _Image_ menu, as well as in the context
+menu of a texture or layer, and in the Layers panel.
+
+#### Removing Channel Assignment
+
+Channels can be disabled by hiding or deleting the layer, or un-assigning the
+channel in the menu. Texture layers cannot be assigned to more than one channel.
+Assigning a layer to a new channel will clear the layer's current channel.
+
+#### Finding Assigned Channels
+
+Select a texture with material layers assigned to reveal the _PBR Channels_
+panel. This panel displays the channels currently assigned in the selected
+texture. Click a channel in the menu to have it selected in the Layers panel.
+
+### Material Brush Tool
+
+Use the _Material Brush Tool_ to paint across multiple PBR channels. The
+controls found in the _Material Brush Panel_.
+
+- Set the metallic, roughness and height values on a scale of 0% - 100%
+- Use the color picker in the _Material Brush Panel_ to set the emissive color.
+- The current color selected in the main color picker is used as the albedo
+ color.
+- Only visible layers with channels assigned will be updated by the brush.
+- Blockbench's paint brush size and smoothness settings control the material
+ brush's settings as well.
+
+#### Material Brush Presets
+
+Open the _Material Brush Presets_ dialog to define and save new brush settings,
+or to select and apply existing presets. A material preview is generated upon
+saving a preset. Select a preset to populate its values in the Material Brush
+input controls.
+
+### `.bbmat` Files
+- Import Blockbench PBR materials by dropping a `.bbmat` file into a Blockbench project.
+ - The import option is also available in the _File_ menu.
+- Export existing materials from texture content menu to save its assigned channels together in one file.
\ No newline at end of file
diff --git a/plugins/pbr_preview/changelog.json b/plugins/pbr_preview/changelog.json
new file mode 100644
index 00000000..d8f93e67
--- /dev/null
+++ b/plugins/pbr_preview/changelog.json
@@ -0,0 +1,51 @@
+{
+ "1.0.0": {
+ "title": "1.0.0",
+ "date": "2024-05-25",
+ "author": "Jason J. Gardner",
+ "categories": [
+ {
+ "title": "PBR plugin",
+ "list": [
+ "Initial release 🚀"
+ ]
+ }
+ ]
+ },
+ "1.1.0": {
+ "title": "1.1.0",
+ "date": "2024-06-10",
+ "author": "Jason J. Gardner",
+ "categories": [
+ {
+ "title": "Java Support",
+ "list": [
+ "Added labPBR export option",
+ "Added labPBR texture decoding"
+ ]
+ },
+ {
+ "title": "Material Brush",
+ "list": [
+ "Added material brush tool",
+ "Added material brush preset dialog"
+ ]
+ }
+ ]
+ },
+ "1.2.0": {
+ "title": "1.2.0",
+ "date": "2024-06-20",
+ "author": "Jason J. Gardner",
+ "categories": [
+ {
+ "title": "USDZ Export",
+ "list": [
+ "Added USDZ export option",
+ "Added normal map orientation options",
+ "Created `.bbmat` codec"
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/plugins/pbr_preview/icon.png b/plugins/pbr_preview/icon.png
new file mode 100644
index 00000000..273eda51
Binary files /dev/null and b/plugins/pbr_preview/icon.png differ
diff --git a/plugins/pbr_preview/members.yml b/plugins/pbr_preview/members.yml
new file mode 100644
index 00000000..438a1942
--- /dev/null
+++ b/plugins/pbr_preview/members.yml
@@ -0,0 +1,4 @@
+maintainers:
+ - jasonjgardner
+developers:
+ - jasonjgardner
diff --git a/plugins/pbr_preview/pbr_preview.js b/plugins/pbr_preview/pbr_preview.js
new file mode 100644
index 00000000..96e1f533
--- /dev/null
+++ b/plugins/pbr_preview/pbr_preview.js
@@ -0,0 +1,291 @@
+"use strict";(()=>{var _=THREE,ie=Vue,le=window.JSZip;var F="1.2.0",K="1.0.0",N="_NONE_",h={albedo:{id:"albedo",label:"Albedo",description:"The color of the material",map:"map",icon:"tonality",default:new _.Color(16777215),regex:new RegExp("(s|_)*(basecolor|color|albedo)","i")},metalness:{id:"metalness",label:"Metalness",description:"The material's metalness map",map:"metalnessMap",icon:"brightness_6",default:new _.Color(0),regex:new RegExp("[ _]*metal(lic|ness)?","i")},emissive:{id:"emissive",label:"Emissive",description:"The material's emissive map",map:"emissiveMap",icon:"wb_twilight",default:new _.Color(0),regex:new RegExp("[ _]*(emissive|emission)","i")},roughness:{id:"roughness",label:"Roughness",description:"The material's roughness map",map:"roughnessMap",icon:"grain",default:new _.Color(16777215),regex:new RegExp("[ _]*rough(ness)?","i")},height:{id:"height",label:"Height",description:"The material's height map",map:"bumpMap",icon:"landscape",default:new _.Color(16777215),regex:new RegExp("[ _]*(height|bump)","i")},normal:{id:"normal",label:"Normal",description:"The material's normal map",map:"normalMap",icon:"looks",default:new _.Color("rgb(128, 128, 255)"),regex:new RegExp("[ _]*normal","i")},ao:{id:"ao",label:"Ambient Occlusion",description:"The material's ambient occlusion map",map:"aoMap",icon:"motion_mode",default:new _.Color(16777215),regex:new RegExp("[ _]*(ao|ambientocclusion|ambient occlusion)","i")}},o={},y=[],C=[];var ce=[...Object.keys(h).map(e=>h[e].id),N];y.push(()=>{o.channelProp=new Property(TextureLayer,"enum","channel",{default:N,values:ce,label:"PBR Channel",exposed:!1}),o.textureChannelProp=new Property(Texture,"enum","channel",{default:N,values:ce,label:"PBR Channel",exposed:!1}),o.materialTextureProp=new Property(Texture,"boolean","material",{default:!1,label:"Material Texture"}),o.pbrMaterialsProp=new Property(ModelProject,"object","pbr_materials",{default:{},exposed:!1,label:"PBR Materials"}),o.projectMaterialsProp=new Property(ModelProject,"object","bb_materials",{default:{},exposed:!1,label:"Project Materials"}),o.projectPbrModeProp=new Property(ModelProject,"boolean","pbr_active",{default:!1,exposed:!1,values:[],label:"PBR Mode"})});function E(){return Texture.selected?Texture.selected:TextureLayer.selected?TextureLayer.selected.texture:Project?Project.selected_texture?Project.selected_texture:Project.textures.find(e=>e.selected)??null:Texture.all.find(e=>e.selected)??Texture.getDefault()}function R(){return TextureLayer.selected?TextureLayer.selected:Texture.selected?.selected_layer?Texture.selected.selected_layer:Project.selected_texture!==null&&Project.selected_texture?.layers_enabled===!0?Project.selected_texture.layers.find(e=>e.selected)??Project.selected_texture.layers[0]:E()?.getActiveLayer()??null}function G(){return Project?Project.model_identifier.length>0?Project.model_identifier:Project.getDisplayName():pathToName(E()?.name??"texture")}function ue(e,a){let t;return function(...r){let n=()=>{t=void 0,e.apply(this,r)};clearTimeout(t),t=setTimeout(n,a)}}function z(e){let a=MediaPreview.renderer??new _.WebGLRenderer({alpha:!0,antialias:!0}),t=new _.Scene,r=new _.PerspectiveCamera(75,96/96,.1,1e3),n=new _.AmbientLight(16777215,.75);t.add(n);let i=new _.PointLight(16777215,1,100);i.position.set(5,5,5),t.add(i);let s=new _.SphereGeometry(1,32,32),l=e instanceof _.MeshStandardMaterial&&e.isMeshStandardMaterial?e:new _.MeshStandardMaterial({color:e.albedo,metalness:e.metalness??0,roughness:e.roughness??1,emissive:e.emissive,bumpScale:e.height??0,envMap:PreviewScene.active?.cubemap??null,envMapIntensity:.5}),u=new _.Mesh(s,l);t.add(u),r.position.x=0,r.position.y=0,r.position.z=2,a.setSize(96,96),a.render(t,r);let m=a.domElement.toDataURL();return l.dispose(),MediaPreview.renderer||(a.clear(),a.dispose()),m}function Y(e,a){let t=a??document.createElement("canvas"),r=t.getContext("2d");if(!r)return t.remove(),null;let n=Math.max(Project?Project.texture_width:16,16),i=Math.max(Project?Project.texture_height:16,16);t.width=n,t.height=i,r.fillStyle=`rgb(${e.r*255}, ${e.g*255}, ${e.b*255})`,r.fillRect(0,0,n,i);let s=t.toDataURL();return a||t.remove(),s}var Ve=(e=!0)=>{let a=Project?Project.textures??Texture.all:Texture.all;return e?a.filter(t=>t.layers_enabled&&t.layers.length>0).flatMap(t=>t.layers):a},D=class e{constructor(a,t){this._scope=a??Ve(),this._materialUuid=t}merToCanvas(){let a=this.getTexture(h.emissive),t=this.getTexture(h.roughness),r=this.getTexture(h.metalness);if(!a&&!t&&!r){let{metalness:n,emissive:i,roughness:s}=this.decodeMer();n&&(r=e.makePixelatedCanvas(n)),i&&(a=e.makePixelatedCanvas(i)),s&&(t=e.makePixelatedCanvas(s))}return{emissiveMap:a,roughnessMap:t,metalnessMap:r}}getMaterial(a={}){let{emissiveMap:t,roughnessMap:r,metalnessMap:n}=Format.id.startsWith("bedrock")?this.merToCanvas():{emissiveMap:this.getTexture(h.emissive),roughnessMap:this.getTexture(h.roughness),metalnessMap:this.getTexture(h.metalness)},i=this.getTexture(h.normal);return new _.MeshStandardMaterial({map:this.getTexture(h.albedo)??e.makePixelatedCanvas(TextureLayer.selected?.canvas??Texture.all.find(s=>s.selected)?.canvas??Texture.getDefault().canvas),aoMap:this.getTexture(h.ao),bumpMap:this.getTexture(h.height),normalMap:i,metalnessMap:n,metalness:n?1:0,roughnessMap:r,roughness:1,emissiveMap:t,emissiveIntensity:t?1:0,emissive:t?16777215:0,envMap:PreviewScene.active?.cubemap??null,envMapIntensity:.95,alphaTest:.1,transparent:!0,...a})}renderMaterialPreview(){return z(this.getMaterial())}saveTexture(a,t){Project&&(Project.pbr_materials||(Project.pbr_materials={}),Project.pbr_materials[this._materialUuid]||(Project.pbr_materials[this._materialUuid]={}),Project.pbr_materials[this._materialUuid][a.id]=t.uuid,t.extend({channel:a.id}))}findTexture(a,t=!0){if(!Project)return null;let r=this._scope.find(u=>u.channel&&(u.channel===a||u.channel===a.id));if(r)return r;let[n,i]=typeof a=="string"?[a,new RegExp(`_*${a}(.[^.]+)?$`,"i")]:[a.id,a.regex??new RegExp(`_*${a.id}(.[^.]+)?$`,"i")];Project.pbr_materials=Project.pbr_materials??{};let s=Project.pbr_materials[this._materialUuid];if(t&&!s?.length&&n!==N)return this._scope.find(u=>i.test(u.name))??null;let l=s?.[n];return l?this._scope.find(u=>u.uuid===l)??null:null}static makePixelatedCanvas(a){let t=new _.CanvasTexture(a,void 0,void 0,void 0,_.NearestFilter,_.NearestFilter);return t.needsUpdate=!0,t}getTexture(a){let t=this.findTexture(a);return t?e.makePixelatedCanvas(t.canvas):null}static extractChannel(a,t){let r=a.canvas,{width:n,height:i}=r,s=r.getContext("2d");if(!s||!n||!i)return null;let l=document.createElement("canvas");l.width=n,l.height=i;let u=l.getContext("2d");if(!u)return null;let m={r:0,g:1,b:2,a:3}[t],{data:d}=s.getImageData(0,0,n,i),c=new Uint8ClampedArray(n*i*4);for(let g=0;gUsage Tip
+> Toggling the PBR preview off and on may solve any texture discrepancies. Allowing the scene to render again will ensure all textures are up-to-date in the preview. +>
+
`});y.push(()=>{o.materialBrushStyles=Blockbench.addCSS(`
+ .preset_list {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, 96px);
+ grid-gap: 8px;
+ justify-content: start;
+ align-items: start;
+ margin: 0 auto;
+ padding: 8px;
+ }
+
+ .user_preset {
+ display: flex;
+ justify-content: start;
+ align-items: center;
+ width: 100%;
+ padding: 8px;
+ position: relative;
+ }
+
+ .preset_title {
+ font-size: 1em;
+ color: var(--color-text);
+ }
+
+ .user_preset:hover .preset_title {
+ color: var(--color-accent);
+ }
+
+ .preset_preview {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: nowrap;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ }
+
+ .preset_buttons {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ font-size: 0.8em;
+ padding: 0 4px;
+ }
+
+ .preset_channel {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin: 0 8px;
+ font-size: 0.8em;
+ }
+
+ .delete_preset {
+ margin-left: 8px;
+ padding: 4px;
+ height: 24px;
+ width: 24px;
+ min-width: 24px;
+ background-color: transparent;
+ color: var(--color-text);
+ border: none;
+ border-radius: 100%;
+ position: absolute;
+ right: -8px;
+ top: 0;
+ filter: drop-shadow(0 0 2px var(--color-shadow));
+ }
+
+ .delete_preset:hover {
+ background: transparent;
+ color: var(--color-accent);
+ }
+
+ .delete_preset .material-icons {
+ font-size: 0.825em;
+ }
+
+ .delete_preset:hover .material-icons {
+ color: var(--color-accent);
+ }`),o.brushMetalnessSlider=new NumSlider("slider_brush_metalness",{category:"paint",name:"Metalness",description:"Adjust the metalness of the brush",tool_setting:"brush_metalness",settings:{min:0,max:1,step:.01,default:0},condition:()=>W(h.metalness)}),o.brushRoughnessSlider=new NumSlider("slider_brush_roughness",{category:"paint",name:"Roughness",description:"Adjust the roughness of the brush",tool_setting:"brush_roughness",settings:{min:0,max:1,step:.01,default:1},condition:()=>W(h.roughness)}),o.brushEmissiveColor=new ColorPicker("brush_emissive_color",{category:"paint",name:"Emissive",description:"Adjust the emissive color of the brush",value:"#000000",tool_setting:"brush_emissive",condition:()=>W(h.emissive)}),o.brushHeightSlider=new NumSlider("slider_brush_height",{category:"paint",name:"Height",description:"Adjust the height of the brush",tool_setting:"brush_height",settings:{min:0,max:1,step:.01,default:.5},condition:()=>W(h.height)}),o.materialBrushTool=new Tool("material_brush",{name:"Material Brush",description:"Paints across multiple texture layers",icon:"view_in_ar",paintTool:!0,cursor:"cell",category:"tools",toolbar:"brush",condition:{project:!0,selected:{texture:!0},modes:["paint"],method(){return E()?.layers_enabled??!1}},allowed_view_modes:"textured",tool_settings:{brush_metalness:0,brush_roughness:1,brush_emissive:"#000000",brush_height:.5},brush:{blend_modes:!1,shapes:!0,size:!0,softness:!0,opacity:!0,offset_even_radius:!0,floor_coordinates:!0,changePixel(e,a,t,r,{size:n,softness:i,texture:s,x:l,y:u}){let m=Z.fromSettings(),d=Object.keys(m.colors),c=Math.floor(n-i*n/100),v=t;return s.layers.forEach(g=>{if(!g.visible||!d.includes(g.channel))return;let x=m.getChannel(g.channel);if(!x)return;let f=Math.sqrt((l-e)**2+(u-a)**2),p=Math.min(1,f/c);if(l%c<=p&&u%c<=p){let b=g.ctx.getImageData(e,a,1,1).data,M=new _.Color(`rgb(${b[0]}, ${b[1]}, ${b[2]})`);x.lerp(M,1)}g.ctx.fillStyle=x.getStyle(),g.ctx.fillRect(e,a,1,1),g.selected&&(v={r:x.r*255,g:x.g*255,b:x.b*255,a:r*255})}),v},onStrokeStart({texture:e}){return Undo.initEdit({layers:e.layers}),!0},onStrokeEnd({texture:e}){return Undo.finishEdit("Material Brush Stroke"),!0}},onCanvasClick(e){Painter.startPaintToolCanvas(e,e.event)},onSelect(){Painter.updateNslideValues(),B()},click(){A()}}),o.loadBrushPreset=new Action("load_brush_preset",{icon:"stroke_full",name:"Material Brush Presets",description:"Load or save a brush preset",category:"paint",condition:{project:!0},click(){o.userMaterialBrushPresets=new Dialog("user_brush_presets",{id:"user_brush_presets",title:"Edit Material Brush",component:mt,part_order:["lines","component","form"],form:{albedo:{type:"color",label:"Albedo",value:ColorPanel.get(),toggle_enabled:!0},metalness:{type:"number",label:"Metalness",min:0,max:1,step:.01,full_width:!1,toggle_enabled:!0},roughness:{type:"number",label:"Roughness",min:0,max:1,step:.01,toggle_enabled:!0,full_width:!1},emissive:{type:"color",label:"Emissive",value:"#000000",toggle_enabled:!0},height:{type:"number",label:"Height",min:0,max:1,step:.01,toggle_enabled:!0}},onConfirm(e){Ee({metalness:Number(e.metalness??o.brushMetalnessSlider?.get()),roughness:Number(e.roughness??o.brushRoughnessSlider?.get()),emissive:(e.emissive??o.brushEmissiveColor?.get()).toString(),height:Number(e.height??o.brushHeightSlider?.get()),albedo:(e.albedo??ColorPanel.get()).toString()})},buttons:["Close","Save","Apply"],cancelIndex:0,confirmIndex:2,onButton(e,a){o.materialBrushTool?.select(),e===1&&Blockbench.textPrompt("Save Preset","New Preset",t=>{t&&(ut(t),Blockbench.showQuickMessage(`Preset "${t}" saved`,2e3))})}}).show()}}),MenuBar.addAction(o.materialBrushTool,"tools.0")});C.push(()=>{MenuBar.removeAction("tools.material_brush")});y.push(()=>{o.materialBrushPanel=new Panel("material_brush_panel",{name:"Material Brush",id:"material_brush_panel",icon:"view_in_ar",toolbars:[new Toolbar("material_brush_toolbar",{id:"material_brush_toolbar",children:["material_brush","load_brush_preset","slider_brush_metalness","slider_brush_roughness","brush_emissive_color","slider_brush_height"],name:"Material Settings"})],condition:{modes:["paint"],project:!0},component:{},expand_button:!0,growable:!1,onFold(){},onResize(){},default_side:"right",default_position:{slot:"right_bar",float_position:[0,0],float_size:[400,300],height:300,folded:!1},insert_after:"color",insert_before:"outliner"})});y.push(()=>{o.displaySettingsPanel=new Panel("display_settings",{name:"PBR Controls",id:"display_settings_panel",icon:"display_settings",toolbars:[new Toolbar("controls_toolbar",{id:"controls_toolbar",children:["toggle_pbr","correct_lights","display_settings_tone_mapping","display_settings_exposure","display_settings_reset_exposure","show_channel_select_menu"],name:"Display Settings"})],display_condition:{modes:["edit","paint","animate"],project:!0},component:{},expand_button:!0,growable:!1,onFold(){},onResize(){},default_side:"left",default_position:{slot:"left_bar",float_position:[0,0],float_size:[400,300],height:300,folded:!1},insert_after:"textures",insert_before:"color"})});var q=e=>e.visible&&e.channel&&e.channel!==N,dt=()=>{let e=R();if(e)return e.texture.layers.filter(q);let a=E();return a?a.layers_enabled?a.layers.filter(q):Texture.all.map(t=>t.layers_enabled?[...t.layers.filter(q)]:[q(t)?t:null]).flat().filter(Boolean):[]},Pe=["select_texture","update_texture_selection","finish_edit","add_texture"],Le=()=>{Panels.channels_panel.inside_vue.textures=dt()};y.push(()=>{o.channelsPanelStyle=Blockbench.addCSS(`
+ .texture_channel {
+ color: var(--color-text);
+ flex: 1;
+ font-size: 1em;
+ margin: 0 0 0 auto;
+ padding: 0 8px;
+ text-align: right;
+ }
+
+ .texture_channel + .texture_particle_icon {
+ padding-right: 8px;
+ }
+
+ .texture_channel_description {
+ background-color: var(--color-back);
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ justify-content: space-between;
+ }
+
+ .texture_channel_wrapper {
+ align-items: center;
+ background-color: var(--color-ui);
+ border-left: 1px solid var(--color-border);
+ display: flex;
+ flex: 1;
+ flex-direction: row;
+ align-items: center;
+ flex-wrap: nowrap;
+ padding: 0 8px;
+ }
+
+ .texture_channel_wrapper:hover {
+ background-color: var(--color-button);
+ }
+
+ .texture_channel_description .texture_name {
+ flex-direction: column;
+ flex-wrap: nowrap;
+ color: var(--color-subtle_text);
+ display: flex;
+ flex: 1;
+ justify-content: center;
+ align-items: start;
+ }
+
+ .texture_parent {
+ color: var(--color-subtle_text);
+ font-size: 0.8em;
+ }
+
+ .texture_channel_description:hover .texture_channel {
+ color: var(--color-accent);
+ }
+
+ #pbr_channel_list {
+ display: flex;
+ flex-direction: column;
+ }
+
+ #pbr_channel_list .texture {
+ border-top: 1px solid var(--color-border);
+ padding-right: 0;
+ }
+ `),o.channelsPanel=new Panel("channels_panel",{name:"PBR Channels",id:"channels_panel",icon:"gallery_thumbnail",condition:{project:!0,selected:{texture:!0},modes:["paint","edit"]},toolbars:[],component:{name:"ChannelsPanel",data(){return{channels:h,textures:[]}},methods:{openMenu(e){o.channelMenu?.open(e)},selectTexture(e){Modes.options.paint.select(),e.select(),e.scrollTo()},channelEnabled(e){return e.channel&&e.channel!==N&&e.channel in this.channels},getImgSrc(e){return e.img?.src??`data:image/png;base64,${e.canvas.toDataURL()}`}},template:`
+ -
+
-
+ ++
+
{{ name }}+++ +{{ name }}+
+
+
`},expand_button:!0,growable:!0,onFold(){},onResize(){},default_side:"left",default_position:{slot:"left_bar",float_position:[0,0],float_size:[400,300],height:350,folded:!0},insert_after:"layers",insert_before:"color"}),Blockbench.on(Pe.join(" "),Le)});C.push(()=>{Pe.forEach(e=>{Blockbench.removeListener(e,Le)})});(()=>{let e=()=>{y.forEach(t=>t())},a=()=>{J(),C.forEach(t=>t()),Object.entries(o).forEach(([t,r])=>{try{r?.delete()}catch(n){console.warn(`Failed to delete ${t} action:`,n)}})};BBPlugin.register("pbr_preview",{version:F,title:"PBR Tools",author:"Jason J. Gardner",description:"Create and view PBR materials in Blockbench. Export USDZ scenes and textures for Java or RenderDragon shaders.",tags:["Minecraft: Java Edition","Minecraft: Bedrock Edition","PBR"],icon:"icon.png",variant:"both",await_loading:!0,repository:"https://github.com/jasonjgardner/blockbench-plugins",has_changelog:!0,min_version:"4.10.3",onload:e,onunload:a})})();})();
diff --git a/src/pbr_preview/.prettierignore b/src/pbr_preview/.prettierignore
new file mode 100644
index 00000000..737bc52b
--- /dev/null
+++ b/src/pbr_preview/.prettierignore
@@ -0,0 +1,3 @@
+node_modules/
+dist/
+package-lock.json
\ No newline at end of file
diff --git a/src/pbr_preview/.prettierrc b/src/pbr_preview/.prettierrc
new file mode 100644
index 00000000..e66b3328
--- /dev/null
+++ b/src/pbr_preview/.prettierrc
@@ -0,0 +1,12 @@
+{
+ "semi": true,
+ "trailingComma": "es5",
+ "singleQuote": false,
+ "printWidth": 80,
+ "tabWidth": 2,
+ "vueIndentScriptAndStyle": true,
+ "bracketSameLine": false,
+ "arrowParens": "always",
+ "endOfLine": "lf",
+ "quoteProps": "as-needed"
+}
\ No newline at end of file
diff --git a/src/pbr_preview/changelog.mjs b/src/pbr_preview/changelog.mjs
new file mode 100644
index 00000000..a2bacf35
--- /dev/null
+++ b/src/pbr_preview/changelog.mjs
@@ -0,0 +1,108 @@
+import readline from "node:readline/promises";
+import { writeFile, readFile } from "node:fs/promises";
+
+const rl = readline.createInterface({
+ input: process.stdin,
+ output: process.stdout,
+});
+
+const changelog = "./plugins/pbr_preview/changelog.json";
+
+function createChangelog(version, changes, author, title = null, date = null) {
+ const changelog = {
+ [version.toString()]: {
+ title: title ?? `Version ${version}`,
+ date: date || new Date().toISOString().split("T")[0],
+ author,
+ categories: [],
+ },
+ };
+
+ for (const change of changes) {
+ changelog[version].categories.push({
+ title: "",
+ list: [],
+ ...change,
+ });
+ }
+
+ return changelog;
+}
+
+async function amendChangelog(
+ version,
+ changes,
+ author,
+ title = null,
+ date = null,
+) {
+ const data = JSON.parse(await readFile(changelog, "utf-8"));
+ const newChangelog = createChangelog(version, changes, author, title, date);
+ const mergedChangelog = { ...data, ...newChangelog };
+
+ await writeFile(changelog, JSON.stringify(mergedChangelog, null, 4));
+}
+
+async function main() {
+ const version = await rl.question("Enter the version number: ");
+ const author = await rl.question("Enter the author: ");
+ const title = await rl.question(
+ "Enter the title (leave blank for default): ",
+ );
+
+ const changes = [];
+ let makingChanges = true;
+ let writingDescriptions = false;
+
+ while (makingChanges) {
+ const change = await rl.question(
+ "Enter a change title (leave blank to exit): ",
+ );
+
+ makingChanges = change.length > 0;
+
+ if (!makingChanges) {
+ break;
+ }
+
+ const descriptions = [];
+ writingDescriptions = true;
+
+ while (writingDescriptions) {
+ const description = await rl.question(
+ "Enter a description (leave blank to finish): ",
+ );
+
+ writingDescriptions = description.length > 0;
+
+ if (!writingDescriptions) {
+ break;
+ }
+
+ descriptions.push(description);
+ }
+
+ changes.push({
+ title: change,
+ list: descriptions,
+ });
+ }
+
+ await amendChangelog(
+ version,
+ changes,
+ author,
+ title ?? `Version ${version}`,
+ new Date().toISOString().split("T")[0],
+ );
+}
+
+main()
+ .then(() => {
+ console.log("Changelog updated!");
+ process.exit(0);
+ })
+ .catch((err) => {
+ console.error(err);
+ process.exit(1);
+ });
diff --git a/src/pbr_preview/package.json b/src/pbr_preview/package.json
new file mode 100644
index 00000000..ffcc0b20
--- /dev/null
+++ b/src/pbr_preview/package.json
@@ -0,0 +1,23 @@
+{
+ "name": "blockbench-pbr",
+ "version": "1.0.0",
+ "description": "PBR support for Blockbench",
+ "main": "./src/index.ts",
+ "scripts": {
+ "build": "esbuild src/index.ts --bundle --minify --outfile=../../plugins/pbr_preview/pbr_preview.js",
+ "build:watch": "esbuild src/index.ts --bundle --minify --outfile=../../plugins/pbr_preview/pbr_preview.js --watch",
+ "dev": "esbuild src/index.ts --bundle --sourcemap --outfile=../../plugins/pbr_preview/pbr_preview.js --watch"
+ },
+ "keywords": [
+ "blockbench"
+ ],
+ "author": "Jason Gardner",
+ "license": "MIT",
+ "devDependencies": {
+ "@types/three": "^0.157.0",
+ "blockbench-types": "4.9.0",
+ "esbuild": "0.19.4",
+ "prettier": "^3.2.5",
+ "typescript": "^5.2.2"
+ }
+}
\ No newline at end of file
diff --git a/src/pbr_preview/src/constants.ts b/src/pbr_preview/src/constants.ts
new file mode 100644
index 00000000..07a00a55
--- /dev/null
+++ b/src/pbr_preview/src/constants.ts
@@ -0,0 +1,80 @@
+import type { IChannel, IRegistry } from "./types";
+import { three as THREE } from "./deps";
+
+export const PLUGIN_VERSION = "1.2.0";
+export const BBMAT_VERSION = "1.0.0";
+export const NA_CHANNEL = "_NONE_";
+export const CHANNELS: Record-
+
-
+
+
++++{{ texture.name }}++ {{ texture.texture.name }} ++++{{ channels[texture.channel].label }}+ {{ channels[texture.channel].icon }} +
+
+
`,
+ },
+ expand_button: true,
+ growable: true,
+ onFold() {},
+ onResize() {},
+ default_side: "left",
+ default_position: {
+ slot: "left_bar",
+ float_position: [0, 0],
+ float_size: [400, 300],
+ height: 350,
+ folded: true,
+ },
+ insert_after: "layers",
+ insert_before: "color",
+ });
+
+ Blockbench.on(events.join(" ") as EventName, refresh);
+});
+
+teardowns.push(() => {
+ events.forEach((event) => {
+ Blockbench.removeListener(event, refresh);
+ });
+});
diff --git a/src/pbr_preview/src/lib/panels/index.ts b/src/pbr_preview/src/lib/panels/index.ts
new file mode 100644
index 00000000..d490932a
--- /dev/null
+++ b/src/pbr_preview/src/lib/panels/index.ts
@@ -0,0 +1,3 @@
+import "./materialBrush";
+import "./pbrSettings";
+import "./channels";
diff --git a/src/pbr_preview/src/lib/panels/materialBrush.ts b/src/pbr_preview/src/lib/panels/materialBrush.ts
new file mode 100644
index 00000000..11ec525a
--- /dev/null
+++ b/src/pbr_preview/src/lib/panels/materialBrush.ts
@@ -0,0 +1,42 @@
+import { registry, setups } from "../../constants";
+
+setups.push(() => {
+ registry.materialBrushPanel = new Panel("material_brush_panel", {
+ name: "Material Brush",
+ id: "material_brush_panel",
+ icon: "view_in_ar",
+ toolbars: [
+ new Toolbar("material_brush_toolbar", {
+ id: "material_brush_toolbar",
+ children: [
+ "material_brush",
+ "load_brush_preset",
+ "slider_brush_metalness",
+ "slider_brush_roughness",
+ "brush_emissive_color",
+ "slider_brush_height",
+ ],
+ name: "Material Settings",
+ }),
+ ],
+ condition: {
+ modes: ["paint"],
+ project: true,
+ },
+ component: {},
+ expand_button: true,
+ growable: false,
+ onFold() {},
+ onResize() {},
+ default_side: "right",
+ default_position: {
+ slot: "right_bar",
+ float_position: [0, 0],
+ float_size: [400, 300],
+ height: 300,
+ folded: false,
+ },
+ insert_after: "color",
+ insert_before: "outliner",
+ });
+});
diff --git a/src/pbr_preview/src/lib/panels/pbrSettings.ts b/src/pbr_preview/src/lib/panels/pbrSettings.ts
new file mode 100644
index 00000000..f5c34d24
--- /dev/null
+++ b/src/pbr_preview/src/lib/panels/pbrSettings.ts
@@ -0,0 +1,44 @@
+import { registry, setups } from "../../constants";
+
+// TODO: Teardown toolbars
+
+setups.push(() => {
+ registry.displaySettingsPanel = new Panel("display_settings", {
+ name: "PBR Controls",
+ id: "display_settings_panel",
+ icon: "display_settings",
+ toolbars: [
+ new Toolbar("controls_toolbar", {
+ id: "controls_toolbar",
+ children: [
+ "toggle_pbr",
+ "correct_lights",
+ "display_settings_tone_mapping",
+ "display_settings_exposure",
+ "display_settings_reset_exposure",
+ "show_channel_select_menu",
+ ],
+ name: "Display Settings",
+ }),
+ ],
+ display_condition: {
+ modes: ["edit", "paint", "animate"],
+ project: true,
+ },
+ component: {},
+ expand_button: true,
+ growable: false,
+ onFold() {},
+ onResize() {},
+ default_side: "left",
+ default_position: {
+ slot: "left_bar",
+ float_position: [0, 0],
+ float_size: [400, 300],
+ height: 300,
+ folded: false,
+ },
+ insert_after: "textures",
+ insert_before: "color",
+ });
+});
diff --git a/src/pbr_preview/src/lib/properties.ts b/src/pbr_preview/src/lib/properties.ts
new file mode 100644
index 00000000..f2008bf4
--- /dev/null
+++ b/src/pbr_preview/src/lib/properties.ts
@@ -0,0 +1,64 @@
+import { registry, CHANNELS, NA_CHANNEL, setups } from "../constants";
+
+const channelsEnum = [
+ ...Object.keys(CHANNELS).map((key) => CHANNELS[key].id),
+ NA_CHANNEL,
+];
+
+setups.push(() => {
+ registry.channelProp = new Property(TextureLayer, "enum", "channel", {
+ default: NA_CHANNEL,
+ values: channelsEnum,
+ label: "PBR Channel",
+ exposed: false,
+ });
+
+ registry.textureChannelProp = new Property(Texture, "enum", "channel", {
+ default: NA_CHANNEL,
+ values: channelsEnum,
+ label: "PBR Channel",
+ exposed: false,
+ });
+
+ // @ts-expect-error Boolean values not required
+ registry.materialTextureProp = new Property(Texture, "boolean", "material", {
+ default: false,
+ label: "Material Texture",
+ });
+
+ registry.pbrMaterialsProp = new Property(
+ ModelProject,
+ // @ts-expect-error "object" is a valid type for a property
+ "object",
+ "pbr_materials",
+ {
+ default: {},
+ exposed: false,
+ label: "PBR Materials",
+ }
+ );
+
+ registry.projectMaterialsProp = new Property(
+ ModelProject,
+ // @ts-expect-error "object" is a valid type for a property
+ "object",
+ "bb_materials",
+ {
+ default: {},
+ exposed: false,
+ label: "Project Materials",
+ }
+ );
+
+ registry.projectPbrModeProp = new Property(
+ ModelProject,
+ "boolean",
+ "pbr_active",
+ {
+ default: false,
+ exposed: false,
+ values: [],
+ label: "PBR Mode",
+ }
+ );
+});
diff --git a/src/pbr_preview/src/lib/tools/index.ts b/src/pbr_preview/src/lib/tools/index.ts
new file mode 100644
index 00000000..e4c04bf9
--- /dev/null
+++ b/src/pbr_preview/src/lib/tools/index.ts
@@ -0,0 +1 @@
+import "./materialBrush";
diff --git a/src/pbr_preview/src/lib/tools/materialBrush.ts b/src/pbr_preview/src/lib/tools/materialBrush.ts
new file mode 100644
index 00000000..8822e2ee
--- /dev/null
+++ b/src/pbr_preview/src/lib/tools/materialBrush.ts
@@ -0,0 +1,570 @@
+import type { IChannel } from "../../types";
+import { registry, CHANNELS, setups, teardowns } from "../../constants";
+import {
+ applyPbrMaterial,
+ debounceApplyPbrMaterial,
+} from "../applyPbrMaterial";
+import { MaterialBrush } from "../MaterialBrush";
+import { vue as Vue, three as THREE } from "../../deps";
+import { getSelectedTexture, generatePreviewImage } from "../util";
+
+const STORAGE_NAMESPACE = "materialBrushPresets";
+
+const getPresets = () => {
+ return JSON.parse(localStorage.getItem(STORAGE_NAMESPACE) || "{}");
+};
+
+const savePreset = (name?: string, id?: string) => {
+ const presets = getPresets();
+ const uuid = id ?? guid();
+ const results = registry.userMaterialBrushPresets?.getFormResult() ?? {};
+ const settings = {};
+
+ if (results.albedo) {
+ settings.albedo = results.albedo.toString();
+ }
+
+ if (results.metalness) {
+ settings.metalness = Number(results.metalness);
+ }
+
+ if (results.roughness) {
+ settings.roughness = Number(results.roughness);
+ }
+
+ if (results.emissive) {
+ settings.emissive = results.emissive.toString();
+ }
+
+ if (results.height) {
+ settings.height = Number(results.height);
+ }
+
+ presets[uuid] = [
+ settings,
+ name ?? "New Preset",
+ generatePreviewImage(settings),
+ ];
+
+ localStorage.setItem(STORAGE_NAMESPACE, JSON.stringify(presets));
+
+ return uuid;
+};
+
+const applyPreset = ({
+ metalness,
+ roughness,
+ emissive,
+ height,
+ albedo,
+}: {
+ metalness?: number;
+ roughness?: number;
+ emissive?: string;
+ height?: number;
+ albedo?: string;
+}) => {
+ if (metalness !== undefined) {
+ registry.brushMetalnessSlider?.setValue(metalness || 0, true);
+ }
+
+ if (roughness !== undefined) {
+ registry.brushRoughnessSlider?.setValue(roughness ?? 1, true);
+ }
+
+ if (emissive !== undefined) {
+ registry.brushEmissiveColor?.set(emissive ?? "#000000");
+ }
+
+ if (height !== undefined) {
+ registry.brushHeightSlider?.setValue(
+ Math.max(0, Math.min(1, height ?? 0.5)),
+ true
+ );
+ }
+
+ if (albedo !== undefined) {
+ // @ts-expect-error ColorPanel global is not typed
+ ColorPanel.set(albedo);
+ }
+};
+
+const materialBrushSliderCondition = ({ id }: IChannel) =>
+ Condition({
+ project: true,
+ tools: ["material_brush"],
+ method() {
+ const texture = getSelectedTexture();
+
+ return (
+ (texture?.layers_enabled &&
+ texture.layers.find(({ channel }) => channel && channel === id) !==
+ undefined) === true
+ );
+ },
+ });
+
+const userPresetsDialogComponent = Vue.extend({
+ name: "UserPresetsDialog",
+ data(): {
+ userPresets: Record-
+
-
+
+
++++{{ texture.name }}++ {{ texture.texture.name }} ++++{{ channels[texture.channel].label }}+ {{ channels[texture.channel].icon }} +
+
+
`,
+});
+
+setups.push(() => {
+ registry.materialBrushStyles = Blockbench.addCSS(/* css */ `
+ .preset_list {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, 96px);
+ grid-gap: 8px;
+ justify-content: start;
+ align-items: start;
+ margin: 0 auto;
+ padding: 8px;
+ }
+
+ .user_preset {
+ display: flex;
+ justify-content: start;
+ align-items: center;
+ width: 100%;
+ padding: 8px;
+ position: relative;
+ }
+
+ .preset_title {
+ font-size: 1em;
+ color: var(--color-text);
+ }
+
+ .user_preset:hover .preset_title {
+ color: var(--color-accent);
+ }
+
+ .preset_preview {
+ display: flex;
+ flex-direction: column;
+ flex-wrap: nowrap;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ }
+
+ .preset_buttons {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ font-size: 0.8em;
+ padding: 0 4px;
+ }
+
+ .preset_channel {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin: 0 8px;
+ font-size: 0.8em;
+ }
+
+ .delete_preset {
+ margin-left: 8px;
+ padding: 4px;
+ height: 24px;
+ width: 24px;
+ min-width: 24px;
+ background-color: transparent;
+ color: var(--color-text);
+ border: none;
+ border-radius: 100%;
+ position: absolute;
+ right: -8px;
+ top: 0;
+ filter: drop-shadow(0 0 2px var(--color-shadow));
+ }
+
+ .delete_preset:hover {
+ background: transparent;
+ color: var(--color-accent);
+ }
+
+ .delete_preset .material-icons {
+ font-size: 0.825em;
+ }
+
+ .delete_preset:hover .material-icons {
+ color: var(--color-accent);
+ }`);
+
+ registry.brushMetalnessSlider = new NumSlider("slider_brush_metalness", {
+ category: "paint",
+ name: "Metalness",
+ description: "Adjust the metalness of the brush",
+ tool_setting: "brush_metalness",
+ settings: {
+ min: 0,
+ max: 1,
+ step: 0.01,
+ default: 0,
+ },
+ condition: () => materialBrushSliderCondition(CHANNELS.metalness),
+ });
+
+ registry.brushRoughnessSlider = new NumSlider("slider_brush_roughness", {
+ category: "paint",
+ name: "Roughness",
+ description: "Adjust the roughness of the brush",
+ tool_setting: "brush_roughness",
+ settings: {
+ min: 0,
+ max: 1,
+ step: 0.01,
+ default: 1,
+ },
+ condition: () => materialBrushSliderCondition(CHANNELS.roughness),
+ });
+
+ registry.brushEmissiveColor = new ColorPicker("brush_emissive_color", {
+ category: "paint",
+ name: "Emissive",
+ description: "Adjust the emissive color of the brush",
+ value: "#000000",
+ tool_setting: "brush_emissive",
+ condition: () => materialBrushSliderCondition(CHANNELS.emissive),
+ });
+
+ registry.brushHeightSlider = new NumSlider("slider_brush_height", {
+ category: "paint",
+ name: "Height",
+ description: "Adjust the height of the brush",
+ tool_setting: "brush_height",
+ settings: {
+ min: 0,
+ max: 1,
+ step: 0.01,
+ default: 0.5,
+ },
+ condition: () => materialBrushSliderCondition(CHANNELS.height),
+ });
+
+ registry.materialBrushTool = new Tool("material_brush", {
+ name: "Material Brush",
+ description: "Paints across multiple texture layers",
+ icon: "view_in_ar",
+ paintTool: true,
+ cursor: "cell",
+ category: "tools",
+ toolbar: "brush",
+ condition: {
+ project: true,
+ selected: {
+ texture: true,
+ },
+ modes: ["paint"],
+ method() {
+ return getSelectedTexture()?.layers_enabled ?? false;
+ },
+ },
+ allowed_view_modes: "textured",
+ tool_settings: {
+ brush_metalness: 0,
+ brush_roughness: 1,
+ brush_emissive: "#000000",
+ brush_height: 0.5,
+ },
+ brush: {
+ blend_modes: false,
+ shapes: true,
+ size: true,
+ softness: true,
+ opacity: true,
+ offset_even_radius: true,
+ floor_coordinates: true,
+ changePixel(
+ pxX, // Pixel that is changing
+ pxY,
+ px,
+ alpha,
+ { size, softness, texture, x, y }
+ ) {
+ const mat = MaterialBrush.fromSettings();
+
+ const matChannels = Object.keys(mat.colors);
+
+ const brushSize = Math.floor(size - (softness * size) / 100);
+
+ let rgba = px;
+
+ texture.layers.forEach((layer) => {
+ // @ts-expect-error Channel property is an extension of TextureLayer
+ if (!layer.visible || !matChannels.includes(layer.channel)) {
+ return;
+ }
+
+ // @ts-expect-error Channel property is an extension of TextureLayer
+ const fill = mat.getChannel(layer.channel);
+
+ if (!fill) {
+ return;
+ }
+
+ const distance = Math.sqrt((x - pxX) ** 2 + (y - pxY) ** 2);
+ const fallOff = Math.min(1, distance / brushSize);
+
+ // Transition colors at soft edges
+ if (x % brushSize <= fallOff && y % brushSize <= fallOff) {
+ const currentPixel = layer.ctx.getImageData(pxX, pxY, 1, 1).data;
+ const currentFill = new THREE.Color(
+ `rgb(${currentPixel[0]}, ${currentPixel[1]}, ${currentPixel[2]})`
+ );
+
+ // Set the fill color to the lerp between the current pixel and the new color
+ fill.lerp(currentFill, 1);
+ }
+
+ layer.ctx.fillStyle = fill.getStyle();
+ layer.ctx.fillRect(pxX, pxY, 1, 1);
+
+ if (layer.selected) {
+ rgba = {
+ r: fill.r * 255,
+ g: fill.g * 255,
+ b: fill.b * 255,
+ a: alpha * 255,
+ };
+ }
+ });
+
+ return rgba;
+ },
+ onStrokeStart({ texture }) {
+ Undo.initEdit({
+ layers: texture.layers,
+ });
+
+ return true;
+ },
+ onStrokeEnd({ texture }) {
+ Undo.finishEdit("Material Brush Stroke");
+
+ return true;
+ },
+ },
+ onCanvasClick(data: any) {
+ Painter.startPaintToolCanvas(data, data.event);
+ },
+ onSelect() {
+ Painter.updateNslideValues();
+ applyPbrMaterial();
+ },
+ click() {
+ debounceApplyPbrMaterial();
+ },
+ });
+
+ registry.loadBrushPreset = new Action("load_brush_preset", {
+ icon: "stroke_full",
+ name: "Material Brush Presets",
+ description: "Load or save a brush preset",
+ category: "paint",
+ condition: {
+ project: true,
+ },
+ click() {
+ registry.userMaterialBrushPresets = new Dialog("user_brush_presets", {
+ id: "user_brush_presets",
+ title: "Edit Material Brush",
+ component: userPresetsDialogComponent,
+ part_order: ["lines", "component", "form"],
+ form: {
+ albedo: {
+ type: "color",
+ label: "Albedo",
+ value: ColorPanel.get(),
+ toggle_enabled: true,
+ },
+ metalness: {
+ type: "number",
+ label: "Metalness",
+ min: 0,
+ max: 1,
+ step: 0.01,
+ full_width: false,
+ toggle_enabled: true,
+ },
+ roughness: {
+ type: "number",
+ label: "Roughness",
+ min: 0,
+ max: 1,
+ step: 0.01,
+ toggle_enabled: true,
+ full_width: false,
+ },
+ emissive: {
+ type: "color",
+ label: "Emissive",
+ value: "#000000",
+ toggle_enabled: true,
+ },
+ height: {
+ type: "number",
+ label: "Height",
+ min: 0,
+ max: 1,
+ step: 0.01,
+ toggle_enabled: true,
+ },
+ },
+ onConfirm(formResult) {
+ applyPreset({
+ metalness: Number(
+ formResult.metalness ?? registry.brushMetalnessSlider?.get()
+ ),
+ roughness: Number(
+ formResult.roughness ?? registry.brushRoughnessSlider?.get()
+ ),
+ emissive: (
+ formResult.emissive ?? registry.brushEmissiveColor?.get()
+ ).toString(),
+ height: Number(
+ formResult.height ?? registry.brushHeightSlider?.get()
+ ),
+ albedo: (formResult.albedo ?? ColorPanel.get()).toString(),
+ });
+ },
+ buttons: ["Close", "Save", "Apply"],
+ cancelIndex: 0,
+ confirmIndex: 2,
+ onButton(idx, event) {
+ registry.materialBrushTool?.select();
+
+ if (idx !== 1) {
+ return;
+ }
+
+ Blockbench.textPrompt("Save Preset", "New Preset", (name) => {
+ if (name) {
+ savePreset(name);
+ Blockbench.showQuickMessage(`Preset "${name}" saved`, 2000);
+ }
+ });
+ },
+ }).show();
+ },
+ });
+
+ MenuBar.addAction(registry.materialBrushTool, "tools.0");
+});
+teardowns.push(() => {
+ MenuBar.removeAction("tools.material_brush");
+});
diff --git a/src/pbr_preview/src/lib/util.ts b/src/pbr_preview/src/lib/util.ts
new file mode 100644
index 00000000..f2dc9794
--- /dev/null
+++ b/src/pbr_preview/src/lib/util.ts
@@ -0,0 +1,194 @@
+import { three as THREE } from "../deps";
+
+/**
+ * Attempts to find the selected texture/layer using various methods
+ * @returns Texture | null
+ */
+export function getSelectedTexture(): Texture | null {
+ if (Texture.selected) {
+ return Texture.selected;
+ }
+
+ if (TextureLayer.selected) {
+ return TextureLayer.selected.texture;
+ }
+
+ if (!Project) {
+ return Texture.all.find((t) => t.selected) ?? Texture.getDefault();
+ }
+
+ if (Project.selected_texture) {
+ return Project.selected_texture;
+ }
+
+ return Project.textures.find((t) => t.selected) ?? null; // Texture.getDefault();
+}
+
+/**
+ * Attempts to find the currently selected layer
+ * @returns TextureLayer | null
+ */
+export function getSelectedLayer(): TextureLayer | null {
+ if (TextureLayer.selected) {
+ return TextureLayer.selected;
+ }
+
+ if (Texture.selected?.selected_layer) {
+ return Texture.selected.selected_layer;
+ }
+
+ if (
+ Project.selected_texture !== null &&
+ Project.selected_texture?.layers_enabled === true
+ ) {
+ return (
+ Project.selected_texture.layers.find((l: TextureLayer) => l.selected) ??
+ Project.selected_texture.layers[0]
+ );
+ }
+
+ return getSelectedTexture()?.getActiveLayer() ?? null;
+}
+
+export function getOutputBaseName() {
+ if (!Project) {
+ return pathToName(getSelectedTexture()?.name ?? "texture");
+ }
+
+ return Project.model_identifier.length > 0
+ ? Project.model_identifier
+ : Project.getDisplayName();
+}
+
+export function getMaterialsFromProject() {
+ const materials: Record-
+
-
+ ++
+
{{ name }}+++ +{{ name }}+
+