dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: Fix tabs to spaces for dynamics

This commit is contained in:
Alexia Death 2009-12-19 17:29:42 +02:00
parent 119c0b3059
commit 355f1bfd56
12 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/core/gimpdynamicsoutput.c
View File

@ -285,13 +285,13 @@ gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
if ((output->use_fade) && (options))
{
GimpFadeOptions *fade_options = options->fade_options;
GimpFadeOptions *fade_options = options->fade_options;
if (fade_options->use_fade)
{
if (fade_options->use_fade)
{
total += fade_point;
factors++;
}
}
}
if (factors > 0)
@ -308,7 +308,7 @@ gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
gdouble
gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
GimpPaintOptions *options,
GimpPaintOptions *options,
gdouble fade_point)
{
gdouble total = 0.0;
@ -380,13 +380,13 @@ gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
if ((output->use_fade) && (options))
{
GimpFadeOptions *fade_options = options->fade_options;
GimpFadeOptions *fade_options = options->fade_options;
if (fade_options->use_fade)
{
if (fade_options->use_fade)
{
total += fade_point;
factors++;
}
}
}
if (factors > 0)
@ -403,7 +403,7 @@ gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
gdouble
gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
GimpPaintOptions *options,
GimpPaintOptions *options,
gdouble fade_point)
{
gdouble total = 0.0;
@ -456,13 +456,13 @@ gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
if ((output->use_fade) && (options))
{
GimpFadeOptions *fade_options = options->fade_options;
GimpFadeOptions *fade_options = options->fade_options;
if (fade_options->use_fade)
{
total += fade_point;
if (fade_options->use_fade)
{
total += fade_point;
factors++;
}
}
}
if (factors > 0)

7
app/core/gimpdynamicsoutput.h
View File

@ -65,15 +65,16 @@ gboolean gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output);
gdouble gimp_dynamics_output_get_linear_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
GimpPaintOptions *options,
GimpPaintOptions *options,
gdouble fade_point);
gdouble gimp_dynamics_output_get_angular_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
GimpPaintOptions *options,
GimpPaintOptions *options,
gdouble fade_point);
gdouble gimp_dynamics_output_get_aspect_value (GimpDynamicsOutput *output,
const GimpCoords *coords,
GimpPaintOptions *options,
GimpPaintOptions *options,
gdouble fade_point);

4
app/paint/gimpairbrush.c
View File

