Flattened the alpha of the background gradients to allow the elimination of color...

git-svn-id: https://s.snth.net/svn/neverball/branches/gles@3554 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/game_draw.c b/ball/game_draw.c
index e8e95c7..af0f41d 100644 (file)
--- a/ball/game_draw.c
+++ b/ball/game_draw.c
@@ -276,11 +276,8 @@ static const struct d_mtrl *game_draw_back(const struct d_mtrl *mq,
 
         if (config_get_d(CONFIG_BACKGROUND))
         {
-            /* Draw all background layers back to front. */
-
-            mq = sol_back(&gd->back.draw, mq, BACK_DIST, FAR_DIST,  t);
             mq = back_draw(mq, 0);
-            mq = sol_back(&gd->back.draw, mq,         0, BACK_DIST, t);
+            mq = sol_back(&gd->back.draw, mq, 0, FAR_DIST, t);
         }
         else back_draw(mq, t);
     }

diff --git a/ball/main.c b/ball/main.c
index 6dd19f1..398d39c 100644 (file)
--- a/ball/main.c
+++ b/ball/main.c
@@ -54,6 +54,7 @@ static void shot(void)
 
 static void toggle_wire(void)
 {
+/*
     static int wire = 0;
 
     if (wire)
@@ -70,6 +71,7 @@ static void toggle_wire(void)
         glDisable(GL_LIGHTING);
         wire = 1;
     }
+*/
 }
 
 /*---------------------------------------------------------------------------*/

diff --git a/data/back/alien.png b/data/back/alien.png
index a8c9f46..e4ef254 100644 (file)
Binary files a/data/back/alien.png and b/data/back/alien.png differ

diff --git a/data/back/space.png b/data/back/space.png
index dd23f0e..f72241f 100644 (file)
Binary files a/data/back/space.png and b/data/back/space.png differ

diff --git a/data/back/volcano.png b/data/back/volcano.png
index f08550f..3e1fc2b 100644 (file)
Binary files a/data/back/volcano.png and b/data/back/volcano.png differ

diff --git a/data/map-back/alien.map b/data/map-back/alien.map
index a2db099..d6eb504 100644 (file)
--- a/data/map-back/alien.map
+++ b/data/map-back/alien.map
@@ -2858,7 +2858,7 @@
 "image"     "png/stars1"
 "width"     "  +101.49846     +0.00000     +0.00000"
 "height"    "  +101.49846     +0.00000     +0.00000"
-"xrot"      "   +10.31190     +0.00000     +0.00000"
+"xrot"      "   +30.31190     +0.00000     +0.00000"
 "yrot"      "   -48.79726     +0.00000     +0.00000"
 "zrot"      "  -147.09494     +0.00000     +0.00000"
 "dist"      "  +300.00000"
@@ -2870,7 +2870,7 @@
 "image"     "png/stars1"
 "width"     "  +198.85251     +0.00000     +0.00000"
 "height"    "  +198.85251     +0.00000     +0.00000"
-"xrot"      "    +0.32685     +0.00000     +0.00000"
+"xrot"      "   +20.32685     +0.00000     +0.00000"
 "yrot"      "  -137.13004     +0.00000     +0.00000"
 "zrot"      "   -19.55077     +0.00000     +0.00000"
 "dist"      "  +300.00000"
@@ -2966,7 +2966,7 @@
 "image"     "png/stars1"
 "width"     "  +137.58659     +0.00000     +0.00000"
 "height"    "  +137.58659     +0.00000     +0.00000"
-"xrot"      "    +3.93506     +0.00000     +0.00000"
+"xrot"      "   +15.93506     +0.00000     +0.00000"
 "yrot"      "   +63.79406     +0.00000     +0.00000"
 "zrot"      "  -146.65547     +0.00000     +0.00000"
 "dist"      "  +300.00000"
@@ -2990,7 +2990,7 @@
 "image"     "png/stars3"
 "width"     "  +183.76111     +0.00000     +0.00000"
 "height"    "  +183.76111     +0.00000     +0.00000"
