From: rlk <rlk@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Date: Tue, 29 Mar 2011 17:34:06 +0000 (+0000)
Subject: Converted mark GL into SOL.
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=aad3149acf32a98c85766e779e115dfb88afe4ff;p=neverball

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
---

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 04bbb2b..0000000
Binary files a/data/geom/goal/goal.png and /dev/null differ
diff --git a/data/geom/goal/goal.sol b/data/geom/goal/goal.sol
deleted file mode 100644
index efc2eb8..0000000
Binary files a/data/geom/goal/goal.sol and /dev/null differ
diff --git a/data/geom/goal/goal.wings b/data/geom/goal/goal.wings
deleted file mode 100644
index ad98b1f..0000000
Binary files a/data/geom/goal/goal.wings and /dev/null differ
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 0000000..33be257
Binary files /dev/null and b/data/geom/mark/mark.wings differ
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);
 
 /*---------------------------------------------------------------------------*/