Enhanced specular illumination.

Modified all material files to be more consistent and to use new specular handling as needed.

git-svn-id: https://s.snth.net/svn/neverball/trunk@1358 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/game.c b/ball/game.c
index 8e1d452..57c9a42 100644 (file)
--- a/ball/game.c
+++ b/ball/game.c
@@ -397,6 +397,7 @@ static void game_draw_balls(const struct s_file *fp)
 
     m_basis(M, fp->uv[0].e[0], fp->uv[0].e[1], fp->uv[0].e[2]);
 
+    glPushAttrib(GL_LIGHTING_BIT);
     glPushMatrix();
     {
         glTranslatef(fp->uv[0].p[0],
@@ -411,6 +412,7 @@ static void game_draw_balls(const struct s_file *fp)
         ball_draw();
     }
     glPopMatrix();
+    glPopAttrib();
 }
 
 static void game_draw_items(const struct s_file *fp)
@@ -418,62 +420,66 @@ static void game_draw_items(const struct s_file *fp)
     float r = 360.f * SDL_GetTicks() / 1000.f;
     int hi;
 
-    item_push(ITEM_COIN);
+    glPushAttrib(GL_LIGHTING_BIT);
     {
-        for (hi = 0; hi < fp->hc; hi++)
+        item_push(ITEM_COIN);
+        {
+            for (hi = 0; hi < fp->hc; hi++)
 
-            if (fp->hv[hi].t == ITEM_COIN && fp->hv[hi].n > 0)
-            {
-                glPushMatrix();
+                if (fp->hv[hi].t == ITEM_COIN && fp->hv[hi].n > 0)
                 {
-                    glTranslatef(fp->hv[hi].p[0],
-                                 fp->hv[hi].p[1],
-                                 fp->hv[hi].p[2]);
-                    glRotatef(r, 0.0f, 1.0f, 0.0f);
-                    item_draw(&fp->hv[hi], r);
+                    glPushMatrix();
+                    {
+                        glTranslatef(fp->hv[hi].p[0],
+                                     fp->hv[hi].p[1],
+                                     fp->hv[hi].p[2]);
+                        glRotatef(r, 0.0f, 1.0f, 0.0f);
+                        item_draw(&fp->hv[hi], r);
+                    }
+                    glPopMatrix();
                 }
-                glPopMatrix();
-            }
-    }
-    item_pull();
+        }
+        item_pull();
 
-    item_push(ITEM_SHRINK);
-    {
-        for (hi = 0; hi < fp->hc; hi++)
+        item_push(ITEM_SHRINK);
+        {
+            for (hi = 0; hi < fp->hc; hi++)
 
-            if (fp->hv[hi].t == ITEM_SHRINK)
-            {
-                glPushMatrix();
+                if (fp->hv[hi].t == ITEM_SHRINK)
                 {
-                    glTranslatef(fp->hv[hi].p[0],
-                                 fp->hv[hi].p[1],
-                                 fp->hv[hi].p[2]);
-                    glRotatef(r, 0.0f, 1.0f, 0.0f);
-                    item_draw(&fp->hv[hi], r);
+                    glPushMatrix();
+                    {
+                        glTranslatef(fp->hv[hi].p[0],
+                                     fp->hv[hi].p[1],
+                                     fp->hv[hi].p[2]);
+                        glRotatef(r, 0.0f, 1.0f, 0.0f);
+                        item_draw(&fp->hv[hi], r);
+                    }
+                    glPopMatrix();
                 }
-                glPopMatrix();
-            }
-    }
-    item_pull();
+        }
+        item_pull();
 
-    item_push(ITEM_GROW);
-    {
-        for (hi = 0; hi < fp->hc; hi++)
+        item_push(ITEM_GROW);
+        {
+            for (hi = 0; hi < fp->hc; hi++)
 
-            if (fp->hv[hi].t == ITEM_GROW)
-            {
-                glPushMatrix();
+                if (fp->hv[hi].t == ITEM_GROW)
                 {
-                    glTranslatef(fp->hv[hi].p[0],
-                                 fp->hv[hi].p[1],
-                                 fp->hv[hi].p[2]);
-                    glRotatef(r, 0.0f, 1.0f, 0.0f);
-                    item_draw(&fp->hv[hi], r);
+                    glPushMatrix();
+                    {
+                        glTranslatef(fp->hv[hi].p[0],
+                                     fp->hv[hi].p[1],
+                                     fp->hv[hi].p[2]);
+                        glRotatef(r, 0.0f, 1.0f, 0.0f);
+                        item_draw(&fp->hv[hi], r);
+                    }
+                    glPopMatrix();
                 }
-                glPopMatrix();
-            }
+        }
+        item_pull();
     }
