From 353351029ee06885fba720caeaf289a139fbe950 Mon Sep 17 00:00:00 2001 From: pyrollo Date: Sat, 24 Dec 2016 21:45:27 +0100 Subject: Right direction model fixed, Green direction signs added, unused files removed --- signs/models/signs_dir_right.obj | 33 ++++++----- signs/textures/signs_wooden_left.png | Bin 2559 -> 0 bytes signs/textures/signs_wooden_right.png | Bin 2562 -> 0 bytes signs_road/nodes.lua | 66 ++++++++++++++++++++-- signs_road/textures/signs_green_dir_inventory.png | Bin 0 -> 313 bytes signs_road/textures/signs_green_direction.png | Bin 0 -> 270 bytes 6 files changed, 82 insertions(+), 17 deletions(-) delete mode 100644 signs/textures/signs_wooden_left.png delete mode 100644 signs/textures/signs_wooden_right.png create mode 100644 signs_road/textures/signs_green_dir_inventory.png create mode 100644 signs_road/textures/signs_green_direction.png diff --git a/signs/models/signs_dir_right.obj b/signs/models/signs_dir_right.obj index 9c30880..d980e38 100644 --- a/signs/models/signs_dir_right.obj +++ b/signs/models/signs_dir_right.obj @@ -1,17 +1,17 @@ -# Blender v2.69 (sub 0) OBJ File: 'signs_dir_right.blend' +# Blender v2.76 (sub 0) OBJ File: 'signs_dir_right2.blend' # www.blender.org mtllib signs_dir_right.mtl o Plane -v 0.437500 -0.500000 -0.218750 -v 0.437500 -0.500000 0.218750 -v -0.312500 -0.500000 -0.218750 -v -0.312500 -0.500000 0.218750 -v -0.500000 -0.500000 0.000000 v 0.437500 -0.437500 -0.218750 v 0.437500 -0.437500 0.218750 v -0.312500 -0.437500 -0.218750 v -0.312500 -0.437500 0.218750 v -0.500000 -0.437500 0.000000 +v 0.437500 -0.500000 -0.218750 +v 0.437500 -0.500000 0.218750 +v -0.312500 -0.500000 -0.218750 +v -0.312500 -0.500000 0.218750 +v -0.500000 -0.500000 0.000000 vt 0.062500 0.500000 vt 0.062500 0.937500 vt 0.812500 0.937500 @@ -33,12 +33,19 @@ vt 0.062500 0.312500 vt 0.000000 0.000000 vt 0.000000 0.500000 vt 0.000000 0.937500 +vn 0.000000 1.000000 0.000000 +vn -0.000000 -1.000000 -0.000000 +vn -0.759300 0.000000 -0.650800 +vn -0.000000 -0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.759300 0.000000 0.650800 +vn 1.000000 0.000000 -0.000000 usemtl None s off -f 2/1 1/2 3/3 5/4 4/5 -f 7/6 9/7 10/8 8/9 6/10 -f 3/11 8/12 10/13 5/14 -f 1/2 6/15 8/16 3/3 -f 4/5 9/7 7/6 2/1 -f 5/17 10/18 9/10 4/19 -f 2/1 7/20 6/21 1/2 +f 2/1/1 1/2/1 3/3/1 5/4/1 4/5/1 +f 7/6/2 9/7/2 10/8/2 8/9/2 6/10/2 +f 3/11/3 8/12/3 10/13/3 5/14/3 +f 1/2/4 6/15/4 8/16/4 3/3/4 +f 4/5/5 9/7/5 7/6/5 2/1/5 +f 5/17/6 10/18/6 9/10/6 4/19/6 +f 2/1/7 7/20/7 6/21/7 1/2/7 diff --git a/signs/textures/signs_wooden_left.png b/signs/textures/signs_wooden_left.png deleted file mode 100644 index a3b6600..0000000 Binary files a/signs/textures/signs_wooden_left.png and /dev/null differ diff --git a/signs/textures/signs_wooden_right.png b/signs/textures/signs_wooden_right.png deleted file mode 100644 index 8d62376..0000000 Binary files a/signs/textures/signs_wooden_right.png and /dev/null differ diff --git a/signs_road/nodes.lua b/signs_road/nodes.lua index 6882f84..5498c6f 100644 --- a/signs_road/nodes.lua +++ b/signs_road/nodes.lua @@ -36,7 +36,7 @@ local models = { }, }, green_street={ - depth=1/32, + depth = 1/32, width = 1, height = 6/16, entity_fields = { @@ -51,7 +51,7 @@ local models = { }, }, black_right={ - depth=1/32, + depth = 1/32, width = 1, height = 0.5, entity_fields = { @@ -68,7 +68,7 @@ local models = { }, }, black_left={ - depth=1/32, + depth = 1/32, width = 1, height = 0.5, entity_fields = { @@ -86,10 +86,68 @@ local models = { on_rightclick=signs.on_right_click_direction, }, }, + green_right={ + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + size = { x = 12/16, y = 5/16 }, + resolution = { x = 112, y = 64 }, + maxlines = 2, + color="#fff", + }, + node_fields = { + description="Green direction sign", + tiles={"signs_green_direction.png"}, + inventory_image="signs_green_dir_inventory.png", + on_place=signs.on_place_direction, + on_rightclick = signs.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_right.obj", + selection_box = { type="wallmounted", + wall_side = {-0.5, -7/32, -7/16, -7/16, 7/32, 0.5}, + wall_bottom = {-0.5, -0.5, -0.5, 0.5, -7/16, 0.5}, + wall_top = {-0.5, 0.5, -0.5, 0.5, 7/16, 0.5}}, + collision_box = { type="wallmounted", + wall_side = {-0.5, -7/32, -7/16, -7/16, 7/32, 0.5}, + wall_bottom = {-0.5, -0.5, -0.5, 0.5, -7/16, 0.5}, + wall_top = {-0.5, 0.5, -0.5, 0.5, 7/16, 0.5}}, + }, + }, + green_left={ + depth = 1/16, + width = 14/16, + height = 7/16, + entity_fields = { + size = { x = 12/16, y = 5/16 }, + resolution = { x = 112, y = 64 }, + maxlines = 2, + color="#fff", + }, + node_fields = { + description="Green direction sign", + tiles={"signs_green_direction.png"}, + inventory_image="signs_green_dir_inventory.png", + on_place=signs.on_place_direction, + on_rightclick = signs.on_right_click_direction, + drawtype = "mesh", + mesh = "signs_dir_left.obj", + selection_box = { type="wallmounted", + wall_side = {-0.5, -7/32, -0.5, -7/16, 7/32, 7/16}, + wall_bottom = {-0.5, -0.5, -0.5, 0.5, -7/16, 0.5}, + wall_top = {-0.5, 0.5, -0.5, 0.5, 7/16, 0.5}}, + collision_box = { type="wallmounted", + wall_side = {-0.5, -7/32, -0.5, -7/16, 7/32, 7/16}, + wall_bottom = {-0.5, -0.5, -0.5, 0.5, -7/16, 0.5}, + wall_top = {-0.5, 0.5, -0.5, 0.5, 7/16, 0.5}}, + groups={not_in_creative_inventory=1}, + drop="signs_road:green_right", + }, + }, } - for name, model in pairs(models) do signs.register_sign("signs_road", name, model) end + diff --git a/signs_road/textures/signs_green_dir_inventory.png b/signs_road/textures/signs_green_dir_inventory.png new file mode 100644 index 0000000..7d6567c Binary files /dev/null and b/signs_road/textures/signs_green_dir_inventory.png differ diff --git a/signs_road/textures/signs_green_direction.png b/signs_road/textures/signs_green_direction.png new file mode 100644 index 0000000..6becd79 Binary files /dev/null and b/signs_road/textures/signs_green_direction.png differ -- cgit v1.2.3