From e86ab17aea669f0bc97392b9967c3e5219287e6c Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Thu, 12 Sep 2019 00:29:40 -0400 Subject: [PATCH] Fix bad UV mapping and font settings on standard signs --- api.lua | 12 +- .../signs_lib_standard_wall_sign_entity.obj | 22 +-- ...s_lib_standard_wall_sign_entity_onpole.obj | 20 +- .../signs_lib_standard_wall_sign_facedir.obj | 8 +- ..._lib_standard_wall_sign_facedir_onpole.obj | 172 +++++++++--------- .../signs_lib_standard_wall_sign_onpole.obj | 6 +- 6 files changed, 120 insertions(+), 120 deletions(-) diff --git a/api.lua b/api.lua index 7037bcc..3cef9cf 100644 --- a/api.lua +++ b/api.lua @@ -10,13 +10,13 @@ signs_lib.allowed_poles = {} -- Settings used for a standard wood or steel wall sign signs_lib.standard_lines = 6 -signs_lib.standard_hscale = 1.7 -signs_lib.standard_vscale = 1.75 +signs_lib.standard_hscale = 1 +signs_lib.standard_vscale = 1 signs_lib.standard_lspace = 1 signs_lib.standard_fsize = 15 -signs_lib.standard_xoffs = 5 -signs_lib.standard_yoffs = 38 -signs_lib.standard_cpl = 25 +signs_lib.standard_xoffs = 4 +signs_lib.standard_yoffs = 2 +signs_lib.standard_cpl = 35 signs_lib.standard_wood_groups = {choppy = 2, flammable = 2, oddly_breakable_by_hand = 3} signs_lib.standard_steel_groups = {cracky = 2, oddly_breakable_by_hand = 3} @@ -550,7 +550,7 @@ end minetest.register_entity("signs_lib:text", { collisionbox = { 0, 0, 0, 0, 0, 0 }, visual = "mesh", - mesh = "signs_lib_basic_entity.obj", + mesh = "signs_lib_standard_wall_sign_entity.obj", textures = {}, on_activate = signs_text_on_activate, }) diff --git a/models/signs_lib_standard_wall_sign_entity.obj b/models/signs_lib_standard_wall_sign_entity.obj index ca7eddb..7005617 100644 --- a/models/signs_lib_standard_wall_sign_entity.obj +++ b/models/signs_lib_standard_wall_sign_entity.obj @@ -1,15 +1,15 @@ -# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden wall sign--entity.blend' +# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden sign.blend' # www.blender.org -o Cube -v 0.406250 -0.281250 0.429687 +o text_entity_Plane +v 0.406250 -0.281250 0.429688 +v -0.406250 -0.281250 0.429688 v 0.406250 0.281250 0.429688 -v -0.406250 -0.281250 0.429687 v -0.406250 0.281250 0.429688 -vt 0.906250 0.781250 -vt 0.093750 0.781250 -vt 0.093750 0.218750 -vt 0.906250 0.218750 -vn 0.0000 0.0000 -1.0000 -g Cube_Cube_None +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vn 0.0000 -0.0000 -1.0000 +g text_entity_Plane_text_entity s off -f 4/1/1 2/2/1 1/3/1 3/4/1 +f 1/1/1 2/2/1 4/3/1 3/4/1 diff --git a/models/signs_lib_standard_wall_sign_entity_onpole.obj b/models/signs_lib_standard_wall_sign_entity_onpole.obj index 2be0885..abc340d 100644 --- a/models/signs_lib_standard_wall_sign_entity_onpole.obj +++ b/models/signs_lib_standard_wall_sign_entity_onpole.obj @@ -1,15 +1,15 @@ -# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden wall sign.blend' +# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden sign.blend' # www.blender.org -o Cube +o text_entity.001_Plane v 0.406250 -0.281250 0.742188 -v 0.406250 0.281250 0.742188 v -0.406250 -0.281250 0.742188 +v 0.406250 0.281250 0.742188 v -0.406250 0.281250 0.742188 -vt 0.906250 0.781250 -vt 0.093750 0.781250 -vt 0.093750 0.218750 -vt 0.906250 0.218750 -vn 0.0000 0.0000 -1.0000 -g Cube_Cube_None +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vn 0.0000 -0.0000 -1.0000 +g text_entity.001_Plane_text_entity s off -f 4/1/1 2/2/1 1/3/1 3/4/1 +f 1/1/1 2/2/1 4/3/1 3/4/1 diff --git a/models/signs_lib_standard_wall_sign_facedir.obj b/models/signs_lib_standard_wall_sign_facedir.obj index 90dbeee..5bc5d17 100644 --- a/models/signs_lib_standard_wall_sign_facedir.obj +++ b/models/signs_lib_standard_wall_sign_facedir.obj @@ -1,6 +1,6 @@ -# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden wall sign--facedir.blend' +# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden wall sign.blend' # www.blender.org -o Cube +o Cube.008_Cube v 0.437500 -0.312500 0.500000 v 0.437500 -0.312500 0.437500 v 0.437500 0.312500 0.500000 @@ -41,11 +41,11 @@ vn 0.0000 -1.0000 0.0000 vn 0.0000 1.0000 0.0000 vn 1.0000 0.0000 0.0000 vn -1.0000 0.0000 0.0000 -g Cube_Cube_front-back +g Cube.008_Cube_front-back s off f 8/1/1 4/2/1 2/3/1 6/4/1 f 3/5/2 7/6/2 5/7/2 1/8/2 -g Cube_Cube_edges +g Cube.008_Cube_edges f 13/9/3 14/10/3 10/11/3 9/12/3 f 11/13/4 12/14/4 16/15/4 15/16/4 f 11/13/5 9/17/5 10/18/5 12/14/5 diff --git a/models/signs_lib_standard_wall_sign_facedir_onpole.obj b/models/signs_lib_standard_wall_sign_facedir_onpole.obj index 264ceb7..f29627e 100644 --- a/models/signs_lib_standard_wall_sign_facedir_onpole.obj +++ b/models/signs_lib_standard_wall_sign_facedir_onpole.obj @@ -1,56 +1,6 @@ -# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden wall sign--facedir.blend' +# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden wall sign.blend' # www.blender.org -o Cube -v 0.437500 -0.312500 0.812500 -v 0.437500 -0.312500 0.750000 -v 0.437500 0.312500 0.812500 -v 0.437500 0.312500 0.750000 -v -0.437500 -0.312500 0.812500 -v -0.437500 -0.312500 0.750000 -v -0.437500 0.312500 0.812500 -v -0.437500 0.312500 0.750000 -v 0.437500 -0.312500 0.812500 -v 0.437500 -0.312500 0.750000 -v 0.437500 0.312500 0.812500 -v 0.437500 0.312500 0.750000 -v -0.437500 -0.312500 0.812500 -v -0.437500 -0.312500 0.750000 -v -0.437500 0.312500 0.812500 -v -0.437500 0.312500 0.750000 -vt 0.468750 0.812500 -vt 0.031250 0.812500 -vt 0.031250 0.187500 -vt 0.468750 0.187500 -vt 0.531250 0.812500 -vt 0.968750 0.812500 -vt 0.968750 0.187500 -vt 0.531250 0.187500 -vt 0.234375 0.000000 -vt 0.234375 1.000000 -vt 0.015625 1.000000 -vt 0.015625 -0.000000 -vt 0.609375 -0.000000 -vt 0.609375 1.000000 -vt 0.390625 1.000000 -vt 0.390625 -0.000000 -vt 0.765625 0.000000 -vt 0.765625 1.000000 -vn 0.0000 0.0000 -1.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 0.0000 -vn 1.0000 0.0000 0.0000 -vn -1.0000 0.0000 0.0000 -g Cube_Cube_front-back -s off -f 8/1/1 4/2/1 2/3/1 6/4/1 -f 3/5/2 7/6/2 5/7/2 1/8/2 -g Cube_Cube_edges -f 13/9/3 14/10/3 10/11/3 9/12/3 -f 11/13/4 12/14/4 16/15/4 15/16/4 -f 11/13/5 9/17/5 10/18/5 12/14/5 -f 13/9/6 15/16/6 16/15/6 14/10/6 -o Cube.001 +o Cube.009_Cube.001 v -0.125000 -0.187500 0.812500 v -0.125000 -0.187500 0.875000 v -0.125000 0.187500 0.812500 @@ -217,38 +167,88 @@ vn 0.0000 1.0000 0.0000 vn 0.0000 -1.0000 -0.0000 vn 0.0000 -0.0000 1.0000 vn 0.0000 0.0000 -1.0000 -g Cube.001_Cube.001_pole_mount +g Cube.009_Cube.001_pole_mount s off -f 17/19/7 18/20/7 20/21/7 19/22/7 -f 22/23/8 21/24/8 24/25/8 23/26/8 -f 20/21/9 24/25/9 21/27/9 19/28/9 -f 17/29/10 22/30/10 23/26/10 18/20/10 -f 18/20/11 23/26/11 24/25/11 20/21/11 -f 25/31/8 26/32/8 28/33/8 27/34/8 -f 27/35/9 28/36/9 32/37/9 31/38/9 -f 31/39/7 32/40/7 30/41/7 29/42/7 -f 29/42/10 30/41/10 26/43/10 25/44/10 -f 33/45/8 34/46/8 36/47/8 35/48/8 -f 35/49/9 36/50/9 40/51/9 39/52/9 -f 39/53/7 40/54/7 38/55/7 37/56/7 -f 37/56/10 38/55/10 34/57/10 33/58/10 -f 41/59/8 42/60/8 44/61/8 43/62/8 -f 43/63/9 44/64/9 48/65/9 47/66/9 -f 47/67/7 48/68/7 46/69/7 45/70/7 -f 45/70/10 46/69/10 42/71/10 41/72/10 -f 49/73/8 50/74/8 52/75/8 51/76/8 -f 51/77/9 52/78/9 56/79/9 55/80/9 -f 55/81/7 56/82/7 54/83/7 53/84/7 -f 53/84/10 54/83/10 50/85/10 49/86/10 -f 57/87/11 58/88/11 60/89/11 59/90/11 -f 59/91/9 60/92/9 64/93/9 63/94/9 -f 63/94/12 64/93/12 62/95/12 61/96/12 -f 61/96/10 62/95/10 58/88/10 57/87/10 -f 59/97/7 63/98/7 61/99/7 57/100/7 -f 64/101/8 60/102/8 58/103/8 62/104/8 -f 65/105/11 66/106/11 68/107/11 67/108/11 -f 67/109/9 68/110/9 72/111/9 71/112/9 -f 71/112/12 72/111/12 70/113/12 69/114/12 -f 69/114/10 70/113/10 66/106/10 65/105/10 -f 67/115/7 71/116/7 69/117/7 65/118/7 -f 72/119/8 68/120/8 66/121/8 70/122/8 +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 6/5/2 5/6/2 8/7/2 7/8/2 +f 4/3/3 8/7/3 5/9/3 3/10/3 +f 1/11/4 6/12/4 7/8/4 2/2/4 +f 2/2/5 7/8/5 8/7/5 4/3/5 +f 9/13/2 10/14/2 12/15/2 11/16/2 +f 11/17/3 12/18/3 16/19/3 15/20/3 +f 15/21/1 16/22/1 14/23/1 13/24/1 +f 13/24/4 14/23/4 10/25/4 9/26/4 +f 17/27/2 18/28/2 20/29/2 19/30/2 +f 19/31/3 20/32/3 24/33/3 23/34/3 +f 23/35/1 24/36/1 22/37/1 21/38/1 +f 21/38/4 22/37/4 18/39/4 17/40/4 +f 25/41/2 26/42/2 28/43/2 27/44/2 +f 27/45/3 28/46/3 32/47/3 31/48/3 +f 31/49/1 32/50/1 30/51/1 29/52/1 +f 29/52/4 30/51/4 26/53/4 25/54/4 +f 33/55/2 34/56/2 36/57/2 35/58/2 +f 35/59/3 36/60/3 40/61/3 39/62/3 +f 39/63/1 40/64/1 38/65/1 37/66/1 +f 37/66/4 38/65/4 34/67/4 33/68/4 +f 41/69/5 42/70/5 44/71/5 43/72/5 +f 43/73/3 44/74/3 48/75/3 47/76/3 +f 47/76/6 48/75/6 46/77/6 45/78/6 +f 45/78/4 46/77/4 42/70/4 41/69/4 +f 43/79/1 47/80/1 45/81/1 41/82/1 +f 48/83/2 44/84/2 42/85/2 46/86/2 +f 49/87/5 50/88/5 52/89/5 51/90/5 +f 51/91/3 52/92/3 56/93/3 55/94/3 +f 55/94/6 56/93/6 54/95/6 53/96/6 +f 53/96/4 54/95/4 50/88/4 49/87/4 +f 51/97/1 55/98/1 53/99/1 49/100/1 +f 56/101/2 52/102/2 50/103/2 54/104/2 +o Cube.004_Cube +v 0.437500 -0.312500 0.812500 +v 0.437500 -0.312500 0.750000 +v 0.437500 0.312500 0.812500 +v 0.437500 0.312500 0.750000 +v -0.437500 -0.312500 0.812500 +v -0.437500 -0.312500 0.750000 +v -0.437500 0.312500 0.812500 +v -0.437500 0.312500 0.750000 +v 0.437500 -0.312500 0.812500 +v 0.437500 -0.312500 0.750000 +v 0.437500 0.312500 0.812500 +v 0.437500 0.312500 0.750000 +v -0.437500 -0.312500 0.812500 +v -0.437500 -0.312500 0.750000 +v -0.437500 0.312500 0.812500 +v -0.437500 0.312500 0.750000 +vt 0.468750 0.812500 +vt 0.031250 0.812500 +vt 0.031250 0.187500 +vt 0.468750 0.187500 +vt 0.531250 0.812500 +vt 0.968750 0.812500 +vt 0.968750 0.187500 +vt 0.531250 0.187500 +vt 0.234375 0.000000 +vt 0.234375 1.000000 +vt 0.015625 1.000000 +vt 0.015625 -0.000000 +vt 0.609375 -0.000000 +vt 0.609375 1.000000 +vt 0.390625 1.000000 +vt 0.390625 -0.000000 +vt 0.765625 0.000000 +vt 0.765625 1.000000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +g Cube.004_Cube_front-back +s off +f 64/105/7 60/106/7 58/107/7 62/108/7 +f 59/109/8 63/110/8 61/111/8 57/112/8 +g Cube.004_Cube_edges +f 69/113/9 70/114/9 66/115/9 65/116/9 +f 67/117/10 68/118/10 72/119/10 71/120/10 +f 67/117/11 65/121/11 66/122/11 68/118/11 +f 69/113/12 71/120/12 72/119/12 70/114/12 diff --git a/models/signs_lib_standard_wall_sign_onpole.obj b/models/signs_lib_standard_wall_sign_onpole.obj index 31b73ef..ac45fda 100644 --- a/models/signs_lib_standard_wall_sign_onpole.obj +++ b/models/signs_lib_standard_wall_sign_onpole.obj @@ -1,6 +1,6 @@ # Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden wall sign.blend' # www.blender.org -o Cube +o Cube.003_Cube v 0.437500 -0.812500 -0.312500 v 0.437500 -0.750000 -0.312500 v 0.437500 -0.812500 0.312500 @@ -41,11 +41,11 @@ vn 0.0000 0.0000 -1.0000 vn 0.0000 0.0000 1.0000 vn 1.0000 0.0000 0.0000 vn -1.0000 0.0000 0.0000 -g Cube_Cube_front-back +g Cube.003_Cube_front-back s off f 8/1/1 4/2/1 2/3/1 6/4/1 f 3/5/2 7/6/2 5/7/2 1/8/2 -g Cube_Cube_edges +g Cube.003_Cube_edges f 13/9/3 14/10/3 10/11/3 9/12/3 f 11/13/4 12/14/4 16/15/4 15/16/4 f 11/13/5 9/17/5 10/18/5 12/14/5