0
Commit Graph

1531 Commits

Author SHA1 Message Date
Nicolas F
b57db703ae web: fix overlays showing up for all base layers
Overlays should only show up for the base layers they apply to,
however, we've had them show up for all base layers in a world.

To fix this, we first change things to be indexed by the unique path,
not the human-readable name (which is not supposed to be always unique).

Then, we remove and add overlay layers to the layerCtrl as needed on a
baselayerchange event.
2019-02-27 14:22:18 +01:00
Aaron Griffith
28f924621b do block state unpacking with numpy slices, not loops
For posterity, my testbench used to make sure this implementation
yields identical results:

https://gist.github.com/agrif/a34efb8e0b534f0309415c9af4872a69
2019-02-22 12:11:37 -05:00
Nicolas F
b70f1a012f Fix C extension build warnings the painful way
Some bad distributions (Debian) apparently are not good enough to
have a Pillow version from this decade packaged.

Therefore, we need to do it the painful way of prefixing our
symbols and refactoring everything to use them.

A new header file called "utils.h" has been added for this purpose,
and it is included in "overviewer.h".

The following macros have been prefixed with "OV_":
- MIN
- MAX
- CLAMP
- BLEND
- MULDIV255

Additionally, the C extension version was bumped to 56 because 55
was reverted back to 54.
2019-02-22 12:53:47 +01:00
Aaron Griffith
53fa463838 block states with 9, 10, 11, and 12 bits per value now unpack correctly
old code mistakenly re-used byte 0 for every aligned stretch of blocks,
causing the wrong block id to be read
2019-02-21 19:28:32 -05:00
Aaron Griffith
fc4a8ec38d Revert "Fix C extension build warnings"
This reverts commit 03a8697866.

Turns out there was a good reason for this: it makes Overviewer work on
Debian. Why? Who knows. It's a mystery.
2019-02-21 17:08:39 -05:00
Aaron Griffith
509bce77d6 Merge 'jvaskonen/minecraft113' and 'jvaskonen/pillar' into master 2019-02-21 16:30:34 -05:00
Nicolas F
bc71ad7a8f web: fix white rectangle behind markers 2019-02-21 18:25:50 +01:00
Nicolas F
23f8cbd330 web: reimplement marker groups default checking
Now you can use checked=True again!

Fixes #1474.
2019-02-21 17:24:08 +01:00
Nicolas F
03a8697866 Fix C extension build warnings
Today in "why did we ever do this?", we discover we've vendored
code from PIL/Pillow, but PIL/Pillow moved some macro definitions
around, so now our vendored code conflicted with their macros that
they included in the headers we're including.

The solution is to throw out our vendored macros and update the
semantics in our vendored Draw.c. I'm not sure why we vendored it,
but we seemingly did remove some stuff from it to avoid having to
pull in all of PIL/Pillow.
2019-02-21 16:27:55 +01:00
Nicolas F
a05daa7519 Merge pull request #1510 from 14mRh4X0r/fix-icon-offset
Fix marker icon position properly. Closes #1481.
2019-02-21 15:59:14 +01:00
Aaron Griffith
1e4cabe5d0 Merge branch 'master' into minecraft113 2019-02-19 14:28:34 -05:00
Willem Mulder
ad5c419546 Fix marker icon position properly. Closes #1481.
CSS margin is always relative to the containing element. For some
reason, using the browser inspector, this does not get propagated
properly. Adding a containing element with the size of the child element
allows us to use margin to offset the icon.
2019-01-23 21:13:59 +01:00
Marc Tönsing
3727f0407a removed strong tags in coordination box
This fixes navigation not working on iOS Safari on iPad and iPhone.
2019-01-10 23:22:27 +01:00
James Miller
72c8a1dbd8 trapdoor orientation
non-oak trapdoors
dried kelp blocks
2018-12-16 05:17:19 -08:00
James Miller
2b2ad76c81 non-oak buttons
buttons on top of blocks
2018-12-16 03:33:38 -08:00
James Miller
ce78ffe008 bone block orientation
smooth stone blocks
coral and dead coral blocks
blue ice
2018-12-16 00:44:09 -08:00
James Miller
9200278f2f Wood and stripped wood 2018-12-15 00:51:27 -08:00
James Miller
be80775bf2 Stripped logs 2018-12-15 00:14:28 -08:00
James Miller
446916540a non-oak pressure plates 2018-12-14 23:40:21 -08:00
James Miller
b282bec2cf Uncarved pumpkin textures 2018-12-14 23:08:33 -08:00
James Miller
39c006886d One more infested block 2018-12-12 23:24:00 -08:00
James Miller
a99ff9ea37 Fix light grey terracotta and glazed terracotta orientation. 2018-12-12 00:38:43 -08:00
James Miller
b85a954e96 When adding quartz pillar orientation, I assumed the top orientation was correct, when it was actually the side.
see: https://github.com/overviewer/Minecraft-Overviewer/pull/1502
2018-12-12 00:06:49 -08:00
James Miller
43122d5dfa Fixing top textures of non-vertically oriented quartz pillars. 2018-12-11 23:51:56 -08:00
James Miller
39812d84ac Added note blocks, carved pumkin, non-oak pressure plates (oak texture), more infested stone bricks and melons. 2018-12-11 20:18:08 -08:00
James Miller
217a896e28 Adds chiseled quartz and quartz pillars 2018-12-09 23:35:00 -08:00
James Miller
a80ed53231 Adding mappings for damaged anvils. Add handling for sign and anvil orientation. 2018-12-09 21:30:31 -08:00
James Miller
4bea454970 Potted plants still not rendering, but I figure this is better than an error message. 2018-12-09 04:45:39 -08:00
James Miller
342a53d67d Fixes big mushrooms 2018-12-09 03:55:14 -08:00
James Miller
57578eab7a Fixing handling of torches/redstone torches on walls 2018-12-09 02:00:12 -08:00
Nicolas F
e1728b9e59 genpoi: Also fix missing nbt keys if processes > 1
oopsie
2018-11-26 14:40:52 +01:00
Nicolas F
38bc400b2f genPOI: catch ChunkDoesntExist when processes > 1
Fixes #1480.

