Browse Source

actuations adj

audio
cailean 8 months ago
parent
commit
df9e7b4706
  1. 2
      Assets/3_MarathonEnvs/Scripts/Ragdoll004/RagDollAgent.cs
  2. 78
      Assets/5_Scenes/DreconDemo.unity
  3. 2
      Assets/5_Scenes/DreconDemo/HDRP Base.asset
  4. 83
      Assets/5_Scenes/Title/Volume Profile.asset
  5. 2
      Assets/8_Scripts/2_General/ActuationsSine.cs
  6. 22
      Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat
  7. 2
      Assets/ML-Agents/Timers/DreconDemo_timers.json
  8. 1
      Assets/ML-Agents/Timers/Title_timers.json
  9. 7
      Assets/ML-Agents/Timers/Title_timers.json.meta

2
Assets/3_MarathonEnvs/Scripts/Ragdoll004/RagDollAgent.cs

@ -226,7 +226,7 @@ public class RagDollAgent : Agent
AddReward(_dReConRewards.Reward);
// if (_dReConRewards.HeadHeightDistance > 0.5f || _dReConRewards.Reward < 1f)
if (_dReConRewards.HeadHeightDistance > 0.5f || _dReConRewards.Reward <= 0f)
if (_dReConRewards.HeadHeightDistance > 0.75f || _dReConRewards.Reward <= 0f)
{
if (!dontResetOnZeroReward)

78
Assets/5_Scenes/DreconDemo.unity

@ -432,22 +432,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -358.76855, y: -9.809143, z: -288.85526}
- {x: -152.98027, y: -9.809143, z: -288.85526}
- {x: -152.98027, y: -9.809143, z: -101.434906}
- {x: -358.76855, y: -9.809143, z: -101.434906}
- {x: -358.76855, y: -9.809143, z: -288.85526}
- {x: -358.76855, y: 434.42487, z: -288.85526}
- {x: -152.98027, y: 434.42487, z: -288.85526}
- {x: -152.98027, y: -9.809143, z: -288.85526}
- {x: -152.98027, y: 434.42487, z: -288.85526}
- {x: -152.98027, y: 434.42487, z: -101.434906}
- {x: -152.98027, y: -9.809143, z: -101.434906}
- {x: -152.98027, y: 434.42487, z: -101.434906}
- {x: -358.76855, y: 434.42487, z: -101.434906}
- {x: -358.76855, y: -9.809143, z: -101.434906}
- {x: -358.76855, y: 434.42487, z: -101.434906}
- {x: -358.76855, y: 434.42487, z: -288.85526}
- {x: -382.40417, y: -22.045624, z: -273.67438}
- {x: -99.68306, y: -22.045624, z: -273.67438}
- {x: -99.68306, y: -22.045624, z: -99.94002}
- {x: -382.40417, y: -22.045624, z: -99.94002}
- {x: -382.40417, y: -22.045624, z: -273.67438}
- {x: -382.40417, y: 444.55865, z: -273.67438}
- {x: -99.68306, y: 444.55865, z: -273.67438}
- {x: -99.68306, y: -22.045624, z: -273.67438}
- {x: -99.68306, y: 444.55865, z: -273.67438}
- {x: -99.68306, y: 444.55865, z: -99.94002}
- {x: -99.68306, y: -22.045624, z: -99.94002}
- {x: -99.68306, y: 444.55865, z: -99.94002}
- {x: -382.40417, y: 444.55865, z: -99.94002}
- {x: -382.40417, y: -22.045624, z: -99.94002}
- {x: -382.40417, y: 444.55865, z: -99.94002}
- {x: -382.40417, y: 444.55865, z: -273.67438}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -1147,7 +1147,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 153031623}
serializedVersion: 2
m_LocalRotation: {x: -0.00001076108, y: 0.9982297, z: 0.059476666, w: -0.000077618104}
m_LocalRotation: {x: -0.000010761081, y: 0.9982297, z: 0.059476666, w: -0.000077618104}
m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1759,7 +1759,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320225263}
serializedVersion: 2
m_LocalRotation: {x: 0.42968023, y: 0.5493335, z: -0.39451057, w: 0.59830517}
m_LocalRotation: {x: 0.4296801, y: 0.54933363, z: -0.39451072, w: 0.5983051}
m_LocalPosition: {x: 69.4, y: 315, z: -332.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1788,7 +1788,7 @@ MonoBehaviour:
m_LookAt: {fileID: 489043706}
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 6.472818
FieldOfView: 6.091351
OrthographicSize: 30.38
NearClipPlane: 0.1
FarClipPlane: 5000
@ -2064,7 +2064,7 @@ Camera:
height: 1
near clip plane: 0.1
far clip plane: 5000
field of view: 6.472818
field of view: 6.091351
orthographic: 0
orthographic size: 30.38
m_Depth: -1
@ -2090,7 +2090,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
serializedVersion: 2
m_LocalRotation: {x: 0.42968023, y: 0.5493335, z: -0.39451057, w: 0.59830517}
m_LocalRotation: {x: 0.4296801, y: 0.54933363, z: -0.39451072, w: 0.5983051}
m_LocalPosition: {x: 69.4, y: 315, z: -332.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -8306,7 +8306,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1446210418}
serializedVersion: 2
m_LocalRotation: {x: -0.0001879747, y: 0.99926, z: -0.004924065, w: -0.03814645}
m_LocalRotation: {x: -0.00018797578, y: 0.99926, z: -0.0049240887, w: -0.038146485}
m_LocalPosition: {x: 18.109627, y: 8.274419, z: 9.536423}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -10621,22 +10621,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -105.58098, y: -13.603226, z: -237.94266}
- {x: 137.64787, y: -13.603226, z: -237.94266}
- {x: 137.64787, y: -13.603226, z: -0.24375153}
- {x: -105.58098, y: -13.603226, z: -0.24375153}
- {x: -105.58098, y: -13.603226, z: -237.94266}
- {x: -105.58098, y: 403.7815, z: -237.94266}
- {x: 137.64787, y: 403.7815, z: -237.94266}
- {x: 137.64787, y: -13.603226, z: -237.94266}
- {x: 137.64787, y: 403.7815, z: -237.94266}
- {x: 137.64787, y: 403.7815, z: -0.24375153}
- {x: 137.64787, y: -13.603226, z: -0.24375153}
- {x: 137.64787, y: 403.7815, z: -0.24375153}
- {x: -105.58098, y: 403.7815, z: -0.24375153}
- {x: -105.58098, y: -13.603226, z: -0.24375153}
- {x: -105.58098, y: 403.7815, z: -0.24375153}
- {x: -105.58098, y: 403.7815, z: -237.94266}
- {x: -75.7825, y: -19.624374, z: -255.21155}
- {x: 171.07774, y: -19.624374, z: -255.21155}
- {x: 171.07774, y: -19.624374, z: 2.3730469}
- {x: -75.7825, y: -19.624374, z: 2.3730469}
- {x: -75.7825, y: -19.624374, z: -255.21155}
- {x: -75.7825, y: 437.6333, z: -255.21155}
- {x: 171.07774, y: 437.6333, z: -255.21155}
- {x: 171.07774, y: -19.624374, z: -255.21155}
- {x: 171.07774, y: 437.6333, z: -255.21155}
- {x: 171.07774, y: 437.6333, z: 2.3730469}
- {x: 171.07774, y: -19.624374, z: 2.3730469}
- {x: 171.07774, y: 437.6333, z: 2.3730469}
- {x: -75.7825, y: 437.6333, z: 2.3730469}
- {x: -75.7825, y: -19.624374, z: 2.3730469}
- {x: -75.7825, y: 437.6333, z: 2.3730469}
- {x: -75.7825, y: 437.6333, z: -255.21155}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -11140,7 +11140,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1955078056}
serializedVersion: 2
m_LocalRotation: {x: 0.7004386, y: -0.026136603, z: 0.025705881, w: 0.7127706}
m_LocalRotation: {x: 0.7004391, y: -0.026122667, z: 0.02569219, w: 0.7127711}
m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0