-    item_pull();
+    glPopAttrib();
 }
 
 static void game_draw_goals(const struct s_file *fp, float rx, float ry)
@@ -653,11 +659,6 @@ static void game_draw_back(int pose, int d, const float p[3])
 static void game_draw_fore(int pose, float rx,
                                      float ry, int d, const float p[3])
 {
-    static const float a[4] = { 0.2f, 0.2f, 0.2f, 1.0f };
-    static const float s[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
-    static const float e[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-    static const float h[1] = { 0.0f };
-    
     const float *ball_p = file.uv->p;
     const float  ball_r = file.uv->r;
 
@@ -711,11 +712,6 @@ static void game_draw_fore(int pose, float rx,
 
         /* Draw the particles and light columns. */
 
-        glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT,   a);
-        glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR,  s);
-        glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION,  e);
-        glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, h);
-
         glEnable(GL_COLOR_MATERIAL);
         glDisable(GL_LIGHTING);
         glDepthMask(GL_FALSE);
@@ -732,6 +728,8 @@ static void game_draw_fore(int pose, float rx,
                 game_draw_swchs(&file);
             }
             glEnable(GL_TEXTURE_2D);
+
+            glColor3f(1.0f, 1.0f, 1.0f);
         }
         glDepthMask(GL_TRUE);
         glEnable(GL_LIGHTING);

diff --git a/data/mtrl/arrow b/data/mtrl/arrow
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/arrow
+++ b/data/mtrl/arrow
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/arrow-dark b/data/mtrl/arrow-dark
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/arrow-dark
+++ b/data/mtrl/arrow-dark
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/arrow-green b/data/mtrl/arrow-green
index d452d62..7401926 100644 (file)
--- a/data/mtrl/arrow-green
+++ b/data/mtrl/arrow-green
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/arrow-light b/data/mtrl/arrow-light
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/arrow-light
+++ b/data/mtrl/arrow-light
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/black b/data/mtrl/black
index 45a912d..7401926 100644 (file)
--- a/data/mtrl/black
+++ b/data/mtrl/black
@@ -1,6 +1,7 @@
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/blue b/data/mtrl/blue
index a286bc8..8c48f2b 100644 (file)
--- a/data/mtrl/blue
+++ b/data/mtrl/blue
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+1.000000 1.000000 1.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 1
+45.000000

diff --git a/data/mtrl/blue-gas b/data/mtrl/blue-gas
index 726b332..6eba1fc 100644 (file)
--- a/data/mtrl/blue-gas
+++ b/data/mtrl/blue-gas
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 0.7\r
-0.6 0.6 0.6 0.7\r
-0.4 0.4 0.4 0.7\r
-0.0 0.0 0.0 1\r
-60.0\r
-2\r
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+2
+45.000000

diff --git a/data/mtrl/blue-sea b/data/mtrl/blue-sea
index 4a4e953..e93a223 100644 (file)
--- a/data/mtrl/blue-sea
+++ b/data/mtrl/blue-sea
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-128.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 6
+45.000000

diff --git a/data/mtrl/box b/data/mtrl/box
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/box
+++ b/data/mtrl/box
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/box-small b/data/mtrl/box-small
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/box-small
+++ b/data/mtrl/box-small
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/brass b/data/mtrl/brass
index 25a5e4c..48c6e13 100644 (file)
--- a/data/mtrl/brass
+++ b/data/mtrl/brass
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 9
+45.000000

diff --git a/data/mtrl/brick b/data/mtrl/brick
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/brick
+++ b/data/mtrl/brick
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/caution b/data/mtrl/caution
index a286bc8..7401926 100644 (file)
--- a/data/mtrl/caution
+++ b/data/mtrl/caution
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/chrome b/data/mtrl/chrome
index 25a5e4c..b388fad 100644 (file)
--- a/data/mtrl/chrome
+++ b/data/mtrl/chrome
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+1.000000 1.000000 1.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+40.000000
 9
+45.000000

diff --git a/data/mtrl/chrome-faceted b/data/mtrl/chrome-faceted
index 41de371..07ed8b2 100644 (file)
--- a/data/mtrl/chrome-faceted
+++ b/data/mtrl/chrome-faceted
@@ -1,7 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+1.000000 1.000000 1.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+40.000000
 9
-0
+0.000000

