Rename stair models

README.md

@@ -43,27 +43,27 @@ simple_models_panel_rear_1x2x1:
 - for door or panel-like nodes with dimensions 1x2x1 positioned at rear
 - texture map: same as simple_models_panel_1x2x1
 
-simple_models_stair_1x1x1:
+simple_models_stair_2s_1x1x1:
 - for stair-like nodes with dimensions 1x1x1
 
 - preview:
 
-  <img src="previews/stair_1x1x1_model.png" />
+  <img src="previews/stair_2s_1x1x1_model.png" />
 
 - texture map:
 
-  <img src="textures/simple_models_sample_stair_1x1x1_map.png" />
+  <img src="textures/simple_models_sample_stair_2s_1x1x1_map.png" />
 
-simple_models_stair_fine_1x1x1:
+simple_models_stair_4s_1x1x1:
   - for stair-like nodes with dimensions 1x1x1
 
   - preview:
 
-    <img src="previews/stair_fine_1x1x1_model.png" />
+    <img src="previews/stair_4s_1x1x1_model.png" />
 
   - texture map:
 
-    <img src="textures/simple_models_sample_stair_fine_1x1x1_map.png" />
+    <img src="textures/simple_models_sample_stair_4s_1x1x1_map.png" />
 
 simple_models_slope_1x1x1:
   - for slope-like nodes with dimensions 1x1x1
@@ -116,22 +116,22 @@ simple_models.panel_rear_1x2x1:
   - box:  {-0.5, -0.5, 0.45, 0.5, 1.5, 0.5}
 - alias: simple_models.panel_rear
 
-simple_models.stair_1x1x1:
+simple_models.stair_2s_1x1x1:
 - fields:
-  - mesh: "simple_models_stair_1x1x1.obj"
+  - mesh: "simple_models_stair_2s_1x1x1.obj"
   - box:  {{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5}, {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5}}
-- alias: simple_models.stair
+- alias: simple_models.stair_2s
 
-simple_models.stair_fine_1x1x1x:
+simple_models.stair_4s_1x1x1x:
 - fields:
-  - mesh: "simple_models_stair_fine_1x1x1x.obj"
+  - mesh: "simple_models_stair_4s_1x1x1x.obj"
   - box:  {
       {-0.5,  0.25,  0.25, 0.5,  0.5,  0.5},
       {-0.5,  0.0,   0.0,  0.5,  0.25, 0.5},
       {-0.5, -0.25, -0.25, 0.5,  0.0,  0.5},
       {-0.5, -0.5,  -0.5,  0.5, -0.25, 0.5},
     }
-- alias: simple_models.stair_fine
+- alias: simple_models.stair_4s
 
 simple_models.slope_1x1x1:
 - fields:

defs.lua

@@ -54,16 +54,16 @@ simple_models.panel_rear_1x2x1 = {
 
 --- Stair
 --
---  Alias: simple_models.stair
+--  Alias: simple_models.stair_2s
 --
---  @table simpel_models.stair_1x1x1
+--  @table simple_models.stair_2s_1x1x1
---  @tfield string mesh simple_models_stair_1x1x1.obj
+--  @tfield string mesh simple_models_stair_2s_1x1x1.obj
 --  @tfield table box {
 --    {-0.5,  0.0,  0.0, 0.5, 0.5, 0.5},
 --    {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
 --  }
-simple_models.stair_1x1x1 = {
+simple_models.stair_2s_1x1x1 = {
-	mesh = "simple_models_stair_1x1x1.obj",
+	mesh = "simple_models_stair_2s_1x1x1.obj",
 	box = {
 		{-0.5,  0.0,  0.0, 0.5, 0.5, 0.5},
 		{-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
@@ -72,18 +72,18 @@ simple_models.stair_1x1x1 = {
 
 --- Stair (4-steps)
 --
---  Alias: simple_models.stair_fine
+--  Alias: simple_models.stair_4s
 --
---  @table simpel_models.stair_fine_1x1x1
+--  @table simple_models.stair_4s_1x1x1
---  @tfield string mesh simple_models_stair_fine_1x1x1.obj
+--  @tfield string mesh simple_models_stair_4s_1x1x1.obj
 --  @tfield table box {
 --    {-0.5,  0.25,  0.25, 0.5,  0.5,  0.5},
 --    {-0.5,  0.0,   0.0,  0.5,  0.25, 0.5},
 --    {-0.5, -0.25, -0.25, 0.5,  0.0,  0.5},
 --    {-0.5, -0.5,  -0.5,  0.5, -0.25, 0.5},
 --  }
-simple_models.stair_fine_1x1x1 = {
+simple_models.stair_4s_1x1x1 = {
-	mesh = "simple_models_stair_fine_1x1x1.obj",
+	mesh = "simple_models_stair_4s_1x1x1.obj",
 	box = {
 		{-0.5,  0.25,  0.25, 0.5,  0.5,  0.5},
 		{-0.5,  0.0,   0.0,  0.5,  0.25, 0.5},
@@ -145,7 +145,7 @@ simple_models.cube = simple_models.cube_1x2x1
 simple_models.panel = simple_models.panel_1x2x1
 simple_models.panel_mid = simple_models.panel_mid_1x2x1
 simple_models.panel_rear = simple_models.panel_rear_1x2x1
-simple_models.stair = simple_models.stair_1x1x1
+simple_models.stair_2s = simple_models.stair_2s_1x1x1
-simple_models.stair_fine = simple_models.stair_fine_1x1x1
+simple_models.stair_4s = simple_models.stair_4s_1x1x1
 simple_models.slope = simple_models.slope_1x1x1
 simple_models.slope_long = simple_models.slope_1x1x2

samples.lua

@@ -230,35 +230,35 @@ end
 
 -- stairs
 
-core.register_node("simple_models:stair", {
+core.register_node("simple_models:stair_2s", {
-	description = "Stair",
+	description = "Stair (2-step)",
 	drawtype = "mesh",
-	tiles = {"simple_models_sample_stair_1x1x1_map.png"},
+	tiles = {"simple_models_sample_stair_2s_1x1x1_map.png"},
-	mesh = smodel.stair.mesh,
+	mesh = smodel.stair_2s.mesh,
 	collision_box = {
 		type = "fixed",
-		fixed = smodel.stair.box,
+		fixed = smodel.stair_2s.box,
 	},
 	selection_box = {
 		type = "fixed",
-		fixed = smodel.stair.box,
+		fixed = smodel.stair_2s.box,
 	},
 	paramtype2 = "facedir",
 	groups = {oddly_breakable_by_hand=1, stair=1},
 })
 
-core.register_node("simple_models:stair2", {
+core.register_node("simple_models:stair_4s", {
-	description = "Stair",
+	description = "Stair (4-step)",
 	drawtype = "mesh",
-	tiles = {"simple_models_sample_stair_fine_1x1x1_map.png"},
+	tiles = {"simple_models_sample_stair_4s_1x1x1_map.png"},
-	mesh = smodel.stair_fine.mesh,
+	mesh = smodel.stair_4s.mesh,
 	collision_box = {
 		type = "fixed",
-		fixed = smodel.stair_fine.box,
+		fixed = smodel.stair_4s.box,
 	},
 	selection_box = {
 		type = "fixed",
-		fixed = smodel.stair_fine.box,
+		fixed = smodel.stair_4s.box,
 	},
 	paramtype2 = "facedir",
 	groups = {oddly_breakable_by_hand=1, stair=1},