Fixed flag SOL. The culprit was a lack of texture coords.

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

diff --git a/data/geom/flag/flag.obj b/data/geom/flag/flag.obj
index bd738a2..f9e76bc 100644 (file)
--- a/data/geom/flag/flag.obj
+++ b/data/geom/flag/flag.obj
@@ -51,6 +51,108 @@ v 4.7835429e-3 2.50335000 -1.1548494e-2
 v 8.8388348e-3 2.50335000 -8.8388348e-3\r
 v 1.1548494e-2 2.50335000 -4.7835429e-3\r
 v 0.81374768 2.75167500 -2.1684043e-19\r
+vt 0.0000000e+0 3.5125839e-5\r
+vt 2.9469936e-4 0.99993695\r
+vt 9.7432183e-4 2.8057961e-5\r
+vt 1.9486742e-3 2.3109579e-5\r
+vt 2.9229849e-3 1.8161670e-5\r
+vt 3.8971636e-3 0.0000000e+0\r
+vt 5.2035517e-3 1.00000000\r
+vt 6.7155612e-3 0.50006971\r
+vt 8.3413460e-3 0.50006923\r
+vt 9.9672776e-3 0.50005595\r
+vt 1.0113395e-2 0.99999645\r
+vt 1.1593168e-2 0.50004268\r
+vt 1.3219003e-2 0.50001661\r
+vt 1.5023197e-2 0.99999289\r
+vt 1.9933928e-2 1.00000000\r
+vt 1.9933928e-2 3.5125839e-5\r
+vt 2.0228628e-2 0.99993695\r
+vt 2.0908250e-2 2.8057961e-5\r
+vt 2.1882602e-2 2.3109579e-5\r
+vt 2.2856913e-2 1.8161670e-5\r
+vt 2.3831092e-2 0.0000000e+0\r
+vt 2.5137480e-2 1.00000000\r
+vt 2.6649490e-2 0.50006971\r
+vt 2.8275274e-2 0.50006923\r
+vt 2.9901206e-2 0.50005595\r
+vt 3.0047323e-2 0.99999645\r
+vt 3.1527096e-2 0.50004268\r
+vt 3.3152931e-2 0.50001661\r
+vt 3.4957125e-2 0.99999289\r
+vt 3.9867857e-2 3.5125839e-5\r
+vt 3.9867857e-2 1.00000000\r
+vt 4.0162556e-2 0.99993695\r
+vt 4.0842178e-2 2.8057961e-5\r
+vt 4.1816531e-2 2.3109579e-5\r
+vt 4.2790842e-2 1.8161670e-5\r
+vt 4.3765020e-2 0.0000000e+0\r
+vt 4.5071408e-2 1.00000000\r
+vt 4.6583418e-2 0.50006971\r
+vt 4.8209203e-2 0.50006923\r
+vt 4.9835134e-2 0.50005595\r
+vt 4.9981252e-2 0.99999645\r
+vt 5.1461024e-2 0.50004268\r
+vt 5.3086860e-2 0.50001661\r
+vt 5.4891053e-2 0.99999289\r
+vt 5.9801785e-2 0.49108183\r
+vt 5.9801785e-2 1.00000000\r
+vt 6.1104796e-2 3.0511289e-6\r
+vt 6.1597856e-2 0.98124397\r
+vt 6.2396127e-2 0.98124949\r
+vt 6.3016552e-2 2.1368669e-6\r
+vt 6.4307862e-2 0.98123786\r
+vt 6.4615121e-2 0.49110363\r
+vt 6.4619433e-2 0.49092702\r
+vt 6.4928317e-2 1.1898399e-6\r
+vt 6.6219572e-2 0.98122594\r
+vt 6.6840067e-2 0.0000000e+0\r
+vt 6.7017595e-2 0.98122168\r
+vt 6.8751758e-2 3.0511289e-6\r
+vt 6.9434428e-2 4.9461914e-3\r
+vt 6.9434428e-2 1.3678863e-2\r
+vt 6.9434428e-2 0.30800898\r
+vt 6.9434428e-2 0.49091130\r
+vt 6.9434428e-2 1.1785673e-2\r
+vt 6.9434428e-2 0.20989894\r
+vt 6.9810921e-2 6.8390404e-3\r
+vt 6.9810959e-2 3.0533500e-3\r
+vt 7.0883116e-2 8.4437276e-3\r
+vt 7.0883186e-2 1.4486844e-3\r
+vt 7.2487782e-2 9.5159538e-3\r
+vt 7.2487874e-2 3.7649046e-4\r
+vt 7.4380624e-2 9.8924824e-3\r
+vt 7.4380724e-2 0.0000000e+0\r
+vt 7.6273473e-2 9.5159902e-3\r
+vt 7.6273565e-2 3.7653025e-4\r
+vt 7.7878160e-2 8.4437949e-3\r
+vt 7.7878231e-2 1.4487579e-3\r
+vt 7.8950387e-2 6.8391284e-3\r
+vt 7.8950425e-2 3.0534460e-3\r
+vt 7.9309924e-2 4.9462908e-3\r
+vt 0.38637873 0.40611903\r
+vt 0.38637873 1.8617454e-2\r
+vt 0.38637873 0.11178890\r
+vt 0.38637873 0.20989894\r
+vt 0.38675466 1.6727537e-2\r
+vt 0.38675466 2.0507371e-2\r
+vt 0.38782521 1.5125343e-2\r
+vt 0.38782521 2.2109565e-2\r
+vt 0.38942741 1.4054791e-2\r
+vt 0.38942741 2.3180117e-2\r
+vt 0.39131732 1.3678863e-2\r
+vt 0.39131732 2.3556044e-2\r
+vt 0.39320724 1.4054791e-2\r
+vt 0.39320724 2.3180117e-2\r
+vt 0.39480943 1.5125343e-2\r
+vt 0.39480943 2.2109565e-2\r
+vt 0.39587999 1.6727537e-2\r
+vt 0.39587999 2.0507371e-2\r
+vt 0.39625591 1.8617454e-2\r
+vt 0.40085191 1.1785673e-2\r
+vt 0.40121099 9.8924824e-3\r
+vt 0.40121099 1.3678863e-2\r
+vt 0.41068323 4.9496270e-3\r
 vn 0.70710678 0.0000000e+0 0.70710678\r
 vn 0.38268343 0.0000000e+0 0.92387953\r
 vn 9.1972853e-17 0.0000000e+0 1.00000000\r