diff --git a/data/mtrl/coin-blue b/data/mtrl/coin-blue
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-blue
+++ b/data/mtrl/coin-blue
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-green-check b/data/mtrl/coin-green-check
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-green-check
+++ b/data/mtrl/coin-green-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-green-check2 b/data/mtrl/coin-green-check2
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-green-check2
+++ b/data/mtrl/coin-green-check2
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-green-dark b/data/mtrl/coin-green-dark
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-green-dark
+++ b/data/mtrl/coin-green-dark
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-green-light b/data/mtrl/coin-green-light
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-green-light
+++ b/data/mtrl/coin-green-light
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-green-small b/data/mtrl/coin-green-small
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-green-small
+++ b/data/mtrl/coin-green-small
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-orange b/data/mtrl/coin-orange
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-orange
+++ b/data/mtrl/coin-orange
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-orange-big b/data/mtrl/coin-orange-big
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-orange-big
+++ b/data/mtrl/coin-orange-big
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-pad-blue b/data/mtrl/coin-pad-blue
index 69ccbdc..cf9568b 100644 (file)
--- a/data/mtrl/coin-pad-blue
+++ b/data/mtrl/coin-pad-blue
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/coin-pad-brown b/data/mtrl/coin-pad-brown
index 69ccbdc..cf9568b 100644 (file)
--- a/data/mtrl/coin-pad-brown
+++ b/data/mtrl/coin-pad-brown
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/coin-pad-green-dark b/data/mtrl/coin-pad-green-dark
index ccd704e..cf9568b 100644 (file)
--- a/data/mtrl/coin-pad-green-dark
+++ b/data/mtrl/coin-pad-green-dark
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/coin-pad-grey b/data/mtrl/coin-pad-grey
index 69ccbdc..cf9568b 100644 (file)
--- a/data/mtrl/coin-pad-grey
+++ b/data/mtrl/coin-pad-grey
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/coin-purple b/data/mtrl/coin-purple
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-purple
+++ b/data/mtrl/coin-purple
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-purple-check b/data/mtrl/coin-purple-check
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-purple-check
+++ b/data/mtrl/coin-purple-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-rainbow b/data/mtrl/coin-rainbow
index 014df98..f66ac4b 100644 (file)
--- a/data/mtrl/coin-rainbow
+++ b/data/mtrl/coin-rainbow
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 65
+45.000000

diff --git a/data/mtrl/coin-red b/data/mtrl/coin-red
index d452d62..7401926 100644 (file)
--- a/data/mtrl/coin-red
+++ b/data/mtrl/coin-red
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/coin-shiny b/data/mtrl/coin-shiny
index 0955011..e19a0f1 100644 (file)
--- a/data/mtrl/coin-shiny
+++ b/data/mtrl/coin-shiny
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.5
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 0.500000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 4
+45.000000

diff --git a/data/mtrl/edge b/data/mtrl/edge
index 9ba8a62..7401926 100644 (file)
--- a/data/mtrl/edge
+++ b/data/mtrl/edge
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.8 0.8 0.8 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-blue b/data/mtrl/edge-blue
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-blue
+++ b/data/mtrl/edge-blue
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-brown b/data/mtrl/edge-brown
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-brown
+++ b/data/mtrl/edge-brown
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-green b/data/mtrl/edge-green
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-green
+++ b/data/mtrl/edge-green
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-green-check b/data/mtrl/edge-green-check
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-green-check
+++ b/data/mtrl/edge-green-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-green-check2 b/data/mtrl/edge-green-check2
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-green-check2
+++ b/data/mtrl/edge-green-check2
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-green-dark b/data/mtrl/edge-green-dark
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-green-dark
+++ b/data/mtrl/edge-green-dark
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-green-light b/data/mtrl/edge-green-light
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-green-light
+++ b/data/mtrl/edge-green-light
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-green-offset b/data/mtrl/edge-green-offset
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-green-offset
+++ b/data/mtrl/edge-green-offset
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-orange b/data/mtrl/edge-orange
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-orange
+++ b/data/mtrl/edge-orange
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-orange-big b/data/mtrl/edge-orange-big
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-orange-big
+++ b/data/mtrl/edge-orange-big
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-purple b/data/mtrl/edge-purple
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-purple
+++ b/data/mtrl/edge-purple
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-purple-check b/data/mtrl/edge-purple-check
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-purple-check
+++ b/data/mtrl/edge-purple-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge-red b/data/mtrl/edge-red
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge-red
+++ b/data/mtrl/edge-red
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-blue b/data/mtrl/edge2-blue
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-blue
+++ b/data/mtrl/edge2-blue
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-brown b/data/mtrl/edge2-brown
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-brown
+++ b/data/mtrl/edge2-brown
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-green b/data/mtrl/edge2-green
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-green
+++ b/data/mtrl/edge2-green
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-green-check b/data/mtrl/edge2-green-check
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-green-check
+++ b/data/mtrl/edge2-green-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-green-dark b/data/mtrl/edge2-green-dark
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-green-dark
+++ b/data/mtrl/edge2-green-dark
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-green-light b/data/mtrl/edge2-green-light
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-green-light
+++ b/data/mtrl/edge2-green-light
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-green-offset b/data/mtrl/edge2-green-offset
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-green-offset
+++ b/data/mtrl/edge2-green-offset
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-green-small b/data/mtrl/edge2-green-small
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-green-small
+++ b/data/mtrl/edge2-green-small
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-orange b/data/mtrl/edge2-orange
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-orange
+++ b/data/mtrl/edge2-orange
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-orange-big b/data/mtrl/edge2-orange-big
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-orange-big
+++ b/data/mtrl/edge2-orange-big
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-purple b/data/mtrl/edge2-purple
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-purple
+++ b/data/mtrl/edge2-purple
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-purple-check b/data/mtrl/edge2-purple-check
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-purple-check
+++ b/data/mtrl/edge2-purple-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/edge2-red b/data/mtrl/edge2-red
index d452d62..7401926 100644 (file)
--- a/data/mtrl/edge2-red
+++ b/data/mtrl/edge2-red
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/glass b/data/mtrl/glass
index 434583f..a62ad89 100644 (file)
--- a/data/mtrl/glass
+++ b/data/mtrl/glass
@@ -1,6 +1,7 @@
-0.5 0.5 0.5 0.2
-0.6 0.6 0.6 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-40.0
+1.000000 1.000000 1.000000 0.200000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 10
+45.000000

