Rearrange mesecons, diglines, dimmable functions and related, tweak

digiline stuff to be more generic, and add various digilines connections
rules to complement mesecons rules.

Mesecons must be present to get the "wallmounted" rules for digilines nodes.
Without mesecons, nodes that want wall rules will get alldir rules instead.

Add mesecons support to table and standing lamps (off -> max -> off).

Add digilines support to all other lights that now support mesecons,
except rope lights, since they're a mesecon conductor.

(will approach that last one later)

homedecor_3d_extras/models/homedecor_door_closet_a.obj

@@ -293,12 +293,12 @@ vt 0.000000 0.062500
 vt 0.000000 0.000000
 vt 0.421053 0.000000
 vt 0.421053 0.000000
-vt 0.052632 0.937500
-vt 0.368421 0.937500
+vt 0.052632 0.921875
+vt 0.368421 0.921875
 vt 0.368421 0.906250
 vt 0.052632 0.906250
-vt 0.473684 0.937500
-vt 0.789474 0.937500
+vt 0.473684 0.921875
+vt 0.789474 0.921875
 vt 0.789474 0.906250
 vt 0.473684 0.906250
 vt 0.842105 0.937500
@@ -339,12 +339,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.906250
-vt 0.368421 0.906250
+vt 0.052632 0.890625
+vt 0.368421 0.890625
 vt 0.368421 0.875000
 vt 0.052632 0.875000
-vt 0.473684 0.906250
-vt 0.789474 0.906250
+vt 0.473684 0.890625
+vt 0.789474 0.890625
 vt 0.789474 0.875000
 vt 0.473684 0.875000
 vt 0.986842 0.562500
@@ -355,12 +355,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.875000
-vt 0.368421 0.875000
+vt 0.052632 0.859375
+vt 0.368421 0.859375
 vt 0.368421 0.843750
 vt 0.052632 0.843750
-vt 0.473684 0.875000
-vt 0.789474 0.875000
+vt 0.473684 0.859375
+vt 0.789474 0.859375
 vt 0.789474 0.843750
 vt 0.473684 0.843750
 vt 0.986842 0.562500
@@ -371,12 +371,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.843750
-vt 0.368421 0.843750
+vt 0.052632 0.828125
+vt 0.368421 0.828125
 vt 0.368421 0.812500
 vt 0.052632 0.812500
-vt 0.473684 0.843750
-vt 0.789474 0.843750
+vt 0.473684 0.828125
+vt 0.789474 0.828125
 vt 0.789474 0.812500
 vt 0.473684 0.812500
 vt 0.986842 0.562500
@@ -387,12 +387,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.812500
-vt 0.368421 0.812500
+vt 0.052632 0.796875
+vt 0.368421 0.796875
 vt 0.368421 0.781250
 vt 0.052632 0.781250
-vt 0.473684 0.812500
-vt 0.789474 0.812500
+vt 0.473684 0.796875
+vt 0.789474 0.796875
 vt 0.789474 0.781250
 vt 0.473684 0.781250
 vt 0.986842 0.562500
@@ -403,12 +403,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.781250
-vt 0.368421 0.781250
+vt 0.052632 0.765625
+vt 0.368421 0.765625
 vt 0.368421 0.750000
 vt 0.052632 0.750000
-vt 0.473684 0.781250
-vt 0.789474 0.781250
+vt 0.473684 0.765625
+vt 0.789474 0.765625
 vt 0.789474 0.750000
 vt 0.473684 0.750000
 vt 0.986842 0.562500
@@ -419,12 +419,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.718750
-vt 0.368421 0.718750
+vt 0.052632 0.703125
+vt 0.368421 0.703125
 vt 0.368421 0.687500
 vt 0.052632 0.687500
-vt 0.473684 0.718750
-vt 0.789474 0.718750
+vt 0.473684 0.703125
+vt 0.789474 0.703125
 vt 0.789474 0.687500
 vt 0.473684 0.687500
 vt 0.986842 0.562500
@@ -435,12 +435,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.750000
-vt 0.368421 0.750000
+vt 0.052632 0.734375
+vt 0.368421 0.734375
 vt 0.368421 0.718750
 vt 0.052632 0.718750
-vt 0.473684 0.750000
-vt 0.789474 0.750000
+vt 0.473684 0.734375
+vt 0.789474 0.734375
 vt 0.789474 0.718750
 vt 0.473684 0.718750
 vt 0.986842 0.562500
@@ -451,12 +451,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.687500
-vt 0.368421 0.687500
+vt 0.052632 0.671875
+vt 0.368421 0.671875
 vt 0.368421 0.656250
 vt 0.052632 0.656250
-vt 0.473684 0.687500
-vt 0.789474 0.687500
+vt 0.473684 0.671875
+vt 0.789474 0.671875
 vt 0.789474 0.656250
 vt 0.473684 0.656250
 vt 0.986842 0.562500
@@ -467,12 +467,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.656250
-vt 0.368421 0.656250
+vt 0.052632 0.640625
+vt 0.368421 0.640625
 vt 0.368421 0.625000
 vt 0.052632 0.625000
