!2786 功能:吊顶材质对接渲染器

src/Add-on/ExportData.tsx

@@ -935,13 +935,19 @@ export function ConverBulkheadCeiling2Data(ent: BulkheadCeiling)
     ed.OCS = ent.OCSNoClone.toArray();
     ed.MaterialId = ent.Material?.Object?.Id?.Index || 71;
 
-    let materials: number[] = [ed.MaterialId];//所有的材质
-    for (let cd of ent.ContourData)
+    let materials: number[] = [];//所有的材质
+
+    if (ent.FaceGeometry.index)
+        materials.push(ed.MaterialId);
+
+    for (let geom of ent.MeshGeometry)
     {
-        for (let i = 0; i < cd.Materials.length; i++)
+        let index = ent._GemoIdMap.get(geom.id);
+        let data = ent.ContourData[index];
+        for (let i = 0; i < data.Materials.length; i++)
         {
-            let mtl = cd.OverWriteMaterial?.get(i) ?? cd.Materials[i];
-            materials.push(mtl?.Index ?? 71);
+            let id = data.OverWriteMaterial?.get(i)?.Index ?? data.Materials[i]?.Index ?? ed.MaterialId;
+            materials.push(id);
         }
     }
     ed.Materials = materials;

src/DatabaseServices/Room/Entity/Ceiling/BulkheadCeiling.ts

@@ -51,7 +51,7 @@ export class BulkheadCeiling extends RoomBase
 {
     constructor() { super(); }
     private _ContourData: BulkheadCeiling_ContourData[] = [];
-    private _GemoIdMap = new Map<number, number>();
+    _GemoIdMap = new Map<number, number>();
 
     get ContourData(): BulkheadCeiling_ContourData[]
     {

src/Geometry/BufferGeometryUtils.ts

@@ -134,7 +134,7 @@ export namespace BufferGeometryUtils
                         mergedGeometry.addGroup(offset + g.start, g.count, materialOffset + g.materialIndex);
                     }
 
-                    materialOffset += maxMaterialIndex;
+                    materialOffset += (maxMaterialIndex + 1);
                 }
                 offset += count;
             }