@ -156,7 +156,7 @@ gimp_airbrush_paint (GimpPaintCore *paint_core,
dynamic_rate =
gimp_dynamics_output_get_linear_value (dynamics->rate_output,
coords,
paint_options,
paint_options,
fade_point);
timeout = 10000 / (options->rate * dynamic_rate);
@ -199,7 +199,7 @@ gimp_airbrush_motion (GimpPaintCore *paint_core,
opacity = options->pressure / 100.0;
opacity *= gimp_dynamics_output_get_linear_value(GIMP_BRUSH_CORE(paint_core)->dynamics->opacity_output,
coords,
paint_options,
paint_options,
fade_point);

16
app/paint/gimpbrushcore.c
View File

@ -425,17 +425,17 @@ gimp_brush_core_start (GimpPaintCore *paint_core,
core->scale *= gimp_dynamics_output_get_linear_value (core->dynamics->size_output,
coords,
paint_options,
paint_options,
fade_point);
core->angle += gimp_dynamics_output_get_angular_value (core->dynamics->angle_output,
coords,
paint_options,
paint_options,
fade_point);
core->aspect_ratio *= gimp_dynamics_output_get_aspect_value (core->dynamics->aspect_ratio_output,
coords,
paint_options,
paint_options,
fade_point);
}
}
@ -522,7 +522,7 @@ gimp_brush_core_interpolate (GimpPaintCore *paint_core,
{
dyn_spacing = gimp_dynamics_output_get_linear_value (core->dynamics->spacing_output,
&current_coords,
paint_options,
paint_options,
fade_point);
/* Dynamic spacing assumes that the value set in core is the min value
* and the max is full 200% spacing. This approach differs ofrom the usual
@ -751,7 +751,7 @@ gimp_brush_core_interpolate (GimpPaintCore *paint_core,
dyn_jitter = core->jitter * gimp_dynamics_output_get_linear_value (core->dynamics->jitter_output,
&current_coords,
paint_options,
paint_options,
fade_point);
jitter_dist = g_rand_double_range (core->rand, 0, dyn_jitter);
@ -819,17 +819,17 @@ gimp_brush_core_get_paint_area (GimpPaintCore *paint_core,
core->scale *= gimp_dynamics_output_get_linear_value (core->dynamics->size_output,
coords,
paint_options,
paint_options,
fade_point);
core->angle += gimp_dynamics_output_get_angular_value (core->dynamics->angle_output,
coords,
paint_options,
paint_options,
fade_point);
core->aspect_ratio *= gimp_dynamics_output_get_aspect_value (core->dynamics->aspect_ratio_output,
coords,
paint_options,
paint_options,
fade_point);
}
}

2
app/paint/gimpclone.c
View File

@ -245,7 +245,7 @@ gimp_clone_motion (GimpSourceCore *source_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
paint_options,
paint_options,
fade_point);
gimp_brush_core_paste_canvas (GIMP_BRUSH_CORE (paint_core), drawable,

4
app/paint/gimpconvolve.c
View File

@ -151,7 +151,7 @@ gimp_convolve_motion (GimpPaintCore *paint_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
paint_options,
paint_options,
fade_point);
if (opacity == 0.0)
return;
@ -165,7 +165,7 @@ gimp_convolve_motion (GimpPaintCore *paint_core,
rate *= gimp_dynamics_output_get_linear_value (dynamics->rate_output,
coords,
paint_options,
paint_options,
fade_point);
gimp_convolve_calculate_matrix (convolve, options->type,

4
app/paint/gimpdodgeburn.c
View File

@ -190,7 +190,7 @@ gimp_dodge_burn_motion (GimpPaintCore *paint_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
paint_options,
paint_options,
fade_point);
if (opacity == 0.0)
return;
@ -257,7 +257,7 @@ gimp_dodge_burn_motion (GimpPaintCore *paint_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
paint_options,
paint_options,
fade_point);
/* Replace the newly dodgedburned area (canvas_buf) to the image */

4
app/paint/gimperaser.c
View File

@ -125,7 +125,7 @@ gimp_eraser_motion (GimpPaintCore *paint_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
paint_options,
paint_options,
fade_point);
if (opacity == 0.0)
return;
@ -147,7 +147,7 @@ gimp_eraser_motion (GimpPaintCore *paint_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
paint_options,
paint_options,
fade_point);
gimp_brush_core_paste_canvas (GIMP_BRUSH_CORE (paint_core), drawable,

2
app/paint/gimpheal.c
View File

@ -450,7 +450,7 @@ gimp_heal_motion (GimpSourceCore *source_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
paint_options,
paint_options,
fade_point);
mask_buf = gimp_brush_core_get_brush_mask (GIMP_BRUSH_CORE (source_core),

6
app/paint/gimppaintbrush.c
View File

@ -128,7 +128,7 @@ _gimp_paintbrush_motion (GimpPaintCore *paint_core,
opacity *= gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
paint_options,
paint_options,
fade_point);
if (opacity == 0.0)
return;
@ -142,7 +142,7 @@ _gimp_paintbrush_motion (GimpPaintCore *paint_core,
grad_point = gimp_dynamics_output_get_linear_value (dynamics->color_output,
coords,
paint_options,
paint_options,
fade_point);
/* optionally take the color from the current gradient */
@ -190,7 +190,7 @@ _gimp_paintbrush_motion (GimpPaintCore *paint_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
paint_options,
paint_options,
fade_point);
/* finally, let the brush core paste the colored area on the canvas */

6
app/paint/gimpsmudge.c
View File

@ -262,7 +262,7 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
paint_options,
paint_options,
fade_point);
if (opacity == 0.0)
return;
@ -282,7 +282,7 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
/* Enable dynamic rate */
dynamic_rate = gimp_dynamics_output_get_linear_value (dynamics->rate_output,
coords,
paint_options,
paint_options,
fade_point);
rate = (options->rate / 100.0) * dynamic_rate;
@ -326,7 +326,7 @@ gimp_smudge_motion (GimpPaintCore *paint_core,
hardness = gimp_dynamics_output_get_linear_value (dynamics->hardness_output,
coords,
paint_options,
paint_options,
fade_point);
gimp_brush_core_replace_canvas (GIMP_BRUSH_CORE (paint_core), drawable,

2
app/paint/gimpsourcecore.c
View File

@ -366,7 +366,7 @@ gimp_source_core_motion (GimpSourceCore *source_core,
opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
coords,
paint_options,
paint_options,
fade_point);
if (opacity == 0.0)
return;