diff --git a/data/mtrl/glass-dark b/data/mtrl/glass-dark
index 4e34eef..d18b72a 100644 (file)
--- a/data/mtrl/glass-dark
+++ b/data/mtrl/glass-dark
@@ -1,6 +1,7 @@
-0.2 0.2 0.2 0.5
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-40.0
+0.200000 0.200000 0.200000 0.500000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 10
+45.000000

diff --git a/data/mtrl/goal b/data/mtrl/goal
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/goal
+++ b/data/mtrl/goal
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/goal-special b/data/mtrl/goal-special
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/goal-special
+++ b/data/mtrl/goal-special
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/hole b/data/mtrl/hole
index 964c277..cf9568b 100644 (file)
--- a/data/mtrl/hole
+++ b/data/mtrl/hole
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/invisible b/data/mtrl/invisible
index 017c4ed..8b3b762 100644 (file)
--- a/data/mtrl/invisible
+++ b/data/mtrl/invisible
@@ -1,6 +1,7 @@
-0.0 0.0 0.0 0.0
-0.0 0.0 0.0 0.0
-0.0 0.0 0.0 0.0
-0.0 0.0 0.0 0.0
-0.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 0
+45.000000

diff --git a/data/mtrl/marble-brown-polished b/data/mtrl/marble-brown-polished
index 555bbc7..d4cbebf 100644 (file)
--- a/data/mtrl/marble-brown-polished
+++ b/data/mtrl/marble-brown-polished
@@ -1,6 +1,7 @@
-0.2 0.2 0.2 0.8
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-20.0
+0.200000 0.200000 0.200000 0.800000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 4
+45.000000

diff --git a/data/mtrl/marble-purple b/data/mtrl/marble-purple
index b9feed6..7401926 100644 (file)
--- a/data/mtrl/marble-purple
+++ b/data/mtrl/marble-purple
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.2 0.2 0.2 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/marble-purple-polished b/data/mtrl/marble-purple-polished
index b8961fa..9acc552 100644 (file)
--- a/data/mtrl/marble-purple-polished
+++ b/data/mtrl/marble-purple-polished
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.85
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-128
+1.000000 1.000000 1.000000 0.800000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 4
+45.000000

diff --git a/data/mtrl/mirror b/data/mtrl/mirror
index 51d9d1e..cd0d21e 100644 (file)
--- a/data/mtrl/mirror
+++ b/data/mtrl/mirror
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.2
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 0.200000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 4
+45.000000

diff --git a/data/mtrl/mirror-check b/data/mtrl/mirror-check
index 2bc215e..a483382 100644 (file)
--- a/data/mtrl/mirror-check
+++ b/data/mtrl/mirror-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.4
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 0.400000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 4
+45.000000

