v0.5.2

The bug of missing texture mapping for 3D nodes has been fixed.

nodes/ImageNode.py

@@ -1060,16 +1060,22 @@ class Image3D:
 
     def run(self,upload,material=None):
         # print('material',material)
-        # print(upload['image'])
+        # print(upload )
         image = base64_to_image(upload['image'])
-        mat=base64_to_image(upload['material'])
+
+        mat=None
+        if 'material' in upload and upload['material']:
+            mat=base64_to_image(upload['material'])
+            mat=mat.convert('RGB')
+            mat=pil2tensor(mat)
+
         mask = image.split()[3]
         image=image.convert('RGB')
-        mat=mat.convert('RGB')
+        
         mask=mask.convert('L')
 
         bg_image=None
-        if 'bg_image' in upload:
+        if 'bg_image' in upload and upload['bg_image']:
             bg_image = base64_to_image(upload['bg_image'])
             bg_image=bg_image.convert('RGB')
             bg_image=pil2tensor(bg_image)
@@ -1077,8 +1083,7 @@ class Image3D:
 
         mask=pil2tensor(mask)
         image=pil2tensor(image)
-        mat=pil2tensor(mat)
-
+        
         m=[]
         if not material is None:
             m=create_temp_file(material[0])

web/javascript/3d_mixlab.js

@@ -187,20 +187,22 @@ app.registerExtension({
           },
           async serializeValue (nodeId, widgetIndex) {
             let d = getLocalData('_mixlab_3d_image')
-            console.log('serializeValue', node)
+            // console.log('serializeValue', node)
             if (d && d[node.id]) {
               let { url, bg, material } = d[node.id]
-              let base64 = await parseImage(url)
-              let bg_base64 = await parseImage(bg)
-              let material_base64 = await parseImage(material)
+              let data = {}
+              if (url) {
+                data.image = await parseImage(url)
+              }
+              if (bg) {
+                data.bg_image = await parseImage(bg)
+              }
 
-              return JSON.parse(
-                JSON.stringify({
-                  image: base64,
-                  bg_image: bg_base64,
-                  material: material_base64
-                })
-              )
+              if (material) {
+                data.material = await parseImage(material)
+              }
+
+              return JSON.parse(JSON.stringify(data))
             } else {
               return {}
             }
@@ -281,6 +283,8 @@ app.registerExtension({
                   <div>Material: <select class="material"></select></div>
                   <div>Material: <div class="material_img"> </div></div>
                   <div><button class="bg">BG</button></div>
+                  <div><button class="export">Export GLB</button></div>
+                  
                 </div></model-viewer>`
 
               preview.innerHTML = html
@@ -294,6 +298,7 @@ app.registerExtension({
               const selectMaterial = preview.querySelector('.material')
               const material_img = preview.querySelector('.material_img')
               const bg = preview.querySelector('.bg')
+              const exportGLB = preview.querySelector('.export')
 
               if (modelViewerVariants) {
                 modelViewerVariants.style.width = `${that.size[0] - 24}px`
@@ -341,21 +346,26 @@ app.registerExtension({
                 let url = await uploadImage(blob, '.png')
                 // console.log(url)
 
-                //  材质贴图
-                let thumbUrl = material_img.getAttribute('src')
-                let tb = await base64ToBlobFromURL(thumbUrl)
-                let tUrl = await uploadImage(tb, '.png')
-
-                // console.log(tUrl)
-
                 let bg_blob = await base64ToBlobFromURL(
                   'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mN88uXrPQAFwwK/6xJ6CQAAAABJRU5ErkJggg=='
                 )
                 let url_bg = await uploadImage(bg_blob, '.png')
+                // console.log('url_bg',url_bg)
 
-                if (!dd[that.id])
-                  dd[that.id] = { url, bg: url_bg, material: tUrl }
-                dd[that.id] = { ...dd[that.id], url, material: tUrl }
+                if (!dd[that.id]) {
+                  dd[that.id] = { url, bg: url_bg }
+                } else {
+                  dd[that.id] = { ...dd[that.id], url }
+                }
+
+                //  材质贴图
+                let thumbUrl = material_img.getAttribute('src')
+                if (thumbUrl) {
+                  let tb = await base64ToBlobFromURL(thumbUrl)
+                  let tUrl = await uploadImage(tb, '.png')
+                  // console.log('材质贴图', tUrl, thumbUrl)
+                  dd[that.id].material = tUrl
+                }
 
                 setLocalDataOfWin(key, dd)
               }
@@ -367,11 +377,11 @@ app.registerExtension({
 
               modelViewerVariants.addEventListener('camera-change', startTimer)
 
-              select.addEventListener('input', event => {
+              select.addEventListener('input', async event => {
                 modelViewerVariants.variantName =
                   event.target.value === 'default' ? null : event.target.value
                 // 材质
-                extractMaterial(
+                await extractMaterial(
                   modelViewerVariants,
                   selectMaterial,
                   material_img
@@ -456,6 +466,15 @@ app.registerExtension({
                 input.click()
               })
 
+              exportGLB.addEventListener('click', async () => {
+                const glTF = await modelViewerVariants.exportScene()
+                const file = new File([glTF], 'export.glb')
+                const link = document.createElement('a')
+                link.download = file.name
+                link.href = URL.createObjectURL(file)
+                link.click()
+              })
+
               uploadWidget.value = await uploadWidget.serializeValue()
 
               // 更新尺寸

web/javascript/checkVersion_mixlab.js

@@ -3,7 +3,7 @@ import { app } from '../../../scripts/app.js'
 const repoOwner = 'shadowcz007' // 替换为仓库的所有者
 const repoName = 'comfyui-mixlab-nodes' // 替换为仓库的名称
 
-const version = 'v0.5.1'
+const version = 'v0.5.2'
 
 fetch(`https://api.github.com/repos/${repoOwner}/${repoName}/releases/latest`)
   .then(response => response.json())