cailean
/
drecon-unity
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fps & camera adjs

audio
cailean 5 months ago
parent
6346d0246b
commit
52b7649ffe
7 changed files with 138 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 173
      Assets/5_Scenes/DreconDemo.unity
  2. 22
      Assets/8_Scripts/1_Managers/FPSManager.cs
  3. 11
      Assets/8_Scripts/1_Managers/FPSManager.cs.meta
  4. 2
      Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat
  5. 4
      Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat
  6. 2
      Assets/ML-Agents/Timers/DreconDemo_timers.json
  7. 8
      Assets/StreamingAssets.meta

173
Assets/5_Scenes/DreconDemo.unity
View File

@ -332,7 +332,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 39290365}
serializedVersion: 2
m_LocalRotation: {x: -0.023895208, y: 0.90641296, z: 0.05175012, w: 0.418529}
m_LocalRotation: {x: -0.008787946, y: 0.96869814, z: 0.03465392, w: 0.24565382}
m_LocalPosition: {x: -9.303368, y: 3.4277678, z: -61.25482}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -354,7 +354,7 @@ MonoBehaviour:
m_Path: {fileID: 1926240438}
m_UpdateMethod: 0
m_PositionUnits: 1
m_Speed: 5
m_Speed: 1
m_Position: 0
--- !u!1 &42386020
GameObject:
@ -432,22 +432,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -347.96527, y: -17.028381, z: -271.64978}
- {x: -141.17072, y: -17.028381, z: -271.64978}
- {x: -141.17072, y: -17.028381, z: -99.31264}
- {x: -347.96527, y: -17.028381, z: -99.31264}
- {x: -347.96527, y: -17.028381, z: -271.64978}
- {x: -347.96527, y: 373.02463, z: -271.64978}
- {x: -141.17072, y: 373.02463, z: -271.64978}
- {x: -141.17072, y: -17.028381, z: -271.64978}
- {x: -141.17072, y: 373.02463, z: -271.64978}
- {x: -141.17072, y: 373.02463, z: -99.31264}
- {x: -141.17072, y: -17.028381, z: -99.31264}
- {x: -141.17072, y: 373.02463, z: -99.31264}
- {x: -347.96527, y: 373.02463, z: -99.31264}
- {x: -347.96527, y: -17.028381, z: -99.31264}
- {x: -347.96527, y: 373.02463, z: -99.31264}
- {x: -347.96527, y: 373.02463, z: -271.64978}
- {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}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -690,7 +690,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 62178361}
serializedVersion: 2
m_LocalRotation: {x: 0.00623864, y: -0.029748663, z: 0.000185677, w: 0.99953794}
m_LocalRotation: {x: -0.11737298, y: -0.02954343, z: -0.0034933034, w: 0.9926422}
m_LocalPosition: {x: 24.371735, y: 8, z: -83.27547}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -719,12 +719,12 @@ MonoBehaviour:
m_LookAt: {fileID: 1853480535}
m_Follow: {fileID: 1014898013}
m_Lens:
FieldOfView: 25
OrthographicSize: 10
NearClipPlane: 0.1
FieldOfView: 1.39
OrthographicSize: 39.22
NearClipPlane: 3.22
FarClipPlane: 50000
Dutch: 0
ModeOverride: 2
ModeOverride: 1
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -1147,7 +1147,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 153031623}
serializedVersion: 2
m_LocalRotation: {x: -0.000010761081, y: 0.9982297, z: 0.059476666, w: -0.000077618104}
m_LocalRotation: {x: -0.00001076108, 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
@ -1666,7 +1666,7 @@ MonoBehaviour:
OrthographicSize: 10
NearClipPlane: 0.1
FarClipPlane: 5000
Dutch: -122
Dutch: -69
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
@ -1759,7 +1759,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320225263}
serializedVersion: 2
m_LocalRotation: {x: 0.4296801, y: 0.54933363, z: -0.39451072, w: 0.5983051}
m_LocalRotation: {x: 0.42968023, y: 0.5493335, z: -0.39451057, w: 0.59830517}
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.702228
FieldOfView: 6.472818
OrthographicSize: 30.38
NearClipPlane: 0.1
FarClipPlane: 5000
@ -1855,7 +1855,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 326736459}
serializedVersion: 2
m_LocalRotation: {x: -0.07396109, y: 0.9066138, z: 0.17882524, w: 0.37497023}
m_LocalRotation: {x: -0.073961094, y: 0.9066138, z: 0.17882526, w: 0.3749702}
m_LocalPosition: {x: 17.7008, y: 8.655965, z: -0.081218004}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -2064,7 +2064,7 @@ Camera:
height: 1
near clip plane: 0.1
far clip plane: 5000
field of view: 6.702228
field of view: 6.472818
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.4296801, y: 0.54933363, z: -0.39451072, w: 0.5983051}
m_LocalRotation: {x: 0.42968023, y: 0.5493335, z: -0.39451057, w: 0.59830517}
m_LocalPosition: {x: 69.4, y: 315, z: -332.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -5361,7 +5361,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.0021121474, z: -0.001193077, 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
@ -5892,7 +5892,7 @@ MonoBehaviour:
m_Path: {fileID: 792989025}
m_UpdateMethod: 0
m_PositionUnits: 1
m_Speed: 5
m_Speed: 1
m_Position: 0
--- !u!1 &1016948515
GameObject:
@ -6455,17 +6455,17 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: eea921e9d576b5a49a4d61d20f513f79,
type: 3}
propertyPath: m_LocalPosition.x
value: -196.5
value: -196.1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: eea921e9d576b5a49a4d61d20f513f79,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.2
value: -3.4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: eea921e9d576b5a49a4d61d20f513f79,
type: 3}
propertyPath: m_LocalPosition.z
value: 175.8
value: 175.4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: eea921e9d576b5a49a4d61d20f513f79,
type: 3}
@ -8306,7 +8306,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1446210418}
serializedVersion: 2
m_LocalRotation: {x: -0.00018797578, y: 0.99926, z: -0.0049240887, w: -0.038146485}
m_LocalRotation: {x: -0.0001879747, y: 0.99926, z: -0.004924065, w: -0.03814645}
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: -80.842926, y: -17.381607, z: -252.48993}
- {x: 152.25427, y: -17.381607, z: -252.48993}
- {x: 152.25427, y: -17.381607, z: -6.2724}
- {x: -80.842926, y: -17.381607, z: -6.2724}
- {x: -80.842926, y: -17.381607, z: -252.48993}
- {x: -80.842926, y: 426.40186, z: -252.48993}
- {x: 152.25427, y: 426.40186, z: -252.48993}
- {x: 152.25427, y: -17.381607, z: -252.48993}
- {x: 152.25427, y: 426.40186, z: -252.48993}
- {x: 152.25427, y: 426.40186, z: -6.2724}
- {x: 152.25427, y: -17.381607, z: -6.2724}
- {x: 152.25427, y: 426.40186, z: -6.2724}
- {x: -80.842926, y: 426.40186, z: -6.2724}
- {x: -80.842926, y: -17.381607, z: -6.2724}
- {x: -80.842926, y: 426.40186, z: -6.2724}
- {x: -80.842926, y: 426.40186, z: -252.48993}
- {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}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -10905,15 +10905,15 @@ MonoBehaviour:
m_Waypoints:
- position: {x: -9.303368, y: 3.4277678, z: -61.25482}
roll: 0
- position: {x: -7.1421967, y: 8.35799, z: -85.62209}
- position: {x: -7.1421967, y: 8.35799, z: -79.978386}
roll: 0
- position: {x: -21.58908, y: 14.978266, z: -98.527306}
- position: {x: -21.58908, y: 14.978266, z: -78.19949}
roll: 0
- position: {x: -36.035965, y: 17.702486, z: -111.43252}
- position: {x: -36.035965, y: 17.702486, z: -97.25773}
roll: 0
- position: {x: -50.48285, y: 13.593344, z: -111.59613}
- position: {x: -62.460754, y: 13.593344, z: -133.04987}
roll: 0
- position: {x: -64.92973, y: 14.464331, z: -111.75974}
- position: {x: -101.50822, y: 14.464331, z: -111.75974}
roll: 0
- position: {x: -79.37662, y: 3.9703684, z: -102.16371}
roll: 0
@ -10927,7 +10927,7 @@ MonoBehaviour:
roll: 0
- position: {x: -125.4338, y: 5.6500306, z: -43.302216}
roll: 0
- position: {x: -66.79367, y: 0.95085907, z: -41.959587}
- position: {x: -66.79367, y: 0.95085907, z: -3.0753098}
roll: 0
--- !u!1 &1944679632
GameObject:
@ -10940,8 +10940,8 @@ GameObject:
- component: {fileID: 1944679633}
- component: {fileID: 1944679637}
- component: {fileID: 1944679636}
- component: {fileID: 1944679634}
- component: {fileID: 1944679638}
- component: {fileID: 1944679639}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
@ -10964,18 +10964,6 @@ Transform:
m_Children: []
m_Father: {fileID: 62178362}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1944679634
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1944679632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1944679636
MonoBehaviour:
m_ObjectHideFlags: 3
@ -11018,6 +11006,33 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Damping: 1
--- !u!114 &1944679639
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1944679632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: 21.34, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
m_HorizontalDamping: 0.5
m_VerticalDamping: 0.5
m_ScreenX: 0.5
m_ScreenY: 0.5
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
m_SoftZoneWidth: 0.8
m_SoftZoneHeight: 0.8
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!1 &1955078056
GameObject:
m_ObjectHideFlags: 0
@ -11156,6 +11171,7 @@ GameObject:
m_Component:
- component: {fileID: 2024068565}
- component: {fileID: 2024068566}
- component: {fileID: 2024068567}
m_Layer: 0
m_Name: Camera Manager
m_TagString: Untagged
@ -11217,6 +11233,19 @@ MonoBehaviour:
m_HumanoidMaterial: {fileID: 2100000, guid: 597337d36e2278c4db0ba474300e988f, type: 2}
m_BackgroundColor: {r: 0.90196085, g: 0.2901961, b: 0.2627451, a: 0}
m_PoseCanvas: {fileID: 607314882}
--- !u!114 &2024068567
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2024068564}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f750825a4908024ab4b92d3acf65887, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FPS: 60
--- !u!1 &2031268866
GameObject:
m_ObjectHideFlags: 0
@ -20766,7 +20795,7 @@ Transform:
m_GameObject: {fileID: 7454324697916771407}
serializedVersion: 2
m_LocalRotation: {x: -0.6876463, y: 0.1647502, z: 0.1647502, w: 0.68764627}
m_LocalPosition: {x: 99.2, y: 1.0099993, z: 208.5}
m_LocalPosition: {x: 163.5, y: -3.5, z: 175.8}
m_LocalScale: {x: 1834.5624, y: 1834.5619, z: 1834.5619}
m_ConstrainProportionsScale: 0
m_Children: []

