Renamed "Build Torus" to "Curved Wall" indicating the intended usage …

…more clearly.
sabresaurus · Jan 30, 2018 · 6c9e1d6 · 6c9e1d6
1 parent 526fe5c
commit 6c9e1d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Scripts/Brushes/CompoundBrushes/CurvedStairBrush.cs b/Scripts/Brushes/CompoundBrushes/CurvedStairBrush.cs
@@ -46,9 +46,9 @@ public class CurvedStairBrush : CompoundBrush
         [SerializeField]
         bool fillToBottom = true;
 
-        /// <summary>Whether to generate stairs or a torus shape.</summary>
+        /// <summary>Whether to generate stairs or a curved wall.</summary>
         [SerializeField]
-        bool buildTorus = false;
+        bool curvedWall = false;
 
         /// <summary>Whether the floor is stairs or a smooth slope.</summary>
         [SerializeField]
@@ -143,7 +143,7 @@ public override void Invalidate (bool polygonsChanged)
 
                 newVertex = Quaternion.Euler(rotateStep * x) * vertex;
                 vertexPositions.Add(new Vector3(newVertex.x, vertex.z - adjustment, newVertex.y));
-                if (buildTorus)
+                if (curvedWall)
                     vertex.z = stepHeight * numSteps;
                 else
                     vertex.z += stepHeight;
@@ -163,7 +163,7 @@ public override void Invalidate (bool polygonsChanged)
 
                 newVertex = Quaternion.Euler(rotateStep * x) * vertex;
                 vertexPositions.Add(new Vector3(newVertex.x, vertex.z - adjustment, newVertex.y));
-                if (buildTorus)
+                if (curvedWall)
                     vertex.z = stepHeight * numSteps;
                 else
                     vertex.z += stepHeight;
@@ -205,7 +205,7 @@ public override void Invalidate (bool polygonsChanged)
             }
 
             // we force NoCSG mode if special NoCSG operators are used.
-            if (buildTorus) { slopedFloor = false; slopedCeiling = false; }
+            if (curvedWall) { slopedFloor = false; slopedCeiling = false; }
             if (fillToBottom) { slopedCeiling = false; }
             if (slopedFloor || slopedCeiling)
             {

diff --git a/Scripts/Brushes/CompoundBrushes/Editor/CurvedStairBrushInspector.cs b/Scripts/Brushes/CompoundBrushes/Editor/CurvedStairBrushInspector.cs
@@ -19,7 +19,7 @@ public class CurvedStairBrushInspector : CompoundBrushInspector
         SerializedProperty addToFirstStep;
         SerializedProperty counterClockwise;
         SerializedProperty fillToBottom;
-        SerializedProperty buildTorus;
+        SerializedProperty curvedWall;
         SerializedProperty slopedFloor;
         SerializedProperty slopedCeiling;
 
@@ -35,7 +35,7 @@ protected override void OnEnable()
             addToFirstStep = serializedObject.FindProperty("addToFirstStep");
             counterClockwise = serializedObject.FindProperty("counterClockwise");
             fillToBottom = serializedObject.FindProperty("fillToBottom");
-            buildTorus = serializedObject.FindProperty("buildTorus");
+            curvedWall = serializedObject.FindProperty("curvedWall");
             slopedFloor = serializedObject.FindProperty("slopedFloor");
             slopedCeiling = serializedObject.FindProperty("slopedCeiling");
         }
@@ -108,15 +108,15 @@ public override void OnInspectorGUI()
                 if (fillToBottom.boolValue != oldBool)
                     ApplyAndInvalidate();
 
-                buildTorus.boolValue = GUILayout.Toggle(oldBool = buildTorus.boolValue, "Build Torus", EditorStyles.toolbarButton);
-                if (buildTorus.boolValue != oldBool)
+                curvedWall.boolValue = GUILayout.Toggle(oldBool = curvedWall.boolValue, "Curved Wall", EditorStyles.toolbarButton);
+                if (curvedWall.boolValue != oldBool)
                     ApplyAndInvalidate();
 
                 EditorGUILayout.EndHorizontal();
             }
 
             // can only use nocsg slopes if build torus is disabled.
-            if (!buildTorus.boolValue)
+            if (!curvedWall.boolValue)
             {
                 using (new NamedVerticalScope("Curved Stair: NoCSG Operators"))
                 {