diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 62d46a5e..bd11b10f 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -679,27 +679,24 @@ for _, i in ipairs(n) do }) end +local p_cbox = { + type = "fixed", + fixed = { + { -0.5, -0.5, 0.4375, 0.5, 0.5, 0.5 } + } +} + for i = 1,20 do homedecor.register("painting_"..i, { description = "Decorative painting #"..i, + mesh = "homedecor_painting.obj", tiles = { - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_edges.png", - "homedecor_painting_back.png", + "default_wood.png", + "homedecor_blank_canvas.png", "homedecor_painting"..i..".png" }, - node_box = { - type = "fixed", - fixed = { - { -32/64, -32/64, 28/64, -30/64, 32/64, 32/64 }, -- left edge - { 30/64, -32/64, 28/64, 32/64, 32/64, 32/64 }, -- right edge - { -32/64, 30/64, 28/64, 32/64, 32/64, 32/64 }, -- top edge - { -32/64, -30/64, 28/64, 32/64, -32/64, 32/64 }, -- bottom edge - { -32/64, -32/64, 29/64, 32/64, 32/64, 29/64 } -- the canvas - } - }, + selection_box = p_cbox, + walkable = false, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), }) diff --git a/homedecor/models/homedecor_painting.obj b/homedecor/models/homedecor_painting.obj new file mode 100644 index 00000000..bcf4c1e2 --- /dev/null +++ b/homedecor/models/homedecor_painting.obj @@ -0,0 +1,111 @@ +# Blender v2.73 (sub 0) OBJ File: 'painting.blend' +# www.blender.org +o Cylinder +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.437500 +v 0.500000 -0.500000 0.437500 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.437500 +v 0.500000 0.500000 0.437500 +v 0.500000 0.500000 0.500000 +v -0.500000 0.468750 0.437500 +v 0.500000 0.468750 0.437500 +v -0.500000 -0.468750 0.437500 +v 0.500000 -0.468750 0.437500 +v -0.468750 0.468750 0.437500 +v -0.468750 -0.468750 0.437500 +v 0.468750 0.468750 0.437500 +v 0.468750 -0.468750 0.437500 +v -0.468750 0.468750 0.468750 +v -0.468750 -0.468750 0.468750 +v 0.468750 0.468750 0.468750 +v 0.468750 -0.468750 0.468750 +v -0.468750 0.468750 0.500000 +v -0.468750 -0.468750 0.500000 +v 0.468750 0.468750 0.500000 +v 0.468750 -0.468750 0.500000 +v -0.500000 -0.468750 0.500000 +v 0.500000 -0.468750 0.500000 +v -0.500000 0.468750 0.500000 +v 0.500000 0.468750 0.500000 +vt 0.250000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 -3.000000 +vt 0.250000 -3.000000 +vt 0.000000 1.000000 +vt 0.000000 -3.000000 +vt 0.250000 1.062500 +vt 0.500000 1.062500 +vt 0.500000 -2.937500 +vt 0.250000 -2.937500 +vt 0.000000 -2.937500 +vt 0.000000 1.062500 +vt 0.375000 1.000000 +vt 0.375000 -3.000000 +vt 0.125000 1.000000 +vt 0.125000 -3.000000 +vt 0.250000 0.875000 +vt 0.250000 -2.875000 +vt 0.375000 -2.875000 +vt 0.375000 0.875000 +vt 0.125000 0.875000 +vt 0.000000 0.875000 +vt 0.000000 -2.875000 +vt 0.125000 -2.875000 +vt 0.750000 -2.875000 +vt 0.500000 -2.875000 +vt 0.500000 0.875000 +vt 0.750000 0.875000 +vt 1.000000 -2.875000 +vt 1.000000 0.875000 +vt 1.000000 -2.812500 +vt 1.000000 0.937500 +vt 0.750000 0.937500 +vt 0.750000 -2.812500 +vt 0.625000 -3.000000 +vt 0.625000 1.000000 +vt 0.750000 1.000000 +vt 0.750000 -3.000000 +vt 1.000000 1.000000 +vt 1.000000 -3.000000 +vt 0.875000 -3.000000 +vt 0.875000 1.000000 +vt 0.500000 -2.812500 +vt 0.500000 0.937500 +vt 0.875000 0.875000 +vt 0.875000 -2.875000 +vt 0.625000 -2.875000 +vt 0.625000 0.875000 +vt 0.031250 0.031250 +vt 0.968750 0.031250 +vt 0.968750 0.968750 +vt 0.031250 0.968750 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +g Cylinder_Cylinder_wood +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 7/1/2 8/5/2 4/6/2 3/4/2 +f 1/7/3 2/8/3 3/9/3 4/10/3 +f 8/11/4 7/10/4 6/7/4 5/12/4 +f 6/3/5 7/2/5 10/13/5 9/14/5 +f 3/15/5 2/16/5 11/4/5 12/1/5 +f 13/17/5 14/18/5 11/19/5 9/20/5 +f 15/21/5 10/22/5 12/23/5 16/24/5 +f 16/25/1 20/26/1 19/27/1 15/28/1 +f 14/29/2 13/30/2 17/28/2 18/25/2 +f 16/31/4 14/32/4 18/33/4 20/34/4 +f 1/35/6 4/36/6 26/37/6 25/38/6 +f 8/39/6 5/40/6 27/41/6 28/42/6 +f 19/43/3 17/44/3 13/33/3 15/34/3 +f 22/25/6 21/28/6 27/45/6 25/46/6 +f 24/47/6 26/26/6 28/27/6 23/48/6 +g Cylinder_Cylinder_canvas +f 22/49/6 24/50/6 23/51/6 21/52/6 +g Cylinder_Cylinder_picture +f 18/50/5 17/51/5 19/52/5 20/49/5 diff --git a/homedecor/textures/homedecor_painting1.png b/homedecor/textures/homedecor_painting1.png index 63c17828..80d92eba 100644 Binary files a/homedecor/textures/homedecor_painting1.png and b/homedecor/textures/homedecor_painting1.png differ diff --git a/homedecor/textures/homedecor_painting10.png b/homedecor/textures/homedecor_painting10.png index b7b3d573..5bea3214 100644 Binary files a/homedecor/textures/homedecor_painting10.png and b/homedecor/textures/homedecor_painting10.png differ diff --git a/homedecor/textures/homedecor_painting11.png b/homedecor/textures/homedecor_painting11.png index e417aa72..5c9133dd 100644 Binary files a/homedecor/textures/homedecor_painting11.png and b/homedecor/textures/homedecor_painting11.png differ diff --git a/homedecor/textures/homedecor_painting12.png b/homedecor/textures/homedecor_painting12.png index 66eadb7c..faf5d576 100644 Binary files a/homedecor/textures/homedecor_painting12.png and b/homedecor/textures/homedecor_painting12.png differ diff --git a/homedecor/textures/homedecor_painting13.png b/homedecor/textures/homedecor_painting13.png index c2384d86..9a9f28c3 100644 Binary files a/homedecor/textures/homedecor_painting13.png and b/homedecor/textures/homedecor_painting13.png differ diff --git a/homedecor/textures/homedecor_painting14.png b/homedecor/textures/homedecor_painting14.png index 1b612ec0..b7e70808 100644 Binary files a/homedecor/textures/homedecor_painting14.png and b/homedecor/textures/homedecor_painting14.png differ diff --git a/homedecor/textures/homedecor_painting15.png b/homedecor/textures/homedecor_painting15.png index caaaf93b..42d67b4e 100644 Binary files a/homedecor/textures/homedecor_painting15.png and b/homedecor/textures/homedecor_painting15.png differ diff --git a/homedecor/textures/homedecor_painting16.png b/homedecor/textures/homedecor_painting16.png index c6537973..2e487ef8 100644 Binary files a/homedecor/textures/homedecor_painting16.png and b/homedecor/textures/homedecor_painting16.png differ diff --git a/homedecor/textures/homedecor_painting17.png b/homedecor/textures/homedecor_painting17.png index 7f1b836e..c4ba2818 100644 Binary files a/homedecor/textures/homedecor_painting17.png and b/homedecor/textures/homedecor_painting17.png differ diff --git a/homedecor/textures/homedecor_painting18.png b/homedecor/textures/homedecor_painting18.png index 24176a21..2aa17349 100644 Binary files a/homedecor/textures/homedecor_painting18.png and b/homedecor/textures/homedecor_painting18.png differ diff --git a/homedecor/textures/homedecor_painting19.png b/homedecor/textures/homedecor_painting19.png index e5054b2b..65a3fb34 100644 Binary files a/homedecor/textures/homedecor_painting19.png and b/homedecor/textures/homedecor_painting19.png differ diff --git a/homedecor/textures/homedecor_painting2.png b/homedecor/textures/homedecor_painting2.png index e29329b2..56967a57 100644 Binary files a/homedecor/textures/homedecor_painting2.png and b/homedecor/textures/homedecor_painting2.png differ diff --git a/homedecor/textures/homedecor_painting20.png b/homedecor/textures/homedecor_painting20.png index ca5a3e2b..066d20fa 100644 Binary files a/homedecor/textures/homedecor_painting20.png and b/homedecor/textures/homedecor_painting20.png differ diff --git a/homedecor/textures/homedecor_painting3.png b/homedecor/textures/homedecor_painting3.png index 9e756e4e..58a7ad89 100644 Binary files a/homedecor/textures/homedecor_painting3.png and b/homedecor/textures/homedecor_painting3.png differ diff --git a/homedecor/textures/homedecor_painting4.png b/homedecor/textures/homedecor_painting4.png index b1ab638a..3378a4cf 100644 Binary files a/homedecor/textures/homedecor_painting4.png and b/homedecor/textures/homedecor_painting4.png differ diff --git a/homedecor/textures/homedecor_painting5.png b/homedecor/textures/homedecor_painting5.png index aef95ff5..fabc5c3e 100644 Binary files a/homedecor/textures/homedecor_painting5.png and b/homedecor/textures/homedecor_painting5.png differ diff --git a/homedecor/textures/homedecor_painting6.png b/homedecor/textures/homedecor_painting6.png index 2d3e0e4b..e3f32320 100644 Binary files a/homedecor/textures/homedecor_painting6.png and b/homedecor/textures/homedecor_painting6.png differ diff --git a/homedecor/textures/homedecor_painting7.png b/homedecor/textures/homedecor_painting7.png index 6734be9c..e5f2a50d 100644 Binary files a/homedecor/textures/homedecor_painting7.png and b/homedecor/textures/homedecor_painting7.png differ diff --git a/homedecor/textures/homedecor_painting8.png b/homedecor/textures/homedecor_painting8.png index 0c13b613..5944044a 100644 Binary files a/homedecor/textures/homedecor_painting8.png and b/homedecor/textures/homedecor_painting8.png differ diff --git a/homedecor/textures/homedecor_painting9.png b/homedecor/textures/homedecor_painting9.png index 40e7dece..c8147c9c 100644 Binary files a/homedecor/textures/homedecor_painting9.png and b/homedecor/textures/homedecor_painting9.png differ diff --git a/homedecor/textures/homedecor_painting_back.png b/homedecor/textures/homedecor_painting_back.png index ff5fab66..fea818c2 100644 Binary files a/homedecor/textures/homedecor_painting_back.png and b/homedecor/textures/homedecor_painting_back.png differ diff --git a/homedecor/textures/homedecor_painting_edges.png b/homedecor/textures/homedecor_painting_edges.png deleted file mode 100644 index adbf8f32..00000000 Binary files a/homedecor/textures/homedecor_painting_edges.png and /dev/null differ