Merge lp:~smspillaz/compiz/compiz.animationsjc-returns into lp:compiz/0.9.12

[Sam Spilsbury]

animationsjc: Re-add the animationsjc plugin

animationsjc: Re-add the animationsjc plugin (thanks MC Return!)

[Marco Trevisan (Treviño) (3v1n0)]

I guess you want to add this to debian/compiz-plugins.install file as well, or pkg build system will complain.

[Sam Spilsbury (smspillaz)]

Hah! I always forget that. Thanks - I'll add it now :)

[lp:~smspillaz/compiz/compiz.animationsjc-returns]

4024. By Sam Spilsbury <email address hidden> on 2016-05-26

debian: Add animationsjc to compiz-plugins.install

[Sam Spilsbury (smspillaz)]

Done

[Marco Trevisan (Treviño) (3v1n0)]

As you said, conflicts are behind the corner, so please merge this again with lp:~smspillaz/compiz/compiz.animationaddon-returns

[Marco Trevisan (Treviño) (3v1n0)]

There's still a merge conflict with prereq branch: https://ci-train.ubuntu.com/job/ubuntu-landing-012-1-build/58/consoleText

[lp:~smspillaz/compiz/compiz.animationsjc-returns]

4025. By Sam Spilsbury <email address hidden> on 2016-06-01

Merge lp:~smspillaz/compiz/compiz.animationaddon-returns

[Marco Trevisan (Treviño) (3v1n0)]

Mh, unfortunately this still fails to build:
 - compiz-animationjc.pc has to be added to debian/compiz-dev.install
 - In ARM still fails

https://launchpadlibrarian.net/262762083/buildlog_ubuntu-yakkety-armhf.compiz_1%3A0.9.12.2+16.10.20160601.1-0ubuntu1_BUILDING.txt.gz

/«BUILDDIR»/compiz-0.9.12.2+16.10.20160601.1/plugins/animationaddon/src/polygon.cpp: In member function ‘virtual void ExtensionPluginAnimAddon::prePaintOutput(CompOutput*)’:
/«BUILDDIR»/compiz-0.9.12.2+16.10.20160601.1/plugins/animationaddon/src/polygon.cpp:1996:23: error: ‘glClearDepth’ was not declared in this scope
  glClearDepth (1000.0f);
                       ^

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Yeah, looks like the issue is in animationaddon - yet another pointless rename of a core function (sigh): https://www.khronos.org/opengles/sdk/docs/man/xhtml/glClearDepthf.xml

I had assumed that since all the fixed function stuff had been removed that we were more or less clear for GLES support, but it looks like I'll need to compile everything locally here to double check.

[Marco Trevisan (Treviño) (3v1n0)]

Almost there...

Just add the .pc file to compiz-dev

dh_install: usr/lib/powerpc64le-linux-gnu/pkgconfig/compiz-animationjc.pc exists in debian/tmp but is not installed to anywhere

[Sam Spilsbury (smspillaz)]

These all need to be resubmitted to lp:compiz anyway

review: Needs Resubmitting

Unmerged revisions

4025. By Sam Spilsbury <email address hidden> on 2016-06-01

Merge lp:~smspillaz/compiz/compiz.animationaddon-returns

4024. By Sam Spilsbury <email address hidden> on 2016-05-26

debian: Add animationsjc to compiz-plugins.install

4023. By Sam Spilsbury <email address hidden> on 2016-05-24

animationjc: Re-add the animationjc plugin

(Thanks MC Return)

4022. By Sam Spilsbury <email address hidden> on 2016-05-23

CMakeLists: Enable building animationaddon

4021. By Sam Spilsbury <email address hidden> on 2016-05-23

animationaddon: Provide damage box for dissolveAnim

4020. By Sam Spilsbury <email address hidden> on 2016-05-23

animationaddon: Use opacity which actually fades out for dissolve.

4019. By Sam Spilsbury <email address hidden> on 2016-05-23

animationaddon: Port the animationaddon plugin to use modern GL API.

This involved a lot of changes:
 - Removal of glPush/glPop. State is assumed to be off in newer versions
   of compiz, so switch off whatever gets switched on.
 - Switch from glVertexPointer/glDrawArrays/glDrawElements to GLVertexBuffer
 - Changes in primitive assembly: GL_POLYGON doesn't exist in GLES
   so switch to using GL_TRIANGLES. This meant that the indices
   for all the animatons needed to be re-tesselated. That was done
   by hand using a winding rule which just duplicates the first and
   third vertex around the fourth.
 - Dropping of glTexEnv calls.
 - Reworking of the depth test, since writes to the depth buffer
   have been disabled by default.

Some things still don't work:
 - Anything depending on clipping planes: glClipPlane and friends
   were removed on GLES20 and they are quite difficult to implement
   using other methods.
 - Drawing of decoration textures - these appear to be stretched
   and skewed incorrectly.
 - Lighting. This will require special shaders.

4018. By Sam Spilsbury <email address hidden> on 2016-05-23

animation: Just set values in paint attrib directly

4017. By Sam Spilsbury <email address hidden> on 2016-05-23

animation: Expose drawGeometry function again

Since glDrawGeometry was dropped post GLES, this function mirrors
glDrawTexture and allows animations to specify their own complete
replacement for it.

4016. By Sam Spilsbury <email address hidden> on 2016-05-23

animation: Reset the glPaint index each time it is called in MultiAnim