-vt 0.473684 0.656250
-vt 0.789474 0.656250
+vt 0.473684 0.640625
+vt 0.789474 0.640625
 vt 0.789474 0.625000
 vt 0.473684 0.625000
 vt 0.986842 0.562500
@@ -483,12 +483,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.625000
-vt 0.368421 0.625000
+vt 0.052632 0.609375
+vt 0.368421 0.609375
 vt 0.368421 0.593750
 vt 0.052632 0.593750
-vt 0.473684 0.625000
-vt 0.789474 0.625000
+vt 0.473684 0.609375
+vt 0.789474 0.609375
 vt 0.789474 0.593750
 vt 0.473684 0.593750
 vt 0.986842 0.562500
@@ -499,12 +499,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.593750
-vt 0.368421 0.593750
+vt 0.052632 0.578125
+vt 0.368421 0.578125
 vt 0.368421 0.562500
 vt 0.052632 0.562500
-vt 0.473684 0.593750
-vt 0.789474 0.593750
+vt 0.473684 0.578125
+vt 0.789474 0.578125
 vt 0.789474 0.562500
 vt 0.473684 0.562500
 vt 0.986842 0.562500
@@ -515,12 +515,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.562500
-vt 0.368421 0.562500
+vt 0.052632 0.546875
+vt 0.368421 0.546875
 vt 0.368421 0.531250
 vt 0.052632 0.531250
-vt 0.473684 0.562500
-vt 0.789474 0.562500
+vt 0.473684 0.546875
+vt 0.789474 0.546875
 vt 0.789474 0.531250
 vt 0.473684 0.531250
 vt 0.986842 0.562500
@@ -533,12 +533,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.468750
 vt 0.368421 0.468750
-vt 0.368421 0.437500
-vt 0.052632 0.437500
+vt 0.368421 0.453125
+vt 0.052632 0.453125
 vt 0.473684 0.468750
 vt 0.789474 0.468750
-vt 0.789474 0.437500
-vt 0.473684 0.437500
+vt 0.789474 0.453125
+vt 0.473684 0.453125
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -549,12 +549,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.437500
 vt 0.368421 0.437500
-vt 0.368421 0.406250
-vt 0.052632 0.406250
+vt 0.368421 0.421875
+vt 0.052632 0.421875
 vt 0.473684 0.437500
 vt 0.789474 0.437500
-vt 0.789474 0.406250
-vt 0.473684 0.406250
+vt 0.789474 0.421875
+vt 0.473684 0.421875
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -565,12 +565,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.406250
 vt 0.368421 0.406250
-vt 0.368421 0.375000
-vt 0.052632 0.375000
+vt 0.368421 0.390625
+vt 0.052632 0.390625
 vt 0.473684 0.406250
 vt 0.789474 0.406250
-vt 0.789474 0.375000
-vt 0.473684 0.375000
+vt 0.789474 0.390625
+vt 0.473684 0.390625
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -581,12 +581,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.375000
 vt 0.368421 0.375000
-vt 0.368421 0.343750
-vt 0.052632 0.343750
+vt 0.368421 0.359375
+vt 0.052632 0.359375
 vt 0.473684 0.375000
 vt 0.789474 0.375000
-vt 0.789474 0.343750
-vt 0.473684 0.343750
+vt 0.789474 0.359375
+vt 0.473684 0.359375
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -597,12 +597,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.343750
 vt 0.368421 0.343750
-vt 0.368421 0.312500
-vt 0.052632 0.312500
+vt 0.368421 0.328125
+vt 0.052632 0.328125
 vt 0.473684 0.343750
 vt 0.789474 0.343750
-vt 0.789474 0.312500
-vt 0.473684 0.312500
+vt 0.789474 0.328125
+vt 0.473684 0.328125
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -613,12 +613,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.312500
 vt 0.368421 0.312500
-vt 0.368421 0.281250
-vt 0.052632 0.281250
+vt 0.368421 0.296875
+vt 0.052632 0.296875
 vt 0.473684 0.312500
 vt 0.789474 0.312500
-vt 0.789474 0.281250
-vt 0.473684 0.281250
+vt 0.789474 0.296875
+vt 0.473684 0.296875
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -629,12 +629,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.250000
 vt 0.368421 0.250000
-vt 0.368421 0.218750
-vt 0.052632 0.218750
+vt 0.368421 0.234375
+vt 0.052632 0.234375
 vt 0.473684 0.250000
 vt 0.789474 0.250000
-vt 0.789474 0.218750
-vt 0.473684 0.218750
+vt 0.789474 0.234375
+vt 0.473684 0.234375
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -645,12 +645,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.281250
 vt 0.368421 0.281250
-vt 0.368421 0.250000
-vt 0.052632 0.250000
+vt 0.368421 0.265625
+vt 0.052632 0.265625
 vt 0.473684 0.281250
 vt 0.789474 0.281250
-vt 0.789474 0.250000
-vt 0.473684 0.250000
+vt 0.789474 0.265625
+vt 0.473684 0.265625
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -661,12 +661,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.218750
 vt 0.368421 0.218750
