From aad3149acf32a98c85766e779e115dfb88afe4ff Mon Sep 17 00:00:00 2001
From: rlk <rlk@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Date: Tue, 29 Mar 2011 17:34:06 +0000
Subject: [PATCH] Converted mark GL into SOL. Moved fader draw to sol_fade and
 reimplemented in terms of billboard drawing.

git-svn-id: https://s.snth.net/svn/neverball/branches/gles@3538 78b8d119-cf0a-0410-b17c-f493084dd1d7
---
 ball/game_draw.c          |    2 +-
 data/geom/goal/goal       |    7 -
 data/geom/goal/goal.map   |    4 -
 data/geom/goal/goal.mtl   |   20 --
 data/geom/goal/goal.obj   |  521 ---------------------------------------------
 data/geom/goal/goal.png   |  Bin 2902 -> 0 bytes
 data/geom/goal/goal.sol   |  Bin 7992 -> 0 bytes
 data/geom/goal/goal.wings |  Bin 6398 -> 0 bytes
 data/geom/mark/mark.map   |    4 +
 data/geom/mark/mark.mtl   |   19 ++
 data/geom/mark/mark.obj   |   95 +++++++++
 data/geom/mark/mark.wings |  Bin 0 -> 2104 bytes
 putt/game.c               |    6 +-
 putt/st_conf.c            |    2 -
 share/geom.c              |  120 +----------
 share/solid_draw.c        |   46 +++-
 share/solid_draw.h        |    1 +
 17 files changed, 171 insertions(+), 676 deletions(-)
 delete mode 100644 data/geom/goal/goal
 delete mode 100644 data/geom/goal/goal.map
 delete mode 100644 data/geom/goal/goal.mtl
 delete mode 100644 data/geom/goal/goal.obj
 delete mode 100644 data/geom/goal/goal.png
 delete mode 100644 data/geom/goal/goal.sol
 delete mode 100644 data/geom/goal/goal.wings
 create mode 100644 data/geom/mark/mark.map
 create mode 100644 data/geom/mark/mark.mtl
 create mode 100644 data/geom/mark/mark.obj
 create mode 100644 data/geom/mark/mark.wings

diff --git a/ball/game_draw.c b/ball/game_draw.c
index ab140eb..863296d 100644
--- a/ball/game_draw.c
+++ b/ball/game_draw.c
@@ -580,7 +580,7 @@ void game_draw(const struct game_draw *gd, int pose, float t)
 
         /* Draw the fade overlay. */
 
-        fade_draw(gd->fade_k);
+        sol_fade(&gd->draw, gd->fade_k);
     }
 }
 