Before we were allowing the wrapable function handler to reset
the index, which means that each copy of the animation had
different behaviour.

=== modified file 'debian/compiz-plugins.install'
--- debian/compiz-plugins.install	2016-06-01 03:18:26 +0000
+++ debian/compiz-plugins.install	2016-06-01 03:18:30 +0000
@@ -4,6 +4,8 @@
 usr/share/compiz/*annotate.*
 usr/lib/*/compiz/*animationaddon.*
 usr/share/compiz/*animationaddon.*
+usr/lib/*/compiz/*animationjc.*
+usr/share/compiz/*animationjc.*
 usr/lib/*/compiz/*bench.*
 usr/share/compiz/*bench.*
 usr/lib/*/compiz/*blur.*

=== modified file 'debian/compiz-plugins.install.armel'
--- debian/compiz-plugins.install.armel	2016-06-01 03:18:26 +0000
+++ debian/compiz-plugins.install.armel	2016-06-01 03:18:30 +0000
@@ -4,6 +4,8 @@
 usr/share/compiz/*annotate.*
 usr/lib/*/compiz/*animationaddon.*
 usr/share/compiz/*animationaddon.*
+usr/lib/*/compiz/*animationjc.*
+usr/share/compiz/*animationjc.*
 usr/lib/*/compiz/*clone.*
 usr/share/compiz/*clone.*
 usr/lib/*/compiz/*crashhandler.*

=== modified file 'debian/compiz-plugins.install.armhf'
--- debian/compiz-plugins.install.armhf	2016-06-01 03:18:26 +0000
+++ debian/compiz-plugins.install.armhf	2016-06-01 03:18:30 +0000
@@ -4,6 +4,8 @@
 usr/share/compiz/*annotate.*
 usr/lib/*/compiz/*animationaddon.*
 usr/share/compiz/*animationaddon.*
+usr/lib/*/compiz/*animationjc.*
+usr/share/compiz/*animationjc.*
 usr/lib/*/compiz/*clone.*
 usr/share/compiz/*clone.*
 usr/lib/*/compiz/*crashhandler.*

=== added directory 'plugins/animationjc'
=== added file 'plugins/animationjc/CMakeLists.txt'
--- plugins/animationjc/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/CMakeLists.txt	2016-06-01 03:18:30 +0000
@@ -0,0 +1,7 @@
+find_package (Compiz REQUIRED)
+include (CompizPlugin)
+include (FindOpenGL)
+
+if (OPENGL_GLU_FOUND)
+    compiz_plugin (animationjc PLUGINDEPS composite opengl animation LIBRARIES ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
+endif (OPENGL_GLU_FOUND)

=== added file 'plugins/animationjc/animationjc.xml.in'
--- plugins/animationjc/animationjc.xml.in	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/animationjc.xml.in	2016-06-01 03:18:30 +0000
@@ -0,0 +1,154 @@
+<compiz>
+  <!-- animationaddon metadata -->
+  <plugin name="animationjc" useBcop="true">
+    <_short>Animations Experimental</_short>
+    <_long>Extra window animations</_long>
+    <category>Effects</category>
+    <deps>
+      <requirement>
+	<plugin>opengl</plugin>
+	<plugin>animation</plugin>
+      </requirement>
+      <relation type="after">
+	<plugin>opengl</plugin>
+	<plugin>composite</plugin>
+	<plugin>animation</plugin>
+	<plugin>decor</plugin>
+      </relation>
+    </deps>
+
+    <options>
+    <group>
+      <_short>Effect Settings</_short>
+
+      <subgroup>
+        <_short>Black Hole</_short>
+	<option name="blackhole_delay" type="float">
+	  <_short>Delay</_short>
+	  <default>0.75</default>
+	  <min>0.0</min>
+	  <max>0.99</max>
+	  <precision>0.01</precision>
+	</option>
+      </subgroup>
+
+      <subgroup>
+        <_short>Flicker</_short>
+	<option name="flicker_amplitude" type="int">
+	  <_short>Amplitude</_short>
+	  <default>3</default>
+	  <min>1</min>
+	  <max>10</max>
+	</option>
+      </subgroup>
+
+      <subgroup>
+        <_short>Ghost</_short>
+	<option name="ghost_grid" type="int">
+	  <_short>Grid</_short>
+	  <default>20</default>
+	  <min>2</min>
+	  <max>20</max>
+	</option>
+
+	<option name="ghost_saturation" type="float">
+	  <_short>Saturation</_short>
+	  <default>0.0</default>
+	  <min>0.0</min>
+	  <max>1.0</max>
+	  <precision>0.1</precision>
+	</option>
+
+	<option name="ghost_amplitude" type="float">
+	  <_short>Amplitude</_short>
+	  <default>1.0</default>
+	  <min>0.0</min>
+	  <max>5.0</max>
+	</option>
+
+	<option name="ghost_wave_speed" type="float">
+	  <_short>Wave Speed</_short>
+	  <default>1.0</default>
+	  <min>0.0</min>
+	  <max>5.0</max>
+	</option>
+      </subgroup>
+
+      <subgroup>
+        <_short>Popcorn</_short>
+	<option name="popcorn_kernel_height" type="float">
+	  <_short>Kernel Height</_short>
+	  <default>1.0</default>
+	  <min>0.0</min>
+	  <max>5.0</max>
+	  <precision>0.1</precision>
+	</option>
+      </subgroup>
+
+      <subgroup>
+        <_short>Raindrop</_short>
+
+	<option name="raindrop_amplitude" type="float">
+	  <_short>Amplitude</_short>
+	  <default>1.0</default>
+	  <min>-5.0</min>
+	  <max>5.0</max>
+	  <precision>0.1</precision>
+	</option>
+
+	<option name="raindrop_wavelength" type="float">
+	  <_short>Wavelength</_short>
+	  <default>0.4</default>
+	  <min>0.0</min>
+	  <max>1.0</max>
+	  <precision>0.05</precision>
+	</option>
+
+	<option name="raindrop_num_waves" type="int">
+	  <_short>Number of Waves</_short>
+	  <default>1</default>
+	  <min>1</min>
+	  <max>5</max>
+	</option>
+      </subgroup>
+    </group>
+    </options>
+
+    <extension base_plugin="animation">
+      <base_option>open_effects</base_option>
+      <base_option>open_random_effects</base_option>
+      <base_option>close_effects</base_option>
+      <base_option>close_random_effects</base_option>
+      <base_option>minimize_effects</base_option>
+      <base_option>minimize_random_effects</base_option>
+      <restriction>
+        <value>animationjc:Black Hole</value>
+        <_name>Black Hole</_name>
+      </restriction>
+      <restriction>
+        <value>animationjc:Ghost</value>
+        <_name>Ghost</_name>
+      </restriction>
+      <restriction>
+        <value>animationjc:Popcorn</value>
+        <_name>Popcorn</_name>
+      </restriction>
+    </extension>
+
+    <extension base_plugin="animation">
+      <base_option>open_effects</base_option>
+      <base_option>open_random_effects</base_option>
+      <base_option>close_effects</base_option>
+      <base_option>close_random_effects</base_option>
+      <base_option>focus_effects</base_option>
+      <restriction>
+        <value>animationjc:Flicker</value>
+        <_name>Flicker</_name>
+      </restriction>
+      <restriction>
+        <value>animationjc:Raindrop</value>
+        <_name>Raindrop</_name>
+      </restriction>
+    </extension>
+  </plugin>
+</compiz>

=== added file 'plugins/animationjc/compiz-animationjc.pc.in'
--- plugins/animationjc/compiz-animationjc.pc.in	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/compiz-animationjc.pc.in	2016-06-01 03:18:30 +0000
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: compiz-animationjc
+Description: Animation JC plugin for compiz
+Version: @VERSION@
+
+Requires: compiz compiz-composite compiz-opengl compiz-animation
+Libs: -L${libdir} -lanimationjc
+Cflags: @COMPIZ_CFLAGS@

=== added directory 'plugins/animationjc/include'
=== added directory 'plugins/animationjc/include/animationjc'
=== added file 'plugins/animationjc/include/animationjc/animationjc.h'
--- plugins/animationjc/include/animationjc/animationjc.h	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/include/animationjc/animationjc.h	2016-06-01 03:18:30 +0000
@@ -0,0 +1,42 @@
+#ifndef _COMPIZ_ANIMATIONJC_H
+#define _COMPIZ_ANIMATIONJC_H
+
+#define ANIMATIONADDON_ABI 20091206
+
+#include <core/pluginclasshandler.h>
+
+#include <vector>
+#include <boost/ptr_container/ptr_vector.hpp>
+
+#include <opengl/opengl.h>
+
+using namespace::std;
+
+class PrivateAnimJCScreen;
+
+
+/// Base class for all polygon- and particle-based animations
+class BaseAddonAnim :
+    virtual public Animation
+{
+public:
+    BaseAddonAnim (CompWindow *w,
+		   WindowEvent curWindowEvent,
+		   float duration,
+		   const AnimEffect info,
+		   const CompRect &icon);
+    ~BaseAddonAnim () {}
+
+    bool needsDepthTest () { return mDoDepthTest; }
+
+protected:
+    /// Gets info about the extension plugin that implements this animation.
+    ExtensionPluginInfo *getExtensionPluginInfo ();
+
+    CompositeScreen *mCScreen;
+    GLScreen *mGScreen;
+
+    bool mDoDepthTest;  ///< Whether depth testing should be used in the effect
+};
+
+#endif

=== added directory 'plugins/animationjc/src'
=== added file 'plugins/animationjc/src/animationjc.cpp'
--- plugins/animationjc/src/animationjc.cpp	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/src/animationjc.cpp	2016-06-01 03:18:30 +0000
@@ -0,0 +1,150 @@
+#include "private.h"
+
+class AnimJCPluginVTable :
+    public CompPlugin::VTableForScreenAndWindow<AnimJCScreen, AnimJCWindow>
+{
+public:
+    bool init ();
+};
+
+COMPIZ_PLUGIN_20090315 (animationjc, AnimJCPluginVTable);
+
+AnimEffect animEffects[NUM_EFFECTS];
+
+ExtensionPluginAnimJC animJCExtPluginInfo (CompString ("animationjc"),
+					   NUM_EFFECTS, animEffects, NULL,
+                                           NUM_NONEFFECT_OPTIONS);
+
+AnimEffect AnimEffectBlackHole;
+AnimEffect AnimEffectFlicker;
+AnimEffect AnimEffectGhost;
+AnimEffect AnimEffectPopcorn;
+AnimEffect AnimEffectRaindrop;
+
+ExtensionPluginInfo *
+BaseAddonAnim::getExtensionPluginInfo ()
+{
+    return &animJCExtPluginInfo;
+}
+
+BaseAddonAnim::BaseAddonAnim (CompWindow *w,
+			      WindowEvent curWindowEvent,
+			      float duration,
+			      const AnimEffect info,
+			      const CompRect &icon) :
+    Animation::Animation (w, curWindowEvent, duration, info, icon),
+    mCScreen (CompositeScreen::get (::screen)),
+    mGScreen (GLScreen::get (::screen)),
+    mDoDepthTest (false)
+{
+}
+
+void
+AnimJCScreen::initAnimationList ()
+{
+    int i = 0;
+
+    AnimEffectUsedFor focusableUsedFor = AnimEffectUsedFor::all ()
+					 .exclude (AnimEventShade);
+    AnimEffectUsedFor openUsedFor = AnimEffectUsedFor::all ()
+				    .exclude (AnimEventShade)
+				    .exclude (AnimEventFocus);
+
+    animEffects[i++] = AnimEffectBlackHole =
+        new AnimEffectInfo ("animationjc:Black Hole",
+			    openUsedFor,
+                            &createAnimation<BlackHoleAnim>);
+
+    animEffects[i++] = AnimEffectFlicker =
+        new AnimEffectInfo ("animationjc:Flicker",
+			    focusableUsedFor,
+                            &createAnimation<FlickerAnim>);
+
+    animEffects[i++] = AnimEffectGhost =
+        new AnimEffectInfo ("animationjc:Ghost",
+			    openUsedFor,
+                            &createAnimation<GhostAnim>);
+
+    animEffects[i++] = AnimEffectPopcorn =
+        new AnimEffectInfo ("animationjc:Popcorn",
+			    openUsedFor,
+                            &createAnimation<PopcornAnim>);
+
+    animEffects[i++] = AnimEffectRaindrop =
+        new AnimEffectInfo ("animationjc:Raindrop",
+			    focusableUsedFor,
+                            &createAnimation<RaindropAnim>);
+
+    animJCExtPluginInfo.effectOptions = &getOptions ();
+
+    AnimScreen *as = AnimScreen::get (::screen);
+
+    // Extends animation plugin with this set of animation effects.
+    as->addExtension (&animJCExtPluginInfo);
+}
+
+PrivateAnimJCScreen::PrivateAnimJCScreen (CompScreen *s) :
+    mOutput (s->fullscreenOutput ())
+{
+}
+
+PrivateAnimJCScreen::~PrivateAnimJCScreen ()
+{
+    AnimScreen *as = AnimScreen::get (::screen);
+
+    as->removeExtension (&animJCExtPluginInfo);
+
+    for (int i = 0; i < NUM_EFFECTS; i++)
+    {
+	delete animEffects[i];
+	animEffects[i] = NULL;
+    }
+}
+
+AnimJCScreen::AnimJCScreen (CompScreen *s) :
+    PluginClassHandler<AnimJCScreen, CompScreen> (s),
+    priv (new PrivateAnimJCScreen (s))
+{
+    initAnimationList ();
+}
+
+AnimJCScreen::~AnimJCScreen ()
+{
+    delete priv;
+}
+
+AnimJCWindow::AnimJCWindow (CompWindow *w) :
+    PluginClassHandler<AnimJCWindow, CompWindow> (w),
+    mWindow (w),
+    aWindow (AnimWindow::get (w))
+{
+}
+
+AnimJCWindow::~AnimJCWindow ()
+{
+    Animation *curAnim = aWindow->curAnimation ();
+
+    if (!curAnim)
+	return;
+
+    // We need to interrupt and clean up the animation currently being played
+    // by animationaddon for this window (if any)
+    if (curAnim->remainingTime () > 0 &&
+	curAnim->getExtensionPluginInfo ()->name ==
+	    CompString ("animationjc"))
+    {
+	aWindow->postAnimationCleanUp ();
+    }
+}
+
+bool
+AnimJCPluginVTable::init ()
+{
+    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
+        !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
+        !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) |
+        !CompPlugin::checkPluginABI ("animation", ANIMATION_ABI))
+	 return false;
+
+    return true;
+}

=== added file 'plugins/animationjc/src/blackhole.cpp'
--- plugins/animationjc/src/blackhole.cpp	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/src/blackhole.cpp	2016-06-01 03:18:30 +0000
@@ -0,0 +1,79 @@
+#include "private.h"
+
+#include <algorithm>
+
+BlackHoleAnim::BlackHoleAnim (CompWindow *w,
+			      WindowEvent curWindowEvent,
+			      float duration,
+			      const AnimEffect info,
+			      const CompRect &icon) :
+    Animation::Animation (w, curWindowEvent, duration, info, icon),
+    TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
+    GridTransformAnim::GridTransformAnim (w, curWindowEvent, duration, info,
+                                          icon)
+{
+}
+
+void
+BlackHoleAnim::initGrid ()
+{
+    mGridWidth = 20;
+    mGridHeight = 20;
+}
+
+void
+BlackHoleAnim::step ()
+{
+    CompRect winRect (mAWindow->savedRectsValid () ?
+                      mAWindow->saveWinRect () :
+                      mWindow->geometry ());
+    CompRect outRect (mAWindow->savedRectsValid () ?
+                      mAWindow->savedOutRect () :
+                      mWindow->outputRect ());
+    CompWindowExtents outExtents (mAWindow->savedRectsValid () ?
+			          mAWindow->savedOutExtents () :
+			          mWindow->output ());
+
+    int wx = winRect.x ();
+    int wy = winRect.y ();
+
+    int owidth = outRect.width ();
+    int oheight = outRect.height ();
+
+    float centerx = wx + mModel->scale ().x () *
+	    (owidth * 0.5 - outExtents.left);
+    float centery = wy + mModel->scale ().y () *
+	    (oheight * 0.5 - outExtents.top);
+
+    float delay = AnimJCScreen::get (screen)->optionGetBlackholeDelay ();
+    float tau = (1. - delay) / 8.;
+
+    GridModel::GridObject *object = mModel->objects ();
+    unsigned int n = mModel->numObjects ();
+    for (unsigned int i = 0; i < n; i++, object++)
+    {
+	// find distance to center in grid terms, 0..1
+	float gridDistance = 2 * max (fabs (object->gridPosition ().x ()-0.5),
+				      fabs (object->gridPosition ().y ()-0.5));
+
+	// use that and tau to find r
+	float cutoff = gridDistance * delay;
+	float r = 1;
+	if (getBlackHoleProgress () > cutoff)
+	    r = exp (-(getBlackHoleProgress () - cutoff) / tau);
+
+	// find real original coordinates
+	float origx = wx + mModel->scale ().x () *
+		(owidth * object->gridPosition ().x () -
+		outExtents.left);
+	float origy = wy + mModel->scale ().y () *
+                (oheight * object->gridPosition ().y () -
+                outExtents.top);
+
+	// shrink toward center by r
+	Point3d &objPos = object->position ();
+	objPos.setX ((origx-centerx) * r + centerx);
+	objPos.setY ((origy-centery) * r + centery);
+	objPos.setZ (0);
+    }
+}

=== added file 'plugins/animationjc/src/flicker.cpp'
--- plugins/animationjc/src/flicker.cpp	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/src/flicker.cpp	2016-06-01 03:18:30 +0000
@@ -0,0 +1,96 @@
+#include <private.h>
+
+void
+FlickerSingleAnim::updateAttrib (GLWindowPaintAttrib &attrib)
+{
+    int layer = MultiAnim <FlickerSingleAnim,5>::getCurrAnimNumber (mAWindow);
+    float o = 0.2;
+    attrib.opacity *= o / (1. - (4-layer)*o);
+}
+
+void
+FlickerSingleAnim::initGrid ()
+{
+    mGridWidth = 2;
+    mGridHeight = 20;
+}
+
+void
+FlickerSingleAnim::step ()
+{
+    int layer = MultiAnim <FlickerSingleAnim,5>::getCurrAnimNumber (mAWindow);
+
+    CompRect winRect (mAWindow->savedRectsValid () ?
+                      mAWindow->saveWinRect () :
+                      mWindow->geometry ());
+    CompRect outRect (mAWindow->savedRectsValid () ?
+                      mAWindow->savedOutRect () :
+                      mWindow->outputRect ());
+    CompWindowExtents outExtents (mAWindow->savedRectsValid () ?
+                                  mAWindow->savedOutExtents () :
+                                  mWindow->output ());
+
+    int wx = winRect.x ();
+    int wy = winRect.y ();
+    int owidth = outRect.width ();
+    int oheight = outRect.height ();
+
+    float t = 1 - progressLinear ();
+    if (mCurWindowEvent == WindowEventClose)
+	t = 1 - t;
+
+    float amplitude = AnimJCScreen::get (screen)->optionGetFlickerAmplitude ();
+    float waveLength = 0.4;
+    float wavePosition = -waveLength + (1. + waveLength) * t;
+
+    float displacement = 0;
+
+    GridModel::GridObject *object = mModel->objects ();
+    unsigned int n = mModel->numObjects ();
+    for (unsigned int i = 0; i < n; i++, object++)
+    {
+	Point3d &objPos = object->position ();
+
+	if (i % 2 == 0) // left side; reuse old displacement on right side
+	{
+	    float distFromWave = object->gridPosition ().y () - wavePosition;
+
+	    if (distFromWave > 0 && distFromWave <= waveLength)
+	    {
+		displacement = amplitude * sin (distFromWave/waveLength * M_PI);
+	    }
+	    else
+	    {
+		displacement = 0;
+	    }
+	}
+
+        float x = wx + mModel->scale ().x () *
+            (owidth * object->gridPosition ().x () - outExtents.left);
+
+	float y = wy + mModel->scale ().y () *
+	    (oheight * object->gridPosition ().y () - outExtents.top);
+
+	switch (layer)
+	{
+	    case 1:
+		x -= displacement;
+		break;
+	    case 2:
+		x += displacement;
+		break;
+	    case 3:
+		y -= displacement;
+		break;
+	    case 4:
+		y += displacement;
+		break;
+	    default:
+		break;
+	}
+
+        objPos.setX (x);
+	objPos.setY (y);
+	objPos.setZ (0);
+    }
+}

=== added file 'plugins/animationjc/src/ghost.cpp'
--- plugins/animationjc/src/ghost.cpp	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/src/ghost.cpp	2016-06-01 03:18:30 +0000
@@ -0,0 +1,98 @@
+#include "private.h"
+
+GhostAnim::GhostAnim (CompWindow *w,
+		      WindowEvent curWindowEvent,
+		      float duration,
+		      const AnimEffect info,
+		      const CompRect &icon) :
+    Animation::Animation (w, curWindowEvent, duration, info, icon),
+    TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
+    GridTransformAnim::GridTransformAnim (w, curWindowEvent, duration, info,
+                                          icon)
+{
+}
+
+void
+GhostAnim::updateAttrib (GLWindowPaintAttrib &attrib)
+{
+    AnimJCScreen *ajs = AnimJCScreen::get (screen);
+    attrib.opacity *= 1. - progressLinear ();
+    attrib.saturation *= ajs->optionGetGhostSaturation ();
+}
+
+void
+GhostAnim::initGrid ()
+{
+    AnimJCScreen *ajs = AnimJCScreen::get (screen);
+    mGridWidth = ajs->optionGetGhostGrid ();
+    mGridHeight = ajs->optionGetGhostGrid ();
+}
+
+void
+GhostAnim::step ()
+{
+    float t = 1. - progressLinear ();
+    if (mCurWindowEvent == WindowEventClose)
+	t = 1. - t;
+
+    CompRect winRect (mAWindow->savedRectsValid () ?
+                      mAWindow->saveWinRect () :
+                      mWindow->geometry ());
+    CompRect outRect (mAWindow->savedRectsValid () ?
+                      mAWindow->savedOutRect () :
+                      mWindow->outputRect ());
+    CompWindowExtents outExtents (mAWindow->savedRectsValid () ?
+			          mAWindow->savedOutExtents () :
+			          mWindow->output ());
+
+    int wx = winRect.x ();
+    int wy = winRect.y ();
+
+    int owidth = outRect.width ();
+    int oheight = outRect.height ();
+
+    AnimJCScreen *ajs = AnimJCScreen::get (screen);
+
+    float waveAmp = 3 * ajs->optionGetGhostAmplitude ();
+    float waveLengthX1 = 0.4;
+    float waveLengthX2 = 0.3;
+    float waveLengthY1 = 0.45;
+    float waveLengthY2 = 0.35;
+    float wavePositionX1 =  0.25 * t * ajs->optionGetGhostWaveSpeed ();
+    float wavePositionX2 = -0.25 * t * ajs->optionGetGhostWaveSpeed ();
+    float wavePositionY1 =  0.25 * t * ajs->optionGetGhostWaveSpeed ();
+    float wavePositionY2 = -0.25 * t * ajs->optionGetGhostWaveSpeed ();
+
+    GridModel::GridObject *object = mModel->objects ();
+    unsigned int n = mModel->numObjects ();
+    for (unsigned int i = 0; i < n; i++, object++)
+    {
+	Point3d &objPos = object->position ();
+
+	float origx = wx + mModel->scale ().x () *
+		(owidth * object->gridPosition ().x () -
+		outExtents.left);
+
+	float origy = wy + mModel->scale ().y () *
+		(oheight * object->gridPosition ().y () -
+		outExtents.top);
+
+	float x = object->gridPosition ().x ();
+	float y = object->gridPosition ().y ();
+
+	float distFromWaveX1 = x - wavePositionX1;
+	float distFromWaveX2 = x - wavePositionX2;
+	float distFromWaveY1 = y - wavePositionY1;
+	float distFromWaveY2 = y - wavePositionY2;
+
+	objPos.setX (origx +
+		     waveAmp * sin (distFromWaveX1 / waveLengthX1 * 2 * M_PI) +
+		     waveAmp * sin (distFromWaveX2 / waveLengthX2 * 2 * M_PI));
+
+	objPos.setY (origy +
+		     waveAmp * sin (distFromWaveY1 / waveLengthY1 * 2 * M_PI) +
+		     waveAmp * sin (distFromWaveY2 / waveLengthY2 * 2 * M_PI));
+
+	objPos.setZ (0);
+    }
+}

=== added file 'plugins/animationjc/src/popcorn.cpp'
--- plugins/animationjc/src/popcorn.cpp	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/src/popcorn.cpp	2016-06-01 03:18:30 +0000
@@ -0,0 +1,60 @@
+#include <private.h>
+
+#define WIN_X(w) ((w)->x () - (w)->input ().left)
+#define WIN_Y(w) ((w)->y () - (w)->input ().top)
+#define WIN_W(w) ((w)->width () + (w)->input ().left + (w)->input ().right)
+#define WIN_H(w) ((w)->height () + (w)->input ().top + (w)->input ().bottom)
+
+float
+PopcornSingleAnim::layerProgress (int layer)
+{
+    if (layer == 0)
+	return 0;
+
+    float tStart = (5. - layer) / 6.;
+    float tEnd = tStart + 1./3.;
+
+    float t = progressLinear ();
+
+    if (t < tStart)
+	return 0;
+
+    if (t > tEnd)
+	return 1;
+
+    return (t - tStart) / (tEnd - tStart);
+}
+
+void
+PopcornSingleAnim::updateAttrib (GLWindowPaintAttrib &attrib)
+{
+    int layer = MultiAnim <PopcornSingleAnim, 6>::getCurrAnimNumber (mAWindow);
+
+    attrib.opacity *= 1. - progressLinear ();
+
+    attrib.opacity *= 1. - layerProgress (layer);
+}
+
+void
+PopcornSingleAnim::applyTransform ()
+{
+    int layer = MultiAnim <PopcornSingleAnim, 6>::getCurrAnimNumber (mAWindow);
+
+    if (layer == 0) return;
+
+    float p = layerProgress (layer);
+
+    float v = 40.;
+    float theta = (54. + 144.*(layer-1)) / 180. * 3.14159265;
+    float dx = v * cos (theta) * p;
+    float dy = -v * sin (theta) * p;
+
+    mTransform.translate (dx, dy,
+	    0.16*p*AnimJCScreen::get (screen)->optionGetPopcornKernelHeight ());
+}
+
+void
+PopcornSingleAnim::updateBB (CompOutput &output)
+{
+    TransformAnim::updateBB (output);
+}

=== added file 'plugins/animationjc/src/private.h'
--- plugins/animationjc/src/private.h	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/src/private.h	2016-06-01 03:18:30 +0000
@@ -0,0 +1,232 @@
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include <core/core.h>
+#include <composite/composite.h>
+#include <opengl/opengl.h>
+
+#include <boost/foreach.hpp>
+#define foreach BOOST_FOREACH
+
+#include <animation/animation.h>
+#include <animationjc/animationjc.h>
+
+#include "animationjc_options.h"
+
+extern AnimEffect AnimEffectBlackHole;
+extern AnimEffect AnimEffectFlicker;
+extern AnimEffect AnimEffectGhost;
+extern AnimEffect AnimEffectPopcorn;
+extern AnimEffect AnimEffectRaindrop;
+
+#define NUM_EFFECTS 5
+
+// This must have the value of the first "effect setting" above
+// in AnimJCScreenOptions
+#define NUM_NONEFFECT_OPTIONS 0
+
+class ExtensionPluginAnimJC : public ExtensionPluginInfo
+{
+public:
+    ExtensionPluginAnimJC (const CompString &name,
+			      unsigned int nEffects,
+			      AnimEffect *effects,
+			      CompOption::Vector *effectOptions,
+			      unsigned int firstEffectOptionIndex) :
+	ExtensionPluginInfo (name, nEffects, effects, effectOptions,
+			     firstEffectOptionIndex) {}
+    ~ExtensionPluginAnimJC () {}
+
+    const CompOutput *output () { return mOutput; }
+
+private:
+    const CompOutput *mOutput;
+};
+
+class AnimJCScreen :
+    public PluginClassHandler<AnimJCScreen, CompScreen>,
+    public AnimationjcOptions
+{
+public:
+    AnimJCScreen (CompScreen *);
+    ~AnimJCScreen ();
+
+    int getIntenseTimeStep ();
+
+    void initAnimationList ();
+
+private:
+    PrivateAnimJCScreen *priv;
+};
+
+class PrivateAnimJCScreen
+{
+    friend class AnimJCScreen;
+
+public:
+    PrivateAnimJCScreen (CompScreen *);
+    ~PrivateAnimJCScreen ();
+
+protected:
+    CompOutput &mOutput;
+};
+
+class AnimJCWindow :
+    public PluginClassHandler<AnimJCWindow, CompWindow>
+{
+public:
+    AnimJCWindow (CompWindow *);
+    ~AnimJCWindow ();
+
+protected:
+    CompWindow *mWindow;    ///< Window being animated.
+    AnimWindow *aWindow;
+};
+
+/*** BLACK HOLE **************************************************************/
+
+class BlackHoleAnim :
+    public GridTransformAnim
+{
+public:
+    BlackHoleAnim (CompWindow *w,
+                   WindowEvent curWindowEvent,
+                   float duration,
+                   const AnimEffect info,
+                   const CompRect &icon);
+
+    float getBlackHoleProgress () { return progressLinear (); }
+
+    void initGrid ();
+    inline bool using3D () { return false; }
+    void step ();
+};
+
+/*** RAINDROP ****************************************************************/
+
+class RaindropAnim :
+    public GridTransformAnim
+{
+public:
+    RaindropAnim (CompWindow *w,
+                  WindowEvent curWindowEvent,
+                  float duration,
+                  const AnimEffect info,
+                  const CompRect &icon);
+
+    void initGrid ();
+
+    inline bool using3D () { return true; }
+
+    void step ();
+};
+
+/*** POPCORN *****************************************************************/
+
+class PopcornSingleAnim :
+    public TransformAnim
+{
+public:
+    PopcornSingleAnim (CompWindow *w,
+                       WindowEvent curWindowEvent,
+                       float duration,
+                       const AnimEffect info,
+                       const CompRect &icon) :
+	    Animation::Animation
+		    (w, curWindowEvent, duration, info, icon),
+	    TransformAnim::TransformAnim
+		    (w, curWindowEvent, duration, info, icon)
+    {
+    }
+
+    float layerProgress (int);
+
+    void applyTransform ();
+
+    void updateAttrib (GLWindowPaintAttrib &);
+
+    void updateBB (CompOutput &output);
+    bool updateBBUsed () { return true; }
+};
+
+class PopcornAnim :
+    public MultiAnim <PopcornSingleAnim, 6>
+{
+public:
+    PopcornAnim (CompWindow *w,
+                 WindowEvent curWindowEvent,
+                 float duration,
+                 const AnimEffect info,
+                 const CompRect &icon) :
+	    MultiAnim <PopcornSingleAnim, 6>::MultiAnim
+		    (w, curWindowEvent, duration, info, icon)
+    {
+    }
+};
+
+/*** GHOST *******************************************************************/
+
+class GhostAnim :
+    public GridTransformAnim
+{
+public:
+    GhostAnim (CompWindow *w,
+               WindowEvent curWindowEvent,
+               float duration,
+               const AnimEffect info,
+               const CompRect &icon);
+
+    void initGrid ();
+
+    inline bool using3D () { return true; }
+
+    void step ();
+
+    void updateAttrib (GLWindowPaintAttrib &);
+};
+
+/*** FLICKER *****************************************************************/
+
+class FlickerSingleAnim :
+    public GridTransformAnim
+{
+public:
+    FlickerSingleAnim (CompWindow *w,
+                       WindowEvent curWindowEvent,
+                       float duration,
+                       const AnimEffect info,
+                       const CompRect &icon) :
+	    Animation::Animation
+		    (w, curWindowEvent, duration, info, icon),
+	    TransformAnim::TransformAnim
+		    (w, curWindowEvent, duration, info, icon),
+	    GridTransformAnim::GridTransformAnim
+		    (w, curWindowEvent, duration, info, icon)
+    {
+    }
+
+    void updateAttrib (GLWindowPaintAttrib &);
+
+    void initGrid ();
+
+    void step ();
+
+    bool updateBBUsed () { return true; }
+    void updateBB (CompOutput &output) { TransformAnim::updateBB (output); }
+};
+
+class FlickerAnim :
+    public MultiAnim <FlickerSingleAnim, 5>
+{
+public:
+    FlickerAnim (CompWindow *w,
+                 WindowEvent curWindowEvent,
+                 float duration,
+                 const AnimEffect info,
+                 const CompRect &icon) :
+	    MultiAnim <FlickerSingleAnim, 5>::MultiAnim
+		    (w, curWindowEvent, duration, info, icon)
+    {
+    }
+};