@@ -68,10 +170,10 @@ vn 0.0000000e+0 1.00000000 0.0000000e+0
 vn 0.29603158 0.95517815 -2.5370834e-15\r
 vn 0.29603158 0.95517815 -2.5370834e-15\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
-vn 0.83146961 0.0000000e+0 0.55557023\r
 vn 5.9629303e-3 0.0000000e+0 0.99998222\r
 vn 0.29551968 0.95352647 5.8782520e-2\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
+vn 0.83146961 0.0000000e+0 0.55557023\r
 vn 0.70710678 0.0000000e+0 0.70710678\r
 vn 0.70710678 0.0000000e+0 0.70710678\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
@@ -79,23 +181,23 @@ vn 0.0000000e+0 1.00000000 0.0000000e+0
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
 vn 0.70710678 0.0000000e+0 0.70710678\r
 vn 0.70710678 0.0000000e+0 0.70710678\r
-vn 0.38268343 0.0000000e+0 0.92387953\r
-vn 0.38268343 0.0000000e+0 0.92387953\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
+vn 0.38268343 0.0000000e+0 0.92387953\r
+vn 0.38268343 0.0000000e+0 0.92387953\r
+vn 7.7823184e-17 0.0000000e+0 1.00000000\r
 vn 7.7823184e-17 0.0000000e+0 1.00000000\r
-vn 8.4898018e-17 0.0000000e+0 1.00000000\r
 vn 0.0000000e+0 1.00000000 -6.3108872e-30\r
 vn 0.0000000e+0 1.00000000 -6.3108872e-30\r
 vn 0.0000000e+0 1.00000000 -6.3108872e-30\r
+vn 8.4898018e-17 0.0000000e+0 1.00000000\r
 vn 7.7823184e-17 0.0000000e+0 1.00000000\r
-vn 7.7823184e-17 0.0000000e+0 1.00000000\r
-vn -0.38268343 0.0000000e+0 0.92387953\r
-vn -0.38268343 0.0000000e+0 0.92387953\r
 vn 0.0000000e+0 1.00000000 2.6764936e-15\r
 vn 0.0000000e+0 1.00000000 2.6764936e-15\r
 vn 0.0000000e+0 1.00000000 2.6764936e-15\r
