Merge lp:~mc-return/compiz/compiz.merge-fix1162484-original-cube-top-and-bottom-caps-not-deformed into lp:compiz/0.9.9

[MC Return]

Cube-addon (Cube Reflection and Deformation):

If the user disables "Draw top face"/"Draw bottom face"
we do not want to draw anything.

The original, non-deformed caps will only work for the
non-deformed cube, so we can just use the original function
in that case.

We need to clear the texture if no texture files are
specified in "Image files".
In this case we will default back and use the cube cap
colors and opacities defined in the "Desktop Cube" plugin
(if "Draw top/bottom face" are enabled only, see above).

void CubeaddonScreen::CubeCap::load is just called by
CubeaddonScreen::changeCap, where cap->mFiles.size ()
is already checked, no need to check it again.

Removed redundant call to cScreen->damageScreen ().
If we draw the cube we are already damaging the screen, no
need to damage it again if we change the cap.

Fixed indentation, removed redundant brackets and newlines,
declaration and assignment of local variables in one line,
if possible, minor cleanup.

(LP: #1162484, LP: #1162711)

Note:
Bug #1162740 (also regarding the caps) is still open, so the caps functionality is just almost perfect... :(
I am hunting this bug as well, but am currently a bit stuck with it (I added details to
the bug report already).

[Daniel van Vugt (vanvugt)]

Please re-target this for lp:compiz/0.9.10

review: Needs Resubmitting

[lp:~mc-return/compiz/compiz.merge-fix1162484-original-cube-top-and-bottom-caps-not-deformed]

3646. By MC Return on 2013-04-02

cScreen->damageScreen (); once the cap has been changed
(reverted removal)

3647. By MC Return on 2013-04-02

Moved the mFiles.size () check to CubeaddonScreen::CubeCap::load (...)

Removed redundant mCurrent = mCurrent % mFiles.size (); calculation,
this has already been done:
cap->mCurrent = (cap->mCurrent + change + count) % count;

count and change both need to be != 0 for mCurrent to change

3648. By MC Return on 2013-04-03

Additional cleanup

Unmerged revisions

3648. By MC Return on 2013-04-03

Additional cleanup

3647. By MC Return on 2013-04-02

Moved the mFiles.size () check to CubeaddonScreen::CubeCap::load (...)

Removed redundant mCurrent = mCurrent % mFiles.size (); calculation,
this has already been done:
cap->mCurrent = (cap->mCurrent + change + count) % count;

count and change both need to be != 0 for mCurrent to change

3646. By MC Return on 2013-04-02

cScreen->damageScreen (); once the cap has been changed
(reverted removal)

3645. By MC Return on 2013-04-01

If the user disables "Draw top face"/"Draw bottom face"
we do not want to draw anything

The original, non-deformed caps will only work for the
non-deformed cube, so we can just use it in that case

We need to clear the texture if no texture files are
specified

void CubeaddonScreen::CubeCap::load is just called by
CubeaddonScreen::changeCap, where cap->mFiles.size ()
is already checked, no need to check it again

Fixed indentation

Removed redundant brackets and newlines

3644. By MC Return on 2013-03-31

Cube-addon:
Only call cubeScreen->cubePaintBottom if there is no deformation
Declare and assign variables in one line, if possible
Minor cleanup

=== modified file 'plugins/cubeaddon/src/cubeaddon.cpp'
--- plugins/cubeaddon/src/cubeaddon.cpp	2013-02-25 19:34:51 +0000
+++ plugins/cubeaddon/src/cubeaddon.cpp	2013-04-01 11:03:21 +0000
@@ -44,9 +44,6 @@
 void
 CubeaddonScreen::CubeCap::load (bool scale, bool aspect, bool clamp)
 {
-    if (mFiles.empty ())
-	return;
-
     CompSize tSize;
     float    xScale, yScale;
 
@@ -58,7 +55,6 @@
 
     mCurrent = mCurrent % mFiles.size ();
 
-
     CompString imgName = mFiles[mCurrent].s ();
     CompString pname = "cubeaddon";
     mTexture = GLTexture::readImageToTexture (imgName, pname, tSize);
@@ -147,6 +143,7 @@
     {
 	int count = cap->mFiles.size ();
 	cap->mCurrent = (cap->mCurrent + change + count) % count;
+
 	if (top)
 	{
 	    cap->load (optionGetTopScale (), optionGetTopAspect (),
@@ -158,16 +155,21 @@
 		       optionGetBottomClamp ());
 	    cap->mTexMat.scale (1.0, -1.0, 1.0);
 	}
-	cScreen->damageScreen ();
-    }
-
+    }
+    /* we need to clear the texture if no texture files are specified */
+    else if (cap->mFiles.empty ())
+    {
+	cap->mTexture.clear ();
+	cap->mLoaded = false;
+	cap->mCurrent = 0;
+	cap->mTexMat.reset ();
+    }
     return false;
 }
 
 bool
 CubeaddonScreen::setOption (const CompString &name, CompOption::Value &value)
 {
-
     unsigned int index;
 
     bool rv = CubeaddonOptions::setOption (name, value);
@@ -206,11 +208,9 @@
 void
 CubeaddonScreen::drawBasicGround ()
 {
-    float i;
-
     glEnable (GL_BLEND);
     glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    i = optionGetIntensity () * 2;
+    float i = optionGetIntensity () * 2;
 
     GLMatrix transform;
     transform.translate (0.0f, 0.0f, -DEFAULT_Z_CAMERA);
@@ -272,10 +272,8 @@
 				       CompOutput                *output,
 				       std::vector<GLVector>     &points)
 {
-    bool status;
-
-    status = cubeScreen->cubeCheckOrientation (sAttrib, transform,
-					       output, points);
+    bool status = cubeScreen->cubeCheckOrientation (sAttrib, transform,
+						    output, points);
 
     if (mReflection)
 	return !status;
@@ -318,7 +316,7 @@
 					  PaintOrder                order)
 {
     bool rv = cubeScreen->cubeShouldPaintViewport (sAttrib, transform,
-					      output, order);
+						   output, order);
 
     if (rv || cubeScreen->unfolded ())
 	return rv;
@@ -406,7 +404,6 @@
 {
     GLScreenPaintAttrib sa;
     GLMatrix            sTransform;
-    int                 i, l, opacity;
     int                 cullNorm, cullInv;
     bool                wasCulled = glIsEnabled (GL_CULL_FACE);
     float               cInv = (top) ? 1.0: -1.0;
@@ -416,12 +413,13 @@
 
     glGetIntegerv (GL_CULL_FACE_MODE, &cullNorm);
     cullInv   = (cullNorm == GL_BACK)? GL_FRONT : GL_BACK;
+
     if (top)
 	color = cubeScreen->topColor ();
     else
 	color = cubeScreen->bottomColor ();
 
-    opacity = cubeScreen->desktopOpacity () * color[3] / 0xffff;
+    int opacity = cubeScreen->desktopOpacity () * color[3] / 0xffff;
 
     glEnable (GL_BLEND);
 
@@ -438,11 +436,11 @@
 
     glEnable(GL_CULL_FACE);
 
-    for (l = 0; l < ((cubeScreen->invert () == 1) ? 2 : 1); l++)
+    for (int l = 0; l < ((cubeScreen->invert () == 1) ? 2 : 1); l++)
     {
 	glCullFace(((l == 1) ^ top) ? cullInv : cullNorm);
 
-	for (i = 0; i < size; i++)
+	for (int i = 0; i < size; i++)
 	{
 	    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
 
@@ -688,17 +686,18 @@
 			       int                       size,
 			       const GLVector            &normal)
 {
-    if ((!optionGetDrawBottom () && cubeScreen->invert () == -1) ||
-        (!optionGetDrawTop () && cubeScreen->invert () == 1))
-    {
+    /* we do not want to draw anything if this option is disabled */
+    if (!optionGetDrawTop ())
+	return;
+
+    if (((!optionGetDrawBottom () && cubeScreen->invert () == -1) ||
+	 (!optionGetDrawTop () && cubeScreen->invert () == 1)) &&
+	/* the original top cap will work for the non-deformed cube only */
+	(optionGetDeformation () == DeformationNone))
 	cubeScreen->cubePaintTop (sAttrib, transform, output, size, normal);
-    }
-
-    if (!optionGetDrawTop ())
-        return;
-
-    paintCap (sAttrib, transform, output, size,
-	      true, optionGetAdjustTop ());
+    else
+	paintCap (sAttrib, transform, output, size,
+		  true, optionGetAdjustTop ());
 }
 
 void 
@@ -708,16 +707,17 @@
 				  int                       size,
 				  const GLVector            &normal)
 {
-    if ((!optionGetDrawBottom () && cubeScreen->invert () == 1) ||
-        (!optionGetDrawTop () && cubeScreen->invert () == -1))
-    {
+    /* we do not want to draw anything if this option is disabled */
+    if (!optionGetDrawBottom ())
+	return;
+
+    if (((!optionGetDrawBottom () && cubeScreen->invert () == 1) ||
+	 (!optionGetDrawTop () && cubeScreen->invert () == -1)) &&
+	/* the original bottom cap will work for the non-deformed cube only */
+	(optionGetDeformation () == DeformationNone))
 	cubeScreen->cubePaintBottom (sAttrib, transform, output, size, normal);
-    }
-
-    if (!optionGetDrawBottom ())
-        return;
-
-    paintCap (sAttrib, transform, output, size,
+    else
+	paintCap (sAttrib, transform, output, size,
 	      false, optionGetAdjustBottom ());
 }
 
@@ -911,7 +911,6 @@
     if (!(mask & PAINT_WINDOW_TRANSFORMED_MASK) && caScreen->mDeform)
     {
 	CompPoint offset;
-	int x1, x2;
 
 	if (!window->onAllViewports ())
 	{
@@ -919,8 +918,8 @@
 	    offset = window->getMovementForOffset (offset);
 	}
 	
-	x1 = window->x () - window->output ().left + offset.x ();
-	x2 = window->x () + window->width () + window->output ().right + offset.x ();
+	int x1 = window->x () - window->output ().left + offset.x ();
+	int x2 = window->x () + window->width () + window->output ().right + offset.x ();
 	if (x1 < 0 && x2 < 0)
 	    return false;
 	if (x1 > screen->width () && x2 > screen->width ())
@@ -941,16 +940,15 @@
 	int       i;
 	int       sx1, sx2, sw, sy1, sy2, sh;
 	int       offX = 0, offY = 0;
-	float     x, y, ym;
+	float     x, y;
 	GLfloat   *v, *n;
-	float     inv;
 	
 	GLVertexBuffer               *vb = gWindow->vertexBuffer ();
 	CubeScreen::MultioutputMode  cMOM = cubeScreen->multioutputMode ();
 	float                        cDist = cubeScreen->distance ();
 
-	inv = (cubeScreen->invert () == 1) ? 1.0: -1.0;
-	ym  = (caScreen->optionGetDeformation () == CubeaddonScreen::DeformationCylinder) ? 0.0 : 1.0;
+	float inv = (cubeScreen->invert () == 1) ? 1.0: -1.0;
+	float ym  = (caScreen->optionGetDeformation () == CubeaddonScreen::DeformationCylinder) ? 0.0 : 1.0;
 	
 	int vertexCount = vb->countVertices ();
 
@@ -1516,7 +1514,6 @@
     cScreen->donePaint ();
 }
 
-
 CubeaddonScreen::CubeaddonScreen (CompScreen *s) :
     PluginClassHandler<CubeaddonScreen, CompScreen> (s),
     CubeaddonOptions (),
@@ -1608,4 +1605,3 @@
 
     return true;
 }
-