diff --git a/data/mtrl/mirror-dark b/data/mtrl/mirror-dark
index ea51501..c729a70 100644 (file)
--- a/data/mtrl/mirror-dark
+++ b/data/mtrl/mirror-dark
@@ -1,6 +1,7 @@
-0.0 0.0 0.0 0.5
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+0.000000 0.000000 0.000000 0.500000
+0.200000 0.200000 0.200000 1.000000
+0.500000 0.500000 0.500000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 4
+45.000000

diff --git a/data/mtrl/plank b/data/mtrl/plank
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/plank
+++ b/data/mtrl/plank
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/plank-diagonal b/data/mtrl/plank-diagonal
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/plank-diagonal
+++ b/data/mtrl/plank-diagonal
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/plank-small b/data/mtrl/plank-small
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/plank-small
+++ b/data/mtrl/plank-small
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/plank-small-dark b/data/mtrl/plank-small-dark
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/plank-small-dark
+++ b/data/mtrl/plank-small-dark
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/poof-blue b/data/mtrl/poof-blue
index 21e1521..094e85d 100644 (file)
--- a/data/mtrl/poof-blue
+++ b/data/mtrl/poof-blue
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 98
+45.000000

diff --git a/data/mtrl/purple-pattern b/data/mtrl/purple-pattern
index 06fd897..7401926 100644 (file)
--- a/data/mtrl/purple-pattern
+++ b/data/mtrl/purple-pattern
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.5 0.5 0.5 1.0
-0.0 0.0 0.0 1.0
-30.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/rail b/data/mtrl/rail
index a286bc8..8c48f2b 100644 (file)
--- a/data/mtrl/rail
+++ b/data/mtrl/rail
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+1.000000 1.000000 1.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 1
+45.000000

diff --git a/data/mtrl/rainbow b/data/mtrl/rainbow
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/rainbow
+++ b/data/mtrl/rainbow
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/red b/data/mtrl/red
index a286bc8..8c48f2b 100644 (file)
--- a/data/mtrl/red
+++ b/data/mtrl/red
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+1.000000 1.000000 1.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+20.000000
 1
+45.000000

diff --git a/data/mtrl/red-gas b/data/mtrl/red-gas
index 726b332..c1c1ab7 100644 (file)
--- a/data/mtrl/red-gas
+++ b/data/mtrl/red-gas
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 0.7\r
-0.6 0.6 0.6 0.7\r
-0.4 0.4 0.4 0.7\r
-0.0 0.0 0.0 1\r
-60.0\r
-2\r
+1.000000 1.000000 1.000000 0.700000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
+2
+45.000000

diff --git a/data/mtrl/red-glass b/data/mtrl/red-glass
index 9f3f72e..9ba51dc 100644 (file)
--- a/data/mtrl/red-glass
+++ b/data/mtrl/red-glass
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 0.7\r
-0.6 0.6 0.6 0.7\r
-0.4 0.4 0.4 0.7\r
-0.0 0.0 0.0 1.0\r
-60.0\r
-1\r
+1.000000 1.000000 1.000000 0.700000
+0.200000 0.200000 0.200000 1.000000
+0.300000 0.300000 0.300000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
+1
+45.000000

diff --git a/data/mtrl/red-pattern b/data/mtrl/red-pattern
index 06fd897..7401926 100644 (file)
--- a/data/mtrl/red-pattern
+++ b/data/mtrl/red-pattern
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.5 0.5 0.5 1.0
-0.0 0.0 0.0 1.0
-30.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/rotate180 b/data/mtrl/rotate180
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/rotate180
+++ b/data/mtrl/rotate180
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/rotate90 b/data/mtrl/rotate90
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/rotate90
+++ b/data/mtrl/rotate90
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/shadow-rock b/data/mtrl/shadow-rock
index 69ccbdc..cf9568b 100644 (file)
--- a/data/mtrl/shadow-rock
+++ b/data/mtrl/shadow-rock
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/starting-line b/data/mtrl/starting-line
index d7de3f3..7401926 100644 (file)
--- a/data/mtrl/starting-line
+++ b/data/mtrl/starting-line
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/switch b/data/mtrl/switch
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/switch
+++ b/data/mtrl/switch
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/teleporter b/data/mtrl/teleporter
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/teleporter
+++ b/data/mtrl/teleporter
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/thwomp b/data/mtrl/thwomp
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/thwomp
+++ b/data/mtrl/thwomp
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/timer b/data/mtrl/timer
index 5dfe6a9..cf9568b 100644 (file)
--- a/data/mtrl/timer
+++ b/data/mtrl/timer
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.99
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 66
+45.000000

