[gimp/soc-2009-dynamics] Rename all GimpDynamicsOutput functions to gimp_dynamics_output_foo()
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp/soc-2009-dynamics] Rename all GimpDynamicsOutput functions to gimp_dynamics_output_foo()
- Date: Sun, 11 Oct 2009 13:55:37 +0000 (UTC)
commit dab5f9e691b5c5f3e14a3c38cb4a0eb782a5659c
Author: Michael Natterer <mitch gimp org>
Date: Sun Oct 11 15:54:59 2009 +0200
Rename all GimpDynamicsOutput functions to gimp_dynamics_output_foo()
app/core/gimpdynamicsoutput.c | 65 +++++++++++++++++++++-------------------
app/core/gimpdynamicsoutput.h | 28 ++++++++---------
app/paint/gimpairbrush.c | 2 +-
app/paint/gimpbrushcore.c | 23 ++++++---------
app/paint/gimpclone.c | 4 +-
app/paint/gimpconvolve.c | 2 +-
app/paint/gimpdodgeburn.c | 4 +-
app/paint/gimperaser.c | 4 +-
app/paint/gimpheal.c | 4 +-
app/paint/gimppaintbrush.c | 6 ++--
app/paint/gimpsmudge.c | 6 ++--
11 files changed, 72 insertions(+), 76 deletions(-)
---
diff --git a/app/core/gimpdynamicsoutput.c b/app/core/gimpdynamicsoutput.c
index 7b605c4..2cedea7 100644
--- a/app/core/gimpdynamicsoutput.c
+++ b/app/core/gimpdynamicsoutput.c
@@ -217,6 +217,9 @@ gimp_dynamics_output_get_property (GObject *object,
}
}
+
+/* public functions */
+
GimpDynamicsOutput *
gimp_dynamics_output_new (const gchar *name)
{
@@ -227,15 +230,21 @@ gimp_dynamics_output_new (const gchar *name)
NULL);
}
+gboolean
+gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output)
+{
+ return (output->pressure || output->velocity || output->direction ||
+ output->tilt || output->random || output->fade);
+}
+
gdouble
-gimp_dynamics_get_linear_output_val (GimpDynamicsOutput *output,
- GimpCoords coords,
- gdouble fade_point)
+gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
+ GimpCoords coords,
+ gdouble fade_point)
{
- gdouble total = 0.0;
+ gdouble total = 0.0;
gdouble factors = 0.0;
-
- gdouble result = 1.0;
+ gdouble result = 1.0;
if (output->pressure)
{
@@ -277,18 +286,18 @@ gimp_dynamics_get_linear_output_val (GimpDynamicsOutput *output,
result = total / factors;
//printf("Dynamics queried(linear). Result: %f, factors: %f, total: %f \n", result, factors, total);
+
return result;
}
gdouble
-gimp_dynamics_get_angular_output_val (GimpDynamicsOutput *output,
- GimpCoords coords,
- gdouble fade_point)
+gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
+ GimpCoords coords,
+ gdouble fade_point)
{
- gdouble total = 0.0;
+ gdouble total = 0.0;
gdouble factors = 0.0;
-
- gdouble result = 1.0;
+ gdouble result = 1.0;
if (output->pressure)
{
@@ -310,10 +319,9 @@ gimp_dynamics_get_angular_output_val (GimpDynamicsOutput *output,
/* For tilt to make sense, it needs to be converted to an angle, not just vector */
if (output->tilt)
{
-
gdouble tilt_x = coords.xtilt;
gdouble tilt_y = coords.ytilt;
- gdouble tilt = 0.0;
+ gdouble tilt = 0.0;
if (tilt_x == 0.0)
{
@@ -321,16 +329,17 @@ gimp_dynamics_get_angular_output_val (GimpDynamicsOutput *output,
tilt = 0.5;
else if (tilt_y < 0.0)
tilt = 0.0;
- else tilt = -1.0;
+ else
+ tilt = -1.0;
}
else
{
tilt = atan ((- 1.0 * tilt_y) /
tilt_x) / (2 * G_PI);
- if (tilt_x > 0.0)
- tilt = tilt + 0.5;
- }
+ if (tilt_x > 0.0)
+ tilt = tilt + 0.5;
+ }
tilt = tilt + 0.5; /* correct the angle, its wrong by 180 degrees */
@@ -339,6 +348,7 @@ gimp_dynamics_get_angular_output_val (GimpDynamicsOutput *output,
while (tilt < 0.0)
tilt += 1.0;
+
total += tilt;
factors++;
}
@@ -363,14 +373,13 @@ gimp_dynamics_get_angular_output_val (GimpDynamicsOutput *output,
gdouble
-gimp_dynamics_get_aspect_output_val (GimpDynamicsOutput *output,
- GimpCoords coords,
- gdouble fade_point)
+gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
+ GimpCoords coords,
+ gdouble fade_point)
{
- gdouble total = 0.0;
+ gdouble total = 0.0;
gdouble factors = 0.0;
-
- gdouble result = 1.0;
+ gdouble result = 1.0;
if (output->pressure)
{
@@ -427,12 +436,6 @@ gimp_dynamics_get_aspect_output_val (GimpDynamicsOutput *output,
result = total / factors;
/* printf("Dynamics queried(aspect). Result: %f, factors: %f, total: %f \n", result, factors, total);*/
- return result;
-}
-gboolean
-gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output)
-{
- return (output->pressure || output->velocity || output->direction ||
- output->tilt || output->random || output->fade);
+ return result;
}
diff --git a/app/core/gimpdynamicsoutput.h b/app/core/gimpdynamicsoutput.h
index e27147b..50ea695 100644
--- a/app/core/gimpdynamicsoutput.h
+++ b/app/core/gimpdynamicsoutput.h
@@ -59,21 +59,19 @@ struct _GimpDynamicsOutputClass
GType gimp_dynamics_output_get_type (void) G_GNUC_CONST;
-GimpDynamicsOutput * gimp_dynamics_output_new (const gchar *name);
-
-gdouble gimp_dynamics_get_linear_output_val (GimpDynamicsOutput *output,
- GimpCoords coords,
- gdouble fade_point);
-
-gdouble gimp_dynamics_get_angular_output_val (GimpDynamicsOutput *output,
- GimpCoords coords,
- gdouble fade_point);
-
-gdouble gimp_dynamics_get_aspect_output_val (GimpDynamicsOutput *output,
- GimpCoords coords,
- gdouble fade_point);
-
-gboolean gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output);
+GimpDynamicsOutput * gimp_dynamics_output_new (const gchar *name);
+
+gboolean gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output);
+
+gdouble gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
+ GimpCoords coords,
+ gdouble fade_point);
+gdouble gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
+ GimpCoords coords,
+ gdouble fade_point);
+gdouble gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
+ GimpCoords coords,
+ gdouble fade_point);
#endif /* __GIMP_DYNAMICS_OUTPUT_H__ */
diff --git a/app/paint/gimpairbrush.c b/app/paint/gimpairbrush.c
index e7c2da9..e33eff5 100644
--- a/app/paint/gimpairbrush.c
+++ b/app/paint/gimpairbrush.c
@@ -150,7 +150,7 @@ gimp_airbrush_paint (GimpPaintCore *paint_core,
airbrush->drawable = drawable;
airbrush->paint_options = paint_options;
- dynamic_rate = gimp_dynamics_get_linear_output_val(dynamics->rate_dynamics, *coords, fade_point);
+ dynamic_rate = gimp_dynamics_output_get_linear_value (dynamics->rate_dynamics, *coords, fade_point);
timeout = 10000 / (options->rate * dynamic_rate);
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index a6e540c..4af2546 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -398,21 +398,17 @@ gimp_brush_core_start (GimpPaintCore *paint_core,
if (GIMP_BRUSH_CORE_GET_CLASS (core)->handles_transforming_brush)
{
-
- core->scale = paint_options->brush_scale;
-
- core->angle = paint_options->brush_angle;
-
+ core->scale = paint_options->brush_scale;
+ core->angle = paint_options->brush_angle;
core->aspect_ratio = paint_options->brush_aspect_ratio;
if (core->dynamics)
{
+ core->scale *= gimp_dynamics_output_get_linear_value (core->dynamics->size_dynamics, *coords, fade_point);
- core->scale *= gimp_dynamics_get_linear_output_val(core->dynamics->size_dynamics, *coords, fade_point);
-
- core->angle += gimp_dynamics_get_angular_output_val(core->dynamics->angle_dynamics, *coords, fade_point);
+ core->angle += gimp_dynamics_output_get_angular_value (core->dynamics->angle_dynamics, *coords, fade_point);
- core->aspect_ratio *= gimp_dynamics_get_aspect_output_val(core->dynamics->aspect_ratio_dynamics, *coords, fade_point);
+ core->aspect_ratio *= gimp_dynamics_output_get_aspect_value (core->dynamics->aspect_ratio_dynamics, *coords, fade_point);
}
}
@@ -703,7 +699,7 @@ gimp_brush_core_interpolate (GimpPaintCore *paint_core,
{
gdouble fade_point = gimp_paint_options_get_fade (paint_options, gimp_item_get_image (GIMP_ITEM (drawable)),
paint_core->pixel_dist);
- gdouble dyn_jitter = core->jitter * gimp_dynamics_get_linear_output_val(core->dynamics->jitter_dynamics, current_coords, fade_point);
+ gdouble dyn_jitter = core->jitter * gimp_dynamics_output_get_linear_value (core->dynamics->jitter_dynamics, current_coords, fade_point);
gdouble jitter_dist;
gint32 jitter_angle;
@@ -768,12 +764,11 @@ gimp_brush_core_get_paint_area (GimpPaintCore *paint_core,
gdouble fade_point = gimp_paint_options_get_fade (paint_options, gimp_item_get_image (GIMP_ITEM (drawable)),
paint_core->pixel_dist);
- core->scale *= gimp_dynamics_get_linear_output_val(core->dynamics->size_dynamics, *coords, fade_point);
-
- core->angle += gimp_dynamics_get_angular_output_val(core->dynamics->angle_dynamics, *coords, fade_point);
+ core->scale *= gimp_dynamics_output_get_linear_value (core->dynamics->size_dynamics, *coords, fade_point);
- core->aspect_ratio *= gimp_dynamics_get_aspect_output_val(core->dynamics->aspect_ratio_dynamics, *coords, fade_point);
+ core->angle += gimp_dynamics_output_get_angular_value (core->dynamics->angle_dynamics, *coords, fade_point);
+ core->aspect_ratio *= gimp_dynamics_output_get_aspect_value (core->dynamics->aspect_ratio_dynamics, *coords, fade_point);
}
}
diff --git a/app/paint/gimpclone.c b/app/paint/gimpclone.c
index b9e68b2..62c1566 100644
--- a/app/paint/gimpclone.c
+++ b/app/paint/gimpclone.c
@@ -243,9 +243,9 @@ gimp_clone_motion (GimpSourceCore *source_core,
}
}
- opacity *= gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
+ opacity *= gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
- hardness = gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
+ hardness = gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
gimp_brush_core_paste_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
coords,
diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c
index a34d56d..904d4ee 100644
--- a/app/paint/gimpconvolve.c
+++ b/app/paint/gimpconvolve.c
@@ -159,7 +159,7 @@ gimp_convolve_motion (GimpPaintCore *paint_core,
rate = options->rate;
- rate *= gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->rate_dynamics, *coords, fade_point);
+ rate *= gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->rate_dynamics, *coords, fade_point);
gimp_convolve_calculate_matrix (convolve, options->type,
brush_core->brush->mask->width / 2,
diff --git a/app/paint/gimpdodgeburn.c b/app/paint/gimpdodgeburn.c
index 2a83979..738a233 100644
--- a/app/paint/gimpdodgeburn.c
+++ b/app/paint/gimpdodgeburn.c
@@ -251,9 +251,9 @@ gimp_dodge_burn_motion (GimpPaintCore *paint_core,
g_free (temp_data);
- opacity *= gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
+ opacity *= gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
- hardness = gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
+ hardness = gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
/* Replace the newly dodgedburned area (canvas_buf) to the image */
gimp_brush_core_replace_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
diff --git a/app/paint/gimperaser.c b/app/paint/gimperaser.c
index 1c27a10..3e44a75 100644
--- a/app/paint/gimperaser.c
+++ b/app/paint/gimperaser.c
@@ -140,9 +140,9 @@ gimp_eraser_motion (GimpPaintCore *paint_core,
color_pixels (temp_buf_get_data (area), col,
area->width * area->height, area->bytes);
- opacity *= gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
+ opacity *= gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
- hardness = gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
+ hardness = gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
gimp_brush_core_paste_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
coords,
diff --git a/app/paint/gimpheal.c b/app/paint/gimpheal.c
index 427477f..7403c89 100644
--- a/app/paint/gimpheal.c
+++ b/app/paint/gimpheal.c
@@ -444,7 +444,7 @@ gimp_heal_motion (GimpSourceCore *source_core,
gdouble fade_point = gimp_paint_options_get_fade (paint_options, gimp_item_get_image (GIMP_ITEM (drawable)),
paint_core->pixel_dist);
- hardness = gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
+ hardness = gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
mask_buf = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (source_core),
coords,
@@ -552,7 +552,7 @@ gimp_heal_motion (GimpSourceCore *source_core,
temp_buf_free (temp);
- opacity *= gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
+ opacity *= gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
/* replace the canvas with our healed data */
gimp_brush_core_replace_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
diff --git a/app/paint/gimppaintbrush.c b/app/paint/gimppaintbrush.c
index 8aa4d7b..5b22b74 100644
--- a/app/paint/gimppaintbrush.c
+++ b/app/paint/gimppaintbrush.c
@@ -132,7 +132,7 @@ _gimp_paintbrush_motion (GimpPaintCore *paint_core,
paint_appl_mode = paint_options->application_mode;
- grad_point = gimp_dynamics_get_linear_output_val(brush_core->dynamics->color_dynamics, *coords, fade_point);
+ grad_point = gimp_dynamics_output_get_linear_value (brush_core->dynamics->color_dynamics, *coords, fade_point);
/* optionally take the color from the current gradient */
if (gimp_paint_options_get_gradient_color (paint_options, image,
@@ -177,9 +177,9 @@ _gimp_paintbrush_motion (GimpPaintCore *paint_core,
area->bytes);
}
- opacity *= gimp_dynamics_get_linear_output_val(brush_core->dynamics->opacity_dynamics, *coords, fade_point);
+ opacity *= gimp_dynamics_output_get_linear_value (brush_core->dynamics->opacity_dynamics, *coords, fade_point);
- hardness = gimp_dynamics_get_linear_output_val(brush_core->dynamics->hardness_dynamics, *coords, fade_point);
+ hardness = gimp_dynamics_output_get_linear_value (brush_core->dynamics->hardness_dynamics, *coords, fade_point);
/* finally, let the brush core paste the colored area on the canvas */
gimp_brush_core_paste_canvas (brush_core, drawable,
diff --git a/app/paint/gimpsmudge.c b/app/paint/gimpsmudge.c
index 990e889..53eda96 100644
--- a/app/paint/gimpsmudge.c
+++ b/app/paint/gimpsmudge.c
@@ -276,7 +276,7 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
area->x, area->y, area->width, area->height, FALSE);
/* Enable dynamic rate */
- dynamic_rate = gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->rate_dynamics, *coords, fade_point);
+ dynamic_rate = gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->rate_dynamics, *coords, fade_point);
rate = (options->rate / 100.0) * dynamic_rate;
@@ -317,9 +317,9 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
else
copy_region (&tempPR, &destPR);
- opacity *= gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
+ opacity *= gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->opacity_dynamics, *coords, fade_point);
- hardness = gimp_dynamics_get_linear_output_val(GIMP_BRUSH_CORE(paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
+ hardness = gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->hardness_dynamics, *coords, fade_point);
gimp_brush_core_replace_canvas (GIMP_BRUSH_CORE (paint_core), drawable,
coords,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
