From 790e527dc4433beadf12abaee618da9650699a82 Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Sun, 28 Apr 2019 01:00:52 +0200 Subject: Updated rock jaws model --- nGJ2019/Assets/Scripts/RockJaws.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'nGJ2019/Assets/Scripts') 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().bounds.size.y; + var bottomJawHeight= BottomJaw.GetComponent().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); } } } -- cgit v1.2.3 From 15c548b59d04c0e52c34bd89e52665b3f2fce9e2 Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Sun, 28 Apr 2019 01:01:39 +0200 Subject: Fixed positioning of rock jaws --- nGJ2019/Assets/Scripts/ObstacleSpawner.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nGJ2019/Assets/Scripts') diff --git a/nGJ2019/Assets/Scripts/ObstacleSpawner.cs b/nGJ2019/Assets/Scripts/ObstacleSpawner.cs index 1615714..4c4028f 100644 --- a/nGJ2019/Assets/Scripts/ObstacleSpawner.cs +++ b/nGJ2019/Assets/Scripts/ObstacleSpawner.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -50,7 +50,7 @@ public class ObstacleSpawner : MonoBehaviour timeline.Add(0, new Vector3(0, 2.75f, 0), ObstacleType.rockTop); timeline.Add(6, new Vector3(0, -2, 0), ObstacleType.rockBottom); timeline.Add(12, new Vector3(0, 0, 0), ObstacleType.narrowPassage); - timeline.Add(20, new Vector3(0, 0, 2), ObstacleType.rockJaws); + timeline.Add(20, new Vector3(0, -2.5f, 2), ObstacleType.rockJaws); timeline.Add(25, new Vector3(0, 0.5f, 3), ObstacleType.net); timeline.OnSpawnEvent += spawnOnEvent; -- cgit v1.2.3