Sketched in possible alternatives for jump and goal particles.

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

diff --git a/ball/game_draw.c b/ball/game_draw.c
index f166ae4..503b07b 100644 (file)
--- a/ball/game_draw.c
+++ b/ball/game_draw.c
@@ -132,7 +132,7 @@ static void game_draw_goals(const struct game_draw *gd,
         int zi;
 
         /* Draw the goal particles. */
-
+/*
         for (zi = 0; zi < base->zc; zi++)
         {
             glPushMatrix();
@@ -145,7 +145,7 @@ static void game_draw_goals(const struct game_draw *gd,
             }
             glPopMatrix();
         }
-
+*/
         /* Draw the goal column. */
 
         for (zi = 0; zi < base->zc; zi++)
@@ -173,7 +173,7 @@ static void game_draw_jumps(const struct game_draw *gd,
     const struct s_base *base = gd->vary.base;
 
     int ji;
-
+/*
     for (ji = 0; ji < base->jc; ji++)
     {
         glPushMatrix();
@@ -186,7 +186,7 @@ static void game_draw_jumps(const struct game_draw *gd,
         }
         glPopMatrix();
     }
-
+*/
     for (ji = 0; ji < base->jc; ji++)
     {
         glPushMatrix();

diff --git a/data/geom/goal/goal b/data/geom/goal/goal
new file mode 100644 (file)
index 0000000..0379dd6
--- /dev/null
+++ b/data/geom/goal/goal
@@ -0,0 +1,7 @@
+0.8 0.8 0.8 1.0
+0.2 0.2 0.2 1.0
+0.0 0.0 0.0 1.0
+0.0 0.0 0.0 1.0
+0.0
+additive transparent two-sided
+45.0

diff --git a/data/geom/goal/goal.map b/data/geom/goal/goal.map
new file mode 100644 (file)
index 0000000..c94e8a2
--- /dev/null
+++ b/data/geom/goal/goal.map
@@ -0,0 +1,4 @@
+{
+"classname" "worldspawn"
+"model" "geom/goal/goal.obj"
+}

diff --git a/data/geom/goal/goal.mtl b/data/geom/goal/goal.mtl
new file mode 100644 (file)
index 0000000..052b0b3
--- /dev/null
+++ b/data/geom/goal/goal.mtl
@@ -0,0 +1,20 @@
+# Exported from Wings 3D 1.4.1\r
+newmtl default\r
+Ns 100.0\r
+d 1.0\r
+illum 2\r
+Kd 1.0 1.0 1.0\r
+Ka 1.0 1.0 1.0\r
+Ks 1.0 1.0 1.0\r
+Ke 0.0 0.0 0.0\r
+\r
+newmtl geom/goal/goal\r
+Ns 100.0\r
+d 1.0\r
+illum 2\r
+Kd 1.0 1.0 1.0\r
+Ka 1.0 1.0 1.0\r
+Ks 1.0 1.0 1.0\r
+Ke 0.0 0.0 0.0\r
+map_Kd goal.png\r
+\r

diff --git a/data/geom/goal/goal.obj b/data/geom/goal/goal.obj
new file mode 100644 (file)
index 0000000..4312787
--- /dev/null
+++ b/data/geom/goal/goal.obj
@@ -0,0 +1,521 @@
+# Exported from Wings 3D 1.4.1\r
+mtllib goal.mtl\r
+o cylinder1\r
+#128 vertices, 128 faces\r
+v 1.00000000 1.00000000 3.6768006e-17\r
+v 0.99518473 1.00000000 9.8017140e-2\r
+v 0.98078528 1.00000000 0.19509032\r
+v 0.95694034 1.00000000 0.29028468\r
+v 0.92387953 1.00000000 0.38268343\r
+v 0.88192126 1.00000000 0.47139674\r
+v 0.83146961 1.00000000 0.55557023\r
+v 0.77301045 1.00000000 0.63439328\r
+v 0.70710678 1.00000000 0.70710678\r
+v 0.63439328 1.00000000 0.77301045\r
+v 0.55557023 1.00000000 0.83146961\r
+v 0.47139674 1.00000000 0.88192126\r
+v 0.38268343 1.00000000 0.92387953\r
+v 0.29028468 1.00000000 0.95694034\r
+v 0.19509032 1.00000000 0.98078528\r
+v 9.8017140e-2 1.00000000 0.99518473\r
+v 9.5926809e-17 1.00000000 1.00000000\r
+v -9.8017140e-2 1.00000000 0.99518473\r
+v -0.19509032 1.00000000 0.98078528\r
+v -0.29028468 1.00000000 0.95694034\r
+v -0.38268343 1.00000000 0.92387953\r
+v -0.47139674 1.00000000 0.88192126\r
+v -0.55557023 1.00000000 0.83146961\r
+v -0.63439328 1.00000000 0.77301045\r
+v -0.70710678 1.00000000 0.70710678\r
+v -0.77301045 1.00000000 0.63439328\r
+v -0.83146961 1.00000000 0.55557023\r
+v -0.88192126 1.00000000 0.47139674\r
+v -0.92387953 1.00000000 0.38268343\r
+v -0.95694034 1.00000000 0.29028468\r
+v -0.98078528 1.00000000 0.19509032\r
+v -0.99518473 1.00000000 9.8017140e-2\r
+v -1.00000000 1.00000000 1.5923269e-16\r
+v -0.99518473 1.00000000 -9.8017140e-2\r
+v -0.98078528 1.00000000 -0.19509032\r
+v -0.95694034 1.00000000 -0.29028468\r
+v -0.92387953 1.00000000 -0.38268343\r
+v -0.88192126 1.00000000 -0.47139674\r
+v -0.83146961 1.00000000 -0.55557023\r
+v -0.77301045 1.00000000 -0.63439328\r
+v -0.70710678 1.00000000 -0.70710678\r
+v -0.63439328 1.00000000 -0.77301045\r
+v -0.55557023 1.00000000 -0.83146961\r
+v -0.47139674 1.00000000 -0.88192126\r
+v -0.38268343 1.00000000 -0.92387953\r
+v -0.29028468 1.00000000 -0.95694034\r
+v -0.19509032 1.00000000 -0.98078528\r
+v -9.8017140e-2 1.00000000 -0.99518473\r
+v -1.4900255e-16 1.00000000 -1.00000000\r
+v 9.8017140e-2 1.00000000 -0.99518473\r
+v 0.19509032 1.00000000 -0.98078528\r
+v 0.29028468 1.00000000 -0.95694034\r
+v 0.38268343 1.00000000 -0.92387953\r
+v 0.47139674 1.00000000 -0.88192126\r
+v 0.55557023 1.00000000 -0.83146961\r
+v 0.63439328 1.00000000 -0.77301045\r
+v 0.70710678 1.00000000 -0.70710678\r
+v 0.77301045 1.00000000 -0.63439328\r
+v 0.83146961 1.00000000 -0.55557023\r
+v 0.88192126 1.00000000 -0.47139674\r
+v 0.92387953 1.00000000 -0.38268343\r
+v 0.95694034 1.00000000 -0.29028468\r
+v 0.98078528 1.00000000 -0.19509032\r
+v 0.99518473 1.00000000 -9.8017140e-2\r
+v 1.00000000 0.0000000e+0 4.7704896e-17\r
+v 0.99518473 0.0000000e+0 9.8017140e-2\r
+v 0.98078528 0.0000000e+0 0.19509032\r
+v 0.95694034 0.0000000e+0 0.29028468\r
+v 0.92387953 0.0000000e+0 0.38268343\r
+v 0.88192126 0.0000000e+0 0.47139674\r
+v 0.83146961 0.0000000e+0 0.55557023\r
+v 0.77301045 0.0000000e+0 0.63439328\r
+v 0.70710678 0.0000000e+0 0.70710678\r
+v 0.63439328 0.0000000e+0 0.77301045\r
+v 0.55557023 0.0000000e+0 0.83146961\r
+v 0.47139674 0.0000000e+0 0.88192126\r
+v 0.38268343 0.0000000e+0 0.92387953\r
+v 0.29028468 0.0000000e+0 0.95694034\r
+v 0.19509032 0.0000000e+0 0.98078528\r
+v 9.8017140e-2 0.0000000e+0 0.99518473\r
+v 7.8579575e-17 0.0000000e+0 1.00000000\r
+v -9.8017140e-2 0.0000000e+0 0.99518473\r
+v -0.19509032 0.0000000e+0 0.98078528\r
+v -0.29028468 0.0000000e+0 0.95694034\r
+v -0.38268343 0.0000000e+0 0.92387953\r
+v -0.47139674 0.0000000e+0 0.88192126\r
+v -0.55557023 0.0000000e+0 0.83146961\r
+v -0.63439328 0.0000000e+0 0.77301045\r
+v -0.70710678 0.0000000e+0 0.70710678\r
+v -0.77301045 0.0000000e+0 0.63439328\r
+v -0.83146961 0.0000000e+0 0.55557023\r
+v -0.88192126 0.0000000e+0 0.47139674\r
+v -0.92387953 0.0000000e+0 0.38268343\r
+v -0.95694034 0.0000000e+0 0.29028468\r
+v -0.98078528 0.0000000e+0 0.19509032\r
+v -0.99518473 0.0000000e+0 9.8017140e-2\r
+v -1.00000000 0.0000000e+0 1.7016958e-16\r
+v -0.99518473 0.0000000e+0 -9.8017140e-2\r
+v -0.98078528 0.0000000e+0 -0.19509032\r
+v -0.95694034 0.0000000e+0 -0.29028468\r
+v -0.92387953 0.0000000e+0 -0.38268343\r
+v -0.88192126 0.0000000e+0 -0.47139674\r
+v -0.83146961 0.0000000e+0 -0.55557023\r
+v -0.77301045 0.0000000e+0 -0.63439328\r
+v -0.70710678 0.0000000e+0 -0.70710678\r
+v -0.63439328 0.0000000e+0 -0.77301045\r
+v -0.55557023 0.0000000e+0 -0.83146961\r
+v -0.47139674 0.0000000e+0 -0.88192126\r
+v -0.38268343 0.0000000e+0 -0.92387953\r
+v -0.29028468 0.0000000e+0 -0.95694034\r
+v -0.19509032 0.0000000e+0 -0.98078528\r
+v -9.8017140e-2 0.0000000e+0 -0.99518473\r
+v -1.6634979e-16 0.0000000e+0 -1.00000000\r
+v 9.8017140e-2 0.0000000e+0 -0.99518473\r
+v 0.19509032 0.0000000e+0 -0.98078528\r
+v 0.29028468 0.0000000e+0 -0.95694034\r
+v 0.38268343 0.0000000e+0 -0.92387953\r
+v 0.47139674 0.0000000e+0 -0.88192126\r
+v 0.55557023 0.0000000e+0 -0.83146961\r
+v 0.63439328 0.0000000e+0 -0.77301045\r
+v 0.70710678 0.0000000e+0 -0.70710678\r
+v 0.77301045 0.0000000e+0 -0.63439328\r
+v 0.83146961 0.0000000e+0 -0.55557023\r
+v 0.88192126 0.0000000e+0 -0.47139674\r
+v 0.92387953 0.0000000e+0 -0.38268343\r
+v 0.95694034 0.0000000e+0 -0.29028468\r
+v 0.98078528 0.0000000e+0 -0.19509032\r
+v 0.99518473 0.0000000e+0 -9.8017140e-2\r
+vt -1.1045018e-15 0.42500000\r
+vt 2.4482118e-15 0.57500000\r
+vt 1.5625000e-2 0.57500000\r
+vt 1.5625000e-2 0.42500000\r
+vt 3.1250000e-2 0.42500000\r
+vt 3.1250000e-2 0.57500000\r
+vt 4.6875000e-2 0.57500000\r
+vt 4.6875000e-2 0.42500000\r
+vt 6.2500000e-2 0.42500000\r
+vt 6.2500000e-2 0.57500000\r
+vt 7.8125000e-2 0.57500000\r
+vt 7.8125000e-2 0.42500000\r
+vt 9.3750000e-2 0.42500000\r
+vt 9.3750000e-2 0.57500000\r
+vt 0.10937500 0.57500000\r
+vt 0.10937500 0.42500000\r
+vt 0.12500000 0.42500000\r
+vt 0.12500000 0.57500000\r
+vt 0.14062500 0.42500000\r
+vt 0.14062500 0.57500000\r
+vt 0.15625000 0.42500000\r
+vt 0.15625000 0.57500000\r
+vt 0.17187500 0.42500000\r
+vt 0.17187500 0.57500000\r
+vt 0.18750000 0.42500000\r
+vt 0.18750000 0.57500000\r
+vt 0.20312500 0.42500000\r
+vt 0.20312500 0.57500000\r
+vt 0.21875000 0.42500000\r
+vt 0.21875000 0.57500000\r
+vt 0.23437500 0.42500000\r
+vt 0.23437500 0.57500000\r
+vt 0.25000000 0.42500000\r
+vt 0.25000000 0.57500000\r
+vt 0.26562500 0.57500000\r
+vt 0.26562500 0.42500000\r
+vt 0.28125000 0.42500000\r
+vt 0.28125000 0.57500000\r
+vt 0.29687500 0.42500000\r
+vt 0.29687500 0.57500000\r
+vt 0.31250000 0.42500000\r
+vt 0.31250000 0.57500000\r
+vt 0.32812500 0.57500000\r
+vt 0.32812500 0.42500000\r
+vt 0.34375000 0.42500000\r
+vt 0.34375000 0.57500000\r
+vt 0.35937500 0.42500000\r
+vt 0.35937500 0.57500000\r
+vt 0.37500000 0.42500000\r
+vt 0.37500000 0.57500000\r
+vt 0.39062500 0.42500000\r
+vt 0.39062500 0.57500000\r
+vt 0.40625000 0.42500000\r
+vt 0.40625000 0.57500000\r
+vt 0.42187500 0.42500000\r
+vt 0.42187500 0.57500000\r
+vt 0.43750000 0.42500000\r
+vt 0.43750000 0.57500000\r
+vt 0.45312500 0.57500000\r
+vt 0.45312500 0.42500000\r
+vt 0.46875000 0.42500000\r
+vt 0.46875000 0.57500000\r
+vt 0.48437500 0.57500000\r
+vt 0.48437500 0.42500000\r
+vt 0.50000000 0.42500000\r
+vt 0.50000000 0.57500000\r
+vt 0.51562500 0.42500000\r
+vt 0.51562500 0.57500000\r
+vt 0.53125000 0.42500000\r
+vt 0.53125000 0.57500000\r
+vt 0.54687500 0.42500000\r
+vt 0.54687500 0.57500000\r
+vt 0.56250000 0.42500000\r
+vt 0.56250000 0.57500000\r
+vt 0.57812500 0.42500000\r
+vt 0.57812500 0.57500000\r
+vt 0.59375000 0.42500000\r
+vt 0.59375000 0.57500000\r
+vt 0.60937500 0.42500000\r
+vt 0.60937500 0.57500000\r
+vt 0.62500000 0.42500000\r
+vt 0.62500000 0.57500000\r
+vt 0.64062500 0.42500000\r
+vt 0.64062500 0.57500000\r
+vt 0.65625000 0.42500000\r
+vt 0.65625000 0.57500000\r
+vt 0.67187500 0.57500000\r
+vt 0.67187500 0.42500000\r
+vt 0.68750000 0.42500000\r
+vt 0.68750000 0.57500000\r
+vt 0.70312500 0.57500000\r
+vt 0.70312500 0.42500000\r
+vt 0.71875000 0.42500000\r
+vt 0.71875000 0.57500000\r
+vt 0.73437500 0.57500000\r
+vt 0.73437500 0.42500000\r
+vt 0.75000000 0.42500000\r
+vt 0.75000000 0.57500000\r
+vt 0.76562500 0.57500000\r
+vt 0.76562500 0.42500000\r
+vt 0.78125000 0.42500000\r
+vt 0.78125000 0.57500000\r
+vt 0.79687500 0.57500000\r
+vt 0.79687500 0.42500000\r
+vt 0.81250000 0.42500000\r
+vt 0.81250000 0.57500000\r
+vt 0.82812500 0.57500000\r
+vt 0.82812500 0.42500000\r
+vt 0.84375000 0.42500000\r
+vt 0.84375000 0.57500000\r
+vt 0.85937500 0.57500000\r
+vt 0.85937500 0.42500000\r
+vt 0.87500000 0.42500000\r
+vt 0.87500000 0.57500000\r
+vt 0.89062500 0.57500000\r
+vt 0.89062500 0.42500000\r
+vt 0.90625000 0.42500000\r
+vt 0.90625000 0.57500000\r
+vt 0.92187500 0.57500000\r
+vt 0.92187500 0.42500000\r
+vt 0.93750000 0.42500000\r
+vt 0.93750000 0.57500000\r
+vt 0.95312500 0.57500000\r
+vt 0.95312500 0.42500000\r
+vt 0.96875000 0.42500000\r
+vt 0.96875000 0.57500000\r
+vt 0.98437500 0.57500000\r
+vt 0.98437500 0.42500000\r
+vt 1.00000000 0.42500000\r
+vt 1.00000000 0.57500000\r
+vn 1.00000000 -7.4044900e-32 -1.3894524e-17\r
+vn 0.99518473 7.0792658e-17 9.8017140e-2\r
+vn 0.98078528 0.0000000e+0 0.19509032\r
+vn 0.95694034 0.0000000e+0 0.29028468\r
+vn 0.92387953 0.0000000e+0 0.38268343\r
+vn 0.88192126 0.0000000e+0 0.47139674\r
+vn 0.83146961 0.0000000e+0 0.55557023\r
+vn 0.77301045 0.0000000e+0 0.63439328\r
+vn 0.70710678 0.0000000e+0 0.70710678\r
+vn 0.63439328 0.0000000e+0 0.77301045\r
+vn 0.55557023 0.0000000e+0 0.83146961\r
+vn 0.47139674 0.0000000e+0 0.88192126\r
+vn 0.38268343 0.0000000e+0 0.92387953\r
+vn 0.29028468 -4.4245411e-18 0.95694034\r
+vn 0.19509032 -1.3273623e-17 0.98078528\r
+vn 9.8017140e-2 -2.6270713e-18 0.99518473\r
+vn 1.1358774e-15 -2.7653382e-19 1.00000000\r
+vn -9.8017140e-2 2.4888044e-18 0.99518473\r
+vn -0.19509032 4.4245411e-18 0.98078528\r
+vn -0.29028468 0.0000000e+0 0.95694034\r
+vn -0.38268343 0.0000000e+0 0.92387953\r
+vn -0.47139674 0.0000000e+0 0.88192126\r
+vn -0.55557023 0.0000000e+0 0.83146961\r
+vn -0.63439328 0.0000000e+0 0.77301045\r
+vn -0.70710678 0.0000000e+0 0.70710678\r
+vn -0.77301045 0.0000000e+0 0.63439328\r
+vn -0.83146961 0.0000000e+0 0.55557023\r
+vn -0.88192126 0.0000000e+0 0.47139674\r
+vn -0.92387953 0.0000000e+0 0.38268343\r
+vn -0.95694034 0.0000000e+0 0.29028468\r
+vn -0.98078528 0.0000000e+0 0.19509032\r
+vn -0.99518473 -1.4461895e-34 9.8017140e-2\r
+vn -1.00000000 0.0000000e+0 5.6967550e-16\r
+vn -0.99518473 0.0000000e+0 -9.8017140e-2\r
+vn -0.98078528 0.0000000e+0 -0.19509032\r
+vn -0.95694034 0.0000000e+0 -0.29028468\r
+vn -0.92387953 0.0000000e+0 -0.38268343\r
+vn -0.88192126 0.0000000e+0 -0.47139674\r
+vn -0.83146961 0.0000000e+0 -0.55557023\r
+vn -0.77301045 0.0000000e+0 -0.63439328\r
+vn -0.70710678 0.0000000e+0 -0.70710678\r
+vn -0.63439328 0.0000000e+0 -0.77301045\r
+vn -0.55557023 0.0000000e+0 -0.83146961\r
+vn -0.47139674 0.0000000e+0 -0.88192126\r
+vn -0.38268343 0.0000000e+0 -0.92387953\r
+vn -0.29028468 0.0000000e+0 -0.95694034\r
+vn -0.19509032 4.4245411e-18 -0.98078528\r
+vn -9.8017140e-2 2.6270713e-18 -0.99518473\r
+vn 0.0000000e+0 2.7653382e-19 -1.00000000\r
+vn 9.8017140e-2 -2.4888044e-18 -0.99518473\r
+vn 0.19509032 -4.4245411e-18 -0.98078528\r
+vn 0.29028468 0.0000000e+0 -0.95694034\r
+vn 0.38268343 0.0000000e+0 -0.92387953\r
+vn 0.47139674 0.0000000e+0 -0.88192126\r
+vn 0.55557023 0.0000000e+0 -0.83146961\r
+vn 0.63439328 0.0000000e+0 -0.77301045\r
+vn 0.70710678 0.0000000e+0 -0.70710678\r
+vn 0.77301045 0.0000000e+0 -0.63439328\r
+vn 0.83146961 0.0000000e+0 -0.55557023\r
+vn 0.88192126 0.0000000e+0 -0.47139674\r
+vn 0.92387953 0.0000000e+0 -0.38268343\r
+vn 0.95694034 0.0000000e+0 -0.29028468\r
+vn 0.98078528 0.0000000e+0 -0.19509032\r
+vn 0.99518473 -7.0792658e-17 -9.8017140e-2\r
+vn 1.00000000 -3.7022450e-32 -1.3894524e-17\r
+vn 0.99518473 3.8565052e-34 9.8017140e-2\r
+vn 0.98078528 -3.4088600e-19 0.19509032\r
+vn 0.95694034 0.0000000e+0 0.29028468\r
+vn 0.92387953 0.0000000e+0 0.38268343\r
+vn 0.88192126 0.0000000e+0 0.47139674\r
+vn 0.83146961 0.0000000e+0 0.55557023\r
+vn 0.77301045 0.0000000e+0 0.63439328\r
+vn 0.70710678 0.0000000e+0 0.70710678\r
+vn 0.63439328 0.0000000e+0 0.77301045\r
+vn 0.55557023 0.0000000e+0 0.83146961\r
+vn 0.47139674 0.0000000e+0 0.88192126\r
+vn 0.38268343 0.0000000e+0 0.92387953\r
+vn 0.29028468 0.0000000e+0 0.95694034\r
+vn 0.19509032 -6.6368117e-18 0.98078528\r
+vn 9.8017140e-2 -2.7653382e-19 0.99518473\r
+vn 5.7141231e-16 -1.3826691e-19 1.00000000\r
+vn -9.8017140e-2 2.7653382e-19 0.99518473\r
+vn -0.19509032 2.2122706e-18 0.98078528\r
+vn -0.29028468 0.0000000e+0 0.95694034\r
+vn -0.38268343 0.0000000e+0 0.92387953\r
+vn -0.47139674 0.0000000e+0 0.88192126\r
+vn -0.55557023 0.0000000e+0 0.83146961\r
+vn -0.63439328 0.0000000e+0 0.77301045\r
+vn -0.70710678 0.0000000e+0 0.70710678\r
+vn -0.77301045 0.0000000e+0 0.63439328\r
+vn -0.83146961 0.0000000e+0 0.55557023\r
+vn -0.88192126 0.0000000e+0 0.47139674\r
+vn -0.92387953 0.0000000e+0 0.38268343\r
+vn -0.95694034 0.0000000e+0 0.29028468\r
+vn -0.98078528 -3.4088600e-19 0.19509032\r
+vn -0.99518473 -2.8923789e-34 9.8017140e-2\r
+vn -1.00000000 7.7612168e-33 5.6446505e-16\r
+vn -0.99518473 0.0000000e+0 -9.8017140e-2\r
+vn -0.98078528 3.4088600e-19 -0.19509032\r
+vn -0.95694034 0.0000000e+0 -0.29028468\r
+vn -0.92387953 0.0000000e+0 -0.38268343\r
+vn -0.88192126 0.0000000e+0 -0.47139674\r
+vn -0.83146961 0.0000000e+0 -0.55557023\r
+vn -0.77301045 0.0000000e+0 -0.63439328\r
+vn -0.70710678 0.0000000e+0 -0.70710678\r
+vn -0.63439328 0.0000000e+0 -0.77301045\r
+vn -0.55557023 0.0000000e+0 -0.83146961\r
+vn -0.47139674 0.0000000e+0 -0.88192126\r
+vn -0.38268343 0.0000000e+0 -0.92387953\r
+vn -0.29028468 0.0000000e+0 -0.95694034\r
+vn -0.19509032 2.2122706e-18 -0.98078528\r
+vn -9.8017140e-2 2.7653382e-19 -0.99518473\r
+vn 0.0000000e+0 1.3826691e-19 -1.00000000\r
+vn 9.8017140e-2 -2.7653382e-19 -0.99518473\r
+vn 0.19509032 -2.2122706e-18 -0.98078528\r
+vn 0.29028468 0.0000000e+0 -0.95694034\r
+vn 0.38268343 0.0000000e+0 -0.92387953\r
+vn 0.47139674 0.0000000e+0 -0.88192126\r
+vn 0.55557023 0.0000000e+0 -0.83146961\r
+vn 0.63439328 0.0000000e+0 -0.77301045\r
+vn 0.70710678 0.0000000e+0 -0.70710678\r
+vn 0.77301045 0.0000000e+0 -0.63439328\r
+vn 0.83146961 0.0000000e+0 -0.55557023\r
+vn 0.88192126 0.0000000e+0 -0.47139674\r
+vn 0.92387953 0.0000000e+0 -0.38268343\r
+vn 0.95694034 0.0000000e+0 -0.29028468\r
+vn 0.98078528 3.4088600e-19 -0.19509032\r
+vn 0.99518473 -4.2421557e-33 -9.8017140e-2\r
+g cylinder1_geom/goal/goal\r
+usemtl geom/goal/goal\r
+s 1\r
+f 1/34/1 65/33/65 64/35/64\r
+f 2/32/2 65/33/65 1/34/1\r
+f 2/32/2 67/29/67 66/31/66\r
+f 3/30/3 67/29/67 2/32/2\r
+f 4/28/4 67/29/67 3/30/3\r
+f 4/28/4 69/25/69 68/27/68\r
+f 5/26/5 69/25/69 4/28/4\r
+f 6/24/6 69/25/69 5/26/5\r
+f 6/24/6 71/21/71 70/23/70\r
+f 7/22/7 71/21/71 6/24/6\r
+f 8/20/8 71/21/71 7/22/7\r
+f 8/20/8 73/17/73 72/19/72\r
+f 9/18/9 73/17/73 8/20/8\r
+f 10/15/10 73/17/73 9/18/9\r
+f 10/15/10 75/13/75 74/16/74\r
+f 11/14/11 75/13/75 10/15/10\r
+f 12/11/12 75/13/75 11/14/11\r
+f 12/11/12 77/9/77 76/12/76\r
+f 13/10/13 77/9/77 12/11/12\r
+f 14/7/14 77/9/77 13/10/13\r
+f 14/7/14 79/5/79 78/8/78\r
+f 15/6/15 79/5/79 14/7/14\r
+f 16/3/16 79/5/79 15/6/15\r
+f 16/3/16 81/1/81 80/4/80\r
+f 17/2/17 81/1/81 16/3/16\r
+f 18/127/18 81/129/81 17/130/17\r
+f 18/127/18 83/125/83 82/128/82\r
+f 19/126/19 83/125/83 18/127/18\r
+f 20/123/20 83/125/83 19/126/19\r
+f 20/123/20 85/121/85 84/124/84\r
+f 21/122/21 85/121/85 20/123/20\r
+f 22/119/22 85/121/85 21/122/21\r
+f 22/119/22 87/117/87 86/120/86\r
+f 23/118/23 87/117/87 22/119/22\r
+f 24/115/24 87/117/87 23/118/23\r
+f 24/115/24 89/113/89 88/116/88\r
+f 25/114/25 89/113/89 24/115/24\r
+f 26/111/26 89/113/89 25/114/25\r
+f 26/111/26 91/109/91 90/112/90\r
+f 27/110/27 91/109/91 26/111/26\r
+f 28/107/28 91/109/91 27/110/27\r
+f 28/107/28 93/105/93 92/108/92\r
+f 29/106/29 93/105/93 28/107/28\r
+f 30/103/30 93/105/93 29/106/29\r
+f 30/103/30 95/101/95 94/104/94\r
+f 31/102/31 95/101/95 30/103/30\r
+f 32/99/32 95/101/95 31/102/31\r
+f 32/99/32 97/97/97 96/100/96\r
+f 33/98/33 97/97/97 32/99/32\r
+f 34/95/34 97/97/97 33/98/33\r
+f 34/95/34 99/93/99 98/96/98\r
+f 35/94/35 99/93/99 34/95/34\r
+f 36/91/36 99/93/99 35/94/35\r
+f 36/91/36 101/89/101 100/92/100\r
+f 37/90/37 101/89/101 36/91/36\r
+f 38/87/38 101/89/101 37/90/37\r
+f 38/87/38 103/85/103 102/88/102\r
+f 39/86/39 103/85/103 38/87/38\r
+f 40/84/40 103/85/103 39/86/39\r
+f 40/84/40 105/81/105 104/83/104\r
+f 41/82/41 105/81/105 40/84/40\r
+f 42/80/42 105/81/105 41/82/41\r
+f 42/80/42 107/77/107 106/79/106\r
+f 43/78/43 107/77/107 42/80/42\r
+f 44/76/44 107/77/107 43/78/43\r
+f 44/76/44 109/73/109 108/75/108\r
+f 45/74/45 109/73/109 44/76/44\r
+f 46/72/46 109/73/109 45/74/45\r
+f 46/72/46 111/69/111 110/71/110\r
+f 47/70/47 111/69/111 46/72/46\r
+f 48/68/48 111/69/111 47/70/47\r
+f 48/68/48 113/65/113 112/67/112\r
+f 49/66/49 113/65/113 48/68/48\r
+f 50/63/50 113/65/113 49/66/49\r
+f 50/63/50 115/61/115 114/64/114\r
+f 51/62/51 115/61/115 50/63/50\r
+f 52/59/52 115/61/115 51/62/51\r
+f 52/59/52 117/57/117 116/60/116\r
+f 53/58/53 117/57/117 52/59/52\r
+f 54/56/54 117/57/117 53/58/53\r
+f 54/56/54 119/53/119 118/55/118\r
+f 55/54/55 119/53/119 54/56/54\r
+f 56/52/56 119/53/119 55/54/55\r
+f 56/52/56 121/49/121 120/51/120\r
+f 57/50/57 121/49/121 56/52/56\r
+f 58/48/58 121/49/121 57/50/57\r
+f 58/48/58 123/45/123 122/47/122\r
+f 59/46/59 123/45/123 58/48/58\r
+f 60/43/60 123/45/123 59/46/59\r
+f 60/43/60 125/41/125 124/44/124\r
+f 61/42/61 125/41/125 60/43/60\r
+f 62/40/62 125/41/125 61/42/61\r
+f 62/40/62 127/37/127 126/39/126\r
+f 63/38/63 127/37/127 62/40/62\r
+f 64/35/64 65/33/65 128/36/128\r
+f 64/35/64 127/37/127 63/38/63\r
+f 66/31/66 65/33/65 2/32/2\r
+f 68/27/68 67/29/67 4/28/4\r
+f 70/23/70 69/25/69 6/24/6\r
+f 72/19/72 71/21/71 8/20/8\r
+f 74/16/74 73/17/73 10/15/10\r
+f 76/12/76 75/13/75 12/11/12\r
+f 78/8/78 77/9/77 14/7/14\r
+f 80/4/80 79/5/79 16/3/16\r
+f 82/128/82 81/129/81 18/127/18\r
+f 84/124/84 83/125/83 20/123/20\r
+f 86/120/86 85/121/85 22/119/22\r
+f 88/116/88 87/117/87 24/115/24\r
+f 90/112/90 89/113/89 26/111/26\r
+f 92/108/92 91/109/91 28/107/28\r
+f 94/104/94 93/105/93 30/103/30\r
+f 96/100/96 95/101/95 32/99/32\r
+f 98/96/98 97/97/97 34/95/34\r
+f 100/92/100 99/93/99 36/91/36\r
+f 102/88/102 101/89/101 38/87/38\r
+f 104/83/104 103/85/103 40/84/40\r
+f 106/79/106 105/81/105 42/80/42\r
+f 108/75/108 107/77/107 44/76/44\r
+f 110/71/110 109/73/109 46/72/46\r
+f 112/67/112 111/69/111 48/68/48\r
+f 114/64/114 113/65/113 50/63/50\r
+f 116/60/116 115/61/115 52/59/52\r
+f 118/55/118 117/57/117 54/56/54\r
+f 120/51/120 119/53/119 56/52/56\r
+f 122/47/122 121/49/121 58/48/58\r
+f 124/44/124 123/45/123 60/43/60\r
+f 126/39/126 125/41/125 62/40/62\r
+f 128/36/128 127/37/127 64/35/64\r

diff --git a/data/geom/goal/goal.png b/data/geom/goal/goal.png
new file mode 100644 (file)
index 0000000..d55a665
Binary files /dev/null and b/data/geom/goal/goal.png differ

diff --git a/data/geom/goal/goal.wings b/data/geom/goal/goal.wings
new file mode 100644 (file)
index 0000000..3d4135f
Binary files /dev/null and b/data/geom/goal/goal.wings differ

diff --git a/data/geom/jump/jump b/data/geom/jump/jump
new file mode 100644 (file)
index 0000000..740fa37
--- /dev/null
+++ b/data/geom/jump/jump
@@ -0,0 +1,7 @@
+0.8 0.8 0.8 1.0
+0.2 0.2 0.2 1.0
+0.0 0.0 0.0 1.0
+0.0 0.0 0.0 1.0
+0.0
+additive clamp-t transparent two-sided
+45.0

diff --git a/data/geom/jump/jump.map b/data/geom/jump/jump.map
new file mode 100644 (file)
index 0000000..b7d3c2e
--- /dev/null
+++ b/data/geom/jump/jump.map
@@ -0,0 +1,4 @@
+{
+"classname" "worldspawn"
+"model" "geom/jump/jump.obj"
+}

diff --git a/data/geom/jump/jump.mtl b/data/geom/jump/jump.mtl
new file mode 100644 (file)
index 0000000..d4a84f5
--- /dev/null
+++ b/data/geom/jump/jump.mtl
@@ -0,0 +1,20 @@
+# Exported from Wings 3D 1.4.1\r
+newmtl default\r
+Ns 100.0\r
+d 1.0\r
+illum 2\r
+Kd 1.0 1.0 1.0\r
+Ka 1.0 1.0 1.0\r
+Ks 1.0 1.0 1.0\r
+Ke 0.0 0.0 0.0\r
+\r
+newmtl geom/jump/jump\r
+Ns 100.0\r
+d 1.0\r
+illum 2\r
+Kd 1.0 1.0 1.0\r
+Ka 1.0 1.0 1.0\r
+Ks 1.0 1.0 1.0\r
+Ke 0.0 0.0 0.0\r
+map_Kd jump.png\r
+\r

diff --git a/data/geom/jump/jump.obj b/data/geom/jump/jump.obj
new file mode 100644 (file)
index 0000000..87ee0ed
--- /dev/null
+++ b/data/geom/jump/jump.obj
@@ -0,0 +1,521 @@
+# Exported from Wings 3D 1.4.1\r
+mtllib jump.mtl\r
+o cylinder1\r
+#128 vertices, 128 faces\r
+v 1.00000000 1.00000000 3.6768006e-17\r
+v 0.99518473 1.00000000 9.8017140e-2\r
+v 0.98078528 1.00000000 0.19509032\r
+v 0.95694034 1.00000000 0.29028468\r
+v 0.92387953 1.00000000 0.38268343\r
+v 0.88192126 1.00000000 0.47139674\r
+v 0.83146961 1.00000000 0.55557023\r
+v 0.77301045 1.00000000 0.63439328\r
+v 0.70710678 1.00000000 0.70710678\r
+v 0.63439328 1.00000000 0.77301045\r
+v 0.55557023 1.00000000 0.83146961\r
+v 0.47139674 1.00000000 0.88192126\r
+v 0.38268343 1.00000000 0.92387953\r
+v 0.29028468 1.00000000 0.95694034\r
+v 0.19509032 1.00000000 0.98078528\r
+v 9.8017140e-2 1.00000000 0.99518473\r
+v 9.5926809e-17 1.00000000 1.00000000\r
+v -9.8017140e-2 1.00000000 0.99518473\r
+v -0.19509032 1.00000000 0.98078528\r
+v -0.29028468 1.00000000 0.95694034\r
+v -0.38268343 1.00000000 0.92387953\r
+v -0.47139674 1.00000000 0.88192126\r
+v -0.55557023 1.00000000 0.83146961\r
+v -0.63439328 1.00000000 0.77301045\r
+v -0.70710678 1.00000000 0.70710678\r
+v -0.77301045 1.00000000 0.63439328\r
+v -0.83146961 1.00000000 0.55557023\r
+v -0.88192126 1.00000000 0.47139674\r
+v -0.92387953 1.00000000 0.38268343\r
+v -0.95694034 1.00000000 0.29028468\r
+v -0.98078528 1.00000000 0.19509032\r
+v -0.99518473 1.00000000 9.8017140e-2\r
+v -1.00000000 1.00000000 1.5923269e-16\r
+v -0.99518473 1.00000000 -9.8017140e-2\r
+v -0.98078528 1.00000000 -0.19509032\r
+v -0.95694034 1.00000000 -0.29028468\r
+v -0.92387953 1.00000000 -0.38268343\r
+v -0.88192126 1.00000000 -0.47139674\r
+v -0.83146961 1.00000000 -0.55557023\r
+v -0.77301045 1.00000000 -0.63439328\r
+v -0.70710678 1.00000000 -0.70710678\r
+v -0.63439328 1.00000000 -0.77301045\r
+v -0.55557023 1.00000000 -0.83146961\r
+v -0.47139674 1.00000000 -0.88192126\r
+v -0.38268343 1.00000000 -0.92387953\r
+v -0.29028468 1.00000000 -0.95694034\r
+v -0.19509032 1.00000000 -0.98078528\r
+v -9.8017140e-2 1.00000000 -0.99518473\r
+v -1.4900255e-16 1.00000000 -1.00000000\r
+v 9.8017140e-2 1.00000000 -0.99518473\r
+v 0.19509032 1.00000000 -0.98078528\r
+v 0.29028468 1.00000000 -0.95694034\r
+v 0.38268343 1.00000000 -0.92387953\r
+v 0.47139674 1.00000000 -0.88192126\r
+v 0.55557023 1.00000000 -0.83146961\r
+v 0.63439328 1.00000000 -0.77301045\r
+v 0.70710678 1.00000000 -0.70710678\r
+v 0.77301045 1.00000000 -0.63439328\r
+v 0.83146961 1.00000000 -0.55557023\r
+v 0.88192126 1.00000000 -0.47139674\r
+v 0.92387953 1.00000000 -0.38268343\r
+v 0.95694034 1.00000000 -0.29028468\r
+v 0.98078528 1.00000000 -0.19509032\r
+v 0.99518473 1.00000000 -9.8017140e-2\r
+v 1.00000000 0.0000000e+0 4.7704896e-17\r
+v 0.99518473 0.0000000e+0 9.8017140e-2\r
+v 0.98078528 0.0000000e+0 0.19509032\r
+v 0.95694034 0.0000000e+0 0.29028468\r
+v 0.92387953 0.0000000e+0 0.38268343\r
+v 0.88192126 0.0000000e+0 0.47139674\r
+v 0.83146961 0.0000000e+0 0.55557023\r
+v 0.77301045 0.0000000e+0 0.63439328\r
+v 0.70710678 0.0000000e+0 0.70710678\r
+v 0.63439328 0.0000000e+0 0.77301045\r
+v 0.55557023 0.0000000e+0 0.83146961\r
+v 0.47139674 0.0000000e+0 0.88192126\r
+v 0.38268343 0.0000000e+0 0.92387953\r
+v 0.29028468 0.0000000e+0 0.95694034\r
+v 0.19509032 0.0000000e+0 0.98078528\r
+v 9.8017140e-2 0.0000000e+0 0.99518473\r
+v 7.8579575e-17 0.0000000e+0 1.00000000\r
+v -9.8017140e-2 0.0000000e+0 0.99518473\r
+v -0.19509032 0.0000000e+0 0.98078528\r
+v -0.29028468 0.0000000e+0 0.95694034\r
+v -0.38268343 0.0000000e+0 0.92387953\r
+v -0.47139674 0.0000000e+0 0.88192126\r
+v -0.55557023 0.0000000e+0 0.83146961\r
+v -0.63439328 0.0000000e+0 0.77301045\r
+v -0.70710678 0.0000000e+0 0.70710678\r
+v -0.77301045 0.0000000e+0 0.63439328\r
+v -0.83146961 0.0000000e+0 0.55557023\r
+v -0.88192126 0.0000000e+0 0.47139674\r
+v -0.92387953 0.0000000e+0 0.38268343\r
+v -0.95694034 0.0000000e+0 0.29028468\r
+v -0.98078528 0.0000000e+0 0.19509032\r
+v -0.99518473 0.0000000e+0 9.8017140e-2\r
+v -1.00000000 0.0000000e+0 1.7016958e-16\r
+v -0.99518473 0.0000000e+0 -9.8017140e-2\r
+v -0.98078528 0.0000000e+0 -0.19509032\r
+v -0.95694034 0.0000000e+0 -0.29028468\r
+v -0.92387953 0.0000000e+0 -0.38268343\r
+v -0.88192126 0.0000000e+0 -0.47139674\r
+v -0.83146961 0.0000000e+0 -0.55557023\r
+v -0.77301045 0.0000000e+0 -0.63439328\r
+v -0.70710678 0.0000000e+0 -0.70710678\r
+v -0.63439328 0.0000000e+0 -0.77301045\r
+v -0.55557023 0.0000000e+0 -0.83146961\r
+v -0.47139674 0.0000000e+0 -0.88192126\r
+v -0.38268343 0.0000000e+0 -0.92387953\r
+v -0.29028468 0.0000000e+0 -0.95694034\r
+v -0.19509032 0.0000000e+0 -0.98078528\r
+v -9.8017140e-2 0.0000000e+0 -0.99518473\r
+v -1.6634979e-16 0.0000000e+0 -1.00000000\r
+v 9.8017140e-2 0.0000000e+0 -0.99518473\r
+v 0.19509032 0.0000000e+0 -0.98078528\r
+v 0.29028468 0.0000000e+0 -0.95694034\r
+v 0.38268343 0.0000000e+0 -0.92387953\r
+v 0.47139674 0.0000000e+0 -0.88192126\r
+v 0.55557023 0.0000000e+0 -0.83146961\r
+v 0.63439328 0.0000000e+0 -0.77301045\r
+v 0.70710678 0.0000000e+0 -0.70710678\r
+v 0.77301045 0.0000000e+0 -0.63439328\r
+v 0.83146961 0.0000000e+0 -0.55557023\r
+v 0.88192126 0.0000000e+0 -0.47139674\r
+v 0.92387953 0.0000000e+0 -0.38268343\r
+v 0.95694034 0.0000000e+0 -0.29028468\r
+v 0.98078528 0.0000000e+0 -0.19509032\r
+v 0.99518473 0.0000000e+0 -9.8017140e-2\r
+vt 0.45000000 1.1268764e-14\r
+vt 0.45000000 1.00000000\r
+vt 0.45156250 1.00000000\r
+vt 0.45156250 2.1593838e-14\r
+vt 0.45312500 6.1062266e-15\r
+vt 0.45312500 1.00000000\r
+vt 0.45468750 1.00000000\r
+vt 0.45468750 2.3536728e-14\r
+vt 0.45625000 9.0483177e-15\r
+vt 0.45625000 1.00000000\r
+vt 0.45781250 1.00000000\r
+vt 0.45781250 1.9872992e-14\r
+vt 0.45937500 9.0483177e-15\r
+vt 0.45937500 1.00000000\r
+vt 0.46093750 1.00000000\r
+vt 0.46093750 2.1482816e-14\r
+vt 0.46250000 5.3290705e-15\r
+vt 0.46250000 1.00000000\r
+vt 0.46406250 2.1205260e-14\r
+vt 0.46406250 1.00000000\r
+vt 0.46562500 7.4384943e-15\r
+vt 0.46562500 1.00000000\r
+vt 0.46718750 2.0428104e-14\r
+vt 0.46718750 1.00000000\r
+vt 0.46875000 9.1593400e-15\r
+vt 0.46875000 1.00000000\r
+vt 0.47031250 1.6597834e-14\r
+vt 0.47031250 1.00000000\r
+vt 0.47187500 8.3266727e-15\r
+vt 0.47187500 1.00000000\r
+vt 0.47343750 1.5376589e-14\r
+vt 0.47343750 1.00000000\r
+vt 0.47500000 1.2156942e-14\r
+vt 0.47500000 1.00000000\r
+vt 0.47656250 1.00000000\r
+vt 0.47656250 1.2601031e-14\r
+vt 0.47812500 9.6589403e-15\r
+vt 0.47812500 1.00000000\r
+vt 0.47968750 1.5987212e-14\r
+vt 0.47968750 1.00000000\r
+vt 0.48125000 7.9936058e-15\r
+vt 0.48125000 1.00000000\r
+vt 0.48281250 1.00000000\r
+vt 0.48281250 1.4821477e-14\r
+vt 0.48437500 1.1268764e-14\r
+vt 0.48437500 1.00000000\r
+vt 0.48593750 1.2712054e-14\r
+vt 0.48593750 1.00000000\r
+vt 0.48750000 7.8270723e-15\r
+vt 0.48750000 1.00000000\r
+vt 0.48906250 1.3489210e-14\r
+vt 0.48906250 1.00000000\r
+vt 0.49062500 7.5495166e-15\r
+vt 0.49062500 1.00000000\r
+vt 0.49218750 1.00000000\r
+vt 0.49218750 1.1546319e-14\r
+vt 0.49375000 1.1879386e-14\r
+vt 0.49375000 1.00000000\r
+vt 0.49531250 1.00000000\r
+vt 0.49531250 7.8270723e-15\r
+vt 0.49687500 9.9364961e-15\r
+vt 0.49687500 1.00000000\r
+vt 0.49843750 1.00000000\r
+vt 0.49843750 1.0380585e-14\r
+vt 0.50000000 8.6042284e-15\r
+vt 0.50000000 1.00000000\r
+vt 0.50156250 6.7723605e-15\r
+vt 0.50156250 1.00000000\r
+vt 0.50312500 1.0991208e-14\r
+vt 0.50312500 1.00000000\r
+vt 0.50468750 4.6074256e-15\r
+vt 0.50468750 1.00000000\r
+vt 0.50625000 7.7160500e-15\r
+vt 0.50625000 1.00000000\r
+vt 0.50781250 6.1062266e-15\r
+vt 0.50781250 1.00000000\r
+vt 0.50937500 6.4948047e-15\r
+vt 0.50937500 1.00000000\r
+vt 0.51093750 5.3290705e-15\r
+vt 0.51093750 1.00000000\r
+vt 0.51250000 1.00000000\r
+vt 0.51250000 8.4376950e-15\r
+vt 0.51406250 3.5527137e-15\r
+vt 0.51406250 1.00000000\r
+vt 0.51562500 1.0713652e-14\r
+vt 0.51562500 1.00000000\r
+vt 0.51718750 1.00000000\r
+vt 0.51718750 2.1094237e-15\r
+vt 0.51875000 1.0047518e-14\r
+vt 0.51875000 1.00000000\r
+vt 0.52031250 1.00000000\r
+vt 0.52031250 3.1641356e-15\r
+vt 0.52187500 1.0491608e-14\r
+vt 0.52187500 1.00000000\r
+vt 0.52343750 1.00000000\r
+vt 0.52343750 5.3290705e-15\r
+vt 0.52500000 1.2712054e-14\r
+vt 0.52500000 1.00000000\r
+vt 0.52656250 1.00000000\r
+vt 0.52656250 3.1641356e-15\r
+vt 0.52812500 1.0214052e-14\r
+vt 0.52812500 1.00000000\r
+vt 0.52968750 1.00000000\r
+vt 0.52968750 3.7192471e-15\r
+vt 0.53125000 9.7699626e-15\r
+vt 0.53125000 1.00000000\r
+vt 0.53281250 1.00000000\r
+vt 0.53281250 4.8849813e-15\r
+vt 0.53437500 1.1546319e-14\r
+vt 0.53437500 1.00000000\r
+vt 0.53593750 1.00000000\r
+vt 0.53593750 3.1641356e-15\r
+vt 0.53750000 8.8817842e-15\r
+vt 0.53750000 1.00000000\r
+vt 0.53906250 1.00000000\r
+vt 0.53906250 1.7763568e-15\r
+vt 0.54062500 1.2156942e-14\r
+vt 0.54062500 1.00000000\r
+vt 0.54218750 1.00000000\r
+vt 0.54218750 0.0000000e+0\r
+vt 0.54375000 1.0713652e-14\r
+vt 0.54375000 1.00000000\r
+vt 0.54531250 1.00000000\r
+vt 0.54531250 1.5543122e-15\r
+vt 0.54687500 1.1879386e-14\r
+vt 0.54687500 1.00000000\r
+vt 0.54843750 1.00000000\r
+vt 0.54843750 3.1641356e-15\r
+vt 0.55000000 1.1268764e-14\r
+vt 0.55000000 1.00000000\r
+vn 1.00000000 -7.4044900e-32 -1.3894524e-17\r
+vn 0.99518473 7.0792658e-17 9.8017140e-2\r
+vn 0.98078528 0.0000000e+0 0.19509032\r
+vn 0.95694034 0.0000000e+0 0.29028468\r
+vn 0.92387953 0.0000000e+0 0.38268343\r
+vn 0.88192126 0.0000000e+0 0.47139674\r
+vn 0.83146961 0.0000000e+0 0.55557023\r
+vn 0.77301045 0.0000000e+0 0.63439328\r
+vn 0.70710678 0.0000000e+0 0.70710678\r
+vn 0.63439328 0.0000000e+0 0.77301045\r
+vn 0.55557023 0.0000000e+0 0.83146961\r
+vn 0.47139674 0.0000000e+0 0.88192126\r
+vn 0.38268343 0.0000000e+0 0.92387953\r
+vn 0.29028468 -4.4245411e-18 0.95694034\r
+vn 0.19509032 -1.3273623e-17 0.98078528\r
+vn 9.8017140e-2 -2.6270713e-18 0.99518473\r
+vn 1.1358774e-15 -2.7653382e-19 1.00000000\r
+vn -9.8017140e-2 2.4888044e-18 0.99518473\r
+vn -0.19509032 4.4245411e-18 0.98078528\r
+vn -0.29028468 0.0000000e+0 0.95694034\r
+vn -0.38268343 0.0000000e+0 0.92387953\r
+vn -0.47139674 0.0000000e+0 0.88192126\r
+vn -0.55557023 0.0000000e+0 0.83146961\r
+vn -0.63439328 0.0000000e+0 0.77301045\r
+vn -0.70710678 0.0000000e+0 0.70710678\r
+vn -0.77301045 0.0000000e+0 0.63439328\r
+vn -0.83146961 0.0000000e+0 0.55557023\r
+vn -0.88192126 0.0000000e+0 0.47139674\r
+vn -0.92387953 0.0000000e+0 0.38268343\r
+vn -0.95694034 0.0000000e+0 0.29028468\r
+vn -0.98078528 0.0000000e+0 0.19509032\r
+vn -0.99518473 -1.4461895e-34 9.8017140e-2\r
+vn -1.00000000 0.0000000e+0 5.6967550e-16\r
+vn -0.99518473 0.0000000e+0 -9.8017140e-2\r
+vn -0.98078528 0.0000000e+0 -0.19509032\r
+vn -0.95694034 0.0000000e+0 -0.29028468\r
+vn -0.92387953 0.0000000e+0 -0.38268343\r
+vn -0.88192126 0.0000000e+0 -0.47139674\r
+vn -0.83146961 0.0000000e+0 -0.55557023\r
+vn -0.77301045 0.0000000e+0 -0.63439328\r
+vn -0.70710678 0.0000000e+0 -0.70710678\r
+vn -0.63439328 0.0000000e+0 -0.77301045\r
+vn -0.55557023 0.0000000e+0 -0.83146961\r
+vn -0.47139674 0.0000000e+0 -0.88192126\r
+vn -0.38268343 0.0000000e+0 -0.92387953\r
+vn -0.29028468 0.0000000e+0 -0.95694034\r
+vn -0.19509032 4.4245411e-18 -0.98078528\r
+vn -9.8017140e-2 2.6270713e-18 -0.99518473\r
+vn 0.0000000e+0 2.7653382e-19 -1.00000000\r
+vn 9.8017140e-2 -2.4888044e-18 -0.99518473\r
+vn 0.19509032 -4.4245411e-18 -0.98078528\r
+vn 0.29028468 0.0000000e+0 -0.95694034\r
+vn 0.38268343 0.0000000e+0 -0.92387953\r
+vn 0.47139674 0.0000000e+0 -0.88192126\r
+vn 0.55557023 0.0000000e+0 -0.83146961\r
+vn 0.63439328 0.0000000e+0 -0.77301045\r
+vn 0.70710678 0.0000000e+0 -0.70710678\r
+vn 0.77301045 0.0000000e+0 -0.63439328\r
+vn 0.83146961 0.0000000e+0 -0.55557023\r
+vn 0.88192126 0.0000000e+0 -0.47139674\r
+vn 0.92387953 0.0000000e+0 -0.38268343\r
+vn 0.95694034 0.0000000e+0 -0.29028468\r
+vn 0.98078528 0.0000000e+0 -0.19509032\r
+vn 0.99518473 -7.0792658e-17 -9.8017140e-2\r
+vn 1.00000000 -3.7022450e-32 -1.3894524e-17\r
+vn 0.99518473 3.8565052e-34 9.8017140e-2\r
+vn 0.98078528 -3.4088600e-19 0.19509032\r
+vn 0.95694034 0.0000000e+0 0.29028468\r
+vn 0.92387953 0.0000000e+0 0.38268343\r
+vn 0.88192126 0.0000000e+0 0.47139674\r
+vn 0.83146961 0.0000000e+0 0.55557023\r
+vn 0.77301045 0.0000000e+0 0.63439328\r
+vn 0.70710678 0.0000000e+0 0.70710678\r
+vn 0.63439328 0.0000000e+0 0.77301045\r
+vn 0.55557023 0.0000000e+0 0.83146961\r
+vn 0.47139674 0.0000000e+0 0.88192126\r
+vn 0.38268343 0.0000000e+0 0.92387953\r
+vn 0.29028468 0.0000000e+0 0.95694034\r
+vn 0.19509032 -6.6368117e-18 0.98078528\r
+vn 9.8017140e-2 -2.7653382e-19 0.99518473\r
+vn 5.7141231e-16 -1.3826691e-19 1.00000000\r
+vn -9.8017140e-2 2.7653382e-19 0.99518473\r
+vn -0.19509032 2.2122706e-18 0.98078528\r
+vn -0.29028468 0.0000000e+0 0.95694034\r
+vn -0.38268343 0.0000000e+0 0.92387953\r
+vn -0.47139674 0.0000000e+0 0.88192126\r
+vn -0.55557023 0.0000000e+0 0.83146961\r
+vn -0.63439328 0.0000000e+0 0.77301045\r
+vn -0.70710678 0.0000000e+0 0.70710678\r
+vn -0.77301045 0.0000000e+0 0.63439328\r
+vn -0.83146961 0.0000000e+0 0.55557023\r
+vn -0.88192126 0.0000000e+0 0.47139674\r
+vn -0.92387953 0.0000000e+0 0.38268343\r
+vn -0.95694034 0.0000000e+0 0.29028468\r
+vn -0.98078528 -3.4088600e-19 0.19509032\r
+vn -0.99518473 -2.8923789e-34 9.8017140e-2\r
+vn -1.00000000 7.7612168e-33 5.6446505e-16\r
+vn -0.99518473 0.0000000e+0 -9.8017140e-2\r
+vn -0.98078528 3.4088600e-19 -0.19509032\r
+vn -0.95694034 0.0000000e+0 -0.29028468\r
+vn -0.92387953 0.0000000e+0 -0.38268343\r
+vn -0.88192126 0.0000000e+0 -0.47139674\r
+vn -0.83146961 0.0000000e+0 -0.55557023\r
+vn -0.77301045 0.0000000e+0 -0.63439328\r
+vn -0.70710678 0.0000000e+0 -0.70710678\r
+vn -0.63439328 0.0000000e+0 -0.77301045\r
+vn -0.55557023 0.0000000e+0 -0.83146961\r
+vn -0.47139674 0.0000000e+0 -0.88192126\r
+vn -0.38268343 0.0000000e+0 -0.92387953\r
+vn -0.29028468 0.0000000e+0 -0.95694034\r
+vn -0.19509032 2.2122706e-18 -0.98078528\r
+vn -9.8017140e-2 2.7653382e-19 -0.99518473\r
+vn 0.0000000e+0 1.3826691e-19 -1.00000000\r
+vn 9.8017140e-2 -2.7653382e-19 -0.99518473\r
+vn 0.19509032 -2.2122706e-18 -0.98078528\r
+vn 0.29028468 0.0000000e+0 -0.95694034\r
+vn 0.38268343 0.0000000e+0 -0.92387953\r
+vn 0.47139674 0.0000000e+0 -0.88192126\r
+vn 0.55557023 0.0000000e+0 -0.83146961\r
+vn 0.63439328 0.0000000e+0 -0.77301045\r
+vn 0.70710678 0.0000000e+0 -0.70710678\r
+vn 0.77301045 0.0000000e+0 -0.63439328\r
+vn 0.83146961 0.0000000e+0 -0.55557023\r
+vn 0.88192126 0.0000000e+0 -0.47139674\r
+vn 0.92387953 0.0000000e+0 -0.38268343\r
+vn 0.95694034 0.0000000e+0 -0.29028468\r
+vn 0.98078528 3.4088600e-19 -0.19509032\r
+vn 0.99518473 -4.2421557e-33 -9.8017140e-2\r
+g cylinder1_geom/jump/jump\r
+usemtl geom/jump/jump\r
+s 1\r
+f 1/34/1 65/33/65 64/35/64\r
+f 2/32/2 65/33/65 1/34/1\r
+f 2/32/2 67/29/67 66/31/66\r
+f 3/30/3 67/29/67 2/32/2\r
+f 4/28/4 67/29/67 3/30/3\r
+f 4/28/4 69/25/69 68/27/68\r
+f 5/26/5 69/25/69 4/28/4\r
+f 6/24/6 69/25/69 5/26/5\r
+f 6/24/6 71/21/71 70/23/70\r
+f 7/22/7 71/21/71 6/24/6\r
+f 8/20/8 71/21/71 7/22/7\r
+f 8/20/8 73/17/73 72/19/72\r
+f 9/18/9 73/17/73 8/20/8\r
+f 10/15/10 73/17/73 9/18/9\r
+f 10/15/10 75/13/75 74/16/74\r
+f 11/14/11 75/13/75 10/15/10\r
+f 12/11/12 75/13/75 11/14/11\r
+f 12/11/12 77/9/77 76/12/76\r
+f 13/10/13 77/9/77 12/11/12\r
+f 14/7/14 77/9/77 13/10/13\r
+f 14/7/14 79/5/79 78/8/78\r
+f 15/6/15 79/5/79 14/7/14\r
+f 16/3/16 79/5/79 15/6/15\r
+f 16/3/16 81/1/81 80/4/80\r
+f 17/2/17 81/1/81 16/3/16\r
+f 18/127/18 81/129/81 17/130/17\r
+f 18/127/18 83/125/83 82/128/82\r
+f 19/126/19 83/125/83 18/127/18\r
+f 20/123/20 83/125/83 19/126/19\r
+f 20/123/20 85/121/85 84/124/84\r
+f 21/122/21 85/121/85 20/123/20\r
+f 22/119/22 85/121/85 21/122/21\r
+f 22/119/22 87/117/87 86/120/86\r
+f 23/118/23 87/117/87 22/119/22\r
+f 24/115/24 87/117/87 23/118/23\r
+f 24/115/24 89/113/89 88/116/88\r
+f 25/114/25 89/113/89 24/115/24\r
+f 26/111/26 89/113/89 25/114/25\r
+f 26/111/26 91/109/91 90/112/90\r
+f 27/110/27 91/109/91 26/111/26\r
+f 28/107/28 91/109/91 27/110/27\r
+f 28/107/28 93/105/93 92/108/92\r
+f 29/106/29 93/105/93 28/107/28\r
+f 30/103/30 93/105/93 29/106/29\r
+f 30/103/30 95/101/95 94/104/94\r
+f 31/102/31 95/101/95 30/103/30\r
+f 32/99/32 95/101/95 31/102/31\r
+f 32/99/32 97/97/97 96/100/96\r
+f 33/98/33 97/97/97 32/99/32\r
+f 34/95/34 97/97/97 33/98/33\r
+f 34/95/34 99/93/99 98/96/98\r
+f 35/94/35 99/93/99 34/95/34\r
+f 36/91/36 99/93/99 35/94/35\r
+f 36/91/36 101/89/101 100/92/100\r
+f 37/90/37 101/89/101 36/91/36\r
+f 38/87/38 101/89/101 37/90/37\r
+f 38/87/38 103/85/103 102/88/102\r
+f 39/86/39 103/85/103 38/87/38\r
+f 40/84/40 103/85/103 39/86/39\r
+f 40/84/40 105/82/105 104/83/104\r
+f 41/81/41 105/82/105 40/84/40\r
+f 42/80/42 105/82/105 41/81/41\r
+f 42/80/42 107/77/107 106/79/106\r
+f 43/78/43 107/77/107 42/80/42\r
+f 44/76/44 107/77/107 43/78/43\r
+f 44/76/44 109/73/109 108/75/108\r
+f 45/74/45 109/73/109 44/76/44\r
+f 46/72/46 109/73/109 45/74/45\r
+f 46/72/46 111/69/111 110/71/110\r
+f 47/70/47 111/69/111 46/72/46\r
+f 48/68/48 111/69/111 47/70/47\r
+f 48/68/48 113/65/113 112/67/112\r
+f 49/66/49 113/65/113 48/68/48\r
+f 50/63/50 113/65/113 49/66/49\r
+f 50/63/50 115/61/115 114/64/114\r
+f 51/62/51 115/61/115 50/63/50\r
+f 52/59/52 115/61/115 51/62/51\r
+f 52/59/52 117/57/117 116/60/116\r
+f 53/58/53 117/57/117 52/59/52\r
+f 54/55/54 117/57/117 53/58/53\r
+f 54/55/54 119/53/119 118/56/118\r
+f 55/54/55 119/53/119 54/55/54\r
+f 56/52/56 119/53/119 55/54/55\r
+f 56/52/56 121/49/121 120/51/120\r
+f 57/50/57 121/49/121 56/52/56\r
+f 58/48/58 121/49/121 57/50/57\r
+f 58/48/58 123/45/123 122/47/122\r
+f 59/46/59 123/45/123 58/48/58\r
+f 60/43/60 123/45/123 59/46/59\r
+f 60/43/60 125/41/125 124/44/124\r
+f 61/42/61 125/41/125 60/43/60\r
+f 62/40/62 125/41/125 61/42/61\r
+f 62/40/62 127/37/127 126/39/126\r
+f 63/38/63 127/37/127 62/40/62\r
+f 64/35/64 65/33/65 128/36/128\r
+f 64/35/64 127/37/127 63/38/63\r
+f 66/31/66 65/33/65 2/32/2\r
+f 68/27/68 67/29/67 4/28/4\r
+f 70/23/70 69/25/69 6/24/6\r
+f 72/19/72 71/21/71 8/20/8\r
+f 74/16/74 73/17/73 10/15/10\r
+f 76/12/76 75/13/75 12/11/12\r
+f 78/8/78 77/9/77 14/7/14\r
+f 80/4/80 79/5/79 16/3/16\r
+f 82/128/82 81/129/81 18/127/18\r
+f 84/124/84 83/125/83 20/123/20\r
+f 86/120/86 85/121/85 22/119/22\r
+f 88/116/88 87/117/87 24/115/24\r
+f 90/112/90 89/113/89 26/111/26\r
+f 92/108/92 91/109/91 28/107/28\r
+f 94/104/94 93/105/93 30/103/30\r
+f 96/100/96 95/101/95 32/99/32\r
+f 98/96/98 97/97/97 34/95/34\r
+f 100/92/100 99/93/99 36/91/36\r
+f 102/88/102 101/89/101 38/87/38\r
+f 104/83/104 103/85/103 40/84/40\r
+f 106/79/106 105/82/105 42/80/42\r
+f 108/75/108 107/77/107 44/76/44\r
+f 110/71/110 109/73/109 46/72/46\r
+f 112/67/112 111/69/111 48/68/48\r
+f 114/64/114 113/65/113 50/63/50\r
+f 116/60/116 115/61/115 52/59/52\r
+f 118/56/118 117/57/117 54/55/54\r
+f 120/51/120 119/53/119 56/52/56\r
+f 122/47/122 121/49/121 58/48/58\r
+f 124/44/124 123/45/123 60/43/60\r
+f 126/39/126 125/41/125 62/40/62\r
+f 128/36/128 127/37/127 64/35/64\r

diff --git a/data/geom/jump/jump.png b/data/geom/jump/jump.png
new file mode 100644 (file)
index 0000000..3fa622e
Binary files /dev/null and b/data/geom/jump/jump.png differ

diff --git a/data/geom/jump/jump.wings b/data/geom/jump/jump.wings
new file mode 100644 (file)
index 0000000..9964df0
Binary files /dev/null and b/data/geom/jump/jump.wings differ

diff --git a/share/geom.c b/share/geom.c
index 1d03365..d5fcdf1 100644 (file)
--- a/share/geom.c
+++ b/share/geom.c
@@ -30,6 +30,8 @@
 /*---------------------------------------------------------------------------*/
 
 static struct s_full beam;
+static struct s_full jump;
+static struct s_full goal;
 static struct s_full flag;
 static struct s_full mark;
 static struct s_full back;
@@ -41,6 +43,8 @@ static GLuint back_text;
 void geom_init(void)
 {
     sol_load_full(&beam, "geom/beam/beam.sol", 0);
+    sol_load_full(&jump, "geom/jump/jump.sol", 0);
+    sol_load_full(&goal, "geom/goal/goal.sol", 0);
     sol_load_full(&flag, "geom/flag/flag.sol", 0);
     sol_load_full(&mark, "geom/mark/mark.sol", 0);
     sol_load_full(&back, "geom/back/back.sol", 0);
@@ -51,6 +55,8 @@ void geom_free(void)
     sol_free_full(&back);
     sol_free_full(&mark);
     sol_free_full(&flag);
+    sol_free_full(&goal);
+    sol_free_full(&jump);
     sol_free_full(&beam);
 }
 
@@ -74,14 +80,49 @@ void back_free(void)
 
 /*---------------------------------------------------------------------------*/
 
+static void jump_part_draw(GLfloat s, GLfloat a)
+{
+    glMatrixMode(GL_TEXTURE);
+    glTranslatef(s, 0.0f, 0.0f);
+    glMatrixMode(GL_MODELVIEW);
+
+    glRotatef(a, 0.0f, 1.0f, 0.0f);
+    sol_draw(&jump.draw, 1, 1);
+    glScalef(0.9f, 0.9f, 0.9f);
+}
+
+static void goal_part_draw(GLfloat s, GLfloat a)
+{
+    glMatrixMode(GL_TEXTURE);
+    glTranslatef(0.0f, -s, 0.0f);
+    glMatrixMode(GL_MODELVIEW);
+
+    glRotatef(a, 0.0f, 1.0f, 0.0f);
+    sol_draw(&goal.draw, 1, 1);
+    glScalef(0.75f, 1.1f, 0.9f);
+}
+
+/*---------------------------------------------------------------------------*/
+
 void goal_draw(void)
 {
+    const GLfloat t = SDL_GetTicks() * 0.001f;
+
     glPushMatrix();
     {
         glScalef(1.0f, 3.0f, 1.0f);
 
         glColor4f(1.0f, 1.0f, 0.0f, 0.5f);
         sol_draw(&beam.draw, 1, 1);
+
+        goal_part_draw(t * 0.1f, 20.0f);
+        goal_part_draw(t * 0.2f, 30.0f);
+        goal_part_draw(t * 0.3f, 70.0f);
+
+        glMatrixMode(GL_TEXTURE);
+        glLoadIdentity();
+        glMatrixMode(GL_MODELVIEW);
+
         glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
     glPopMatrix();
@@ -89,6 +130,8 @@ void goal_draw(void)
 
 void jump_draw(int highlight)
 {
+    const GLfloat t = SDL_GetTicks() * 0.001f;
+
     static GLfloat jump_colors[4][4] = {
         { 0.75f, 0.5f, 1.0f, 0.5f },
         { 0.75f, 0.5f, 1.0f, 0.8f },
@@ -96,10 +139,19 @@ void jump_draw(int highlight)
 
     glPushMatrix();
     {
-        glScalef(1.0f, 2.0f, 1.0f);
-
         glColor4fv(jump_colors[highlight]);
+
+        glScalef(1.0f, 2.0f, 1.0f);
         sol_draw(&beam.draw, 1, 1);
+
+        jump_part_draw(t * 0.1f, t * 360.0f);
+        jump_part_draw(t * 0.2f, t * 360.0f);
+        jump_part_draw(t * 0.3f, t * 360.0f);
+
+        glMatrixMode(GL_TEXTURE);
+        glLoadIdentity();
+        glMatrixMode(GL_MODELVIEW);
+
         glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
     glPopMatrix();

diff --git a/share/solid_draw.c b/share/solid_draw.c
index 5e68c3d..36aa218 100644 (file)
--- a/share/solid_draw.c
+++ b/share/solid_draw.c
@@ -202,21 +202,19 @@ static const struct d_mtrl *sol_apply_mtrl(const struct d_mtrl *mp_draw,
     if (tobyte(mp_base->h[0]) != tobyte(mq_base->h[0]))
         glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mp_base->h);
 
-    /* Enable ball shadow. */
+    /* Ball shadow. */
 
     if ((mp_base->fl & M_SHADOWED) && !(mq_base->fl & M_SHADOWED))
     {
         shad_draw_set();
     }
 
-    /* Disable ball shadow. */
-
     if (!(mp_base->fl & M_SHADOWED) && (mq_base->fl & M_SHADOWED))
     {
         shad_draw_clr();
     }
 
-    /* Enable environment mapping. */
+    /* Environment mapping. */
 
     if ((mp_base->fl & M_ENVIRONMENT) && !(mq_base->fl & M_ENVIRONMENT))
     {
@@ -227,25 +225,21 @@ static const struct d_mtrl *sol_apply_mtrl(const struct d_mtrl *mp_draw,
         glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
     }
 
-    /* Disable environment mapping. */
-
     if ((mq_base->fl & M_ENVIRONMENT) && !(mp_base->fl & M_ENVIRONMENT))
     {
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
     }
 
-    /* Enable additive blending. */
+    /* Additive blending. */
 
     if ((mp_base->fl & M_ADDITIVE) && !(mq_base->fl & M_ADDITIVE))
         glBlendFunc(GL_ONE, GL_ONE);
 
-    /* Enable standard blending. */
-
     if ((mq_base->fl & M_ADDITIVE) && !(mp_base->fl & M_ADDITIVE))
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-    /* Enable visibility-from-behind. */
+    /* Visibility-from-behind. */
 
     if ((mp_base->fl & M_TWO_SIDED) && !(mq_base->fl & M_TWO_SIDED))
     {
@@ -253,15 +247,13 @@ static const struct d_mtrl *sol_apply_mtrl(const struct d_mtrl *mp_draw,
         glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 1);
     }
 
-    /* Disable visibility-from-behind. */
-
     if ((mq_base->fl & M_TWO_SIDED) && !(mp_base->fl & M_TWO_SIDED))
     {
         glEnable(GL_CULL_FACE);
         glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
     }
 
-    /* Enable decal offset. */
+    /* Decal offset. */
 
     if ((mp_base->fl & M_DECAL) && !(mq_base->fl & M_DECAL))
     {
@@ -269,8 +261,6 @@ static const struct d_mtrl *sol_apply_mtrl(const struct d_mtrl *mp_draw,
         glPolygonOffset(-1.0f, -2.0f);
     }
 
-    /* Disable decal offset. */
-
     if ((mq_base->fl & M_DECAL) && !(mp_base->fl & M_DECAL))
         glDisable(GL_POLYGON_OFFSET_FILL);