2
Assets/5_Scenes/DreconDemo/HDRP Base.asset

@ -92,7 +92,7 @@ MonoBehaviour:
m_Value: 0
tracing:
m_OverrideState: 1
m_Value: 2
m_Value: 4
rayMiss:
m_OverrideState: 0
m_Value: 3

83
Assets/5_Scenes/Title/Volume Profile.asset

@ -1,5 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4752158604937623120
MonoBehaviour:
m_ObjectHideFlags: 3
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: d877a03bef431a847adca8ab343db3e1, type: 3}
m_Name: RayTracingSettings
m_EditorClassIdentifier:
active: 0
rayBias:
m_OverrideState: 1
m_Value: 0.001
distantRayBias:
m_OverrideState: 1
m_Value: 0.001
extendShadowCulling:
m_OverrideState: 1
m_Value: 1
extendCameraCulling:
m_OverrideState: 1
m_Value: 0
directionalShadowRayLength:
m_OverrideState: 1
m_Value: 1000
directionalShadowFallbackIntensity:
m_OverrideState: 1
m_Value: 1
buildMode:
m_OverrideState: 0
m_Value: 0
cullingMode:
m_OverrideState: 0
m_Value: 0
cullingDistance:
m_OverrideState: 1
m_Value: 1000
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@ -12,4 +52,45 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: Volume Profile
m_EditorClassIdentifier:
components: []
components:
- {fileID: -4752158604937623120}
- {fileID: 6840140740279336354}
--- !u!114 &6840140740279336354
MonoBehaviour:
m_ObjectHideFlags: 3
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: 31394aa05878563408489d5c1688f3a0, type: 3}
m_Name: PathTracing
m_EditorClassIdentifier:
active: 0
enable:
m_OverrideState: 1
m_Value: 0
layerMask:
m_OverrideState: 0
m_Value:
serializedVersion: 2
m_Bits: 4294967295
maximumSamples:
m_OverrideState: 0
m_Value: 256
minimumDepth:
m_OverrideState: 0
m_Value: 1
maximumDepth:
m_OverrideState: 0
m_Value: 4
maximumIntensity:
m_OverrideState: 0
m_Value: 10
skyImportanceSampling:
m_OverrideState: 0
m_Value: 0
tilingParameters:
m_OverrideState: 0
m_Value: {x: 1, y: 1, z: 0, w: 0}