-vt 0.368421 0.187500
-vt 0.052632 0.187500
+vt 0.368421 0.203125
+vt 0.052632 0.203125
 vt 0.473684 0.218750
 vt 0.789474 0.218750
-vt 0.789474 0.187500
-vt 0.473684 0.187500
+vt 0.789474 0.203125
+vt 0.473684 0.203125
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -677,12 +677,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.187500
 vt 0.368421 0.187500
-vt 0.368421 0.156250
-vt 0.052632 0.156250
+vt 0.368421 0.171875
+vt 0.052632 0.171875
 vt 0.473684 0.187500
 vt 0.789474 0.187500
-vt 0.789474 0.156250
-vt 0.473684 0.156250
+vt 0.789474 0.171875
+vt 0.473684 0.171875
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -693,12 +693,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.156250
 vt 0.368421 0.156250
-vt 0.368421 0.125000
-vt 0.052632 0.125000
+vt 0.368421 0.140625
+vt 0.052632 0.140625
 vt 0.473684 0.156250
 vt 0.789474 0.156250
-vt 0.789474 0.125000
-vt 0.473684 0.125000
+vt 0.789474 0.140625
+vt 0.473684 0.140625
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -709,12 +709,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.125000
 vt 0.368421 0.125000
-vt 0.368421 0.093750
-vt 0.052632 0.093750
+vt 0.368421 0.109375
+vt 0.052632 0.109375
 vt 0.473684 0.125000
 vt 0.789474 0.125000
-vt 0.789474 0.093750
-vt 0.473684 0.093750
+vt 0.789474 0.109375
+vt 0.473684 0.109375
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -725,12 +725,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.093750
 vt 0.368421 0.093750
-vt 0.368421 0.062500
-vt 0.052632 0.062500
+vt 0.368421 0.078125
+vt 0.052632 0.078125
 vt 0.473684 0.093750
 vt 0.789474 0.093750
-vt 0.789474 0.062500
-vt 0.473684 0.062500
+vt 0.789474 0.078125
+vt 0.473684 0.078125
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500

homedecor_3d_extras/models/homedecor_door_closet_b.obj

@@ -293,12 +293,12 @@ vt 0.000000 0.062500
 vt 0.000000 0.000000
 vt 0.421053 0.000000
 vt 0.421053 0.000000
-vt 0.052632 0.937500
-vt 0.368421 0.937500
+vt 0.052632 0.921875
+vt 0.368421 0.921875
 vt 0.368421 0.906250
 vt 0.052632 0.906250
-vt 0.473684 0.937500
-vt 0.789474 0.937500
+vt 0.473684 0.921875
+vt 0.789474 0.921875
 vt 0.789474 0.906250
 vt 0.473684 0.906250
 vt 0.842105 0.937500
@@ -339,12 +339,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.906250
-vt 0.368421 0.906250
+vt 0.052632 0.890625
+vt 0.368421 0.890625
 vt 0.368421 0.875000
 vt 0.052632 0.875000
-vt 0.473684 0.906250
-vt 0.789474 0.906250
+vt 0.473684 0.890625
+vt 0.789474 0.890625
 vt 0.789474 0.875000
 vt 0.473684 0.875000
 vt 0.986842 0.562500
@@ -355,12 +355,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.875000
-vt 0.368421 0.875000
+vt 0.052632 0.859375
+vt 0.368421 0.859375
 vt 0.368421 0.843750
 vt 0.052632 0.843750
-vt 0.473684 0.875000
-vt 0.789474 0.875000
+vt 0.473684 0.859375
+vt 0.789474 0.859375
 vt 0.789474 0.843750
 vt 0.473684 0.843750
 vt 0.986842 0.562500
@@ -371,12 +371,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.843750
-vt 0.368421 0.843750
+vt 0.052632 0.828125
+vt 0.368421 0.828125
 vt 0.368421 0.812500
 vt 0.052632 0.812500
-vt 0.473684 0.843750
-vt 0.789474 0.843750
+vt 0.473684 0.828125
+vt 0.789474 0.828125
 vt 0.789474 0.812500
 vt 0.473684 0.812500
 vt 0.986842 0.562500
@@ -387,12 +387,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.812500
-vt 0.368421 0.812500
+vt 0.052632 0.796875
+vt 0.368421 0.796875
 vt 0.368421 0.781250
 vt 0.052632 0.781250
-vt 0.473684 0.812500
-vt 0.789474 0.812500
+vt 0.473684 0.796875
+vt 0.789474 0.796875
 vt 0.789474 0.781250
 vt 0.473684 0.781250
 vt 0.986842 0.562500
@@ -403,12 +403,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.781250
-vt 0.368421 0.781250
+vt 0.052632 0.765625
+vt 0.368421 0.765625
 vt 0.368421 0.750000
 vt 0.052632 0.750000
-vt 0.473684 0.781250
-vt 0.789474 0.781250
+vt 0.473684 0.765625
+vt 0.789474 0.765625
 vt 0.789474 0.750000
 vt 0.473684 0.750000
 vt 0.986842 0.562500
