From 2b7b7fb9cace97f3552c89cc0ee3c665920d590b Mon Sep 17 00:00:00 2001 From: cailean Date: Fri, 19 Apr 2024 15:13:21 +0100 Subject: [PATCH] tags updated & new material for actuations --- Assets/5_Scenes/DreconDemo.unity | 24 +- .../SMPLX Blend/SMPLX Body Actuations.prefab | 2 +- .../smplx texture human actuations.mat | 291 ++++++++++++++++++ .../smplx texture human actuations.mat.meta | 8 + .../ML-Agents/Timers/DreconDemo_timers.json | 2 +- 5 files changed, 313 insertions(+), 14 deletions(-) create mode 100644 Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat create mode 100644 Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat.meta diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index 747289e..334d8fa 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -459,7 +459,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 @@ -783,7 +783,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320225263} serializedVersion: 2 - m_LocalRotation: {x: 0.38916165, y: 0.59321105, z: -0.5829468, w: 0.39601386} + m_LocalRotation: {x: 0.3891651, y: 0.5932087, z: -0.5829446, w: 0.39601725} m_LocalPosition: {x: 17.78, y: 21.78, z: 3.06} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -865,7 +865,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 @@ -1053,11 +1053,11 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.1 + near clip plane: 0.01 far clip plane: 5000 - field of view: 40 - orthographic: 1 - orthographic size: -0.34 + field of view: 31.1 + orthographic: 0 + orthographic size: 0.53 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1081,8 +1081,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.38916165, y: 0.59321105, z: -0.5829468, w: 0.39601386} - m_LocalPosition: {x: 17.78, y: 21.78, z: 3.06} + m_LocalRotation: {x: -0.254152, y: 0.69070727, z: -0.6135771, w: -0.28610036} + m_LocalPosition: {x: 22.891924, y: 9.244215, z: 4.6990404} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2505,7 +2505,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 882491594} serializedVersion: 2 - m_LocalRotation: {x: 0.49182287, y: 0.0021121476, z: -0.0011930771, w: 0.8706919} + m_LocalRotation: {x: 0.49182287, y: 0.0021121174, z: -0.00119306, 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 @@ -5019,7 +5019,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.7004387, y: -0.026134748, z: 0.025704062, w: 0.71277064} + m_LocalRotation: {x: 0.7004388, y: -0.026130881, z: 0.025700254, w: 0.7127709} m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -5082,7 +5082,7 @@ MonoBehaviour: m_Bits: 1335 m_Environment: serializedVersion: 2 - m_Bits: 3127 + m_Bits: 3135 m_Actuations: serializedVersion: 2 m_Bits: 5175 diff --git a/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab b/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab index e93192e..2b6168a 100644 --- a/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab +++ b/Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab @@ -2287,7 +2287,7 @@ SkinnedMeshRenderer: m_RenderingLayerMask: 257 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 597337d36e2278c4db0ba474300e988f, type: 2} + - {fileID: 2100000, guid: 5c128b24ab321c147a2309eb60bcad62, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat new file mode 100644 index 0000000..b6cc433 --- /dev/null +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat @@ -0,0 +1,291 @@ +%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 actuations + m_Shader: {fileID: -6465566751694194690, guid: 8da30c3b74c073944b750388446f9e0c, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2501 + 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_43476D73: 1 + - Boolean_D258FF8E: 0 + - Vector1_B2CC132F: 150 + - _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 + - _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: 2 + - _Smoothness: 0.5 + - _SmoothnessRemapMax: 1 + - _SmoothnessRemapMin: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 + - _SrcBlend: 1 + - _StencilRef: 0 + - _StencilRefDepth: 1 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 10 + - _StencilRefMV: 33 + - _StencilWriteMask: 6 + - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 15 + - _StencilWriteMaskMV: 43 + - _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: 4 + - _ZTestGBuffer: 4 + - _ZTestTransparent: 4 + - _ZWrite: 1 + m_Colors: + - _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} + - _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 actuations.mat.meta b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat.meta new file mode 100644 index 0000000..3c396b9 --- /dev/null +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c128b24ab321c147a2309eb60bcad62 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index ad97b42..4ce59a1 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":48.3423136,"total":49.699399899999996,"children":{"InitializeActuators":{"count":1,"self":0.0010006,"total":0.0010006,"children":null},"InitializeSensors":{"count":1,"self":0.0010007,"total":0.0010007,"children":null},"AgentSendState":{"count":2615,"self":0.0172939,"total":0.3630545,"children":{"CollectObservations":{"count":1308,"self":0.32920469999999996,"total":0.32920469999999996,"children":null},"WriteActionMask":{"count":1308,"self":0.0035194,"total":0.0035194,"children":null},"RequestDecision":{"count":1308,"self":0.0130365,"total":0.0130365,"children":null}}},"DecideAction":{"count":2615,"self":0.5577557,"total":0.5577557,"children":null},"AgentAct":{"count":2615,"self":0.4342738,"total":0.4342738,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":2,"max":178.038376,"min":66.61866,"runningAverage":122.328522,"value":178.038376,"weightedAverage":94.47359}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713535314","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\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 35e1e307-bed6-45f6-bd2e-ffedcc836cc6 -accessToken 0lRu6csHJ34cbzvP-Bp73LSli6WheMXxZCca1Jo9JP8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1713535363"}} \ No newline at end of file +{"count":1,"self":89.022976,"total":91.5332865,"children":{"InitializeActuators":{"count":1,"self":0.0009996,"total":0.0009996,"children":null},"InitializeSensors":{"count":1,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"AgentSendState":{"count":5120,"self":0.0254454,"total":0.6623137,"children":{"CollectObservations":{"count":2560,"self":0.61879469999999992,"total":0.61879469999999992,"children":null},"WriteActionMask":{"count":2560,"self":0.0025134999999999997,"total":0.0025134999999999997,"children":null},"RequestDecision":{"count":2560,"self":0.015560099999999999,"total":0.015560099999999999,"children":null}}},"DecideAction":{"count":5120,"self":1.0943142,"total":1.0943142,"children":null},"AgentAct":{"count":5120,"self":0.7506809,"total":0.7506809,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":81.79638,"min":81.79638,"runningAverage":81.79638,"value":81.79638,"weightedAverage":81.79638}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713535872","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\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 35e1e307-bed6-45f6-bd2e-ffedcc836cc6 -accessToken 0lRu6csHJ34cbzvP-Bp73LSli6WheMXxZCca1Jo9JP8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1713535964"}} \ No newline at end of file