2
Assets/8_Scripts/2_General/ActuationsSine.cs

@ -30,7 +30,7 @@ public class ActuationsSine : MonoBehaviour
m_Camera.m_Lens.FieldOfView = mappedFOV;
float mappedVertex = Map(50f, 20f, -1, 1, sin);
float mappedVertex = Map(90f, 50f, -1, 1, sin);
m_ActuationsMaterial.SetFloat("Vector1_B2CC132F", mappedVertex);
}

22
Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat

@ -19,7 +19,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2501
m_CustomRenderQueue: 2000
stringTagMap:
MotionVector: User
disabledShaderPasses:
@ -134,9 +134,18 @@ Material:
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_B2CC132F: 29.163094
- Vector1_21C41D02: 256
- Vector1_6F288C5B: 0.5
- Vector1_B2CC132F: 65.269196
- Vector1_B9994903: 11
- Vector1_E8746023: 16
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
@ -157,6 +166,7 @@ Material:
- _ConservativeDepthOffsetEnable: 0
- _CullMode: 2
- _CullModeForward: 2
- _CustomColor: 1
- _Cutoff: 0.5
- _DepthOffsetEnable: 0
- _DetailAlbedoScale: 1
@ -213,7 +223,8 @@ Material:
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 0
- _RefractionModel: 0
- _RenderQueueType: 2
- _RenderQueueType: 1
- _RequireSplitLighting: 0
- _Smoothness: 0.5
- _SmoothnessRemapMax: 1
- _SmoothnessRemapMin: 0
@ -251,14 +262,17 @@ Material:
- _UVEmissive: 0
- _UseEmissiveIntensity: 0
- _UseShadowThreshold: 0
- _ZTestDepthEqualForOpaque: 4
- _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.3, g: 0.59, b: 0.11, 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}

