refactor(common/Color): extract hardcoded colors as static members

arx-tools · Aug 26, 2023 · 978648b · 978648b
1 parent e2e726d
commit 978648b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/common/Color.ts b/src/common/Color.ts
@@ -55,4 +55,12 @@ export class Color {
       return BinaryIO.sizeOfUint8Array(4)
     }
   }
+
+  static get black(): ArxColor {
+    return { r: 0, g: 0, b: 0, a: 1 }
+  }
+
+  static get transparent(): ArxColor {
+    return { r: 0, g: 0, b: 0, a: 0 }
+  }
 }
diff --git a/src/dlf/ZoneAndPathHeader.ts b/src/dlf/ZoneAndPathHeader.ts
@@ -119,9 +119,7 @@ export class ZoneAndPathHeader {
     binary.writeInt32(zoneOrPath.points.length)
     binary.writeBuffer(
       Color.accumulateFrom(
-        'backgroundColor' in zoneOrPath
-          ? zoneOrPath?.backgroundColor ?? { r: 0, g: 0, b: 0, a: 1 }
-          : { r: 0, g: 0, b: 0, a: 1 },
+        'backgroundColor' in zoneOrPath ? zoneOrPath?.backgroundColor ?? Color.black : Color.black,
         'rgb',
       ),
     )

diff --git a/src/fts/TextureVertex.ts b/src/fts/TextureVertex.ts
@@ -4,8 +4,8 @@ import { ArxColor, Color } from '@common/Color'
 import { ArxVector3 } from '@common/types'
 
 const HARDCODED_DATA_TYPE1 = {
-  color: { r: 0, g: 0, b: 0, a: 0 } as ArxColor,
-  specular: { r: 0, g: 0, b: 0, a: 0 } as ArxColor,
+  color: Color.transparent as ArxColor,
+  specular: Color.transparent as ArxColor,
   tu: 0,
   tv: 0,
 }