diff --git a/data/geom/goal/goal b/data/geom/goal/goal
deleted file mode 100644
index 6649767..0000000
--- a/data/geom/goal/goal
+++ /dev/null
@@ -1,7 +0,0 @@
-1.000000 1.000000 1.000000 1.000000
-1.000000 1.000000 1.000000 1.000000
-0.000000 0.000000 0.000000 0.000000
-0.000000 0.000000 0.000000 0.000000
-10.000000
-33
-45.000000
diff --git a/data/geom/goal/goal.map b/data/geom/goal/goal.map
deleted file mode 100644
index c94e8a2..0000000
--- a/data/geom/goal/goal.map
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-"classname" "worldspawn"
-"model" "geom/goal/goal.obj"
-}
diff --git a/data/geom/goal/goal.mtl b/data/geom/goal/goal.mtl
deleted file mode 100644
index 052b0b3..0000000
--- a/data/geom/goal/goal.mtl
+++ /dev/null
@@ -1,20 +0,0 @@
-# Exported from Wings 3D 1.4.1
-newmtl default
-Ns 100.0
-d 1.0
-illum 2
-Kd 1.0 1.0 1.0
-Ka 1.0 1.0 1.0
-Ks 1.0 1.0 1.0
-Ke 0.0 0.0 0.0
-
-newmtl geom/goal/goal
-Ns 100.0
-d 1.0
-illum 2
-Kd 1.0 1.0 1.0
-Ka 1.0 1.0 1.0
-Ks 1.0 1.0 1.0
-Ke 0.0 0.0 0.0
-map_Kd goal.png
-
diff --git a/data/geom/goal/goal.obj b/data/geom/goal/goal.obj
deleted file mode 100644
index 0973cd2..0000000
--- a/data/geom/goal/goal.obj
+++ /dev/null
@@ -1,521 +0,0 @@
-# Exported from Wings 3D 1.4.1
-mtllib goal.mtl
-o cylinder1
-#128 vertices, 128 faces
-v 1.00000000 3.00000000 4.7704896e-17
-v 0.99518473 3.00000000 9.8017140e-2
-v 0.98078528 3.00000000 0.19509032
-v 0.95694034 3.00000000 0.29028468
-v 0.92387953 3.00000000 0.38268343
-v 0.88192126 3.00000000 0.47139674
-v 0.83146961 3.00000000 0.55557023
-v 0.77301045 3.00000000 0.63439328
-v 0.70710678 3.00000000 0.70710678
-v 0.63439328 3.00000000 0.77301045
-v 0.55557023 3.00000000 0.83146961
-v 0.47139674 3.00000000 0.88192126
-v 0.38268343 3.00000000 0.92387953
-v 0.29028468 3.00000000 0.95694034
-v 0.19509032 3.00000000 0.98078528
-v 9.8017140e-2 3.00000000 0.99518473
-v 7.8579575e-17 3.00000000 1.00000000
-v -9.8017140e-2 3.00000000 0.99518473
-v -0.19509032 3.00000000 0.98078528
-v -0.29028468 3.00000000 0.95694034
-v -0.38268343 3.00000000 0.92387953
-v -0.47139674 3.00000000 0.88192126
-v -0.55557023 3.00000000 0.83146961
-v -0.63439328 3.00000000 0.77301045
-v -0.70710678 3.00000000 0.70710678
-v -0.77301045 3.00000000 0.63439328
-v -0.83146961 3.00000000 0.55557023
-v -0.88192126 3.00000000 0.47139674
-v -0.92387953 3.00000000 0.38268343
-v -0.95694034 3.00000000 0.29028468
-v -0.98078528 3.00000000 0.19509032
-v -0.99518473 3.00000000 9.8017140e-2
-v -1.00000000 3.00000000 1.7016958e-16
-v -0.99518473 3.00000000 -9.8017140e-2
-v -0.98078528 3.00000000 -0.19509032
-v -0.95694034 3.00000000 -0.29028468
-v -0.92387953 3.00000000 -0.38268343
-v -0.88192126 3.00000000 -0.47139674
-v -0.83146961 3.00000000 -0.55557023
-v -0.77301045 3.00000000 -0.63439328
-v -0.70710678 3.00000000 -0.70710678
-v -0.63439328 3.00000000 -0.77301045
-v -0.55557023 3.00000000 -0.83146961
-v -0.47139674 3.00000000 -0.88192126
-v -0.38268343 3.00000000 -0.92387953
-v -0.29028468 3.00000000 -0.95694034
-v -0.19509032 3.00000000 -0.98078528
-v -9.8017140e-2 3.00000000 -0.99518473
-v -1.6634979e-16 3.00000000 -1.00000000
-v 9.8017140e-2 3.00000000 -0.99518473
-v 0.19509032 3.00000000 -0.98078528
-v 0.29028468 3.00000000 -0.95694034
-v 0.38268343 3.00000000 -0.92387953
-v 0.47139674 3.00000000 -0.88192126
-v 0.55557023 3.00000000 -0.83146961
-v 0.63439328 3.00000000 -0.77301045
-v 0.70710678 3.00000000 -0.70710678
-v 0.77301045 3.00000000 -0.63439328
-v 0.83146961 3.00000000 -0.55557023
-v 0.88192126 3.00000000 -0.47139674
-v 0.92387953 3.00000000 -0.38268343
-v 0.95694034 3.00000000 -0.29028468
-v 0.98078528 3.00000000 -0.19509032
-v 0.99518473 3.00000000 -9.8017140e-2
-v 1.00000000 0.0000000e+0 4.7704896e-17
-v 0.99518473 0.0000000e+0 9.8017140e-2
-v 0.98078528 0.0000000e+0 0.19509032
-v 0.95694034 0.0000000e+0 0.29028468
-v 0.92387953 0.0000000e+0 0.38268343
-v 0.88192126 0.0000000e+0 0.47139674
-v 0.83146961 0.0000000e+0 0.55557023
-v 0.77301045 0.0000000e+0 0.63439328
-v 0.70710678 0.0000000e+0 0.70710678
-v 0.63439328 0.0000000e+0 0.77301045
-v 0.55557023 0.0000000e+0 0.83146961
-v 0.47139674 0.0000000e+0 0.88192126
-v 0.38268343 0.0000000e+0 0.92387953
-v 0.29028468 0.0000000e+0 0.95694034
-v 0.19509032 0.0000000e+0 0.98078528
-v 9.8017140e-2 0.0000000e+0 0.99518473
-v 7.8579575e-17 0.0000000e+0 1.00000000
-v -9.8017140e-2 0.0000000e+0 0.99518473
-v -0.19509032 0.0000000e+0 0.98078528
-v -0.29028468 0.0000000e+0 0.95694034
-v -0.38268343 0.0000000e+0 0.92387953
-v -0.47139674 0.0000000e+0 0.88192126
-v -0.55557023 0.0000000e+0 0.83146961
-v -0.63439328 0.0000000e+0 0.77301045
-v -0.70710678 0.0000000e+0 0.70710678
-v -0.77301045 0.0000000e+0 0.63439328
-v -0.83146961 0.0000000e+0 0.55557023
-v -0.88192126 0.0000000e+0 0.47139674
-v -0.92387953 0.0000000e+0 0.38268343
-v -0.95694034 0.0000000e+0 0.29028468
-v -0.98078528 0.0000000e+0 0.19509032
-v -0.99518473 0.0000000e+0 9.8017140e-2
-v -1.00000000 0.0000000e+0 1.7016958e-16
-v -0.99518473 0.0000000e+0 -9.8017140e-2
-v -0.98078528 0.0000000e+0 -0.19509032
-v -0.95694034 0.0000000e+0 -0.29028468
-v -0.92387953 0.0000000e+0 -0.38268343
-v -0.88192126 0.0000000e+0 -0.47139674
-v -0.83146961 0.0000000e+0 -0.55557023
-v -0.77301045 0.0000000e+0 -0.63439328
-v -0.70710678 0.0000000e+0 -0.70710678
-v -0.63439328 0.0000000e+0 -0.77301045
-v -0.55557023 0.0000000e+0 -0.83146961
-v -0.47139674 0.0000000e+0 -0.88192126
-v -0.38268343 0.0000000e+0 -0.92387953
-v -0.29028468 0.0000000e+0 -0.95694034
-v -0.19509032 0.0000000e+0 -0.98078528
-v -9.8017140e-2 0.0000000e+0 -0.99518473
-v -1.6634979e-16 0.0000000e+0 -1.00000000
-v 9.8017140e-2 0.0000000e+0 -0.99518473
-v 0.19509032 0.0000000e+0 -0.98078528
-v 0.29028468 0.0000000e+0 -0.95694034
-v 0.38268343 0.0000000e+0 -0.92387953
-v 0.47139674 0.0000000e+0 -0.88192126
-v 0.55557023 0.0000000e+0 -0.83146961
-v 0.63439328 0.0000000e+0 -0.77301045
-v 0.70710678 0.0000000e+0 -0.70710678
-v 0.77301045 0.0000000e+0 -0.63439328
-v 0.83146961 0.0000000e+0 -0.55557023
-v 0.88192126 0.0000000e+0 -0.47139674
-v 0.92387953 0.0000000e+0 -0.38268343
-v 0.95694034 0.0000000e+0 -0.29028468
-v 0.98078528 0.0000000e+0 -0.19509032
-v 0.99518473 0.0000000e+0 -9.8017140e-2
-vt 0.0000000e+0 1.1272913e-14
-vt 3.4972025e-15 1.00000000
-vt 1.5625000e-2 1.00000000
-vt 1.5625000e-2 2.1616101e-14
-vt 3.1250000e-2 6.1013189e-15
-vt 3.1250000e-2 1.00000000
-vt 4.6875000e-2 1.00000000
-vt 4.6875000e-2 2.3533659e-14
-vt 6.2500000e-2 9.0648167e-15
-vt 6.2500000e-2 1.00000000
-vt 7.8125000e-2 1.00000000
-vt 7.8125000e-2 1.9872867e-14
-vt 9.3750000e-2 9.0648167e-15
-vt 9.3750000e-2 1.00000000
-vt 0.10937500 1.00000000
-vt 0.10937500 2.1499886e-14
-vt 0.12500000 5.3459175e-15
-vt 0.12500000 1.00000000
-vt 0.14062500 2.1209347e-14
-vt 0.14062500 1.00000000
-vt 0.15625000 7.4377983e-15
-vt 0.15625000 1.00000000
-vt 0.17187500 2.0453945e-14
-vt 0.17187500 1.00000000
-vt 0.18750000 9.1810323e-15
-vt 0.18750000 1.00000000
-vt 0.20312500 1.6618831e-14
-vt 0.20312500 1.00000000
-vt 0.21875000 8.3094153e-15
-vt 0.21875000 1.00000000
-vt 0.23437500 1.5398567e-14
-vt 0.23437500 1.00000000
-vt 0.25000000 1.2144530e-14
-vt 0.25000000 1.00000000
-vt 0.26562500 1.00000000
-vt 0.26562500 1.2609392e-14
-vt 0.28125000 9.6458947e-15
-vt 0.28125000 1.00000000
-vt 0.29687500 1.5979645e-14
-vt 0.29687500 1.00000000
-vt 0.31250000 8.0188763e-15
-vt 0.31250000 1.00000000
-vt 0.32812500 1.00000000
-vt 0.32812500 1.4817489e-14
-vt 0.34375000 1.1272913e-14
-vt 0.34375000 1.00000000
-vt 0.35937500 1.2725608e-14
-vt 0.35937500 1.00000000
-vt 0.37500000 7.8445529e-15
-vt 0.37500000 1.00000000
-vt 0.39062500 1.3481009e-14
-vt 0.39062500 1.00000000
-vt 0.40625000 7.5540139e-15
-vt 0.40625000 1.00000000
-vt 0.42187500 1.00000000
-vt 0.42187500 1.1563452e-14
-vt 0.43750000 1.1853991e-14
-vt 0.43750000 1.00000000
-vt 0.45312500 1.00000000
-vt 0.45312500 7.8445529e-15
-vt 0.46875000 9.9364337e-15
-vt 0.46875000 1.00000000
-vt 0.48437500 1.00000000
-vt 0.48437500 1.0401296e-14
-vt 0.50000000 8.5999543e-15
-vt 0.50000000 1.00000000
-vt 0.51562500 6.7986125e-15
-vt 0.51562500 1.00000000
-vt 0.53125000 1.0982374e-14
-vt 0.53125000 1.00000000
-vt 0.54687500 4.5905161e-15
-vt 0.54687500 1.00000000
-vt 0.56250000 7.7283373e-15
-vt 0.56250000 1.00000000
-vt 0.57812500 6.1013189e-15
-vt 0.57812500 1.00000000
-vt 0.59375000 6.5080735e-15
-vt 0.59375000 1.00000000
-vt 0.60937500 5.3459175e-15
-vt 0.60937500 1.00000000
-vt 0.62500000 1.00000000
-vt 0.62500000 8.4256309e-15
-vt 0.64062500 3.5445758e-15
-vt 0.64062500 1.00000000
-vt 0.65625000 1.0691835e-14
-vt 0.65625000 1.00000000
-vt 0.67187500 1.00000000
-vt 0.67187500 2.0918808e-15
-vt 0.68750000 1.0052649e-14
-vt 0.68750000 1.00000000
-vt 0.70312500 1.00000000
-vt 0.70312500 3.1378212e-15
-vt 0.71875000 1.0517512e-14
-vt 0.71875000 1.00000000
-vt 0.73437500 1.00000000
-vt 0.73437500 5.3459175e-15
-vt 0.75000000 1.2725608e-14
-vt 0.75000000 1.00000000
-vt 0.76562500 1.00000000
-vt 0.76562500 3.1378212e-15
-vt 0.78125000 1.0226973e-14
-vt 0.78125000 1.00000000
-vt 0.79687500 1.00000000
-vt 0.79687500 3.7188992e-15
-vt 0.81250000 9.7621103e-15
-vt 0.81250000 1.00000000
-vt 0.82812500 1.00000000
-vt 0.82812500 4.8810551e-15
-vt 0.84375000 1.1563452e-14
-vt 0.84375000 1.00000000
-vt 0.85937500 1.00000000
-vt 0.85937500 3.1378212e-15
-vt 0.87500000 8.8904933e-15
-vt 0.87500000 1.00000000
-vt 0.89062500 1.00000000
-vt 0.89062500 1.8013418e-15
-vt 0.90625000 1.2144530e-14
-vt 0.90625000 1.00000000
-vt 0.92187500 1.00000000
-vt 0.92187500 0.0000000e+0
-vt 0.93750000 1.0691835e-14
-vt 0.93750000 1.00000000
-vt 0.95312500 1.00000000
-vt 0.95312500 1.5108028e-15
-vt 0.96875000 1.1853991e-14
-vt 0.96875000 1.00000000
-vt 0.98437500 1.00000000
-vt 0.98437500 3.1378212e-15
-vt 1.00000000 1.1272913e-14
-vt 1.00000000 1.00000000
-vn 1.00000000 0.0000000e+0 -2.0841787e-17
-vn 0.99518473 0.0000000e+0 9.8017140e-2
-vn 0.98078528 0.0000000e+0 0.19509032
-vn 0.95694034 0.0000000e+0 0.29028468
-vn 0.92387953 0.0000000e+0 0.38268343
-vn 0.88192126 0.0000000e+0 0.47139674
-vn 0.83146961 0.0000000e+0 0.55557023
-vn 0.77301045 0.0000000e+0 0.63439328
-vn 0.70710678 0.0000000e+0 0.70710678
-vn 0.63439328 0.0000000e+0 0.77301045
-vn 0.55557023 0.0000000e+0 0.83146961
-vn 0.47139674 0.0000000e+0 0.88192126
-vn 0.38268343 0.0000000e+0 0.92387953
-vn 0.29028468 0.0000000e+0 0.95694034
-vn 0.19509032 0.0000000e+0 0.98078528
-vn 9.8017140e-2 0.0000000e+0 0.99518473
-vn 6.9472622e-18 0.0000000e+0 1.00000000
-vn -9.8017140e-2 0.0000000e+0 0.99518473
-vn -0.19509032 0.0000000e+0 0.98078528
-vn -0.29028468 0.0000000e+0 0.95694034
-vn -0.38268343 0.0000000e+0 0.92387953
-vn -0.47139674 0.0000000e+0 0.88192126
-vn -0.55557023 0.0000000e+0 0.83146961
-vn -0.63439328 0.0000000e+0 0.77301045
-vn -0.70710678 0.0000000e+0 0.70710678
-vn -0.77301045 0.0000000e+0 0.63439328
-vn -0.83146961 0.0000000e+0 0.55557023
-vn -0.88192126 0.0000000e+0 0.47139674
-vn -0.92387953 0.0000000e+0 0.38268343
-vn -0.95694034 0.0000000e+0 0.29028468
-vn -0.98078528 0.0000000e+0 0.19509032
-vn -0.99518473 0.0000000e+0 9.8017140e-2
-vn -1.00000000 0.0000000e+0 5.6620187e-16
-vn -0.99518473 0.0000000e+0 -9.8017140e-2
-vn -0.98078528 0.0000000e+0 -0.19509032
-vn -0.95694034 0.0000000e+0 -0.29028468
-vn -0.92387953 0.0000000e+0 -0.38268343
-vn -0.88192126 0.0000000e+0 -0.47139674
-vn -0.83146961 0.0000000e+0 -0.55557023
-vn -0.77301045 0.0000000e+0 -0.63439328
-vn -0.70710678 0.0000000e+0 -0.70710678
-vn -0.63439328 0.0000000e+0 -0.77301045
-vn -0.55557023 0.0000000e+0 -0.83146961
-vn -0.47139674 0.0000000e+0 -0.88192126
-vn -0.38268343 0.0000000e+0 -0.92387953
-vn -0.29028468 0.0000000e+0 -0.95694034
-vn -0.19509032 0.0000000e+0 -0.98078528
-vn -9.8017140e-2 0.0000000e+0 -0.99518473
-vn 0.0000000e+0 0.0000000e+0 -1.00000000
-vn 9.8017140e-2 0.0000000e+0 -0.99518473
-vn 0.19509032 0.0000000e+0 -0.98078528
-vn 0.29028468 0.0000000e+0 -0.95694034
-vn 0.38268343 0.0000000e+0 -0.92387953
-vn 0.47139674 0.0000000e+0 -0.88192126
-vn 0.55557023 0.0000000e+0 -0.83146961
-vn 0.63439328 0.0000000e+0 -0.77301045
-vn 0.70710678 0.0000000e+0 -0.70710678
-vn 0.77301045 0.0000000e+0 -0.63439328
-vn 0.83146961 0.0000000e+0 -0.55557023
-vn 0.88192126 0.0000000e+0 -0.47139674
-vn 0.92387953 0.0000000e+0 -0.38268343
-vn 0.95694034 0.0000000e+0 -0.29028468
-vn 0.98078528 0.0000000e+0 -0.19509032
-vn 0.99518473 0.0000000e+0 -9.8017140e-2
-vn 1.00000000 0.0000000e+0 -1.9104971e-17
-vn 0.99518473 0.0000000e+0 9.8017140e-2
-vn 0.98078528 0.0000000e+0 0.19509032
-vn 0.95694034 0.0000000e+0 0.29028468
-vn 0.92387953 0.0000000e+0 0.38268343
-vn 0.88192126 0.0000000e+0 0.47139674
-vn 0.83146961 0.0000000e+0 0.55557023
-vn 0.77301045 0.0000000e+0 0.63439328
-vn 0.70710678 0.0000000e+0 0.70710678
-vn 0.63439328 0.0000000e+0 0.77301045
-vn 0.55557023 0.0000000e+0 0.83146961
-vn 0.47139674 0.0000000e+0 0.88192126
-vn 0.38268343 0.0000000e+0 0.92387953
-vn 0.29028468 0.0000000e+0 0.95694034
-vn 0.19509032 0.0000000e+0 0.98078528
-vn 9.8017140e-2 0.0000000e+0 0.99518473
-vn 6.9472622e-18 0.0000000e+0 1.00000000
-vn -9.8017140e-2 0.0000000e+0 0.99518473
-vn -0.19509032 0.0000000e+0 0.98078528
-vn -0.29028468 0.0000000e+0 0.95694034
-vn -0.38268343 0.0000000e+0 0.92387953
-vn -0.47139674 0.0000000e+0 0.88192126
-vn -0.55557023 0.0000000e+0 0.83146961
-vn -0.63439328 0.0000000e+0 0.77301045
-vn -0.70710678 0.0000000e+0 0.70710678
-vn -0.77301045 0.0000000e+0 0.63439328
-vn -0.83146961 0.0000000e+0 0.55557023
-vn -0.88192126 0.0000000e+0 0.47139674
-vn -0.92387953 0.0000000e+0 0.38268343
-vn -0.95694034 0.0000000e+0 0.29028468
-vn -0.98078528 0.0000000e+0 0.19509032
-vn -0.99518473 0.0000000e+0 9.8017140e-2
-vn -1.00000000 0.0000000e+0 5.6620187e-16
-vn -0.99518473 0.0000000e+0 -9.8017140e-2
-vn -0.98078528 0.0000000e+0 -0.19509032
-vn -0.95694034 0.0000000e+0 -0.29028468
-vn -0.92387953 0.0000000e+0 -0.38268343
-vn -0.88192126 0.0000000e+0 -0.47139674
-vn -0.83146961 0.0000000e+0 -0.55557023
-vn -0.77301045 0.0000000e+0 -0.63439328
-vn -0.70710678 0.0000000e+0 -0.70710678
-vn -0.63439328 0.0000000e+0 -0.77301045
-vn -0.55557023 0.0000000e+0 -0.83146961
-vn -0.47139674 0.0000000e+0 -0.88192126
-vn -0.38268343 0.0000000e+0 -0.92387953
-vn -0.29028468 0.0000000e+0 -0.95694034
-vn -0.19509032 0.0000000e+0 -0.98078528
-vn -9.8017140e-2 0.0000000e+0 -0.99518473
-vn 0.0000000e+0 0.0000000e+0 -1.00000000
-vn 9.8017140e-2 0.0000000e+0 -0.99518473
-vn 0.19509032 0.0000000e+0 -0.98078528
-vn 0.29028468 0.0000000e+0 -0.95694034
-vn 0.38268343 0.0000000e+0 -0.92387953
-vn 0.47139674 0.0000000e+0 -0.88192126
-vn 0.55557023 0.0000000e+0 -0.83146961
-vn 0.63439328 0.0000000e+0 -0.77301045
-vn 0.70710678 0.0000000e+0 -0.70710678
-vn 0.77301045 0.0000000e+0 -0.63439328
-vn 0.83146961 0.0000000e+0 -0.55557023
-vn 0.88192126 0.0000000e+0 -0.47139674
-vn 0.92387953 0.0000000e+0 -0.38268343
-vn 0.95694034 0.0000000e+0 -0.29028468
-vn 0.98078528 0.0000000e+0 -0.19509032
-vn 0.99518473 0.0000000e+0 -9.8017140e-2
-g cylinder1_geom/goal/goal
-usemtl geom/goal/goal
-s 1
-f 1/34/1 65/33/65 64/35/64
-f 2/32/2 65/33/65 1/34/1
-f 2/32/2 67/29/67 66/31/66
-f 3/30/3 67/29/67 2/32/2
-f 4/28/4 67/29/67 3/30/3
-f 4/28/4 69/25/69 68/27/68
-f 5/26/5 69/25/69 4/28/4
-f 6/24/6 69/25/69 5/26/5
-f 6/24/6 71/21/71 70/23/70
-f 7/22/7 71/21/71 6/24/6
-f 8/20/8 71/21/71 7/22/7
-f 8/20/8 73/17/73 72/19/72
-f 9/18/9 73/17/73 8/20/8
-f 10/15/10 73/17/73 9/18/9
-f 10/15/10 75/13/75 74/16/74
-f 11/14/11 75/13/75 10/15/10
-f 12/11/12 75/13/75 11/14/11
-f 12/11/12 77/9/77 76/12/76
-f 13/10/13 77/9/77 12/11/12
-f 14/7/14 77/9/77 13/10/13
-f 14/7/14 79/5/79 78/8/78
-f 15/6/15 79/5/79 14/7/14
-f 16/3/16 79/5/79 15/6/15
-f 16/3/16 81/1/81 80/4/80
-f 17/2/17 81/1/81 16/3/16
-f 18/127/18 81/129/81 17/130/17
-f 18/127/18 83/125/83 82/128/82
-f 19/126/19 83/125/83 18/127/18
-f 20/123/20 83/125/83 19/126/19
-f 20/123/20 85/121/85 84/124/84
-f 21/122/21 85/121/85 20/123/20
-f 22/119/22 85/121/85 21/122/21
-f 22/119/22 87/117/87 86/120/86
-f 23/118/23 87/117/87 22/119/22
-f 24/115/24 87/117/87 23/118/23
-f 24/115/24 89/113/89 88/116/88
-f 25/114/25 89/113/89 24/115/24
-f 26/111/26 89/113/89 25/114/25
-f 26/111/26 91/109/91 90/112/90
-f 27/110/27 91/109/91 26/111/26
-f 28/107/28 91/109/91 27/110/27
-f 28/107/28 93/105/93 92/108/92
-f 29/106/29 93/105/93 28/107/28
-f 30/103/30 93/105/93 29/106/29
-f 30/103/30 95/101/95 94/104/94
-f 31/102/31 95/101/95 30/103/30
-f 32/99/32 95/101/95 31/102/31
-f 32/99/32 97/97/97 96/100/96
-f 33/98/33 97/97/97 32/99/32
-f 34/95/34 97/97/97 33/98/33
-f 34/95/34 99/93/99 98/96/98
-f 35/94/35 99/93/99 34/95/34
-f 36/91/36 99/93/99 35/94/35
-f 36/91/36 101/89/101 100/92/100
-f 37/90/37 101/89/101 36/91/36
-f 38/87/38 101/89/101 37/90/37
-f 38/87/38 103/85/103 102/88/102
-f 39/86/39 103/85/103 38/87/38
-f 40/84/40 103/85/103 39/86/39
-f 40/84/40 105/82/105 104/83/104
-f 41/81/41 105/82/105 40/84/40
-f 42/80/42 105/82/105 41/81/41
-f 42/80/42 107/77/107 106/79/106
-f 43/78/43 107/77/107 42/80/42
-f 44/76/44 107/77/107 43/78/43
-f 44/76/44 109/73/109 108/75/108
-f 45/74/45 109/73/109 44/76/44
-f 46/72/46 109/73/109 45/74/45
-f 46/72/46 111/69/111 110/71/110
-f 47/70/47 111/69/111 46/72/46
-f 48/68/48 111/69/111 47/70/47
-f 48/68/48 113/65/113 112/67/112
-f 49/66/49 113/65/113 48/68/48
-f 50/63/50 113/65/113 49/66/49
-f 50/63/50 115/61/115 114/64/114
-f 51/62/51 115/61/115 50/63/50
-f 52/59/52 115/61/115 51/62/51
-f 52/59/52 117/57/117 116/60/116
-f 53/58/53 117/57/117 52/59/52
-f 54/55/54 117/57/117 53/58/53
-f 54/55/54 119/53/119 118/56/118
-f 55/54/55 119/53/119 54/55/54
-f 56/52/56 119/53/119 55/54/55
-f 56/52/56 121/49/121 120/51/120
-f 57/50/57 121/49/121 56/52/56
-f 58/48/58 121/49/121 57/50/57
-f 58/48/58 123/45/123 122/47/122
-f 59/46/59 123/45/123 58/48/58
-f 60/43/60 123/45/123 59/46/59
-f 60/43/60 125/41/125 124/44/124
-f 61/42/61 125/41/125 60/43/60
-f 62/40/62 125/41/125 61/42/61
-f 62/40/62 127/37/127 126/39/126
-f 63/38/63 127/37/127 62/40/62
-f 64/35/64 65/33/65 128/36/128
-f 64/35/64 127/37/127 63/38/63
-f 66/31/66 65/33/65 2/32/2
-f 68/27/68 67/29/67 4/28/4
-f 70/23/70 69/25/69 6/24/6
-f 72/19/72 71/21/71 8/20/8
-f 74/16/74 73/17/73 10/15/10
-f 76/12/76 75/13/75 12/11/12
-f 78/8/78 77/9/77 14/7/14
-f 80/4/80 79/5/79 16/3/16
-f 82/128/82 81/129/81 18/127/18
-f 84/124/84 83/125/83 20/123/20
-f 86/120/86 85/121/85 22/119/22
-f 88/116/88 87/117/87 24/115/24
-f 90/112/90 89/113/89 26/111/26
-f 92/108/92 91/109/91 28/107/28
-f 94/104/94 93/105/93 30/103/30
-f 96/100/96 95/101/95 32/99/32
-f 98/96/98 97/97/97 34/95/34
-f 100/92/100 99/93/99 36/91/36
-f 102/88/102 101/89/101 38/87/38
-f 104/83/104 103/85/103 40/84/40
-f 106/79/106 105/82/105 42/80/42
-f 108/75/108 107/77/107 44/76/44
-f 110/71/110 109/73/109 46/72/46
-f 112/67/112 111/69/111 48/68/48
-f 114/64/114 113/65/113 50/63/50
-f 116/60/116 115/61/115 52/59/52
-f 118/56/118 117/57/117 54/55/54
-f 120/51/120 119/53/119 56/52/56
-f 122/47/122 121/49/121 58/48/58
-f 124/44/124 123/45/123 60/43/60
-f 126/39/126 125/41/125 62/40/62
-f 128/36/128 127/37/127 64/35/64
diff --git a/data/geom/goal/goal.png b/data/geom/goal/goal.png
deleted file mode 100644
index 04bbb2b2adffa21ae3d4c9a8aa16b061e68eb96f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2902
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
Ai2wiq

