Hi there, I've written a patch for Synfig to export PNG Spritesheets. For further information please take a look at the patch file.
Please let me know if you will use it or if there is anything I need to change. And thanks for this great software :) Greetings, LittleFox
From f83307c71f1a5e44dd19b269e2362d38a3186e95 Mon Sep 17 00:00:00 2001 From: "Moritz Grosch (LittleFox)" <little...@fsfe.org> Date: Sun, 13 Oct 2013 20:26:49 +0200 Subject: [PATCH] Added target png_spritesheet png_spritesheet is a target to put all frames in a single png file. The frames are drawn vertically below each other. I think it's a good start for this feature request: http://www.synfig.org/issues/thebuggenie/synfig/issues/222 Although not everything wished there is implemented. It's only a modification of the target png, there is no way to set the space between two frames or to draw them horizontally. Anyway it's useful for me and, I'm sure, for many others. Please let me know if there are any questions left --- synfig-core/src/modules/mod_png/Makefile.am | 2 + synfig-core/src/modules/mod_png/main.cpp | 2 + .../src/modules/mod_png/trgt_png_spritesheet.cpp | 246 +++++++++++++++++++++ .../src/modules/mod_png/trgt_png_spritesheet.h | 78 +++++++ 4 files changed, 328 insertions(+) create mode 100644 synfig-core/src/modules/mod_png/trgt_png_spritesheet.cpp create mode 100644 synfig-core/src/modules/mod_png/trgt_png_spritesheet.h diff --git a/synfig-core/src/modules/mod_png/Makefile.am b/synfig-core/src/modules/mod_png/Makefile.am index d206a16..a33dcb4 100644 --- a/synfig-core/src/modules/mod_png/Makefile.am +++ b/synfig-core/src/modules/mod_png/Makefile.am @@ -18,6 +18,8 @@ libmod_png_la_SOURCES = \ main.cpp \ trgt_png.cpp \ trgt_png.h \ + trgt_png_spritesheet.cpp \ + trgt_png_spritesheet.h \ trgt_cairo_png.cpp \ trgt_cairo_png.h \ mptr_png.cpp \ diff --git a/synfig-core/src/modules/mod_png/main.cpp b/synfig-core/src/modules/mod_png/main.cpp index e9bf2b8..adfe87c 100644 --- a/synfig-core/src/modules/mod_png/main.cpp +++ b/synfig-core/src/modules/mod_png/main.cpp @@ -36,6 +36,7 @@ #include "png.h" #include <synfig/module.h> #include "trgt_png.h" +#include "trgt_png_spritesheet.h" #include "trgt_cairo_png.h" #include "mptr_png.h" #include "mptr_cairo_png.h" @@ -55,6 +56,7 @@ MODULE_INVENTORY_BEGIN(mod_png) BEGIN_TARGETS TARGET(cairo_png_trgt) TARGET(png_trgt) + TARGET(png_trgt_spritesheet) END_TARGETS BEGIN_IMPORTERS IMPORTER(png_mptr) diff --git a/synfig-core/src/modules/mod_png/trgt_png_spritesheet.cpp b/synfig-core/src/modules/mod_png/trgt_png_spritesheet.cpp new file mode 100644 index 0000000..25d2002 --- /dev/null +++ b/synfig-core/src/modules/mod_png/trgt_png_spritesheet.cpp @@ -0,0 +1,246 @@ +/* === S Y N F I G ========================================================= */ +/*! \file trgt_png_spriteengine.cpp +** \brief png_trgt Target Module +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore +** Copyright (c) 2013 Moritz Grosch (LittleFox) <little...@fsfe.org> +** +** Based on trgt_png.cpp +** +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal +** +** === N O T E S =========================================================== +** +** ========================================================================= */ + +/* === H E A D E R S ======================================================= */ + +#ifdef USING_PCH +# include "pch.h" +#else +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include "trgt_png_spritesheet.h" +#include <png.h> +#include <ETL/stringf> +#include <cstdio> +#include <algorithm> +#include <functional> +#include <ETL/misc> + +#endif + +/* === M A C R O S ========================================================= */ + +using namespace synfig; +using namespace std; +using namespace etl; + +/* === G L O B A L S ======================================================= */ + +SYNFIG_TARGET_INIT(png_trgt_spritesheet); +SYNFIG_TARGET_SET_NAME(png_trgt_spritesheet,"png_spritesheet"); +SYNFIG_TARGET_SET_EXT(png_trgt_spritesheet,"png_spritesheet"); +SYNFIG_TARGET_SET_VERSION(png_trgt_spritesheet,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(png_trgt_spritesheet,"$Id$"); + +/* === M E T H O D S ======================================================= */ + +void +png_trgt_spritesheet::png_out_error(png_struct *png_data,const char *msg) +{ + png_trgt_spritesheet *me=(png_trgt_spritesheet*)png_get_error_ptr(png_data); + synfig::error(strprintf("png_trgt_spritesheet: error: %s",msg)); + me->ready=false; +} + +void +png_trgt_spritesheet::png_out_warning(png_struct *png_data,const char *msg) +{ + png_trgt_spritesheet *me=(png_trgt_spritesheet*)png_get_error_ptr(png_data); + synfig::warning(strprintf("png_trgt_spritesheet: warning: %s",msg)); + me->ready=false; +} + + +//Target *png_trgt::New(const char *filename){ return new png_trgt(filename);} + +png_trgt_spritesheet::png_trgt_spritesheet(const char *Filename, + const synfig::TargetParam& params ) +{ + file=NULL; + filename=Filename; + buffer=NULL; + ready=false; + initialized = false; + color_buffer=0; + sequence_separator=params.sequence_separator; + + if(filename=="-") + { + file=stdout; + } + + file=fopen(filename.c_str(),POPEN_BINARY_WRITE_TYPE); +} + +png_trgt_spritesheet::~png_trgt_spritesheet() +{ + if(file) + { + png_write_end(png_ptr,info_ptr); + png_destroy_write_struct(&png_ptr, &info_ptr); + + fclose(file); + } + file=NULL; + + delete[] buffer; + delete[] color_buffer; +} + +bool +png_trgt_spritesheet::set_rend_desc(RendDesc *given_desc) +{ + if(!file) + return false; + + //given_desc->set_pixel_format(PixelFormat((int)PF_RGB|(int)PF_A)); + desc=*given_desc; + imagecount=desc.get_frame_start(); + lastimage=desc.get_frame_end(); + numimages = (lastimage - imagecount) + 1; + + + + return true; +} + +void +png_trgt_spritesheet::end_frame() +{ + imagecount++; + ready=false; +} + +bool +png_trgt_spritesheet::start_frame(synfig::ProgressCallback *callback) +{ + if(!initialized) + { + png_ptr=png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)this,png_out_error, png_out_warning); + if (!png_ptr) + { + synfig::error("Unable to setup PNG struct"); + fclose(file); + return false; + } + + info_ptr= png_create_info_struct(png_ptr); + if (!info_ptr) + { + synfig::error("Unable to setup PNG info struct"); + fclose(file); + png_destroy_write_struct(&png_ptr,(png_infopp)NULL); + return false; + } + + if (setjmp(png_jmpbuf(png_ptr))) + { + synfig::error("Unable to setup longjump"); + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(file); + return false; + } + png_init_io(png_ptr,file); + png_set_filter(png_ptr,0,PNG_FILTER_NONE); + + synfig::warning(strprintf("%dx%d - %d/%d/%d", desc.get_w(), desc.get_h(), imagecount, lastimage, numimages).c_str()); + + setjmp(png_jmpbuf(png_ptr)); + png_set_IHDR(png_ptr,info_ptr,desc.get_w(),desc.get_h() * numimages,8,PNG_COLOR_TYPE_RGBA,PNG_INTERLACE_NONE,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); + + // Write the gamma + //png_set_gAMA(png_ptr, info_ptr,1.0/gamma().get_gamma()); + png_set_gAMA(png_ptr, info_ptr,gamma().get_gamma()); + + // Write the physical size + png_set_pHYs(png_ptr,info_ptr,round_to_int(desc.get_x_res()),round_to_int(desc.get_y_res()),PNG_RESOLUTION_METER); + + char title [] = "Title"; + char description[] = "Description"; + char software [] = "Software"; + char synfig [] = "SYNFIG"; +// char copyright [] = "Copyright"; +// char voria [] = "(c) 2004 Voria Studios, LLC"; + + // Output any text info along with the file + png_text comments[]= + { + { PNG_TEXT_COMPRESSION_NONE, title, const_cast<char *>(get_canvas()->get_name().c_str()), + strlen(get_canvas()->get_name().c_str()) + }, + { PNG_TEXT_COMPRESSION_NONE, description, const_cast<char *>(get_canvas()->get_description().c_str()), + strlen(get_canvas()->get_description().c_str()) + }, +// { PNG_TEXT_COMPRESSION_NONE, copyright, voria, strlen(voria) }, + { PNG_TEXT_COMPRESSION_NONE, software, synfig, strlen(synfig) }, + }; + png_set_text(png_ptr,info_ptr,comments,sizeof(comments)/sizeof(png_text)); + + png_write_info_before_PLTE(png_ptr, info_ptr); + png_write_info(png_ptr, info_ptr); + + initialized = true; + } + + + if(callback)callback->task(strprintf("%s, (frame %d/%d)", filename.c_str(), imagecount - (lastimage - numimages), numimages).c_str()); + + ready=true; + return true; +} + +Color * +png_trgt_spritesheet::start_scanline(int /*scanline*/) +{ + if(buffer) + delete buffer; + + if(color_buffer) + delete color_buffer; + + buffer = new unsigned char[4 * desc.get_w()]; + color_buffer = new Color[desc.get_w()]; + + return color_buffer; +} + +bool +png_trgt_spritesheet::end_scanline() +{ + if(!file || !ready) + return false; + + convert_color_format(buffer, color_buffer, desc.get_w(), PF_RGB|PF_A, gamma()); + + setjmp(png_jmpbuf(png_ptr)); + png_write_row(png_ptr,buffer); + + return true; +} diff --git a/synfig-core/src/modules/mod_png/trgt_png_spritesheet.h b/synfig-core/src/modules/mod_png/trgt_png_spritesheet.h new file mode 100644 index 0000000..ace46a4 --- /dev/null +++ b/synfig-core/src/modules/mod_png/trgt_png_spritesheet.h @@ -0,0 +1,78 @@ +/* === S Y N F I G ========================================================= */ +/*! \file trgt_png_spritesheet.h +** \brief Template Header +** +** $Id$ +** +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2013 Moritz Grosch (LittleFox) <little...@fsfe.org> +** +** Based on trgt_png.h +** +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal +** +** === N O T E S =========================================================== +** +** ========================================================================= */ + +/* === S T A R T =========================================================== */ + +#ifndef __SYNFIG_TRGT_PNG_SPRITESHEET_H +#define __SYNFIG_TRGT_PNG_SPRITESHEET_H + +/* === H E A D E R S ======================================================= */ + +#include <png.h> +#include <synfig/target_scanline.h> +#include <synfig/string.h> +#include <synfig/targetparam.h> +#include <cstdio> + +/* === M A C R O S ========================================================= */ + +/* === T Y P E D E F S ===================================================== */ + +/* === C L A S S E S & S T R U C T S ======================================= */ + +class png_trgt_spritesheet : public synfig::Target_Scanline +{ + SYNFIG_TARGET_MODULE_EXT +private: + FILE *file; + png_structp png_ptr; + png_infop info_ptr; + + static void png_out_error(png_struct *png,const char *msg); + static void png_out_warning(png_struct *png,const char *msg); + bool ready; + bool initialized; + int imagecount, lastimage, numimages; + synfig::String filename; + unsigned char *buffer; + synfig::Color *color_buffer; + synfig::String sequence_separator; +public: + png_trgt_spritesheet(const char *filename, const synfig::TargetParam& /* params */); + virtual ~png_trgt_spritesheet(); + + virtual bool set_rend_desc(synfig::RendDesc *desc); + virtual bool start_frame(synfig::ProgressCallback *cb); + virtual void end_frame(); + + virtual synfig::Color * start_scanline(int scanline); + virtual bool end_scanline(); +}; + +/* === E N D =============================================================== */ + +#endif -- 1.8.4.rc3
signature.asc
Description: This is a digitally signed message part
------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
