summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/miniview.c
diff options
context:
space:
mode:
authorracarr <racarr@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-03 03:01:51 +0000
committerracarr <racarr@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-02-03 03:01:51 +0000
commit14e7ea84db9bc375ea1e0aa61c1b85e00639142e (patch)
tree16c7669996dbcd0aa515194b4cb6d00fe65f612a /beryl-plugins/src/miniview.c
parent2b2555943c2f43b8b9c2846b06e43d400462bbe5 (diff)
downloadmarex-dev-14e7ea84db9bc375ea1e0aa61c1b85e00639142e.tar.gz
marex-dev-14e7ea84db9bc375ea1e0aa61c1b85e00639142e.tar.bz2
Lots of work on expo mode
git-svn-id: file:///beryl/trunk@3602 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/miniview.c')
-rw-r--r--beryl-plugins/src/miniview.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/beryl-plugins/src/miniview.c b/beryl-plugins/src/miniview.c
index ca2e308..2585a05 100644
--- a/beryl-plugins/src/miniview.c
+++ b/beryl-plugins/src/miniview.c
@@ -310,17 +310,19 @@ static void miniviewPaintTransformedScreen(CompScreen * s,
//int origView = s->x;
//moveScreenViewport(s,-s->x,0,FALSE);
- if (ms->expoCam+0.075 <= 1)
- ms->expoCam += 0.075;
+ if (ms->expoCam+0.15 <= 1)
+ ms->expoCam += 0.15;
- glScalef(1/((float)s->hsize/2),1/((float)s->vsize/2),1.0f);
+ glScalef(((s->hsize > 1) ? 1/((float)s->hsize/2) : 1)/ms->expoCam,((s->vsize > 1) ? 1/((float)s->vsize/2) : 1)/ms->expoCam,1.0f);
- glTranslatef(-0.25f*s->hsize,0.25f*s->vsize,-0.8f);
+ glTranslatef(-0.15f*s->hsize,0.25f*s->vsize,-0.8f);
+
+ glRotatef(10*ms->expoCam,0.0f,1.0f,-0.0f);
+
- glRotatef(10,0.0f,1.0f,-0.0f);
glTranslatef(0.0f,0.0f,-0.2f);
int i;
@@ -330,8 +332,11 @@ static void miniviewPaintTransformedScreen(CompScreen * s,
{
for (i = 0; i < s->hsize; i++)
{
+
(*s->paintTransformedScreen) (s, sAttrib,region, output, mask);
+
glTranslatef(1.0,0.0f,0.0);
+
moveScreenViewport(s,1,0,FALSE);
}
glTranslatef(-(s->hsize),-1.0f,0.0f);