@@ -419,12 +419,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.718750
-vt 0.368421 0.718750
+vt 0.052632 0.703125
+vt 0.368421 0.703125
 vt 0.368421 0.687500
 vt 0.052632 0.687500
-vt 0.473684 0.718750
-vt 0.789474 0.718750
+vt 0.473684 0.703125
+vt 0.789474 0.703125
 vt 0.789474 0.687500
 vt 0.473684 0.687500
 vt 0.986842 0.562500
@@ -435,12 +435,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.750000
-vt 0.368421 0.750000
+vt 0.052632 0.734375
+vt 0.368421 0.734375
 vt 0.368421 0.718750
 vt 0.052632 0.718750
-vt 0.473684 0.750000
-vt 0.789474 0.750000
+vt 0.473684 0.734375
+vt 0.789474 0.734375
 vt 0.789474 0.718750
 vt 0.473684 0.718750
 vt 0.986842 0.562500
@@ -451,12 +451,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.687500
-vt 0.368421 0.687500
+vt 0.052632 0.671875
+vt 0.368421 0.671875
 vt 0.368421 0.656250
 vt 0.052632 0.656250
-vt 0.473684 0.687500
-vt 0.789474 0.687500
+vt 0.473684 0.671875
+vt 0.789474 0.671875
 vt 0.789474 0.656250
 vt 0.473684 0.656250
 vt 0.986842 0.562500
@@ -467,12 +467,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.656250
-vt 0.368421 0.656250
+vt 0.052632 0.640625
+vt 0.368421 0.640625
 vt 0.368421 0.625000
 vt 0.052632 0.625000
-vt 0.473684 0.656250
-vt 0.789474 0.656250
+vt 0.473684 0.640625
+vt 0.789474 0.640625
 vt 0.789474 0.625000
 vt 0.473684 0.625000
 vt 0.986842 0.562500
@@ -483,12 +483,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.625000
-vt 0.368421 0.625000
+vt 0.052632 0.609375
+vt 0.368421 0.609375
 vt 0.368421 0.593750
 vt 0.052632 0.593750
-vt 0.473684 0.625000
-vt 0.789474 0.625000
+vt 0.473684 0.609375
+vt 0.789474 0.609375
 vt 0.789474 0.593750
 vt 0.473684 0.593750
 vt 0.986842 0.562500
@@ -499,12 +499,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.593750
-vt 0.368421 0.593750
+vt 0.052632 0.578125
+vt 0.368421 0.578125
 vt 0.368421 0.562500
 vt 0.052632 0.562500
-vt 0.473684 0.593750
-vt 0.789474 0.593750
+vt 0.473684 0.578125
+vt 0.789474 0.578125
 vt 0.789474 0.562500
 vt 0.473684 0.562500
 vt 0.986842 0.562500
@@ -515,12 +515,12 @@ vt 0.973684 0.062500
 vt 0.960526 0.062500
 vt 0.960526 0.437500
 vt 0.973684 0.437500
-vt 0.052632 0.562500
-vt 0.368421 0.562500
+vt 0.052632 0.546875
+vt 0.368421 0.546875
 vt 0.368421 0.531250
 vt 0.052632 0.531250
-vt 0.473684 0.562500
-vt 0.789474 0.562500
+vt 0.473684 0.546875
+vt 0.789474 0.546875
 vt 0.789474 0.531250
 vt 0.473684 0.531250
 vt 0.986842 0.562500
@@ -533,12 +533,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.468750
 vt 0.368421 0.468750
-vt 0.368421 0.437500
-vt 0.052632 0.437500
+vt 0.368421 0.453125
+vt 0.052632 0.453125
 vt 0.473684 0.468750
 vt 0.789474 0.468750
-vt 0.789474 0.437500
-vt 0.473684 0.437500
+vt 0.789474 0.453125
+vt 0.473684 0.453125
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -549,12 +549,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.437500
 vt 0.368421 0.437500
-vt 0.368421 0.406250
-vt 0.052632 0.406250
+vt 0.368421 0.421875
+vt 0.052632 0.421875
 vt 0.473684 0.437500
 vt 0.789474 0.437500
-vt 0.789474 0.406250
-vt 0.473684 0.406250
+vt 0.789474 0.421875
+vt 0.473684 0.421875
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -565,12 +565,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.406250
 vt 0.368421 0.406250
-vt 0.368421 0.375000
-vt 0.052632 0.375000
+vt 0.368421 0.390625
+vt 0.052632 0.390625
 vt 0.473684 0.406250
 vt 0.789474 0.406250
-vt 0.789474 0.375000
-vt 0.473684 0.375000
+vt 0.789474 0.390625
+vt 0.473684 0.390625
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -581,12 +581,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.375000
 vt 0.368421 0.375000
-vt 0.368421 0.343750
-vt 0.052632 0.343750
+vt 0.368421 0.359375
+vt 0.052632 0.359375
 vt 0.473684 0.375000
 vt 0.789474 0.375000
