Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 47

synfig.spec Changed

@@ -56,8 +56,8 @@
 BuildRequires:  pkgconfig(pangocairo)
 BuildRequires:  pkgconfig(sigc++-2.0)
 BuildRequires:  pkgconfig(zlib)
-Summary:        Shared library part of %name
-Requires:       %name-modules = %version
+Summary:        Shared library part of %pkg
+Requires:       %pkg-modules = %version-%release
 
 %description -n %soname%sover
 Vector based 2D animation render.
@@ -65,34 +65,34 @@
 This package contains the shared library.
 
 %package        modules
-Summary:        Shared library part of %name
-Requires:       %name = %version
+Summary:        Shared library part of %pkg
+Requires:       %pkg = %version-%release
 
 %description    modules
 Vector based 2D animation render.
 
-This package contains modules for %name.
+This package contains modules for %pkg.
 
 %package        devel
-Summary:        Header files and static library for the %name library
-Requires:       %soname%sover = %version
-Provides:       %soname-devel = %version
-Obsoletes:      %soname-devel < %version
+Summary:        Header files and static library for the %pkg library
+Requires:       %soname%sover = %version-%release
+Provides:       %soname-devel = %version-%release
+Obsoletes:      %soname-devel < %version-%release
 
 %description    devel
 Vector based 2D animation render.
 
 This package contains the pkgconfig, header files and libraries needed to
-develop application that use %name.
+develop application that use %pkg.
 
 %package        doc
-Summary:        Documentation for %name
+Summary:        Documentation for %pkg
 BuildArch:      noarch
 
 %description    doc
 Vector based 2D animation render.
 
-This package provides documentation and several examples for %name.
+This package provides documentation and several examples for %pkg.
 
 %lang_package
 %endif
@@ -116,8 +116,8 @@
 BuildRequires:  pkgconfig(synfig)
 BuildRequires:  pkgconfig(gtkmm-3.0)
 BuildRequires:  pkgconfig(fontconfig)
-Summary:        Shared library part of %name
-Requires:       %name-modules = %version
+Summary:        Shared library part of %pkg
+Requires:       %pkg = %version
 
 %description -n synfigstudio
 %endif
@@ -148,7 +148,7 @@
 bash -x bootstrap.sh
 %endif
 CFLAGS='%optflags -Wno-deprecated-declarations'
-CXXFLAGS='%optflags -Wno-deprecated-declarations'
+CXXFLAGS='%optflags -Wno-deprecated-declarations -Wno-unused-parameter'
 %configure --help
 %configure \
 	--disable-update-mimedb \
@@ -169,7 +169,7 @@
 
 %if "%build_flavor" == ""
 popd
-%find_lang %name %{?no_lang_C} --without-gnome --without-kde
+%find_lang %pkg %{?no_lang_C} --without-gnome --without-kde
 
 find %buildroot -type f -name '*.la' -print -delete
 
@@ -196,7 +196,7 @@
 %files doc
 %dir %_libdir/%pkg
 
-%files lang -f %name.lang
+%files lang -f %pkg.lang
 %endif
 #
 %if "%build_flavor" == "ETL"

_service Changed

@@ -230,16 +230,7 @@
 		<param name="exclude">synfig-studio/TODO</param>
 		<param name="exclude">synfig-studio/analyze-clang.sh</param>
 		<param name="exclude">synfig-studio/analyze_cppcheck.sh</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/04_pen.myb</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/04_pen_prev.png</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/08_pen.myb</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/08_pen_prev.png</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/Big_BG.myb</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/Big_BG_prev.png</param>
 		<param name="exclude">synfig-studio/brushes/CD_concept/CMakeLists.txt</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/Eraser.myb</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/Eraser_prev.png</param>
-		<param name="exclude">synfig-studio/brushes/CD_concept/readme.txt</param>
 		<param name="exclude">synfig-studio/brushes/CMakeLists.txt</param>
 		<param name="exclude">synfig-studio/build_tools</param>
 		<param name="exclude">synfig-studio/config</param>
@@ -583,18 +574,11 @@
 		<param name="exclude">synfig-studio/sounds/readme.txt</param>
 		<param name="exclude">synfig-studio/sounds/renderdone.wav</param>
 		<param name="exclude">synfig-studio/src/CMakeLists.txt</param>
-		<param name="exclude">synfig-studio/src/brushlib.h</param>
 		<param name="exclude">synfig-studio/src/brushlib/README</param>
 		<param name="exclude">synfig-studio/src/brushlib/SConscript</param>
 		<param name="exclude">synfig-studio/src/brushlib/__init__.py</param>
-		<param name="exclude">synfig-studio/src/brushlib/brush.hpp</param>
-		<param name="exclude">synfig-studio/src/brushlib/brushlib.hpp</param>
-		<param name="exclude">synfig-studio/src/brushlib/brushsettings.hpp</param>
 		<param name="exclude">synfig-studio/src/brushlib/brushsettings.py</param>
 		<param name="exclude">synfig-studio/src/brushlib/generate.py</param>
