0
Commit Graph

1486 Commits

Author SHA1 Message Date
Joseph Camp
9ee1a6a3dd Amend table block rendering
- Account for render direction & flip bottom-right face of
  crafting, fletching, smithing, and cartography table blocks
2020-06-23 23:35:43 +00:00
Joseph Camp
83db30da66 Amend coarse dirt texture
- Correct texture used for coarse dirt
- Code formatting
2020-06-23 23:35:43 +00:00
Joseph Camp
efc345313d Add bell texture 2020-06-23 23:35:43 +00:00
Joseph Camp
99864d99a7 Add campfire texture 2020-06-23 23:35:43 +00:00
Joseph Camp
9365cce160 Amend lectern rendering
- Replaces exising implementation with a texture that better
  resembles the in game block, accounting for its facing & whether
  a book has been placed or not
2020-06-23 23:35:43 +00:00
Joseph Camp
cde059e9a6 Amend stonecutter rendering
- Account for facing when generating textures
- Render block top at the appropriate height & add saw blade
2020-06-23 23:35:43 +00:00
Joseph Camp
3bfe52013d Amend grindstone rendering
- Replaces existing implementation with a texture that better
  resembles the in game block and accounts for its facing & what
  surface it is attached to (ceiling, wall, or floor)
2020-06-23 23:35:42 +00:00
Joseph Camp
d0ddab3b20 Amend anvil texture generation
- Fix gap between sides & top in anvil texture
2020-06-23 23:35:42 +00:00
Joseph Camp
8e1eeb2170 Amend glazed terracotta rendering
- Reduce data range to prevent excessive texture generation
- Correct rotation of side 4 texture
- Simplify texture generation code
2020-06-23 23:35:42 +00:00
Joseph Camp
b2244f5b76 Amend observer rendering
- Allow rendering of powered observers with appropriate back texture
2020-06-23 23:35:41 +00:00
Joseph Camp
0bb4785008 Amend shulker box rendering
- Correct shulker box side textures being resized to 4x4 resolution
- Use intended texture for 'uncolored' shulker boxes instead of purple
2020-06-23 23:33:56 +00:00
Joseph Camp
7e0c880a58 Add mushroom block & vine variants
- Add all possible variants of mushroom blocks introduced in 1.13
- Render mushroom stems similarly to red/brown mushroom blocks
- Add vine variants where vines are on the upwards facing side
2020-06-23 23:33:55 +00:00
Joseph Camp
b6716a898a Fix chiseled sandstone rendering
- Resolve data value mismatch between textures.py and world.py
2020-06-23 23:33:55 +00:00
Joseph Camp
29eff95f8b Amend (blast) furnace & smoker rendering
- Use 'lit' property to determine when block is on or off
- Account for facing when generating textures
- Clean up smoker/furnace/dispenser/dropper texture generation code
2020-06-23 23:33:55 +00:00
Joseph Camp
6d5ccdfd54 Amend farmland rendering
- Use 'moisture' property to determine when to render farmland as moist
2020-06-23 23:33:55 +00:00
Joseph Camp
16753aad79 Fix cake rendering
- Use 'bites' property to determine which cut of cake to render
2020-06-23 23:33:55 +00:00
Joseph Camp
63eefb2423 Amend redstone repeater delay rendering
- Use 'delay' property to determine offset of repeater torch
2020-06-23 23:33:55 +00:00
Joseph Camp
268e773c11 Amend structure block variant rendering
- Use 'mode' property to determine which variant of block to render
2020-06-23 23:33:55 +00:00
Joseph Camp
70ce68da4b Add Jigsaw block 2020-06-23 23:33:55 +00:00
Joseph Camp
46d48bf1f8 Fix cauldron water rendering
- Use cauldron 'level' property to determine water level
2020-06-23 23:33:55 +00:00
Joseph Camp
c30e976cbd Amend end portal frame rendering
- Use portal frame 'eye' property to allow ender eye to be rendered
- Use portal frame 'facing' property to determine block rotation
2020-06-23 23:33:55 +00:00
Joseph Camp
4ee5673e0d Add piston variant rendering & fix lighting
- Fix extended pistons rendering as if they were retracted
- Fix retracted pistons rendering completely dark when using a
  lighting rendermode primitive
- Use piston head 'facing' property to determine rotation
- Use piston head 'type' property to determine if sticky or not
2020-06-23 23:33:52 +00:00
Joseph Camp
2a7280f8bf Add colored beds & use bed facing/type properties
- Add beds with colors other than red
- Use bed 'facing' property to determine bed's rotation
- Use bed 'type' property to determine if the head or foot is rendered
- Correct faulty logic during bed texture generation
2020-06-23 22:27:04 +00:00
InrcedibleHolg
8c08b44a38 add flowers and berries 2020-06-13 16:45:50 +02:00
Nicolas F
678048177d Merge pull request #1755 from cliffmeyers
fix a bug where multiple renders of the same world led to repeat genPOI scans
2020-05-23 16:27:05 +02:00
Alexander Rath
9e7bd98410 make 20w17a blockstate code cleaner 2020-05-22 10:27:47 +02:00
Alexander Rath
5ff3e2b09f world: add support for 20w17a blockstates 2020-04-23 01:19:35 +02:00
Cliff Meyers
61903939a3 remove __lt__ from RegionSet & wrapper as it's no longer used in genPOI 2020-04-15 08:06:12 -04:00
Cliff Meyers
512d6e7583 use logging.debug for detailed reporting of entities found during genPOI 2020-04-15 07:52:34 -04:00
Cliff Meyers
0a1560431a fix a bug where multiple renders of the same world led to repeat genPOI scans
the code that calls handleEntities in genPOI was building a list
of all filter funcs in the config, then used itertools.groupby to walk over
each region set, calling handleEntities and passing filters funcs for the rset.

this works fine when all of the renders point at a different world,
since rsets are sorted via __lt__ using the regiondir. when an rset appears in
the config multiple times, groupby can't sort the rsets reliably,
so a single rset is passed multiple times to handleEntities with only some
of the applicable filters. for a config with just two renders of the same world,
handleEntities would frequently be called 5-7 times instead of just 2.

this change eliminates group by, and just iterates over all the rsets, each
time plucking the list of applicable filters based on rset associated with
each filter (simple equality).
2020-04-15 07:34:54 -04:00
Cliff Meyers
80e45c4d66 genPOI: apply consistent sorting to markers.js and markersDB.js
use json.dumps(sort_keys=True) to apply a consistent sorting to the output JS files.
improves the readability of diffs and making config testing easier
2020-04-05 08:29:17 -04:00
Nicolas F
7af188da4e textures: better error logging for corrupt files
Sometimes people's texture packs contain weird things, and it'd
be good if instead of throwing an unhandled IOError, we raise
a TextureException with the filename in it.

Also, make verbose mode actually run find_file in verbose mode,
which is useful for finding where Overviewer loaded that texture
file from.
2020-03-30 07:47:16 +02:00
Nicolas F
e5ec41fcf9 Revert "textures: remove baffling texture generation logic"
This reverts commit 9895fe875b.

The original code was correct, but confusing. Overviewer did regenerate
the texture in each worker process because Python pickling is incredibly
fragile fucking garbage designed by idiots who have no clue of what
a good language looks like.
2020-03-02 19:59:18 +01:00
Jens
2a22d25f7a Add Icons to POI Legend 2020-03-02 13:45:01 +01:00
Nicolas F
9895fe875b textures: remove baffling texture generation logic
We used to generate textures multiple times for each worker process,
which didn't seem to be intended as it was done gated behind a reversed
if statement. It just so happened to fix an issue introduced by the
pickling code which was deleting vital attributes like the actual
generated textures.

I'm honestly not sure why this was ever done, so let's just throw this
out and call it a day.

Fixes #1728
2020-02-19 15:06:42 +01:00
Nicolas F
51efdbaa4e overviewer.h: bump extension version 2020-02-14 21:26:34 +01:00
Nicolas F
d8b3183a88 Merge PR 1717 from DragonDev1906 2020-02-14 21:21:58 +01:00
Nicolas F
1d8279243d genPOI: polyline text improvements
Don't require text for polylines/polygons, and support hovertext
by utilising leaflet's tooltips.
2020-02-13 18:35:20 +01:00
Nicolas F
2c92b4acf9 Merge PR 1649 from deltaidea 2020-02-13 17:40:35 +01:00
Nicolas F
6fdf78c35f overviewer.h: bump extension version 2020-02-13 17:36:20 +01:00
Nicolas F
27e63d4aa6 Merge PR 1704 from dgrimreaper 2020-02-13 17:32:30 +01:00
Daniel Grimwood
ede3ac5db4 And the other location for the temporary variables 2020-02-13 19:58:02 +08:00
Daniel Grimwood
1770e2e6cd mmmm temporary variables 2020-02-12 21:50:58 +08:00
Nicolas F
a929b55d4e observer: minor change to LoggingObserver interval
Off-by-one situation and all that.
2020-02-11 19:52:04 +01:00
Nicolas F
6251a6c730 Merge PR #1716 by Auron956 2020-02-11 07:38:43 +01:00
Nicolas F
58ae9dc529 Merge pull request #1670 from robosphinx/patch-1
Change lava ID from 10 to 11 (Fixes issue #1551)
2020-02-11 07:27:00 +01:00
Nicolas F
7097f76476 Merge PR #1720 by DragonDev1906 2020-02-11 07:02:51 +01:00
Nicolas F
021e88dd4a Merge pull request #1699 from sjamesr/py3.4-compat
Fix construct requiring >=Python3.5
2020-02-11 06:52:51 +01:00
Jens
e9bb7d340e Add regiondir property to CroppedRegionSet
- CroppedRegionSet is a Wrapper for RegionSet and should have all of
  it's Variables / Parameters
- genPOI sorts a list by (Cropped)RegionSet objects
- The comparing method (__lt__) was correct in CroppedRegionSet but not
  in RegionSet. To prevent this issue from happening again, the
  RegionSetWrapper now has the regiondir property, too
- Fixes Issue: #1706
- Example config: see below

def testFilter(poi):
    if poi['id'] == 'Town':
        return poi['name']
def townFilter(poi):
    if poi['id'] == 'Town':
        return poi['name']

renders["normalrender"] = {
    "world": "Test12985",
    "title": "Normal Render of Testworld",
    'markers': [dict(name="Towns", filterFunction=townFilter), dict(name="Test", filterFunction=testFilter)],
}

renders["secondrender"] = {
    "world": "Test12985",
    "title": "Second Render of Testworld",
    "crop": (180, -230, 220, -260),
    'markers': [dict(name="Towns", filterFunction=townFilter), dict(name="Test", filterFunction=testFilter)],
}
2020-02-06 20:14:08 +01:00
Auron956
a3960bd419 Fix chest rendering by using 'type' property
Resolves an issue where chests with more than one adjacent chest would
fail to render. Instead of distinguishing double from single chests by
checking for the presence of adjacent chests, use the provided "type"
property of chests to determine if they are single or the left/right
part of a double chest.
2020-02-04 00:16:28 +00:00