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

ui changes

Browse Source
This commit is contained in:
Cailean Finn
2024-05-02 16:31:37 +01:00
parent da19f51976
commit e43c2b83ee
9 changed files with 108 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
Assets/5_Scenes/DreconDemo.unity generated
View File

@@ -279,22 +279,22 @@ LineRenderer:
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}
- {x: -377.21457, y: -21.966553, z: -286.2464}
- {x: -130.35992, y: -21.966553, z: -286.2464}
- {x: -130.35992, y: -21.966553, z: -74.60516}
- {x: -377.21457, y: -21.966553, z: -74.60516}
- {x: -377.21457, y: -21.966553, z: -286.2464}
- {x: -377.21457, y: 403.0896, z: -286.2464}
- {x: -130.35992, y: 403.0896, z: -286.2464}
- {x: -130.35992, y: -21.966553, z: -286.2464}
- {x: -130.35992, y: 403.0896, z: -286.2464}
- {x: -130.35992, y: 403.0896, z: -74.60516}
- {x: -130.35992, y: -21.966553, z: -74.60516}
- {x: -130.35992, y: 403.0896, z: -74.60516}
- {x: -377.21457, y: 403.0896, z: -74.60516}
- {x: -377.21457, y: -21.966553, z: -74.60516}
- {x: -377.21457, y: 403.0896, z: -74.60516}
- {x: -377.21457, y: 403.0896, z: -286.2464}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@@ -1167,7 +1167,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320225263}
serializedVersion: 2
m_LocalRotation: {x: 0.38916236, y: 0.5932106, z: -0.58294636, w: 0.39601454}
m_LocalRotation: {x: 0.3891641, y: 0.5932094, z: -0.5829452, w: 0.3960163}
m_LocalPosition: {x: 17.78, y: 21.78, z: 3.06}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -1263,7 +1263,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
@@ -1519,7 +1519,7 @@ MonoBehaviour:
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 3
m_Time: 0
m_CustomCurve:
serializedVersion: 2
m_Curve: []
@@ -2279,9 +2279,9 @@ RectTransform:
- {fileID: 1016948516}
m_Father: {fileID: 951379159}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -5, y: -436.7}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 966.6, y: -75.8}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &489043705
@@ -3814,7 +3814,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 882491594}
serializedVersion: 2
m_LocalRotation: {x: 0.49182287, y: 0.0021121176, z: -0.0011930601, w: 0.8706919}
m_LocalRotation: {x: 0.49182287, y: 0.0021121474, z: -0.0011930768, 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
@@ -4157,7 +4157,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
@@ -4814,9 +4814,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 459103777}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -20, y: 916.7}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1800, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1261636063
@@ -4867,11 +4867,11 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 75
m_fontSizeBase: 120
m_fontSize: 33
m_fontSizeBase: 33
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 75
m_enableAutoSizing: 0
m_fontSizeMin: 65
m_fontSizeMax: 100
m_fontStyle: 0
m_HorizontalAlignment: 1
@@ -5025,9 +5025,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 459103777}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -20, y: 857}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -30.2}
m_SizeDelta: {x: 1800, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1361807061
@@ -5078,11 +5078,11 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 75
m_fontSizeBase: 120
m_fontSize: 33
m_fontSizeBase: 33
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 75
m_enableAutoSizing: 0
m_fontSizeMin: 65
m_fontSizeMax: 100
m_fontStyle: 0
m_HorizontalAlignment: 1
@@ -5375,6 +5375,7 @@ GameObject:
m_Component:
- component: {fileID: 1446210420}
- component: {fileID: 1446210419}
- component: {fileID: 1446210421}
m_Layer: 3
m_Name: Pose Camera
m_TagString: vc_Compare
@@ -5436,7 +5437,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1446210418}
serializedVersion: 2
m_LocalRotation: {x: 0.0000007538141, y: 0.9999878, z: -0.004940901, w: 0.00015256426}
m_LocalRotation: {x: 0.00000075398714, y: 0.9999878, z: -0.004940921, w: 0.00015259867}
m_LocalPosition: {x: 18.109627, y: 8.274419, z: 9.536423}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -5444,6 +5445,19 @@ Transform:
- {fileID: 835970670}
m_Father: {fileID: 1346050330}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1446210421
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1446210418}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a4300a1a4ef3b064a89ed9ad47a8cca5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_CameraSettings: {fileID: 11400000, guid: 0f775fd92a022f441a939e36bbcd6b1e, type: 2}
--- !u!1 &1450629402
GameObject:
m_ObjectHideFlags: 0
@@ -6669,22 +6683,22 @@ LineRenderer:
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}
- {x: -72.7769, y: -18.496506, z: -228.58112}
- {x: 165.02495, y: -18.496506, z: -228.58112}
- {x: 165.02495, y: -18.496506, z: -9.704887}
- {x: -72.7769, y: -18.496506, z: -9.704887}
- {x: -72.7769, y: -18.496506, z: -228.58112}
- {x: -72.7769, y: 399.35565, z: -228.58112}
- {x: 165.02495, y: 399.35565, z: -228.58112}
- {x: 165.02495, y: -18.496506, z: -228.58112}
- {x: 165.02495, y: 399.35565, z: -228.58112}
- {x: 165.02495, y: 399.35565, z: -9.704887}
- {x: 165.02495, y: -18.496506, z: -9.704887}
- {x: 165.02495, y: 399.35565, z: -9.704887}
- {x: -72.7769, y: 399.35565, z: -9.704887}
- {x: -72.7769, y: -18.496506, z: -9.704887}
- {x: -72.7769, y: 399.35565, z: -9.704887}
- {x: -72.7769, y: 399.35565, z: -228.58112}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@@ -7027,7 +7041,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1955078056}
serializedVersion: 2
m_LocalRotation: {x: 0.7004385, y: -0.026137773, z: 0.025707029, w: 0.7127706}
m_LocalRotation: {x: 0.7004386, y: -0.026136603, z: 0.025705881, 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
@@ -7219,8 +7233,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -5, y: 103.29999}
m_SizeDelta: {x: 1600, y: 0}
m_AnchoredPosition: {x: -5, y: 47}
m_SizeDelta: {x: 600, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2115541934
MonoBehaviour:
@@ -7271,12 +7285,12 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 100
m_fontSize: 33
m_fontSizeBase: 120
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 100
m_fontSizeMax: 175
m_fontSizeMin: 33
m_fontSizeMax: 50
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@@ -16284,7 +16298,7 @@ MonoBehaviour:
hasUpgradedBrainParametersWithActionSpec: 1
m_Model: {fileID: 5022602860645237092, guid: 0e791689cf0300c4fbe8be76f09fccff, type: 3}
m_InferenceDevice: 2
m_BehaviorType: 2
m_BehaviorType: 0
m_BehaviorName: DReCon-v0
TeamId: 0
m_UseChildSensors: 1

3
Assets/8_Scripts/1_Managers/CameraManager.cs
View File

@@ -78,6 +78,7 @@ public class CameraManager : MonoBehaviour
private void CameraControllerInput(){
var count = 0;
if(Input.GetKeyDown(KeyCode.LeftArrow)){
if (m_CameraIndex != 0)
m_CameraIndex--;
@@ -89,7 +90,7 @@ public class CameraManager : MonoBehaviour
}
for(int i = 0 + (m_CameraIndex * 10); i < m_CameraObjects.Count; i++){
for(int i = 0 + (m_CameraIndex * 10); i < m_CameraObjects.Count + 1; i++){
if(Input.GetKeyDown(KeyCode.Alpha0 + ( i - ( m_CameraIndex * 10 ) ))){
foreach(GameObject obj in m_CameraObjects){
if(count == i){

2
Assets/8_Scripts/1_Managers/Model Manager.cs
View File

@@ -59,7 +59,7 @@ public class ModelManager : MonoBehaviour
private void LoadLocalModels()
{
DirectoryInfo dirInfo = new DirectoryInfo(Path.Combine(Application.dataPath, m_DirectoryPath));
DirectoryInfo dirInfo = new DirectoryInfo("C:\\Users\\caile\\Desktop\\onnx");
FileInfo[] nnList = dirInfo.GetFiles("*.onnx");
// Sort files by filename (assuming filenames are numeric)
Array.Sort(nnList, (x, y) => {

28
Assets/8_Scripts/1_Managers/SubtitleManager.cs
View File

@@ -95,22 +95,22 @@ public class SubtitleManager : MonoBehaviour
if (Random.Range(0f, 10f) > 6) earlyStop = true;
yield return new WaitForSecondsRealtime(0);
m_Text.text = sentence;
//m_Text.text = sentence;
//foreach (char c in sentence.ToCharArray())
//{
// index++;
// m_Text.text += c;
// float randomInterval = Random.Range(0.02f, 0.06f);
// yield return new WaitForSecondsRealtime(randomInterval);
// m_TimeElapsed += randomInterval;
foreach (char c in sentence.ToCharArray())
{
index++;
m_Text.text += c;
float randomInterval = Random.Range(0.02f, 0.06f);
yield return new WaitForSecondsRealtime(randomInterval);
m_TimeElapsed += randomInterval;
// // Stop audio early based on probability
// if (randomStoppingValue == index && earlyStop)
// {
// AudioManager.instance.StopSound(m_NarrationSFXInst);
// }
//}
// Stop audio early based on probability
if (randomStoppingValue == index && earlyStop)
{
AudioManager.instance.StopSound(m_NarrationSFXInst);
}
}
StartCoroutine(ClearText(waitTime, false));
}

1
Assets/8_Scripts/3_Script/Howl by Alan Ginsberg.txt
View File

@@ -1,4 +1,3 @@
what sphinx of cement and aluminum bashed open their skulls and ate up their brains and imagination?
moloch
solitude

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

@@ -1 +1 @@
{"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"}}
{"count":1,"self":202.16128,"total":210.7398988,"children":{"InitializeActuators":{"count":1,"self":0.0015145999999999998,"total":0.0015145999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.001006,"total":0.001006,"children":null},"AgentSendState":{"count":12170,"self":0.09982379999999999,"total":2.9599415,"children":{"CollectObservations":{"count":6085,"self":2.7872554,"total":2.7872554,"children":null},"WriteActionMask":{"count":6085,"self":0.0207702,"total":0.0207702,"children":null},"RequestDecision":{"count":6085,"self":0.052092099999999995,"total":0.052092099999999995,"children":null}}},"DecideAction":{"count":12170,"self":3.6710528,"total":3.6710526,"children":null},"AgentAct":{"count":12170,"self":1.9441092,"total":1.9441092999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714663679","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":"1714663889"}}

8
Assets/StreamingAssets.meta generated Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f451acef213043b40a9c983dac28d2e4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
ProjectSettings/BurstAotSettings_StandaloneWindows.json
View File

@@ -1,16 +1,18 @@
{
"MonoBehaviour": {
"Version": 3,
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"UsePlatformSDKLinker": false,
"DebugDataKind": 0,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX32": 6,
"CpuTargetsX64": 72
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}

2
ProjectSettings/CommonBurstAotSettings.json
View File

@@ -1,6 +1,6 @@
{
"MonoBehaviour": {
"Version": 3,
"Version": 4,
"DisabledWarnings": ""
}
}