+vn -0.38268343 0.0000000e+0 0.92387953\r
+vn -0.38268343 0.0000000e+0 0.92387953\r
 vn -0.70710678 0.0000000e+0 0.70710678\r
 vn -0.70710678 0.0000000e+0 0.70710678\r
 vn 0.0000000e+0 1.00000000 -3.7851336e-15\r
@@ -103,20 +205,20 @@ vn 0.0000000e+0 1.00000000 -3.7851336e-15
 vn 0.0000000e+0 1.00000000 -3.7851336e-15\r
 vn -0.70710678 0.0000000e+0 0.70710678\r
 vn -0.70710678 0.0000000e+0 0.70710678\r
-vn -0.92387953 0.0000000e+0 0.38268343\r
-vn -0.92387953 0.0000000e+0 0.38268343\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
+vn -0.92387953 0.0000000e+0 0.38268343\r
+vn -0.92387953 0.0000000e+0 0.38268343\r
 vn -1.00000000 0.0000000e+0 -7.0748349e-18\r
-vn -1.00000000 0.0000000e+0 7.0748349e-18\r
+vn -1.00000000 0.0000000e+0 0.0000000e+0\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
+vn -1.00000000 0.0000000e+0 7.0748349e-18\r
 vn -1.00000000 0.0000000e+0 -7.0748349e-18\r
-vn -1.00000000 0.0000000e+0 0.0000000e+0\r
-vn -0.92387953 0.0000000e+0 -0.38268343\r
-vn -0.92387953 0.0000000e+0 -0.38268343\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
+vn -0.92387953 0.0000000e+0 -0.38268343\r
+vn -0.92387953 0.0000000e+0 -0.38268343\r
 vn -0.70710678 0.0000000e+0 -0.70710678\r
 vn -0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.0000000e+0 1.00000000 -1.6132136e-14\r
@@ -124,11 +226,11 @@ vn 0.0000000e+0 1.00000000 -1.6132136e-14
 vn 0.0000000e+0 1.00000000 -1.6132136e-14\r
 vn -0.70710678 0.0000000e+0 -0.70710678\r
 vn -0.70710678 0.0000000e+0 -0.70710678\r
-vn -0.38268343 0.0000000e+0 -0.92387953\r
-vn -0.38268343 0.0000000e+0 -0.92387953\r
 vn 0.0000000e+0 1.00000000 -3.7851336e-15\r
 vn 0.0000000e+0 1.00000000 -3.7851336e-15\r
 vn 0.0000000e+0 1.00000000 -3.7851336e-15\r
+vn -0.38268343 0.0000000e+0 -0.92387953\r
+vn -0.38268343 0.0000000e+0 -0.92387953\r
 vn -9.9047688e-17 0.0000000e+0 -1.00000000\r
 vn -9.9047688e-17 0.0000000e+0 -1.00000000\r
 vn 0.0000000e+0 1.00000000 -6.3108872e-30\r
@@ -136,11 +238,11 @@ vn 0.0000000e+0 1.00000000 -6.3108872e-30
 vn 0.0000000e+0 1.00000000 -6.3108872e-30\r
 vn -9.9047688e-17 0.0000000e+0 -1.00000000\r
 vn -9.9047688e-17 0.0000000e+0 -1.00000000\r
-vn 0.38268343 0.0000000e+0 -0.92387953\r
-vn 0.38268343 0.0000000e+0 -0.92387953\r
 vn 0.0000000e+0 1.00000000 9.6705086e-15\r
 vn 0.0000000e+0 1.00000000 9.6705086e-15\r
 vn 0.0000000e+0 1.00000000 9.6705086e-15\r
+vn 0.38268343 0.0000000e+0 -0.92387953\r
+vn 0.38268343 0.0000000e+0 -0.92387953\r
 vn 0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
@@ -149,11 +251,11 @@ vn 0.0000000e+0 1.00000000 0.0000000e+0
 vn 0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
-vn 0.83146961 0.0000000e+0 -0.55557023\r
 vn 0.29551968 0.95352647 -5.8782520e-2\r
 vn 5.9629303e-3 0.0000000e+0 -0.99998222\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 1.00000000 0.0000000e+0\r
+vn 0.83146961 0.0000000e+0 -0.55557023\r
 vn 1.00000000 0.0000000e+0 -2.0517021e-16\r
 vn 1.00000000 0.0000000e+0 -2.0517021e-16\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
@@ -161,11 +263,11 @@ vn 0.0000000e+0 -1.00000000 0.0000000e+0
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 1.00000000 0.0000000e+0 -2.0517021e-16\r
 vn 1.00000000 0.0000000e+0 -2.0517021e-16\r
-vn 0.92387953 0.0000000e+0 0.38268343\r
-vn 0.92387953 0.0000000e+0 0.38268343\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
+vn 0.92387953 0.0000000e+0 0.38268343\r
+vn 0.92387953 0.0000000e+0 0.38268343\r
 vn 0.70710678 0.0000000e+0 0.70710678\r
 vn 0.70710678 0.0000000e+0 0.70710678\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
@@ -174,19 +276,19 @@ vn 0.0000000e+0 -1.00000000 0.0000000e+0
 vn 0.70710678 0.0000000e+0 0.70710678\r
 vn 0.70710678 0.0000000e+0 0.70710678\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
+vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.38268343 0.0000000e+0 0.92387953\r
 vn 0.38268343 0.0000000e+0 0.92387953\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
-vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 2.1224505e-17 0.0000000e+0 1.00000000\r
-vn 3.5374174e-17 0.0000000e+0 1.00000000\r
 vn 2.8299339e-17 0.0000000e+0 1.00000000\r
 vn 2.1224505e-17 0.0000000e+0 1.00000000\r
+vn 3.5374174e-17 0.0000000e+0 1.00000000\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
-vn -0.38268343 0.0000000e+0 0.92387953\r
-vn -0.38268343 0.0000000e+0 0.92387953\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
+vn -0.38268343 0.0000000e+0 0.92387953\r
+vn -0.38268343 0.0000000e+0 0.92387953\r
 vn -0.70710678 0.0000000e+0 0.70710678\r
 vn -0.70710678 0.0000000e+0 0.70710678\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
@@ -194,11 +296,11 @@ vn 0.0000000e+0 -1.00000000 0.0000000e+0
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn -0.70710678 0.0000000e+0 0.70710678\r
 vn -0.70710678 0.0000000e+0 0.70710678\r
-vn -0.92387953 0.0000000e+0 0.38268343\r
-vn -0.92387953 0.0000000e+0 0.38268343\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
+vn -0.92387953 0.0000000e+0 0.38268343\r
+vn -0.92387953 0.0000000e+0 0.38268343\r
 vn -1.00000000 0.0000000e+0 0.0000000e+0\r
 vn -1.00000000 0.0000000e+0 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
@@ -206,11 +308,11 @@ vn 0.0000000e+0 -1.00000000 0.0000000e+0
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn -1.00000000 0.0000000e+0 0.0000000e+0\r
 vn -1.00000000 0.0000000e+0 0.0000000e+0\r
-vn -0.92387953 0.0000000e+0 -0.38268343\r
-vn -0.92387953 0.0000000e+0 -0.38268343\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
+vn -0.92387953 0.0000000e+0 -0.38268343\r
+vn -0.92387953 0.0000000e+0 -0.38268343\r
 vn -0.70710678 0.0000000e+0 -0.70710678\r
 vn -0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
@@ -218,20 +320,20 @@ vn 0.0000000e+0 -1.00000000 0.0000000e+0
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn -0.70710678 0.0000000e+0 -0.70710678\r
 vn -0.70710678 0.0000000e+0 -0.70710678\r
-vn -0.38268343 0.0000000e+0 -0.92387953\r
-vn -0.38268343 0.0000000e+0 -0.92387953\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
+vn -0.38268343 0.0000000e+0 -0.92387953\r
+vn -0.38268343 0.0000000e+0 -0.92387953\r
 vn -1.1319736e-16 0.0000000e+0 -1.00000000\r
 vn -1.2027219e-16 0.0000000e+0 -1.00000000\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
-vn -1.2027219e-16 0.0000000e+0 -1.00000000\r
 vn -1.1319736e-16 0.0000000e+0 -1.00000000\r
