Add possibility for global offset / scaling
This commit is contained in:
parent
7179e44814
commit
c7830c3f17
|
|
@ -80,6 +80,14 @@ If you wish to run a custom generation process, this generator can output a JSON
|
||||||
|
|
||||||
You are now ready to integrate Melpomene in your website!
|
You are now ready to integrate Melpomene in your website!
|
||||||
|
|
||||||
|
## Advanced usage
|
||||||
|
|
||||||
|
If you need to do some global scaling / offset of all zooms in HTML (if for example you reuse zooms data for multiple resolutions), you can add the following attributes to the `<div id="reader-pages" ...>` tag :
|
||||||
|
|
||||||
|
+ `data-global-zoom-offset="<x offset float value>,<y offset float value>"` : offset all positions by the provided x / y values
|
||||||
|
+ If they become negative, they get clamped to 0 and width / height get reduced to compensate
|
||||||
|
+ If they become greater than the page size, they get clamped to the page size and width / height get reduced to compensate
|
||||||
|
+ `data-global-zoom-scale="<float value>"` : scale all positions / sizes by this factor
|
||||||
|
|
||||||
# Credits
|
# Credits
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,69 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<link rel="stylesheet" href="demo.css">
|
||||||
|
|
||||||
|
<!-- melpomene_head.html import -->
|
||||||
|
<link rel="stylesheet" href="../melpomene.css">
|
||||||
|
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<!-- Melpomene comic reader -->
|
||||||
|
<!-- CC-BY-NC-SA https://git.aribaud.net/caribaud/melpomene/ -->
|
||||||
|
<div id="reader-frame">
|
||||||
|
<div id="reader-content-frame">
|
||||||
|
<div id="reader-pages" class="animated" data-global-zoom-scale="0.4836759371221282" data-global-zoom-offset="0,-70" hidden>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P01.jpg" data-zooms="2481.0,1327.1057,0.0,0.0;593.15338,1076.4635,0.0,1364.053;890.72864,491.29874,830.81415,1751.5;2481.0,1078.4192,0.0,1364.053;562.77032,909.44702,102.48115,2491.6567;920.74463,909.44702,698.55927,2491.6567;728.776,909.44702,1652.3695,2491.6567"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P02.jpg" data-zooms="1459.9161,960.62878,99.857468,103.85177;788.87384,960.62878,1593.7252,103.85177;455.35007,305.56384,389.44412,1376.0359;2282.7415,760.914,99.857475,1114.4093;1069.9728,496.29166,101.85461,1928.2478;1209.7733,496.29166,1172.3267,1928.2478;788.87402,926.67731,101.85462,2474.468;415.40707,926.67731,924.68018,2474.468;1008.5604,926.67731,1372.0416,2474.468"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P03.jpg" data-zooms="2278.4634,1424.0264,103.9937,103.9937;457.3472,589.15906,816.83411,469.33011;618.69055,832.04285,104.47829,1578.7172;1170.7311,832.04285,756.71887,1578.7172;418.14838,832.04285,1962.6545,1578.7172;2280.6614,940.57422,100.82664,2461.1147"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P04.jpg" data-zooms="1128.3893,547.21899,100.85604,101.85461;1125.3937,505.27878,101.85462,700.99945;659.59674,1104.1381,1237.9126,100.46677;474.09705,1104.7645,1908.0801,103.04887;991.58466,641.08496,365.47833,1256.2069;2276.7502,1268.1899,101.85461,1256.2069;669.66565,827.24689,100.95136,2574.8799;1574.1992,825.24969,806.56573,2576.877"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P05.jpg" data-zooms="2270.7588,1348.0758,107.84606,109.84322;828.80096,1879.4762,104.70337,1519.7256;606.50098,1877.479,975.78717,1521.7228;755.02411,1139.5406,1623.401,1521.7228;757.02124,680.4198,1621.4038,2716.7849"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P06.jpg" data-zooms="2273.6387,1248.3829,104.50265,107.32705;624.19147,440.60574,1259.6805,771.06006;830.37231,940.5238,110.15143,1415.0222;1395.2515,1313.3441,985.71411,1409.3734;1321.8173,796.47961,112.97583,2417.6829;974.4165,754.11365,1403.7247,2646.4587"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P07.jpg" data-zooms="828.81702,497.29019,443.36716,531.2417;2275.0127,1188.0789,105.30553,109.78442;2275.0127,804.28339,105.30553,1356.3481;847.87823,1182.9146,105.30553,2210.6436;497.6918,1185.7389,994.37964,2213.468;854.35431,1185.7389,1528.7885,2213.468"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P08.jpg" data-zooms="2272.7561,1228.2468,101.85461,107.84607;497.29019,756.91962,994.58044,569.18756;2276.7502,1052.4977,101.85461,1336.0929;2278.7473,958.63165,101.85462,2444.5107"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P09.jpg" data-zooms="1131.1705,453.31552,101.67825,103.09045;1148.1168,453.31552,1232.8488,103.09045;1481.6407,453.31552,501.89209,103.09045;2282.1118,855.79193,98.853851,604.42072;1776.5449,881.21149,290.91275,1355.71;703.27454,398.23981,762.58685,2863.9373;2270.8142,1132.5826,107.32704,2270.8142"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P10.jpg" data-zooms="2278.7473,1240.2297,101.85461,101.85461;667.04791,1016.549,99.857468,1390.016;1583.7395,1014.5519,798.85974,1390.016;2280.7446,944.65161,99.857468,2456.4937"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P11.jpg" data-zooms="830.81415,1194.2953,97.860321,101.85461;774.89398,1198.2897,960.62885,99.857468;609.13055,1192.2982,1769.4744,101.85461;363.4812,868.75995,99.857468,1348.0758;1495.8649,870.75714,493.2959,1346.0787;357.48975,870.75714,2023.1123,1348.0758;529.24457,499.28735,103.85177,2280.7446;531.24176,687.01941,99.857468,2716.123;1022.5405,1120.4008,669.04504,2280.7446;657.06213,1120.4008,1725.5371,2280.7446"/>
|
||||||
|
<img loading="lazy" width="1200" height="1660" src="https://www.peppercarrot.com/0_sources/ep35_The-Reflection/low-res/en_Pepper-and-Carrot_by-David-Revoy_E35P12.jpg" data-zooms="704.99371,341.51254,619.11633,281.59805;393.43842,551.21326,1459.9161,159.77196;2280.7446,691.01367,99.857468,101.85461;718.97375,1198.2897,99.857468,840.79987;712.9823,1196.2925,850.78564,842.79706;780.88538,1192.2982,1599.7167,842.79706;2366.6221,1445.9362,61.911629,2049.0752;922.68298,551.21326,984.59467,2378.605;631.09918,211.69783,1851.3574,3289.3049"/>
|
||||||
|
</div>
|
||||||
|
<div id="focus-overlay" class="flex-col fill">
|
||||||
|
<div class="grow obscured animated"></div>
|
||||||
|
<div id="focus-overlay-height" class="flex animated" style="height:100%">
|
||||||
|
<div class="grow obscured animated"></div>
|
||||||
|
<div id="focus-overlay-width" class="focus animated" style="width:100%"></div>
|
||||||
|
<div class="grow obscured animated"></div>
|
||||||
|
</div>
|
||||||
|
<div class="grow obscured animated"></div>
|
||||||
|
</div>
|
||||||
|
<div id="nav-controls" class="fill">
|
||||||
|
<div class="left" id="nav-left" onclick="moveReader(false,false)"></div>
|
||||||
|
<div class="right" id="nav-right" onclick="moveReader(true,false)"></div>
|
||||||
|
</div>
|
||||||
|
<div id="help-menu">
|
||||||
|
<div id="help-controls" style="opacity:1; transform: translate(0,0);">
|
||||||
|
<div><div class="key">←</div>/ scroll up / clic : previous</div>
|
||||||
|
<div><div class="key">→</div>/ scroll down / clic : next</div>
|
||||||
|
<div>-----------------------</div>
|
||||||
|
<div><div class="key">F</div>: Toggle fullscreen</div>
|
||||||
|
<div><div class="key">P</div>: Toggle progress bar</div>
|
||||||
|
<div><div class="key">V</div>: Toggle panel / page viewing mode</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="reader-progress-container">
|
||||||
|
<div id="reader-progress-bar"></div>
|
||||||
|
<div id="reader-progress-pages"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- End of Melpomene comic reader -->
|
||||||
|
|
||||||
|
|
||||||
|
</body>
|
||||||
|
|
||||||
|
<!-- melpomene_js.html import -->
|
||||||
|
<script src="../melpomene.js"></script>
|
||||||
|
|
||||||
|
</html>
|
||||||
70
melpomene.js
70
melpomene.js
|
|
@ -61,6 +61,33 @@ MOUSEWHELL_WAIT = false
|
||||||
// Zooms utilites
|
// Zooms utilites
|
||||||
// --------------
|
// --------------
|
||||||
|
|
||||||
|
function globalZoomScale(){
|
||||||
|
|
||||||
|
if (READER_PAGES.dataset.globalZoomScale != undefined){
|
||||||
|
return parseFloat(READER_PAGES.dataset.globalZoomScale)
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1.0
|
||||||
|
}
|
||||||
|
|
||||||
|
function globalZoomOffsetX(){
|
||||||
|
|
||||||
|
if (READER_PAGES.dataset.globalZoomOffset != undefined){
|
||||||
|
return parseFloat(READER_PAGES.dataset.globalZoomOffset.split(',')[0])
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0.0
|
||||||
|
}
|
||||||
|
|
||||||
|
function globalZoomOffsetY(){
|
||||||
|
|
||||||
|
if (READER_PAGES.dataset.globalZoomOffset != undefined){
|
||||||
|
return parseFloat(READER_PAGES.dataset.globalZoomOffset.split(',')[1])
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0.0
|
||||||
|
}
|
||||||
|
|
||||||
function loadZoomsFromImgTagsIfRequired(){
|
function loadZoomsFromImgTagsIfRequired(){
|
||||||
|
|
||||||
// Zooms may be defined by another JS file
|
// Zooms may be defined by another JS file
|
||||||
|
|
@ -236,6 +263,40 @@ function initReader(){
|
||||||
|
|
||||||
function moveReaderDisplayToArea(pageNumber, width, height, posx, posy){
|
function moveReaderDisplayToArea(pageNumber, width, height, posx, posy){
|
||||||
|
|
||||||
|
// Keep original values for registering
|
||||||
|
o_width = width
|
||||||
|
o_height = height
|
||||||
|
o_posx = posx
|
||||||
|
o_posy = posy
|
||||||
|
|
||||||
|
// Apply global offsets before scales if we are displaying a zoom
|
||||||
|
// Pages display uses width & height = 0
|
||||||
|
if (width != 0 || height != 0){
|
||||||
|
width = width * globalZoomScale()
|
||||||
|
height = height * globalZoomScale()
|
||||||
|
posx = (posx + globalZoomOffsetX()) * globalZoomScale()
|
||||||
|
posy = (posy + globalZoomOffsetY()) * globalZoomScale()
|
||||||
|
}
|
||||||
|
|
||||||
|
// reduce width if offset sent us outside of page
|
||||||
|
if (posx < 0) {
|
||||||
|
width = width + posx
|
||||||
|
posx = 0
|
||||||
|
}
|
||||||
|
if ((posx + width) > pageOriginalWidth(pageNumber)) {
|
||||||
|
width = pageOriginalWidth(pageNumber) - posx
|
||||||
|
}
|
||||||
|
|
||||||
|
// reduce height if offset sent us outside of page
|
||||||
|
if (posy < 0) {
|
||||||
|
height = height + posy
|
||||||
|
posy = 0
|
||||||
|
}
|
||||||
|
if ((posy + height) > pageOriginalHeight(pageNumber)) {
|
||||||
|
height = pageOriginalHeight(pageNumber) - posy
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Align the top-left corner of the frame with the page
|
// Align the top-left corner of the frame with the page
|
||||||
READER_PAGES.style.transform = "translate(-" + previousPagesWidth(pageNumber) + "px, -" + pageVerticalOffset(pageNumber) + "px )"
|
READER_PAGES.style.transform = "translate(-" + previousPagesWidth(pageNumber) + "px, -" + pageVerticalOffset(pageNumber) + "px )"
|
||||||
|
|
||||||
|
|
@ -279,11 +340,12 @@ function moveReaderDisplayToArea(pageNumber, width, height, posx, posy){
|
||||||
updateFocusByHeight(scaledHeight)
|
updateFocusByHeight(scaledHeight)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Use values before global offset / scale
|
||||||
CURRENT_PAGE = pageNumber
|
CURRENT_PAGE = pageNumber
|
||||||
CURRENT_WIDTH = width
|
CURRENT_WIDTH = o_width
|
||||||
CURRENT_HEIGHT = height
|
CURRENT_HEIGHT = o_height
|
||||||
CURRENT_X = posx
|
CURRENT_X = o_posx
|
||||||
CURRENT_Y = posy
|
CURRENT_Y = o_posy
|
||||||
}
|
}
|
||||||
|
|
||||||
function refreshReaderDisplay() {
|
function refreshReaderDisplay() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue