From 0bcc7a72273f12bd82c1e52169045b43981c7fa5 Mon Sep 17 00:00:00 2001
From: deepmurk <axiao@protonmail.com>
Date: Sun, 22 Apr 2018 06:25:27 -0400
Subject: [PATCH] Belly Scaling
Dynamic belly scaling
---
artTools/vector_source_ndmain.svg | 39 +++----------
src/art/vector/Belly.tw | 94 +++++++++++++++++--------------
src/art/vector/Feet.tw | 4 +-
src/art/vector/Head.tw | 4 --
src/art/vector/layers/Belly.tw | 2 +-
5 files changed, 63 insertions(+), 80 deletions(-)
diff --git a/artTools/vector_source_ndmain.svg b/artTools/vector_source_ndmain.svg
index e46e8f92c57..5097b16a217 100644
--- a/artTools/vector_source_ndmain.svg
+++ b/artTools/vector_source_ndmain.svg
@@ -60,7 +60,7 @@
<feGaussianBlur stdDeviation="1.5 1.5" result="blur" id="feGaussianBlur4091-3-43"/>
</filter>
</defs>
- <sodipodi:namedview inkscape:snap-others="false" inkscape:snap-bbox="true" inkscape:snap-intersection-paths="false" inkscape:snap-nodes="true" inkscape:snap-global="false" inkscape:snap-object-midpoints="true" inkscape:snap-smooth-nodes="false" inkscape:object-paths="true" inkscape:object-nodes="true" inkscape:current-layer="Head_Outfit_Soviet" inkscape:window-maximized="1" inkscape:window-y="0" inkscape:window-x="0" inkscape:cy="736.29606" inkscape:cx="214.12498" inkscape:zoom="0.99999996" showgrid="false" id="namedview4358" inkscape:window-height="952" inkscape:window-width="1280" inkscape:pageshadow="2" inkscape:pageopacity="0" guidetolerance="10" gridtolerance="10" objecttolerance="10" borderopacity="1" bordercolor="#666666" pagecolor="#ffffff" showguides="true">
+ <sodipodi:namedview inkscape:snap-others="false" inkscape:snap-bbox="true" inkscape:snap-intersection-paths="false" inkscape:snap-nodes="true" inkscape:snap-global="false" inkscape:snap-object-midpoints="true" inkscape:snap-smooth-nodes="false" inkscape:object-paths="true" inkscape:object-nodes="true" inkscape:current-layer="Belly" inkscape:window-maximized="1" inkscape:window-y="0" inkscape:window-x="0" inkscape:cy="734.29606" inkscape:cx="253.93769" inkscape:zoom="0.99999996" showgrid="false" id="namedview4358" inkscape:window-height="952" inkscape:window-width="1280" inkscape:pageshadow="2" inkscape:pageopacity="0" guidetolerance="10" gridtolerance="10" objecttolerance="10" borderopacity="1" bordercolor="#666666" pagecolor="#ffffff" showguides="true">
<inkscape:grid type="xygrid" id="grid897"/>
</sodipodi:namedview>
<style type="text/css" id="style">
@@ -2250,7 +2250,7 @@
</g>
<g style="display:none" inkscape:label="Pubic_Hair_None" id="Pubic_Hair_None" inkscape:groupmode="layer"/>
</g>
- <g inkscape:groupmode="layer" id="Torso_Outfit_" inkscape:label="Torso_Outfit_" style="display:inline">
+ <g inkscape:groupmode="layer" id="Torso_Outfit_" inkscape:label="Torso_Outfit_" style="display:none">
<g inkscape:groupmode="layer" id="Torso_Accessory_" inkscape:label="Torso_Accessory_" style="display:none">
<g style="display:none;opacity:1" inkscape:label="Hugebelly" id="Hugebelly" inkscape:groupmode="layer">
<path id="path4612" class="shadow" d="m 277.11003,447.18502 c 22.76994,-1.65 52.46986,-4.94999 68.08982,-46.63988 14.40996,-48.72987 -30.57992,-109.55971 -65.88983,-111.64971 -44.10989,6.81998 -67.97983,47.07987 -70.28982,106.58973 2.42,34.09991 36.40991,53.89986 68.08983,51.69986 z" inkscape:connector-curvature="0"/>
@@ -4809,35 +4809,12 @@
</g>
<g inkscape:groupmode="layer" id="Hip_Addon_" inkscape:label="Hip_Addon_"/>
<g inkscape:groupmode="layer" id="Belly_" style="display:inline" inkscape:label="Belly_">
- <g style="display:none;opacity:1" inkscape:label="Belly_Small" id="Belly_Small" inkscape:groupmode="layer">
- <path id="path4537" class="shadow" d="m 271.5036,433.80752 c 19.66778,-1.4252 45.32141,-4.2756 58.81332,-40.28569 12.44676,-42.09095 -26.41374,-94.63338 -56.91305,-96.43864 -38.10039,5.89083 -58.71831,40.66575 -60.71359,92.06802 2.0903,29.45416 31.44945,46.55658 58.81332,44.65631 z" inkscape:connector-curvature="0"/>
- <path id="path4539" class="skin" d="m 271.5036,433.80752 c 19.76279,0.095 46.93664,-12.35174 58.81332,-40.28569 11.87668,-27.93395 -17.57749,-79.24121 -43.70618,-96.62867 -6.17588,-4.08557 -36.7702,-7.7911 -38.38543,0 -2.47035,11.02156 -42.66103,31.63948 -39.33556,91.97301 1.71024,33.06467 42.85105,44.84634 62.61385,44.94135 z" inkscape:connector-curvature="0"/>
- <path inkscape:connector-curvature="0" id="path4541" d="m 247.78334,397.63961 a 2.945364,2.6603288 78.497917 0 1 -2.01958,3.4167 2.945364,2.6603288 78.497917 0 1 -3.19422,-2.35574 2.945364,2.6603288 78.497917 0 1 2.01958,-3.41669 2.945364,2.6603288 78.497917 0 1 3.19422,2.35573 z" class="areola"/>
- </g>
- <g inkscape:groupmode="layer" id="Belly" inkscape:label="Belly" style="display:none;opacity:1">
- <path inkscape:connector-curvature="0" d="m 274.8,433.8 c 20.7,-1.5 47.7,-4.5 61.9,-42.4 13.1,-44.3 -27.8,-99.6 -59.9,-101.5 -40.1,6.2 -61.8,42.8 -63.9,96.9 2.2,31 33.1,49 61.9,47 z" class="shadow" id="XMLID_543_"/>
- <path inkscape:connector-curvature="0" d="m 274.8,433.8 c 20.8,0.1 49.4,-13 61.9,-42.4 12.5,-29.4 -18.5,-83.4 -46,-101.7 -6.5,-4.3 -38.7,-8.2 -40.4,0 -2.6,11.6 -44.9,33.3 -41.4,96.8 1.8,34.8 45.1,47.2 65.9,47.3 z" class="skin" id="XMLID_544_"/>
- <path class="areola" d="m 249.83484,395.7339 a 3.0999447,2.7999501 78.497917 0 1 -2.12558,3.59601 3.0999447,2.7999501 78.497917 0 1 -3.36186,-2.47937 3.0999447,2.7999501 78.497917 0 1 2.12558,-3.59601 3.0999447,2.7999501 78.497917 0 1 3.36186,2.47937 z" id="XMLID_545_" inkscape:connector-curvature="0"/>
- </g>
- <g style="display:none;opacity:1" inkscape:label="Belly_Big" id="Belly_Big" inkscape:groupmode="layer">
- <path id="path4497" class="shadow" d="m 275.9043,440.49257 c 21.7348,-1.57499 50.08454,-4.72496 64.99441,-44.5196 13.75487,-46.51457 -29.18974,-104.57904 -62.89443,-106.57403 -42.10462,6.50994 -64.88941,44.93959 -67.09439,101.74408 2.30998,32.5497 34.75469,51.44953 64.99441,49.34955 z" inkscape:connector-curvature="0"/>
- <path id="path4499" class="skin" d="m 275.9043,440.49257 c 21.8398,0.105 51.86953,-13.64988 64.99441,-44.5196 13.12488,-30.86972 -19.42483,-87.5692 -48.29956,-106.78402 -6.82494,-4.51496 -40.63463,-8.60993 -42.41962,0 -2.72997,12.17989 -47.14457,34.96468 -43.4696,101.63907 1.88998,36.53967 47.35457,49.55955 69.19437,49.66455 z" inkscape:connector-curvature="0"/>
- <path inkscape:connector-curvature="0" id="path4501" d="m 249.69112,400.52353 a 3.2549123,2.9399208 78.497917 0 1 -2.23184,3.77577 3.2549123,2.9399208 78.497917 0 1 -3.52992,-2.60331 3.2549123,2.9399208 78.497917 0 1 2.23184,-3.77578 3.2549123,2.9399208 78.497917 0 1 3.52992,2.60332 z" class="areola"/>
- </g>
- <g inkscape:groupmode="layer" id="Belly_Huge" inkscape:label="Belly_Huge" style="display:none;opacity:1">
- <path inkscape:connector-curvature="0" d="m 277.11003,447.18502 c 22.76994,-1.65 52.46986,-4.94999 68.08982,-46.63988 14.40996,-48.72987 -30.57992,-109.55971 -65.88983,-111.64971 -44.10989,6.81998 -67.97983,47.07987 -70.28982,106.58973 2.42,34.09991 36.40991,53.89986 68.08983,51.69986 z" class="shadow" id="path4521"/>
- <path inkscape:connector-curvature="0" d="m 277.11003,447.18502 c 22.87994,0.11001 54.33986,-14.29996 68.08982,-46.63988 13.74997,-32.33992 -20.34995,-91.73976 -50.59987,-111.8697 -7.14998,-4.72999 -42.56989,-9.01999 -44.43989,0 -2.85999,12.75996 -49.38987,36.6299 -45.53988,106.47972 1.98,38.2799 49.60988,51.91986 72.48982,52.02986 z" class="skin" id="path4523"/>
- <path class="areola" d="m 249.64842,405.31242 a 3.4099304,3.0799371 78.497917 0 1 -2.33813,3.9556 3.4099304,3.0799371 78.497917 0 1 -3.69804,-2.7273 3.4099304,3.0799371 78.497917 0 1 2.33814,-3.9556 3.4099304,3.0799371 78.497917 0 1 3.69803,2.7273 z" id="path4525" inkscape:connector-curvature="0"/>
- </g>
- <g inkscape:groupmode="layer" id="Belly_Giant" inkscape:label="Belly_Giant" style="display:none;opacity:1">
- <path inkscape:connector-curvature="0" d="m 278.20636,453.8775 c 23.80214,-1.7248 54.8484,-5.17438 71.17644,-48.75414 15.06319,-50.93887 -31.96616,-114.52623 -68.87672,-116.71097 -46.10946,7.12914 -71.06146,49.21408 -73.47617,111.42161 2.52971,35.64571 38.06043,56.34323 71.17645,54.0435 z" class="shadow" id="path4513"/>
- <path inkscape:connector-curvature="0" d="m 278.20636,453.8775 c 23.91712,0.11499 56.80317,-14.9482 71.17644,-48.75414 14.37328,-33.80594 -21.27245,-95.89847 -52.89364,-116.94093 -7.4741,-4.94441 -44.49965,-9.42888 -46.45442,0 -2.98964,13.33839 -51.62879,38.29039 -47.60428,111.30661 2.06976,40.01519 51.85878,54.27347 75.7759,54.38846 z" class="skin" id="path4515"/>
- <path class="areola" d="m 249.49987,410.10675 a 3.5645079,3.2195555 78.497917 0 1 -2.44412,4.13491 3.5645079,3.2195555 78.497917 0 1 -3.86568,-2.85093 3.5645079,3.2195555 78.497917 0 1 2.44414,-4.13492 3.5645079,3.2195555 78.497917 0 1 3.86566,2.85094 z" id="path4517" inkscape:connector-curvature="0"/>
- </g>
- <g style="display:none;opacity:1" inkscape:label="Belly_Massive" id="Belly_Massive" inkscape:groupmode="layer">
- <path id="path4519" class="shadow" d="m 279.50211,460.16997 c 24.8341,-1.7996 57.22648,-5.3987 74.2625,-50.86801 15.71625,-53.14745 -33.35217,-119.49179 -71.8631,-121.77123 -48.10863,7.43821 -74.14254,51.34785 -76.662,116.25257 2.63942,37.19118 39.71074,58.78617 74.2626,56.38667 z" inkscape:connector-curvature="0"/>
- <path id="path4527" class="skin" d="m 279.50211,460.16997 c 24.95406,0.11975 59.266,-15.59629 74.2625,-50.86801 14.99639,-35.27162 -22.19479,-100.05638 -55.18707,-122.01125 -7.7981,-5.15878 -46.429,-9.83761 -48.46851,0 -3.11926,13.91675 -53.86731,39.95066 -49.66832,116.13271 2.15948,41.75016 54.10723,56.62659 79.0614,56.74655 z" inkscape:connector-curvature="0"/>
- <path inkscape:connector-curvature="0" id="path4529" d="m 249.55094,414.50143 a 3.7190572,3.3591484 78.497917 0 1 -2.55011,4.31419 3.7190572,3.3591484 78.497917 0 1 -4.03327,-2.97454 3.7190572,3.3591484 78.497917 0 1 2.55011,-4.31418 3.7190572,3.3591484 78.497917 0 1 4.03327,2.97453 z" class="areola"/>
+ <g inkscape:groupmode="layer" id="Belly" inkscape:label="Belly" style="display:inline;opacity:1">
+ <g id="g7940">
+ <path id="XMLID_543_" class="shadow" d="m 274.8,433.8 c 20.7,-1.5 47.7,-4.5 61.9,-42.4 13.1,-44.3 -27.8,-99.6 -59.9,-101.5 -40.1,6.2 -61.8,42.8 -63.9,96.9 2.2,31 33.1,49 61.9,47 z" inkscape:connector-curvature="0"/>
+ <path id="XMLID_544_" class="skin" d="m 274.8,433.8 c 20.8,0.1 49.4,-13 61.9,-42.4 12.5,-29.4 -18.5,-83.4 -46,-101.7 -6.5,-4.3 -38.7,-8.2 -40.4,0 -2.6,11.6 -44.9,33.3 -41.4,96.8 1.8,34.8 45.1,47.2 65.9,47.3 z" inkscape:connector-curvature="0"/>
+ <path inkscape:connector-curvature="0" id="XMLID_545_" d="m 249.83484,395.7339 a 3.0999447,2.7999501 78.497917 0 1 -2.12558,3.59601 3.0999447,2.7999501 78.497917 0 1 -3.36186,-2.47937 3.0999447,2.7999501 78.497917 0 1 2.12558,-3.59601 3.0999447,2.7999501 78.497917 0 1 3.36186,2.47937 z" class="areola"/>
+ </g>
</g>
<g inkscape:groupmode="layer" id="Belly_Piercing" inkscape:label="Belly_Piercing" style="display:none">
<circle id="XMLID_547_" class="steel_piercing" cx="246.89999" cy="390.89999" r="1.2"/>
diff --git a/src/art/vector/Belly.tw b/src/art/vector/Belly.tw
index c17a61cd7b5..4fdfac6f84a 100644
--- a/src/art/vector/Belly.tw
+++ b/src/art/vector/Belly.tw
@@ -1,52 +1,64 @@
:: Art_Vector_Belly_ [nobr]
-<<set _showNavelPiercings = $showBodyMods == 1 && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a latex catsuit">>
-
-<<if _artSlave.belly > 0>>
- <<if _artSlave.belly >= 100000>>
- <<include Art_Vector_Belly_Massive>>
- <<elseif _artSlave.belly >= 75000>>
- <<include Art_Vector_Belly_Giant>>
- <<elseif _artSlave.belly >= 50000>>
- <<include Art_Vector_Belly_Huge>>
- <<elseif _artSlave.belly >= 30000>>
- <<include Art_Vector_Belly_Big>>
- <<elseif _artSlave.belly >= 10000>>
- <<include Art_Vector_Belly>>
- <<elseif _artSlave.belly >= 1500>>
- <<include Art_Vector_Belly_Small>>
+<<set _art_have_belly = true>>
+<<set _art_belly_scale_factor = 0.300*Math.log(0.011*_artSlave.belly) >>
+/* TODO: add check in penis control. do not draw penis atop belly if _art_belly_scale_factor > 1. */
+<<set _art_scale_factor = _art_belly_scale_factor >>
+<<set _art_translation_x = -262*(_art_scale_factor-1) >>
+<<set _art_translation_y = -284*(_art_scale_factor-1) >>
+<<set _art_belly_transform = "matrix(" + _art_scale_factor +",0,0," + _art_scale_factor + "," + _art_translation_x + "," + _art_translation_y + ")">>
+<<set _art_transform = _art_belly_transform>>
+<<if _artSlave.belly >= 1000>>
+ <<include Art_Vector_Belly>>
<</if>>
-
- /* shiny clothings */
- <<if $seeVectorArtHighlights == 1>>
- <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">>
- <<include Art_Vector_Belly_Outfit_Shine>>
- <</if>>
+/* SNIPPED UNTIL SCALING WORKS */
+/*
+ <<set _showNavelPiercings = $showBodyMods == 1 && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a latex catsuit">>
+
+ <<if _artSlave.belly > 0>>
+ <<if _artSlave.belly >= 100000>>
+ <<include Art_Vector_Belly_Massive>>
+ <<elseif _artSlave.belly >= 75000>>
+ <<include Art_Vector_Belly_Giant>>
+ <<elseif _artSlave.belly >= 50000>>
+ <<include Art_Vector_Belly_Huge>>
+ <<elseif _artSlave.belly >= 30000>>
+ <<include Art_Vector_Belly_Big>>
+ <<elseif _artSlave.belly >= 10000>>
+ <<include Art_Vector_Belly>>
+ <<elseif _artSlave.belly >= 1500>>
+ <<include Art_Vector_Belly_Small>>
<</if>>
-
- /* belly piercings */
- <<if _showNavelPiercings >>
- <<if _artSlave.navelPiercing >= 1>>
- <<include Art_Vector_Belly_Piercing>>
+
+ shiny clothings
+ <<if $seeVectorArtHighlights == 1>>
+ <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">>
+ <<include Art_Vector_Belly_Outfit_Shine>>
+ <</if>>
<</if>>
- <<if _artSlave.navelPiercing == 2>>
- <<include Art_Vector_Belly_Piercing_Heavy>>
+
+ belly piercings
+ <<if _showNavelPiercings >>
+ <<if _artSlave.navelPiercing >= 1>>
+ <<include Art_Vector_Belly_Piercing>>
+ <</if>>
+ <<if _artSlave.navelPiercing == 2>>
+ <<include Art_Vector_Belly_Piercing_Heavy>>
+ <</if>>
<</if>>
- <</if>>
-<<else>>
-
- /* flat midriff piercings */
- <<if _showNavelPiercings >>
- <<if _artSlave.navelPiercing >= 1>>
- <<include Art_Vector_Navel_Piercing>>
- <</if>>
- <<if _artSlave.navelPiercing == 2>>
- <<include Art_Vector_Navel_Piercing_Heavy>>
+ <<else>>
+ flat midriff piercings
+ <<if _showNavelPiercings >>
+ <<if _artSlave.navelPiercing >= 1>>
+ <<include Art_Vector_Navel_Piercing>>
+ <</if>>
+ <<if _artSlave.navelPiercing == 2>>
+ <<include Art_Vector_Navel_Piercing_Heavy>>
+ <</if>>
<</if>>
<</if>>
-<</if>>
-
+*/
/* Torso Accessories */
@@ -79,4 +91,4 @@
<</if>>
<<if _artSlave.bellyAccessory == "a huge empathy belly">>
<<include Art_Vector_Hugebelly>>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/art/vector/Feet.tw b/src/art/vector/Feet.tw
index 1b99d3f4185..c1e62de1c6f 100644
--- a/src/art/vector/Feet.tw
+++ b/src/art/vector/Feet.tw
@@ -102,7 +102,6 @@
<</if>>
<</if>>
<</if>>
-<<<<<<< HEAD
/* shiny clothings */
<<if $seeVectorArtHighlights == 1>>
@@ -533,5 +532,4 @@
<</if>>
<</if>>
*/
-=======
->>>>>>> pregmod-master
+
diff --git a/src/art/vector/Head.tw b/src/art/vector/Head.tw
index 599d4b22594..cc97daeffb3 100644
--- a/src/art/vector/Head.tw
+++ b/src/art/vector/Head.tw
@@ -57,11 +57,7 @@
<<include Art_Vector_Head_Outfit_Military>>
<</if>>
<<if _artSlave.clothes == "a cybersuit">>
-<<<<<<< HEAD
<<include Art_Vector_Head_Outfit_Cybersuit>>
-=======
- <<include Art_Vector_Head_Outfit_Cybersuit>>
->>>>>>> pregmod-master
<</if>>
<<if _artSlave.clothes == "a schutzstaffel uniform">>
<<include Art_Vector_Head_Outfit_Schutzstaffel>>
diff --git a/src/art/vector/layers/Belly.tw b/src/art/vector/layers/Belly.tw
index 08b57466baf..88f2edfa7f5 100644
--- a/src/art/vector/layers/Belly.tw
+++ b/src/art/vector/layers/Belly.tw
@@ -1,3 +1,3 @@
:: Art_Vector_Belly [nobr]
-<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_art_transform+'"id="g5427" class="scaler_" transform="matrix(0.9,0,0,0.9,28.325904,35.760934)"><path d="m 275.9043,440.49257 c 21.7348,-1.57499 50.08454,-4.72496 64.99441,-44.5196 13.75487,-46.51457 -29.18974,-104.57904 -62.89443,-106.57403 -42.10462,6.50994 -64.88941,44.93959 -67.09439,101.74408 2.30998,32.5497 34.75469,51.44953 64.99441,49.34955 z" class="shadow" id="path4497"/><path d="m 275.9043,440.49257 c 21.8398,0.105 51.86953,-13.64988 64.99441,-44.5196 13.12488,-30.86972 -19.42483,-87.5692 -48.29956,-106.78402 -6.82494,-4.51496 -40.63463,-8.60993 -42.41962,0 -2.72997,12.17989 -47.14457,34.96468 -43.4696,101.63907 1.88998,36.53967 47.35457,49.55955 69.19437,49.66455 z" class="skin" id="path4499"/><path class="areola" d="m 249.69112,400.52353 a 3.2549123,2.9399208 78.497917 0 1 -2.23184,3.77577 3.2549123,2.9399208 78.497917 0 1 -3.52992,-2.60331 3.2549123,2.9399208 78.497917 0 1 2.23184,-3.77578 3.2549123,2.9399208 78.497917 0 1 3.52992,2.60332 z" id="path4501"/></g></svg></html>' >>
\ No newline at end of file
+<<print '<html><svg viewBox="0 0 560 1000" class="'+_art_display_class+'"><g transform="'+_art_transform+'"id="g7940"><path id="XMLID_543_" class="shadow" d="m 274.8,433.8 c 20.7,-1.5 47.7,-4.5 61.9,-42.4 13.1,-44.3 -27.8,-99.6 -59.9,-101.5 -40.1,6.2 -61.8,42.8 -63.9,96.9 2.2,31 33.1,49 61.9,47 z"/><path id="XMLID_544_" class="skin" d="m 274.8,433.8 c 20.8,0.1 49.4,-13 61.9,-42.4 12.5,-29.4 -18.5,-83.4 -46,-101.7 -6.5,-4.3 -38.7,-8.2 -40.4,0 -2.6,11.6 -44.9,33.3 -41.4,96.8 1.8,34.8 45.1,47.2 65.9,47.3 z"/><path id="XMLID_545_" d="m 249.83484,395.7339 a 3.0999447,2.7999501 78.497917 0 1 -2.12558,3.59601 3.0999447,2.7999501 78.497917 0 1 -3.36186,-2.47937 3.0999447,2.7999501 78.497917 0 1 2.12558,-3.59601 3.0999447,2.7999501 78.497917 0 1 3.36186,2.47937 z" class="areola"/></g></svg></html>' >>
\ No newline at end of file
--
GitLab