-vn 0.38268343 0.0000000e+0 -0.92387953\r
-vn 0.38268343 0.0000000e+0 -0.92387953\r
+vn -1.2027219e-16 0.0000000e+0 -1.00000000\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
+vn 0.38268343 0.0000000e+0 -0.92387953\r
+vn 0.38268343 0.0000000e+0 -0.92387953\r
 vn 0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
@@ -239,15 +341,15 @@ vn 0.0000000e+0 -1.00000000 0.0000000e+0
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.70710678 0.0000000e+0 -0.70710678\r
 vn 0.70710678 0.0000000e+0 -0.70710678\r
-vn 0.92387953 0.0000000e+0 -0.38268343\r
-vn 0.92387953 0.0000000e+0 -0.38268343\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
 vn 0.0000000e+0 -1.00000000 0.0000000e+0\r
-vn 0.29603158 -0.95517815 2.2069150e-15\r
+vn 0.92387953 0.0000000e+0 -0.38268343\r
+vn 0.92387953 0.0000000e+0 -0.38268343\r
 vn 0.29603158 -0.95517815 2.2069150e-15\r
 vn 1.00000000 0.0000000e+0 -2.2639472e-16\r
 vn 1.00000000 0.0000000e+0 -2.2639472e-16\r
+vn 0.29603158 -0.95517815 2.2069150e-15\r
 vn 0.89653751 0.0000000e+0 0.44296783\r
 vn 5.9629303e-3 0.0000000e+0 0.99998222\r
 vn 0.89653751 0.0000000e+0 0.44296783\r
@@ -273,102 +375,102 @@ vn 0.29603158 -0.95517815 2.2069150e-15
 g cylinder1_mtrl/red\r
 usemtl mtrl/red\r
 s 1\r
-f 16//101 49//218 48//210\r
-f 34//199 49//215 2//19\r
+f 16/80/100 49/61/218 48/83/210\r
+f 34/60/199 49/82/215 2/64/18\r
 s 2\r
-f 1//16 49//217 16//100\r
-f 2//20 49//216 1//15\r
-f 33//195 49//219 34//202\r
-f 48//206 49//214 33//194\r
+f 1/79/16 49/102/217 16/77/99\r
+f 2/78/19 49/102/216 1/79/15\r
+f 33/99/197 49/63/219 34/100/202\r
+f 48/101/206 49/63/214 33/99/194\r
 g cylinder1_mtrl/white\r
 usemtl mtrl/white\r
 s 1\r
-f 1//14 16//98 2//17\r
-f 2//21 16//103 3//25\r
-f 3//26 15//95 4//32\r
-f 4//33 14//90 5//37\r
-f 5//38 13//83 6//44\r
-f 6//45 12//78 7//49\r
-f 7//50 11//71 8//56\r
-f 8//57 10//66 9//60\r
-f 10//65 8//55 11//70\r
-f 11//69 7//48 12//77\r
-f 12//76 6//43 13//82\r
-f 13//81 5//36 14//89\r
-f 14//88 4//31 15//94\r
-f 15//93 3//24 16//102\r
-f 17//108 25//153 32//192\r
-f 18//115 24//147 17//106\r
-f 19//120 23//140 18//113\r
-f 20//126 22//135 19//118\r
-f 21//127 22//132 20//123\r
-f 23//139 19//119 22//136\r
-f 24//146 18//114 23//141\r
-f 25//152 17//107 24//148\r
-f 26//158 32//191 25//151\r
-f 27//163 31//184 26//159\r
-f 28//171 30//180 27//164\r
-f 29//174 30//179 28//170\r
-f 31//186 27//165 30//181\r
-f 32//193 26//160 31//185\r
+f 1/79/14 16/77/98 2/78/17\r
+f 2/78/20 16/77/102 3/76/25\r
+f 3/76/26 15/75/95 4/74/30\r
+f 4/74/31 14/73/88 5/72/37\r
+f 5/72/38 13/71/83 6/70/42\r
+f 6/70/43 12/69/76 7/68/49\r
+f 7/68/50 11/67/71 8/66/54\r
+f 8/66/55 10/65/64 9/59/60\r
+f 10/65/63 8/66/53 11/67/70\r
+f 11/67/69 7/68/48 12/69/75\r
+f 12/69/74 6/70/41 13/71/82\r
+f 13/71/81 5/72/36 14/73/87\r
+f 14/73/86 4/74/29 15/75/94\r
+f 15/75/93 3/76/24 16/77/101\r
+f 17/81/108 25/98/153 32/85/190\r
+f 18/84/113 24/96/145 17/81/106\r
+f 19/86/120 23/94/140 18/84/111\r
+f 20/88/124 22/92/133 19/86/118\r
+f 21/90/127 22/92/132 20/88/123\r
+f 23/94/139 19/86/119 22/92/134\r
+f 24/96/144 18/84/112 23/94/141\r
+f 25/98/152 17/81/107 24/96/146\r
+f 26/97/156 32/85/189 25/98/151\r
+f 27/95/163 31/87/184 26/97/157\r
+f 28/93/169 30/89/178 27/95/164\r
+f 29/91/174 30/89/177 28/93/168\r
+f 31/87/186 27/95/165 30/89/179\r
+f 32/85/191 26/97/158 31/87/185\r
 s 3\r