2
Assets/ML-Agents/Timers/DreconDemo_timers.json

@ -1 +1 @@
{"count":1,"self":19.7509984,"total":20.2001779,"children":{"InitializeActuators":{"count":1,"self":0.0009972,"total":0.0009972,"children":null},"InitializeSensors":{"count":1,"self":0.0005028,"total":0.0005028,"children":null},"AgentSendState":{"count":868,"self":0.009019,"total":0.1399245,"children":{"CollectObservations":{"count":434,"self":0.127384,"total":0.127384,"children":null},"WriteActionMask":{"count":434,"self":0.0005049,"total":0.0005049,"children":null},"RequestDecision":{"count":434,"self":0.0030166,"total":0.0030166,"children":null}}},"DecideAction":{"count":868,"self":0.18750129999999998,"total":0.18750129999999998,"children":null},"AgentAct":{"count":868,"self":0.1202545,"total":0.1202545,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1715171228","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 41e63fd2-05d9-4fd2-ba1e-c3ec0c3e6398 -accessToken ZB9P9VtSqwk78TWq9KSEmUk9W3JCHAVWi-jmNam0PaM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1715171248"}}
{"count":1,"self":44.502848,"total":45.6966634,"children":{"InitializeActuators":{"count":1,"self":0.0010017,"total":0.0010017,"children":null},"InitializeSensors":{"count":1,"self":0.0015029,"total":0.0015029,"children":null},"AgentSendState":{"count":2392,"self":0.0045268999999999995,"total":0.3264796,"children":{"CollectObservations":{"count":1196,"self":0.3134364,"total":0.3134364,"children":null},"WriteActionMask":{"count":1196,"self":0.0030004,"total":0.0030004,"children":null},"RequestDecision":{"count":1196,"self":0.0055159,"total":0.0055159,"children":null}}},"DecideAction":{"count":2392,"self":0.5129095,"total":0.5129095,"children":null},"AgentAct":{"count":2392,"self":0.351923,"total":0.351923,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1715173592","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 41e63fd2-05d9-4fd2-ba1e-c3ec0c3e6398 -accessToken ZB9P9VtSqwk78TWq9KSEmUk9W3JCHAVWi-jmNam0PaM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1715173637"}}

1
Assets/ML-Agents/Timers/Title_timers.json

@ -0,0 +1 @@
{"count":1,"self":220.4767488,"total":223.1735108,"children":{"InitializeActuators":{"count":1,"self":0.00099819999999999987,"total":0.00099819999999999987,"children":null},"InitializeSensors":{"count":1,"self":0.0009999,"total":0.0009999,"children":null},"AgentSendState":{"count":5385,"self":0.028579499999999997,"total":0.75474639999999993,"children":{"CollectObservations":{"count":2693,"self":0.66623389999999993,"total":0.66623389999999993,"children":null},"WriteActionMask":{"count":2693,"self":0.0038052,"total":0.0038052,"children":null},"RequestDecision":{"count":2693,"self":0.0561278,"total":0.0561278,"children":null}}},"DecideAction":{"count":5385,"self":1.1292240999999998,"total":1.1292240999999998,"children":null},"AgentAct":{"count":5385,"self":0.81080069999999993,"total":0.81080069999999993,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1715171376","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 41e63fd2-05d9-4fd2-ba1e-c3ec0c3e6398 -accessToken ZB9P9VtSqwk78TWq9KSEmUk9W3JCHAVWi-jmNam0PaM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Title","end_time_seconds":"1715171600"}}

7
Assets/ML-Agents/Timers/Title_timers.json.meta

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d96e101d4e590e74eb8ec7b1b368692f
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Loading…
Cancel
Save