-vt 0.789474 0.343750
-vt 0.473684 0.343750
+vt 0.789474 0.359375
+vt 0.473684 0.359375
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -597,12 +597,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.343750
 vt 0.368421 0.343750
-vt 0.368421 0.312500
-vt 0.052632 0.312500
+vt 0.368421 0.328125
+vt 0.052632 0.328125
 vt 0.473684 0.343750
 vt 0.789474 0.343750
-vt 0.789474 0.312500
-vt 0.473684 0.312500
+vt 0.789474 0.328125
+vt 0.473684 0.328125
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -613,12 +613,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.312500
 vt 0.368421 0.312500
-vt 0.368421 0.281250
-vt 0.052632 0.281250
+vt 0.368421 0.296875
+vt 0.052632 0.296875
 vt 0.473684 0.312500
 vt 0.789474 0.312500
-vt 0.789474 0.281250
-vt 0.473684 0.281250
+vt 0.789474 0.296875
+vt 0.473684 0.296875
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -629,12 +629,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.250000
 vt 0.368421 0.250000
-vt 0.368421 0.218750
-vt 0.052632 0.218750
+vt 0.368421 0.234375
+vt 0.052632 0.234375
 vt 0.473684 0.250000
 vt 0.789474 0.250000
-vt 0.789474 0.218750
-vt 0.473684 0.218750
+vt 0.789474 0.234375
+vt 0.473684 0.234375
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -645,12 +645,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.281250
 vt 0.368421 0.281250
-vt 0.368421 0.250000
-vt 0.052632 0.250000
+vt 0.368421 0.265625
+vt 0.052632 0.265625
 vt 0.473684 0.281250
 vt 0.789474 0.281250
-vt 0.789474 0.250000
-vt 0.473684 0.250000
+vt 0.789474 0.265625
+vt 0.473684 0.265625
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -661,12 +661,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.218750
 vt 0.368421 0.218750
-vt 0.368421 0.187500
-vt 0.052632 0.187500
+vt 0.368421 0.203125
+vt 0.052632 0.203125
 vt 0.473684 0.218750
 vt 0.789474 0.218750
-vt 0.789474 0.187500
-vt 0.473684 0.187500
+vt 0.789474 0.203125
+vt 0.473684 0.203125
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -677,12 +677,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.187500
 vt 0.368421 0.187500
-vt 0.368421 0.156250
-vt 0.052632 0.156250
+vt 0.368421 0.171875
+vt 0.052632 0.171875
 vt 0.473684 0.187500
 vt 0.789474 0.187500
-vt 0.789474 0.156250
-vt 0.473684 0.156250
+vt 0.789474 0.171875
+vt 0.473684 0.171875
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -693,12 +693,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.156250
 vt 0.368421 0.156250
-vt 0.368421 0.125000
-vt 0.052632 0.125000
+vt 0.368421 0.140625
+vt 0.052632 0.140625
 vt 0.473684 0.156250
 vt 0.789474 0.156250
-vt 0.789474 0.125000
-vt 0.473684 0.125000
+vt 0.789474 0.140625
+vt 0.473684 0.140625
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -709,12 +709,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.125000
 vt 0.368421 0.125000
-vt 0.368421 0.093750
-vt 0.052632 0.093750
+vt 0.368421 0.109375
+vt 0.052632 0.109375
 vt 0.473684 0.125000
 vt 0.789474 0.125000
-vt 0.789474 0.093750
-vt 0.473684 0.093750
+vt 0.789474 0.109375
+vt 0.473684 0.109375
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500
@@ -725,12 +725,12 @@ vt 0.960526 0.437500
 vt 0.973684 0.437500
 vt 0.052632 0.093750
 vt 0.368421 0.093750
-vt 0.368421 0.062500
-vt 0.052632 0.062500
+vt 0.368421 0.078125
+vt 0.052632 0.078125
 vt 0.473684 0.093750
 vt 0.789474 0.093750
-vt 0.789474 0.062500
-vt 0.473684 0.062500
+vt 0.789474 0.078125
+vt 0.473684 0.078125
 vt 0.986842 0.562500
 vt 0.973684 0.562500
 vt 0.973684 0.937500

homedecor_doors_and_gates/depends.txt

@@ -1,5 +1,6 @@
 homedecor_common
 homedecor_misc?
+homedecor_3d_extras?
 default
 basic_materials
 dye

homedecor_doors_and_gates/init.lua

@@ -163,6 +163,8 @@ if mesecons_mp then
 	}
 end
 
