summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--atlantis.c10
-rw-r--r--atlantis.xml5
2 files changed, 13 insertions, 2 deletions
diff --git a/atlantis.c b/atlantis.c
index 53757cf..fecb8d6 100644
--- a/atlantis.c
+++ b/atlantis.c
@@ -268,13 +268,13 @@ static void atlantisPaintInside (CompScreen *s, const ScreenPaintAttrib *sAttrib
glPushAttrib(GL_COLOR_BUFFER_BIT | GL_TEXTURE_BIT | GL_LIGHTING_BIT);
glDisable(GL_BLEND);
- if (!glIsEnabled(GL_CULL_FACE))
+ if (glIsEnabled(GL_CULL_FACE))
{
enabledCull = TRUE;
glEnable(GL_CULL_FACE);
}
- glDisable(GL_CULL_FACE);
+
glPushMatrix();
glScalef(0.00001,0.00001,0.00001);
@@ -290,6 +290,12 @@ static void atlantisPaintInside (CompScreen *s, const ScreenPaintAttrib *sAttrib
glEnable(GL_NORMALIZE);
glEnable(GL_LIGHTING);
glEnable(GL_LIGHT1);
+ glEnable(GL_LIGHT0);
+
+ if (atlantisGetColors(s))
+ glEnable (GL_COLOR_MATERIAL);
+ else
+ glDisable (GL_COLOR_MATERIAL);
glEnable(GL_DEPTH_TEST);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
diff --git a/atlantis.xml b/atlantis.xml
index 80e7e29..1bbd24c 100644
--- a/atlantis.xml
+++ b/atlantis.xml
@@ -20,6 +20,11 @@
<min>5</min>
<max>100</max>
</option>
+ <option name="colors" type="bool">
+ <short>Colors</short>
+ <long>Enable colors</long>
+ <default>true</default>
+ </option>
</screen>
</plugin>
</compiz>