Merge pull request #10 from swgpu/car_sample

Car sample

Author: jay19240

bin/WARME-Blender-Exporter.zip

@@ -5,6 +5,16 @@ import { Gfx3Transformable } from './gfx3_transformable';
 import { Gfx3BoundingBox } from './gfx3_bounding_box';
 import { Quaternion } from '../core/quaternion';
 
+enum MeshEffect {
+  NONE = 0,
+  PIXELATION = 2,
+  COLOR_LIMITATION = 4,
+  DITHER = 8,
+  OUTLINE = 16,
+  SHADOW_VOLUME = 32,
+  CHANNEL1 = 64
+};
+
 /**
  * A 3D drawable object.
  */
@@ -21,7 +31,7 @@ class Gfx3Drawable extends Gfx3Transformable implements Poolable<Gfx3Drawable> {
    */
   constructor(vertexStride: number) {
     super();
-    this.id = [0, 0, 0, 0];
+    this.id = [0, 0, 0, 1];
     this.vertexSubBuffer = gfx3Manager.createVertexBuffer(0);
     this.vertices = [];
     this.vertexCount = 0;
@@ -126,33 +136,34 @@ class Gfx3Drawable extends Gfx3Transformable implements Poolable<Gfx3Drawable> {
 
   /**
    * Set an identifier based on three components.
-   * Note: WARME use some specials ID's in its internal pipeline, check the table below:
-   * ■ decals group: g = n
-   * ■ lights group: b = n
-   * ■ pixelation: a = 1
-   * ■ color limitation: a = 2
-   * ■ dither: a = 4
-   * ■ outline: a = 8
-   * ■ shadow volume: a = 16
-   * ■ channel 1: a = 32 (channel 1 is a rendering texture used by post process unit for many different things, it is invisible by default)
+   * Note: SWGPU use some specials ID's in its internal pipeline, check the table below:
+   * ■ R: The red channel.
+   * ■ G: The green channel.
+   * ■ A: The alpha channel [0, 1]
+   * ■ B: The blue channel for effects
+   *  ■ pixelation: 2
+   *  ■ color limitation: 4
+   *  ■ dither: 8
+   *  ■ outline: 16
+   *  ■ shadow volume: 32
+   *  ■ channel1: 64
    * 
-   * @param {number} r - The pur identifier you can use for custom stuff.
-   * @param {number} g - The decals group.
-   * @param {number} b - The lights group.
-   * @param {number} a - The flags value for specials effects.
+   * @param {number} r - The red channel.
+   * @param {number} g - The green channel.
+   * @param {MeshEffect|number} b - The blue channel for effects.
+   * @param {number} a - The alpha channel.
    */
-  setId(r: number, g: number = 0, b: number = 0, a: number = 0): void {
+  setId(r: number, g: number = 0, b: MeshEffect = 0, a: number = 1): void {
     this.id = [r, g, b, a];
   }
 
   /**
-   * Set a single identifier component.
+   * Set the effects.
    * 
-   * @param {number} index - The component index.
-   * @param {number} value - The identifier value.
+   * @param {MeshEffecta|number} effects - The effects.
    */
-  setSingleId(index: number, value: number): void {
-    this.id[index] = value;
+  setEffects(effects: number): void {
+    this.id[2] = effects;
   }
 
   /**
@@ -218,4 +229,4 @@ class Gfx3Drawable extends Gfx3Transformable implements Poolable<Gfx3Drawable> {
   }
 }
 
-export { Gfx3Drawable };
+export { Gfx3Drawable, MeshEffect };

public/templates/prerendered/scene1/scene1.blend

@@ -18,7 +18,7 @@ class Gfx3MeshLight extends Gfx3Transformable {
   linear: number;
   exp: number;
   radius: number;
-  meshId: number;
+  group: number;
   /* spot */
   cutoff: number;
   direction: vec3;
@@ -33,7 +33,7 @@ class Gfx3MeshLight extends Gfx3Transformable {
     this.linear = 0;
     this.exp = 0;
     this.radius = 10;
-    this.meshId = 0;
+    this.group = 0;
     this.cutoff = 12.5;
     this.direction = [0, -1, 0];
   }
@@ -60,7 +60,7 @@ class Gfx3MeshLight extends Gfx3Transformable {
     this.linear = json['Linear'];
     this.exp = json['Exp'];
     this.radius = json['Radius'];
-    this.meshId = json['MeshID'];
+    this.group = json['Group'];
     this.cutoff = json['Cutoff'];
     this.direction = json['Direction'];
   }
@@ -75,7 +75,7 @@ class Gfx3MeshLight extends Gfx3Transformable {
         this.diffuse,
         this.specular,
         this.intensity,
-        this.meshId,
+        this.group,
         this.constant,
         this.linear,
         this.exp
@@ -89,7 +89,7 @@ class Gfx3MeshLight extends Gfx3Transformable {
         this.diffuse,
         this.specular,
         this.intensity,
-        this.meshId,
+        this.group,
         this.constant,
         this.linear,
         this.exp
@@ -180,13 +180,13 @@ class Gfx3MeshLight extends Gfx3Transformable {
   }
 
   /**
-   * Set mesh id targeted.
-   * Note: 0 affect all mesh
+   * Set group light identifier.
+   * Note: 0 is the default group and will affect all mesh
    * 
-   * @param {number} meshId - The mesh id.
+   * @param {number} group - The group id.
    */
-  setMeshId(meshId: number): void {
-    this.meshId = meshId;
+  setGroup(group: number): void {
+    this.group = group;
   }
 
   /**
@@ -268,11 +268,10 @@ class Gfx3MeshLight extends Gfx3Transformable {
   }
 
   /**
-   * Returns the mesh id affected by the light.
-   * Note: 0 affect all mesh
+   * Returns the group id.
    */
-  getMeshId(): number {
-    return this.meshId;
+  getGroup(): number {
+    return this.group;
   }
 
   /**

public/templates/prerendered/scene1/scene1.blend1

@@ -27,6 +27,7 @@ interface MATOptions {
   id?: number;
   normalIntensity?: number;
   lightning?: boolean;
+  lightGroup?: number;
   ambient?: vec3;
   diffuse?: vec3;
   specular?: vec3;
@@ -37,6 +38,7 @@ interface MATOptions {
   textureScrollAngle?: number;
   textureScrollRate?: number;
   textureScale?: vec2,
+  textureBlendMode?: 'mul' | 'add';
   secondaryTexture?: Gfx3Texture;
   secondaryTextureScrollAngle?: number;
   secondaryTextureScrollRate?: number;
@@ -71,7 +73,8 @@ interface MATOptions {
   sParams?: Array<{name: string, value: number }>;
   s0Texture?: Gfx3Texture;
   s1Texture?: Gfx3Texture;
-  colorBlendMode?: 'mul' | 'add';
+  decalGroup?: number;
+  effects?: number;
 };
 
 interface Animation {
@@ -150,7 +153,7 @@ class Gfx3Material {
     this.colors[22] = options.dissolveGlow ? options.dissolveGlow[2] : 1.0;
     this.colors[23] = 0.0;
 
-    this.params = this.grp2.setFloat(1, 'MAT_PARAMS', 43);
+    this.params = this.grp2.setFloat(1, 'MAT_PARAMS', 46);
     this.params[0] = options.id ?? 0;
     this.params[1] = options.normalIntensity ?? 1.0;
     this.params[2] = options.lightning ? 1.0 : 0.0;
@@ -177,13 +180,16 @@ class Gfx3Material {
     this.params[23] = options.distanceAlphaBlend ?? 0.0;
     this.params[24] = options.s0Texture ? 1.0 : 0.0;
     this.params[25] = options.s1Texture ? 1.0 : 0.0;
-    this.params[26] = options.colorBlendMode ? (options.colorBlendMode == 'mul' ? 1.0 : 2.0) : 1.0;
+    this.params[26] = options.textureBlendMode ? (options.textureBlendMode == 'mul' ? 1.0 : 2.0) : 1.0;
+    this.params[27] = options.lightGroup ?? 0;
+    this.params[28] = options.decalGroup ?? 0;
+    this.params[29] = options.effects ?? 0;
 
     if (options.sParams) {
       for (const sParam of options.sParams) {
         const paramIndex = Object.values(MAT_PARAMS_VARS).findIndex(n => n == sParam.name);
         if (paramIndex != -1) {
-          this.params[27 + paramIndex] = sParam.value ?? 0.0;
+          this.params[30 + paramIndex] = sParam.value ?? 0.0;
         }
       }
     }
@@ -299,6 +305,7 @@ class Gfx3Material {
       id: json['Id'],
       normalIntensity: json['NormalIntensity'],
       lightning: json['Lightning'],
+      lightGroup: json['LightGroup'],
       emissive: json['Emissive'],
       ambient: json['Ambient'],
       diffuse: json['Diffuse'],
@@ -309,6 +316,7 @@ class Gfx3Material {
       textureScrollAngle: json['TextureScrollAngle'],
       textureScrollRate: json['TextureScrollRate'],
       textureScale: json['TextureScale'],
+      textureBlendMode: json['TextureBlendMode'],
       secondaryTexture: json['SecondaryTexture'] ? await gfx3TextureManager.loadTexture(textureDir + json['SecondaryTexture']) : undefined,
       secondaryTextureScrollAngle: json['SecondaryTextureScrollAngle'],
       secondaryTextureScrollRate: json['SecondaryTextureScrollRate'],
@@ -342,6 +350,8 @@ class Gfx3Material {
       toonLightDir: json['ToonLightDir'],
       facingAlphaBlend: json['FacingAlphaBlend'],
       distanceAlphaBlend: json['DistanceAlphaBlend'],
+      decalGroup: json['DecalGroup'],
+      effects: json['Effects'],
       sParams: sParams
     });
   }
@@ -591,6 +601,26 @@ class Gfx3Material {
     this.dataChanged = true;
   }
 
+  /**
+   * Set the light group identifier.
+   * 
+   * @param {number} group - The light group identifier.
+   */
+  setLightGroup(group: number): void {
+    this.params[27] = group;
+    this.dataChanged = true;
+  }
+
+  /**
+   * Set the decal group identifier.
+   * 
+   * @param {number} group - The decal group identifier.
+   */
+  setDecalGroup(group: number): void {
+    this.params[28] = group;
+    this.dataChanged = true;
+  }
+
   /**
    * Set the dissolve glow color.
    * 
@@ -964,7 +994,7 @@ class Gfx3Material {
       throw new Error('Gfx3Material::setCustomParam(): Custom param name not found !');
     }
 
-    this.params[27 + paramIndex] = value;
+    this.params[30 + paramIndex] = value;
   }
 
   /**
@@ -978,7 +1008,7 @@ class Gfx3Material {
       throw new Error('Gfx3Material::getCustomParam(): Custom param name not found !');
     }
 
-    return this.params[27 + paramIndex];
+    return this.params[30 + paramIndex];
   }
 
   /**
@@ -1148,4 +1178,4 @@ class Gfx3Material {
 }
 
 export { Gfx3Material };
-export type { TextureTarget };
+export type { TextureTarget, MATFlipbook };