diff --git a/data/mtrl/turf-blue b/data/mtrl/turf-blue
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-blue
+++ b/data/mtrl/turf-blue
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-brown b/data/mtrl/turf-brown
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-brown
+++ b/data/mtrl/turf-brown
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-disco b/data/mtrl/turf-disco
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-disco
+++ b/data/mtrl/turf-disco
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-green b/data/mtrl/turf-green
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-green
+++ b/data/mtrl/turf-green
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-green-check b/data/mtrl/turf-green-check
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-green-check
+++ b/data/mtrl/turf-green-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-green-check2 b/data/mtrl/turf-green-check2
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-green-check2
+++ b/data/mtrl/turf-green-check2
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-green-dark b/data/mtrl/turf-green-dark
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-green-dark
+++ b/data/mtrl/turf-green-dark
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-green-light b/data/mtrl/turf-green-light
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-green-light
+++ b/data/mtrl/turf-green-light
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-green-offset b/data/mtrl/turf-green-offset
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-green-offset
+++ b/data/mtrl/turf-green-offset
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-green-small b/data/mtrl/turf-green-small
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-green-small
+++ b/data/mtrl/turf-green-small
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-grey b/data/mtrl/turf-grey
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-grey
+++ b/data/mtrl/turf-grey
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-grey-dark b/data/mtrl/turf-grey-dark
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-grey-dark
+++ b/data/mtrl/turf-grey-dark
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-orange b/data/mtrl/turf-orange
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-orange
+++ b/data/mtrl/turf-orange
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-orange-big b/data/mtrl/turf-orange-big
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-orange-big
+++ b/data/mtrl/turf-orange-big
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-purple b/data/mtrl/turf-purple
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-purple
+++ b/data/mtrl/turf-purple
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-purple-check b/data/mtrl/turf-purple-check
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-purple-check
+++ b/data/mtrl/turf-purple-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-red b/data/mtrl/turf-red
index d452d62..7401926 100644 (file)
--- a/data/mtrl/turf-red
+++ b/data/mtrl/turf-red
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-10.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+0.000000
 1
+45.000000

diff --git a/data/mtrl/turf-shiny b/data/mtrl/turf-shiny
index 0955011..e19a0f1 100644 (file)
--- a/data/mtrl/turf-shiny
+++ b/data/mtrl/turf-shiny
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.5
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 0.500000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 4
+45.000000

diff --git a/data/mtrl/turf-shiny-light b/data/mtrl/turf-shiny-light
index 0955011..e19a0f1 100644 (file)
--- a/data/mtrl/turf-shiny-light
+++ b/data/mtrl/turf-shiny-light
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 0.5
-1.0 1.0 1.0 1.0
-0.2 0.2 0.2 1.0
-0.0 0.0 0.0 1.0
-0.0
+1.000000 1.000000 1.000000 0.500000
+0.200000 0.200000 0.200000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 4
+45.000000

diff --git a/data/mtrl/white b/data/mtrl/white
index a9b20ea..d4e38c7 100644 (file)
--- a/data/mtrl/white
+++ b/data/mtrl/white
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-40.0
+0.700000 0.700000 0.700000 1.000000
+0.200000 0.200000 0.200000 1.000000
+1.000000 1.000000 1.000000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 1
+45.000000

diff --git a/data/mtrl/wood b/data/mtrl/wood
index d7de3f3..8d03692 100644 (file)
--- a/data/mtrl/wood
+++ b/data/mtrl/wood
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.300000 0.300000 0.300000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 1
+45.000000

diff --git a/data/mtrl/wood-check b/data/mtrl/wood-check
index d7de3f3..8d03692 100644 (file)
--- a/data/mtrl/wood-check
+++ b/data/mtrl/wood-check
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.300000 0.300000 0.300000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 1
+45.000000

diff --git a/data/mtrl/wood-light b/data/mtrl/wood-light
index d7de3f3..8d03692 100644 (file)
--- a/data/mtrl/wood-light
+++ b/data/mtrl/wood-light
@@ -1,6 +1,7 @@
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-1.0 1.0 1.0 1.0
-0.0 0.0 0.0 1.0
-60.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.300000 0.300000 0.300000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 1
+45.000000

diff --git a/data/mtrl/yellow b/data/mtrl/yellow
index a286bc8..8d03692 100644 (file)
--- a/data/mtrl/yellow
+++ b/data/mtrl/yellow
@@ -1,6 +1,7 @@
-0.8 0.8 0.8 1.0
-0.6 0.6 0.6 1.0
-0.4 0.4 0.4 1.0
-0.0 0.0 0.0 1.0
-20.0
+1.000000 1.000000 1.000000 1.000000
+0.200000 0.200000 0.200000 1.000000
+0.300000 0.300000 0.300000 1.000000
+0.000000 0.000000 0.000000 1.000000
+10.000000
 1
+45.000000

diff --git a/putt/game.c b/putt/game.c
index 4dad79a..89477bd 100644 (file)
--- a/putt/game.c
+++ b/putt/game.c
@@ -208,6 +208,7 @@ static void game_draw_balls(const struct s_file *fp)
             glPopMatrix();
         }
     }
+    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 }
 
 static void game_draw_goals(const struct s_file *fp, float rx, float ry)

diff --git a/share/config.c b/share/config.c
index ba176f7..3a5a930 100644 (file)
--- a/share/config.c
+++ b/share/config.c
@@ -429,6 +429,10 @@ int config_mode(int f, int w, int h)
         glEnable(GL_LIGHTING);
         glEnable(GL_BLEND);
 
+        glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL,
+                      GL_SEPARATE_SPECULAR_COLOR);
+        glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
+
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         glDepthFunc(GL_LEQUAL);
 

diff --git a/share/geom.c b/share/geom.c
index f543391..e79555d 100644 (file)
--- a/share/geom.c
+++ b/share/geom.c
@@ -99,7 +99,7 @@ void ball_draw(void)
     static const float a[4] = { 0.2f, 0.2f, 0.2f, 1.0f };
     static const float s[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
     static const float e[4] = { 0.2f, 0.2f, 0.2f, 1.0f };
-    static const float h[1] = { 64.0f };
+    static const float h[1] = { 20.0f };
 
     glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT,   a);
     glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR,  s);
@@ -176,7 +176,6 @@ void mark_draw(void)
     glDisable(GL_TEXTURE_2D);
     glDepthMask(GL_FALSE);
     {
-
         glCallList(mark_list);
     }
     glDepthMask(GL_TRUE);
@@ -344,7 +343,7 @@ void item_push(int type)
     static const float  a[4] = { 0.2f, 0.2f, 0.2f, 1.0f };
     static const float  s[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
     static const float  e[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-    static const float  h[1] = { 32.0f };
+    static const float  h[1] = { 10.0f };
 
     glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT,   a);
     glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR,  s);
@@ -549,20 +548,6 @@ void flag_init(int b)
         glDisable(GL_LIGHTING);
         glDisable(GL_TEXTURE_2D);
         {
-            glBegin(GL_QUAD_STRIP);
-            {
-                for (i = 0; i <= n; i++)
-                {
-                    float x = fcosf(2.f * PI * i / n) * 0.01f;
-                    float y = fsinf(2.f * PI * i / n) * 0.01f;
-
-                    glColor3f(1.0f, 1.0f, 1.0f);
-                    glVertex3f(x, 0.0f,        y);
-                    glVertex3f(x, GOAL_HEIGHT, y);
-                }
-            }
-            glEnd();
-
             glBegin(GL_TRIANGLES);
             {
                 glColor3f(1.0f, 0.0f, 0.0f);
@@ -576,6 +561,20 @@ void flag_init(int b)
                 glVertex3f(GOAL_HEIGHT * 0.2f, GOAL_HEIGHT * 0.9f, 0.0f);
             }
             glEnd();
+
+            glBegin(GL_QUAD_STRIP);
+            {
+                for (i = 0; i <= n; i++)
+                {
+                    float x = fcosf(2.f * PI * i / n) * 0.01f;
+                    float y = fsinf(2.f * PI * i / n) * 0.01f;
+
+                    glColor3f(1.0f, 1.0f, 1.0f);
+                    glVertex3f(x, 0.0f,        y);
+                    glVertex3f(x, GOAL_HEIGHT, y);
+                }
+            }
+            glEnd();
         }
         glEnable(GL_TEXTURE_2D);
         glEnable(GL_LIGHTING);
@@ -682,6 +681,8 @@ void fade_draw(float k)
             }
             glEnd();
 
+            glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+
             glEnable(GL_TEXTURE_2D);
             glEnable(GL_DEPTH_TEST);
             glEnable(GL_LIGHTING);

diff --git a/share/gui.c b/share/gui.c
index 68a9b25..7f7b091 100644 (file)
--- a/share/gui.c
+++ b/share/gui.c
@@ -1269,6 +1269,8 @@ void gui_paint(int id)
 
                 glEnable(GL_TEXTURE_2D);
                 gui_paint_text(id);
