Merge branch 'master' of https://github.com/teamfisk/VstyleR

Assets/Measurement.cs

@@ -8,29 +8,40 @@ public class Measurement : MonoBehaviour {
     public Vector3 EndPosition;
     private float HoleSize = 0.1f;
     private Vector3 lineUp = new Vector3(0, 1, 0);
+
+
+    private Vector3 LocalStartPosition;
+    private Vector3 LocalEndPosition;
+
     // Use this for initialization
     void Start () {
 	
 	}
 	
 	// Update is called once per frame
-	void Update () {
+	void Update ()
+	{
+        LocalStartPosition = transform.TransformPoint(StartPosition);
+        LocalEndPosition = transform.TransformPoint(EndPosition);
+        
         Transform line1Transform = transform.FindChild("Line1");
         LineRenderer line1Renderer = line1Transform.GetComponent<LineRenderer>();
 
         Transform line2Transform = transform.FindChild("Line2");
         LineRenderer line2Renderer = line2Transform.GetComponent<LineRenderer>();
         
-        Vector3 middlePosition = (StartPosition + (EndPosition - StartPosition) / 2.0f);
-        
-        float magnitude = (EndPosition - StartPosition).magnitude;
-        Vector3 direction = Vector3.Normalize(EndPosition - StartPosition);
+        Vector3 middlePosition = (LocalStartPosition + (LocalEndPosition - LocalStartPosition) / 2.0f);
 
-        line1Renderer.SetPosition(0, StartPosition);
+
+	    Vector3 startToEnd = LocalEndPosition - LocalStartPosition;
+        float magnitude = startToEnd.magnitude;
+        Vector3 direction = Vector3.Normalize(LocalEndPosition - LocalStartPosition);
+
+        line1Renderer.SetPosition(0, LocalStartPosition);
         line1Renderer.SetPosition(1, middlePosition - (direction * HoleSize));
         
         line2Renderer.SetPosition(0, middlePosition  +(direction * HoleSize));
-        line2Renderer.SetPosition(1, EndPosition);
+        line2Renderer.SetPosition(1, LocalEndPosition);
 
         
 
@@ -40,11 +51,19 @@ public class Measurement : MonoBehaviour {
         if (Camera.current != null)
         {
             textTransform.LookAt(Vector3.Normalize(textTransform.position - Camera.current.transform.position) + textTransform.position);
-            lineUp = Vector3.Normalize(Vector3.Cross(middlePosition - Camera.current.transform.position, EndPosition - StartPosition));
+            lineUp = Vector3.Normalize(Vector3.Cross(middlePosition - Camera.current.transform.position, LocalEndPosition - LocalStartPosition));
         }
 
         TextMesh textMesh = textTransform.GetComponent<TextMesh>();
-	    textMesh.text = magnitude.ToString("0.00") + "m";
+
+        Vector3 inverseScale = new Vector3(1.0f / transform.lossyScale.x, 1.0f / transform.lossyScale.y, 1.0f / transform.lossyScale.z);
+
+        float textMagnitude = Vector3.Scale(startToEnd, inverseScale).magnitude;
+
+
+        textMagnitude = transform.InverseTransformVector(startToEnd).magnitude;
+
+        textMesh.text = textMagnitude.ToString("0.00") + "m";
 
 
 	    textMesh.characterSize = Mathf.Max(0.001f * Math.Min(1.0f , magnitude), 0.0005f);
@@ -54,14 +73,14 @@ public class Measurement : MonoBehaviour {
         Transform line1BaseTransform = transform.FindChild("Line1Base");
         LineRenderer line1BaseRenderer = line1BaseTransform.GetComponent<LineRenderer>();
         
-        line1BaseRenderer.SetPosition(0, StartPosition + lineUp * 0.01f);
-        line1BaseRenderer.SetPosition(1, StartPosition - lineUp * 0.01f);
+        line1BaseRenderer.SetPosition(0, LocalStartPosition + lineUp * 0.01f);
+        line1BaseRenderer.SetPosition(1, LocalStartPosition - lineUp * 0.01f);
 
 
         Transform line2BaseTransform = transform.FindChild("Line2Base");
         LineRenderer line2BaseRenderer = line2BaseTransform.GetComponent<LineRenderer>();
 
-        line2BaseRenderer.SetPosition(0, EndPosition + lineUp * 0.01f);
-        line2BaseRenderer.SetPosition(1, EndPosition - lineUp * 0.01f);
+        line2BaseRenderer.SetPosition(0, LocalEndPosition + lineUp * 0.01f);
+        line2BaseRenderer.SetPosition(1, LocalEndPosition - lineUp * 0.01f);
     }
 }

Assets/SquidPink.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 99da8952c81b4be4c8d398e523647503
+timeCreated: 1464296533
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: