fix: importing props/mounts in projects (#148)

* fix: importing props in projects causing wonky character model to appear

* fix: bugs related to project mount importing

Author: Bronya-Rand

Brio/Capabilities/Actor/ActorAppearanceCapability.cs

@@ -212,11 +212,11 @@ public unsafe void ExportAppearance(string file)
         var currentAppearance = CurrentAppearance;
         BrioHuman.ShaderParams* shaders = Character.GetShaderParams();
 
-        ActorAppearanceExtended actor = new()
+        ActorAppearanceExtended actor = new() { Appearance = currentAppearance };
+        if(shaders != null)
         {
-            Appearance = currentAppearance,
-            ShaderParams = *shaders
-        };
+            actor.ShaderParams = *shaders;
+        }
 
         AnamnesisCharaFile appearance = actor;
         ResourceProvider.Instance.SaveFileDocument(file, appearance);

Brio/Files/ActorFile.cs

@@ -4,6 +4,7 @@
 using Brio.Entities.Actor;
 using Brio.Game.Actor.Appearance;
 using Brio.Game.Actor.Extensions;
+using Brio.Game.Actor.Interop;
 using Brio.Game.Types;
 using MessagePack;
 using System;
@@ -39,10 +40,19 @@ public static unsafe implicit operator ActorFile(ActorEntity actorEntity)
         var posingCapability = actorEntity.GetCapability<PosingCapability>();
         var modelCapability = actorEntity.GetCapability<ModelPosingCapability>();
 
+        ActorAppearanceExtended anaCharaFile = new() { Appearance = appearanceCapability.CurrentAppearance };
+        BrioHuman.ShaderParams* shaderParams = appearanceCapability.Character.GetShaderParams();
+
+        // append shader params to appearance if they exist
+        if(shaderParams is not null)
+        {
+            anaCharaFile.ShaderParams = *shaderParams;
+        }
+
         var actorFile = new ActorFile
         {
             Name = actorEntity.RawName,
-            AnamnesisCharaFile = new ActorAppearanceExtended { Appearance = appearanceCapability.CurrentAppearance, ShaderParams = *appearanceCapability.Character.GetShaderParams() },
+            AnamnesisCharaFile = anaCharaFile,
             PoseFile = posingCapability.GeneratePoseFile(),
             IsProp = actorEntity.IsProp,
             PropData = new PropData

Brio/Files/AnamnesisCharaFile.cs

@@ -247,19 +247,22 @@ public static implicit operator AnamnesisCharaFile(ActorAppearanceExtended appea
             // Extended Appearance
             Transparency = appearance.ExtendedAppearance.Transparency,
             HeightMultiplier = appearance.ExtendedAppearance.HeightMultiplier,
-
-            SkinColor = shaders.SkinColor,
-            SkinGloss = shaders.SkinGloss,
-            LeftEyeColor = shaders.LeftEyeColor,
-            RightEyeColor = shaders.RightEyeColor,
-            HairColor = shaders.HairColor,
-            HairGloss = shaders.HairGloss,
-            HairHighlight = shaders.HairHighlight,
-            MouthColor = shaders.MouthColor,
-            MuscleTone = shaders.MuscleTone,
-            LimbalRingColor = shaders.FeatureColor,
         };
 
+        if(shaders.HasValue)
+        {
+            charaFile.SkinColor = shaders.Value.SkinColor;
+            charaFile.SkinGloss = shaders.Value.SkinGloss;
+            charaFile.LeftEyeColor = shaders.Value.LeftEyeColor;
+            charaFile.RightEyeColor = shaders.Value.RightEyeColor;
+            charaFile.HairColor = shaders.Value.HairColor;
+            charaFile.HairGloss = shaders.Value.HairGloss;
+            charaFile.HairHighlight = shaders.Value.HairHighlight;
+            charaFile.MouthColor = shaders.Value.MouthColor;
+            charaFile.MuscleTone = shaders.Value.MuscleTone;
+            charaFile.LimbalRingColor = shaders.Value.FeatureColor;
+        }
+
         return charaFile;
     }
 

