Remove shadowing from scene groupe type

karimnaaji · karimnaaji · commit 3436647f08fe · 2017-11-01T17:30:04.000-04:00
diff --git a/Assets/Editor/MapzenMapEditor.cs b/Assets/Editor/MapzenMapEditor.cs
@@ -51,7 +51,7 @@ public override void OnInspectorGUI()
         SavePreferences();
     }
 
-    private void SceneGroupToggle(MapzenMap mapzenMap, SceneGroup.Type type)
+    private void SceneGroupToggle(MapzenMap mapzenMap, SceneGroup.GroupType type)
     {
         bool isSet = SceneGroup.Test(type, mapzenMap.GroupOptions);
         isSet = EditorGUILayout.Toggle(type.ToString(), isSet);
@@ -74,13 +74,13 @@ private void TileDataFoldout()
         EditorGUI.indentLevel++;
 
         EditorGUILayout.BeginHorizontal();
-        SceneGroupToggle(mapzenMap, SceneGroup.Type.Feature);
-        SceneGroupToggle(mapzenMap, SceneGroup.Type.Filter);
+        SceneGroupToggle(mapzenMap, SceneGroup.GroupType.Feature);
+        SceneGroupToggle(mapzenMap, SceneGroup.GroupType.Filter);
         EditorGUILayout.EndHorizontal();
 
         EditorGUILayout.BeginHorizontal();
-        SceneGroupToggle(mapzenMap, SceneGroup.Type.Layer);
-        SceneGroupToggle(mapzenMap, SceneGroup.Type.Tile);
+        SceneGroupToggle(mapzenMap, SceneGroup.GroupType.Layer);
+        SceneGroupToggle(mapzenMap, SceneGroup.GroupType.Tile);
         EditorGUILayout.EndHorizontal();
 
         EditorGUI.indentLevel--;
diff --git a/Assets/Mapzen/SceneGroup.cs b/Assets/Mapzen/SceneGroup.cs
@@ -7,7 +7,7 @@ namespace Mapzen
     public class SceneGroup
     {
         [Flags]
-        public enum Type
+        public enum GroupType
         {
             None = 0,
             Tile = 1 << 0,
@@ -24,9 +24,9 @@ public enum Type
         // The mesh data, may be empty
         public MeshData meshData;
 
-        public Type type;
+        public GroupType type;
 
-        public SceneGroup(Type type, string name)
+        public SceneGroup(GroupType type, string name)
         {
             this.childs = new Dictionary<string, SceneGroup>();
             this.type = type;
@@ -39,7 +39,7 @@ public SceneGroup(Type type, string name)
         /// </summary>
         /// <param name="type">The type to check.</param>
         /// <param name="options">The group type options.</param>
-        public static bool Test(Type type, Type options)
+        public static bool Test(GroupType type, GroupType options)
         {
             return ((int)type & (int)options) == (int)type;
         }
@@ -49,14 +49,14 @@ public static bool Test(Type type, Type options)
         /// </summary>
         /// <param name="type">The type to check.</param>
         /// <param name="options">The group type options.</param>
-        public static bool IsLeaf(Type type, Type options)
+        public static bool IsLeaf(GroupType type, GroupType options)
         {
             return ((int)type ^ (int)options) < (int)type;
         }
 
         public override string ToString()
         {
-            if (type == Type.None || type == Type.All)
+            if (type == GroupType.None || type == GroupType.All)
             {
                 return name;
             }
diff --git a/Assets/Mapzen/Unity/TileTask.cs b/Assets/Mapzen/Unity/TileTask.cs
@@ -13,11 +13,11 @@ public class TileTask
     private TileAddress address;
     private byte[] response;
     private bool ready;
-    private SceneGroup.Type groupOptions;
+    private SceneGroup.GroupType groupOptions;
     private float inverseTileScale;
     private Matrix4x4 transform;
 
-    public TileTask(TileAddress address, SceneGroup.Type groupOptions, byte[] response, float offsetX, float offsetY, float regionScaleRatio)
+    public TileTask(TileAddress address, SceneGroup.GroupType groupOptions, byte[] response, float offsetX, float offsetY, float regionScaleRatio)
     {
         this.address = address;
         this.response = response;
@@ -40,7 +40,7 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)
         // The leaf currently used (will hold the mesh data for the currently matched group)
         SceneGroup leaf = root;
 
-        var tileGroup = OnSceneGroupData(SceneGroup.Type.Tile, address.ToString(), root, ref leaf);
+        var tileGroup = OnSceneGroupData(SceneGroup.GroupType.Tile, address.ToString(), root, ref leaf);
 
         foreach (var style in featureStyling)
         {
@@ -51,11 +51,11 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)
 
             foreach (var filterStyle in style.FilterStyles)
             {
-                var filterGroup = OnSceneGroupData(SceneGroup.Type.Filter, filterStyle.Name, tileGroup, ref leaf);
+                var filterGroup = OnSceneGroupData(SceneGroup.GroupType.Filter, filterStyle.Name, tileGroup, ref leaf);
 
                 foreach (var layer in tileData.FeatureCollections)
                 {
-                    var layerGroup = OnSceneGroupData(SceneGroup.Type.Layer, layer.Name, filterGroup, ref leaf);
+                    var layerGroup = OnSceneGroupData(SceneGroup.GroupType.Layer, layer.Name, filterGroup, ref leaf);
 
                     foreach (var feature in filterStyle.GetFilter().Filter(layer))
                     {
@@ -69,7 +69,7 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)
                             featureName += identifier.ToString();
                         }
 
-                        OnSceneGroupData(SceneGroup.Type.Feature, featureName, layerGroup, ref leaf);
+                        OnSceneGroupData(SceneGroup.GroupType.Feature, featureName, layerGroup, ref leaf);
 
                         if (feature.Type == GeometryType.Polygon || feature.Type == GeometryType.MultiPolygon)
                         {
@@ -100,7 +100,7 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)
         ready = true;
     }
 
-    private SceneGroup OnSceneGroupData(SceneGroup.Type type, string name, SceneGroup parent, ref SceneGroup leaf)
+    private SceneGroup OnSceneGroupData(SceneGroup.GroupType type, string name, SceneGroup parent, ref SceneGroup leaf)
     {
         SceneGroup group = null;
 
diff --git a/Assets/MapzenMap.cs b/Assets/MapzenMap.cs
@@ -33,7 +33,7 @@ public class MapzenMap : MonoBehaviour
 
     [HideInInspector]
     [SerializeField]
-    private SceneGroup.Type groupOptions;
+    private SceneGroup.GroupType groupOptions;
 
     [HideInInspector]
     [SerializeField]
@@ -52,7 +52,7 @@ public void DownloadTiles()
         tasks.Clear();
         nTasksForArea = 0;
 
-        regionMap = new SceneGroup(SceneGroup.Type.None, RegionName);
+        regionMap = new SceneGroup(SceneGroup.GroupType.None, RegionName);
 
         foreach (var tileAddress in bounds.TileAddressRange)
         {
@@ -142,7 +142,7 @@ public float RegionScaleRatio {
         set { regionScaleRatio = value; }
     }
 
-    public SceneGroup.Type GroupOptions
+    public SceneGroup.GroupType GroupOptions
     {
         get { return groupOptions; }
         set { groupOptions = value; }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Mapzen`
`7`	`7`	`public class SceneGroup`
`8`	`8`	`{`
`9`	`9`	`[Flags]`
`10`		`- public enum Type`
	`10`	`+ public enum GroupType`
`11`	`11`	`{`
`12`	`12`	`None = 0,`
`13`	`13`	`Tile = 1 << 0,`
`@@ -24,9 +24,9 @@ public enum Type`
`24`	`24`	`// The mesh data, may be empty`
`25`	`25`	`public MeshData meshData;`
`26`	`26`
`27`		`- public Type type;`
	`27`	`+ public GroupType type;`
`28`	`28`
`29`		`- public SceneGroup(Type type, string name)`
	`29`	`+ public SceneGroup(GroupType type, string name)`
`30`	`30`	`{`
`31`	`31`	`this.childs = new Dictionary<string, SceneGroup>();`
`32`	`32`	`this.type = type;`
`@@ -39,7 +39,7 @@ public SceneGroup(Type type, string name)`
`39`	`39`	`/// </summary>`
`40`	`40`	`/// <param name="type">The type to check.</param>`
`41`	`41`	`/// <param name="options">The group type options.</param>`
`42`		`- public static bool Test(Type type, Type options)`
	`42`	`+ public static bool Test(GroupType type, GroupType options)`
`43`	`43`	`{`
`44`	`44`	`return ((int)type & (int)options) == (int)type;`
`45`	`45`	`}`
`@@ -49,14 +49,14 @@ public static bool Test(Type type, Type options)`
`49`	`49`	`/// </summary>`
`50`	`50`	`/// <param name="type">The type to check.</param>`
`51`	`51`	`/// <param name="options">The group type options.</param>`
`52`		`- public static bool IsLeaf(Type type, Type options)`
	`52`	`+ public static bool IsLeaf(GroupType type, GroupType options)`
`53`	`53`	`{`
`54`	`54`	`return ((int)type ^ (int)options) < (int)type;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public override string ToString()`
`58`	`58`	`{`
`59`		`- if (type == Type.None \|\| type == Type.All)`
	`59`	`+ if (type == GroupType.None \|\| type == GroupType.All)`
`60`	`60`	`{`
`61`	`61`	`return name;`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ public class TileTask`
`13`	`13`	`private TileAddress address;`
`14`	`14`	`private byte[] response;`
`15`	`15`	`private bool ready;`
`16`		`- private SceneGroup.Type groupOptions;`
	`16`	`+ private SceneGroup.GroupType groupOptions;`
`17`	`17`	`private float inverseTileScale;`
`18`	`18`	`private Matrix4x4 transform;`
`19`	`19`
`20`		`- public TileTask(TileAddress address, SceneGroup.Type groupOptions, byte[] response, float offsetX, float offsetY, float regionScaleRatio)`
	`20`	`+ public TileTask(TileAddress address, SceneGroup.GroupType groupOptions, byte[] response, float offsetX, float offsetY, float regionScaleRatio)`
`21`	`21`	`{`
`22`	`22`	`this.address = address;`
`23`	`23`	`this.response = response;`
`@@ -40,7 +40,7 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)`
`40`	`40`	`// The leaf currently used (will hold the mesh data for the currently matched group)`
`41`	`41`	`SceneGroup leaf = root;`
`42`	`42`
`43`		`- var tileGroup = OnSceneGroupData(SceneGroup.Type.Tile, address.ToString(), root, ref leaf);`
	`43`	`+ var tileGroup = OnSceneGroupData(SceneGroup.GroupType.Tile, address.ToString(), root, ref leaf);`
`44`	`44`
`45`	`45`	`foreach (var style in featureStyling)`
`46`	`46`	`{`
`@@ -51,11 +51,11 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)`
`51`	`51`
`52`	`52`	`foreach (var filterStyle in style.FilterStyles)`
`53`	`53`	`{`
`54`		`- var filterGroup = OnSceneGroupData(SceneGroup.Type.Filter, filterStyle.Name, tileGroup, ref leaf);`
	`54`	`+ var filterGroup = OnSceneGroupData(SceneGroup.GroupType.Filter, filterStyle.Name, tileGroup, ref leaf);`
`55`	`55`
`56`	`56`	`foreach (var layer in tileData.FeatureCollections)`
`57`	`57`	`{`
`58`		`- var layerGroup = OnSceneGroupData(SceneGroup.Type.Layer, layer.Name, filterGroup, ref leaf);`
	`58`	`+ var layerGroup = OnSceneGroupData(SceneGroup.GroupType.Layer, layer.Name, filterGroup, ref leaf);`
`59`	`59`
`60`	`60`	`foreach (var feature in filterStyle.GetFilter().Filter(layer))`
`61`	`61`	`{`
`@@ -69,7 +69,7 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)`
`69`	`69`	`featureName += identifier.ToString();`
`70`	`70`	`}`
`71`	`71`
`72`		`- OnSceneGroupData(SceneGroup.Type.Feature, featureName, layerGroup, ref leaf);`
	`72`	`+ OnSceneGroupData(SceneGroup.GroupType.Feature, featureName, layerGroup, ref leaf);`
`73`	`73`
`74`	`74`	`if (feature.Type == GeometryType.Polygon \|\| feature.Type == GeometryType.MultiPolygon)`
`75`	`75`	`{`
`@@ -100,7 +100,7 @@ public void Start(List<FeatureStyle> featureStyling, SceneGroup root)`
`100`	`100`	`ready = true;`
`101`	`101`	`}`
`102`	`102`
`103`		`- private SceneGroup OnSceneGroupData(SceneGroup.Type type, string name, SceneGroup parent, ref SceneGroup leaf)`
	`103`	`+ private SceneGroup OnSceneGroupData(SceneGroup.GroupType type, string name, SceneGroup parent, ref SceneGroup leaf)`
`104`	`104`	`{`
`105`	`105`	`SceneGroup group = null;`
`106`	`106`