+local hd_3d = minetest.get_modpath("homedecor_3d_extras")
+
 for _, door in ipairs(door_list) do
 	doors.register(door.name, {
 			tiles = {{ name = "homedecor_door_"..door.name..".png", backface_culling = door.backface }},
@@ -190,7 +192,7 @@ for _, door in ipairs(door_list) do
 			minetest.register_node(":"..nn_b, def)
 	end
 
-	if door.custom_model then
+	if door.custom_model and hd_3d then
 		def = hd_doors_clone_node(nn_a)
 			def.mesh = door.custom_model.."_a.obj"
 			minetest.register_node(":"..nn_a, def)

homedecor_lighting/depends.txt

@@ -7,3 +7,4 @@ moreblocks?
 building_blocks?
 darkage?
 mesecons?
+digilines?

homedecor_lighting/init.lua

@@ -11,26 +11,23 @@ local function is_protected(pos, clicker)
 	return false
 end
 
-local actions = {
-	action_off = function(pos, node)
-		local sep = string.find(node.name, "_o", -5)
-		local onoff = string.sub(node.name, sep + 1)
-		if minetest.get_meta(pos):get_int("toggled") > 0 then
-			minetest.swap_node(pos, {
-				name = string.sub(node.name, 1, sep - 1).."_off",
-				param2 = node.param2
-			})
-		end
-	end,
-	action_on = function(pos, node)
-		minetest.get_meta(pos):set_int("toggled", 1)
-		local sep = string.find(node.name, "_o", -5)
-		local onoff = string.sub(node.name, sep + 1)
-		minetest.swap_node(pos, {
-			name = string.sub(node.name, 1, sep - 1).."_on",
-			param2 = node.param2
-		})
-	end
+-- control and brightness for dimmable lamps
+
+local repl = {
+	["off"] = "low",
+	["low"] = "med",
+	["med"] = "hi",
+	["hi"]  = "max",
+	["max"] = "off",
+	["on"]  = "off",
+}
+
+local brightness_tab = {
+	0xffd0d0d0,
+	0xffd8d8d8,
+	0xffe0e0e0,
+	0xffe8e8e8,
+	0xffffffff,
 }
 
 local rules_xz = {
@@ -63,7 +60,34 @@ local rules_toponly = {
 	{x =  0, y =  1, z = -1},
 }
 
+-- mesecons compatibility
+
+local actions
+
 if minetest.get_modpath("mesecons") then
+
+	actions = {
+		action_off = function(pos, node)
+			local sep = string.find(node.name, "_", -5)
+			local onoff = string.sub(node.name, sep + 1)
+			if minetest.get_meta(pos):get_int("toggled") > 0 then
+				minetest.swap_node(pos, {
+					name = string.sub(node.name, 1, sep - 1).."_off",
+					param2 = node.param2
+				})
+			end
+		end,
+		action_on = function(pos, node)
+			minetest.get_meta(pos):set_int("toggled", 1)
+			local sep = string.find(node.name, "_", -5)
+			local onoff = string.sub(node.name, sep + 1)
+			minetest.swap_node(pos, {
+				name = string.sub(node.name, 1, sep - 1).."_on",
+				param2 = node.param2
+			})
+		end
+	}
+
 	homedecor.mesecon_wall_light = {
 		effector = table.copy(actions)
 	}
@@ -87,57 +111,34 @@ if minetest.get_modpath("mesecons") then
 end
 
 -- digilines compatibility
--- the following functions are based on the so-named ones in Jeija's digilines mod
-
-local on_digiline_receive_std = function(pos, node, channel, msg)
-	local meta = minetest.get_meta(pos)
-	local setchan = meta:get_string("channel")
-	if setchan ~= channel then return end
-	local num = tonumber(msg)
-	if msg == "colon" or msg == "period" or msg == "off" or (num and (num >= 0 and num <= 9)) then
-			minetest.swap_node(pos, { name = "led_marquee:marquee_"..msg, param2 = node.param2})
-	end
-end
-
-local on_digiline_receive_string = function(pos, node, channel, msg)
-	local meta = minetest.get_meta(pos)
-	local setchan = meta:get_string("channel")
-
-	if setchan ~= channel then return end
-	if msg and msg ~= "" and type(msg) == "string" then
-		if msg == "off"
-		  or msg == "low"
-		  or msg == "med"
-		  or msg == "hi"
-		  or msg == "max" then
-			local basename = string.sub(node.name, 1, string.find(node.name, "_", -5) - 1)
-			minetest.swap_node(pos, {name = basename.."_"..msg, param2 = node.param2})
-		end
-	end
-end
-
-local repl = {
-	["off"] ="low",
-	["low"] ="med",
-	["med"] ="hi",
-	["hi"]  ="max",
-	["max"] ="off",
-}
+-- this one is based on the so-named one in Jeija's digilines mod
 
 local player_last_clicked = {}
 
-local dl_onreceive
-local dl_digiline
-local dl_on_punch
-local function dl_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
-	if is_protected(pos, clicker) then return end
-	local delim = string.find(node.name, "_", -5)
-	local basename = string.sub(node.name, 1, delim - 1)
-	local suffix = string.sub(node.name, delim + 1)
-	minetest.set_node(pos, {name = basename.."_"..repl[suffix], param2 = node.param2})
-end
+local digiline_on_punch
 
 if minetest.get_modpath("digilines") then
+
+	local on_digiline_receive_string = function(pos, node, channel, msg)
+		local meta = minetest.get_meta(pos)
+		local setchan = meta:get_string("channel")
+
+		if setchan ~= channel then return end
+		if msg and msg ~= "" and type(msg) == "string" then
+			if msg == "off"
+			  or msg == "low"
+			  or msg == "med"
+			  or msg == "hi"
+			  or msg == "max"
+			  or msg == "on" then
+				local basename = string.sub(node.name, 1, string.find(node.name, "_", -5) - 1)
+				if minetest.registered_nodes[basename.."_"..msg] then
+					minetest.swap_node(pos, {name = basename.."_"..msg, param2 = node.param2})
+				end
+			end
+		end
+	end
+
 	minetest.register_on_player_receive_fields(function(player, formname, fields)
 		local name = player:get_player_name()
 		local pos = player_last_clicked[name]
@@ -150,14 +151,54 @@ if minetest.get_modpath("digilines") then
 		end
 	end)
 
-	dl_digiline = {
+	if minetest.get_modpath("mesecons") then
+		homedecor.digiline_wall_light = {
+			effector = {
+				action = on_digiline_receive_string,
+			},
+			wire = {
+				rules = mesecon.rules.wallmounted_get
+			}
+		}
+	else
+		homedecor.digiline_wall_light = {
+			effector = {
+				action = on_digiline_receive_string,
+			},
+			wire = {
+				rules = rules_alldir
+			}
+		}
+	end
+
+	homedecor.digiline_xz_light = {
 		effector = {
 			action = on_digiline_receive_string,
 		},
-		rules = rules_xz
+		wire = {
+			rules = rules_xz
+		}
 	}
 
-	function dl_on_punch(pos, node, puncher, pointed_thing)
+	homedecor.digiline_alldir_light = {
+		effector = {
+			action = on_digiline_receive_string,
+		},
+		wire = {
+			rules = rules_alldir
+		}
+	}
+
+	homedecor.digiline_toponly_light = {
+		effector = {
+			action = on_digiline_receive_string,
+		},
+		wire = {
+			rules = rules_toponly
+		}
+	}
+
+	function digiline_on_punch(pos, node, puncher, pointed_thing)
 		if is_protected(pos, puncher) then return end
 
 		if puncher:get_player_control().sneak then
@@ -168,23 +209,17 @@ if minetest.get_modpath("digilines") then
 			minetest.show_formspec(name, "homedecor:lamp_set_channel", form)
 		end
 	end
-
-	function dl_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
-		if is_protected(pos, clicker) then return end
-		local delim = string.find(node.name, "_", -5)
-		local basename = string.sub(node.name, 1, delim - 1)
-		local suffix = string.sub(node.name, delim + 1)
-		minetest.swap_node(pos, {name = basename.."_"..repl[suffix], param2 = node.param2})
-	end
 end
 
-local brightness_tab = {
-	0xffd0d0d0,
-	0xffd8d8d8,
-	0xffe0e0e0,
-	0xffe8e8e8,
-	0xffffffff,
-}
+-- turn on/off, cycle brightness
+
+function on_rightclick(pos, node, clicker, itemstack, pointed_thing)
+	if is_protected(pos, clicker) then return end
+	local delim = string.find(node.name, "_", -5)
+	local basename = string.sub(node.name, 1, delim - 1)
+	local suffix = string.sub(node.name, delim + 1)
+	minetest.swap_node(pos, {name = basename.."_"..repl[suffix], param2 = node.param2})
+end
 
 function homedecor.toggle_light(pos, node, clicker, itemstack, pointed_thing)
 	if is_protected(pos, clicker) then return end
@@ -194,6 +229,9 @@ function homedecor.toggle_light(pos, node, clicker, itemstack, pointed_thing)
 	minetest.swap_node(pos, {name = newname, param2 = node.param2})
 end
 
+-----
+-- The actual lights! :-)
+
 for _, onoff in ipairs({"on", "off"}) do
 
 	local onflag = (onoff == "on")
@@ -277,7 +315,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:glowlight_half_on"}, inherit_color = true },
 			}
 		},
-		mesecons = homedecor.mesecon_wall_light
+		mesecons = homedecor.mesecon_wall_light,
+		digiline = homedecor.digiline_wall_light,
+		on_punch = digiline_on_punch
 	})
 
 	sides_edges = "homedecor_glowlight_thin_sides_edges.png"