22
Assets/8_Scripts/1_Managers/FPSManager.cs
View File

@ -0,0 +1,22 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class FPSManager : MonoBehaviour
{
// Start is called before the first frame update
public int m_FPS = 60;
void Awake()
{
Application.targetFrameRate = m_FPS;
}
// Update is called once per frame
void Update()
{
if (Application.targetFrameRate != m_FPS)
{
Application.targetFrameRate = m_FPS;
}
}
}

11
Assets/8_Scripts/1_Managers/FPSManager.cs.meta
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5f750825a4908024ab4b92d3acf65887
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human actuations.mat
View File

@ -136,7 +136,7 @@ Material:
m_Floats:
- Boolean_43476D73: 1
- Boolean_D258FF8E: 0
- Vector1_B2CC132F: 27.785316
- Vector1_B2CC132F: 29.163094
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1

4
Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat
View File

@ -136,7 +136,7 @@ Material:
m_Floats:
- Boolean_43476D73: 1
- Boolean_D258FF8E: 0
- Vector1_B2CC132F: 100
- Vector1_B2CC132F: 400
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
@ -168,7 +168,7 @@ Material:
- _DisplacementLockTilingScale: 1
- _DisplacementMode: 0
- _Dissapear: 1
- _DissapearValue: 0.51575506
- _DissapearValue: 1
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 1

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

@ -1 +1 @@
{"count":1,"self":61.686662399999996,"total":64.1365596,"children":{"InitializeActuators":{"count":1,"self":0.0015053,"total":0.0015053,"children":null},"InitializeSensors":{"count":1,"self":0.00099969999999999985,"total":0.00099969999999999985,"children":null},"AgentSendState":{"count":3444,"self":0.0285244,"total":1.0424371,"children":{"CollectObservations":{"count":1722,"self":0.9911521,"total":0.9911521,"children":null},"WriteActionMask":{"count":1722,"self":0.0102385,"total":0.0102385,"children":null},"RequestDecision":{"count":1722,"self":0.0125221,"total":0.0125221,"children":null}}},"DecideAction":{"count":3444,"self":0.90983189999999992,"total":0.90983189999999992,"children":null},"AgentAct":{"count":3444,"self":0.49512039999999996,"total":0.49512039999999996,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1715111448","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 93a68a07-80c3-45f4-9064-a08c685fba09 -accessToken ntSDS0razlG2T0dPUjcrNr9zIG6h5YGoYqM1n4f6-RI005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1715111512"}}
{"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"}}

8
Assets/StreamingAssets.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f451acef213043b40a9c983dac28d2e4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Write Preview
Loading…
Cancel
Save