---- last push for base color WITHOUT tint

4ian · Feb 5, 2025 · 9e00efb · 9e00efb
1 parent 1a2193d
commit 9e00efb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Extensions/3D/JsExtension.js b/Extensions/3D/JsExtension.js
@@ -2421,11 +2421,12 @@ module.exports = {
         this._updateTextureUvMapping();
       }
 
-      updateColor(object) {
+      _updateColor() {
         const colors = [];
-
         const normalizedColor = objectsRenderingService
-          .hexNumberToRGBArray(this._cube3DRuntimeObject._color)
+          .hexNumberToRGBArray(
+            objectsRenderingService.rgbOrHexToHexNumber(this._color)
+          )
           .map((component) => component / 255);
 
         for (
@@ -2482,7 +2483,7 @@ module.exports = {
           this._shouldUseTransparentTexture = shouldUseTransparentTexture;
           materialsDirty = true;
         }
-        const color = object.content.color;
+        const color = object.content.color || '128;128;128';
         if (this._color !== color) {
           this._color = color;
           colorDirty = true;
@@ -2579,7 +2580,7 @@ module.exports = {
 
         if (materialsDirty) this._updateThreeObjectMaterials();
         if (uvMappingDirty) this._updateTextureUvMapping();
-        if (colorDirty) this.updateColor(object);
+        if (colorDirty) this._updateColor();
       }
 
       /**

diff --git a/Extensions/JsExtensionTypes.d.ts b/Extensions/JsExtensionTypes.d.ts
@@ -189,7 +189,7 @@ declare type ObjectsRenderingService = {
     objectConfiguration: gd.ObjectConfiguration
   ) => string;
   rgbOrHexToHexNumber: (value: string) => number;
-  hexNumberToRGBArray: (value: string) => [number, number, number];
+  hexNumberToRGBArray: (value: number) => [number, number, number];
   registerClearCache: (clearCache: (_: any) => void) => void;
 };