diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/MinedMap.cpp | 49 | ||||
| -rw-r--r-- | src/PNG.cpp | 75 | ||||
| -rw-r--r-- | src/PNG.hpp | 37 |
4 files changed, 119 insertions, 44 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6241e27..8815881 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,8 @@ add_executable(MinedMap MinedMap.cpp GZip.cpp Info.cpp + PNG.cpp + NBT/Tag.cpp Resource/Biome.cpp Resource/BlockType.cpp diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp index 004d39e..2cd90d4 100644 --- a/src/MinedMap.cpp +++ b/src/MinedMap.cpp @@ -25,6 +25,7 @@ #include "Info.hpp" +#include "PNG.hpp" #include "World/Level.hpp" #include "World/Region.hpp" @@ -34,15 +35,12 @@ #include <cstring> #include <cstdlib> #include <iostream> -#include <set> -#include <system_error> #include <sys/types.h> #include <arpa/inet.h> #include <dirent.h> #include <fcntl.h> -#include <png.h> #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> @@ -54,52 +52,15 @@ using namespace MinedMap; static const size_t DIM = World::Region::SIZE*World::Chunk::SIZE; -static void addChunk(uint32_t image[DIM][DIM], size_t X, size_t Z, const World::Chunk *chunk) { +static void addChunk(uint32_t image[DIM*DIM], size_t X, size_t Z, const World::Chunk *chunk) { World::Chunk::Blocks layer = chunk->getTopLayer(); for (size_t x = 0; x < World::Chunk::SIZE; x++) { for (size_t z = 0; z < World::Chunk::SIZE; z++) - image[Z*World::Chunk::SIZE+z][X*World::Chunk::SIZE+x] = htonl(layer.blocks[x][z].getColor()); + image[(Z*World::Chunk::SIZE+z)*DIM + X*World::Chunk::SIZE+x] = htonl(layer.blocks[x][z].getColor()); } } -static void writePNG(const char *filename, const uint32_t data[DIM][DIM]) { - std::FILE *f = std::fopen(filename, "wb"); - if (!f) - throw std::system_error(errno, std::generic_category(), "unable to open output file"); - - png_structp png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); - if (!png_ptr) - throw std::runtime_error("unable to create PNG write struct"); - - png_infop info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) { - png_destroy_write_struct(&png_ptr, nullptr); - throw std::runtime_error("unable to create PNG info struct"); - } - - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - std::fclose(f); - throw std::runtime_error("unable to write PNG file"); - } - - png_init_io(png_ptr, f); - - png_set_IHDR(png_ptr, info_ptr, DIM, DIM, 8, PNG_COLOR_TYPE_RGB_ALPHA, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - - uint8_t *row_pointers[World::Region::SIZE*World::Chunk::SIZE]; - for (size_t i = 0; i < World::Region::SIZE*World::Chunk::SIZE; i++) - row_pointers[i] = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(data[i])); - - png_set_rows(png_ptr, info_ptr, row_pointers); - png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); - - png_destroy_write_struct(&png_ptr, &info_ptr); - std::fclose(f); -} - static void doRegion(const std::string &input, const std::string &output) { struct stat instat, outstat; @@ -121,10 +82,10 @@ static void doRegion(const std::string &input, const std::string &output) { const std::string tmpfile = output + ".tmp"; try { - uint32_t image[DIM][DIM] = {}; + uint32_t image[DIM*DIM] = {}; World::Region::visitChunks(input.c_str(), [&image] (size_t X, size_t Z, const World::Chunk *chunk) { addChunk(image, X, Z, chunk); }); - writePNG(tmpfile.c_str(), image); + writePNG(tmpfile.c_str(), image, DIM, DIM); struct timespec times[2] = {instat.st_mtim, instat.st_mtim}; if (utimensat(AT_FDCWD, tmpfile.c_str(), times, 0) < 0) diff --git a/src/PNG.cpp b/src/PNG.cpp new file mode 100644 index 0000000..1e25712 --- /dev/null +++ b/src/PNG.cpp @@ -0,0 +1,75 @@ +/* + Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#include "PNG.hpp" + +#include <cerrno> +#include <cstdio> +#include <system_error> + +#include <png.h> + + +namespace MinedMap { + +void writePNG(const char *filename, const uint32_t *data, size_t width, size_t height) { + std::FILE *f = std::fopen(filename, "wb"); + if (!f) + throw std::system_error(errno, std::generic_category(), "unable to open output file"); + + png_structp png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); + if (!png_ptr) + throw std::runtime_error("unable to create PNG write struct"); + + png_infop info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) { + png_destroy_write_struct(&png_ptr, nullptr); + throw std::runtime_error("unable to create PNG info struct"); + } + + if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + std::fclose(f); + throw std::runtime_error("unable to write PNG file"); + } + + png_init_io(png_ptr, f); + + png_set_IHDR(png_ptr, info_ptr, width, height, 8, PNG_COLOR_TYPE_RGB_ALPHA, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + uint8_t *row_pointers[height]; + for (size_t i = 0; i < height; i++) + row_pointers[i] = const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(&data[i*width])); + + png_set_rows(png_ptr, info_ptr, row_pointers); + png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); + + png_destroy_write_struct(&png_ptr, &info_ptr); + std::fclose(f); +} + +} diff --git a/src/PNG.hpp b/src/PNG.hpp new file mode 100644 index 0000000..62a9437 --- /dev/null +++ b/src/PNG.hpp @@ -0,0 +1,37 @@ +/* + Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#pragma once + +#include <cstddef> +#include <cstdint> + + +namespace MinedMap { + +void writePNG(const char *filename, const uint32_t *data, size_t width, size_t height); + +} |