feat(line/thickline): support object type, also LineRenderer to

arenaxr · Mar 3, 2023 · 07d832f · 07d832f
1 parent a4d8da1
commit 07d832f
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 16 deletions.
diff --git a/Runtime/ArenaClientScene.cs b/Runtime/ArenaClientScene.cs
@@ -611,8 +611,9 @@ private void CreateUpdateObject(string object_id, string storeType, bool persist
                 case "text":
                     ArenaUnity.ToUnityText(data, ref gobj);
                     break;
+                case "line":
                 case "thickline":
-                    ArenaUnity.ToUnityThickline(data, ref gobj);
+                    ArenaUnity.ToUnityLine(data, ref gobj);
                     break;
                 case "light":
                     ArenaUnity.ToUnityLight(data, ref gobj);

diff --git a/Runtime/ArenaObject.cs b/Runtime/ArenaObject.cs
@@ -203,6 +203,8 @@ public bool PublishCreateUpdate(bool transformOnly = false)
                     ArenaUnity.ToArenaMaterial(gameObject, ref dataUnity);
                 if (GetComponent<TextMeshPro>())
                     ArenaUnity.ToArenaText(gameObject, ref dataUnity);
+                if (GetComponent<LineRenderer>())
+                    ArenaUnity.ToArenaLine(gameObject, ref dataUnity);
             }
 
             // merge unity data with original message data

diff --git a/Runtime/ArenaUnity.cs b/Runtime/ArenaUnity.cs
@@ -20,6 +20,7 @@ namespace ArenaUnity
     /// </summary>
     public static class ArenaUnity
     {
+        private const float SinglePixelInMeters = 0.005f;
         private static string ColorPropertyName = (!GraphicsSettings.renderPipelineAsset ? "_Color" : "_BaseColor");
 
         private static float ArenaFloat(float n) { return (float)Math.Round(n, 3); }
@@ -45,9 +46,12 @@ public static string ToArenaObjectType(GameObject gobj)
             TextMeshPro tm = gobj.GetComponent<TextMeshPro>();
             Light light = gobj.GetComponent<Light>();
             SpriteRenderer spriteRenderer = gobj.GetComponent<SpriteRenderer>();
+            LineRenderer lr = gobj.GetComponent<LineRenderer>();
             // initial priority is primitive
             if (spriteRenderer && spriteRenderer.sprite && spriteRenderer.sprite.pixelsPerUnit != 0f)
                 objectType = "image";
+            else if (lr)
+                objectType = "thickline";
             else if (tm)
                 objectType = "text";
             else if (light)
@@ -473,29 +477,75 @@ public static Color ColorRandom()
         }
 
         // line/thickline
-        public static void ToUnityThickline(dynamic data, ref GameObject gobj)
+        public static void ToArenaLine(GameObject gobj, ref dynamic data)
+        {
+            // TODO: support Material opacity/visibility
+            LineRenderer line = gobj.GetComponent<LineRenderer>();
+            // always use thickline, too many variables otherwise
+            data.object_type = "thickline";
+            string[] positions = new string[line.positionCount];
+            Vector3[] vertices = new Vector3[line.positionCount];
+            line.GetPositions(vertices);
+            if (line.useWorldSpace)
+            {   // line.useWorldSpace does not match arena thickline which always uses position
+                for (var i = 0; i < line.positionCount; i++)
+                {
+                    // arena ignores line position transform, so translate every position?...
+                    positions[i] = ToArenaPositionString(vertices[i] - gobj.transform.localPosition);
+                }
+                // TODO: does arena ignores thickline rotation?
+            }
+            else
+            {   // !line.useWorldSpace matches arena thickline which always uses position
+                for (var i = 0; i < line.positionCount; i++)
+                {
+                    positions[i] = ToArenaPositionString(vertices[i]);
+                }
+            }
+            data.path = string.Join(",", positions);
+            data.lineWidth = (int)(line.startWidth / SinglePixelInMeters); // TODO: support endWidth
+            data.color = ToArenaColor(line.startColor); // TODO: support endColor
+        }
+        public static void ToUnityLine(dynamic data, ref GameObject gobj)
         {
             LineRenderer line = gobj.GetComponent<LineRenderer>();
             if (line == null)
                 line = gobj.AddComponent<LineRenderer>();
 
-            if (data.color != null)
-                line.startColor = line.endColor = ToUnityColor((string)data.color);
-            // convert arena thickline pixels vs unity meters
             float pixelWidth = 1f; // default
-            if (data.lineWidth != null)
-                pixelWidth = (float)data.lineWidth;
-            line.startWidth = line.endWidth = pixelWidth * 0.005f;
-            if (data.path != null)
+            switch ((string)data.object_type)
             {
-                string[] nodes = ((string)data.path).Split(new char[] { ',' });
-                line.positionCount = nodes.Length;
-                for (var i = 0; i < nodes.Length; i++)
-                {
-                    Vector3 position = ToUnityPositionString(nodes[i]);
-                    line.SetPosition(i, position);
-                }
+                case "line":
+                    line.useWorldSpace = true; // match arena line which always ignores position
+                    if (data.start != null && data.end != null)
+                    {
+                        Vector3[] nodes = {
+                            ToUnityPosition(data.start),
+                            ToUnityPosition(data.end),
+                        };
+                        line.SetPositions(nodes);
+                    }
+                    break;
+                case "thickline":
+                    line.useWorldSpace = false; // match arena thickline which always uses position
+                    if (data.path != null)
+                    {
+                        string[] nodes = ((string)data.path).Split(new char[] { ',' });
+                        line.positionCount = nodes.Length;
+                        for (var i = 0; i < nodes.Length; i++)
+                        {
+                            Vector3 position = ToUnityPositionString(nodes[i]);
+                            line.SetPosition(i, position);
+                        }
+                    }
+                    if (data.lineWidth != null)
+                        pixelWidth = (float)data.lineWidth;
+                    break;
             }
+            // convert arena thickline pixels vs unity meters
+            line.startWidth = line.endWidth = pixelWidth * SinglePixelInMeters;
+            if (data.color != null)
+                line.startColor = line.endColor = ToUnityColor((string)data.color);
         }
 
         // text