From 96bf10155b3721ddeef8d577c7cbd8139ddd86ef Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Tue, 15 Mar 2016 22:29:04 -0400 Subject: [PATCH] working on canvas version of map --- chunk_x-2z4.png | Bin 206 -> 0 bytes chunkymap-regen.py | 18 +- chunkymap-update C wamp www.bat | 8 + etc/compass-rose.xcf | Bin 15593 -> 15770 bytes web/chunkymap.php | 432 +++++++++++++++--- .../images/compass-rose.png | Bin 2976 -> 2920 bytes web/viewchunkymap.php | 27 +- 7 files changed, 404 insertions(+), 81 deletions(-) delete mode 100644 chunk_x-2z4.png create mode 100644 chunkymap-update C wamp www.bat diff --git a/chunk_x-2z4.png b/chunk_x-2z4.png deleted file mode 100644 index 1004c7eb6c887ce00093fa14ae04806919a5f76f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|93`$1B}w^3DXB#a1}gTe~DWM4f6(BmR diff --git a/chunkymap-regen.py b/chunkymap-regen.py index 7da805d..27d9271 100644 --- a/chunkymap-regen.py +++ b/chunkymap-regen.py @@ -590,9 +590,9 @@ class MTChunks: # 0 becomes 0 #-1 becomes -10 return int(decachunky_x*10) - - - + + + def is_worldborder_chunk(self, chunky_x, chunky_z): result = False image_path = self.get_chunk_image_path(chunky_x, chunky_z) @@ -634,7 +634,7 @@ class MTChunks: result = index break return result - + def check_decachunk_containing_chunk(self, chunky_x, chunky_z): try: @@ -704,9 +704,9 @@ class MTChunks: print(min_indent+"ERROR in check_decachunk_containing_chunk: no outline of chunks could be found around "+str(chunky_pos)) if not is_chunk_complete: break - - - + + + #if not is_any_part_queued: #if queued_chunk_coords is None: if is_chunk_complete and not is_any_part_queued: @@ -1421,7 +1421,7 @@ class MTChunks: if self.verbose_enable: print(min_indent+"["+str(self.todo_index)+"] not branching from "+str((chunky_x, chunky_z))) self.todo_index += 1 - + #check_decachunk_containing_chunk AFTER incrementing todo_index so that self being queued doesn't prevent decachunk render: self.check_decachunk_containing_chunk(chunky_x, chunky_z) if self.todo_index>=len(self.todo_positions): # check again since may have branched above, making this untrue @@ -1572,7 +1572,7 @@ class MTChunks: result = True break return result - + def is_nonworldborder_isrendered_count_gt_or_eq(chunky_coords_list, min_count): result = False diff --git a/chunkymap-update C wamp www.bat b/chunkymap-update C wamp www.bat new file mode 100644 index 0000000..f65b0e7 --- /dev/null +++ b/chunkymap-update C wamp www.bat @@ -0,0 +1,8 @@ +SET SOURCE_DIR=C:\Users\Owner\Documents\GitHub\minetest-chunkymap\web +SET DEST_DIR=C:\wamp\www +COPY /Y "%SOURCE_DIR%\browser.php" "%DEST_DIR%\" +if NOT ["%errorlevel%"]==["0"] pause +COPY /Y "%SOURCE_DIR%\chunkymap.php" "%DEST_DIR%\" +if NOT ["%errorlevel%"]==["0"] pause +COPY /Y "%SOURCE_DIR%\viewchunkymap.php" "%DEST_DIR%\" +if NOT ["%errorlevel%"]==["0"] pause \ No newline at end of file diff --git a/etc/compass-rose.xcf b/etc/compass-rose.xcf index c97c9dde5c089a22ba02fb5150e5cb1c4d584c58..5f7605446bd7f0b23ca72d934110e7367757ae6c 100644 GIT binary patch delta 4256 zcmbuD3s6+o8G!$L_aQ78K|ny{Da#__!iH5*K;1P_8*6OTI5F1xLL6g!jOGEP>0OQZ zXdD&q#Ab+-wvowoSS?ud zsWV2zKS@|)+y?-tVoAno#9H6@%pB>Q2j{?wMT}(kCJ(rGYjPoi#UF7(#F!9=#^~(2 z5uRU&U{Pl?X^ZFNEWs(w_khc-%_h1dn5=Ve*5pD2i;+yTxp&T>LE0)hYpV>fdn1k+ zuy&Be0Xdn13(H-?BuTUG22BScO9%MW;2f?&7NZ!)x;^&2s2j2+#35UBb{j{19=2tW zMO{7&b!lN)7VVlXuGvq16%ql2`CMsuKdwO*qxc5evT+Pe7qTV9AzO5ILri#{2o`k? z+cMiwGQ#zDTwjk7vfN-OUFGuO8ddFSntg4r-gD2+o}=;V?YGnAgw*9Kn^@rjQH7;vQHLeh<&j1YT0Eq1a zNH~Fc{#$^w9!znR6`Tba7X+Aa9-!nY00-uN*=;-^QvoUrI0=@@e}~%esiE_cFmu8D zpXDt4$@5Rm;lf9+c|$0V3P~? z(f{)c{8k(sPDb|anea8=1+BO(UyH%TmBJRnV*p3_U-r`A#CI_&eSA62@-VOc%4C3A z{y0eSIpnQ!`A@^PX)ex?m&U|PuaOW7rNa!Y=;oOH*izADF&JrpMG!EikB)^hP!nRo z32KfJ7h@@405%paV0lC%iN?}nF%gFbh9!+M;RN*@;1ACqa(^euz>gX#s3s3%3Kj{3p{uR-79o3H;g9%hF^KMqqnas z+*fX0xY>mPz{h*Ifd^V|oNz%gs4cf~a6q}!nvA{Rv44JpUA3nbJAuSwcaGsu)`Ch( zUi&xquN=jPY%g|wd7t(6|7~&~uFRHWU&U|;SJcV1B*2iw-I2Rv-;_NLqrBCUZ>8f# zrBtsN3(IGkBrLOZww}*`gw&E&Maz=599f=Z782T4q#qHisro}&o8ES)kTE`5mQm4Gm@z^$nNU1jo^DTd zU=|LP%&j`vv89R=WbTTVW&WmZN9KfB6Qy8_>SWcE-p(wv_ZN=r6v+dOcQyfcp>x#lF9vT`h-fIlC}J%7uF# z&RB3;EPWhg?hkUt8&MbKV!_!U^Yhjz0Mn0iKWAT-h%gochDsK|^yu@|Y`M=k4|2S> z^HH07 zxd?)*P($QF#@As=2Frp08Xn-~_|yhHNq@xo(PpYA)1eSpJuc@*qj-SwdIuE9BgUns z<-vEx)D9AU;>4@s0$R$i=0LtYZCq+bHvAyKb6nwu8z1N#12YspV~@JhP+$^LCpfLt3Ga!lo3{T`QEsl~}P~nidjiS1!s* z3#l&+&l#*H1`lG&R_^=s+q-8QYo;b(Quu`2`LBP_734A8$8NUoUgn6!oK_O5*1vtR zhbMDi@Y+Y7MTJHfUJgD}@sgd#Z!wykfnvzWS z|4cXi-Lw(^3QZG1xah=8@9h=faR_8{of`k3f-A`j7gq6I{`MEOXn&_la@ zAW}##k`FGCH{K>{B3e(hfvAdTI+BW8#P?hxIy!KR^V{V4FB$xah3#e0%1 zB|1&AZt}ku9s}kj>L!_=sDWe+MEIY;8-KLvA+u}q{}M2ZJiaP zg%UkYW?(yF;hGoMtbS?Trj0rCR&HI761v#6LceT@B{|n&TlART(|-RT>%Wf%{wqLY cy;N;MpfsF;73Ebsv8AHRst!>{dJOn~0Lru;*#H0l delta 4140 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.1.0 if ($is_verbose) echo "globals..."; //$chunkymap_view_x=0; //$chunkymap_view_z=0; -//$chunkymap_view_zoom_multiplier=25; +//$chunkymap_view_zoom=25; if (!isset($chunkymap_view_x)) { $chunkymap_view_x=0; } if (!isset($chunkymap_view_z)) { $chunkymap_view_z=0; } -if (!isset($chunkymap_view_zoom_multiplier)) { - $chunkymap_view_zoom_multiplier=.25; +if (!isset($chunkymap_view_zoom)) { + $chunkymap_view_zoom=.25; } $chunkymapdata_path = "chunkymapdata"; @@ -44,15 +44,15 @@ $chunkymapdata_worlds_path = $chunkymapdata_path."/worlds"; $chunkymapdata_thisworld_path = null; $showplayers=true; -// NOT OPTIONAL: +// NOT OPTIONAL for table version: $chunkymap_tile_original_w=16; $chunkymap_tile_original_h=16; $chunk_dimension_min=$chunkymap_tile_original_w; if ($chunkymap_tile_original_h<$chunk_dimension_min) $chunk_dimension_min=$chunkymap_tile_original_h; - -$chunkymap_view_min_zoom=1.0/$chunk_dimension_min; //should be a number that would get to exactly 100 eventually if multiplied by 2 repeatedly (such as 0.09765625); 0.005 was avoided since tiles used to be 80x80 pixels -$chunkymap_view_max_zoom=13107200.0; +$chunkymap_zoom_delta=1.5; +$chunkymap_view_min_zoom=0.0173415299; //1.0/$chunk_dimension_min; //should be a number that would get to exactly 100 eventually if multiplied by chunkymap_zoom_delta repeatedly (such as 0.09765625 if chunkymap_zoom_delta were 2); 0.005 was avoided since tiles used to be 80x80 pixels +$chunkymap_view_max_zoom=16585998.48141; //13107200.0; function echo_error($val) { if (!isset($val)) { @@ -118,13 +118,13 @@ function is_int_string($val) { } return $result; } -function set_chunkymap_view($set_chunkymap_view_x, $set_chunkymap_view_z, $set_chunkymap_view_zoom_multiplier) { +function set_chunkymap_view($set_chunkymap_view_x, $set_chunkymap_view_z, $set_chunkymap_view_zoom) { global $chunkymap_view_x; global $chunkymap_view_z; - global $chunkymap_view_zoom_multiplier; + global $chunkymap_view_zoom; $chunkymap_view_x = $set_chunkymap_view_x; $chunkymap_view_z = $set_chunkymap_view_z; - $chunkymap_view_zoom_multiplier = $set_chunkymap_view_zoom_multiplier; + $chunkymap_view_zoom = $set_chunkymap_view_zoom; } function echo_chunkymap_anchor() { global $chunkymap_anchor_name; @@ -133,7 +133,7 @@ function echo_chunkymap_anchor() { function echo_chunkymap_controls() { global $chunkymap_view_x; global $chunkymap_view_z; - global $chunkymap_view_zoom_multiplier; + global $chunkymap_view_zoom; global $chunkymap_view_max_zoom; global $chunkymap_view_min_zoom; global $chunkymap_anchor_name; @@ -142,18 +142,18 @@ function echo_chunkymap_controls() { $in_img_name = "zoom-in.png"; $out_img_name = "zoom-out.png"; - $in_zoom = $chunkymap_view_zoom_multiplier; + $in_zoom = $chunkymap_view_zoom; if ($in_zoom<$chunkymap_view_max_zoom) { $is_in=true; - $in_zoom = $chunkymap_view_zoom_multiplier*2.0; + $in_zoom = $chunkymap_view_zoom*2.0; //echo "in:$in_zoom "; } else $in_img_name = "zoom-in_disabled.png"; - $out_zoom = $chunkymap_view_zoom_multiplier; + $out_zoom = $chunkymap_view_zoom; if ($out_zoom>$chunkymap_view_min_zoom) { $is_out=true; - $out_zoom = ($chunkymap_view_zoom_multiplier/2.0); + $out_zoom = ($chunkymap_view_zoom/2.0); } else $out_img_name = "zoom-out_disabled.png"; @@ -208,19 +208,15 @@ function echo_chunkymap_controls() { } if (!$found) $in_zoom=$chunkymap_view_max_zoom; - $in_html=""; - $out_html=""; + $in_html=""; + $out_html=""; global $world_name; - $append_vars="&"; + $append_vars=""; if (isset($world_name)) { - $prefix = ""; - if (strlen($append_vars)>0 && !endsWith($append_vars,"&") ) { - $prefix = "&"; - } - $append_vars.="$prefix"."world_name=$world_name"; + $append_vars.="&"."world_name=$world_name"; } - if ($is_in) $in_html="$in_html"; - if ($is_out) $out_html="$out_html"; + if ($is_in) $in_html="$in_html"; + if ($is_out) $out_html="$out_html"; echo $in_html; echo $out_html; } @@ -287,9 +283,9 @@ function get_decachunk_folder_path_from_decachunk($chunky_x, $chunky_z) { return $result; } -function get_chunky_coord_from_location($location_x) { - $chunk_x = intval($location_x/16); - return $chunk_x; +function get_chunky_coord_from_location($location_coord) { + $chunk_coord = intval(floor((float)$location_coord/16)); + return $chunk_coord; } function get_decachunky_coord_from_chunky_coord($chunky_x) { @@ -310,10 +306,323 @@ function get_decachunk_image_name_from_decachunk($x, $z) { return "decachunk_x"."$x"."z"."$z".".jpg"; } -function echo_chunkymap_canvas() { +function echo_chunk_debug_canvas() { + global $chunkymap_view_x; + global $chunkymap_view_z; + global $chunkymap_view_zoom; + global $chunkymap_view_max_zoom; + global $chunkymap_view_min_zoom; + global $showplayers; + global $chunkymap_zoom_delta; + $tile_w = 160; + $tile_h = 160; + + if ($chunkymap_view_zoom<$chunkymap_view_min_zoom) $chunkymap_view_zoom = $chunkymap_view_min_zoom; + if ($chunkymap_view_zoom>$chunkymap_view_max_zoom) $chunkymap_view_zoom = $chunkymap_view_max_zoom; + + $world_camera_w = 6.0 * (1.0/$chunkymap_view_zoom); + $world_camera_h = $world_camera_w; //start with square camera to make sure enough chunks are loaded + + $chunky_view_x = get_chunky_coord_from_location($chunkymap_view_x); + $chunky_view_z = get_chunky_coord_from_location($chunkymap_view_z); + + $chunky_min_x = 0; + $chunky_max_x = 0; + $chunky_min_z = 0; + $chunky_max_z = 0; + + + + echo ' '; + echo ' + '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + //TODO: $chunkymap_view_zoom SHOULD BE interpreted so each block (pixel) is 1pt: 1066x600 pt canvas would have 66+2/3 blocks horizontally, is 37.5 blocks vertically + //so, at zoom 1.0 canvas should show 60 chunks across (6 decachunks across) +} + +function echo_decachunk_table() { global $chunkymap_view_x; global $chunkymap_view_z; - global $chunkymap_view_zoom_multiplier; + global $chunkymap_view_zoom; global $chunkymap_view_max_zoom; global $chunkymap_view_min_zoom; global $showplayers; @@ -327,25 +636,29 @@ function echo_chunkymap_canvas() { $z_opener="z"; $dot_and_ext = ".jpg"; - if ($chunkymap_view_zoom_multiplier<$chunkymap_view_min_zoom) $chunkymap_view_zoom_multiplier = $chunkymap_view_min_zoom; - if ($chunkymap_view_zoom_multiplier>$chunkymap_view_max_zoom) $chunkymap_view_zoom_multiplier = $chunkymap_view_max_zoom; + if ($chunkymap_view_zoom<$chunkymap_view_min_zoom) $chunkymap_view_zoom = $chunkymap_view_min_zoom; + if ($chunkymap_view_zoom>$chunkymap_view_max_zoom) $chunkymap_view_zoom = $chunkymap_view_max_zoom; - $decachunks_per_page = intval(1.0/$chunkymap_view_zoom_multiplier); + $decachunks_per_page = intval(6.0/$chunkymap_view_zoom); if ($decachunks_per_page<1) { $decachunks_per_page = 1; } - $view_w = (($decachunks_per_page*160.0)); - $view_h = (($decachunks_per_page*160.0)); - $view_left = (($chunkymap_view_x)) - (($view_w/2.0)); - $view_right = $view_left + $view_w; + $viewer_ratio = 16.0/9.0; + $world_camera_w = 6.0 * (1.0/$chunkymap_view_zoom); + $world_camera_h = $world_camera_w; + //$world_camera_w = (($decachunks_per_page*160.0)); + //$world_camera_h = (($decachunks_per_page*160.0)); + + $view_left = (($chunkymap_view_x)) - (($world_camera_w/2.0)); + $view_right = $view_left + $world_camera_w; //z is cartesian still: - $view_top = (($chunkymap_view_z)) + (($view_h/2.0)); - $view_bottom = $view_top - $view_h; + $view_top = (($chunkymap_view_z)) + (($world_camera_h/2.0)); + $view_bottom = $view_top - $world_camera_h; echo_chunkymap_anchor(); echo_chunkymap_controls(); echo "\r\n"; - echo " ".($chunkymap_view_zoom_multiplier*100.0)."%\r\n";//(string)((int)($chunkymap_view_zoom_multiplier*100+.5)); + echo " ".($chunkymap_view_zoom*100.0)."%\r\n";//(string)((int)($chunkymap_view_zoom*100+.5)); //"chunkymapdata/images/compass-rose.png" //"chunkymapdata/images/start.png" $decachunky_min_x = get_decachunky_coord_from_location($view_left); @@ -367,12 +680,12 @@ function echo_chunkymap_canvas() { echo ''."\r\n"; echo ' '."\r\n"; echo ' '."\r\n"; - echo " '."\r\n"; + echo " '."\r\n"; echo ' '."\r\n"; echo ' '."\r\n"; $cell_perc=intval(round(100.0/$decachunky_count_x)); echo ' '."\r\n"; - echo " '."\r\n"; + echo " '."\r\n"; echo ' '."\r\n"; - echo " '."\r\n"; + echo " '."\r\n"; echo ' '."\r\n"; echo ' '."\r\n"; echo ' '."\r\n"; - echo " '."\r\n"; + echo " '."\r\n"; echo ' '."\r\n"; echo ' '."\r\n"; echo '
'."$td_placeholder_content".'".''.'".''.''."$td_placeholder_content".'
".''.'".''.''."\r\n"; echo ' '."\r\n"; while ($decachunky_z>=$decachunky_min_z) { @@ -403,11 +716,11 @@ function echo_chunkymap_canvas() { } echo '
'."\r\n"; echo ' 		".''.'".''.'
'."$td_placeholder_content".'".''.'".''.''."$td_placeholder_content".'
'."\r\n"; @@ -447,7 +760,7 @@ function echo_chunkymap_as_chunk_table($show_all_enable) { $is_echo_never_held=true; global $chunkymap_view_x; global $chunkymap_view_z; - global $chunkymap_view_zoom_multiplier; + global $chunkymap_view_zoom; global $chunkymap_view_max_zoom; global $chunkymap_view_min_zoom; global $chunkymapdata_path; @@ -461,11 +774,11 @@ function echo_chunkymap_as_chunk_table($show_all_enable) { echo_chunkymap_anchor(); echo_chunkymap_controls(); - echo " ".($chunkymap_view_zoom_multiplier*100.0)."%";//(string)((int)($chunkymap_view_zoom_multiplier*100+.5)); + echo " ".($chunkymap_view_zoom*100.0)."%";//(string)((int)($chunkymap_view_zoom*100+.5)); - if ($chunkymap_view_zoom_multiplier<$chunkymap_view_min_zoom) $chunkymap_view_zoom_multiplier = $chunkymap_view_min_zoom; - if ($chunkymap_view_zoom_multiplier>$chunkymap_view_max_zoom) $chunkymap_view_zoom_multiplier = $chunkymap_view_max_zoom; - //$zoom_divisor = (int)(100/$chunkymap_view_zoom_multiplier); + if ($chunkymap_view_zoom<$chunkymap_view_min_zoom) $chunkymap_view_zoom = $chunkymap_view_min_zoom; + if ($chunkymap_view_zoom>$chunkymap_view_max_zoom) $chunkymap_view_zoom = $chunkymap_view_max_zoom; + //$zoom_divisor = (int)(100/$chunkymap_view_zoom); $chunk_assoc = array(); // used for storing players; and used for determining which chunks are on the edge, since not all generated map tiles are the same size (edge tile images are smaller and corner ones are smaller yet) $chunk_count = 0; $x_opener="chunk_x"; @@ -475,15 +788,15 @@ function echo_chunkymap_as_chunk_table($show_all_enable) { $min_chunkz = 0; $max_chunkx = 0; $max_chunkz = 0; - $chunks_per_page = (1.0/$chunkymap_view_zoom_multiplier)*10; + $chunks_per_page = (1.0/$chunkymap_view_zoom)*10; - $view_w = (($chunks_per_page*16.0)); - $view_h = (($chunks_per_page*16.0)); - $view_left = (($chunkymap_view_x)) - (($view_w/2.0)); - $view_right = $view_left + $view_w; + $world_camera_w = (($chunks_per_page*16.0)); + $world_camera_h = (($chunks_per_page*16.0)); + $view_left = (($chunkymap_view_x)) - (($world_camera_w/2.0)); + $view_right = $view_left + $world_camera_w; //z is cartesian still: - $view_top = (($chunkymap_view_z)) + (($view_h/2.0)); - $view_bottom = $view_top - $view_h; + $view_top = (($chunkymap_view_z)) + (($world_camera_h/2.0)); + $view_bottom = $view_top - $world_camera_h; if (!$show_all_enable) { $min_chunkx=intval($view_left/$chunkymap_tile_original_w); @@ -715,7 +1028,7 @@ function echo_chunkymap_as_chunk_table($show_all_enable) { //cellpadding="0" cellspacing="0" still needed for IE echo_hold( " \r\n"); $z = (int)$max_chunkz; - $scale=(float)$chunkymap_view_zoom_multiplier; // no longer /100 + $scale=(float)$chunkymap_view_zoom; // no longer /100 $zoomed_w=(int)((float)$chunkymap_tile_original_w*$scale+.5); $zoomed_h=(int)((float)$chunkymap_tile_original_h*$scale+.5); $genresult_suffix_then_dot_then_ext="_mapper_result.txt"; @@ -952,12 +1265,12 @@ function echo_chunkymap_as_chunk_table($show_all_enable) { echo "
    "; if ($chunkymapdata_handle = opendir($chunkymapdata_worlds_path)) { $append_vars="&"; - if (isset($chunkymap_view_zoom_multiplier)) { + if (isset($chunkymap_view_zoom)) { $prefix = ""; if (strlen($append_vars)>0 and !endsWith($append_vars,"&")) { $prefix = "&"; } - $append_vars.="$prefix"."&chunkymap_view_zoom_multiplier=$chunkymap_view_zoom_multiplier"; + $append_vars.="$prefix"."&chunkymap_view_zoom=$chunkymap_view_zoom"; } if (isset($chunkymap_anchor_name)) { $prefix = ""; @@ -979,3 +1292,4 @@ function echo_chunkymap_as_chunk_table($show_all_enable) { } } ?> + diff --git a/web/chunkymapdata_default/images/compass-rose.png b/web/chunkymapdata_default/images/compass-rose.png index a51b7a44367d096bbabe85ed664d139e6e2ab123..db19e4cadfc2fe397589ac81f0de2d783f3579ba 100644 GIT binary patch delta 2907 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 FV1j6XfVuzx delta 2964 zcmV;F3v2Y~7N8efiBL{Q4GJ0x0000DNk~Le0000;0000;2nGNE09Ea?M*si-24YJ` zL;#lntN^Nf1g?z$000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2jBw;3MnSTSbW`) zTPuGH1W80eRCwC$n|V-_=N-pCFE1?TuAl;oiySKKdVq=w8bw9p886Zp$J8b<`6Dqs zCarD8q|+v86EkhncG@P5F?P}2%`I;lpMdpaIoD25CP4*+rJDR%=O0 zN(#Gn?LwhYkd&0f#r%9%p!;D3Gz!@6@9(dzt*w!OaA4QQjT`Cc=wQNx3FPMH0+c2;(^UwkU4gxv-MjWvJrou4> zr*6>RHRacM&apDfE+1Ej}MjIFj$4tg6`yEfhG&yZJka)x3gp)clUp>KJA^z zS6lH^xaj~lC!p&ZGf6YjT@nIG2y_8K?m&bS&$BJskQcBJm~{t85x{G}5nyG2(R}?v zLp#87+jFnoCLX!iR{P6=HMW0prJF$}3780+_Esw20C@l3pGZI?upJQoYPDFfa)nTN zdWv&XW{dMvW{dY!BgMO_kwWF^DHg0)F8tN%-qy!qubN@W8;yYo33ObsJv9TdBmVFJ-ZZ4*-AV%`Hek-Eb8% zA74e{x*rmtR#SPYBD%AqgG!3iIZ4`AYtVSigRLIqRrSv;!{uID&XtgyU|}PxFShX)9wY!CWU`B82~t@FYmFSU^TB7 zoXtT9|3Hl+E+dJ_;06bS-3grI$E! z>Xh8s(cuT|9?XA$B7l$AJhz?^p&=ka=7|&3Ha6fN5WvEfE2N=bUhXq5*Y%llA0V@t zYty0?z}n%3WA!dYKjXB&=(a`QdES#sE9JXp3crr3$Pc+ z>o-aO%RmBh1GF{>Q9!i9-F;&C=uw&otxk&2^}vYK=?D%9!Nuj?hT041n7;f5ICoQb zcQ=(+u253g15963gubwlveHtcv8$`V1}h)Pwf%p6`9W)@`vEkfpG8C|6pD!)?L*;TAl6d|36Pb>HhgR;!gO6%`a07NRdI>an=OBFalk+stNj zUO#Yo^z7<3+_95)Kecdw>K2QIhPpaTU0qa`U*dd5CceJD`1ttTm!;fIC9#o2dMLQC z@t1$!vv?P@wY6a|7-(r}>3g(TEVuhy!k#YHYgy5ACd3p5#>xJj#<#h`jfVB%2B7|Vu@uPoqo;=<6n$FJ7TR<2L1}r^hvHvCzdcf?6 zg<_ZOTgtLcI)480Wuu>1zaE9B2g!#HQGV&tnbNW{Pp@Hqp1x`|mM9(L6w1CEM2#Me zBuT`CkK%HhfspWU>YAH5uy;>;NwL1Lrluxv&eA0;N=(Gv!-KM-;$&OPBgGb18vcKm zy&-$oK_||g&LAL2&Dt+*_wYRiJUM&GjsktBuOIcWEu^%wE#(j8IT^>abQ;x z2*}UAfHr0l;W{l|N)`LIeSS>eYN+XM6h#rGB$ZeSe_|3q5}_ZSI_f1=$zCV&x~lehpW*o*MP!k#ES($zk!cPxqyH zfZuO=6|W&fn7d>#LI|uDD}Q?Cs-&CNvaprIOUIza~0<)(tN9$v?J`@YsJ+yp=wjNjt^X zKmD1iiVBmdtLv@C`g%{3$rvX|E^Q`bSB5uxu7 z8&})32dGr9$JWES zYdfg-<-ir}wDs&Lr#o``r~0xUKsgW6;TW`a(0wYmsk&O+fa`{Sh8Ch8mO$Oz-TmPJIcHq>6B|uQ*{lc4&+|oSm&g3n`&w( z_4K-*4EB%$s;;5T+U>NUJE*9!rp97!Z38=>*ch~uU0rir-Q02_; znxp;VFxLs_-heP1s<$IM7@$s|4rq5qWT%{R$|}WJ)qeryxtmIlfV?sQ0000< KMNUMnLSTaKE2*de diff --git a/web/viewchunkymap.php b/web/viewchunkymap.php index 93189bc..bbbc24f 100644 --- a/web/viewchunkymap.php +++ b/web/viewchunkymap.php @@ -1,9 +1,9 @@ - + - - + + "; - echo "

    "; - echo_map_heading_text(); - echo "

    "; - echo ""; - set_chunkymap_view($chunkymap_view_x,$chunkymap_view_z,$chunkymap_view_zoom_multiplier); - echo "
"; - echo_chunkymap_as_chunk_table(false); - echo_chunkymap_canvas(); - echo "
"; + //echo "
"; + //echo "

"; + //echo_map_heading_text(); + //echo "

"; + //echo "
"; + set_chunkymap_view($chunkymap_view_x,$chunkymap_view_z,$chunkymap_view_zoom); + //echo "
"; + echo_chunk_debug_canvas(); + //echo_chunkymap_as_chunk_table(false); + //echo_decachunk_table(); + //echo "
"; //echo "returned from echo_chunkymap_as_chunk_table."; } else {