0
Commit Graph

295 Commits

Author SHA1 Message Date
Joseph Camp
a839fa437d C: Amend logic in block_class_is_wall()
Resolves an issue where this function would mistakenly identify
various non-wall blocks as walls
2020-08-06 23:24:12 +00:00
Nicolas F
1d40ea77d4 nether: move nether roof blocks into new class 2020-08-05 19:01:52 +02:00
InrcedibleHolg
0a9d1961c5 add soul_soil, nether_gold_ore, removelist 2020-08-04 19:38:23 +02:00
InrcedibleHolg
3ac090a7a0 nether biomes 2020-07-17 00:21:29 +02:00
Nicolas F
fcb3f2644d Shuffle around wall IDs, change wall check
Previously, walls were all numbered at 21000+. This is bad because
our blockmap is an array, so this caused our blockmap to take up
80 MiB of RAM in each worker process.

This commit changes the wall numbering, and exploits some bitmasking
to have the wall check run in constant time no matter how many walls
there are. This is done with a simple mask and xor to check the prefix.

RAM usage for the blockmap thus drops to like 44 MiB.

This is in preparation for adding more walls for 1.16.
2020-07-13 19:15:47 +02:00
Nicolas F
fd2c0a057a Add blackstone and netherite blocks 2020-07-03 13:10:23 +02:00
Nicolas F
bc56346bad Initial 1.16 block work
- Add ancient debris
- Add basalt
- Add polished basalt
- Add soul campfire
2020-07-03 13:10:23 +02:00
Nicolas F
d362e1512d overlay-mineral: fix tuple parse data type
Was a byte, should've been an unsigned short.

Fixes #1801.
2020-07-03 13:06:46 +02:00
Joseph Camp
ab0f6ab388 overviewer.h: Bump extension version 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
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
70ce68da4b Add Jigsaw block 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
InrcedibleHolg
8c08b44a38 add flowers and berries 2020-06-13 16:45:50 +02:00
Nicolas F
51efdbaa4e overviewer.h: bump extension version 2020-02-14 21:26:34 +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
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
Daniel Grimwood
de5f27c446 Fixes #1659 by testing both 8 and 9 for water blockid 2019-12-29 15:38:56 +08:00
Gijs Oortgiese
885fa75f54 Add bee_hive, beenest, honeycom_block and honey_block 2019-12-27 14:17:34 +01:00
Nicolas F
0b74d26c49 Completely change biome code again
Turns out my previous grasp of how Minecraft does this was wrong.

This seems to be the correct way. One side effect is that biome data
now has less resolution. One only really notices this when looking at
water, for which Minecraft does not even use the water colours for
in-game, otherwise I can't really tell a big difference.

Fixes #1698.
2019-12-23 23:50:20 +01:00
Nicolas F
268938a706 Fix biomes for Minecraft 1.15
Fixes #1650.

Mojang changed the biomes code so that it now can have different
biomes for different Y levels. We need to adjust our logic accordingly,
which is done through some small BiomeDispensary class where we shove
a numpy'd Mojang array in and can then read out the biomes for each level.

Biome data is now stored per-section, which needed some changes on the C
side of things. I didn't change anything in the biome overlay code so
I wouldn't be surprised if it's broken now, but for the time being I'd
rather have 1.15 fixed than some obscure overlay.

Tested to work with 1.14 and 1.15 data. No new biomes have been added
to the code yet.
2019-12-10 23:12:16 +01:00
Ian Salmons
9e27e6adc9 add composter 2019-11-01 11:45:00 +01:00
InrcedibleHolg
3c3e958eae add bamboo 2019-11-01 10:50:20 +01:00
InrcedibleHolg
17bb942b94 add missing smooth_red_sandstone_stairs 2019-10-27 11:46:20 +01:00
Florian Graf
935bdb847d feat: added 1.14 scaffolding block 2019-10-27 09:10:55 +01:00
InrcedibleHolg
20fde52236 add new stone walls 2019-10-27 09:07:00 +01:00
Gijs Oortgiese
7342085140 Created seperate sapling blocks and added bamboo_sapling 2019-08-21 09:44:37 +02:00
Nicolas F
3498641d4e Merge rebased sign changes from Gyzie's 1-14-signs (#1627) 2019-08-19 12:36:57 +02:00
Gijs Oortgiese
f73e5d92ff Added sign variants added in 1.14 2019-08-19 12:35:56 +02:00
InrcedibleHolg
cdcb88b0f2 Implement new stairs fix stone stairs and slabs
added code change requests by @CounterPillow
2019-08-17 11:09:03 +02:00
Nicolas F
3b96158fb4 Implement smooth sandstone stairs 2019-08-06 14:26:03 +02:00
Nicolas F
b28073c3a7 Increase overviewer C extension version to 71 2019-08-02 17:12:04 +02:00
InrcedibleHolg
a5d9787071 Lantern implemented
enforcing coding style
2019-07-30 14:43:04 +02:00
Nicolas F
7e2cb56c1b Implement some mossy blocks
This adds:
- mossy stone brick stairs
- mossy cobblestone stairs
- mossy stone brick walls

We also add another block class for walls, and while we're at it,
clean up the stairs texture function to not have a huge sprawling
elif mess for loading textures, but instead to a cheeky dictionary
lookup.

In case you're wondering, yes I am just as disgusted by this code as
you are.
2019-07-15 17:23:25 +02:00
Nicolas F
634e13c92c Merge branch 'workstations' of https://github.com/IncredibleHolg/Minecraft-Overviewer 2019-07-13 17:37:58 +02:00
InrcedibleHolg
419889c1f1 add workstations: blastfurnace, smoker, lectern, loom, stonecutter and grindstone 2019-07-12 21:16:22 +02:00
Nicolas F
aeeaadd5bb Bump C extension version to 68 2019-07-12 15:27:42 +02:00
Wunkolo
4298aea569 Fix GCC signed-unsigned and pointer-warnings (#1608)
* Fix GCC signed-unsigned and pointer-warnings

A lot of the signed/unsigned issues are related to the fact that I converted
a lot of indexing values to use unsigned types, little did I know that a lot of
other values used when indexing actually come from the python-end. Python does
not have built-in unsigned types so all integers coming from Python are signed
implicitly so a lot of things like image-size and x, y coordiantes are specially
handling negative-integer cases.

Guess we'll just take our `int32_t i = 0; i < blah; ++i` and like it.

Code now compiles with no warnings or nagging.
2019-07-12 15:26:45 +02:00
Nicolas F
221b2c6805 Bump C extension version to 67 2019-07-10 18:37:38 +02:00
Nicolas F
4f3c7368ba Merge branch 'posix-types' of Wunkolo (#1598) 2019-07-10 18:36:32 +02:00
Nicolas F
6b0ccc1513 src/primitives/base: don't try to free nullpointer
If loading the grass and foliage biome colour fails, Overviewer doesn't
necessarily crash, it just renders everything gray, apart from one small
issue: in trying to call base_finish, it'd crash trying to decrease the
reference of a null pointer.
2019-07-06 23:15:55 +02:00
Wunkolo
22840d5a97 Implement straggler standard integer types 2019-06-26 10:29:10 -07:00
Wunkolo
5b212dc585 Implement standard C boolean type 2019-06-25 14:19:12 -07:00
Wunkolo
d738c21852 Propagate block, bool, standard integer types across codebase
Posix type integer pass

Propagate block, bool, integer types across codebase

Add standard integer types to prototypes
2019-06-25 11:56:11 -07:00
Wunkolo
8162f3f877 Add .clang_format
Also applies clang-format to the current code base, using command:
`find . -regex '.*\.\(c\|h\)' -exec clang-format -style=file -i {} \;`
2019-06-23 18:43:32 -07:00