add layer metadata for assigning textures

brianzinn · Nov 11, 2021 · f15223f · f15223f
1 parent bec3980
commit f15223f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/CreatedInstance.ts b/src/CreatedInstance.ts
@@ -27,6 +27,7 @@ export interface InstanceMetadataParameter {
   isShadowGenerator?: boolean
   isUtilityLayerRenderer?: boolean
   isGizmo?: boolean
+  isLayer?: boolean
 }
 
 export interface CreatedInstanceMetadata extends InstanceMetadataParameter {

diff --git a/src/customHosts/TexturesLifecycleListener.ts b/src/customHosts/TexturesLifecycleListener.ts
@@ -12,10 +12,13 @@ export default class TexturesLifecycleListener extends BaseLifecycleListener<Tex
     let tmp: CreatedInstance<any> | null = instance.parent;
 
     while (tmp !== null) {
-      if (tmp.metadata && (tmp.metadata.isMaterial === true || tmp.metadata.className === 'Model')) {
+      if (tmp.metadata && (tmp.metadata.isMaterial === true || tmp.metadata.className === 'Model' || tmp.metadata.isLayer === true)) {
         if (assignTo) {
           assignProperty(texture, tmp.hostInstance, assignTo);
         } else {
+          if (tmp.metadata.isLayer === true) {
+            continue;
+          }
           // maybe below case is more common, so let it default
           tmp.hostInstance.diffuseTexture = texture;
         }

diff --git a/src/generatedCode.ts b/src/generatedCode.ts
@@ -16998,6 +16998,7 @@ export class FiberLayer implements HasPropsHandlers<FiberLayerProps> {
           ]
         };
     public static readonly Metadata: CreatedInstanceMetadata = {
+          "isLayer": true,
           "className": "FiberLayer"
         };
 }

diff --git a/tools/generate-code.ts b/tools/generate-code.ts
@@ -1702,7 +1702,7 @@ const generateCode = async () => {
   createSingleClass("CascadedShadowGenerator", generatedCodeSourceFile, generatedPropsSourceFile, undefined, { delayCreation: true, isShadowGenerator: true }, () => { return; }, 'ShadowGeneratorCustomProps');
   createSingleClass("EngineView", generatedCodeSourceFile, generatedPropsSourceFile, undefined, { delayCreation: true }, () => { return; });
   createSingleClass("GizmoManager", generatedCodeSourceFile, generatedPropsSourceFile);
-  createSingleClass("Layer", generatedCodeSourceFile, generatedPropsSourceFile);
+  createSingleClass("Layer", generatedCodeSourceFile, generatedPropsSourceFile, undefined, { isLayer: true });
 
   console.log('Adding read-only property classes:');
   readonlyPropertiesToGenerate.forEach((value: ClassNameSpaceTuple, className: string) => {
-Original file line number
+Diff line change
@@ Expand Up @@
               ]
             };
         public static readonly Metadata: CreatedInstanceMetadata = {
+              "isLayer": true,
               "className": "FiberLayer"
             };
     }
@@ Expand Down @@