Merge lp:~smspillaz/compiz/compiz.animationsjc-returns into lp:compiz/0.9.12
Status: | Rejected |
---|---|
Rejected by: | Sam Spilsbury |
Proposed branch: | lp:~smspillaz/compiz/compiz.animationsjc-returns |
Merge into: | lp:compiz/0.9.12 |
Prerequisite: | lp:~smspillaz/compiz/compiz.animationaddon-returns |
Diff against target: |
1112 lines (+1021/-0) 14 files modified
debian/compiz-plugins.install (+2/-0) debian/compiz-plugins.install.armel (+2/-0) debian/compiz-plugins.install.armhf (+2/-0) plugins/animationjc/CMakeLists.txt (+7/-0) plugins/animationjc/animationjc.xml.in (+154/-0) plugins/animationjc/compiz-animationjc.pc.in (+12/-0) plugins/animationjc/include/animationjc/animationjc.h (+42/-0) plugins/animationjc/src/animationjc.cpp (+150/-0) plugins/animationjc/src/blackhole.cpp (+79/-0) plugins/animationjc/src/flicker.cpp (+96/-0) plugins/animationjc/src/ghost.cpp (+98/-0) plugins/animationjc/src/popcorn.cpp (+60/-0) plugins/animationjc/src/private.h (+232/-0) plugins/animationjc/src/raindrop.cpp (+85/-0) |
To merge this branch: | bzr merge lp:~smspillaz/compiz/compiz.animationsjc-returns |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sam Spilsbury | Needs Resubmitting | ||
Marco Trevisan (Treviño) | Needs Fixing | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email:
|
Commit message
animationsjc: Re-add the animationsjc plugin
Description of the change
animationsjc: Re-add the animationsjc plugin (thanks MC Return!)
Unmerged revisions
- 4025. By Sam Spilsbury <email address hidden>
- 4024. By Sam Spilsbury <email address hidden>
-
debian: Add animationsjc to compiz-
plugins. install - 4023. By Sam Spilsbury <email address hidden>
-
animationjc: Re-add the animationjc plugin
(Thanks MC Return)
- 4022. By Sam Spilsbury <email address hidden>
-
CMakeLists: Enable building animationaddon
- 4021. By Sam Spilsbury <email address hidden>
-
animationaddon: Provide damage box for dissolveAnim
- 4020. By Sam Spilsbury <email address hidden>
-
animationaddon: Use opacity which actually fades out for dissolve.
- 4019. By Sam Spilsbury <email address hidden>
-
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>
-
animation: Just set values in paint attrib directly
- 4017. By Sam Spilsbury <email address hidden>
-
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>
-
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.
I guess you want to add this to debian/ compiz- plugins. install file as well, or pkg build system will complain.