Skip to content

Commit

Permalink
fix(mesh): fixed arena defaults for several geometries
Browse files Browse the repository at this point in the history
  • Loading branch information
@mwfarb
mwfarb committed Feb 28, 2023
1 parent 57cfdf5 commit 3bb06f2
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 29 deletions.
6 changes: 3 additions & 3 deletions Runtime/ArenaMesh/ArenaMeshCube.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public class ArenaMeshCube : ArenaMesh
[SerializeField, Range(0.5f, 10f)] internal float width = 1f;
[SerializeField, Range(0.5f, 10f)] internal float height = 1f;
[SerializeField, Range(0.5f, 10f)] internal float depth = 1f;
[SerializeField, Range(2, 20)] internal int widthSegments = 2;
[SerializeField, Range(2, 20)] internal int heightSegments = 2;
[SerializeField, Range(2, 20)] internal int depthSegments = 2;
[SerializeField, Range(1, 10)] internal int widthSegments = 1;
[SerializeField, Range(1, 10)] internal int heightSegments = 1;
[SerializeField, Range(1, 10)] internal int depthSegments = 1;

protected override void Build(MeshFilter filter)
{
Expand Down
8 changes: 6 additions & 2 deletions Runtime/ArenaMesh/ArenaMeshPlane.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ public enum PlaneType
[SerializeField] internal PlaneType type = PlaneType.Default;
[SerializeField, Range(0.5f, 10f)] internal float width = 1f;
[SerializeField, Range(0.5f, 10f)] internal float height = 1f;
[SerializeField, Range(2, 40)] internal int wSegments = 2;
[SerializeField, Range(2, 40)] internal int hSegments = 2;
[SerializeField, Range(1, 20)] internal int wSegments = 1;
[SerializeField, Range(1, 20)] internal int hSegments = 1;

protected override void Build(MeshFilter filter)
{
// convert to triangles
wSegments *= 2;
hSegments *= 2;

switch (type)
{
case PlaneType.Noise:
Expand Down
4 changes: 2 additions & 2 deletions Runtime/ArenaMesh/ArenaMeshTorusKnot.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public class ArenaMeshTorusKnot : ArenaMesh
[SerializeField, Range(0.05f, 10f)] internal float radiusTubular = 0.1f;
[SerializeField, Range(2, 64)] internal int radialSegments = 16;
[SerializeField, Range(3, 64)] internal int thetaSegments = 8;
[SerializeField, Range(2, 5)] internal int p = 2;
[SerializeField, Range(2, 5)] internal int q = 3;
[SerializeField, Range(2, 5)] internal float p = 2;
[SerializeField, Range(2, 5)] internal float q = 3;

protected override void Build(MeshFilter filter)
{
Expand Down
55 changes: 33 additions & 22 deletions Runtime/ArenaUnity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,34 @@ public static void ToUnityMesh(dynamic indata, ref GameObject gobj)
}
switch (type)
{
// build your own meshes, defaults here should reflect ARENA/AFRAME/THREE defaults
// build your own meshes, defaults here should reflect ARENA/AFRAME defaults
case "capsule":
ArenaMeshCapsule capsule = gobj.GetComponent<ArenaMeshCapsule>() ?? gobj.AddComponent<ArenaMeshCapsule>();
capsule.radius = data.radius != null ? (float)data.radius : 1f;
capsule.length = data.length != null ? (float)data.length : 1f;
capsule.radialSegments = data.segmentsRadial != null ? (int)data.segmentsRadial : 36;
capsule.heightSegments = data.segmentsHeight != null ? (int)data.segmentsHeight : 18;
capsule.heightSegments = data.segmentsCap != null ? (int)data.segmentsCap : 18;
break;
case "box":
case "cube": // support legacy arena 'cube' == 'box'
ArenaMeshCube cube = gobj.GetComponent<ArenaMeshCube>() ?? gobj.AddComponent<ArenaMeshCube>();
cube.width = data.width != null ? (float)data.width : 1f;
cube.height = data.height != null ? (float)data.height : 1f;
cube.depth = data.depth != null ? (float)data.depth : 1f;
cube.widthSegments = data.segmentsWidth != null ? (int)data.segmentsWidth : 2;
cube.heightSegments = data.segmentsHeight != null ? (int)data.segmentsHeight : 2;
cube.depthSegments = data.segmentsDepth != null ? (int)data.segmentsDepth : 2;
cube.widthSegments = data.segmentsWidth != null ? (int)data.segmentsWidth : 1;
cube.heightSegments = data.segmentsHeight != null ? (int)data.segmentsHeight : 1;
cube.depthSegments = data.segmentsDepth != null ? (int)data.segmentsDepth : 1;
break;
case "cone":
ArenaMeshCone cone = gobj.GetComponent<ArenaMeshCone>() ?? gobj.AddComponent<ArenaMeshCone>();
cone.radius = data.radiusBottom != null ? (float)data.radiusBottom : 1f;
//cone.radiusTop = data.radiusTop != null ? (float)data.radiusTop : 0.01f;
cone.height = data.height != null ? (float)data.height : 1f;
cone.subdivision = data.segmentsRadial != null ? (int)data.segmentsRadial : 36;
//cone.segmentsHeight = data.segmentsHeight != null ? (int)data.segmentsHeight : 18;
//cone.openEnded = data.openEnded != null ? Convert.ToBoolean(data.openEnded) : false;
//cone.thetaStart = (float)(data.thetaStart != null ? Mathf.PI / 180 * (float)data.thetaStart : 0f);
//cone.thetaLength = (float)(data.thetaLength != null ? Mathf.PI / 180 * (float)data.thetaLength : Mathf.PI * 2f);
break;
case "cylinder":
ArenaMeshCylinder cylinder = gobj.GetComponent<ArenaMeshCylinder>() ?? gobj.AddComponent<ArenaMeshCylinder>();
Expand All @@ -105,33 +110,35 @@ public static void ToUnityMesh(dynamic indata, ref GameObject gobj)
cylinder.radialSegments = data.segmentsRadial != null ? (int)data.segmentsRadial : 36;
cylinder.heightSegments = data.segmentsHeight != null ? (int)data.segmentsHeight : 18;
cylinder.openEnded = data.openEnded != null ? Convert.ToBoolean(data.openEnded) : false;
//cylinder.thetaStart = (float)(data.thetaStart != null ? Mathf.PI / 180 * (float)data.thetaStart : 0f);
//cylinder.thetaLength = (float)(data.thetaLength != null ? Mathf.PI / 180 * (float)data.thetaLength : Mathf.PI * 2f);
break;
case "dodecahedron":
ArenaMeshDodecahedron dodecahedron = gobj.GetComponent<ArenaMeshDodecahedron>() ?? gobj.AddComponent<ArenaMeshDodecahedron>();
dodecahedron.radius = data.radius != null ? (float)data.radius : 1f;
dodecahedron.details = 0;
dodecahedron.details = data.detail != null ? (int)data.detail : 0;
break;
case "tetrahedron":
ArenaMeshTetrahedron tetrahedron = gobj.GetComponent<ArenaMeshTetrahedron>() ?? gobj.AddComponent<ArenaMeshTetrahedron>();
tetrahedron.radius = data.radius != null ? (float)data.radius : 1f;
tetrahedron.details = 0;
tetrahedron.details = data.detail != null ? (int)data.detail : 0;
break;
case "icosahedron":
ArenaMeshIcosahedron icosahedron = gobj.GetComponent<ArenaMeshIcosahedron>() ?? gobj.AddComponent<ArenaMeshIcosahedron>();
icosahedron.radius = data.radius != null ? (float)data.radius : 1f;
icosahedron.details = 0;
icosahedron.details = data.detail != null ? (int)data.detail : 0;
break;
case "octahedron":
ArenaMeshOctahedron octahedron = gobj.GetComponent<ArenaMeshOctahedron>() ?? gobj.AddComponent<ArenaMeshOctahedron>();
octahedron.radius = data.radius != null ? (float)data.radius : 1f;
octahedron.details = 0;
octahedron.details = data.detail != null ? (int)data.detail : 0;
break;
case "plane":
ArenaMeshPlane plane = gobj.GetComponent<ArenaMeshPlane>() ?? gobj.AddComponent<ArenaMeshPlane>();
plane.width = data.width != null ? (float)data.width : 1f;
plane.height = data.height != null ? (float)data.height : 1f;
plane.wSegments = data.segmentsWidth != null ? (int)data.segmentsWidth : 2;
plane.hSegments = data.segmentsHeight != null ? (int)data.segmentsHeight : 2;
plane.wSegments = data.segmentsWidth != null ? (int)data.segmentsWidth : 1;
plane.hSegments = data.segmentsHeight != null ? (int)data.segmentsHeight : 1;
break;
case "prism":
ArenaMeshPrism prism = gobj.GetComponent<ArenaMeshPrism>() ?? gobj.AddComponent<ArenaMeshPrism>();
Expand All @@ -141,9 +148,9 @@ public static void ToUnityMesh(dynamic indata, ref GameObject gobj)
break;
case "ring":
ArenaMeshRing ring = gobj.GetComponent<ArenaMeshRing>() ?? gobj.AddComponent<ArenaMeshRing>();
ring.outerRadius = data.radiusOuter != null ? (float)data.radiusOuter : 1f;
ring.innerRadius = data.radiusInner != null ? (float)data.radiusInner : 0.5f;
ring.phiSegments = data.segmentsPhi != null ? (int)data.segmentsPhi : 8;
ring.outerRadius = data.radiusOuter != null ? (float)data.radiusOuter : 1.2f;
ring.innerRadius = data.radiusInner != null ? (float)data.radiusInner : 0.8f;
ring.phiSegments = data.segmentsPhi != null ? (int)data.segmentsPhi : 10;
ring.thetaSegments = data.segmentsTheta != null ? (int)data.segmentsTheta : 32;
ring.thetaStart = (float)(data.thetaStart != null ? Mathf.PI / 180 * (float)data.thetaStart : 0f);
ring.thetaLength = (float)(data.thetaLength != null ? Mathf.PI / 180 * (float)data.thetaLength : Mathf.PI * 2f);
Expand All @@ -161,11 +168,15 @@ public static void ToUnityMesh(dynamic indata, ref GameObject gobj)
sphere.radius = data.radius != null ? (float)data.radius : 1f;
sphere.lonSegments = data.segmentsWidth != null ? (int)data.segmentsWidth : 18;
sphere.latSegments = data.segmentsHeight != null ? (int)data.segmentsHeight : 36;
//sphere.phiStart = (float)(data.phiStart != null ? Mathf.PI / 180 * (float)data.phiStart : 0f);
//sphere.phiLength = (float)(data.phiLength != null ? Mathf.PI / 180 * (float)data.phiLength : Mathf.PI * 2f);
//sphere.thetaStart = (float)(data.thetaStart != null ? Mathf.PI / 180 * (float)data.thetaStart : 0f);
//sphere.thetaLength = (float)(data.thetaLength != null ? Mathf.PI / 180 * (float)data.thetaLength : Mathf.PI);
break;
case "torus":
ArenaMeshTorus torus = gobj.GetComponent<ArenaMeshTorus>() ?? gobj.AddComponent<ArenaMeshTorus>();
torus.radius = data.radius != null ? (float)data.radius : 1f;
torus.radiusTubular = data.radiusTubular != null ? (float)data.radiusTubular : 0.4f;
torus.radiusTubular = data.radiusTubular != null ? (float)data.radiusTubular : 0.2f;
torus.radialSegments = data.segmentsRadial != null ? (int)data.segmentsRadial : 36;
torus.thetaSegments = data.segmentsTubular != null ? (int)data.segmentsTubular : 32;
torus.thetaStart = 0f;
Expand All @@ -174,11 +185,11 @@ public static void ToUnityMesh(dynamic indata, ref GameObject gobj)
case "torusKnot":
ArenaMeshTorusKnot torusKnot = gobj.GetComponent<ArenaMeshTorusKnot>() ?? gobj.AddComponent<ArenaMeshTorusKnot>();
torusKnot.radius = data.radius != null ? (float)data.radius : 1f;
torusKnot.radiusTubular = data.radiusTubular != null ? (float)data.radiusTubular : 0.4f;
torusKnot.radialSegments = data.segmentsRadial != null ? (int)data.segmentsRadial : 36;
torusKnot.thetaSegments = data.segmentsTubular != null ? (int)data.segmentsTubular : 32;
torusKnot.p = data.p != null ? (int)data.p : 2;
torusKnot.q = data.q != null ? (int)data.q : 3;
torusKnot.radiusTubular = data.radiusTubular != null ? (float)data.radiusTubular : 0.2f;
torusKnot.radialSegments = data.segmentsRadial != null ? (int)data.segmentsRadial : 8;
torusKnot.thetaSegments = data.segmentsTubular != null ? (int)data.segmentsTubular : 100;
torusKnot.p = data.p != null ? (float)data.p : 2f;
torusKnot.q = data.q != null ? (float)data.q : 3f;
break;
case "triangle":
ArenaMeshTriangle triangle = gobj.GetComponent<ArenaMeshTriangle>() ?? gobj.AddComponent<ArenaMeshTriangle>();
Expand Down Expand Up @@ -285,11 +296,11 @@ public static void ToArenaMesh(GameObject gobj, ref dynamic data)
}

// position
private static string ToArenaPositionString(Vector3 position)
public static string ToArenaPositionString(Vector3 position)
{
return $"{ArenaFloat(position.x)} {ArenaFloat(position.y)} {ArenaFloat(-position.z)}";
}
private static Vector3 ToUnityPositionString(string strPos)
public static Vector3 ToUnityPositionString(string strPos)
{
string[] axis = strPos.Split(new char[] { ' ' }, 3, StringSplitOptions.RemoveEmptyEntries);
return new Vector3(
Expand Down

0 comments on commit 3bb06f2

Please sign in to comment.