gimp r25575 - in trunk: . plug-ins/script-fu/scripts

[neo svn gnome org]

Author: neo
Date: Tue May  6 11:52:56 2008
New Revision: 25575
URL: http://svn.gnome.org/viewvc/gimp?rev=25575&view=rev

Log:
2008-05-06  Sven Neumann  <sven gimp org>

	* plug-ins/script-fu/scripts/3d-outline.scm: applied patch from
	 Ulf-D. Ehlert. Makes the vacated region, which is created when
	 specifying a non-zero shadow offset, to be filled with the
	 background color (white) instead of transparency (bug #530216).


Modified:
   trunk/ChangeLog
   trunk/plug-ins/script-fu/scripts/3d-outline.scm

Modified: trunk/plug-ins/script-fu/scripts/3d-outline.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/3d-outline.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/3d-outline.scm	Tue May  6 11:52:56 2008
@@ -35,10 +35,10 @@
         (height (car (gimp-drawable-height logo-layer)))
         (bg-layer (car (gimp-layer-new img width height
                                        RGB-IMAGE "Background" 100 NORMAL-MODE)))
-        (pattern (car (gimp-layer-new img width height
-                                      RGBA-IMAGE "Pattern" 100 NORMAL-MODE)))
-        (layer2 0)
-        (layer3 0)
+        (pattern-layer (car (gimp-layer-new img width height
+                                       RGBA-IMAGE "Pattern" 100 NORMAL-MODE)))
+        (alpha-layer 0)
+        (shadow-layer 0)
         (pattern-mask 0)
         (floating-sel 0)
         )
@@ -47,46 +47,50 @@
 
     (gimp-selection-none img)
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (script-fu-util-image-add-layers img pattern bg-layer)
+    (script-fu-util-image-add-layers img pattern-layer bg-layer)
     (gimp-context-set-background '(255 255 255))
     (gimp-edit-fill bg-layer BACKGROUND-FILL)
-    (gimp-edit-clear pattern)
+    (gimp-edit-clear pattern-layer)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
     (gimp-context-set-foreground '(0 0 0))
     (gimp-edit-fill logo-layer FOREGROUND-FILL)
     (gimp-layer-set-lock-alpha logo-layer FALSE)
     (plug-in-gauss-iir RUN-NONINTERACTIVE img logo-layer outline-blur-radius TRUE TRUE)
 
-    (gimp-drawable-set-visible pattern FALSE)
-    (set! layer2 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)))
-    (plug-in-edge RUN-NONINTERACTIVE img layer2 2 1 0)
-    (set! layer3 (car (gimp-layer-copy layer2 TRUE)))
-    (script-fu-util-image-add-layers img layer3)
-    (plug-in-gauss-iir RUN-NONINTERACTIVE img layer2 bump-map-blur-radius TRUE TRUE)
+    (gimp-drawable-set-visible pattern-layer FALSE)
+    (set! alpha-layer (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)))
+    (plug-in-edge RUN-NONINTERACTIVE img alpha-layer 2 1 0)
+    (gimp-drawable-set-name alpha-layer "Bump map")
+    (set! shadow-layer (car (gimp-layer-copy alpha-layer TRUE)))
+    (gimp-drawable-set-name shadow-layer "Edges")
+    (script-fu-util-image-add-layers img shadow-layer)
+    (plug-in-gauss-iir RUN-NONINTERACTIVE img alpha-layer bump-map-blur-radius TRUE TRUE)
 
     (gimp-selection-all img)
     (gimp-context-set-pattern text-pattern)
-    (gimp-edit-bucket-fill pattern
+    (gimp-edit-bucket-fill pattern-layer
                            PATTERN-BUCKET-FILL NORMAL-MODE 100 0 FALSE 0 0)
-    (plug-in-bump-map noninteractive img pattern layer2
+    (plug-in-bump-map noninteractive img pattern-layer alpha-layer
                       110.0 45.0 4 0 0 0 0 TRUE FALSE 0)
 
-    (set! pattern-mask (car (gimp-layer-create-mask pattern ADD-ALPHA-MASK)))
-    (gimp-layer-add-mask pattern pattern-mask)
+    (set! pattern-mask (car (gimp-layer-create-mask pattern-layer ADD-ALPHA-MASK)))
+    (gimp-layer-add-mask pattern-layer pattern-mask)
 
     (gimp-selection-all img)
-    (gimp-edit-copy layer3)
+    (gimp-edit-copy shadow-layer)
     (set! floating-sel (car (gimp-edit-paste pattern-mask FALSE)))
     (gimp-floating-sel-anchor floating-sel)
 
-    (gimp-layer-remove-mask pattern MASK-APPLY)
-    (gimp-invert layer3)
-    (plug-in-gauss-iir RUN-NONINTERACTIVE img layer3 shadow-blur-radius TRUE TRUE)
+    (gimp-layer-remove-mask pattern-layer MASK-APPLY)
+    (gimp-invert shadow-layer)
+    (gimp-drawable-set-name shadow-layer "Drop shadow")
+    (plug-in-gauss-iir RUN-NONINTERACTIVE img shadow-layer shadow-blur-radius TRUE TRUE)
 
-    (gimp-drawable-offset layer3 0 1 s-offset-x s-offset-y)
+    (gimp-drawable-offset shadow-layer
+                          FALSE OFFSET-BACKGROUND s-offset-x s-offset-y)
 
-    (gimp-drawable-set-visible layer2 FALSE)
-    (gimp-drawable-set-visible pattern TRUE)
+    (gimp-drawable-set-visible alpha-layer FALSE)
+    (gimp-drawable-set-visible pattern-layer TRUE)
     ;;(set! final (car (gimp-image-flatten img)))
 
     (gimp-context-pop)