forked from cgvr/DeltaVR
quest marker hovers above specified target
This commit is contained in:
@@ -58,8 +58,8 @@ public class ShapeDetectionNPC : NPCController
|
||||
{
|
||||
state = 1;
|
||||
await CallPlayer();
|
||||
await Task.Delay(2500);
|
||||
questMarker.MoveTo(radio.transform);
|
||||
await Task.Delay(2000);
|
||||
questMarker.MoveTo(radio.transform, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ public class ShapeDetectionNPC : NPCController
|
||||
{
|
||||
SpeakVoiceLine(5, radio.gameObject, radioAmount);
|
||||
state = 5;
|
||||
questMarker.MoveTo(shapeScanner.transform);
|
||||
questMarker.MoveTo(shapeScanner.transform, true);
|
||||
}
|
||||
|
||||
string encodedTexture = Convert.ToBase64String(GeneratedTexture.EncodeToJPG());
|
||||
|
||||
@@ -7,10 +7,11 @@ public class QuestMarker : MonoBehaviour
|
||||
public Transform movingPart;
|
||||
public float amplitude = 0.1f; // How far up/down it moves
|
||||
public float frequency = 1.5f; // Speed of oscillation
|
||||
public float heightAboveTarget = 1f;
|
||||
public float heightAboveTarget = 0.75f;
|
||||
|
||||
private Vector3 startPos;
|
||||
private Transform playerTransform;
|
||||
private Transform hoverAboveTransform;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
@@ -31,6 +32,13 @@ public class QuestMarker : MonoBehaviour
|
||||
Vector3 lookTargetPos = new Vector3(playerTransform.position.x, transform.position.y, playerTransform.position.z);
|
||||
transform.LookAt(lookTargetPos);
|
||||
}
|
||||
|
||||
if (hoverAboveTransform != null)
|
||||
{
|
||||
Debug.Log("pos before floating: " + transform.position);
|
||||
transform.position = hoverAboveTransform.position + new Vector3(0f, heightAboveTarget, 0f);
|
||||
Debug.Log("pos after floating: " + transform.position);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
@@ -49,8 +57,15 @@ public class QuestMarker : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
public void MoveTo(Transform target)
|
||||
public void MoveTo(Transform target, bool attach = false)
|
||||
{
|
||||
transform.position = target.position + new Vector3(0, heightAboveTarget, 0);
|
||||
if (attach)
|
||||
{
|
||||
hoverAboveTransform = target;
|
||||
} else
|
||||
{
|
||||
hoverAboveTransform = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user