-f 3//23 34//198 2//18\r
-f 3//27 36//2 35//1\r
-f 4//30 36//2 3//22\r
-f 5//35 36//2 4//29\r
-f 5//39 38//4 37//3\r
-f 6//42 38//4 5//34\r
-f 7//47 38//4 6//41\r
-f 7//51 40//6 39//5\r
-f 8//54 40//6 7//46\r
-f 9//59 40//6 8//53\r
-f 9//61 42//8 41//7\r
-f 10//64 42//8 9//58\r
-f 11//68 42//8 10//63\r
-f 11//72 44//10 43//9\r
-f 12//75 44//10 11//67\r
-f 13//80 44//10 12//74\r
-f 13//84 46//12 45//11\r
-f 14//87 46//12 13//79\r
-f 15//92 46//12 14//86\r
-f 15//96 48//211 47//13\r
-f 16//99 48//207 15//91\r
-f 17//105 34//201 18//112\r
-f 17//110 48//212 33//197\r
-f 18//111 34//200 19//117\r
-f 19//121 34//204 35//1\r
-f 19//116 36//2 20//125\r
-f 20//124 36//2 21//129\r
-f 21//130 36//2 37//3\r
-f 21//128 38//4 22//134\r
-f 22//133 38//4 23//138\r
-f 23//142 38//4 39//5\r
-f 23//137 40//6 24//145\r
-f 24//144 40//6 25//150\r
-f 25//154 40//6 41//7\r
-f 25//149 42//8 26//157\r
-f 26//156 42//8 27//162\r
-f 27//166 42//8 43//9\r
-f 27//161 44//10 28//169\r
-f 28//168 44//10 29//173\r
-f 29//175 44//10 45//11\r
-f 29//172 46//12 30//178\r
-f 30//177 46//12 31//183\r
-f 31//187 46//12 47//13\r
-f 31//182 48//209 32//190\r
-f 32//189 48//208 17//104\r
-f 33//196 34//205 17//109\r
-f 35//1 34//203 3//28\r
-f 35//1 36//2 19//122\r
-f 37//3 36//2 5//40\r
-f 37//3 38//4 21//131\r
-f 39//5 38//4 7//52\r
-f 39//5 40//6 23//143\r
-f 41//7 40//6 9//62\r
-f 41//7 42//8 25//155\r
-f 43//9 42//8 11//73\r
-f 43//9 44//10 27//167\r
-f 45//11 44//10 13//85\r
-f 45//11 46//12 29//176\r
-f 47//13 46//12 15//97\r
-f 47//13 48//213 31//188\r
+f 3/52/27 34/49/205 2/45/21\r
+f 3/15/22 36/12/2 35/13/1\r
+f 4/14/33 36/12/2 3/15/28\r
+f 5/11/39 36/12/2 4/14/32\r
+f 5/11/34 38/9/4 37/10/3\r
+f 6/7/45 38/9/4 5/11/40\r
+f 7/2/51 38/9/4 6/7/44\r
+f 7/31/46 40/27/6 39/28/5\r
+f 8/29/57 40/27/6 7/31/52\r
+f 9/26/61 40/27/6 8/29/56\r
+f 9/26/58 42/24/8 41/25/7\r
+f 10/22/66 42/24/8 9/26/62\r
+f 11/17/72 42/24/8 10/22/65\r
+f 11/46/67 44/42/10 43/43/9\r
+f 12/44/78 44/42/10 11/46/73\r
+f 13/41/84 44/42/10 12/44/77\r
+f 13/41/79 46/39/12 45/40/11\r
+f 14/37/89 46/39/12 13/41/85\r
+f 15/32/97 46/39/12 14/37/90\r
+f 15/53/91 48/55/207 47/57/13\r
+f 16/62/103 48/55/211 15/53/96\r
+f 17/54/109 34/49/204 18/50/115\r
+f 17/54/104 48/55/208 33/51/195\r
+f 18/50/114 34/49/203 19/47/122\r
+f 19/47/117 34/49/200 35/48/1\r
+f 19/6/121 36/12/2 20/5/126\r
+f 20/5/125 36/12/2 21/4/131\r
+f 21/4/129 36/12/2 37/10/3\r
+f 21/4/130 38/9/4 22/3/136\r
+f 22/3/135 38/9/4 23/1/143\r
+f 23/1/138 38/9/4 39/8/5\r
+f 23/21/142 40/27/6 24/20/148\r
+f 24/20/147 40/27/6 25/19/155\r
+f 25/19/150 40/27/6 41/25/7\r
+f 25/19/154 42/24/8 26/18/160\r
+f 26/18/159 42/24/8 27/16/167\r
+f 27/16/162 42/24/8 43/23/9\r
+f 27/36/166 44/42/10 28/35/171\r
+f 28/35/170 44/42/10 29/34/176\r
+f 29/34/173 44/42/10 45/40/11\r
+f 29/34/175 46/39/12 30/33/181\r
+f 30/33/180 46/39/12 31/30/188\r
+f 31/30/183 46/39/12 47/38/13\r
+f 31/58/187 48/55/212 32/56/192\r
+f 32/56/193 48/55/213 17/54/110\r
+f 33/51/196 34/49/201 17/54/105\r
+f 35/48/1 34/49/198 3/52/23\r
+f 35/13/1 36/12/2 19/6/116\r
+f 37/10/3 36/12/2 5/11/35\r
+f 37/10/3 38/9/4 21/4/128\r
+f 39/8/5 38/9/4 7/2/47\r
+f 39/28/5 40/27/6 23/21/137\r
+f 41/25/7 40/27/6 9/26/59\r
+f 41/25/7 42/24/8 25/19/149\r
+f 43/23/9 42/24/8 11/17/68\r
+f 43/43/9 44/42/10 27/36/161\r
+f 45/40/11 44/42/10 13/41/80\r
+f 45/40/11 46/39/12 29/34/172\r
+f 47/38/13 46/39/12 15/32/92\r
+f 47/57/13 48/55/209 31/58/182\r