=== added file 'plugins/animationjc/src/raindrop.cpp'
--- plugins/animationjc/src/raindrop.cpp	1970-01-01 00:00:00 +0000
+++ plugins/animationjc/src/raindrop.cpp	2016-06-01 03:18:30 +0000
@@ -0,0 +1,85 @@
+#include "private.h"
+
+#include <algorithm>
+
+RaindropAnim::RaindropAnim (CompWindow *w,
+			    WindowEvent curWindowEvent,
+			    float duration,
+			    const AnimEffect info,
+			    const CompRect &icon) :
+    Animation::Animation (w, curWindowEvent, duration, info, icon),
+    TransformAnim::TransformAnim (w, curWindowEvent, duration, info, icon),
+    GridTransformAnim::GridTransformAnim (w, curWindowEvent, duration, info,
+                                          icon)
+{
+}
+
+void
+RaindropAnim::initGrid ()
+{
+    mGridWidth = 20;
+    mGridHeight = 20;
+}
+
+void
+RaindropAnim::step ()
+{
+    float t = 1. - progressLinear ();
+    if (mCurWindowEvent == WindowEventClose)
+	t = 1. - t;
+
+    CompRect winRect (mAWindow->savedRectsValid () ?
+                      mAWindow->saveWinRect () :
+                      mWindow->geometry ());
+    CompRect outRect (mAWindow->savedRectsValid () ?
+                      mAWindow->savedOutRect () :
+                      mWindow->outputRect ());
+    CompWindowExtents outExtents (mAWindow->savedRectsValid () ?
+			          mAWindow->savedOutExtents () :
+			          mWindow->output ());
+
+    int wx = winRect.x ();
+    int wy = winRect.y ();
+
+    int owidth = outRect.width ();
+    int oheight = outRect.height ();
+
+    AnimJCScreen *ajs = AnimJCScreen::get (screen);
+
+    float waveLength = ajs->optionGetRaindropWavelength ();
+    int numWaves = ajs->optionGetRaindropNumWaves ();
+    float waveAmp = (pow ((float)oheight / ::screen->height (), 0.4) * 0.08) *
+	    ajs->optionGetRaindropAmplitude ();
+    float wavePosition = -waveLength * numWaves +
+	    (1. + waveLength * numWaves) * t;
+
+    GridModel::GridObject *object = mModel->objects ();
+    unsigned int n = mModel->numObjects ();
+    for (unsigned int i = 0; i < n; i++, object++)
+    {
+	Point3d &objPos = object->position ();
+
+        float origx = wx + mModel->scale ().x () *
+		(owidth * object->gridPosition ().x () -
+		outExtents.left);
+        objPos.setX (origx);
+
+	float origy = wy + mModel->scale ().y () *
+		(oheight * object->gridPosition ().y () -
+		outExtents.top);
+        objPos.setY (origy);
+
+	// find distance to center in grid terms
+	float gridDistance = sqrt (pow (object->gridPosition ().x ()-0.5, 2) +
+			           pow (object->gridPosition ().y ()-0.5, 2)) *
+			     sqrt (2);
+
+	float distFromWave = gridDistance - wavePosition;
+	if (distFromWave < waveLength*numWaves && distFromWave > 0)
+	    objPos.setZ (waveAmp *
+		    sin (3.14159265 * distFromWave / waveLength / numWaves) *
+		    pow (sin (3.14159265 * distFromWave / waveLength), 2));
+	else
+	    objPos.setZ (0);
+    }
+}