-		<param name="exclude">synfig-studio/src/brushlib/helpers.hpp</param>
-		<param name="exclude">synfig-studio/src/brushlib/mapping.hpp</param>
-		<param name="exclude">synfig-studio/src/brushlib/surface.hpp</param>
 		<param name="exclude">synfig-studio/src/config.h.cmake.in</param>
 		<param name="exclude">synfig-studio/src/gui/CMakeLists.txt</param>
 		<param name="exclude">synfig-studio/src/gui/_smach.h</param>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/04_pen.myb Added

@@ -0,0 +1,43 @@
+# mypaint brush file
+# you can edit this file and then select the brush in mypaint (again) to reload
+version 2
+tracking_noise 0.0
+speed2_gamma 4.0
+speed2_slowness 0.8
+stroke_holdtime 10.0
+stroke_duration_logarithmic 1.18
+slow_tracking 5.9
+change_color_v 0.0
+elliptical_dab_ratio 1.0
+change_color_h 0.0
+change_color_l 0.0
+offset_by_speed_slowness 1.0
+speed1_gamma 2.87
+slow_tracking_per_dab 5.99
+dabs_per_basic_radius 2.18
+opaque 1.0
+color_s 1.0
+opaque_multiply 0.0 | pressure (0.000000 0.000000), (0.015000 0.000000), (0.111765 0.958333), (1.000000 1.000000)
+elliptical_dab_angle 90.0
+lock_alpha 0.0
+eraser 0.0
+stroke_threshold 0.0
+color_h 0.188217257994
+smudge_radius_log 0.0
+speed1_slowness 0.04
+smudge 0.0
+change_color_hsv_s 0.0
+radius_by_random 0.0
+dabs_per_second 15.82
+color_v 0.0
+custom_input 0.0
+hardness 0.3
+opaque_linearize 0.46
+smudge_length 0.5
+radius_logarithmic 0.78 | pressure (0.000000 -0.537760), (0.088235 -0.464844), (0.139706 -0.218750), (0.169118 0.000000), (0.500000 0.000000), (1.000000 0.000000) | speed1 (0.000000 -0.000000), (0.582609 -0.000000), (1.617391 -0.250000), (2.747826 -0.708333), (4.000000 -2.000000)
+change_color_hsl_s 0.0
+custom_input_slowness 0.0
+offset_by_speed 0.0
+dabs_per_actual_radius 2.2
+offset_by_random 0.0
+direction_filter 2.0

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/04_pen_prev.png Added

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/08_pen.myb Added

@@ -0,0 +1,44 @@
+# mypaint brush file
+# you can edit this file and then select the brush in mypaint (again) to reload
+version 2
+tracking_noise 0.0
+speed2_gamma 4.0
+speed2_slowness 0.8
+stroke_holdtime 10.0
+stroke_duration_logarithmic 1.18
+slow_tracking 5.9
+change_color_v 0.0
+elliptical_dab_ratio 1.0
+change_color_h 0.0
+change_color_l 0.0
+offset_by_speed_slowness 1.0
+speed1_gamma 2.87
+slow_tracking_per_dab 5.99
+dabs_per_basic_radius 2.18
+opaque 1.0
+color_s 0.0
+opaque_multiply 0.0 | pressure (0.000000 0.000000), (0.015000 0.000000), (0.041304 0.854167), (1.000000 1.000000)
+elliptical_dab_angle 90.0
+lock_alpha 0.0
+eraser 0.0
+stroke_threshold 0.0
+color_h 0.0
+parent_brush_name CA_concept%2F08_pen%231
+smudge_radius_log 0.0
+speed1_slowness 0.04
+smudge 0.0
+change_color_hsv_s 0.0
+radius_by_random 0.0
+dabs_per_second 15.82
+color_v 0.0
+custom_input 0.0
+hardness 0.46
+opaque_linearize 0.46
+smudge_length 0.5
+radius_logarithmic 1.19 | pressure (0.000000 -0.537760), (0.088235 -0.464844), (0.139706 -0.218750), (0.169118 0.000000), (0.500000 0.000000), (1.000000 0.000000) | speed1 (0.000000 -0.000000), (0.582609 -0.000000), (1.617391 -0.250000), (2.747826 -0.708333), (4.000000 -2.000000)
+change_color_hsl_s 0.0
+custom_input_slowness 0.0
+offset_by_speed 0.0
+dabs_per_actual_radius 2.2
+offset_by_random 0.0
+direction_filter 2.0

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/08_pen_prev.png Added

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/Big_BG.myb Added