diff --git a/data/geom/flag/flag.wings b/data/geom/flag/flag.wings
index d330bd8..1c4ee23 100644 (file)
Binary files a/data/geom/flag/flag.wings and b/data/geom/flag/flag.wings differ

diff --git a/putt/game.c b/putt/game.c
index 728976a..9ea8b88 100644 (file)
--- a/putt/game.c
+++ b/putt/game.c
@@ -376,18 +376,15 @@ void game_draw(int pose, float t)
         glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION,  e);
         glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, h);
 
-        game_draw_goals(fp->base);
-
         glEnable(GL_COLOR_MATERIAL);
         glDisable(GL_LIGHTING);
-        glDisable(GL_TEXTURE_2D);
         glDepthMask(GL_FALSE);
         {
+            game_draw_goals(fp->base);
             game_draw_jumps(fp->base);
             game_draw_swchs(fp->vary);
         }
         glDepthMask(GL_TRUE);
-        glEnable(GL_TEXTURE_2D);
         glEnable(GL_LIGHTING);
         glDisable(GL_COLOR_MATERIAL);
     }

diff --git a/share/geom.c b/share/geom.c
index 3f07dc0..9c49787 100644 (file)
--- a/share/geom.c
+++ b/share/geom.c
@@ -101,6 +101,7 @@ void swch_draw(int b, int e)
 
 void flag_draw(void)
 {
+    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     sol_draw(&flag.draw, 1, 1);
 }