aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiakata <miakata@gmail.com>2019-04-28 02:08:47 +0200
committermiakata <miakata@gmail.com>2019-04-28 02:08:47 +0200
commitb0a8bf29889bec24153abbd6f39ad1a0f5662393 (patch)
treebf742b1078b59712235535f62ee2402d9d4e294e /nGJ2019/Assets/Scripts/RockJaws.cs
parentc9592befb156b0528fec0000613c2dd73fe90af8 (diff)
parent1ed8a90dc94bedb19039ee1777c12b6a731cf710 (diff)
Merge branch 'master' of https://github.com/marcinzelent/ngj2019
Diffstat (limited to 'nGJ2019/Assets/Scripts/RockJaws.cs')
-rw-r--r--nGJ2019/Assets/Scripts/RockJaws.cs15
1 files changed, 9 insertions, 6 deletions
diff --git a/nGJ2019/Assets/Scripts/RockJaws.cs b/nGJ2019/Assets/Scripts/RockJaws.cs
index a161dfe..874d6d3 100644
--- a/nGJ2019/Assets/Scripts/RockJaws.cs
+++ b/nGJ2019/Assets/Scripts/RockJaws.cs
@@ -23,15 +23,18 @@ public class RockJaws : MonoBehaviour
void FixedUpdate()
{
- if (TopJaw.localPosition.y < BottomJaw.localPosition.y) reverse = true;
- else if(TopJaw.localPosition.y > initialTopJawY) reverse = false;
+ var topJawHeight= TopJaw.GetComponent<MeshRenderer>().bounds.size.y;
+ var bottomJawHeight= BottomJaw.GetComponent<MeshRenderer>().bounds.size.y;
+
+ if (TopJaw.localPosition.y - topJawHeight / 2 < BottomJaw.localPosition.y + bottomJawHeight / 2) reverse = true;
+ else if(TopJaw.localPosition.y > initialTopJawY) reverse = false;
if (!reverse) {
- TopJaw.Translate(0, -0.01f * Speed, 0);
- BottomJaw.Translate(0, 0.01f * Speed, 0);
+ TopJaw.Translate(0, -0.01f * Speed, 0, Space.World);
+ BottomJaw.Translate(0, 0.01f * Speed, 0, Space.World);
} else {
- TopJaw.Translate(0, 0.01f * Speed, 0);
- BottomJaw.Translate(0, -0.01f * Speed, 0);
+ TopJaw.Translate(0, 0.01f * Speed, 0, Space.World);
+ BottomJaw.Translate(0, -0.01f * Speed, 0, Space.World);
}
}
}