No clue how this wasn't an issue before but is an issue now in 1.13,
maybe Minecraft writes more placeholder chunks these days.
2018-11-26 13:03:44 +01:00
Nicolas F
cf53208989 genpoi: fix uncaught KeyErrors on some MC data
Apparently TileEntities can just not even exist now, and the same
goes for the player Dimension key. For the latter, I'm not sure
whether the fallback is correct, but it's a guess I suppose.

Hopefully addresses #1480.
2018-11-18 09:29:48 +01:00
Nicolas F
bde265a8ac web: fix createInfoWindow not having any effect
Fixes #1494.
2018-11-18 09:18:55 +01:00
Nicolas F
2918637539 web: fix marker icon position
Shoutouts to 14mRh4X0r for finding the right CSS properties that
work for centering the marker icons.

Fixes #1481.
2018-11-18 09:10:54 +01:00
Aaron Griffith
e867221d8e Merge #1488: Make JSObserver work with Leaflet.
Fixes #1451.
2018-10-09 11:03:15 -04:00
Aaron Griffith
dc70d6dc62 Merge #1487: Use cached center for initial view.
Fixes #1453.
2018-10-09 11:01:27 -04:00
Willem Mulder
4efb9f2d89 Make JSObserver work with Leaflet. Fixes #1451. 2018-10-08 19:45:57 +02:00
Willem Mulder
3cc184a751 Use cached center for initial view. Fixes #1453. 2018-10-06 18:12:17 +02:00
RedSparr0w
1428bf150c remove print 2018-09-22 15:40:24 +12:00
Danial Nickford
dec61e5763 furnace orientation 2018-09-21 09:47:27 +12:00
Danial Nickford
50909270fe dispenser, dropper orientation 2018-09-21 09:47:13 +12:00
Danial Nickford
ff26eaf099 add/update comments 2018-09-21 08:57:16 +12:00
Danial Nickford
0b35efef12 fix piston orientation 2018-09-21 08:56:46 +12:00
RedSparr0w
1e0b2b1fd5 fix gate orientation 2018-09-20 21:42:26 +12:00
Danial Nickford
6daefbedac fix rail, powered rail orientation + powered state 2018-09-20 12:31:48 +12:00
Danial Nickford
f24215d980 add oak button 2018-09-20 08:32:54 +12:00
Danial Nickford
6f594b70be fix shulker, observer orientation 2018-09-20 08:32:41 +12:00
Danial Nickford
72e10d5aee fix slab top/bottom slab
still not sure how to render double slab
2018-09-20 08:32:12 +12:00
Danial Nickford
f7f134464a fix repeate, comparator orientation + powered state 2018-09-20 08:30:39 +12:00