diff --git a/data/geom/goal/goal.sol b/data/geom/goal/goal.sol
deleted file mode 100644
index efc2eb8c238a45800762e472cfa6f3c5bd0bad72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7992
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
IvvLyt1JFL+G5`Po

diff --git a/data/geom/goal/goal.wings b/data/geom/goal/goal.wings
deleted file mode 100644
index ad98b1fdfd4ea6641975662ad5748f840549d15b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6398
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
JMRn4${{xT;ryBqO

diff --git a/data/geom/mark/mark.map b/data/geom/mark/mark.map
new file mode 100644
index 0000000..531781b
--- /dev/null
+++ b/data/geom/mark/mark.map
@@ -0,0 +1,4 @@
+{
+"classname" "worldspawn"
+"model" "geom/mark/mark.obj"
+}
diff --git a/data/geom/mark/mark.mtl b/data/geom/mark/mark.mtl
new file mode 100644
index 0000000..48f5512
--- /dev/null
+++ b/data/geom/mark/mark.mtl
@@ -0,0 +1,19 @@
+# Exported from Wings 3D 1.4.1
+newmtl default
+Ns 100.0
+d 1.0
+illum 2
+Kd 1.0 1.0 1.0
+Ka 1.0 1.0 1.0
+Ks 1.0 1.0 1.0
+Ke 0.0 0.0 0.0
+
+newmtl mtrl/white
+Ns 100.0
+d 1.0
+illum 2
+Kd 1.0 1.0 1.0
+Ka 1.0 1.0 1.0
+Ks 1.0 1.0 1.0
+Ke 0.0 0.0 0.0
+
diff --git a/data/geom/mark/mark.obj b/data/geom/mark/mark.obj
new file mode 100644
index 0000000..eeb0877
--- /dev/null
+++ b/data/geom/mark/mark.obj
@@ -0,0 +1,95 @@
+# Exported from Wings 3D 1.4.1
+mtllib mark.mtl
+o cylinder2
+#16 vertices, 14 faces
+v 1.00000000 0.0000000e+0 3.1225023e-17
+v 0.92387953 0.0000000e+0 0.38268343
+v 0.70710678 0.0000000e+0 0.70710678
+v 0.38268343 0.0000000e+0 0.92387953
+v 1.0286570e-16 0.0000000e+0 1.00000000
+v -0.38268343 0.0000000e+0 0.92387953
+v -0.70710678 0.0000000e+0 0.70710678
+v -0.92387953 0.0000000e+0 0.38268343
+v -1.00000000 0.0000000e+0 1.5368970e-16
+v -0.92387953 0.0000000e+0 -0.38268343
+v -0.70710678 0.0000000e+0 -0.70710678
+v -0.38268343 0.0000000e+0 -0.92387953
+v -1.4206366e-16 0.0000000e+0 -1.00000000
+v 0.38268343 0.0000000e+0 -0.92387953
+v 0.70710678 0.0000000e+0 -0.70710678
+v 0.92387953 0.0000000e+0 -0.38268343
+vt 0.0000000e+0 0.50000000
+vt 3.8060234e-2 0.69134172
+vt 3.8060234e-2 0.30865828
+vt 0.14644661 0.85355339
+vt 0.14644661 0.14644661
+vt 0.30865828 0.96193977
+vt 0.30865828 3.8060234e-2
+vt 0.50000000 1.00000000
+vt 0.50000000 0.0000000e+0
+vt 0.69134172 3.8060234e-2
+vt 0.69134172 0.96193977
+vt 0.85355339 0.85355339
+vt 0.85355339 0.14644661
+vt 0.96193977 0.69134172
+vt 0.96193977 0.30865828
+vt 1.00000000 0.50000000
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+vn 0.0000000e+0 1.00000000 0.0000000e+0
+g cylinder2_mtrl/white
+usemtl mtrl/white
+s 2
+f 1/16/3 9/1/23 2/15/5
+f 2/15/4 8/3/20 3/13/9
+f 3/13/7 7/5/17 4/10/12
+f 4/10/10 6/7/14 5/9/13
+f 6/7/15 4/10/11 7/5/16
+f 7/5/18 3/13/8 8/3/19
+f 8/3/21 2/15/6 9/1/24
+f 9/1/22 1/16/2 10/2/26
+f 10/2/27 16/14/42 11/4/29
+f 11/4/30 15/12/39 12/6/32
+f 12/6/33 14/11/36 13/8/34
+f 14/11/35 12/6/31 15/12/38
+f 15/12/37 11/4/28 16/14/41
+f 16/14/40 10/2/25 1/16/1
diff --git a/data/geom/mark/mark.wings b/data/geom/mark/mark.wings
new file mode 100644
index 0000000000000000000000000000000000000000..33be257a7f205997cd471c12ddef16543d235724
GIT binary patch
literal 2104
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

literal 0
HcmV?d00001

diff --git a/putt/game.c b/putt/game.c
index 9ea8b88..9318ceb 100644
--- a/putt/game.c
+++ b/putt/game.c
@@ -193,6 +193,8 @@ static void game_draw_balls(const struct s_vary *fp,
 
     int ui;
 
+    glEnable(GL_COLOR_MATERIAL);
+
     for (ui = curr_party(); ui > 0; ui--)
     {
         if (ui == ball)
@@ -212,10 +214,8 @@ static void game_draw_balls(const struct s_vary *fp,
                          fp->uv[ui].r,
                          fp->uv[ui].r);
 
-                glEnable(GL_COLOR_MATERIAL);
                 glColor4fv(color[ui]);
                 ball_draw(ball_M, pend_M, bill_M, t);
-                glDisable(GL_COLOR_MATERIAL);
             }
             glPopMatrix();
         }
@@ -239,7 +239,9 @@ static void game_draw_balls(const struct s_vary *fp,
             glPopMatrix();
         }
     }
+
     glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+    glDisable(GL_COLOR_MATERIAL);
 }
 
 static void game_draw_goals(const struct s_base *fp)
diff --git a/putt/st_conf.c b/putt/st_conf.c
index b992f9a..8f10959 100644
--- a/putt/st_conf.c
+++ b/putt/st_conf.c
@@ -308,7 +308,6 @@ static int null_enter(struct state *st, struct state *prev)
 {
     gui_free();
     geom_free();
-    mark_free();
     ball_free();
     shad_free();
 
@@ -319,7 +318,6 @@ static void null_leave(struct state *st, struct state *next, int id)
 {
     shad_init();
     ball_init();
-    mark_init();
     geom_init();
     gui_init();
 }
diff --git a/share/geom.c b/share/geom.c
index 9c49787..b41623f 100644
--- a/share/geom.c
+++ b/share/geom.c
@@ -27,21 +27,22 @@
 
 #include "solid_draw.h"
 
-#define PI 3.1415926535897932
-
 /*---------------------------------------------------------------------------*/
 
 static struct s_full beam;
 static struct s_full flag;
+static struct s_full mark;
 
 void geom_init(void)
 {
     sol_load_full(&beam, "geom/beam/beam.sol", 0);
     sol_load_full(&flag, "geom/flag/flag.sol", 0);
+    sol_load_full(&mark, "geom/mark/mark.sol", 0);
 }
 
 void geom_free(void)
 {
+    sol_free_full(&mark);
     sol_free_full(&flag);
     sol_free_full(&beam);
 }
@@ -105,120 +106,11 @@ void flag_draw(void)
     sol_draw(&flag.draw, 1, 1);
 }
 
-/*---------------------------------------------------------------------------*/
-
-static GLuint mark_list;
-
-void mark_init(void)
-{
-    int i, slices = 32;
-
-    mark_list = glGenLists(1);
-
-    glNewList(mark_list, GL_COMPILE);
-    {
-        glBegin(GL_TRIANGLE_FAN);
-        {
-            glNormal3f(0.f, 1.f, 0.f);
-
-            for (i = 0; i < slices; i++)
-            {
-                float x = fcosf(-2.f * PI * i / slices);
-                float y = fsinf(-2.f * PI * i / slices);
-
-                glVertex3f(x, 0, y);
-            }
-        }
-        glEnd();
-    }
-    glEndList();
-}
-
 void mark_draw(void)
 {
-    glEnable(GL_COLOR_MATERIAL);
-    glDisable(GL_TEXTURE_2D);
-    glDepthMask(GL_FALSE);
-    {
-        glCallList(mark_list);
-    }
-    glDepthMask(GL_TRUE);
-    glEnable(GL_TEXTURE_2D);
-    glDisable(GL_COLOR_MATERIAL);
-}
-
-void mark_free(void)
-{
-    if (glIsList(mark_list))
-        glDeleteLists(mark_list, 1);
-
-    mark_list = 0;
-}
-
-/*---------------------------------------------------------------------------*/
-/*
-static GLuint flag_list;
-
-void flag_init(void)
-{
-    int i, n = 8;
-
-    flag_list = glGenLists(1);
-
-    glNewList(flag_list, GL_COMPILE);
-    {
-        glEnable(GL_COLOR_MATERIAL);
-        glDisable(GL_LIGHTING);
-        glDisable(GL_TEXTURE_2D);
-        {
-            glBegin(GL_TRIANGLES);
-            {
-                glColor3f(1.0f, 0.0f, 0.0f);
-
-                glVertex3f(              0.0f, GOAL_HEIGHT,        0.0f);
-                glVertex3f(GOAL_HEIGHT * 0.2f, GOAL_HEIGHT * 0.9f, 0.0f);
-                glVertex3f(              0.0f, GOAL_HEIGHT * 0.8f, 0.0f);
-
-                glVertex3f(              0.0f, GOAL_HEIGHT,        0.0f);
-                glVertex3f(              0.0f, GOAL_HEIGHT * 0.8f, 0.0f);
-                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);
-        glDisable(GL_COLOR_MATERIAL);
-    }
-    glEndList();
+    sol_draw(&mark.draw, 1, 1);
 }
 
-void flag_free(void)
-{
-    if (glIsList(flag_list))
-        glDeleteLists(flag_list, 1);
-
-    flag_list = 0;
-}
-
-void flag_draw(void)
-{
-    glCallList(flag_list);
-}
-*/
 /*---------------------------------------------------------------------------*/
 
 static GLuint clip_text;
@@ -370,7 +262,7 @@ void shad_draw_clr(void)
 }
 
 /*---------------------------------------------------------------------------*/
-
+/*
 void fade_draw(float k)
 {
     if (k > 0.0f)
@@ -406,5 +298,5 @@ void fade_draw(float k)
         video_pop_matrix();
     }
 }
-
+*/
 /*---------------------------------------------------------------------------*/
diff --git a/share/solid_draw.c b/share/solid_draw.c
index ef14c34..871c47f 100644
--- a/share/solid_draw.c
+++ b/share/solid_draw.c
@@ -79,10 +79,10 @@ static void sol_transform(const struct s_vary *vary,
 static void sol_load_bill(struct s_draw *draw)
 {
     static const GLfloat data[] = {
-        0.0f,  0.0f, -0.5f, -0.5f,
-        1.0f,  0.0f,  0.5f, -0.5f,
-        0.0f,  1.0f, -0.5f,  0.5f,
-        1.0f,  1.0f,  0.5f,  0.5f,
+        0.0f,  0.0f, -1.0f, -1.0f,
+        1.0f,  0.0f,  1.0f, -1.0f,
+        0.0f,  1.0f, -1.0f,  1.0f,
+        1.0f,  1.0f,  1.0f,  1.0f,
     };
 
     /* Initialize a vertex buffer object for billboard drawing. */
@@ -124,7 +124,7 @@ static void sol_draw_bill(GLfloat w, GLfloat h, GLboolean edge)
 {
     glPushMatrix();
     {
-        glScalef(w, h, 1.0f);
+        glScalef(0.5f * w, 0.5f * h, 1.0f);
 
         if (edge)
             glTranslatef(0.0f, 0.5f, 0.0f);
@@ -848,6 +848,42 @@ void sol_shad(const struct s_draw *draw, int ui)
     /* TODO: Remove. */
 }
 
+void sol_fade(const struct s_draw *draw, float k)
+{
+    if (k > 0.0f)
+    {
+        glMatrixMode(GL_PROJECTION);
+        glPushMatrix();
+        glLoadIdentity();
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix();
+        glLoadIdentity();
+        {
+            glEnable(GL_COLOR_MATERIAL);
+            glDisable(GL_LIGHTING);
+            glDisable(GL_DEPTH_TEST);
+            glDisable(GL_TEXTURE_2D);
+
+            glColor4f(0.0f, 0.0f, 0.0f, k);
+
+            sol_bill_enable(draw);
+            glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+            sol_bill_disable();
+
+            glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+            glEnable(GL_TEXTURE_2D);
+            glEnable(GL_DEPTH_TEST);
+            glEnable(GL_LIGHTING);
+            glDisable(GL_COLOR_MATERIAL);
+        }
+        glMatrixMode(GL_PROJECTION);
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPopMatrix();
+    }
+}
+
 /*---------------------------------------------------------------------------*/
 
 int sol_load_full(struct s_full *full, const char *filename, int s)
diff --git a/share/solid_draw.h b/share/solid_draw.h
index cde8295..9e69fc1 100644
--- a/share/solid_draw.h
+++ b/share/solid_draw.h
@@ -92,6 +92,7 @@ void sol_refl(const struct s_draw *);
 void sol_draw(const struct s_draw *, int, int);
 void sol_bill(const struct s_draw *, const float *, float);
 void sol_shad(const struct s_draw *, int);
+void sol_fade(const struct s_draw *, float);
 
 /*---------------------------------------------------------------------------*/
 
-- 
1.7.9.5