+
+                glColor4fv(gui_wht);
             }
             glEnable(GL_DEPTH_TEST);
             glEnable(GL_LIGHTING);

diff --git a/share/mapc.c b/share/mapc.c
index f06ad74..f44b406 100644 (file)
--- a/share/mapc.c
+++ b/share/mapc.c
@@ -402,10 +402,11 @@ static int read_mtrl(struct s_file *fp, const char *name)
 
     strncpy(mp->f, name, PATHMAX - 1);
 
-    mp->a[0] = mp->a[1] = mp->a[2] = mp->a[3] = 1.0f;
-    mp->d[0] = mp->d[1] = mp->d[2] = mp->d[3] = 1.0f;
-    mp->s[0] = mp->s[1] = mp->s[2] = mp->s[3] = 1.0f;
-    mp->e[0] = mp->e[1] = mp->e[2] = mp->e[3] = 1.0f;
+    mp->a[0] = mp->a[1] = mp->a[2] = 0.2f;
+    mp->d[0] = mp->d[1] = mp->d[2] = 0.8f;
+    mp->s[0] = mp->s[1] = mp->s[2] = 0.0f;
+    mp->e[0] = mp->e[1] = mp->e[2] = 0.0f;
+    mp->a[3] = mp->d[3] = mp->s[3] = mp->e[3] = 1.0f;
     mp->h[0] = 0.0f;
     mp->fl   = 0;
     mp->angle = 45.0f;
@@ -582,7 +583,7 @@ static void read_obj(struct s_file *fp, const char *name)
 
             else if (strncmp(line, "f", 1) == 0)
             {
-                if (fp->mv[mi].d[3] > 0)
+                if (fp->mv[mi].d[3] > 0.0f)
                     read_f(fp, line + 1, v0, t0, s0, mi);
             }
 
@@ -1534,7 +1535,7 @@ static void clip_lump(struct s_file *fp, struct s_lump *lp)
     lp->gc = 0;
 
     for (i = 0; i < lp->sc; i++)
-        if (fp->mv[plane_m[fp->iv[lp->s0 + i]]].d[3] > 0)
+        if (fp->mv[plane_m[fp->iv[lp->s0 + i]]].d[3] > 0.0f)
             clip_geom(fp, lp,
                       fp->iv[lp->s0 + i]);
 

diff --git a/share/solid.c b/share/solid.c
index 82779ab..dd54091 100644 (file)
--- a/share/solid.c
+++ b/share/solid.c
@@ -99,8 +99,8 @@ void sol_body_p(float p[3],
 
 static void sol_load_mtrl(FILE *fin, struct s_mtrl *mp)
 {
-    get_array(fin,  mp->a, 4);
     get_array(fin,  mp->d, 4);
+    get_array(fin,  mp->a, 4);
     get_array(fin,  mp->s, 4);
     get_array(fin,  mp->e, 4);
     get_array(fin,  mp->h, 1);
@@ -438,8 +438,8 @@ int sol_load_only_head(struct s_file *fp, const char *filename)
 
 static void sol_stor_mtrl(FILE *fout, struct s_mtrl *mp)
 {
-    put_array(fout,  mp->a, 4);
     put_array(fout,  mp->d, 4);
+    put_array(fout,  mp->a, 4);
     put_array(fout,  mp->s, 4);
     put_array(fout,  mp->e, 4);
     put_array(fout,  mp->h, 1);

diff --git a/share/solid.h b/share/solid.h
index ca40579..d31a270 100644 (file)
--- a/share/solid.h
+++ b/share/solid.h
@@ -108,8 +108,8 @@
 
 struct s_mtrl
 {
-    float a[4];                                /* ambient color              */
     float d[4];                                /* diffuse color              */
+    float a[4];                                /* ambient color              */
     float s[4];                                /* specular color             */
     float e[4];                                /* emission color             */
     float h[1];                                /* specular exponent          */

diff --git a/share/solid_gl.c b/share/solid_gl.c
index d47af25..68b5c04 100644 (file)
--- a/share/solid_gl.c
+++ b/share/solid_gl.c
@@ -80,8 +80,8 @@ static int sol_enum_body(const struct s_file *fp,
 
 static struct s_mtrl default_mtrl =
 {
-    { 0.2f, 0.2f, 0.2f, 1.0f },
     { 0.8f, 0.8f, 0.8f, 1.0f },
+    { 0.2f, 0.2f, 0.2f, 1.0f },
     { 0.0f, 0.0f, 0.0f, 1.0f },
     { 0.0f, 0.0f, 0.0f, 1.0f },
     { 0.0f, }, 0.0f, M_OPAQUE, 0, ""