fixed format for color propertie

4ian · Jan 29, 2025 · e69d659 · e69d659
1 parent 0c3b510
commit e69d659
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Extensions/3D/Cube3DRuntimeObject.ts b/Extensions/3D/Cube3DRuntimeObject.ts
@@ -24,7 +24,7 @@ namespace gdjs {
       rightFaceVisible: boolean;
       topFaceVisible: boolean;
       bottomFaceVisible: boolean;
-      color: THREE.Color;
+      color: string;
       materialType: 'Basic' | 'StandardWithoutMetalness';
     };
   }
@@ -71,7 +71,7 @@ namespace gdjs {
     ];
     _materialType: gdjs.Cube3DRuntimeObject.MaterialType =
       gdjs.Cube3DRuntimeObject.MaterialType.Basic;
-    _color: THREE.Color;
+    _color: [float, float, float];
     constructor(
       instanceContainer: gdjs.RuntimeInstanceContainer,
       objectData: Cube3DObjectData
@@ -118,7 +118,9 @@ namespace gdjs {
         objectData.content.bottomFaceResourceName,
       ];
 
-      this._color = objectData.content.color || new THREE.Color(0.5, 0.5, 0.5);
+      this._color = objectData.content.color
+        ? rgbOrHexToRGBColor(objectData.content.color)
+        : [0.5, 0.5, 0.5];
 
       this._materialType = this._convertMaterialType(
         objectData.content.materialType
@@ -209,9 +211,9 @@ namespace gdjs {
       this._faceResourceNames[faceIndex] = resourceName;
       this._renderer.updateFace(faceIndex);
     }
-    setCubeColor(color: THREE.Color): void {
-      if (color === this._color) return;
-      this._color = color;
+    setCubeColor(color: string): void {
+      if (rgbOrHexToRGBColor(color) === this._color) return;
+      this._color = rgbOrHexToRGBColor(color);
     }
 
     /** @internal */

diff --git a/Extensions/3D/Cube3DRuntimeObjectPixiRenderer.ts b/Extensions/3D/Cube3DRuntimeObjectPixiRenderer.ts
@@ -99,9 +99,9 @@ namespace gdjs {
       let colors: number[] = [];
       for (let i = 0; i < geometry.attributes.position.count; i++) {
         colors.push(
-          runtimeObject._color.r,
-          runtimeObject._color.g,
-          runtimeObject._color.b
+          runtimeObject._color[0],
+          runtimeObject._color[1],
+          runtimeObject._color[2]
         );
       }