From 45b892336cc98fc838af571793fb83a883896728 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 26 Aug 2021 13:50:59 -0700 Subject: [PATCH] Rename stair models --- README.md | 24 +++++++++--------- defs.lua | 24 +++++++++--------- ...end => simple_models_stair_2s_1x1x1.blend} | Bin ...1.obj => simple_models_stair_2s_1x1x1.obj} | 0 ...end => simple_models_stair_4s_1x1x1.blend} | Bin ...1.obj => simple_models_stair_4s_1x1x1.obj} | 0 ...1x1_model.png => stair_2s_1x1x1_model.png} | Bin ...1x1_model.png => stair_4s_1x1x1_model.png} | Bin samples.lua | 24 +++++++++--------- ...mple_models_sample_stair_2s_1x1x1_map.png} | Bin ...mple_models_sample_stair_4s_1x1x1_map.png} | Bin 11 files changed, 36 insertions(+), 36 deletions(-) rename models/{simple_models_stair_1x1x1.blend => simple_models_stair_2s_1x1x1.blend} (100%) rename models/{simple_models_stair_1x1x1.obj => simple_models_stair_2s_1x1x1.obj} (100%) rename models/{simple_models_stair_fine_1x1x1.blend => simple_models_stair_4s_1x1x1.blend} (100%) rename models/{simple_models_stair_fine_1x1x1.obj => simple_models_stair_4s_1x1x1.obj} (100%) rename previews/{stair_1x1x1_model.png => stair_2s_1x1x1_model.png} (100%) rename previews/{stair_fine_1x1x1_model.png => stair_4s_1x1x1_model.png} (100%) rename textures/{simple_models_sample_stair_1x1x1_map.png => simple_models_sample_stair_2s_1x1x1_map.png} (100%) rename textures/{simple_models_sample_stair_fine_1x1x1_map.png => simple_models_sample_stair_4s_1x1x1_map.png} (100%) diff --git a/README.md b/README.md index 7ecca7f..34dcde8 100644 --- a/README.md +++ b/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: - + - texture map: - + -simple_models_stair_fine_1x1x1: +simple_models_stair_4s_1x1x1: - for stair-like nodes with dimensions 1x1x1 - preview: - + - texture map: - + 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: diff --git a/defs.lua b/defs.lua index be2552d..ac96d54 100644 --- a/defs.lua +++ b/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 --- @tfield string mesh simple_models_stair_1x1x1.obj +-- @table simple_models.stair_2s_1x1x1 +-- @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 = { - mesh = "simple_models_stair_1x1x1.obj", +simple_models.stair_2s_1x1x1 = { + 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 --- @tfield string mesh simple_models_stair_fine_1x1x1.obj +-- @table simple_models.stair_4s_1x1x1 +-- @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 = { - mesh = "simple_models_stair_fine_1x1x1.obj", +simple_models.stair_4s_1x1x1 = { + 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_fine = simple_models.stair_fine_1x1x1 +simple_models.stair_2s = simple_models.stair_2s_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 diff --git a/models/simple_models_stair_1x1x1.blend b/models/simple_models_stair_2s_1x1x1.blend similarity index 100% rename from models/simple_models_stair_1x1x1.blend rename to models/simple_models_stair_2s_1x1x1.blend diff --git a/models/simple_models_stair_1x1x1.obj b/models/simple_models_stair_2s_1x1x1.obj similarity index 100% rename from models/simple_models_stair_1x1x1.obj rename to models/simple_models_stair_2s_1x1x1.obj diff --git a/models/simple_models_stair_fine_1x1x1.blend b/models/simple_models_stair_4s_1x1x1.blend similarity index 100% rename from models/simple_models_stair_fine_1x1x1.blend rename to models/simple_models_stair_4s_1x1x1.blend diff --git a/models/simple_models_stair_fine_1x1x1.obj b/models/simple_models_stair_4s_1x1x1.obj similarity index 100% rename from models/simple_models_stair_fine_1x1x1.obj rename to models/simple_models_stair_4s_1x1x1.obj diff --git a/previews/stair_1x1x1_model.png b/previews/stair_2s_1x1x1_model.png similarity index 100% rename from previews/stair_1x1x1_model.png rename to previews/stair_2s_1x1x1_model.png diff --git a/previews/stair_fine_1x1x1_model.png b/previews/stair_4s_1x1x1_model.png similarity index 100% rename from previews/stair_fine_1x1x1_model.png rename to previews/stair_4s_1x1x1_model.png diff --git a/samples.lua b/samples.lua index 1a7c211..d8f68f4 100644 --- a/samples.lua +++ b/samples.lua @@ -230,35 +230,35 @@ end -- stairs -core.register_node("simple_models:stair", { - description = "Stair", +core.register_node("simple_models:stair_2s", { + description = "Stair (2-step)", drawtype = "mesh", - tiles = {"simple_models_sample_stair_1x1x1_map.png"}, - mesh = smodel.stair.mesh, + tiles = {"simple_models_sample_stair_2s_1x1x1_map.png"}, + 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", { - description = "Stair", +core.register_node("simple_models:stair_4s", { + description = "Stair (4-step)", drawtype = "mesh", - tiles = {"simple_models_sample_stair_fine_1x1x1_map.png"}, - mesh = smodel.stair_fine.mesh, + tiles = {"simple_models_sample_stair_4s_1x1x1_map.png"}, + 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}, diff --git a/textures/simple_models_sample_stair_1x1x1_map.png b/textures/simple_models_sample_stair_2s_1x1x1_map.png similarity index 100% rename from textures/simple_models_sample_stair_1x1x1_map.png rename to textures/simple_models_sample_stair_2s_1x1x1_map.png diff --git a/textures/simple_models_sample_stair_fine_1x1x1_map.png b/textures/simple_models_sample_stair_4s_1x1x1_map.png similarity index 100% rename from textures/simple_models_sample_stair_fine_1x1x1_map.png rename to textures/simple_models_sample_stair_4s_1x1x1_map.png