@@ -0,0 +1,43 @@
+# mypaint brush file
+# you can edit this file and then select the brush in mypaint (again) to reload
+version 2
+tracking_noise 0.0
+speed2_gamma 4.0
+speed2_slowness 0.9
+stroke_holdtime 0.0
+stroke_duration_logarithmic 4.0
+slow_tracking 0.0
+change_color_v 0.0
+elliptical_dab_ratio 10.0 | speed1 (0.000000 -7.500000), (0.962963 -2.031250), (4.000000 0.000000)
+change_color_h 0.0
+change_color_l 0.0
+offset_by_speed_slowness 1.0
+speed1_gamma 4.0
+slow_tracking_per_dab 0.0
+dabs_per_basic_radius 2.21
+opaque 0.0276044544717 | pressure (0.000000 1.000000), (1.000000 1.000000)
+color_s 0.312922107159
+opaque_multiply 0.0 | pressure (0.000000 0.000000), (0.058642 0.259792), (1.000000 0.430000)
+elliptical_dab_angle 19.29 | direction (0.000000 0.000000), (180.000000 180.000000)
+lock_alpha 0.0
+eraser 0.0
+stroke_threshold 0.0
+color_h 0.639299680067
+smudge_radius_log -1.6
+speed1_slowness 0.04
+smudge 0.9
+change_color_hsv_s 0.0
+radius_by_random 0.0
+dabs_per_second 28.87
+color_v 0.167370007536
+custom_input 0.0
+hardness 0.88
+opaque_linearize 0.9
+smudge_length 0.0
+radius_logarithmic 3.8 | pressure (0.000000 0.000000), (1.000000 1.530000)
+change_color_hsl_s 0.0
+custom_input_slowness 0.0
+offset_by_speed 0.0
+dabs_per_actual_radius 0.0
+offset_by_random 0.0
+direction_filter 2.0

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/Big_BG_prev.png Added

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/Eraser.myb Added

@@ -0,0 +1,44 @@
+# mypaint brush file
+# you can edit this file and then select the brush in mypaint (again) to reload
+version 2
+tracking_noise 0.0
+speed2_gamma 4.0
+speed2_slowness 0.9
+stroke_holdtime 0.0
+stroke_duration_logarithmic 4.0
+slow_tracking 0.0
+change_color_v 0.0
+elliptical_dab_ratio 10.0 | speed1 (0.000000 -7.500000), (0.962963 -2.031250), (4.000000 0.000000)
+change_color_h 0.0
+change_color_l 0.0
+offset_by_speed_slowness 1.0
+speed1_gamma 4.0
+slow_tracking_per_dab 0.0
+dabs_per_basic_radius 2.21
+opaque 1.69 | pressure (0.000000 0.927083), (1.000000 1.000000)
+color_s 0.0
+opaque_multiply 0.0 | pressure (0.000000 0.000000), (0.058642 0.259792), (1.000000 0.430000)
+elliptical_dab_angle 90.0 | direction (0.000000 0.000000), (180.000000 180.000000)
+lock_alpha 0.0
+eraser 1.0
+stroke_threshold 0.0
+color_h 0.0
+parent_brush_name CA_concept%2FEraser%231
+smudge_radius_log 0.0
+speed1_slowness 0.04
+smudge 0.9
+change_color_hsv_s 0.0
+radius_by_random 0.0
+dabs_per_second 11.08
+color_v 0.0
+custom_input 0.0
+hardness 0.52
+opaque_linearize 0.9
+smudge_length 0.5
+radius_logarithmic 1.68 | pressure (0.000000 0.000000), (1.000000 1.970000)
+change_color_hsl_s 0.0
+custom_input_slowness 0.0
+offset_by_speed 0.0
+dabs_per_actual_radius 0.0
+offset_by_random 0.0
+direction_filter 2.0

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/Eraser_prev.png Added

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/brushes/CD_concept/readme.txt Added

@@ -0,0 +1,26 @@
+
+================================================
+MyPaint 0.9.0 (or later) BrushPackage release                                                          
+*****  "Concept Design (C_D)"  *****                           
+                                               
+www.ramonmiranda.com 
+mirandagraphic@gmail.com                                           
+================================================
+A briefs words...
+-----------------
+"Concept Design" idea comes from conceptual design, where Markers and inks are very useful. I thought that it would be fun to have something similar inside mypaint so i made them.in this set we have 16 brushes with specific functions to improve the workflows and productivity.
+so please, feel free to change order, mix with other sets or whatever you want.
+
+Install notes
+-------------
+When install popup menu appears, select "OK" to install and then select the "Rename all" option if you want to have an independent set, or "Replace all" if you want to remove the older brushes.
+
+License
+-------
+Copyright 2011 Ramon Miranda
+
+Except where otherwise noted, these brushes are licensed under a Creative Commons Attribution 3.0 Unported License. See http://creativecommons.org/licenses/by/3.0/ for details.
+
+As an exception to this and to the extent possible under law, Ramon Miranda has waived all copyright and related or neighboring rights to the raw brush settings (those files ending with ".myb"). See http://creativecommons.org/publicdomain/zero/1.0/ for details.
+================================================
+

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/brushlib.h Added

