roavatar-renderer 1.5.7 → 1.5.8

package/dist/index.js

@@ -30676,7 +30676,7 @@ class Instance {
       }
       if (FLAGS.SEARCH_FOR_STRING) {
         if (property.typeID === DataType.String || property.typeID === DataType.Bytecode || property.typeID === DataType.SharedString) {
-          if (value.toLowerCase().includes(FLAGS.SEARCH_FOR_STRING)) {
+          if (value && value.toLowerCase().includes(FLAGS.SEARCH_FOR_STRING)) {
             log(true, this.GetFullName());
             log(true, value);
           }
@@ -31402,7 +31402,7 @@ class RBX {
         case "Content": {
           const property = new Property();
           property.name = propertyNode.getAttribute("name") || "null";
-          property.typeID = DataType.String;
+          property.typeID = DataType.Content;
           instance.addProperty(property);
           const childElement = propertyNode.querySelector(":scope > *");
           if (childElement) {
@@ -31427,7 +31427,7 @@ class RBX {
         case "bool": {
           const property = new Property();
           property.name = propertyNode.getAttribute("name") || "null";
-          property.typeID = DataType.String;
+          property.typeID = DataType.Bool;
           instance.addProperty(property);
           instance.setProperty(property.name, propertyNode.textContent.toLowerCase() === "true");
           break;
@@ -31581,7 +31581,7 @@ class RBX {
         case "NumberSequence": {
           const property = new Property();
           property.name = propertyNode.getAttribute("name") || "null";
-          property.typeID = DataType.NumberRange;
+          property.typeID = DataType.NumberSequence;
           const values = propertyNode.textContent.split(" ");
           const numberSequence = new NumberSequence();
           for (let i = 0; i < Math.floor(values.length / 3); i++) {
@@ -31598,7 +31598,7 @@ class RBX {
         case "ColorSequence": {
           const property = new Property();
           property.name = propertyNode.getAttribute("name") || "null";
-          property.typeID = DataType.NumberRange;
+          property.typeID = DataType.ColorSequence;
           const values = propertyNode.textContent.split(" ");
           const colorSequence = new ColorSequence();
           for (let i = 0; i < Math.floor(values.length / 5); i++) {
@@ -32274,8 +32274,8 @@ const AssetTypes = [
   "Audio",
   "Mesh",
   "Lua",
-  "",
-  "",
+  "HTML",
+  "Text",
   "Hat",
   "Place",
   "Model",
@@ -32284,30 +32284,30 @@ const AssetTypes = [
   "Decal",
   "",
   "",
-  "",
+  "Avatar",
   "Head",
   "Face",
   "Gear",
   "",
   "Badge",
-  "",
+  "GroupEmblem",
   "",
   "Animation",
-  "",
-  "",
+  "Arms",
+  "Legs",
   "Torso",
   "RightArm",
   "LeftArm",
   "LeftLeg",
   "RightLeg",
   "Package",
-  "",
+  "YouTubeVideo",
   "GamePass",
+  "App",
   "",
-  "",
-  "",
+  "Code",
   "Plugin",
-  "",
+  "SolidModel",
   "MeshPart",
   "HairAccessory",
   "FaceAccessory",
@@ -32325,13 +32325,13 @@ const AssetTypes = [
   "SwimAnimation",
   "WalkAnimation",
   "PoseAnimation",
-  "EarAccessory",
-  "EyeAccessory",
   "",
   "",
+  "LocalizationTableManifest",
+  "LocalizationTableTranslation",
   "EmoteAnimation",
   "Video",
-  "",
+  "TexturePack",
   "TShirtAccessory",
   "ShirtAccessory",
   "PantsAccessory",
@@ -32342,24 +32342,26 @@ const AssetTypes = [
   "RightShoeAccessory",
   "DressSkirtAccessory",
   "FontFamily",
-  "",
-  "",
+  "FontFace",
+  "MeshHiddenSurfaceRemoval",
   "EyebrowAccessory",
   "EyelashAccessory",
   "MoodAnimation",
   "DynamicHead",
   //79
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
-  "",
+  "CodeSnippet",
+  "AdsVideo",
+  "OtaUpdate",
+  "Screenshot",
+  "RuntimePropertySet",
+  "StorePreviewVideo",
+  "GamePreviewVideo",
+  "CreatorExperienceConfig",
   "FaceMakeup",
   "LipMakeup",
-  "EyeMakeup"
+  "EyeMakeup",
+  "VoxelFragment",
+  "AvatarBackground"
 ];
 const WearableAssetTypes = [
   "TShirt",
@@ -43762,14 +43764,19 @@ class _TextureComposer {
   }
 }
 const TextureComposer = new _TextureComposer(1, 1);
-const vertexShader$5 = `
+const vertexShader$5 = (
+  /*glsl*/
+  `
 varying vec2 vUv;
 void main() {
     vUv = uv;
     gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
 }
-`;
-const fragmentShader$5 = `
+`
+);
+const fragmentShader$5 = (
+  /*glsl*/
+  `
 uniform sampler2D uTexture;
 varying vec2 vUv;
 void main() {
@@ -43777,7 +43784,8 @@ void main() {
     vec4 texColor = texture2D(uTexture, vUv);
     gl_FragColor = texColor;
 }
-`;
+`
+);
 const Shader_TextureComposer_Flat = new ShaderMaterial({
   uniforms: {
     uTexture: { value: void 0 }
@@ -43787,7 +43795,9 @@ const Shader_TextureComposer_Flat = new ShaderMaterial({
   depthWrite: false,
   transparent: true
 });
-const vertexShader$4 = `
+const vertexShader$4 = (
+  /*glsl*/
+  `
 uniform vec2 uOffset;
 uniform vec2 uSize;
 varying vec2 vUv;
@@ -43796,8 +43806,11 @@ void main() {
     vec2 mapUv = vec2(uv.x * uSize.x + uOffset.x, uv.y * uSize.y + uOffset.y);
     gl_Position = vec4(mapUv.x * 2.0 - 1.0, mapUv.y * 2.0 - 1.0, 0.0, 1.0);
 }
-`;
-const fragmentShader$4 = `
+`
+);
+const fragmentShader$4 = (
+  /*glsl*/
+  `
 uniform sampler2D uTexture;
 varying vec2 vUv;
 void main() {
@@ -43805,7 +43818,8 @@ void main() {
     vec4 texColor = texture2D(uTexture, vUv);
     gl_FragColor = texColor;
 }
-`;
+`
+);
 const Shader_TextureComposer_FullscreenQuad = new ShaderMaterial({
   uniforms: {
     uTexture: { value: void 0 },
@@ -43817,17 +43831,23 @@ const Shader_TextureComposer_FullscreenQuad = new ShaderMaterial({
   depthWrite: false,
   transparent: true
 });
-const vertexShader$3 = `
+const vertexShader$3 = (
+  /*glsl*/
+  `
 void main() {
     gl_Position = vec4(uv.x * 2.0 - 1.0, uv.y * 2.0 - 1.0, 0.0, 1.0);
 }
-`;
-const fragmentShader$3 = `
+`
+);
+const fragmentShader$3 = (
+  /*glsl*/
+  `
 uniform vec3 uColor;
 void main() {
     gl_FragColor = vec4(uColor, 1.0);
 }
-`;
+`
+);
 const Shader_TextureComposer_FullscreenQuad_Color = new ShaderMaterial({
   uniforms: {
     uColor: { value: new Color(0, 0, 0) }
@@ -43837,17 +43857,23 @@ const Shader_TextureComposer_FullscreenQuad_Color = new ShaderMaterial({
   depthWrite: false,
   transparent: true
 });
-const vertexShader$2 = `
+const vertexShader$2 = (
+  /*glsl*/
+  `
 void main() {
     gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
 }
-`;
-const fragmentShader$2 = `
+`
+);
+const fragmentShader$2 = (
+  /*glsl*/
+  `
 uniform vec3 uColor;
 void main() {
     gl_FragColor = vec4(uColor, 1.0);
 }
-`;
+`
+);
 const Shader_TextureComposer_Flat_Color = new ShaderMaterial({
   uniforms: {
     uColor: { value: new Color(0, 0, 0) }
@@ -43857,7 +43883,9 @@ const Shader_TextureComposer_Flat_Color = new ShaderMaterial({
   depthWrite: false,
   transparent: true
 });
-const vertexShader$1 = `
+const vertexShader$1 = (
+  /*glsl*/
+  `
 uniform mat4 uTextureProjMat;
 
 varying vec2 vUv;
@@ -43870,8 +43898,11 @@ void main() {
     vNormal = normalize(normalMatrix * normal);
     gl_Position = vec4(uv.x * 2.0 - 1.0, uv.y * 2.0 - 1.0, 0.0, 1.0);
 }
-`;
-const fragmentShader$1 = `
+`
+);
+const fragmentShader$1 = (
+  /*glsl*/
+  `
 uniform sampler2D uTexture;
 uniform vec3 uDecalNormal;
 
@@ -43897,7 +43928,8 @@ void main() {
     vec4 texColor = texture2D(uTexture, vTextureProjCoord);
     gl_FragColor = texColor;
 }
-`;
+`
+);
 const Shader_TextureComposer_Decal = new ShaderMaterial({
   uniforms: {
     uTexture: { value: void 0 },
@@ -43909,7 +43941,9 @@ const Shader_TextureComposer_Decal = new ShaderMaterial({
   depthWrite: false,
   transparent: true
 });
-const vertexShader = `
+const vertexShader = (
+  /*glsl*/
+  `
 uniform vec2 uOffset;
 uniform vec2 uSize;
 varying vec2 vUv;
@@ -43918,10 +43952,22 @@ void main() {
     vec2 mapUv = vec2(uv.x * uSize.x + uOffset.x, uv.y * uSize.y + uOffset.y);
     gl_Position = vec4(mapUv.x * 2.0 - 1.0, mapUv.y * 2.0 - 1.0, 0.0, 1.0);
 }
-`;
-const fragmentShader = `
+`
+);
+const fragmentShader = (
+  /*glsl*/
+  `
 uniform sampler2D uTexture;
 varying vec2 vUv;
+
+vec3 sRGBToLinear(vec3 color) {
+    return mix(
+        color / 12.92, 
+        pow((color + 0.055) / 1.055, vec3(2.4)), 
+        step(0.04045, color)
+    );
+}
+
 void main() {
     //sample the original render texture result
     vec4 texColor = texture2D(uTexture, vUv);
@@ -43931,9 +43977,10 @@ void main() {
     }
 
     //convert to linear
-    gl_FragColor = vec4(pow(texColor.rgb, vec3(2.2)), texColor.a);
+    gl_FragColor = vec4(sRGBToLinear(texColor.rgb), texColor.a);
 }
-`;
+`
+);
 const Shader_TextureComposer_Gamma = new ShaderMaterial({
   uniforms: {
     uTexture: { value: void 0 },
@@ -49381,7 +49428,9 @@ const __vite_glob_0_0 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
   __proto__: null,
   AttachmentDesc
 }, Symbol.toStringTag, { value: "Module" }));
-const particle_vertexShader = `
+const particle_vertexShader = (
+  /*glsl*/
+  `
 attribute vec3 instanceColor;
 attribute vec3 instanceSeedTime;
 attribute float instanceOpacity;
@@ -49406,13 +49455,18 @@ void main() {
 
     vec4 modelViewPosition = modelViewMatrix * instanceMatrix * vec4(position, 1.0);
 
+    //offset position toward camera
     vec3 viewDir = normalize(modelViewPosition.xyz);
     modelViewPosition.xyz += viewDir * -uZOffset;
 
     gl_Position = projectionMatrix * modelViewPosition;
 }
-`;
-const particle_fragmentShader = `
+`
+);
+const particle_fragmentShader = (
+  /*glsl*/
+  `
+//artibutes
 varying vec2 vUv;
 varying vec3 vInstanceColor;
 varying float vInstanceOpacity;
@@ -49420,12 +49474,25 @@ varying vec3 vInstanceSeedTime;
 varying vec2 vFlipbookUv0;
 varying vec2 vFlipbookUv1;
 
+//textures
 uniform sampler2D uColorMap;
 uniform sampler2D uAlphaMap;
 uniform sampler2D uMap;
+
+//uniforms
+uniform float uLightInfluence;
 uniform float uOpacity;
 uniform vec2 uFlipbookSize;
 
+//light uniforms
+struct DirectionalLight {
+  vec3 direction;
+  vec3 color;
+};
+uniform DirectionalLight directionalLights[NUM_DIR_LIGHTS]; 
+
+uniform vec3 ambientLightColor; 
+
 void main() {
     float seed = vInstanceSeedTime.x;
     float time = vInstanceSeedTime.y;
@@ -49453,12 +49520,25 @@ void main() {
     vec4 finalColor = opacityColor;
     finalColor.rgb = mix(opacityColor.rgb, opacityColor.rgb * colorTex.rgb, colorTex.a);
 
+    // Apply lighting
+    vec3 light = ambientLightColor;
+    #if NUM_DIR_LIGHTS > 0
+        for (int i = 0; i < NUM_DIR_LIGHTS; i++) {
+            light += directionalLights[i].color;
+        }
+    #endif
+
+    finalColor = vec4(mix(finalColor.rgb, finalColor.rgb * light, uLightInfluence), finalColor.a);
+
     gl_FragColor = finalColor;
 }
-`;
+`
+);
 const particle_fragmentShader_additive = particle_fragmentShader.replace(
   "//#ADDITIVE_INSERT",
-  `if (opacityColor.r + opacityColor.g + opacityColor.b <= 0.05) {
+  /*glsl*/
+  `
+if (opacityColor.r + opacityColor.g + opacityColor.b <= 0.05) {
     discard;
 }`
 );
@@ -49624,6 +49704,7 @@ class EmitterDesc extends DisposableDesc {
   shapeInOut = 0;
   opacity = 1;
   lightEmission = 1;
+  lightInfluence = 0;
   blending = AdditiveBlending;
   color = new ColorSequence();
   size = new NumberSequence();
@@ -49660,7 +49741,7 @@ class EmitterDesc extends DisposableDesc {
     return this.texture === other.texture && this.alphaTexture === other.alphaTexture && this.colorTexture === other.colorTexture && this.rate === other.rate;
   }
   isSame(other) {
-    return !this.needsRegeneration(other) && this.lockedToPart === other.lockedToPart && this.lifetime.isSame(other.lifetime) && this.spreadAngle.isSame(other.spreadAngle) && this.speed.isSame(other.speed) && this.rotation.isSame(other.rotation) && this.rotationSpeed.isSame(other.rotationSpeed) && this.localAcceleration.isSame(other.localAcceleration) && this.acceleration.isSame(other.acceleration) && this.drag === other.drag && this.timeScale === other.timeScale && this.orientation === other.orientation && this.zOffset === other.zOffset && this.offset.isSame(other.offset) && this.shapeInOut === other.shapeInOut && this.opacity === other.opacity && this.lightEmission === other.lightEmission && this.blending === other.blending && this.color.isSame(other.color) && this.size.isSame(other.size) && this.squash.isSame(other.squash) && this.transparency.isSame(other.transparency) && this.normalizeSizeKeypointTime === other.normalizeSizeKeypointTime && this.flipbookLayout === other.flipbookLayout && this.flipbookBlendFrames === other.flipbookBlendFrames && this.flipbookFramerate.isSame(other.flipbookFramerate) && this.flipbookMode === other.flipbookMode && this.flipbookSizeX === other.flipbookSizeX && this.flipbookSizeY === other.flipbookSizeY && this.flipbookStartRandom === other.flipbookStartRandom;
+    return !this.needsRegeneration(other) && this.lockedToPart === other.lockedToPart && this.lifetime.isSame(other.lifetime) && this.spreadAngle.isSame(other.spreadAngle) && this.speed.isSame(other.speed) && this.rotation.isSame(other.rotation) && this.rotationSpeed.isSame(other.rotationSpeed) && this.localAcceleration.isSame(other.localAcceleration) && this.acceleration.isSame(other.acceleration) && this.drag === other.drag && this.timeScale === other.timeScale && this.orientation === other.orientation && this.zOffset === other.zOffset && this.offset.isSame(other.offset) && this.shapeInOut === other.shapeInOut && this.opacity === other.opacity && this.lightEmission === other.lightEmission && this.lightInfluence === other.lightInfluence && this.blending === other.blending && this.color.isSame(other.color) && this.size.isSame(other.size) && this.squash.isSame(other.squash) && this.transparency.isSame(other.transparency) && this.normalizeSizeKeypointTime === other.normalizeSizeKeypointTime && this.flipbookLayout === other.flipbookLayout && this.flipbookBlendFrames === other.flipbookBlendFrames && this.flipbookFramerate.isSame(other.flipbookFramerate) && this.flipbookMode === other.flipbookMode && this.flipbookSizeX === other.flipbookSizeX && this.flipbookSizeY === other.flipbookSizeY && this.flipbookStartRandom === other.flipbookStartRandom;
   }
   fromEmitterDesc(other) {
     this.lockedToPart = other.lockedToPart;
@@ -49680,6 +49761,7 @@ class EmitterDesc extends DisposableDesc {
     this.shapeInOut = other.shapeInOut;
     this.opacity = other.opacity;
     this.lightEmission = other.lightEmission;
+    this.lightInfluence = other.lightInfluence;
     this.blending = other.blending;
     this.color = other.color.clone();
     this.size = other.size.clone();
@@ -49777,16 +49859,21 @@ class EmitterDesc extends DisposableDesc {
       side: DoubleSide,
       blending: this.blending,
       opacity: this.opacity,
+      lights: true,
       vertexShader: particle_vertexShader,
       fragmentShader: this.blending === AdditiveBlending ? particle_fragmentShader_additive : particle_fragmentShader,
-      uniforms: {
-        uMap: { value: mapToUse },
-        uAlphaMap: { value: alphaMapToUse },
-        uColorMap: { value: colorMapToUse },
-        uOpacity: { value: this.opacity },
-        uZOffset: { value: this.zOffset },
-        uFlipbookSize: { value: new Vector2$1(1 / flipbookSizeX, 1 / flipbookSizeY) }
-      }
+      uniforms: UniformsUtils.merge([
+        UniformsLib.lights,
+        {
+          uMap: { value: mapToUse },
+          uAlphaMap: { value: alphaMapToUse },
+          uColorMap: { value: colorMapToUse },
+          uLightInfluence: { value: this.lightInfluence },
+          uOpacity: { value: this.opacity },
+          uZOffset: { value: this.zOffset },
+          uFlipbookSize: { value: new Vector2$1(1 / flipbookSizeX, 1 / flipbookSizeY) }
+        }
+      ])
     });
     this.resultMaterial = material;
     this.result = new InstancedMesh(geometry, material, this.maxCount);
@@ -49879,7 +49966,9 @@ class EmitterDesc extends DisposableDesc {
     if (this.resultMaterial) {
       this.resultMaterial.uniforms.uOpacity.value = this.opacity;
       this.resultMaterial.uniforms.uZOffset.value = this.zOffset;
+      this.resultMaterial.uniforms.uLightInfluence.value = this.lightInfluence;
       this.resultMaterial.uniforms.uFlipbookSize.value.set(1 / flipbookSizeX, 1 / flipbookSizeY);
+      this.resultMaterial.needsUpdate = true;
     }
     for (let i = 0; i < this.result.count; i++) {
       const particle = this.particles[i];
@@ -50061,6 +50150,7 @@ class EmitterGroupDesc extends RenderDesc {
     if (child.HasProperty("Transparency")) emitterDesc.transparency = child.Prop("Transparency");
     if (child.HasProperty("LightEmission")) emitterDesc.lightEmission = child.Prop("LightEmission");
     emitterDesc.blending = emitterDesc.lightEmission === 0 ? NormalBlending : AdditiveBlending;
+    if (child.HasProperty("LightInfluence")) emitterDesc.lightInfluence = child.Prop("LightInfluence");
     if (child.HasProperty("ZOffset")) emitterDesc.zOffset = child.Prop("ZOffset");
     if (child.HasProperty("Orientation")) emitterDesc.orientation = child.Prop("Orientation");
     if (child.HasProperty("LockedToPart")) emitterDesc.lockedToPart = child.Prop("LockedToPart");
@@ -50179,7 +50269,8 @@ class EmitterGroupDesc extends RenderDesc {
       lifetime: new NumberRange(5, 5),
       timeScale,
       color: ColorSequence.fromColor(color),
-      blending: NormalBlending
+      blending: NormalBlending,
+      lightInfluence: 1
     }));
   }
   dispose(renderer, scene) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roavatar-renderer",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "A renderer for Roblox avatars, used by the RoAvatar extension.",
   "author": "steinan",
   "type": "module",