Brio/Game/Actor/Appearance/ActorAppearance.cs

@@ -337,5 +337,5 @@ private static (WeaponModelId, WeaponModelId, ActorEquipment) FromNpcEquip(NpcEq
 public struct ActorAppearanceExtended
 {
     public ActorAppearance Appearance;
-    public BrioHuman.ShaderParams ShaderParams;
+    public BrioHuman.ShaderParams? ShaderParams;
 }

Brio/Game/Scene/SceneService.cs

@@ -170,10 +170,20 @@ private async Task ApplyDataToActor(EntityId actorId, ActorFile actorFile)
 
         await _framework.RunOnTick(async () =>
         {
-
-            if(actorFile.AnamnesisCharaFile.IsExtendedAppearanceValid)
+            // only import shaders if the appearance is valid and it's not a prop (characters only)
+            if(actorFile.AnamnesisCharaFile.IsExtendedAppearanceValid && !actorFile.IsProp)
+            {
                 BrioUtilities.ImportShadersFromFile(ref appearanceCapability._modelShaderOverride, actorFile.AnamnesisCharaFile);
-            await appearanceCapability.SetAppearance(actorFile.AnamnesisCharaFile, AppearanceImportOptions.All);
+                await appearanceCapability.SetAppearance(actorFile.AnamnesisCharaFile, AppearanceImportOptions.All);
+            }
+            else if(actorFile.IsProp) // if it's a prop, only import the appearance
+            {
+                await appearanceCapability.SetAppearance(actorFile.AnamnesisCharaFile, AppearanceImportOptions.Customize);
+            }
+            else // chars with invalid extended appearances
+            {
+                await appearanceCapability.SetAppearance(actorFile.AnamnesisCharaFile, AppearanceImportOptions.Default);
+            }
 
             await _framework.RunOnTick(async () =>
             {
@@ -182,7 +192,7 @@ await _framework.RunOnTick(async () =>
                     mountPose = true;
 
                 if(mountPose == false)
-                    posingCapability.ImportPose(actorFile.PoseFile, asScene: true);
+                    posingCapability.ImportPose(actorFile.PoseFile, asScene: true, asProp: actorFile.IsProp);
 
                 if(attachedActor.HasCapability<CompanionCapability>() == true && actorFile.HasChild && actorFile.Child is not null)
                 {
@@ -191,20 +201,20 @@ await _framework.RunOnTick(async () =>
                     companionCapability.SetCompanion(actorFile.Child.Companion);
 
                     await _framework.RunOnTick(() =>
+                    {
+                        if(actorFile.Child.PoseFile is not null)
                         {
-                            if(actorFile.Child.PoseFile is not null)
-                            {
-                                var companionEntity = companionCapability.GetCompanionAsEntity();
+                            var companionEntity = companionCapability.GetCompanionAsEntity();
 
-                                if(companionEntity is not null && companionEntity.TryGetCapability<PosingCapability>(out var posingCapability))
-                                {
-                                    posingCapability.ImportPose(actorFile.Child.PoseFile, asScene: true, freezeOnLoad: true);
-                                }
+                            if(companionEntity is not null && companionEntity.TryGetCapability<PosingCapability>(out var posingCapability))
+                            {
+                                posingCapability.ImportPose(actorFile.Child.PoseFile, asScene: true, freezeOnLoad: true, asProp: actorFile.IsProp);
                             }
+                        }
 
-                            if(mountPose == true)
-                                posingCapability.ImportPose(actorFile.PoseFile, asScene: true);
-                        });
+                        if(mountPose == true)
+                            posingCapability.ImportPose(actorFile.PoseFile, asScene: true, asProp: actorFile.IsProp);
+                    });
                 }
             }, delayTicks: 10); // I don't like having to set delayTicks to this but I don't think I have another way without more rework
         });