@@ -0,0 +1,208 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file brushlib.h
+**	\brief Helper file to integrte brushlib into synfig
+**
+**	\legal
+**	......... ... 2014 Ivan Mahonin
+**
+**	This file is part of Synfig.
+**
+**	Synfig 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.
+**
+**	Synfig 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.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with Synfig.  If not, see <https://www.gnu.org/licenses/>.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_BRUSH_H
+#define __SYNFIG_BRUSH_H
+
+/* === H E A D E R S ======================================================= */
+
+#include <brushlib/brushlib.hpp>
+#include <synfig/angle.h> // we need PI
+#include <synfig/surface.h>
+
+/* === 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 ======================================= */
+
+namespace brushlib {
+	class ActiveSurface: public Surface {
+	public:
+		virtual bool draw_dab(
+			float /* x */, float /* y */,
+			float /* radius */,
+			float /* color_r */, float /* color_g */, float /* color_b */,
+			float /* opaque */, float /* hardness */ = 0.5,
+			float /* alpha_eraser */ = 1.0,
+			float /* aspect_ratio */ = 1.0, float /* angle */ = 0.0,
+			float /* lock_alpha */ = 0.0
+		) { return false; };
+
+		virtual void get_color(
+			float /* x */, float /* y */,
+			float /* radius */,
+			float * color_r, float * color_g, float * color_b, float * color_a
+		) { *color_r = 0.f; *color_g = 0.f; *color_b = 0.f; *color_a = 0.f; };
+	};
+
+	class SurfaceWrapper: public ActiveSurface {
+	public:
+		typedef synfig::Surface surface_type;
+		surface_type *surface;
+		int extra_left;
+		int extra_right;
+		int extra_top;
+		int extra_bottom;
+		int offset_x;
+		int offset_y;
+
+		explicit SurfaceWrapper(surface_type* surface = nullptr):
+			surface(surface),
+			extra_left(0), extra_right(0),
+			extra_top(0), extra_bottom(0),
+			offset_x(0), offset_y(0) { }
+
+		void reset() {
+			extra_left = 0;
+			extra_right = 0;
+			extra_top = 0;
+			extra_bottom = 0;
+			offset_x = 0;
+			offset_y = 0;
+		}
+
+		virtual bool draw_dab(
+			float x, float y,
+			float radius,
+			float color_r, float color_g, float color_b,
+			float opaque, float hardness = 0.5,
+			float alpha_eraser = 1.0,
+			float aspect_ratio = 1.0, float angle = 0.0,
+			float /* lock_alpha */ = 0.0
+		) {
+			if (!surface) return false;
+
+			x += (float)offset_x;
+			y += (float)offset_y;
+
+			float cs = cosf(angle/180.f*(float)PI);
+			float sn = sinf(angle/180.f*(float)PI);
+
+			// calculate bounds
+			if (aspect_ratio < 1.0) aspect_ratio = 1.0;
+			if (hardness > 1.0) hardness = 1.0;
+			if (hardness < 0.0) hardness = 0.0;
+			float maxr = fabsf(radius);
+			int x0 = (int)(x - maxr - 1.f);
+			int x1 = (int)(x + maxr + 1.f);
+			int y0 = (int)(y - maxr - 1.f);
+			int y1 = (int)(y + maxr + 1.f);
+
+			if (x0 < 0
+			 || y0 < 0
+			 || x1+1 > surface->get_w()
+			 || y1+1 > surface->get_h() )
+			{
+				int l = x0 < 0 ? x0 : 0;
+				int t = y0 < 0 ? y0 : 0;
+				int r = x1+1 > surface->get_w() ? x1+1 : surface->get_w();
+				int b = y1+1 > surface->get_h() ? y1+1 : surface->get_h();
+
+				extra_left   -= l; // increase because l and t is negative
+				extra_top    -= t;
+				extra_right  += r - surface->get_w();
+				extra_bottom += b - surface->get_h();
+
+				synfig::Surface tmp;
+				tmp = *surface;
+				surface->set_wh(r-l, b-t);
+				surface->clear();
+				synfig::Surface::pen p(surface->get_pen(-l, -t));
+				tmp.blit_to(p);
+
+				offset_x -= l;
+				offset_y -= t;
+				x -= (float)l; y -= (float)t;
+				x0 -= l; y0 -= t;
+				x1 -= l; y1 -= t;
+			}
+
+			bool erase = alpha_eraser < 1.0;
+			for(int py = y0; py <= y1; py++)
+			{
+				for(int px = x0; px <= x1; px++)
+				{
+					float dx = (float)px - x;
+					float dy = (float)py - y;
+					float dyr = (dy*cs-dx*sn)*aspect_ratio;
+					float dxr = (dy*sn+dx*cs);
+					float dd = (dyr*dyr + dxr*dxr) / (radius*radius);
+					if (dd <= 1.f)
+					{
+						float opa = dd < hardness
+								  ? dd + 1-(dd/hardness)
+								  : hardness/(1-hardness)*(1-dd);
+						opa *= opaque;
+						synfig::Color &c = (*surface)pypx;
+						if (erase)
+						{
+							c.set_a(c.get_a()*(1.0 - (1.0 - alpha_eraser)*opa));
+						}
+						else
+						{
+							float sum_alpha = opa + c.get_a();
+							if (sum_alpha > 1.0) sum_alpha = 1.0;
+							float inv_opa = sum_alpha - opa;
+							c.set_r(c.get_r()*inv_opa + color_r*opa);
+							c.set_g(c.get_g()*inv_opa + color_g*opa);
+							c.set_b(c.get_b()*inv_opa + color_b*opa);
+							c.set_a(sum_alpha);
+						}
+					}
+				}
+			}
+
+			return true;
+		};
+
+		virtual void get_color(
+			float x, float y,
+			float /* radius */,
+			float * color_r, float * color_g, float * color_b, float * color_a
+		) {
+			if (!surface) {
+				*color_r = 0.f; *color_g = 0.f; *color_b = 0.f; *color_a = 0.f;
+				return;
+			}
+
+			x += (float)offset_x;
+			y += (float)offset_y;
+
+			synfig::Color c = surface->cubic_sample(x, y);
+			*color_r = c.get_r();
+			*color_g = c.get_g();
+			*color_b = c.get_b();

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/brushlib/brush.hpp Added

@@ -0,0 +1,827 @@
+/* brushlib - The MyPaint Brush Library
+ * Copyright (C) 2007-2011 Martin Renold <martinxyz@gmx.ch>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <glib.h>
+#include <cmath>
+//#include "Python.h"
+
+#include "brushsettings.hpp"
+#include "mapping.hpp"
+
+#define ACTUAL_RADIUS_MIN 0.2
+#define ACTUAL_RADIUS_MAX 800 // safety guard against radius like 1e20 and against rendering overload with unexpected brush dynamics
+
+/* The Brush class stores two things:
+   b) settings: constant during a stroke (eg. size, spacing, dynamics, color selected by the user)
+   a) states: modified during a stroke (eg. speed, smudge colors, time/distance to next dab, position filter states)
+
+   FIXME: Actually those are two orthogonal things. Should separate them:
+          a) brush settings class that is saved/loaded/selected  (without states)
+          b) brush core class to draw the dabs (using an instance of the above)
+
+   In python, there are two kinds of instances from this: a "global
+   brush" which does the cursor tracking, and the "brushlist" where
+   the states are ignored. When a brush is selected, its settings are
+   copied into the global one, leaving the state intact.
+ */
+
+namespace brushlib {
+
+class Brush {
+public:
+  bool print_inputs; // debug menu
+  // for stroke splitting (undo/redo)
+  double stroke_total_painting_time;
+  double stroke_current_idling_time; 
+
+private:
+  // see also brushsettings.py
+
+  // the states (get_state, set_state, reset) that change during a stroke
+  float statesSTATE_COUNT;
+  GRand * rng;
+
+  // Those mappings describe how to calculate the current value for each setting.
+  // Most of settings will be constant (eg. only their base_value is used).
+  Mapping * settingsBRUSH_SETTINGS_COUNT;
+
+  // the current value of all settings (calculated using the current state)
+  float settings_valueBRUSH_SETTINGS_COUNT;
+
+  // cached calculation results
+  float speed_mapping_gamma2, speed_mapping_m2, speed_mapping_q2;
+
+  bool reset_requested;
+
+public:
+  Brush() {
+    for (int i=0; i<BRUSH_SETTINGS_COUNT; i++) {
+      settingsi = new Mapping(INPUT_COUNT);
+    }
+    rng = g_rand_new();
+    print_inputs = false;
+    
+    for (int i=0; i<STATE_COUNT; i++) {
+      statesi = 0;
+    }
+    new_stroke();
+
+    settings_base_values_have_changed();
+
+    reset_requested = true;
+  }
+
+  ~Brush() {
+    for (int i=0; i<BRUSH_SETTINGS_COUNT; i++) {
+      delete settingsi;
+    }
+    g_rand_free(rng); rng = nullptr;
+  }
+
+  void reset()
+  {
+    reset_requested = true;
+  }
+
+  void new_stroke()
+  {
+    stroke_current_idling_time = 0;
+    stroke_total_painting_time = 0;
+  }
+
+  void set_base_value (int id, float value) {
+    assert (id >= 0 && id < BRUSH_SETTINGS_COUNT);
+    settingsid->base_value = value;
+
+    settings_base_values_have_changed ();
+  }
+
+  void set_mapping_n (int id, int input, int n) {
+    assert (id >= 0 && id < BRUSH_SETTINGS_COUNT);
+    settingsid->set_n (input, n);
+  }
+
+  void set_mapping_point (int id, int input, int index, float x, float y) {
+    assert (id >= 0 && id < BRUSH_SETTINGS_COUNT);
+    settingsid->set_point (input, index, x, y);
+  }
+
+  float get_state (int i)
+  {
+    assert (i >= 0 && i < STATE_COUNT);
+    return statesi;
+  }
+
+  void set_state (int i, float value)
+  {
+    assert (i >= 0 && i < STATE_COUNT);
+    statesi = value;
+  }
+
+private:
+  // returns the fraction still left after t seconds
+  float exp_decay (float T_const, float t)
+  {
+    // the argument might not make mathematical sense (whatever.)
+    if (T_const <= 0.001) {
+      return 0.0;
+    } else {
+      return exp(- t / T_const);
+    }
+  }
+
+
+  void settings_base_values_have_changed ()
+  {
+    // precalculate stuff that does not change dynamically
+
+    // Precalculate how the physical speed will be mapped to the speed input value.
+    // The formula for this mapping is:
+    //
+    // y = log(gamma+x)*m + q;
+    //
+    // x: the physical speed (pixels per basic dab radius)
+    // y: the speed input that will be reported
+    // gamma: parameter set by this user (small means a logarithmic mapping, big linear)
+    // m, q: parameters to scale and translate the curve
+    //
+    // The code below calculates m and q given gamma and two hardcoded constraints.
+    //
+    for (int i=0; i<2; i++) {
+      float gamma;
+      gamma = settings(i==0)?BRUSH_SPEED1_GAMMA:BRUSH_SPEED2_GAMMA->base_value;
+      gamma = exp(gamma);
+
+      float fix1_x, fix1_y, fix2_x, fix2_dy;
+      fix1_x = 45.0;
+      fix1_y = 0.5;
+      fix2_x = 45.0;
+      fix2_dy = 0.015;
+
+      float m, q;
+      float c1;
+      c1 = log(fix1_x+gamma);
+      m = fix2_dy * (fix2_x + gamma);
+      q = fix1_y - m*c1;
+    
+      speed_mapping_gammai = gamma;
+      speed_mapping_mi = m;
+      speed_mapping_qi = q;
+    }
+  }
+
+  // This function runs a brush "simulation" step. Usually it is
+  // called once or twice per dab. In theory the precision of the
+  // "simulation" gets better when it is called more often. In
+  // practice this only matters if there are some highly nonlinear
+  // mappings in critical places or extremely few events per second.
+  //
+  // note: parameters are is dx/ddab, ..., dtime/ddab (dab is the number, 5.0 = 5th dab)
+  void update_states_and_setting_values (float step_dx, float step_dy, float step_dpressure, float step_declination, float step_ascension, float step_dtime)
+  {
+    float pressure;
+    float inputsINPUT_COUNT;
+

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/brushlib/brushlib.hpp Added

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/brushlib/brushsettings.hpp Added

@@ -0,0 +1,88 @@
+// DO NOT EDIT - autogenerated by ./generate.py
+
+#define INPUT_PRESSURE 0
+#define INPUT_SPEED1 1
+#define INPUT_SPEED2 2
+#define INPUT_RANDOM 3
+#define INPUT_STROKE 4
+#define INPUT_DIRECTION 5
+#define INPUT_TILT_DECLINATION 6
+#define INPUT_TILT_ASCENSION 7
+#define INPUT_CUSTOM 8
+#define INPUT_COUNT 9
+
+#define BRUSH_OPAQUE 0
+#define BRUSH_OPAQUE_MULTIPLY 1
+#define BRUSH_OPAQUE_LINEARIZE 2
+#define BRUSH_RADIUS_LOGARITHMIC 3
+#define BRUSH_HARDNESS 4
+#define BRUSH_ANTI_ALIASING 5
+#define BRUSH_DABS_PER_BASIC_RADIUS 6
+#define BRUSH_DABS_PER_ACTUAL_RADIUS 7
+#define BRUSH_DABS_PER_SECOND 8
+#define BRUSH_RADIUS_BY_RANDOM 9
+#define BRUSH_SPEED1_SLOWNESS 10
+#define BRUSH_SPEED2_SLOWNESS 11
+#define BRUSH_SPEED1_GAMMA 12
+#define BRUSH_SPEED2_GAMMA 13
+#define BRUSH_OFFSET_BY_RANDOM 14
+#define BRUSH_OFFSET_BY_SPEED 15
+#define BRUSH_OFFSET_BY_SPEED_SLOWNESS 16
+#define BRUSH_SLOW_TRACKING 17
+#define BRUSH_SLOW_TRACKING_PER_DAB 18
+#define BRUSH_TRACKING_NOISE 19
+#define BRUSH_COLOR_H 20
+#define BRUSH_COLOR_S 21
+#define BRUSH_COLOR_V 22
+#define BRUSH_RESTORE_COLOR 23
+#define BRUSH_CHANGE_COLOR_H 24
+#define BRUSH_CHANGE_COLOR_L 25
+#define BRUSH_CHANGE_COLOR_HSL_S 26
+#define BRUSH_CHANGE_COLOR_V 27
+#define BRUSH_CHANGE_COLOR_HSV_S 28
+#define BRUSH_SMUDGE 29
+#define BRUSH_SMUDGE_LENGTH 30
+#define BRUSH_SMUDGE_RADIUS_LOG 31
+#define BRUSH_ERASER 32
+#define BRUSH_STROKE_THRESHOLD 33
+#define BRUSH_STROKE_DURATION_LOGARITHMIC 34
+#define BRUSH_STROKE_HOLDTIME 35
+#define BRUSH_CUSTOM_INPUT 36
+#define BRUSH_CUSTOM_INPUT_SLOWNESS 37
+#define BRUSH_ELLIPTICAL_DAB_RATIO 38
+#define BRUSH_ELLIPTICAL_DAB_ANGLE 39
+#define BRUSH_DIRECTION_FILTER 40
+#define BRUSH_LOCK_ALPHA 41
+#define BRUSH_SETTINGS_COUNT 42
+
+#define STATE_X 0
+#define STATE_Y 1
+#define STATE_PRESSURE 2
+#define STATE_DIST 3
+#define STATE_ACTUAL_RADIUS 4
+#define STATE_SMUDGE_RA 5
+#define STATE_SMUDGE_GA 6
+#define STATE_SMUDGE_BA 7
+#define STATE_SMUDGE_A 8
+#define STATE_LAST_GETCOLOR_R 9
+#define STATE_LAST_GETCOLOR_G 10
+#define STATE_LAST_GETCOLOR_B 11
+#define STATE_LAST_GETCOLOR_A 12
+#define STATE_LAST_GETCOLOR_RECENTNESS 13
+#define STATE_ACTUAL_X 14
+#define STATE_ACTUAL_Y 15
+#define STATE_NORM_DX_SLOW 16
+#define STATE_NORM_DY_SLOW 17
+#define STATE_NORM_SPEED1_SLOW 18
+#define STATE_NORM_SPEED2_SLOW 19
+#define STATE_STROKE 20
+#define STATE_STROKE_STARTED 21
+#define STATE_CUSTOM_INPUT 22
+#define STATE_RNG_SEED 23
+#define STATE_ACTUAL_ELLIPTICAL_DAB_RATIO 24
+#define STATE_ACTUAL_ELLIPTICAL_DAB_ANGLE 25
+#define STATE_DIRECTION_DX 26
+#define STATE_DIRECTION_DY 27
+#define STATE_DECLINATION 28
+#define STATE_ASCENSION 29
+#define STATE_COUNT 30

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/brushlib/helpers.hpp Added

@@ -0,0 +1,344 @@
+/* brushlib - The MyPaint Brush Library
+ * Copyright (C) 2007-2008 Martin Renold <martinxyz@gmx.ch>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __helpers_h__
+#define __helpers_h__
+
+#include <glib.h>
+#include <assert.h>
+
+// MAX, MIN, ABS, CLAMP are already available from gmacros.h
+#define ROUND(x) ((int) ((x) + 0.5))
+#define SIGN(x) ((x)>0?1:(-1))
+#define SQR(x) ((x)*(x))
+
+#define MAX3(a, b, c) ((a)>(b)?MAX((a),(c)):MAX((b),(c)))
+#define MIN3(a, b, c) ((a)<(b)?MIN((a),(c)):MIN((b),(c)))
+
+namespace brushlib {
+
+typedef struct { int x, y, w, h; } Rect;
+// originally from my mass project (mass.sourceforge.net)
+inline void ExpandRectToIncludePoint(Rect * r, int x, int y)
+{
+  if (r->w == 0) {
+    r->w = 1; r->h = 1;
+    r->x = x; r->y = y;
+  } else {
+    if (x < r->x) { r->w += r->x-x; r->x = x; } else
+    if (x >= r->x+r->w) { r->w = x - r->x + 1; }
+
+    if (y < r->y) { r->h += r->y-y; r->y = y; } else
+    if (y >= r->y+r->h) { r->h = y - r->y + 1; }
+  }
+}
+
+// Optimized version from one in GIMP (noisify.c), where it was
+// adapted from ppmforge.c, which is part of PBMPLUS. The algorithm
+// comes from: 'The Science Of Fractal Images'. Peitgen, H.-O., and
+// Saupe, D. eds.  Springer Verlag, New York, 1988.
+inline float rand_gauss (GRand * rng)
+{
+  float sum = 0.0;
+  uint32_t rand1 = g_rand_int(rng);
+  uint32_t rand2 = g_rand_int(rng);
+  sum +=  rand1        & 0x7FFF;
+  sum += (rand1 >> 16) & 0x7FFF;
+  sum +=  rand2        & 0x7FFF;
+  sum += (rand2 >> 16) & 0x7FFF;
+  return sum * 5.28596089837e-5 - 3.46410161514;
+}
+
+// stolen from GIMP (gimpcolorspace.c)
+// (from gimp_rgb_to_hsv)
+inline void
+rgb_to_hsv_float (float *r_ /*h*/, float *g_ /*s*/, float *b_ /*v*/)
+{
+  float max, min, delta;
+  float h, s, v;
+  float r, g, b;
+
+  h = 0.0; // silence gcc warning
+
+  r = *r_;
+  g = *g_;
+  b = *b_;
+
+  r = CLAMP(r, 0.0, 1.0);
+  g = CLAMP(g, 0.0, 1.0);
+  b = CLAMP(b, 0.0, 1.0);
+
+  max = MAX3(r, g, b);
+  min = MIN3(r, g, b);
+
+  v = max;
+  delta = max - min;
+
+  if (delta > 0.0001)
+    {
+      s = delta / max;
+
+      if (r == max)
+        {
+          h = (g - b) / delta;
+          if (h < 0.0)
+            h += 6.0;
+        }
+      else if (g == max)
+        {
+          h = 2.0 + (b - r) / delta;
+        }
+      else if (b == max)
+        {
+          h = 4.0 + (r - g) / delta;
+        }
+
+      h /= 6.0;
+    }
+  else
+    {
+      s = 0.0;
+      h = 0.0;
+    }
+
+  *r_ = h;
+  *g_ = s;
+  *b_ = v;
+}
+
+// (from gimp_hsv_to_rgb)
+inline void
+hsv_to_rgb_float (float *h_, float *s_, float *v_)
+{
+  gint    i;
+  gdouble f, w, q, t;
+  float h, s, v;
+  float r, g, b;
+  r = g = b = 0.0; // silence gcc warning
+
+  h = *h_;
+  s = *s_;
+  v = *v_;
+
+  h = h - floor(h);
+  s = CLAMP(s, 0.0, 1.0);
+  v = CLAMP(v, 0.0, 1.0);
+
+  gdouble hue;
+
+  if (s == 0.0)
+    {
+      r = v;
+      g = v;
+      b = v;
+    }
+  else
+    {
+      hue = h;
+
+      if (hue == 1.0)
+        hue = 0.0;
+
+      hue *= 6.0;
+
+      i = (gint) hue;
+      f = hue - i;
+      w = v * (1.0 - s);
+      q = v * (1.0 - (s * f));
+      t = v * (1.0 - (s * (1.0 - f)));
+
+      switch (i)
+        {
+        case 0:
+          r = v;
+          g = t;
+          b = w;
+          break;
+        case 1:
+          r = q;
+          g = v;
+          b = w;
+          break;
+        case 2:
+          r = w;
+          g = v;
+          b = t;
+          break;
+        case 3:
+          r = w;
+          g = q;
+          b = v;
+          break;
+        case 4:
+          r = t;
+          g = w;
+          b = v;
+          break;
+        case 5:
+          r = v;
+          g = w;
+          b = q;
+          break;
+        }
+    }
+
+  *h_ = r;
+  *s_ = g;

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/brushlib/mapping.hpp Added

@@ -0,0 +1,140 @@
+/* brushlib - The MyPaint Brush Library
+ * Copyright (C) 2007-2008 Martin Renold <martinxyz@gmx.ch>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __MAPPING_H__
+#define __MAPPING_H__
+
+// user-defined mappings
+// (the curves you can edit in the brush settings)
+
+namespace brushlib {
+
+class Mapping {
+private:
+  typedef struct {
+    // a set of control points (stepwise linear)
+    float xvalues8;
+    float yvalues8;
+    int n;
+  } ControlPoints;
+
+  int inputs;
+  ControlPoints * pointsList; // one for each input
+  int inputs_used; // optimization
+public:
+  float base_value;
+
+  Mapping(int inputs_) {
+    inputs = inputs_;
+    pointsList = new ControlPointsinputs;
+    for (int i=0; i<inputs; i++) pointsListi.n = 0;
+    inputs_used = 0;
+    base_value = 0;
+  }
+  ~Mapping() {
+    delete  pointsList;
+  }
+
+  void set_n (int input, int n)
+  {
+    assert (input >= 0 && input < inputs);
+    assert (n >= 0 && n <= 8);
+    assert (n != 1); // cannot build a linear mapping with only one point
+    ControlPoints * p = pointsList + input;
+
+    if (n != 0 && p->n == 0) inputs_used++;
+    if (n == 0 && p->n != 0) inputs_used--;
+    assert(inputs_used >= 0);
+    assert(inputs_used <= inputs);
+
+    p->n = n;
+  }
+
+  void set_point (int input, int index, float x, float y)
+  {
+    assert (input >= 0 && input < inputs);
+    assert (index >= 0 && index < 8);
+    ControlPoints * p = pointsList + input;
+    assert (index < p->n);
+
+    if (index > 0) {
+      assert (x >= p->xvaluesindex-1);
+    }
+
+    p->xvaluesindex = x;
+    p->yvaluesindex = y;
+  }
+
+  bool is_constant()
+  {
+    return inputs_used == 0;
+  }
+
+  float calculate (float * data)
+  {
+    int j;
+    float result;
+    result = base_value;
+
+    // constant mapping (common case)
+    if (inputs_used == 0) return result;
+
+    for (j=0; j<inputs; j++) {
+      ControlPoints * p = pointsList + j;
+
+      if (p->n) {
+        float x, y;
+        x = dataj;
+
+        // find the segment with the slope that we need to use
+        float x0, y0, x1, y1;
+        x0 = p->xvalues0;
+        y0 = p->yvalues0;
+        x1 = p->xvalues1;
+        y1 = p->yvalues1;
+
+        int i;
+        for (i=2; i<p->n && x>x1; i++) {
+          x0 = x1;
+          y0 = y1;
+          x1 = p->xvaluesi;
+          y1 = p->yvaluesi;
+        }
+
+        if (x0 == x1) {
+          y = y0;
+        } else {
+          // linear interpolation
+          y = (y1*(x - x0) + y0*(x1 - x)) / (x1 - x0);
+        }
+
+        result += y;
+      }
+    }
+    return result;
+  }
+
+  // used in python for the global pressure mapping
+  float calculate_single_input (float input)
+  {
+    assert(inputs == 1);
+    return calculate(&input);
+  }
+};
+
+}
+
+#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/brushlib/surface.hpp Added

@@ -0,0 +1,40 @@
+/* brushlib - The MyPaint Brush Library
+ * Copyright (C) 2008 Martin Renold <martinxyz@gmx.ch>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+namespace brushlib {
+
+// surface interface required by brush.hpp
+class Surface {
+public:
+
+  virtual ~Surface() {}
+
+  virtual bool draw_dab (float x, float y, 
+                         float radius, 
+                         float color_r, float color_g, float color_b,
+                         float opaque, float hardness = 0.5,
+                         float alpha_eraser = 1.0,
+                         float aspect_ratio = 1.0, float angle = 0.0,
+                         float lock_alpha = 0.0
+                         ) = 0;
+
+  virtual void get_color (float x, float y, 
+                          float radius, 
+                          float * color_r, float * color_g, float * color_b, float * color_a
+                          ) = 0;
+};
+
+}