update Color

cocos · Oct 15, 2024 · fd73f66 · fd73f66
1 parent 872df78
commit fd73f66
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/cocos/gfx/base/define.ts b/cocos/gfx/base/define.ts
@@ -987,21 +987,21 @@ export class Color {
         public w: number = 0,
     ) {}
 
-    public set (x: number, y: number, z: number, w: number): Color {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.w = w;
-        return this;
-    }
-
     public copy (info: Readonly<Color>): Color {
         this.x = info.x;
         this.y = info.y;
         this.z = info.z;
         this.w = info.w;
         return this;
     }
+
+    public set (x: number, y: number, z: number, w: number): Color {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.w = w;
+        return this;
+    }
 }
 
 export class MarkerInfo {

diff --git a/native/tools/gfx-define-generator/generate.js b/native/tools/gfx-define-generator/generate.js
@@ -289,17 +289,6 @@ for (const name of Object.keys(structMap)) {
 
     output += `    ) {}\n`;
 
-    if (name === 'Color') {
-        output += `\n`;
-        output += `    public set (x: number, y: number, z: number, w: number): Color {\n`;
-        output += `        this.x = x;\n`;
-        output += `        this.y = y;\n`;
-        output += `        this.z = z;\n`;
-        output += `        this.w = w;\n`;
-        output += `        return this;\n`;
-        output += `    }\n`;
-    }
-
     if (!Object.keys(struct.member).some((k) => struct.member[k].readonly)) {
         output += `\n    public copy (info: Readonly<${name}>): ${name} {\n`;
         for (const key in struct.member) {
@@ -320,6 +309,17 @@ for (const name of Object.keys(structMap)) {
         output += `    }\n`;
     }
 
+    if (name === 'Color') {
+        output += `\n`;
+        output += `    public set (x: number, y: number, z: number, w: number): Color {\n`;
+        output += `        this.x = x;\n`;
+        output += `        this.y = y;\n`;
+        output += `        this.z = z;\n`;
+        output += `        this.w = w;\n`;
+        output += `        return this;\n`;
+        output += `    }\n`;
+    }
+
     output += `}\n\n`;
 }