@@ -340,7 +380,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:glowlight_quarter_on"}, inherit_color = true },
 			}
 		},
-		mesecons = homedecor.mesecon_wall_light
+		mesecons = homedecor.mesecon_wall_light,
+		digiline = homedecor.digiline_wall_light,
+		on_punch = digiline_on_punch
 	})
 
 	tb_edges =    "homedecor_glowlight_cube_tb_edges.png"
@@ -404,7 +446,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:glowlight_small_cube_on"}, inherit_color = true },
 			}
 		},
-		mesecons = homedecor.mesecon_wall_light
+		mesecons = homedecor.mesecon_wall_light,
+		digiline = homedecor.digiline_wall_light,
+		on_punch = digiline_on_punch
 	})
 
 	local lighttex
@@ -437,7 +481,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:plasma_lamp_on"}},
 			}
 		},
-		mesecons = homedecor.mesecon_alldir_light
+		mesecons = homedecor.mesecon_alldir_light,
+		digiline = homedecor.digiline_alldir_light,
+		on_punch = digiline_on_punch
 	})
 
 	local lighttex = "homedecor_blanktile.png"
@@ -473,7 +519,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:plasma_ball_on"}},
 			}
 		},
-		mesecons = homedecor.mesecon_xz_light
+		mesecons = homedecor.mesecon_xz_light,
+		digiline = homedecor.digiline_xz_light,
+		on_punch = digiline_on_punch
 	})
 
 	local gl_cbox = {
@@ -505,7 +553,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:ground_lantern_on"}},
 			}
 		},
