From f13fa851e1b69dd5522ca60e5ae720713dba78e0 Mon Sep 17 00:00:00 2001
From: Daniel <exodaniel@gmail.com>
Date: Wed, 26 Feb 2020 22:07:48 +0100
Subject: [PATCH] fix es m/f ratio, adds random gesture picking
---
.../ControlAnimation/AnimationController.cs | 5 +-
Assets/Scenes/Tests/ETH MBN/Scene 1.unity | 84 +++++++++----------
2 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/Assets/MainAssets/Scripts/Agents/ControlAnimation/AnimationController.cs b/Assets/MainAssets/Scripts/Agents/ControlAnimation/AnimationController.cs
index d091449a..ca5033a8 100644
--- a/Assets/MainAssets/Scripts/Agents/ControlAnimation/AnimationController.cs
+++ b/Assets/MainAssets/Scripts/Agents/ControlAnimation/AnimationController.cs
@@ -36,7 +36,7 @@ public class AnimationController : MonoBehaviour
_objectAnimator.speed = 0;
_objectAnimator.SetFloat("Speed", 0);
_objectAnimator.SetFloat("AngularSpeed", 0);
- _objectAnimator.SetInteger("AnimationType", 2);
+ _objectAnimator.SetInteger("AnimationType", UnityEngine.Random.Range(1,4)); // 1, 2 or 3
#if MIDDLEVR
_objectAnimator.cullingMode = AnimatorCullingMode.CullUpdateTransforms;
@@ -110,7 +110,8 @@ public class AnimationController : MonoBehaviour
{
print("Switching to Idle Animation");
_oldState = _defaultIdleAnimation;
- _objectAnimator.Play(_defaultIdleAnimation);
+ _objectAnimator.SetInteger("AnimationType", UnityEngine.Random.Range(1,4)); // 1, 2 or 3
+ _objectAnimator.Play("Transition");
}
}
_objectAnimator.SetFloat("Speed", animationSpeed);
diff --git a/Assets/Scenes/Tests/ETH MBN/Scene 1.unity b/Assets/Scenes/Tests/ETH MBN/Scene 1.unity
index d6438b7c..7b5d6a53 100644
--- a/Assets/Scenes/Tests/ETH MBN/Scene 1.unity
+++ b/Assets/Scenes/Tests/ETH MBN/Scene 1.unity
@@ -13516,7 +13516,7 @@ Transform:
- {fileID: 1837957688}
- {fileID: 1160794715}
m_Father: {fileID: 1806438592}
- m_RootOrder: 29
+ m_RootOrder: 33
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &147138118
MonoBehaviour:
@@ -30811,7 +30811,7 @@ Transform:
- {fileID: 1446336687}
- {fileID: 435837465}
m_Father: {fileID: 1806438592}
- m_RootOrder: 14
+ m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &348805981
MonoBehaviour:
@@ -39110,7 +39110,7 @@ Transform:
- {fileID: 444284384}
- {fileID: 980266863}
m_Father: {fileID: 1806438592}
- m_RootOrder: 19
+ m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &440631125
MonoBehaviour:
@@ -40739,7 +40739,7 @@ Transform:
- {fileID: 1907703192}
- {fileID: 155254484}
m_Father: {fileID: 1806438592}
- m_RootOrder: 15
+ m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &459962560
MonoBehaviour:
@@ -41621,7 +41621,7 @@ Transform:
- {fileID: 453169081}
- {fileID: 730479777}
m_Father: {fileID: 1806438592}
- m_RootOrder: 23
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &469109884
MonoBehaviour:
@@ -45021,7 +45021,7 @@ Transform:
- {fileID: 515012643}
- {fileID: 1710616441}
m_Father: {fileID: 1806438592}
- m_RootOrder: 2
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &499128047
MonoBehaviour:
@@ -49263,7 +49263,7 @@ Transform:
- {fileID: 785959068}
- {fileID: 98807223}
m_Father: {fileID: 1806438592}
- m_RootOrder: 17
+ m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &549413230
MonoBehaviour:
@@ -54928,7 +54928,7 @@ Transform:
- {fileID: 436801206}
- {fileID: 1673176488}
m_Father: {fileID: 1806438592}
- m_RootOrder: 30
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &624914941
MonoBehaviour:
@@ -58364,7 +58364,7 @@ Transform:
- {fileID: 2005887349}
- {fileID: 1419496015}
m_Father: {fileID: 1806438592}
- m_RootOrder: 28
+ m_RootOrder: 32
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &661014223
MonoBehaviour:
@@ -58822,7 +58822,7 @@ Transform:
- {fileID: 737760036}
- {fileID: 1415760277}
m_Father: {fileID: 1806438592}
- m_RootOrder: 10
+ m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &666477171
MonoBehaviour:
@@ -63350,7 +63350,7 @@ Transform:
- {fileID: 1053382155}
- {fileID: 1020604028}
m_Father: {fileID: 1806438592}
- m_RootOrder: 4
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &722645081
MonoBehaviour:
@@ -73049,7 +73049,7 @@ Transform:
- {fileID: 1281013410}
- {fileID: 1314669587}
m_Father: {fileID: 1806438592}
- m_RootOrder: 35
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &832223752
MonoBehaviour:
@@ -86764,7 +86764,7 @@ Transform:
- {fileID: 486199633}
- {fileID: 231723416}
m_Father: {fileID: 1806438592}
- m_RootOrder: 7
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &998224297
MonoBehaviour:
@@ -92617,7 +92617,7 @@ Transform:
- {fileID: 1884000654}
- {fileID: 182664816}
m_Father: {fileID: 1806438592}
- m_RootOrder: 5
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1076032917
MonoBehaviour:
@@ -98285,7 +98285,7 @@ Transform:
- {fileID: 2061503163}
- {fileID: 1545499467}
m_Father: {fileID: 1806438592}
- m_RootOrder: 31
+ m_RootOrder: 34
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1138062055
MonoBehaviour:
@@ -98489,7 +98489,7 @@ Transform:
- {fileID: 1118391673}
- {fileID: 1509809123}
m_Father: {fileID: 1806438592}
- m_RootOrder: 22
+ m_RootOrder: 30
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1138753880
MonoBehaviour:
@@ -105126,7 +105126,7 @@ Transform:
- {fileID: 1537994782}
- {fileID: 1111518604}
m_Father: {fileID: 1806438592}
- m_RootOrder: 11
+ m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1212602825
MonoBehaviour:
@@ -111126,7 +111126,7 @@ Transform:
- {fileID: 1408173968}
- {fileID: 599350251}
m_Father: {fileID: 1806438592}
- m_RootOrder: 34
+ m_RootOrder: 35
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1286355699
MonoBehaviour:
@@ -111405,7 +111405,7 @@ Transform:
- {fileID: 1460089066}
- {fileID: 1936614795}
m_Father: {fileID: 1806438592}
- m_RootOrder: 12
+ m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1289547310
MonoBehaviour:
@@ -112276,7 +112276,7 @@ Transform:
- {fileID: 1309163114}
- {fileID: 537495810}
m_Father: {fileID: 1806438592}
- m_RootOrder: 27
+ m_RootOrder: 31
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1301856134
MonoBehaviour:
@@ -120118,7 +120118,7 @@ Transform:
- {fileID: 538615989}
- {fileID: 1510950838}
m_Father: {fileID: 1806438592}
- m_RootOrder: 9
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1399113361
MonoBehaviour:
@@ -122089,7 +122089,7 @@ Transform:
- {fileID: 60347268}
- {fileID: 1499139755}
m_Father: {fileID: 1806438592}
- m_RootOrder: 3
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1420990183
MonoBehaviour:
@@ -124359,7 +124359,7 @@ Transform:
- {fileID: 682493644}
- {fileID: 1679006206}
m_Father: {fileID: 1806438592}
- m_RootOrder: 33
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1446585679
MonoBehaviour:
@@ -125385,7 +125385,7 @@ Transform:
- {fileID: 1820712508}
- {fileID: 1172007619}
m_Father: {fileID: 1806438592}
- m_RootOrder: 18
+ m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1460197227
MonoBehaviour:
@@ -129453,7 +129453,7 @@ Transform:
- {fileID: 346852181}
- {fileID: 1808021960}
m_Father: {fileID: 1806438592}
- m_RootOrder: 13
+ m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1508693283
MonoBehaviour:
@@ -134712,7 +134712,7 @@ Transform:
- {fileID: 492878158}
- {fileID: 703342452}
m_Father: {fileID: 1806438592}
- m_RootOrder: 32
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1565167235
MonoBehaviour:
@@ -143862,7 +143862,7 @@ Transform:
- {fileID: 710702068}
- {fileID: 1991511279}
m_Father: {fileID: 1806438592}
- m_RootOrder: 24
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1670121422
MonoBehaviour:
@@ -151375,7 +151375,7 @@ Transform:
- {fileID: 1398979258}
- {fileID: 746106052}
m_Father: {fileID: 1806438592}
- m_RootOrder: 16
+ m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1755163412
MonoBehaviour:
@@ -152373,7 +152373,7 @@ Transform:
- {fileID: 1533427498}
- {fileID: 1680671680}
m_Father: {fileID: 1806438592}
- m_RootOrder: 8
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1766342095
MonoBehaviour:
@@ -155562,7 +155562,7 @@ Transform:
- {fileID: 1472811795}
- {fileID: 2073427357}
m_Father: {fileID: 1806438592}
- m_RootOrder: 6
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1804499900
MonoBehaviour:
@@ -155795,17 +155795,25 @@ Transform:
m_Children:
- {fileID: 5548364807954965255}
- {fileID: 111417084}
+ - {fileID: 1446585678}
+ - {fileID: 1565167234}
+ - {fileID: 1670121421}
- {fileID: 499128046}
- {fileID: 1420990182}
+ - {fileID: 832223751}
- {fileID: 722645080}
- {fileID: 1076032916}
- {fileID: 1804499899}
+ - {fileID: 469109883}
- {fileID: 998224296}
+ - {fileID: 624914940}
+ - {fileID: 1993647927}
- {fileID: 1766342094}
- {fileID: 1399113360}
- {fileID: 666477170}
- {fileID: 1212602824}
- {fileID: 1289547309}
+ - {fileID: 2104289407}
- {fileID: 1508693282}
- {fileID: 348805980}
- {fileID: 459962559}
@@ -155816,19 +155824,11 @@ Transform:
- {fileID: 1974415124}
- {fileID: 1823558526}
- {fileID: 1138753879}
- - {fileID: 469109883}
- - {fileID: 1670121421}
- - {fileID: 2104289407}
- - {fileID: 1993647927}
- {fileID: 1301856133}
- {fileID: 661014222}
- {fileID: 147138117}
- - {fileID: 624914940}
- {fileID: 1138062054}
- - {fileID: 1565167234}
- - {fileID: 1446585678}
- {fileID: 1286355698}
- - {fileID: 832223751}
- {fileID: 654997290}
- {fileID: 1934727850}
- {fileID: 1753389743}
@@ -157404,7 +157404,7 @@ Transform:
- {fileID: 878034887}
- {fileID: 2054212240}
m_Father: {fileID: 1806438592}
- m_RootOrder: 21
+ m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1823558527
MonoBehaviour:
@@ -170332,7 +170332,7 @@ Transform:
- {fileID: 1826080898}
- {fileID: 1654051850}
m_Father: {fileID: 1806438592}
- m_RootOrder: 20
+ m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1974415125
MonoBehaviour:
@@ -172041,7 +172041,7 @@ Transform:
- {fileID: 588912447}
- {fileID: 640821641}
m_Father: {fileID: 1806438592}
- m_RootOrder: 26
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1993647928
MonoBehaviour:
@@ -182141,7 +182141,7 @@ Transform:
- {fileID: 1454697148}
- {fileID: 488152226}
m_Father: {fileID: 1806438592}
- m_RootOrder: 25
+ m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2104289408
MonoBehaviour:
--
GitLab