From 9fab6fabdc4efbaa1dbd7b59b03a54029869b070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20T=C3=B6nsing?= Date: Thu, 21 Feb 2019 20:02:03 +0100 Subject: [PATCH] Fixed css problems --- .DS_Store | Bin 12292 -> 12292 bytes COPY/.DS_Store | Bin 8196 -> 8196 bytes .../.DS_Store | Bin 8196 -> 8196 bytes .../docs/signs.rst | 4 +-- .../overviewer_core/.DS_Store | Bin 8196 -> 6148 bytes .../overviewer_core/data/.DS_Store | Bin 8196 -> 0 bytes .../overviewer_core/data/js_src/util.js | 13 ++++++--- .../data/web_assets/overviewer.css | 25 +++++++++++++----- .../overviewer_core/src/Draw.c | 23 ++++++---------- .../overviewer_core/src/overviewer.h | 7 +---- 10 files changed, 39 insertions(+), 33 deletions(-) delete mode 100644 COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/.DS_Store diff --git a/.DS_Store b/.DS_Store index 3f1a50072c579cebcbff5b7ec0c435e43966ca6d..567434dda1b2e71ae31e0192bf7fac762d8c2c4d 100644 GIT binary patch delta 464 zcmZokXi3pI5C-eMM;Jp^hQS(t8e za!#%lm6-gGRci8Y!8w~RNjNexb8$;d_Gj7aC&0(gD<&=>5mB0ySy-A`QYoO!!EuF` zk6(aGMnaBLU@J#VN@7W>Z+=Qo!^={OiZk=`AcB@$)*OP2I-C*7`MJ5Nc_qaVVLJ&2 z4uKOKaUk=35{pax3sUodR)AbOIagEz=nn(d#|%#yo=rAp3ua!$xO#FYo7Uti87-iH z{h2m@mNQ|ToUGQ#hY>)gz#x{GY{?=#`HAo@P(UpZ0R|K_*f%ecsbypZ29^K=IJE5K dwr*Bb<7S+EN#HX$3^%iAd}W#ZO4b~oA^@z@hsXc` delta 1707 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 literal 8196 zcmeHMO;8*~6n>AtOjkl^Vi;f{x+NkIA@Um_k+}Q>LktoF1VUn9c4r7v4l}qjyZlMS z=+UG~%fIrVrgAeWPv)QpFP1-5R;guC6=Uheg9k5OJy`1N=~)yAH!7sc>8PuYy>Ax)uq&lE0F(fLLYI(yCslVSLNBfjB`fI3C5hw@kbop;FbN*iZLkhILIgqt zLIgqtLIgqt?ga$s%oau2bx`G}03>s$+b`6n zJizyf1~L}NWhs4E8dGKu7`S4PVxV*o}j0JL8O6d+L-2sEh7-T5uM<>6iZw?rf zGOR-cLIgGnIeYqhP# zPn*W2AV`(_@NATa3Turn@En zS@RkEe^|wz?Noc8IMz4LdCE0T8J6amX`@H;40oItxb!0W5{`W`X`~7Ck%VKVrft#` zCNwLNB4eY|vIfls!yWaEIZw34Tqo&u`-Y3FkF=T7gMq%~> zV=H`jLB3k7mMXkL8BN8_=TfFO?~hehuCjAF&9L9m#b`ResW4v?EmzgELerfzsMZz5 z?|!IKWkW8_mTQ4w&3?v)o+UuZgV>sf+-GY9%Wxk) zOpL9;{aA}Fco5r&wSu!pu@{fw(|8JpaG01oLCj5{j+5x%3?|Vf24BP%@I}0YFXLsr zg0BWleiyH;<8EJuwNm1Zt>KteCYyx8*KdMlBKf|Iy8V|KFCmg+W6E zLImy(0+`b?*waO^Hrty-t{tUof-X^n-LjOv3srtPPSQ`uNv{53NbM+@3ZGaYm!+g0 eDtG;dfUW;p8=n8+`A>=OzkhyjNQv*k^Zy@{P;qx%6HgRCy@?$!t=4h1!${ zcrg)QMtwQYr58$L^6UZqQ1nv_Vgq`Ve zRX63ds>w5~cUpBP;(oiA7Piz@EQ-8j~J7;&(79VMVjj7sv@(s_4U+lXgoAGCkiDMwMRO~CeP2zUYL9QGA)$~`mZ0_ z;L7qUbvM}ba?mz#HJx-D$0u}o5ub0C@R9PA&J$8sOfE{(w!5cX!?v7$J?W5)$psEU z)tRuZ(@CA#2NJfKnzWplT$oVJM9NfMy~Q+pj2Yb-boFVMwT2x#>9%=}F_ zhBZD+NL#M)sG%pt!mJsw*HS0-h3zG!va&B<;uH>K3ICK> zSEd{jgdt{W(KKBX%A=K>FCGG7d9=o-j{piBpgZn3jL;F8f{XARJP$9xYw!+SgZJPg zxB)leGx!{C!FTW@{0zUsZ}2<(0e_)@BIaQ}D!3cVaSzsD6CTE9Jc6xw61(tW?8aU^ zi=#M(Dvsk6o1;XuH+`MK-qDZ6z(Io>C>yv#Uk_NT*fPbaYiYNgu^l;6z}e-pl*mb&%1l~ zg(W$Q7%h6v2M$VMIfuy0t@qVSlAKNK=GMk0vTh+BbL)|#WCeEqxLK?SOZ4vh$DF(Z zSK&H*N^HCZU%?OX6Z`^y5)X5*085C4J28yA@Lt@D`>_hE@qTP1K0ZKSjzJMj`e^4-vmemTMQ7`ya-@+drx~S?SJvI zUkwGzwIlS5(ZdS!o9EICp^CXMy_b%YT>6J0wIjYQ>dSd9$wK8{{~>_=5gXk9!TrC< H@BhC6j2KS@ literal 8196 zcmeHMO;8*~6n<}kFf$3EiOB#9##O`+0tpZz5J_BENP;m2UH+0_mff8(OgTG4c4l`2 zND3<+<6rq-mQ@#7p+M@mQ{`2*y^038Zcv#YFwfdGL3 zfdGL3fdGL3f&T*nbY}A+t#R%PZO{e?1PI)b2=MnqgesR&U(O5Zy*jAzQUH?0H0%}X zQy$>?M0^?b<-CxdE6pjg2lQRhPccxqlRm=DNk)A+FQjk>6z+h2Wb`u>^rDkr#4`ts z3K_Hk0s#W65#YIdIoOoB^PK(0{5=6_8qb2BDmYUq(@v4)wbYbpIBrYJ_ZTWFF4<5j z$@D3co{Uf0g}9q^b53tEdx~ETCf&)D-ygDVbE%(9jTm|%!M4V1%S{@Vp7op!O(&D_ zQNz;gLa&{(G{>7KE)+bDoM4r+v&}6{k*>D6rpRn-dpq?zI`_@Z$x>x~>w$rZ%=FCc zGjr$P6dOhVWkEY!Uf!b1b#|>eX){IZ=2NU=YC8Ft04OxQ2+;K72hHW_`de$MCVC4>BHITNg!K}{pqiNgBWh^JbD$+?aoimfJ-ea0^V@7wzT>YHO zdnX+`>&8681Y;TB%k`tWFxsrHr#V z!=3i#s;O0#ag9PAvo$`O#;!`Tr-{_6>M5>?Wp!#bN%Ds8uUC~Jhp#N@8}4jWl%c2T zo->C+@dfVQqo~7XGNqeLlZD&fc10b{3&hw_f3UMlQODADCPQ0sDzM2PK5$S~PxHu+ zCLQe9!;ZF)kPZwFT5qlb|5K%!DE3pdi#RsqfcVZ*% z#ZKIh4`Da<<54_@kKu6~!wF1b8a2#d9;a~zXYo0F1z*G0@eO zmSrNi(A9?jjhEmud_qk84z3gbeudwOfqxSFO0mLYUk%pccHBV>Y{XsIj1OW5b`c9>*hefp zjDz?%#&HNoFyS*%M+6RbC}t>PNQMh-EHq(X%+A3f2r?K5 n1h|2OD-gGDEd0(qnP0|`kzuk8k2DVx#4#ZEF>H?KnZpbKHa#H% literal 8196 zcmeHMS!^6d5UsKuXIimIJLK?eaJ2oe&?UkLdEL4E*h4*~IJSiNfQU@5 zx~r$FYPzfHP50C+0AOdqOajybfJRkNzKEJRir|ZSLn#YKs)!=#1DpmM9I(L87H^P_ z1|knc9*8^;c_8vYhc`IMGx{rxaD{fJz-OoEgIm1?B9d z7nkCIDMh0;@<8N)8$BR$cLoL&;4BQx%-{Wytm9>g`%!kpvHhU2@oOwAuUJsIP-FC~ z)*i?VdBsd%1O>m-$R8J1hm2q-8}@rV&zbHU*tyq)X)_rPtY<%LO z$%kK1)?v6qz~Wifo}b%PXE2$`dBY=0I|tECgM$vZ8AjnHnmWQHn;wx5KS9s`Z*^{ zC=z~|9(4TCE)|Ee=S#r+W*V4mk>0&`-~Iv43%+&Oa*V(pwbDjl`2&2hPYCVKdG4XS zHA-mg%Xv;=*dYUfYFXXtwRbl*-?t-uwfeTjyk-ew#|X)8V4t?F{E?z<217>;KWDk7?GE;h z+PUDO)q?I4=Ofiee zU)PxAG}P<*alz@zThyAGCWqIp*IAEGR&XN}Ol)MV=RtY|xlcqp! z1-HXAX;lrW^&-9i(hUu%Ms>x-`+yD!*bckk805f(B0K@-;7K?S7vM6y25-R!@Cked zpTie$4ZedP;3xPQeudxQ4_t^#aXGHQTD%iC;yt(tTX7riz!Y}iUOb5R<6+F;3CyC2 z7M?~Ai#UekIDwDiIeZGA#%J(Fyoi_ZRlJOE;G1{_-^KUvQ~VOYRVyqjZ8Hbdb*aVc z)SC&{a33u@ITu`GyLRtM|0i(0R;4g{`_g5r8rE-Y+OoA{I+nAdHxot@I|>{UG$l~T z@cjjeBHnszC99hc%|{4x)>%yehc8sp@z`pOu)-x+^w^r%I*kC$%Osa=h>@hB@p2`+ zi6u1xC|{tsn^_AZ2=fZXZDZ{kA(dAu?sk@9;vwUpuGhrUOyf8o{^mvB%Wx5{!29qq zq3$cV4&TF%@H+xlBA1AZ;YzH-wYU!N!VQ?fW^5tswP8D^aVPG^J%qmu_Fyme;Zee0 zPU3F}&tM({ED#Q-@DW1cWB7Q8!)Nh1dtVn0lon%_+NSke?$hG5CPf-;`$W19KRj85aI8m97 l6P^CUkos{F6*{SqPAN(wRQ~l30nzy{Ust2^|JFYL{{%1*&c^@% diff --git a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/.DS_Store b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/.DS_Store deleted file mode 100644 index 86a1d0b7c96528c9bd794f1b8e5677d842b04ab6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIp6h5adWo`huMSePqg_Q=1xX89b0r}gu%TM`9k!@)UNSWOk=;(B&?9A>` zYR#HRd=aBYW5mS7@P^2fMtSkYpZF7hVlYY!5BlPx(P-k6@!Wf78@sTHPby*V=H7GX zo^$rz^WAUe?wJJu>@Jw?0L=iPQ5BNUq2?Av=taG$)P*ArB$509@{r4x{PC>gWpA>M z1|kF^1R?|?1R?|?1pW^Q(3vfYR^!}P+Ng~Xh!D6V5fIOZI8`B2p)4yYA05=l6o8~i z0c4>*m_$R8C~2aRAf8}|D>&zbHU*~7L~8sQ6jJU1|G*UC$0+qB5!*r4s2Ua8wFxTY_^ zC!-W%9yY?8Cnr0SiFikH^Hd@}+5TWhXCmIYe$&(x)0V7k-`0C#Y~t+X<5N$(qT<5v z*#Psa;=E8Dq~jNR)JuxGmn%VjHytFKqxbIJw||85f^QwN93!xcR@w+Ge}vEXDcatg z=N`;kMT%@N=Q)Kjmo!Z|!^suM*y?hejD6PfhXU(NAbLl9FCX+s!y%h|#n=d6ApHBr z1KV@`!&crW$=Dln7qzTdb$@chLp##f=G`@)H!Wc72%+Kz_DS2y50q>(7#%kJoaLIf zdup&~`*zl``dwqpYO2>5yS8{q^E^GK-&0XlyJ);s8!BY&(*--2kaH|suCrq%t^9yz zidjtlw#KBUb-At|6`G#BMXjl6a=2}^&iZ|df*YY>Vl89+kI{B=pOzpN-rm9V0msN% z4mX){>)gon!J-P4?+XXFY-RdT&Knz}5d9`hgu|&WT|X{n-f#Fp-?-({sy?RaWpvB+ z-I_Kmv|Xl2t7=WHR$DG%XiX*66&I(94hh%}yWj}qz=aY#1LxscxBwU73cLmH!AI~J zd;wp=S8yGEfS=$O_!WMG-{DW3jSF!xF2QEJ7uVtgxDGerHr#eDU@hZNLAK>TsHGZ#FSXZI!0d-wz z@dou~+?Pbz@V#2y@movI)P?_RiQS?lVx9UHfHP48#b4*s1=l0S+d zk~kG&$Ss_~MzQC5Y$QpsrWO(oEx6i-R>8_&QvI ztMDOwO3eEPZorT5GyH*ojmRbIVz?Ara22-UeYge_xB)wff17a&rg10k#y!Nr4EEz; z9K>PbU`}#y6i;Iw11u01%lITQ@fM~BLpG@{t*J$kj|vL$+XtvUF6zvswb$5BJ9da zN*8KmI!;oi<0Pm5Frlw~Dpgv!7EB7lBNMCU(kn1UZ5I{zgP@3iJG4ei|p diff --git a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/js_src/util.js b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/js_src/util.js index 7afe306..3aa19bb 100755 --- a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/js_src/util.js +++ b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/js_src/util.js @@ -267,6 +267,12 @@ overviewer.util = { [], ovconf.marker_groups, {collapsed: false}).addTo(overviewer.map); } + for (var marker_group in ovconf.marker_groups) { + var mg = ovconf.marker_groups[marker_group]; + if (mg.options.default_checked) { + mg.addTo(overviewer.map); + } + } overviewer.util.updateHash(); }); @@ -334,8 +340,8 @@ overviewer.util = { for (var mkidx = 0; mkidx < markers[obj.path].length; mkidx++) { var marker_group = new L.layerGroup(); var marker_entry = markers[obj.path][mkidx]; - var icon = L.icon({iconUrl: marker_entry.icon, - className: "ov-marker"}); + L.Util.setOptions(marker_group, {default_checked: marker_entry.checked}); + var icon = L.divIcon({html: ``}); console.log("marker group:", marker_entry.displayName, marker_entry.groupName); for (var dbidx = 0; dbidx < markersDB[marker_entry.groupName].raw.length; dbidx++) { @@ -343,8 +349,7 @@ overviewer.util = { var latlng = overviewer.util.fromWorldToLatLng(db.x, db.y, db.z, obj); var m_icon; if (db.icon != undefined) { - m_icon = L.icon({iconUrl: db.icon, - className: "ov-marker"}); + m_icon = L.divIcon({html: ``}); } else { m_icon = icon; } diff --git a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/web_assets/overviewer.css b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/web_assets/overviewer.css index 6aefa2d..46cd3f3 100755 --- a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/web_assets/overviewer.css +++ b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/data/web_assets/overviewer.css @@ -56,10 +56,10 @@ body { line-height: 160%; text-align: center; padding: 0px 6px; - + background-image: url('control-bg.png'); background-repeat: repeat-x; - + border: 1px solid #A9BBDF; border-radius: 2px 2px; box-shadow: rgba(0, 0, 0, 0.347656) 2px 2px 3px; @@ -81,11 +81,11 @@ body { .customControl > div.dropDown { font-size: 12px; background-color: white; - + border: 1px solid #A9BBDF; border-radius: 2px 2px; box-shadow: rgba(0, 0, 0, 0.347656) 2px 2px 3px; - + display: none; } @@ -143,7 +143,7 @@ div#searchDropDown { div.searchResultItem { overflow: hidden; - text-overflow: ellipsis; + text-overflow: ellipsis; } div.searchResultItem img { @@ -165,9 +165,22 @@ div.worldcontrol select { font-size: 1.2em; } -.leaflet-control-container .progress.leaflet-control { +.leaflet-container .coordbox, .leaflet-container .progress { + box-shadow: none; + font-size: 11px; background: rgba(255, 255, 255, 0.7); margin: 0; padding: 0 5px; color: #333; } + +.ov-marker { + position:relative; + margin-left:-50%; + margin-top:-50%; +} + +.leaflet-div-icon { + background: 0; + border: 0; +} diff --git a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/src/Draw.c b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/src/Draw.c index fca0518..c31a299 100755 --- a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/src/Draw.c +++ b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/src/Draw.c @@ -64,13 +64,6 @@ #define INK8(ink) (*(UINT8*)ink) #define INK32(ink) (*(INT32*)ink) -/* like (a * b + 127) / 255), but much faster on most platforms */ -#define MULDIV255(a, b, tmp)\ - (tmp = (a) * (b) + 128, ((((tmp) >> 8) + (tmp)) >> 8)) - -#define BLEND(mask, in1, in2, tmp1, tmp2)\ - (MULDIV255(in1, 255 - mask, tmp1) + MULDIV255(in2, mask, tmp2)) - /* -------------------------------------------------------------------- */ /* Primitives */ /* -------------------------------------------------------------------- */ @@ -100,14 +93,14 @@ point32(Imaging im, int x, int y, int ink) static inline void point32rgba(Imaging im, int x, int y, int ink) { - unsigned int tmp1, tmp2; + unsigned int tmp1; if (x >= 0 && x < im->xsize && y >= 0 && y < im->ysize) { UINT8* out = (UINT8*) im->image[y]+x*4; UINT8* in = (UINT8*) &ink; - out[0] = BLEND(in[3], out[0], in[0], tmp1, tmp2); - out[1] = BLEND(in[3], out[1], in[1], tmp1, tmp2); - out[2] = BLEND(in[3], out[2], in[2], tmp1, tmp2); + out[0] = BLEND(in[3], out[0], in[0], tmp1); + out[1] = BLEND(in[3], out[1], in[1], tmp1); + out[2] = BLEND(in[3], out[2], in[2], tmp1); } } @@ -159,7 +152,7 @@ static inline void hline32rgba(Imaging im, int x0, int y0, int x1, int ink) { int tmp; - unsigned int tmp1, tmp2; + unsigned int tmp1; if (y0 >= 0 && y0 < im->ysize) { if (x0 > x1) @@ -176,9 +169,9 @@ hline32rgba(Imaging im, int x0, int y0, int x1, int ink) UINT8* out = (UINT8*) im->image[y0]+x0*4; UINT8* in = (UINT8*) &ink; while (x0 <= x1) { - out[0] = BLEND(in[3], out[0], in[0], tmp1, tmp2); - out[1] = BLEND(in[3], out[1], in[1], tmp1, tmp2); - out[2] = BLEND(in[3], out[2], in[2], tmp1, tmp2); + out[0] = BLEND(in[3], out[0], in[0], tmp1); + out[1] = BLEND(in[3], out[1], in[1], tmp1); + out[2] = BLEND(in[3], out[2], in[2], tmp1); x0++; out += 4; } } diff --git a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/src/overviewer.h b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/src/overviewer.h index 83734a2..c5fd035 100755 --- a/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/src/overviewer.h +++ b/COPY/Minecraft-Overviewer-minecraft113-fixed/overviewer_core/src/overviewer.h @@ -33,7 +33,7 @@ // increment this value if you've made a change to the c extesion // and want to force users to rebuild -#define OVERVIEWER_EXTENSION_VERSION 54 +#define OVERVIEWER_EXTENSION_VERSION 55 /* Python PIL, and numpy headers */ #include @@ -42,11 +42,6 @@ /* Fix Pillow on mingw-w64 which includes windows.h in Imaging.h */ #undef TRANSPARENT -/* like (a * b + 127) / 255), but much faster on most platforms - from PIL's _imaging.c */ -#define MULDIV255(a, b, tmp) \ - (tmp = (a) * (b) + 128, ((((tmp) >> 8) + (tmp)) >> 8)) - /* macro for getting a value out of various numpy arrays the 3D arrays have interesting, swizzled coordinates because minecraft (anvil) stores blocks in y/z/x order for 3D, z/x order for 2D */