mirror of
https://github.com/4sval/FModel.git
synced 2026-06-20 15:00:12 -05:00
ABI update, Roco Kingdom World meshes fix
Some checks failed
FModel QA Builder / build (push) Has been cancelled
Some checks failed
FModel QA Builder / build (push) Has been cancelled
This commit is contained in:
parent
bd83589915
commit
e723149db8
|
|
@ -1 +1 @@
|
|||
Subproject commit 721e812b7bd82f94a23ab728d0887245bb4c56d9
|
||||
Subproject commit 166d67076273f6e717adcc15cd57b759abf8e987
|
||||
|
|
@ -161,4 +161,5 @@ public enum EAssetCategory : uint
|
|||
GameSpecific = AssetCategoryExtensions.CategoryBase + (10 << 16),
|
||||
Borderlands = GameSpecific + 1,
|
||||
Aion2 = GameSpecific + 2,
|
||||
RocoKingdomWorld = GameSpecific + 3,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -358,6 +358,7 @@ public class GameFileViewModel(GameFile asset) : ViewModel
|
|||
break;
|
||||
case "stinfo":
|
||||
case "ushaderbytecode":
|
||||
case "upipelinecache":
|
||||
AssetCategory = EAssetCategory.ByteCode;
|
||||
break;
|
||||
case "wav":
|
||||
|
|
@ -439,6 +440,11 @@ public class GameFileViewModel(GameFile asset) : ViewModel
|
|||
case "dat" when GameVersion is EGame.GAME_Aion2:
|
||||
AssetCategory = EAssetCategory.Aion2;
|
||||
break;
|
||||
case "bytes" when GameVersion is EGame.GAME_RocoKingdomWorld:
|
||||
case "non" when GameVersion is EGame.GAME_RocoKingdomWorld:
|
||||
case "cam" when GameVersion is EGame.GAME_RocoKingdomWorld:
|
||||
AssetCategory = EAssetCategory.RocoKingdomWorld;
|
||||
break;
|
||||
default:
|
||||
AssetCategory = EAssetCategory.All; // just so it sets resolved
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<SolidColorBrush x:Key="FoliageBrush" Color="ForestGreen" />
|
||||
<SolidColorBrush x:Key="ParticleBrush" Color="Gold" />
|
||||
<SolidColorBrush x:Key="AnimationBrush" Color="Coral" />
|
||||
<SolidColorBrush x:Key="LuaBrush" Color="DarkBlue" />
|
||||
<SolidColorBrush x:Key="LuaBrush" Color="Blue" />
|
||||
<SolidColorBrush x:Key="JsonXmlBrush" Color="LightGreen" />
|
||||
<SolidColorBrush x:Key="CodeBrush" Color="SandyBrown" />
|
||||
<SolidColorBrush x:Key="HtmlBrush" Color="Tomato" />
|
||||
|
|
@ -52,4 +52,5 @@
|
|||
<!-- For specific games -->
|
||||
<SolidColorBrush x:Key="BorderlandsBrush" Color="Yellow"></SolidColorBrush>
|
||||
<SolidColorBrush x:Key="AionBrush" Color="DeepSkyBlue"></SolidColorBrush>
|
||||
<SolidColorBrush x:Key="RocoKingdomWorldBrush" Color="#fecf4d"></SolidColorBrush>
|
||||
</ResourceDictionary>
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@ public class FileToGeometryConverter : IMultiValueConverter
|
|||
|
||||
EAssetCategory.Borderlands => ("BorderlandsIcon", "BorderlandsBrush"),
|
||||
EAssetCategory.Aion2 => ("AionIcon", "AionBrush"),
|
||||
EAssetCategory.RocoKingdomWorld => ("RocoKingdomWorldIcon", "RocoKingdomWorldBrush"),
|
||||
|
||||
_ => ("AssetIcon", "NeutralBrush")
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user