-"xrot"      "   +14.37513     +0.00000     +0.00000"
+"xrot"      "   +24.37513     +0.00000     +0.00000"
 "yrot"      "    -5.42192     +0.00000     +0.00000"
 "zrot"      "   +81.53752     +0.00000     +0.00000"
 "dist"      "  +300.00000"
@@ -3098,7 +3098,7 @@
 "image"     "png/stars1"
 "width"     "  +117.78924     +0.00000     +0.00000"
 "height"    "  +117.78924     +0.00000     +0.00000"
-"xrot"      "   +10.88870     +0.00000     +0.00000"
+"xrot"      "   +18.88870     +0.00000     +0.00000"
 "yrot"      "    -8.90469     +0.00000     +0.00000"
 "zrot"      "  +114.18989     +0.00000     +0.00000"
 "dist"      "  +300.00000"
@@ -3122,7 +3122,7 @@
 "image"     "png/stars1"
 "width"     "  +175.58519     +0.00000     +0.00000"
 "height"    "  +175.58519     +0.00000     +0.00000"
-"xrot"      "    +8.61141     +0.00000     +0.00000"
+"xrot"      "   +15.61141     +0.00000     +0.00000"
 "yrot"      "    -8.89370     +0.00000     +0.00000"
 "zrot"      "   +79.88953     +0.00000     +0.00000"
 "dist"      "  +300.00000"
@@ -3218,7 +3218,7 @@
 "image"     "png/stars3"
 "width"     "  +119.78515     +0.00000     +0.00000"
 "height"    "  +119.78515     +0.00000     +0.00000"
-"xrot"      "    +7.69494     +0.00000     +0.00000"
+"xrot"      "   +15.69494     +0.00000     +0.00000"
 "yrot"      "  -135.60289     +0.00000     +0.00000"
 "zrot"      "  +123.17698     +0.00000     +0.00000"
 "dist"      "  +300.00000"
@@ -3254,7 +3254,7 @@
 "image"     "png/stars3"
 "width"     "  +125.27238     +0.00000     +0.00000"
 "height"    "  +125.27238     +0.00000     +0.00000"
-"xrot"      "    +4.27045     +0.00000     +0.00000"
+"xrot"      "   +19.27045     +0.00000     +0.00000"
 "yrot"      "  -179.41771     +0.00000     +0.00000"
 "zrot"      "  -127.98914     +0.00000     +0.00000"
 "dist"      "  +300.00000"

diff --git a/share/part.c b/share/part.c
index e3ae7f8..c78fa3d 100644 (file)
--- a/share/part.c
+++ b/share/part.c
@@ -23,9 +23,10 @@
 #include "vec3.h"
 #include "image.h"
 
-#define PARTICLEVBO 1
-
 /*---------------------------------------------------------------------------*/
+/*
+#define PARTICLEVBO 1
+*/
 
 struct part_vary
 {

diff --git a/share/video.c b/share/video.c
index 4b83788..b0c2acb 100644 (file)
--- a/share/video.c
+++ b/share/video.c
@@ -108,7 +108,7 @@ int video_mode(int f, int w, int h)
         config_set_d(CONFIG_HEIGHT,     h);
 
         glViewport(0, 0, w, h);
-        glClearColor(0.0f, 0.0f, 0.1f, 0.0f);
+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
         glEnable(GL_NORMALIZE);
         glEnable(GL_CULL_FACE);
@@ -337,12 +337,10 @@ void video_pop_matrix(void)
 void video_clear(void)
 {
     if (config_get_d(CONFIG_REFLECTION))
-        glClear(GL_COLOR_BUFFER_BIT |
-                GL_DEPTH_BUFFER_BIT |
+        glClear(GL_DEPTH_BUFFER_BIT |
                 GL_STENCIL_BUFFER_BIT);
     else
-        glClear(GL_COLOR_BUFFER_BIT |
-                GL_DEPTH_BUFFER_BIT);
+        glClear(GL_DEPTH_BUFFER_BIT);
 }
 
 /*---------------------------------------------------------------------------*/