diff --git a/AssetStudio/Classes/AnimationClip.cs b/AssetStudio/Classes/AnimationClip.cs index 4d85a5b3..a3f9042b 100644 --- a/AssetStudio/Classes/AnimationClip.cs +++ b/AssetStudio/Classes/AnimationClip.cs @@ -10,13 +10,13 @@ namespace AssetStudio { public class Keyframe { - public float time { get; set; } - public T value { get; set; } - public T inSlope { get; set; } - public T outSlope { get; set; } - public int weightedMode { get; set; } - public T inWeight { get; set; } - public T outWeight { get; set; } + public float time; + public T value; + public T inSlope; + public T outSlope; + public int weightedMode; + public T inWeight; + public T outWeight; public Keyframe(ObjectReader reader, Func readerFunc) @@ -36,10 +36,10 @@ public Keyframe(ObjectReader reader, Func readerFunc) public class AnimationCurve { - public List> m_Curve { get; set; } - public int m_PreInfinity { get; set; } - public int m_PostInfinity { get; set; } - public int m_RotationOrder { get; set; } + public List> m_Curve; + public int m_PreInfinity; + public int m_PostInfinity; + public int m_RotationOrder; public AnimationCurve(ObjectReader reader, Func readerFunc) { @@ -62,8 +62,8 @@ public AnimationCurve(ObjectReader reader, Func readerFunc) public class QuaternionCurve { - public AnimationCurve curve { get; set; } - public string path { get; set; } + public AnimationCurve curve; + public string path; public QuaternionCurve(ObjectReader reader) { @@ -74,11 +74,11 @@ public QuaternionCurve(ObjectReader reader) public class PackedFloatVector { - public uint m_NumItems { get; set; } - public float m_Range { get; set; } - public float m_Start { get; set; } - public byte[] m_Data { get; set; } - public byte m_BitSize { get; set; } + public uint m_NumItems; + public float m_Range; + public float m_Start; + public byte[] m_Data; + public byte m_BitSize; public PackedFloatVector(ObjectReader reader) { @@ -135,9 +135,9 @@ public float[] UnpackFloats(int itemCountInChunk, int chunkStride, int start = 0 public class PackedIntVector { - public uint m_NumItems { get; set; } - public byte[] m_Data { get; set; } - public byte m_BitSize { get; set; } + public uint m_NumItems; + public byte[] m_Data; + public byte m_BitSize; public PackedIntVector(ObjectReader reader) { @@ -180,8 +180,8 @@ public int[] UnpackInts() public class PackedQuatVector { - public uint m_NumItems { get; set; } - public byte[] m_Data { get; set; } + public uint m_NumItems; + public byte[] m_Data; public PackedQuatVector(ObjectReader reader) { @@ -260,12 +260,12 @@ public Quaternion[] UnpackQuats() public class CompressedAnimationCurve { - public string m_Path { get; set; } - public PackedIntVector m_Times { get; set; } - public PackedQuatVector m_Values { get; set; } - public PackedFloatVector m_Slopes { get; set; } - public int m_PreInfinity { get; set; } - public int m_PostInfinity { get; set; } + public string m_Path; + public PackedIntVector m_Times; + public PackedQuatVector m_Values; + public PackedFloatVector m_Slopes; + public int m_PreInfinity; + public int m_PostInfinity; public CompressedAnimationCurve(ObjectReader reader) { @@ -280,8 +280,8 @@ public CompressedAnimationCurve(ObjectReader reader) public class Vector3Curve { - public AnimationCurve curve { get; set; } - public string path { get; set; } + public AnimationCurve curve; + public string path; public Vector3Curve(ObjectReader reader) { @@ -292,11 +292,11 @@ public Vector3Curve(ObjectReader reader) public class FloatCurve { - public AnimationCurve curve { get; set; } - public string attribute { get; set; } - public string path { get; set; } - public int classID { get; set; } - public PPtr script { get; set; } + public AnimationCurve curve; + public string attribute; + public string path; + public int classID; + public PPtr script; public FloatCurve(ObjectReader reader) @@ -311,8 +311,8 @@ public FloatCurve(ObjectReader reader) public class PPtrKeyframe { - public float time { get; set; } - public PPtr value { get; set; } + public float time; + public PPtr value; public PPtrKeyframe(ObjectReader reader) @@ -324,11 +324,11 @@ public PPtrKeyframe(ObjectReader reader) public class PPtrCurve { - public List curve { get; set; } - public string attribute { get; set; } - public string path { get; set; } - public int classID { get; set; } - public PPtr script { get; set; } + public List curve; + public string attribute; + public string path; + public int classID; + public PPtr script; public PPtrCurve(ObjectReader reader) @@ -349,8 +349,8 @@ public PPtrCurve(ObjectReader reader) public class AABB { - public Vector3 m_Center { get; set; } - public Vector3 m_Extend { get; set; } + public Vector3 m_Center; + public Vector3 m_Extend; public AABB(ObjectReader reader) { @@ -361,9 +361,9 @@ public AABB(ObjectReader reader) public class xform { - public object t { get; set; } - public Quaternion q { get; set; } - public object s { get; set; } + public object t; + public Quaternion q; + public object s; public xform(ObjectReader reader) { @@ -376,12 +376,12 @@ public xform(ObjectReader reader) public class HandPose { - public xform m_GrabX { get; set; } - public float[] m_DoFArray { get; set; } - public float m_Override { get; set; } - public float m_CloseOpen { get; set; } - public float m_InOut { get; set; } - public float m_Grab { get; set; } + public xform m_GrabX; + public float[] m_DoFArray; + public float m_Override; + public float m_CloseOpen; + public float m_InOut; + public float m_Grab; public HandPose(ObjectReader reader) { @@ -399,11 +399,11 @@ public HandPose(ObjectReader reader) public class HumanGoal { - public xform m_X { get; set; } - public float m_WeightT { get; set; } - public float m_WeightR { get; set; } - public object m_HintT { get; set; } - public float m_HintWeightT { get; set; } + public xform m_X; + public float m_WeightT; + public float m_WeightR; + public object m_HintT; + public float m_HintWeightT; public HumanGoal(ObjectReader reader) { @@ -421,14 +421,14 @@ public HumanGoal(ObjectReader reader) public class HumanPose { - public xform m_RootX { get; set; } - public object m_LookAtPosition { get; set; } - public Vector4 m_LookAtWeight { get; set; } - public List m_GoalArray { get; set; } - public HandPose m_LeftHandPose { get; set; } - public HandPose m_RightHandPose { get; set; } - public float[] m_DoFArray { get; set; } - public object[] m_TDoFArray { get; set; } + public xform m_RootX; + public object m_LookAtPosition; + public Vector4 m_LookAtWeight; + public List m_GoalArray; + public HandPose m_LeftHandPose; + public HandPose m_RightHandPose; + public float[] m_DoFArray; + public object[] m_TDoFArray; public HumanPose(ObjectReader reader) { @@ -464,8 +464,8 @@ public HumanPose(ObjectReader reader) public class StreamedClip { - public uint[] data { get; set; } - public uint curveCount { get; set; } + public uint[] data; + public uint curveCount; public StreamedClip(ObjectReader reader) { @@ -476,8 +476,8 @@ public StreamedClip(ObjectReader reader) public class StreamedCurveKey { - public int index { get; set; } - public float[] coeff { get; set; } + public int index; + public float[] coeff; public float value; public float outSlope; @@ -511,8 +511,8 @@ public float CalculateNextInSlope(float dx, StreamedCurveKey rhs) public class StreamedFrame { - public float time { get; set; } - public List keyList { get; set; } + public float time; + public List keyList; public StreamedFrame(BinaryReader reader) { @@ -564,11 +564,11 @@ public List ReadData() public class DenseClip { - public int m_FrameCount { get; set; } - public uint m_CurveCount { get; set; } - public float m_SampleRate { get; set; } - public float m_BeginTime { get; set; } - public float[] m_SampleArray { get; set; } + public int m_FrameCount; + public uint m_CurveCount; + public float m_SampleRate; + public float m_BeginTime; + public float[] m_SampleArray; public DenseClip(ObjectReader reader) { @@ -584,7 +584,7 @@ public DenseClip(ObjectReader reader) public class ConstantClip { - public float[] data { get; set; } + public float[] data; public ConstantClip(ObjectReader reader) { @@ -595,10 +595,10 @@ public ConstantClip(ObjectReader reader) public class ValueConstant { - public uint m_ID { get; set; } - public uint m_TypeID { get; set; } - public uint m_Type { get; set; } - public uint m_Index { get; set; } + public uint m_ID; + public uint m_TypeID; + public uint m_Type; + public uint m_Index; public ValueConstant(ObjectReader reader) { @@ -615,7 +615,7 @@ public ValueConstant(ObjectReader reader) public class ValueArrayConstant { - public List m_ValueArray { get; set; } + public List m_ValueArray; public ValueArrayConstant(ObjectReader reader) { @@ -630,10 +630,10 @@ public ValueArrayConstant(ObjectReader reader) public class Clip { - public StreamedClip m_StreamedClip { get; set; } - public DenseClip m_DenseClip { get; set; } - public ConstantClip m_ConstantClip { get; set; } - public ValueArrayConstant m_Binding { get; set; } + public StreamedClip m_StreamedClip; + public DenseClip m_DenseClip; + public ConstantClip m_ConstantClip; + public ValueArrayConstant m_Binding; public Clip(ObjectReader reader) { @@ -650,8 +650,8 @@ public Clip(ObjectReader reader) public class ValueDelta { - public float m_Start { get; set; } - public float m_Stop { get; set; } + public float m_Start; + public float m_Stop; public ValueDelta(ObjectReader reader) { @@ -662,35 +662,35 @@ public ValueDelta(ObjectReader reader) public class ClipMuscleConstant { - public HumanPose m_DeltaPose { get; set; } - public xform m_StartX { get; set; } - public xform m_StopX { get; set; } - public xform m_LeftFootStartX { get; set; } - public xform m_RightFootStartX { get; set; } - public xform m_MotionStartX { get; set; } - public xform m_MotionStopX { get; set; } - public object m_AverageSpeed { get; set; } - public Clip m_Clip { get; set; } - public float m_StartTime { get; set; } - public float m_StopTime { get; set; } - public float m_OrientationOffsetY { get; set; } - public float m_Level { get; set; } - public float m_CycleOffset { get; set; } - public float m_AverageAngularSpeed { get; set; } - public int[] m_IndexArray { get; set; } - public List m_ValueArrayDelta { get; set; } - public float[] m_ValueArrayReferencePose { get; set; } - public bool m_Mirror { get; set; } - public bool m_LoopTime { get; set; } - public bool m_LoopBlend { get; set; } - public bool m_LoopBlendOrientation { get; set; } - public bool m_LoopBlendPositionY { get; set; } - public bool m_LoopBlendPositionXZ { get; set; } - public bool m_StartAtOrigin { get; set; } - public bool m_KeepOriginalOrientation { get; set; } - public bool m_KeepOriginalPositionY { get; set; } - public bool m_KeepOriginalPositionXZ { get; set; } - public bool m_HeightFromFeet { get; set; } + public HumanPose m_DeltaPose; + public xform m_StartX; + public xform m_StopX; + public xform m_LeftFootStartX; + public xform m_RightFootStartX; + public xform m_MotionStartX; + public xform m_MotionStopX; + public object m_AverageSpeed; + public Clip m_Clip; + public float m_StartTime; + public float m_StopTime; + public float m_OrientationOffsetY; + public float m_Level; + public float m_CycleOffset; + public float m_AverageAngularSpeed; + public int[] m_IndexArray; + public List m_ValueArrayDelta; + public float[] m_ValueArrayReferencePose; + public bool m_Mirror; + public bool m_LoopTime; + public bool m_LoopBlend; + public bool m_LoopBlendOrientation; + public bool m_LoopBlendPositionY; + public bool m_LoopBlendPositionXZ; + public bool m_StartAtOrigin; + public bool m_KeepOriginalOrientation; + public bool m_KeepOriginalPositionY; + public bool m_KeepOriginalPositionXZ; + public bool m_HeightFromFeet; public ClipMuscleConstant(ObjectReader reader) { @@ -759,12 +759,12 @@ public ClipMuscleConstant(ObjectReader reader) public class GenericBinding { - public uint path { get; set; } - public uint attribute { get; set; } - public PPtr script { get; set; } - public int typeID { get; set; } - public byte customType { get; set; } - public byte isPPtrCurve { get; set; } + public uint path; + public uint attribute; + public PPtr script; + public int typeID; + public byte customType; + public byte isPPtrCurve; public GenericBinding(ObjectReader reader) { @@ -788,8 +788,8 @@ public GenericBinding(ObjectReader reader) public class AnimationClipBindingConstant { - public List genericBindings { get; set; } - public List pptrCurveMapping { get; set; } + public List genericBindings; + public List pptrCurveMapping; public AnimationClipBindingConstant(ObjectReader reader) { @@ -833,24 +833,24 @@ public enum AnimationType public sealed class AnimationClip : NamedObject { - public AnimationType m_AnimationType { get; set; } - public bool m_Legacy { get; set; } - public bool m_Compressed { get; set; } - public bool m_UseHighQualityCurve { get; set; } - public List m_RotationCurves { get; set; } - public List m_CompressedRotationCurves { get; set; } - public List m_EulerCurves { get; set; } - public List m_PositionCurves { get; set; } - public List m_ScaleCurves { get; set; } - public List m_FloatCurves { get; set; } - public List m_PPtrCurves { get; set; } - public float m_SampleRate { get; set; } - public int m_WrapMode { get; set; } - public AABB m_Bounds { get; set; } - public uint m_MuscleClipSize { get; set; } - public ClipMuscleConstant m_MuscleClip { get; set; } - public AnimationClipBindingConstant m_ClipBindingConstant { get; set; } - //public List m_Events { get; set; } + public AnimationType m_AnimationType; + public bool m_Legacy; + public bool m_Compressed; + public bool m_UseHighQualityCurve; + public List m_RotationCurves; + public List m_CompressedRotationCurves; + public List m_EulerCurves; + public List m_PositionCurves; + public List m_ScaleCurves; + public List m_FloatCurves; + public List m_PPtrCurves; + public float m_SampleRate; + public int m_WrapMode; + public AABB m_Bounds; + public uint m_MuscleClipSize; + public ClipMuscleConstant m_MuscleClip; + public AnimationClipBindingConstant m_ClipBindingConstant; + //public List m_Events; public AnimationClip(ObjectReader reader) : base(reader) diff --git a/AssetStudio/Classes/AnimatorController.cs b/AssetStudio/Classes/AnimatorController.cs index e83b825e..7bbacfdc 100644 --- a/AssetStudio/Classes/AnimatorController.cs +++ b/AssetStudio/Classes/AnimatorController.cs @@ -8,9 +8,9 @@ namespace AssetStudio { public class HumanPoseMask { - public uint word0 { get; set; } - public uint word1 { get; set; } - public uint word2 { get; set; } + public uint word0; + public uint word1; + public uint word2; public HumanPoseMask(ObjectReader reader) { @@ -25,8 +25,8 @@ public HumanPoseMask(ObjectReader reader) public class SkeletonMaskElement { - public uint m_PathHash { get; set; } - public float m_Weight { get; set; } + public uint m_PathHash; + public float m_Weight; public SkeletonMaskElement(ObjectReader reader) { @@ -37,7 +37,7 @@ public SkeletonMaskElement(ObjectReader reader) public class SkeletonMask { - public SkeletonMaskElement[] m_Data { get; set; } + public SkeletonMaskElement[] m_Data; public SkeletonMask(ObjectReader reader) { @@ -52,15 +52,15 @@ public SkeletonMask(ObjectReader reader) public class LayerConstant { - public uint m_StateMachineIndex { get; set; } - public uint m_StateMachineMotionSetIndex { get; set; } - public HumanPoseMask m_BodyMask { get; set; } - public SkeletonMask m_SkeletonMask { get; set; } - public uint m_Binding { get; set; } - public int m_LayerBlendingMode { get; set; } - public float m_DefaultWeight { get; set; } - public bool m_IKPass { get; set; } - public bool m_SyncedLayerAffectsTiming { get; set; } + public uint m_StateMachineIndex; + public uint m_StateMachineMotionSetIndex; + public HumanPoseMask m_BodyMask; + public SkeletonMask m_SkeletonMask; + public uint m_Binding; + public int m_LayerBlendingMode; + public float m_DefaultWeight; + public bool m_IKPass; + public bool m_SyncedLayerAffectsTiming; public LayerConstant(ObjectReader reader) { @@ -79,10 +79,10 @@ public LayerConstant(ObjectReader reader) public class ConditionConstant { - public uint m_ConditionMode { get; set; } - public uint m_EventID { get; set; } - public float m_EventThreshold { get; set; } - public float m_ExitTime { get; set; } + public uint m_ConditionMode; + public uint m_EventID; + public float m_EventThreshold; + public float m_ExitTime; public ConditionConstant(ObjectReader reader) { @@ -95,20 +95,20 @@ public ConditionConstant(ObjectReader reader) public class TransitionConstant { - public ConditionConstant[] m_ConditionConstantArray { get; set; } - public uint m_DestinationState { get; set; } - public uint m_FullPathID { get; set; } - public uint m_ID { get; set; } - public uint m_UserID { get; set; } - public float m_TransitionDuration { get; set; } - public float m_TransitionOffset { get; set; } - public float m_ExitTime { get; set; } - public bool m_HasExitTime { get; set; } - public bool m_HasFixedDuration { get; set; } - public int m_InterruptionSource { get; set; } - public bool m_OrderedInterruption { get; set; } - public bool m_Atomic { get; set; } - public bool m_CanTransitionToSelf { get; set; } + public ConditionConstant[] m_ConditionConstantArray; + public uint m_DestinationState; + public uint m_FullPathID; + public uint m_ID; + public uint m_UserID; + public float m_TransitionDuration; + public float m_TransitionOffset; + public float m_ExitTime; + public bool m_HasExitTime; + public bool m_HasFixedDuration; + public int m_InterruptionSource; + public bool m_OrderedInterruption; + public bool m_Atomic; + public bool m_CanTransitionToSelf; public TransitionConstant(ObjectReader reader) { @@ -151,8 +151,8 @@ public TransitionConstant(ObjectReader reader) public class LeafInfoConstant { - public uint[] m_IDArray { get; set; } - public uint m_IndexOffset { get; set; } + public uint[] m_IDArray; + public uint m_IndexOffset; public LeafInfoConstant(ObjectReader reader) { @@ -163,7 +163,7 @@ public LeafInfoConstant(ObjectReader reader) public class MotionNeighborList { - public uint[] m_NeighborArray { get; set; } + public uint[] m_NeighborArray; public MotionNeighborList(ObjectReader reader) { @@ -173,11 +173,11 @@ public MotionNeighborList(ObjectReader reader) public class Blend2dDataConstant { - public Vector2[] m_ChildPositionArray { get; set; } - public float[] m_ChildMagnitudeArray { get; set; } - public Vector2[] m_ChildPairVectorArray { get; set; } - public float[] m_ChildPairAvgMagInvArray { get; set; } - public MotionNeighborList[] m_ChildNeighborListArray { get; set; } + public Vector2[] m_ChildPositionArray; + public float[] m_ChildMagnitudeArray; + public Vector2[] m_ChildPairVectorArray; + public float[] m_ChildPairAvgMagInvArray; + public MotionNeighborList[] m_ChildNeighborListArray; public Blend2dDataConstant(ObjectReader reader) { @@ -197,7 +197,7 @@ public Blend2dDataConstant(ObjectReader reader) public class Blend1dDataConstant // wrong labeled { - public float[] m_ChildThresholdArray { get; set; } + public float[] m_ChildThresholdArray; public Blend1dDataConstant(ObjectReader reader) { @@ -207,8 +207,8 @@ public Blend1dDataConstant(ObjectReader reader) public class BlendDirectDataConstant { - public uint[] m_ChildBlendEventIDArray { get; set; } - public bool m_NormalizedBlendValues { get; set; } + public uint[] m_ChildBlendEventIDArray; + public bool m_NormalizedBlendValues; public BlendDirectDataConstant(ObjectReader reader) { @@ -220,18 +220,18 @@ public BlendDirectDataConstant(ObjectReader reader) public class BlendTreeNodeConstant { - public uint m_BlendType { get; set; } - public uint m_BlendEventID { get; set; } - public uint m_BlendEventYID { get; set; } - public uint[] m_ChildIndices { get; set; } - public Blend1dDataConstant m_Blend1dData { get; set; } - public Blend2dDataConstant m_Blend2dData { get; set; } - public BlendDirectDataConstant m_BlendDirectData { get; set; } - public uint m_ClipID { get; set; } - public uint m_ClipIndex { get; set; } - public float m_Duration { get; set; } - public float m_CycleOffset { get; set; } - public bool m_Mirror { get; set; } + public uint m_BlendType; + public uint m_BlendEventID; + public uint m_BlendEventYID; + public uint[] m_ChildIndices; + public Blend1dDataConstant m_Blend1dData; + public Blend2dDataConstant m_Blend2dData; + public BlendDirectDataConstant m_BlendDirectData; + public uint m_ClipID; + public uint m_ClipIndex; + public float m_Duration; + public float m_CycleOffset; + public bool m_Mirror; public BlendTreeNodeConstant(ObjectReader reader) { @@ -262,7 +262,7 @@ public BlendTreeNodeConstant(ObjectReader reader) public class BlendTreeConstant { - public BlendTreeNodeConstant[] m_NodeArray { get; set; } + public BlendTreeNodeConstant[] m_NodeArray; public BlendTreeConstant(ObjectReader reader) { @@ -278,23 +278,23 @@ public BlendTreeConstant(ObjectReader reader) public class StateConstant { - public TransitionConstant[] m_TransitionConstantArray { get; set; } - public int[] m_BlendTreeConstantIndexArray { get; set; } - public LeafInfoConstant[] m_LeafInfoArray { get; set; } - public BlendTreeConstant[] m_BlendTreeConstantArray { get; set; } - public uint m_NameID { get; set; } - public uint m_PathID { get; set; } - public uint m_FullPathID { get; set; } - public uint m_TagID { get; set; } - public uint m_SpeedParamID { get; set; } - public uint m_MirrorParamID { get; set; } - public uint m_CycleOffsetParamID { get; set; } - public float m_Speed { get; set; } - public float m_CycleOffset { get; set; } - public bool m_IKOnFeet { get; set; } - public bool m_WriteDefaultValues { get; set; } - public bool m_Loop { get; set; } - public bool m_Mirror { get; set; } + public TransitionConstant[] m_TransitionConstantArray; + public int[] m_BlendTreeConstantIndexArray; + public LeafInfoConstant[] m_LeafInfoArray; + public BlendTreeConstant[] m_BlendTreeConstantArray; + public uint m_NameID; + public uint m_PathID; + public uint m_FullPathID; + public uint m_TagID; + public uint m_SpeedParamID; + public uint m_MirrorParamID; + public uint m_CycleOffsetParamID; + public float m_Speed; + public float m_CycleOffset; + public bool m_IKOnFeet; + public bool m_WriteDefaultValues; + public bool m_Loop; + public bool m_Mirror; public StateConstant(ObjectReader reader) { @@ -366,8 +366,8 @@ public StateConstant(ObjectReader reader) public class SelectorTransitionConstant { - public uint m_Destination { get; set; } - public ConditionConstant[] m_ConditionConstantArray { get; set; } + public uint m_Destination; + public ConditionConstant[] m_ConditionConstantArray; public SelectorTransitionConstant(ObjectReader reader) { @@ -384,9 +384,9 @@ public SelectorTransitionConstant(ObjectReader reader) public class SelectorStateConstant { - public SelectorTransitionConstant[] m_TransitionConstantArray { get; set; } - public uint m_FullPathID { get; set; } - public bool m_isEntry { get; set; } + public SelectorTransitionConstant[] m_TransitionConstantArray; + public uint m_FullPathID; + public bool m_isEntry; public SelectorStateConstant(ObjectReader reader) { @@ -405,11 +405,11 @@ public SelectorStateConstant(ObjectReader reader) public class StateMachineConstant { - public StateConstant[] m_StateConstantArray { get; set; } - public TransitionConstant[] m_AnyStateTransitionConstantArray { get; set; } - public SelectorStateConstant[] m_SelectorStateConstantArray { get; set; } - public uint m_DefaultState { get; set; } - public uint m_MotionSetCount { get; set; } + public StateConstant[] m_StateConstantArray; + public TransitionConstant[] m_AnyStateTransitionConstantArray; + public SelectorStateConstant[] m_SelectorStateConstantArray; + public uint m_DefaultState; + public uint m_MotionSetCount; public StateMachineConstant(ObjectReader reader) { @@ -445,12 +445,12 @@ public StateMachineConstant(ObjectReader reader) public class ValueArray { - public bool[] m_BoolValues { get; set; } - public int[] m_IntValues { get; set; } - public float[] m_FloatValues { get; set; } - public object[] m_PositionValues { get; set; } - public Vector4[] m_QuaternionValues { get; set; } - public object[] m_ScaleValues { get; set; } + public bool[] m_BoolValues; + public int[] m_IntValues; + public float[] m_FloatValues; + public object[] m_PositionValues; + public Vector4[] m_QuaternionValues; + public object[] m_ScaleValues; public ValueArray(ObjectReader reader) { @@ -505,10 +505,10 @@ public ValueArray(ObjectReader reader) public class ControllerConstant { - public LayerConstant[] m_LayerArray { get; set; } - public StateMachineConstant[] m_StateMachineArray { get; set; } - public ValueArrayConstant m_Values { get; set; } - public ValueArray m_DefaultValues { get; set; } + public LayerConstant[] m_LayerArray; + public StateMachineConstant[] m_StateMachineArray; + public ValueArrayConstant m_Values; + public ValueArray m_DefaultValues; public ControllerConstant(ObjectReader reader) { diff --git a/AssetStudio/Classes/Avatar.cs b/AssetStudio/Classes/Avatar.cs index 67199e79..7c516ee8 100644 --- a/AssetStudio/Classes/Avatar.cs +++ b/AssetStudio/Classes/Avatar.cs @@ -5,8 +5,8 @@ namespace AssetStudio { public class Node { - public int m_ParentId { get; set; } - public int m_AxesId { get; set; } + public int m_ParentId; + public int m_AxesId; public Node(ObjectReader reader) { @@ -17,8 +17,8 @@ public Node(ObjectReader reader) public class Limit { - public object m_Min { get; set; } - public object m_Max { get; set; } + public object m_Min; + public object m_Max; public Limit(ObjectReader reader) { @@ -38,12 +38,12 @@ public Limit(ObjectReader reader) public class Axes { - public Vector4 m_PreQ { get; set; } - public Vector4 m_PostQ { get; set; } - public object m_Sgn { get; set; } - public Limit m_Limit { get; set; } - public float m_Length { get; set; } - public uint m_Type { get; set; } + public Vector4 m_PreQ; + public Vector4 m_PostQ; + public object m_Sgn; + public Limit m_Limit; + public float m_Length; + public uint m_Type; public Axes(ObjectReader reader) { @@ -66,9 +66,9 @@ public Axes(ObjectReader reader) public class Skeleton { - public List m_Node { get; set; } - public List m_ID { get; set; } - public List m_AxesArray { get; set; } + public List m_Node; + public List m_ID; + public List m_AxesArray; public Skeleton(ObjectReader reader) @@ -98,7 +98,7 @@ public Skeleton(ObjectReader reader) public class SkeletonPose { - public List m_X { get; set; } + public List m_X; public SkeletonPose() { @@ -118,7 +118,7 @@ public SkeletonPose(ObjectReader reader) public class Hand { - public List m_HandBoneIndex { get; set; } + public List m_HandBoneIndex; public Hand(ObjectReader reader) { @@ -133,9 +133,9 @@ public Hand(ObjectReader reader) public class Handle { - public xform m_X { get; set; } - public uint m_ParentHumanIndex { get; set; } - public uint m_ID { get; set; } + public xform m_X; + public uint m_ParentHumanIndex; + public uint m_ID; public Handle(ObjectReader reader) { @@ -147,15 +147,15 @@ public Handle(ObjectReader reader) public class Collider { - public xform m_X { get; set; } - public uint m_Type { get; set; } - public uint m_XMotionType { get; set; } - public uint m_YMotionType { get; set; } - public uint m_ZMotionType { get; set; } - public float m_MinLimitX { get; set; } - public float m_MaxLimitX { get; set; } - public float m_MaxLimitY { get; set; } - public float m_MaxLimitZ { get; set; } + public xform m_X; + public uint m_Type; + public uint m_XMotionType; + public uint m_YMotionType; + public uint m_ZMotionType; + public float m_MinLimitX; + public float m_MaxLimitX; + public float m_MaxLimitY; + public float m_MaxLimitZ; public Collider(ObjectReader reader) { @@ -173,27 +173,27 @@ public Collider(ObjectReader reader) public class Human { - public xform m_RootX { get; set; } - public Skeleton m_Skeleton { get; set; } - public SkeletonPose m_SkeletonPose { get; set; } - public Hand m_LeftHand { get; set; } - public Hand m_RightHand { get; set; } - public List m_Handles { get; set; } - public List m_ColliderArray { get; set; } - public List m_HumanBoneIndex { get; set; } - public List m_HumanBoneMass { get; set; } - public List m_ColliderIndex { get; set; } - public float m_Scale { get; set; } - public float m_ArmTwist { get; set; } - public float m_ForeArmTwist { get; set; } - public float m_UpperLegTwist { get; set; } - public float m_LegTwist { get; set; } - public float m_ArmStretch { get; set; } - public float m_LegStretch { get; set; } - public float m_FeetSpacing { get; set; } - public bool m_HasLeftHand { get; set; } - public bool m_HasRightHand { get; set; } - public bool m_HasTDoF { get; set; } + public xform m_RootX; + public Skeleton m_Skeleton; + public SkeletonPose m_SkeletonPose; + public Hand m_LeftHand; + public Hand m_RightHand; + public List m_Handles; + public List m_ColliderArray; + public List m_HumanBoneIndex; + public List m_HumanBoneMass; + public List m_ColliderIndex; + public float m_Scale; + public float m_ArmTwist; + public float m_ForeArmTwist; + public float m_UpperLegTwist; + public float m_LegTwist; + public float m_ArmStretch; + public float m_LegStretch; + public float m_FeetSpacing; + public bool m_HasLeftHand; + public bool m_HasRightHand; + public bool m_HasTDoF; public Human(ObjectReader reader) { @@ -262,18 +262,18 @@ public Human(ObjectReader reader) public class AvatarConstant { - public Skeleton m_AvatarSkeleton { get; set; } - public SkeletonPose m_AvatarSkeletonPose { get; set; } - public SkeletonPose m_DefaultPose { get; set; } - public List m_SkeletonNameIDArray { get; set; } - public Human m_Human { get; set; } - public List m_HumanSkeletonIndexArray { get; set; } - public List m_HumanSkeletonReverseIndexArray { get; set; } - public int m_RootMotionBoneIndex { get; set; } - public xform m_RootMotionBoneX { get; set; } - public Skeleton m_RootMotionSkeleton { get; set; } - public SkeletonPose m_RootMotionSkeletonPose { get; set; } - public List m_RootMotionSkeletonIndexArray { get; set; } + public Skeleton m_AvatarSkeleton; + public SkeletonPose m_AvatarSkeletonPose; + public SkeletonPose m_DefaultPose; + public List m_SkeletonNameIDArray; + public Human m_Human; + public List m_HumanSkeletonIndexArray; + public List m_HumanSkeletonReverseIndexArray; + public int m_RootMotionBoneIndex; + public xform m_RootMotionBoneX; + public Skeleton m_RootMotionSkeleton; + public SkeletonPose m_RootMotionSkeletonPose; + public List m_RootMotionSkeletonIndexArray; public AvatarConstant(ObjectReader reader) { @@ -331,9 +331,9 @@ public AvatarConstant(ObjectReader reader) public sealed class Avatar : NamedObject { - public uint m_AvatarSize { get; set; } - public AvatarConstant m_Avatar { get; set; } - public List> m_TOS { get; set; } + public uint m_AvatarSize; + public AvatarConstant m_Avatar; + public List> m_TOS; public Avatar(ObjectReader reader) : base(reader) { diff --git a/AssetStudio/Classes/Mesh.cs b/AssetStudio/Classes/Mesh.cs index 78621cb2..961569f6 100644 --- a/AssetStudio/Classes/Mesh.cs +++ b/AssetStudio/Classes/Mesh.cs @@ -66,10 +66,10 @@ public class BlendShapeData { public class BlendShapeVertex { - public Vector3 vertex { get; set; } - public Vector3 normal { get; set; } - public Vector3 tangent { get; set; } - public uint index { get; set; } + public Vector3 vertex; + public Vector3 normal; + public Vector3 tangent; + public uint index; public BlendShapeVertex(ObjectReader reader) { @@ -82,10 +82,10 @@ public BlendShapeVertex(ObjectReader reader) public class MeshBlendShape { - public uint firstVertex { get; set; } - public uint vertexCount { get; set; } - public bool hasNormals { get; set; } - public bool hasTangents { get; set; } + public uint firstVertex; + public uint vertexCount; + public bool hasNormals; + public bool hasTangents; public MeshBlendShape(ObjectReader reader) { @@ -99,10 +99,10 @@ public MeshBlendShape(ObjectReader reader) public class MeshBlendShapeChannel { - public string name { get; set; } - public uint nameHash { get; set; } - public int frameIndex { get; set; } - public int frameCount { get; set; } + public string name; + public uint nameHash; + public int frameIndex; + public int frameCount; public MeshBlendShapeChannel(ObjectReader reader) { @@ -113,10 +113,10 @@ public MeshBlendShapeChannel(ObjectReader reader) } } - public List vertices { get; set; } - public List shapes { get; set; } - public List channels { get; set; } - public List fullWeights { get; set; } + public List vertices; + public List shapes; + public List channels; + public List fullWeights; public BlendShapeData(ObjectReader reader) { diff --git a/AssetStudio/Classes/Shader.cs b/AssetStudio/Classes/Shader.cs index 123c9663..b19c92ab 100644 --- a/AssetStudio/Classes/Shader.cs +++ b/AssetStudio/Classes/Shader.cs @@ -6,8 +6,8 @@ namespace AssetStudio { public class StructParameter { - public List m_MatrixParams { get; set; } - public List m_VectorParams { get; set; } + public List m_MatrixParams; + public List m_VectorParams; public StructParameter(BinaryReader reader) { @@ -34,8 +34,8 @@ public StructParameter(BinaryReader reader) public class SamplerParameter { - public uint sampler { get; set; } - public int bindPoint { get; set; } + public uint sampler; + public int bindPoint; public SamplerParameter(BinaryReader reader) { @@ -43,28 +43,49 @@ public SamplerParameter(BinaryReader reader) bindPoint = reader.ReadInt32(); } } + public enum TextureDimension + { + kTexDimUnknown = -1, + kTexDimNone = 0, + kTexDimAny = 1, + kTexDim2D = 2, + kTexDim3D = 3, + kTexDimCUBE = 4, + kTexDim2DArray = 5, + kTexDimCubeArray = 6, + kTexDimForce32Bit = 2147483647 + }; public class SerializedTextureProperty { - public string m_DefaultName { get; set; } - public int m_TexDim { get; set; } + public string m_DefaultName; + public TextureDimension m_TexDim; public SerializedTextureProperty(BinaryReader reader) { m_DefaultName = reader.ReadAlignedString(); - m_TexDim = reader.ReadInt32(); + m_TexDim = (TextureDimension)reader.ReadInt32(); } } + public enum SerializedPropertyType + { + kColor = 0, + kVector = 1, + kFloat = 2, + kRange = 3, + kTexture = 4 + }; + public class SerializedProperty { - public string m_Name { get; set; } - public string m_Description { get; set; } - public List m_Attributes { get; set; } - public int m_Type { get; set; } - public uint m_Flags { get; set; } - public List m_DefValue { get; set; } - public SerializedTextureProperty m_DefTexture { get; set; } + public string m_Name; + public string m_Description; + public List m_Attributes; + public SerializedPropertyType m_Type; + public uint m_Flags; + public List m_DefValue; + public SerializedTextureProperty m_DefTexture; public SerializedProperty(BinaryReader reader) { @@ -78,7 +99,7 @@ public SerializedProperty(BinaryReader reader) m_Attributes.Add(reader.ReadAlignedString()); } - m_Type = reader.ReadInt32(); + m_Type = (SerializedPropertyType)reader.ReadInt32(); m_Flags = reader.ReadUInt32(); int numValues = 4; @@ -94,7 +115,7 @@ public SerializedProperty(BinaryReader reader) public class SerializedProperties { - public List m_Props { get; set; } + public List m_Props; public SerializedProperties(BinaryReader reader) { @@ -109,8 +130,8 @@ public SerializedProperties(BinaryReader reader) public class SerializedShaderFloatValue { - public float val { get; set; } - public string name { get; set; } + public float val; + public string name; public SerializedShaderFloatValue(BinaryReader reader) { @@ -121,13 +142,13 @@ public SerializedShaderFloatValue(BinaryReader reader) public class SerializedShaderRTBlendState { - public SerializedShaderFloatValue srcBlend { get; set; } - public SerializedShaderFloatValue destBlend { get; set; } - public SerializedShaderFloatValue srcBlendAlpha { get; set; } - public SerializedShaderFloatValue destBlendAlpha { get; set; } - public SerializedShaderFloatValue blendOp { get; set; } - public SerializedShaderFloatValue blendOpAlpha { get; set; } - public SerializedShaderFloatValue colMask { get; set; } + public SerializedShaderFloatValue srcBlend; + public SerializedShaderFloatValue destBlend; + public SerializedShaderFloatValue srcBlendAlpha; + public SerializedShaderFloatValue destBlendAlpha; + public SerializedShaderFloatValue blendOp; + public SerializedShaderFloatValue blendOpAlpha; + public SerializedShaderFloatValue colMask; public SerializedShaderRTBlendState(BinaryReader reader) { @@ -143,10 +164,10 @@ public SerializedShaderRTBlendState(BinaryReader reader) public class SerializedStencilOp { - public SerializedShaderFloatValue pass { get; set; } - public SerializedShaderFloatValue fail { get; set; } - public SerializedShaderFloatValue zFail { get; set; } - public SerializedShaderFloatValue comp { get; set; } + public SerializedShaderFloatValue pass; + public SerializedShaderFloatValue fail; + public SerializedShaderFloatValue zFail; + public SerializedShaderFloatValue comp; public SerializedStencilOp(BinaryReader reader) { @@ -159,11 +180,11 @@ public SerializedStencilOp(BinaryReader reader) public class SerializedShaderVectorValue { - public SerializedShaderFloatValue x { get; set; } - public SerializedShaderFloatValue y { get; set; } - public SerializedShaderFloatValue z { get; set; } - public SerializedShaderFloatValue w { get; set; } - public string name { get; set; } + public SerializedShaderFloatValue x; + public SerializedShaderFloatValue y; + public SerializedShaderFloatValue z; + public SerializedShaderFloatValue w; + public string name; public SerializedShaderVectorValue(BinaryReader reader) { @@ -175,40 +196,50 @@ public SerializedShaderVectorValue(BinaryReader reader) } } + public enum FogMode + { + kFogUnknown = -1, + kFogDisabled = 0, + kFogLinear = 1, + kFogExp = 2, + kFogExp2 = 3, + kFogModeCount = 4 + }; + public class SerializedShaderState { - public string m_Name { get; set; } - public SerializedShaderRTBlendState rtBlend0 { get; set; } - public SerializedShaderRTBlendState rtBlend1 { get; set; } - public SerializedShaderRTBlendState rtBlend2 { get; set; } - public SerializedShaderRTBlendState rtBlend3 { get; set; } - public SerializedShaderRTBlendState rtBlend4 { get; set; } - public SerializedShaderRTBlendState rtBlend5 { get; set; } - public SerializedShaderRTBlendState rtBlend6 { get; set; } - public SerializedShaderRTBlendState rtBlend7 { get; set; } - public bool rtSeparateBlend { get; set; } - public SerializedShaderFloatValue zClip { get; set; } - public SerializedShaderFloatValue zTest { get; set; } - public SerializedShaderFloatValue zWrite { get; set; } - public SerializedShaderFloatValue culling { get; set; } - public SerializedShaderFloatValue offsetFactor { get; set; } - public SerializedShaderFloatValue offsetUnits { get; set; } - public SerializedShaderFloatValue alphaToMask { get; set; } - public SerializedStencilOp stencilOp { get; set; } - public SerializedStencilOp stencilOpFront { get; set; } - public SerializedStencilOp stencilOpBack { get; set; } - public SerializedShaderFloatValue stencilReadMask { get; set; } - public SerializedShaderFloatValue stencilWriteMask { get; set; } - public SerializedShaderFloatValue stencilRef { get; set; } - public SerializedShaderFloatValue fogStart { get; set; } - public SerializedShaderFloatValue fogEnd { get; set; } - public SerializedShaderFloatValue fogDensity { get; set; } - public SerializedShaderVectorValue fogColor { get; set; } - public int fogMode { get; set; } - public int gpuProgramID { get; set; } - public SerializedTagMap m_Tags { get; set; } - public int m_LOD { get; set; } - public bool lighting { get; set; } + public string m_Name; + public SerializedShaderRTBlendState rtBlend0; + public SerializedShaderRTBlendState rtBlend1; + public SerializedShaderRTBlendState rtBlend2; + public SerializedShaderRTBlendState rtBlend3; + public SerializedShaderRTBlendState rtBlend4; + public SerializedShaderRTBlendState rtBlend5; + public SerializedShaderRTBlendState rtBlend6; + public SerializedShaderRTBlendState rtBlend7; + public bool rtSeparateBlend; + public SerializedShaderFloatValue zClip; + public SerializedShaderFloatValue zTest; + public SerializedShaderFloatValue zWrite; + public SerializedShaderFloatValue culling; + public SerializedShaderFloatValue offsetFactor; + public SerializedShaderFloatValue offsetUnits; + public SerializedShaderFloatValue alphaToMask; + public SerializedStencilOp stencilOp; + public SerializedStencilOp stencilOpFront; + public SerializedStencilOp stencilOpBack; + public SerializedShaderFloatValue stencilReadMask; + public SerializedShaderFloatValue stencilWriteMask; + public SerializedShaderFloatValue stencilRef; + public SerializedShaderFloatValue fogStart; + public SerializedShaderFloatValue fogEnd; + public SerializedShaderFloatValue fogDensity; + public SerializedShaderVectorValue fogColor; + public FogMode fogMode; + public int gpuProgramID; + public SerializedTagMap m_Tags; + public int m_LOD; + public bool lighting; public SerializedShaderState(ObjectReader reader) { @@ -245,7 +276,7 @@ public SerializedShaderState(ObjectReader reader) fogEnd = new SerializedShaderFloatValue(reader); fogDensity = new SerializedShaderFloatValue(reader); fogColor = new SerializedShaderVectorValue(reader); - fogMode = reader.ReadInt32(); + fogMode = (FogMode)reader.ReadInt32(); gpuProgramID = reader.ReadInt32(); m_Tags = new SerializedTagMap(reader); m_LOD = reader.ReadInt32(); @@ -256,8 +287,8 @@ public SerializedShaderState(ObjectReader reader) public class ShaderBindChannel { - public sbyte source { get; set; } - public sbyte target { get; set; } + public sbyte source; + public sbyte target; public ShaderBindChannel(BinaryReader reader) { @@ -268,8 +299,8 @@ public ShaderBindChannel(BinaryReader reader) public class ParserBindChannels { - public List m_Channels { get; set; } - public uint m_SourceMap { get; set; } + public List m_Channels; + public uint m_SourceMap; public ParserBindChannels(BinaryReader reader) { @@ -287,11 +318,11 @@ public ParserBindChannels(BinaryReader reader) public class VectorParameter { - public int m_NameIndex { get; set; } - public int m_Index { get; set; } - public int m_ArraySize { get; set; } - public sbyte m_Type { get; set; } - public sbyte m_Dim { get; set; } + public int m_NameIndex; + public int m_Index; + public int m_ArraySize; + public sbyte m_Type; + public sbyte m_Dim; public VectorParameter(BinaryReader reader) { @@ -306,11 +337,11 @@ public VectorParameter(BinaryReader reader) public class MatrixParameter { - public int m_NameIndex { get; set; } - public int m_Index { get; set; } - public int m_ArraySize { get; set; } - public sbyte m_Type { get; set; } - public sbyte m_RowCount { get; set; } + public int m_NameIndex; + public int m_Index; + public int m_ArraySize; + public sbyte m_Type; + public sbyte m_RowCount; public MatrixParameter(BinaryReader reader) { @@ -325,10 +356,10 @@ public MatrixParameter(BinaryReader reader) public class TextureParameter { - public int m_NameIndex { get; set; } - public int m_Index { get; set; } - public int m_SamplerIndex { get; set; } - public sbyte m_Dim { get; set; } + public int m_NameIndex; + public int m_Index; + public int m_SamplerIndex; + public sbyte m_Dim; public TextureParameter(ObjectReader reader) { @@ -348,8 +379,8 @@ public TextureParameter(ObjectReader reader) public class BufferBinding { - public int m_NameIndex { get; set; } - public int m_Index { get; set; } + public int m_NameIndex; + public int m_Index; public BufferBinding(BinaryReader reader) { @@ -360,11 +391,11 @@ public BufferBinding(BinaryReader reader) public class ConstantBuffer { - public int m_NameIndex { get; set; } - public List m_MatrixParams { get; set; } - public List m_VectorParams { get; set; } - public List m_StructParams { get; set; } - public int m_Size { get; set; } + public int m_NameIndex; + public List m_MatrixParams; + public List m_VectorParams; + public List m_StructParams; + public int m_Size; public ConstantBuffer(ObjectReader reader) { @@ -400,9 +431,9 @@ public ConstantBuffer(ObjectReader reader) public class UAVParameter { - public int m_NameIndex { get; set; } - public int m_Index { get; set; } - public int m_OriginalIndex { get; set; } + public int m_NameIndex; + public int m_Index; + public int m_OriginalIndex; public UAVParameter(BinaryReader reader) { @@ -412,21 +443,52 @@ public UAVParameter(BinaryReader reader) } } + public enum ShaderGpuProgramType + { + kShaderGpuProgramUnknown = 0, + kShaderGpuProgramGLLegacy = 1, + kShaderGpuProgramGLES31AEP = 2, + kShaderGpuProgramGLES31 = 3, + kShaderGpuProgramGLES3 = 4, + kShaderGpuProgramGLES = 5, + kShaderGpuProgramGLCore32 = 6, + kShaderGpuProgramGLCore41 = 7, + kShaderGpuProgramGLCore43 = 8, + kShaderGpuProgramDX9VertexSM20 = 9, + kShaderGpuProgramDX9VertexSM30 = 10, + kShaderGpuProgramDX9PixelSM20 = 11, + kShaderGpuProgramDX9PixelSM30 = 12, + kShaderGpuProgramDX10Level9Vertex = 13, + kShaderGpuProgramDX10Level9Pixel = 14, + kShaderGpuProgramDX11VertexSM40 = 15, + kShaderGpuProgramDX11VertexSM50 = 16, + kShaderGpuProgramDX11PixelSM40 = 17, + kShaderGpuProgramDX11PixelSM50 = 18, + kShaderGpuProgramDX11GeometrySM40 = 19, + kShaderGpuProgramDX11GeometrySM50 = 20, + kShaderGpuProgramDX11HullSM50 = 21, + kShaderGpuProgramDX11DomainSM50 = 22, + kShaderGpuProgramMetalVS = 23, + kShaderGpuProgramMetalFS = 24, + kShaderGpuProgramSPIRV = 25, + kShaderGpuProgramConsole = 26, + }; + public class SerializedSubProgram { - public uint m_BlobIndex { get; set; } - public ParserBindChannels m_Channels { get; set; } - public List m_KeywordIndices { get; set; } - public sbyte m_ShaderHardwareTier { get; set; } - public sbyte m_GpuProgramType { get; set; } - public List m_VectorParams { get; set; } - public List m_MatrixParams { get; set; } - public List m_TextureParams { get; set; } - public List m_BufferParams { get; set; } - public List m_ConstantBuffers { get; set; } - public List m_ConstantBufferBindings { get; set; } - public List m_UAVParams { get; set; } - public List m_Samplers { get; set; } + public uint m_BlobIndex; + public ParserBindChannels m_Channels; + public List m_KeywordIndices; + public sbyte m_ShaderHardwareTier; + public ShaderGpuProgramType m_GpuProgramType; + public List m_VectorParams; + public List m_MatrixParams; + public List m_TextureParams; + public List m_BufferParams; + public List m_ConstantBuffers; + public List m_ConstantBufferBindings; + public List m_UAVParams; + public List m_Samplers; public SerializedSubProgram(ObjectReader reader) { @@ -446,7 +508,7 @@ public SerializedSubProgram(ObjectReader reader) reader.AlignStream(4); } m_ShaderHardwareTier = reader.ReadSByte(); - m_GpuProgramType = reader.ReadSByte(); + m_GpuProgramType = (ShaderGpuProgramType)reader.ReadSByte(); reader.AlignStream(4); int numVectorParams = reader.ReadInt32(); @@ -516,7 +578,7 @@ public SerializedSubProgram(ObjectReader reader) public class SerializedProgram { - public List m_SubPrograms { get; set; } + public List m_SubPrograms; public SerializedProgram(ObjectReader reader) { @@ -529,22 +591,29 @@ public SerializedProgram(ObjectReader reader) } } + public enum PassType + { + kPassTypeNormal = 0, + kPassTypeUse = 1, + kPassTypeGrab = 2 + }; + public class SerializedPass { - public List> m_NameIndices { get; set; } - public int m_Type { get; set; } - public SerializedShaderState m_State { get; set; } - public uint m_ProgramMask { get; set; } - public SerializedProgram progVertex { get; set; } - public SerializedProgram progFragment { get; set; } - public SerializedProgram progGeometry { get; set; } - public SerializedProgram progHull { get; set; } - public SerializedProgram progDomain { get; set; } - public bool m_HasInstancingVariant { get; set; } - public string m_UseName { get; set; } - public string m_Name { get; set; } - public string m_TextureName { get; set; } - public SerializedTagMap m_Tags { get; set; } + public List> m_NameIndices; + public PassType m_Type; + public SerializedShaderState m_State; + public uint m_ProgramMask; + public SerializedProgram progVertex; + public SerializedProgram progFragment; + public SerializedProgram progGeometry; + public SerializedProgram progHull; + public SerializedProgram progDomain; + public bool m_HasInstancingVariant; + public string m_UseName; + public string m_Name; + public string m_TextureName; + public SerializedTagMap m_Tags; public SerializedPass(ObjectReader reader) { @@ -557,7 +626,7 @@ public SerializedPass(ObjectReader reader) m_NameIndices.Add(new KeyValuePair(reader.ReadAlignedString(), reader.ReadInt32())); } - m_Type = reader.ReadInt32(); + m_Type = (PassType)reader.ReadInt32(); m_State = new SerializedShaderState(reader); m_ProgramMask = reader.ReadUInt32(); progVertex = new SerializedProgram(reader); @@ -580,7 +649,7 @@ public SerializedPass(ObjectReader reader) public class SerializedTagMap { - public List> tags { get; set; } + public List> tags; public SerializedTagMap(BinaryReader reader) { @@ -595,9 +664,9 @@ public SerializedTagMap(BinaryReader reader) public class SerializedSubShader { - public List m_Passes { get; set; } - public SerializedTagMap m_Tags { get; set; } - public int m_LOD { get; set; } + public List m_Passes; + public SerializedTagMap m_Tags; + public int m_LOD; public SerializedSubShader(ObjectReader reader) { @@ -615,8 +684,8 @@ public SerializedSubShader(ObjectReader reader) public class SerializedShaderDependency { - public string from { get; set; } - public string to { get; set; } + public string from; + public string to; public SerializedShaderDependency(BinaryReader reader) { @@ -627,13 +696,13 @@ public SerializedShaderDependency(BinaryReader reader) public class SerializedShader { - public SerializedProperties m_PropInfo { get; set; } - public List m_SubShaders { get; set; } - public string m_Name { get; set; } - public string m_CustomEditorName { get; set; } - public string m_FallbackName { get; set; } - public List m_Dependencies { get; set; } - public bool m_DisableNoSubshadersMessage { get; set; } + public SerializedProperties m_PropInfo; + public List m_SubShaders; + public string m_Name; + public string m_CustomEditorName; + public string m_FallbackName; + public List m_Dependencies; + public bool m_DisableNoSubshadersMessage; public SerializedShader(ObjectReader reader) { diff --git a/AssetStudio/StudioClasses/ShaderConverter.cs b/AssetStudio/StudioClasses/ShaderConverter.cs index 50088a27..578a1a9b 100644 --- a/AssetStudio/StudioClasses/ShaderConverter.cs +++ b/AssetStudio/StudioClasses/ShaderConverter.cs @@ -195,35 +195,4 @@ public string Export() return sb.ToString(); } } - - public enum ShaderGpuProgramType - { - kShaderGpuProgramUnknown = 0, - kShaderGpuProgramGLLegacy = 1, - kShaderGpuProgramGLES31AEP = 2, - kShaderGpuProgramGLES31 = 3, - kShaderGpuProgramGLES3 = 4, - kShaderGpuProgramGLES = 5, - kShaderGpuProgramGLCore32 = 6, - kShaderGpuProgramGLCore41 = 7, - kShaderGpuProgramGLCore43 = 8, - kShaderGpuProgramDX9VertexSM20 = 9, - kShaderGpuProgramDX9VertexSM30 = 10, - kShaderGpuProgramDX9PixelSM20 = 11, - kShaderGpuProgramDX9PixelSM30 = 12, - kShaderGpuProgramDX10Level9Vertex = 13, - kShaderGpuProgramDX10Level9Pixel = 14, - kShaderGpuProgramDX11VertexSM40 = 15, - kShaderGpuProgramDX11VertexSM50 = 16, - kShaderGpuProgramDX11PixelSM40 = 17, - kShaderGpuProgramDX11PixelSM50 = 18, - kShaderGpuProgramDX11GeometrySM40 = 19, - kShaderGpuProgramDX11GeometrySM50 = 20, - kShaderGpuProgramDX11HullSM50 = 21, - kShaderGpuProgramDX11DomainSM50 = 22, - kShaderGpuProgramMetalVS = 23, - kShaderGpuProgramMetalFS = 24, - kShaderGpuProgramSPIRV = 25, - kShaderGpuProgramConsole = 26, - }; }