-		mesecons = homedecor.mesecon_xz_light
+		mesecons = homedecor.mesecon_xz_light,
+		digiline = homedecor.digiline_xz_light,
+		on_punch = digiline_on_punch
 	})
 
 	local hl_cbox = {
@@ -530,7 +580,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:hanging_lantern_on"}},
 			}
 		},
-		mesecons = homedecor.mesecon_alldir_light
+		mesecons = homedecor.mesecon_alldir_light,
+		digiline = homedecor.digiline_alldir_light,
+		on_punch = digiline_on_punch
 	})
 
 	local cl_cbox = {
@@ -555,7 +607,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:ceiling_lantern_on"}},
 			}
 		},
-		mesecons = homedecor.mesecon_toponly_light
+		mesecons = homedecor.mesecon_toponly_light,
+		digiline = homedecor.digiline_toponly_light,
+		on_punch = digiline_on_punch
 	})
 
 	if minetest.get_modpath("darkage") then
@@ -580,7 +634,9 @@ for _, onoff in ipairs({"on", "off"}) do
 					{items = {"homedecor:lattice_lantern_large_on"}},
 				}
 			},
-			mesecons = homedecor.mesecon_alldir_light
+			mesecons = homedecor.mesecon_alldir_light,
+			digiline = homedecor.digiline_alldir_light,
+			on_punch = digiline_on_punch
 		})
 	end
 
@@ -620,7 +676,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:lattice_lantern_small_on"}},
 			}
 		},
-		mesecons = homedecor.mesecon_wall_light
+		mesecons = homedecor.mesecon_alldir_light,
+		digiline = homedecor.digiline_alldir_light,
+		on_punch = digiline_on_punch
 	})
 
 	-- "gooseneck" style desk lamps
@@ -658,7 +716,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:desk_lamp_on"}, inherit_color = true },
 			}
 		},
-		mesecons = homedecor.mesecon_xz_light
+		mesecons = homedecor.mesecon_xz_light,
+		digiline = homedecor.digiline_xz_light,
+		on_punch = digiline_on_punch
 	})
 
 	-- "kitchen"/"dining room" ceiling lamp
@@ -682,7 +742,9 @@ for _, onoff in ipairs({"on", "off"}) do
 				{items = {"homedecor:ceiling_lamp_on"}},
 			}
 		},
-		mesecons = homedecor.mesecon_toponly_light
+		mesecons = homedecor.mesecon_toponly_light,
+		digiline = homedecor.digiline_toponly_light,
+		on_punch = digiline_on_punch
 	})
 
 -- rope lighting
@@ -1067,9 +1129,10 @@ local function reg_lamp(suffix, nxt, light, brightness)
 				{items = {"homedecor:table_lamp_hi"}, inherit_color = true },
 			}
 		},
-		digiline = dl_digiline,
-		on_rightclick = dl_on_rightclick,
-		on_punch = dl_on_punch
+		digiline =      homedecor.digiline_xz_light,
+		mesecons =      homedecor.mesecon_wall_light,
+		on_rightclick = on_rightclick,
+		on_punch =      digiline_on_punch
 	})
 
 	homedecor.register("standing_lamp_"..suffix, {
@@ -1099,11 +1162,13 @@ local function reg_lamp(suffix, nxt, light, brightness)
 				{items = {"homedecor:standing_lamp_hi"}, inherit_color = true },
 			}
 		},
-		digiline = dl_digiline,
-		on_rightclick = dl_on_rightclick,
-		on_punch = dl_on_punch
+		digiline =      homedecor.digiline_xz_light,
+		mesecons =      homedecor.mesecon_wall_light,
+		on_rightclick = on_rightclick,
+		on_punch =      digiline_on_punch
 	})
 
+
 	-- for old maps that had the original 3dforniture mod
 	minetest.register_alias("3dforniture:table_lamp_"..suffix, "homedecor:table_lamp_"..suffix)
 end
@@ -1114,6 +1179,9 @@ reg_lamp("med", "hi",   7,   3 )
 reg_lamp("hi",  "max", 11,   4 )
 reg_lamp("max", "off", 14,   5 )
 
+-- mesecons compatibility
+minetest.register_alias("homedecor:table_lamp_on",    "homedecor:table_lamp_max")
+minetest.register_alias("homedecor:standing_lamp_on", "homedecor:standing_lamp_max")
 
 -- conversion LBM for param2 coloring