aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalinou <Calinou@users.noreply.github.com>2015-06-20 18:29:03 +0200
committerCalinou <Calinou@users.noreply.github.com>2015-06-20 18:29:03 +0200
commit6c9550e2c5eab3e0294d335c036414a811044c25 (patch)
treeada6ae63c6f6a65530c9ae8a3552e5ba88e3b0cd
parentd8dac59c697f3b9541f515e136cfe5196156e025 (diff)
parent0ba64153aeefc86c51e2ea150726a3b9c51e0405 (diff)
downloadmoreblocks-6c9550e2c5eab3e0294d335c036414a811044c25.tar.gz
moreblocks-6c9550e2c5eab3e0294d335c036414a811044c25.tar.bz2
moreblocks-6c9550e2c5eab3e0294d335c036414a811044c25.zip
Merge pull request #9 from beyondlimits/master
Add new "inner cut" slopes
-rw-r--r--models/moreblocks_slope_cut.obj23
-rw-r--r--models/moreblocks_slope_inner_cut.obj20
-rw-r--r--models/moreblocks_slope_inner_cut_half.obj22
-rw-r--r--models/moreblocks_slope_inner_cut_half_raised.obj23
-rw-r--r--stairsplus/slopes.lua23
5 files changed, 111 insertions, 0 deletions
diff --git a/models/moreblocks_slope_cut.obj b/models/moreblocks_slope_cut.obj
new file mode 100644
index 0000000..5f7af5e
--- /dev/null
+++ b/models/moreblocks_slope_cut.obj
@@ -0,0 +1,23 @@
+v 0.500000 0.500000 0.500000
+v -0.500000 0.000000 0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 0.000000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.000000 0.000000
+vt 0.500000 0.000000
+vt 1.000000 0.000000
+vt 0.000000 0.500000
+vt 1.000000 0.500000
+vt 0.000000 1.000000
+vt 0.500000 1.000000
+vt 1.000000 1.000000
+vt 0.500000 2.000000
+s off
+f 4/1 3/3 1/8 2/4
+f 3/1 6/3 5/5 1/6
+f 7/1 6/3 3/8 4/6
+f 7/2 2/8 1/9 5/6
+f 6/1 7/3 5/4
+f 7/1 4/3 2/5
diff --git a/models/moreblocks_slope_inner_cut.obj b/models/moreblocks_slope_inner_cut.obj
new file mode 100644
index 0000000..cdc6643
--- /dev/null
+++ b/models/moreblocks_slope_inner_cut.obj
@@ -0,0 +1,20 @@
+v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 0.500000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.000000 0.000000
+vt 0.500000 0.000000
+vt 1.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+s off
+f 3/1 6/3 5/5 1/4
+f 4/1 3/3 1/5 2/4
+f 6/1 3/3 4/5 7/4
+f 2/1 1/3 5/5
+f 7/1 4/3 2/5
+f 6/1 7/3 5/4
+f 7/2 2/5 5/4
diff --git a/models/moreblocks_slope_inner_cut_half.obj b/models/moreblocks_slope_inner_cut_half.obj
new file mode 100644
index 0000000..1df607c
--- /dev/null
+++ b/models/moreblocks_slope_inner_cut_half.obj
@@ -0,0 +1,22 @@
+v 0.500000 0.000000 0.500000
+v -0.500000 0.000000 0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 0.000000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.000000 0.000000
+vt 0.500000 0.000000
+vt 1.000000 0.000000
+vt 0.000000 0.500000
+vt 1.000000 0.500000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+s off
+f 3/1 6/3 5/5 1/4
+f 4/1 3/3 1/5 2/4
+f 6/1 3/3 4/7 7/6
+f 2/1 1/3 5/7
+f 7/1 4/3 2/5
+f 6/1 7/3 5/4
+f 7/2 2/7 5/6
diff --git a/models/moreblocks_slope_inner_cut_half_raised.obj b/models/moreblocks_slope_inner_cut_half_raised.obj
new file mode 100644
index 0000000..ba6dc5c
--- /dev/null
+++ b/models/moreblocks_slope_inner_cut_half_raised.obj
@@ -0,0 +1,23 @@
+v 0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 0.500000 -0.500000
+v -0.500000 0.000000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+vt 0.000000 0.000000
+vt 0.500000 0.000000
+vt 1.000000 0.000000
+vt 0.000000 0.500000
+vt 1.000000 0.500000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+s off
+f 3/1 7/3 5/7 1/6
+f 4/1 3/3 1/7 2/6
+f 7/1 3/3 4/7 8/6
+f 2/1 1/3 5/7
+f 8/1 4/3 2/7 6/4
+f 7/1 8/3 6/5 5/6
+f 6/2 2/7 5/6
diff --git a/stairsplus/slopes.lua b/stairsplus/slopes.lua
index 3a16906..45d274f 100644
--- a/stairsplus/slopes.lua
+++ b/stairsplus/slopes.lua
@@ -162,6 +162,24 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
--==============================================================
+ ["_inner_cut"] = {
+ mesh = "moreblocks_slope_inner_cut.obj",
+ collision_box = box_slope_inner,
+ selection_box = box_slope_inner,
+ },
+ ["_inner_cut_half"] = {
+ mesh = "moreblocks_slope_inner_cut_half.obj",
+ collision_box = box_slope_inner_half,
+ selection_box = box_slope_inner_half,
+ },
+ ["_inner_cut_half_raised"] = {
+ mesh = "moreblocks_slope_inner_cut_half_raised.obj",
+ collision_box = box_slope_inner_half_raised,
+ selection_box = box_slope_inner_half_raised,
+ },
+
+--==============================================================
+
["_outer"] = {
mesh = "moreblocks_slope_outer.obj",
collision_box = box_slope_outer,
@@ -195,6 +213,11 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
collision_box = box_slope_outer_half_raised,
selection_box = box_slope_outer_half_raised,
},
+ ["_cut"] = {
+ mesh = "moreblocks_slope_cut.obj",
+ collision_box = box_slope_outer,
+ selection_box = box_slope_outer,
+ },
}
local desc = S("%s Slope"):format(fields.description)