diff --git a/.vscode/settings.json b/.vscode/settings.json index e232cd6..717ae9e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ -{ +{ "files.exclude": { "**/.DS_Store":true, @@ -51,5 +51,6 @@ "ProjectSettings/":true, "temp/":true, "Temp/":true - } + }, + "dotnet.preferCSharpExtension": true } \ No newline at end of file diff --git a/Assets/12_VFX Graphs/Smoke Thin.vfx b/Assets/12_VFX Graphs/Smoke Thin.vfx index 8de6019..bc1acd6 100644 --- a/Assets/12_VFX Graphs/Smoke Thin.vfx +++ b/Assets/12_VFX Graphs/Smoke Thin.vfx @@ -67,8 +67,8 @@ VisualEffectResource: lightProbeUsage: 0 m_CullingFlags: 0 m_UpdateMode: 0 - m_PreWarmDeltaTime: 0.05 - m_PreWarmStepCount: 0 + m_PreWarmDeltaTime: 0.25 + m_PreWarmStepCount: 400 m_InitialEventName: OnPlay m_InstancingMode: 0 m_InstancingCapacity: 64 diff --git a/Assets/12_VFX Graphs/Smoke.vfx b/Assets/12_VFX Graphs/Smoke.vfx index 7958ccf..aeea677 100644 --- a/Assets/12_VFX Graphs/Smoke.vfx +++ b/Assets/12_VFX Graphs/Smoke.vfx @@ -68,8 +68,8 @@ VisualEffectResource: lightProbeUsage: 0 m_CullingFlags: 0 m_UpdateMode: 0 - m_PreWarmDeltaTime: 0.05 - m_PreWarmStepCount: 0 + m_PreWarmDeltaTime: 0.25 + m_PreWarmStepCount: 400 m_InitialEventName: OnPlay m_InstancingMode: 0 m_InstancingCapacity: 64 @@ -183,11 +183,11 @@ MonoBehaviour: - {fileID: 8926484042661614580} - {fileID: 8926484042661614619} - {fileID: 8926484042661614669} - m_UIPosition: {x: 941.3827, y: 114.57214} + m_UIPosition: {x: 941, y: 185} m_UICollapsed: 0 m_UISuperCollapsed: 0 m_InputSlots: - - {fileID: 8926484042661614747} + - {fileID: 8926484042661614760} m_OutputSlots: [] m_Label: m_Data: {fileID: 8926484042661614568} @@ -714,7 +714,7 @@ MonoBehaviour: - {fileID: 8926484042661614633} - {fileID: 8926484042661614646} - {fileID: 8926484042661614672} - m_UIPosition: {x: 941, y: 790} + m_UIPosition: {x: 941, y: 805} m_UICollapsed: 0 m_UISuperCollapsed: 0 m_InputSlots: [] @@ -3142,7 +3142,7 @@ MonoBehaviour: needsComputeBounds: 0 boundsMode: 0 m_Space: 0 ---- !u!114 &8926484042661614747 +--- !u!114 &8926484042661614760 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3157,13 +3157,13 @@ MonoBehaviour: m_UIIgnoredErrors: [] m_Parent: {fileID: 0} m_Children: - - {fileID: 8926484042661614748} - - {fileID: 8926484042661614749} - - {fileID: 8926484042661614750} + - {fileID: 8926484042661614761} + - {fileID: 8926484042661614762} + - {fileID: 8926484042661614763} m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 - m_MasterSlot: {fileID: 8926484042661614747} + m_MasterSlot: {fileID: 8926484042661614760} m_MasterData: m_Owner: {fileID: 8926484042661614558} m_Value: @@ -3179,7 +3179,7 @@ MonoBehaviour: Culture=neutral, PublicKeyToken=null m_Direction: 0 m_LinkedSlots: [] ---- !u!114 &8926484042661614748 +--- !u!114 &8926484042661614761 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3192,12 +3192,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UIIgnoredErrors: [] - m_Parent: {fileID: 8926484042661614747} + m_Parent: {fileID: 8926484042661614760} m_Children: [] m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 - m_MasterSlot: {fileID: 8926484042661614747} + m_MasterSlot: {fileID: 8926484042661614760} m_MasterData: m_Owner: {fileID: 0} m_Value: @@ -3212,7 +3212,7 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] ---- !u!114 &8926484042661614749 +--- !u!114 &8926484042661614762 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3225,12 +3225,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UIIgnoredErrors: [] - m_Parent: {fileID: 8926484042661614747} + m_Parent: {fileID: 8926484042661614760} m_Children: [] m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 - m_MasterSlot: {fileID: 8926484042661614747} + m_MasterSlot: {fileID: 8926484042661614760} m_MasterData: m_Owner: {fileID: 0} m_Value: @@ -3245,7 +3245,7 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] ---- !u!114 &8926484042661614750 +--- !u!114 &8926484042661614763 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3258,12 +3258,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UIIgnoredErrors: [] - m_Parent: {fileID: 8926484042661614747} + m_Parent: {fileID: 8926484042661614760} m_Children: [] m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 - m_MasterSlot: {fileID: 8926484042661614747} + m_MasterSlot: {fileID: 8926484042661614760} m_MasterData: m_Owner: {fileID: 0} m_Value: diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index fb15d09..78a769b 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -203,6 +203,179 @@ MonoBehaviour: m_PositionUnits: 1 m_Speed: 10 m_Position: 0 +--- !u!1 &42386020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 42386021} + - component: {fileID: 42386023} + - component: {fileID: 42386022} + m_Layer: 0 + m_Name: Gizmo Manager (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &42386021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 42386020} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 760971828} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &42386022 +LineRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 42386020} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 1651406497} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: -400.8728, y: -21.97293, z: -268.7162} + - {x: -131.88246, y: -21.97293, z: -268.7162} + - {x: -131.88246, y: -21.97293, z: -85.93224} + - {x: -400.8728, y: -21.97293, z: -85.93224} + - {x: -400.8728, y: -21.97293, z: -268.7162} + - {x: -400.8728, y: 437.20514, z: -268.7162} + - {x: -131.88246, y: 437.20514, z: -268.7162} + - {x: -131.88246, y: -21.97293, z: -268.7162} + - {x: -131.88246, y: 437.20514, z: -268.7162} + - {x: -131.88246, y: 437.20514, z: -85.93224} + - {x: -131.88246, y: -21.97293, z: -85.93224} + - {x: -131.88246, y: 437.20514, z: -85.93224} + - {x: -400.8728, y: 437.20514, z: -85.93224} + - {x: -400.8728, y: -21.97293, z: -85.93224} + - {x: -400.8728, y: 437.20514, z: -85.93224} + - {x: -400.8728, y: 437.20514, z: -268.7162} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9525475 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 0.7995102, b: 0, a: 1} + key1: {r: 1, g: 0.9584536, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 1 + m_ColorSpace: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 1 +--- !u!114 &42386023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 42386020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea15476715398c499869b7cdc74bfa5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_VFX: {fileID: 574220079} --- !u!1 &45273095 GameObject: m_ObjectHideFlags: 0 @@ -571,7 +744,7 @@ MonoBehaviour: - m_Script m_LockStageInInspector: m_StreamingVersion: 20170927 - m_Priority: 90000 + m_Priority: 0 m_StandbyUpdate: 2 m_LookAt: {fileID: 469916971584254379} m_Follow: {fileID: 38443225415845789} @@ -609,7 +782,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153031623} serializedVersion: 2 - m_LocalRotation: {x: -0.000010761057, y: 0.9982297, z: 0.059476644, w: -0.000077618504} + m_LocalRotation: {x: -0.000010763111, y: 0.9982297, z: 0.059476666, w: -0.000077584016} m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1090,7 +1263,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 326736459} serializedVersion: 2 - m_LocalRotation: {x: -0.073961094, y: 0.9066138, z: 0.17882526, w: 0.3749702} + m_LocalRotation: {x: -0.07396109, y: 0.9066138, z: 0.17882524, w: 0.37497023} m_LocalPosition: {x: 17.7008, y: 8.655965, z: -0.081218004} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1346,7 +1519,7 @@ MonoBehaviour: m_BlendUpdateMethod: 1 m_DefaultBlend: m_Style: 1 - m_Time: 0 + m_Time: 3 m_CustomCurve: serializedVersion: 2 m_Curve: [] @@ -1373,7 +1546,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: clearColorMode: 1 - backgroundColorHDR: {r: 0, g: 0, b: 1, a: 1} + backgroundColorHDR: {r: 0.7924528, g: 0.068794996, b: 0.056069765, a: 1} clearDepth: 1 volumeLayerMask: serializedVersion: 2 @@ -2264,7 +2437,7 @@ GameObject: - component: {fileID: 574220082} - component: {fileID: 574220081} m_Layer: 10 - m_Name: Smoke + m_Name: Smoke Thin m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2682,7 +2855,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: clearColorMode: 1 - backgroundColorHDR: {r: 1, g: 0, b: 0, a: 0} + backgroundColorHDR: {r: 0.79129815, g: 0.06847818, b: 0.056128494, a: 0} clearDepth: 1 volumeLayerMask: serializedVersion: 2 @@ -2845,9 +3018,9 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 8 + m_Bits: 16392 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8600000, guid: d64162c865044fd41815ac076158a959, type: 2} + m_TargetTexture: {fileID: 0} m_TargetDisplay: 1 m_TargetEye: 3 m_HDR: 0 @@ -2943,6 +3116,8 @@ Transform: - {fileID: 842964162} - {fileID: 2024068565} - {fileID: 595798490} + - {fileID: 1864854691} + - {fileID: 42386021} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &766384027 @@ -3639,7 +3814,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 882491594} serializedVersion: 2 - m_LocalRotation: {x: 0.49182287, y: 0.0021121176, z: -0.00119306, w: 0.8706919} + m_LocalRotation: {x: 0.49182287, y: 0.0021121176, z: -0.0011930601, w: 0.8706919} m_LocalPosition: {x: 18.100853, y: 10.155965, z: -0.48116565} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4802,6 +4977,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1446210420} - {fileID: 153031625} - {fileID: 1955078060} - {fileID: 882491598} @@ -5201,11 +5377,11 @@ GameObject: - component: {fileID: 1446210419} m_Layer: 3 m_Name: Pose Camera - m_TagString: Untagged + m_TagString: vc_Compare m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1446210419 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5260,13 +5436,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1446210418} serializedVersion: 2 - m_LocalRotation: {x: 0.00000075398714, y: 0.9999878, z: -0.004940921, w: 0.00015259867} - m_LocalPosition: {x: -1.2322983, y: 1.530204, z: 8.3873825} + m_LocalRotation: {x: 0.0000007538141, y: 0.9999878, z: -0.004940901, w: 0.00015256426} + m_LocalPosition: {x: 18.109627, y: 8.274419, z: 9.536423} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 835970670} - m_Father: {fileID: 0} + m_Father: {fileID: 1346050330} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1450629402 GameObject: @@ -5666,7 +5842,7 @@ GameObject: - component: {fileID: 1621936323} - component: {fileID: 1621936322} m_Layer: 10 - m_Name: Smoke (1) + m_Name: Smoke Large m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5737,7 +5913,7 @@ VisualEffect: m_Enabled: 1 m_Asset: {fileID: 8926484042661614526, guid: d3fec04179eb13048b62a053861b20e8, type: 3} m_InitialEventName: OnPlay - m_InitialEventNameOverriden: 0 + m_InitialEventNameOverriden: 1 m_StartSeed: 0 m_ResetSeedOnPlay: 1 m_AllowInstancing: 1 @@ -5920,6 +6096,46 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fdec66b4af82b494f830bb5ac54844ea, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &1651406497 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sprites/Default (Instance) + m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1 &1657725489 GameObject: m_ObjectHideFlags: 0 @@ -6364,6 +6580,179 @@ MonoBehaviour: roll: 0 - position: {x: -36.83068, y: 76.955246, z: -62.555172} roll: 0 +--- !u!1 &1864854690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1864854691} + - component: {fileID: 1864854692} + - component: {fileID: 1864854693} + m_Layer: 0 + m_Name: Gizmo Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1864854691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864854690} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 760971828} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1864854692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864854690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ea15476715398c499869b7cdc74bfa5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_VFX: {fileID: 1621936320} +--- !u!120 &1864854693 +LineRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864854690} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 1651406497} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: -49.233696, y: -17.59166, z: -238.18579} + - {x: 157.56042, y: -17.59166, z: -238.18579} + - {x: 157.56042, y: -17.59166, z: -33.913605} + - {x: -49.233696, y: -17.59166, z: -33.913605} + - {x: -49.233696, y: -17.59166, z: -238.18579} + - {x: -49.233696, y: 377.2921, z: -238.18579} + - {x: 157.56042, y: 377.2921, z: -238.18579} + - {x: 157.56042, y: -17.59166, z: -238.18579} + - {x: 157.56042, y: 377.2921, z: -238.18579} + - {x: 157.56042, y: 377.2921, z: -33.913605} + - {x: 157.56042, y: -17.59166, z: -33.913605} + - {x: 157.56042, y: 377.2921, z: -33.913605} + - {x: -49.233696, y: 377.2921, z: -33.913605} + - {x: -49.233696, y: -17.59166, z: -33.913605} + - {x: -49.233696, y: 377.2921, z: -33.913605} + - {x: -49.233696, y: 377.2921, z: -238.18579} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9525475 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 0.7995102, b: 0, a: 1} + key1: {r: 1, g: 0.9584536, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 1 + m_ColorSpace: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 1 --- !u!1 &1926240436 GameObject: m_ObjectHideFlags: 0 @@ -6638,7 +7027,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.7004386, y: -0.026136585, z: 0.025705865, w: 0.7127706} + m_LocalRotation: {x: 0.7004385, y: -0.026137773, z: 0.025707029, w: 0.7127706} m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -6711,13 +7100,16 @@ MonoBehaviour: m_Bits: 27767 m_Bodies: serializedVersion: 2 - m_Bits: 1335 + m_Bits: 3383 m_Environment: serializedVersion: 2 m_Bits: 19511 m_Actuations: serializedVersion: 2 - m_Bits: 13367 + m_Bits: 15415 + m_Compare: + serializedVersion: 2 + m_Bits: 16392 m_Rewards: {fileID: 459103776} m_CameraBlendMin: 2 m_CameraBlendMax: 4 @@ -6725,7 +7117,7 @@ MonoBehaviour: m_CameraSwapMax: 10 m_CameraController: 1 m_HumanoidMaterial: {fileID: 2100000, guid: 597337d36e2278c4db0ba474300e988f, type: 2} - m_BackgroundColor: {r: 0, g: 0, b: 0, a: 0} + m_BackgroundColor: {r: 0.90196085, g: 0.2901961, b: 0.2627451, a: 0} --- !u!1 &2031268866 GameObject: m_ObjectHideFlags: 0 @@ -8889,7 +9281,7 @@ CharacterController: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Height: 1.68 + m_Height: 1.9 m_Radius: 0.15 m_SlopeLimit: 45 m_StepOffset: 0.3 @@ -11509,7 +11901,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3582234302426997122} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 88580b94a44cc5c4a8f212083bc0e0fd, type: 3} m_Name: @@ -16687,7 +17079,7 @@ SkinnedMeshRenderer: m_RenderingLayerMask: 257 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a789622d55596314b94c2c6ccedda290, type: 2} + - {fileID: 2100000, guid: fa787ed6892e6b340baf43716fe8ab18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18321,7 +18713,6 @@ SceneRoots: - {fileID: 1363938499} - {fileID: 564611602} - {fileID: 1192570237} - - {fileID: 1446210420} - {fileID: 547443783} - {fileID: 1327997889} - {fileID: 2079806149} diff --git a/Assets/8_Scripts/1_Managers/CameraManager.cs b/Assets/8_Scripts/1_Managers/CameraManager.cs index 3174644..7d3c2b0 100644 --- a/Assets/8_Scripts/1_Managers/CameraManager.cs +++ b/Assets/8_Scripts/1_Managers/CameraManager.cs @@ -29,6 +29,7 @@ public class CameraManager : MonoBehaviour public LayerMask m_Bodies; public LayerMask m_Environment; public LayerMask m_Actuations; + public LayerMask m_Compare; [Header("Text Objects")] public GameObject m_Rewards; @@ -131,6 +132,10 @@ public class CameraManager : MonoBehaviour case "vc_Actuations": m_Camera.cullingMask = m_Actuations; m_Rewards.SetActive(true); + break; + case "vc_Compare": + m_Camera.cullingMask = m_Compare; + m_Rewards.SetActive(true); break; } @@ -205,7 +210,8 @@ public class CameraManager : MonoBehaviour if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Body") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Body") - || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Actuations")) + || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Actuations") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Compare") + || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Compare", "vc_Compare") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Compare") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Compare")) blendtime = 0; cmBrain.m_DefaultBlend.m_Time = blendtime; diff --git a/Assets/8_Scripts/1_Managers/GizmoManager.cs b/Assets/8_Scripts/1_Managers/GizmoManager.cs new file mode 100644 index 0000000..84030cf --- /dev/null +++ b/Assets/8_Scripts/1_Managers/GizmoManager.cs @@ -0,0 +1,55 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.VFX; + +[ExecuteInEditMode] +public class GizmoManager : MonoBehaviour +{ + public GameObject m_VFX; + private LineRenderer lineRenderer; + + void Start(){ + lineRenderer = this.GetComponent(); + lineRenderer.startWidth = 0.2f; + lineRenderer.endWidth = 0.2f; + //lineRenderer.material = new Material(Shader.Find("Sprites/Default")); + //lineRenderer.material.color = Color.yellow; + } + + void Update(){ + DrawWireframe(m_VFX); + } + + void DrawWireframe(GameObject m_Smoke){ + + Bounds m_SmokeBounds = m_Smoke.GetComponent().bounds; + + Vector3[] vertices = new Vector3[16]; + + // Calculate the vertices of the box + vertices[0] = new Vector3(m_SmokeBounds.min.x, m_SmokeBounds.min.y, m_SmokeBounds.min.z); + vertices[1] = new Vector3(m_SmokeBounds.max.x, m_SmokeBounds.min.y, m_SmokeBounds.min.z); + vertices[2] = new Vector3(m_SmokeBounds.max.x, m_SmokeBounds.min.y, m_SmokeBounds.max.z); + vertices[3] = new Vector3(m_SmokeBounds.min.x, m_SmokeBounds.min.y, m_SmokeBounds.max.z); + vertices[4] = new Vector3(m_SmokeBounds.min.x, m_SmokeBounds.min.y, m_SmokeBounds.min.z); + + vertices[5] = new Vector3(m_SmokeBounds.min.x, m_SmokeBounds.max.y, m_SmokeBounds.min.z); + vertices[6] = new Vector3(m_SmokeBounds.max.x, m_SmokeBounds.max.y, m_SmokeBounds.min.z); + vertices[7] = new Vector3(m_SmokeBounds.max.x, m_SmokeBounds.min.y, m_SmokeBounds.min.z); + vertices[8] = new Vector3(m_SmokeBounds.max.x, m_SmokeBounds.max.y, m_SmokeBounds.min.z); + + vertices[9] = new Vector3(m_SmokeBounds.max.x, m_SmokeBounds.max.y, m_SmokeBounds.max.z); + vertices[10] = new Vector3(m_SmokeBounds.max.x, m_SmokeBounds.min.y, m_SmokeBounds.max.z); + vertices[11] = new Vector3(m_SmokeBounds.max.x, m_SmokeBounds.max.y, m_SmokeBounds.max.z); + vertices[12] = new Vector3(m_SmokeBounds.min.x, m_SmokeBounds.max.y, m_SmokeBounds.max.z); + vertices[13] = new Vector3(m_SmokeBounds.min.x, m_SmokeBounds.min.y, m_SmokeBounds.max.z); + vertices[14] = new Vector3(m_SmokeBounds.min.x, m_SmokeBounds.max.y, m_SmokeBounds.max.z); + vertices[15] = new Vector3(m_SmokeBounds.min.x, m_SmokeBounds.max.y, m_SmokeBounds.min.z); + + + lineRenderer.positionCount = vertices.Length; + lineRenderer.SetPositions(vertices); + + } +} diff --git a/Assets/8_Scripts/1_Managers/GizmoManager.cs.meta b/Assets/8_Scripts/1_Managers/GizmoManager.cs.meta new file mode 100644 index 0000000..01e0dc3 --- /dev/null +++ b/Assets/8_Scripts/1_Managers/GizmoManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2ea15476715398c499869b7cdc74bfa5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose grey.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose grey.mat new file mode 100644 index 0000000..547faff --- /dev/null +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose grey.mat @@ -0,0 +1,305 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: smplx texture human pose grey + m_Shader: {fileID: -6465566751694194690, guid: 7ee3c8c91dcff2b47a503b00ca908693, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _DISABLE_SSR_TRANSPARENT + m_InvalidKeywords: + - _NORMALMAP_TANGENT_SPACE + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2225 + stringTagMap: + MotionVector: User + disabledShaderPasses: + - TransparentDepthPrepass + - TransparentDepthPostpass + - TransparentBackface + - RayTracingPrepass + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - Texture2D_4450AB74: + m_Texture: {fileID: 2800000, guid: a8892f830876f50488e9bd05d6541488, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AnisotropyMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BentNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BentNormalMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CoatMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _HeightMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescenceMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescenceThicknessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecularColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SubsurfaceMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TangentMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TangentMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ThicknessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TransmissionMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TransmittanceColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - Boolean_193028D2: 0 + - Boolean_3F1A8DAB: 0 + - Boolean_43476D73: 1 + - Boolean_7165A49C: 1 + - Boolean_85059BBE: 1 + - Boolean_8BBF99CD: 1 + - Boolean_D258FF8E: 0 + - Vector1_21C41D02: 256 + - Vector1_6F288C5B: 0.5 + - Vector1_B2CC132F: 50 + - Vector1_B9994903: 11 + - Vector1_E8746023: 16 + - _AORemapMax: 1 + - _AORemapMin: 0 + - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 + - _AlbedoAffectEmissive: 0 + - _AlphaCutoff: 0.5 + - _AlphaCutoffEnable: 0 + - _AlphaCutoffPostpass: 0.5 + - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaRemapMax: 1 + - _AlphaRemapMin: 0 + - _AlphaSrcBlend: 1 + - _Anisotropy: 0 + - _BlendMode: 0 + - _CoatMask: 0 + - _ConservativeDepthOffsetEnable: 0 + - _CullMode: 2 + - _CullModeForward: 2 + - _CustomColor: 1 + - _Cutoff: 0.5 + - _DepthOffsetEnable: 0 + - _DetailAlbedoScale: 1 + - _DetailNormalScale: 1 + - _DetailSmoothnessScale: 1 + - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 + - _DisplacementLockObjectScale: 1 + - _DisplacementLockTilingScale: 1 + - _DisplacementMode: 0 + - _Dissapear: 0 + - _DissapearValue: 1 + - _DoubleSidedEnable: 0 + - _DoubleSidedGIMode: 0 + - _DoubleSidedNormalMode: 1 + - _DstBlend: 0 + - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 + - _EnableBlendModePreserveSpecularLighting: 1 + - _EnableFogOnTransparent: 1 + - _EnableGeometricSpecularAA: 0 + - _EnergyConservingSpecularColor: 1 + - _HeightAmplitude: 0.02 + - _HeightCenter: 0.5 + - _HeightMapParametrization: 0 + - _HeightMax: 1 + - _HeightMin: -1 + - _HeightOffset: 0 + - _HeightPoMAmplitude: 2 + - _HeightTessAmplitude: 2 + - _HeightTessCenter: 0.5 + - _InvTilingScale: 1 + - _Ior: 1.5 + - _IridescenceMask: 1 + - _IridescenceThickness: 1 + - _LinkDetailsWithBase: 1 + - _MaterialID: 1 + - _Metallic: 0 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 + - _NormalMapSpace: 0 + - _NormalScale: 1 + - _ObjectSpaceUVMapping: 0 + - _ObjectSpaceUVMappingEmissive: 0 + - _OpaqueCullMode: 2 + - _PPDLodThreshold: 5 + - _PPDMaxSamples: 15 + - _PPDMinSamples: 5 + - _PPDPrimitiveLength: 1 + - _PPDPrimitiveWidth: 1 + - _RayTracing: 0 + - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 + - _RefractionModel: 0 + - _RenderQueueType: 1 + - _RequireSplitLighting: 0 + - _Smoothness: 0.5 + - _SmoothnessRemapMax: 1 + - _SmoothnessRemapMin: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 + - _SrcBlend: 1 + - _StencilRef: 0 + - _StencilRefDepth: 8 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 10 + - _StencilRefMV: 40 + - _StencilWriteMask: 6 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 41 + - _SubsurfaceMask: 1 + - _SupportDecals: 1 + - _SurfaceType: 0 + - _TexWorldScale: 1 + - _TexWorldScaleEmissive: 1 + - _Thickness: 1 + - _TransmissionEnable: 1 + - _TransmissionMask: 1 + - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 + - _TransparentDepthPostpassEnable: 0 + - _TransparentDepthPrepassEnable: 0 + - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 + - _UVBase: 0 + - _UVDetail: 0 + - _UVEmissive: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 + - _ZTestDepthEqualForOpaque: 3 + - _ZTestGBuffer: 4 + - _ZTestTransparent: 4 + - _ZWrite: 1 + m_Colors: + - Color_2E5415DE: {r: 1, g: 1, b: 1, a: 0} + - Vector2_8044833E: {r: 1, g: 1, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _CustomVector: {r: -0.39, g: 0.99, b: 1.08, a: 0} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} + - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} + - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} + - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1} + - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} + - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} + - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] +--- !u!114 &1245144697628335399 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 13 + hdPluginSubTargetMaterialVersions: + m_Keys: [] + m_Values: diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose grey.mat.meta b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose grey.mat.meta new file mode 100644 index 0000000..67caf9e --- /dev/null +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose grey.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa787ed6892e6b340baf43716fe8ab18 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose.mat index 969cd9d..954de71 100644 --- a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose.mat +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose.mat @@ -33,7 +33,7 @@ Material: serializedVersion: 3 m_TexEnvs: - Texture2D_4450AB74: - m_Texture: {fileID: 10307, guid: 0000000000000000f000000000000000, type: 0} + m_Texture: {fileID: 2800000, guid: a8892f830876f50488e9bd05d6541488, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _AnisotropyMap: @@ -143,7 +143,7 @@ Material: - Boolean_D258FF8E: 0 - Vector1_21C41D02: 256 - Vector1_6F288C5B: 0.5 - - Vector1_B2CC132F: 20 + - Vector1_B2CC132F: 50 - Vector1_B9994903: 11 - Vector1_E8746023: 16 - _AORemapMax: 1 @@ -177,8 +177,8 @@ Material: - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 - - _Dissapear: 0 - - _DissapearValue: 1 + - _Dissapear: 1 + - _DissapearValue: 0.5 - _DoubleSidedEnable: 0 - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 @@ -274,6 +274,7 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _CustomVector: {r: 19.56, g: -14.09, b: 58.2, a: 0} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} + - _DissapearColor: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat index cfb1e23..a7bb467 100644 --- a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat @@ -260,7 +260,7 @@ Material: - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - - _DissapearColor: {r: 0, g: 0, b: 0, a: 0} + - _DissapearColor: {r: 0.90196085, g: 0.2901961, b: 0.2627451, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index 567647f..0afa9e3 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":235.60611839999999,"total":243.6778824,"children":{"InitializeActuators":{"count":1,"self":0.0015050999999999999,"total":0.0015050999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0019984,"total":0.0019984,"children":null},"AgentSendState":{"count":12474,"self":0.10105149999999999,"total":2.7721427,"children":{"CollectObservations":{"count":6237,"self":2.6320352,"total":2.6320351,"children":null},"WriteActionMask":{"count":6237,"self":0.0078532999999999988,"total":0.0078532999999999988,"children":null},"RequestDecision":{"count":6237,"self":0.0312028,"total":0.0312028,"children":null}}},"DecideAction":{"count":12474,"self":3.6057192,"total":3.6057192999999996,"children":null},"AgentAct":{"count":12474,"self":1.6894368,"total":1.6894367,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714578936","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 0be5c510-ebd5-47f5-9010-cd09a6e700dc -accessToken 7fsngBwFvv1hN99q_SqTtiFuqujVT4oOqRZLlJCg1lw005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1714579180"}} \ No newline at end of file +{"count":1,"self":45.6063488,"total":47.4605174,"children":{"InitializeActuators":{"count":1,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0010011,"total":0.0010011,"children":null},"AgentSendState":{"count":2394,"self":0.025969299999999997,"total":0.69068619999999992,"children":{"CollectObservations":{"count":1197,"self":0.64899,"total":0.64899,"children":null},"WriteActionMask":{"count":1197,"self":0.002036,"total":0.002036,"children":null},"RequestDecision":{"count":1197,"self":0.013690899999999999,"total":0.013690899999999999,"children":null}}},"DecideAction":{"count":2394,"self":0.7085524,"total":0.7085524,"children":null},"AgentAct":{"count":2394,"self":0.4529301,"total":0.4529301,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714657215","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 248251cd-5a9d-4a44-91c6-3370a1b135fe -accessToken BnQiYrkvRzpz0grwCj15aMOktGBObxw7xMhcprI-7p8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1714657263"}} \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 443c826..36348ab 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,6 +8,7 @@ TagManager: - vc_Body - vc_Environment - vc_Actuations + - vc_Compare layers: - Default - TransparentFX