# Added command-line launching of mods.

Run with "-mod=official" for the default behaviour (same as specifying
nothing), and with "-mod=official -mod=antigravity -mod=starwars" to
load multiple mods (with the later-mentioned ones having a higher
priority than the earlier ones).
Added "_test.minimal" mod which can be used instead of "official" - it
provides just enough for the actor viewer to run, plus one unit skin.
Added test script for the COLLADA converter, which converts the models
and creates some actors in a "_test.collada" mod. Then the actor viewer
can be run with _test.minimal + _test.collada, to see if it's working
correctly.

This was SVN commit r4690.

binaries/data/mods/_test.minimal/fonts/console.fnt

@@ -0,0 +1,610 @@
+100
+256 256
+606
+20
+32 0 256 0 0 0 0 5
+33 250 154 3 11 1 11 4
+34 121 18 5 4 0 11 5
+35 80 214 12 11 0 11 12
+36 190 39 10 13 0 12 10
+37 204 11 15 11 0 11 15
+38 187 25 13 11 0 11 12
+39 253 188 3 4 0 11 3
+40 252 79 4 11 0 11 4
+41 251 67 5 11 0 11 5
+42 73 186 7 7 1 12 8
+43 48 138 9 9 2 9 13
+44 253 184 3 4 2 2 6
+45 20 226 4 2 1 5 6
+46 253 180 3 2 0 2 5
+47 146 89 6 13 -1 11 4
+48 154 73 10 11 0 11 10
+49 250 11 6 11 2 11 11
+50 164 73 10 11 0 11 10
+51 86 75 10 11 1 11 11
+52 174 75 10 11 0 11 10
+53 232 75 10 11 0 11 10
+54 12 77 10 11 0 11 10
+55 226 166 8 11 1 11 10
+56 72 77 10 11 0 11 10
+57 96 79 10 11 0 11 10
+58 32 224 3 8 1 8 5
+59 29 224 3 10 1 8 5
+60 74 138 9 9 2 9 13
+61 111 61 9 5 2 7 13
+62 84 138 9 9 2 9 13
+63 81 190 9 11 0 11 8
+64 0 14 16 14 0 11 16
+65 39 49 11 11 0 11 11
+66 204 79 10 11 1 11 11
+67 51 49 11 11 0 11 11
+68 63 49 11 11 1 11 12
+69 117 190 9 11 1 11 10
+70 122 162 8 11 1 11 10
+71 161 49 11 11 0 11 11
+72 173 49 11 11 1 11 12
+73 58 128 3 11 1 11 4
+74 145 188 9 11 0 11 9
+75 214 79 10 11 1 11 11
+76 13 186 9 11 1 11 10
+77 204 23 14 11 1 11 15
+78 97 51 11 11 1 11 12
+79 185 51 11 11 0 11 11
+80 242 79 10 11 1 11 11
+81 201 48 11 12 0 11 11
+82 0 81 10 11 1 11 11
+83 241 51 11 11 0 11 11
+84 23 186 9 11 0 11 9
+85 75 53 11 11 0 11 11
+86 184 83 10 11 0 11 10
+87 126 11 16 11 0 11 16
+88 122 214 12 11 -1 11 10
+89 109 55 11 11 -1 11 9
+90 170 156 8 11 1 11 10
+91 185 107 5 11 0 11 5
+92 114 99 6 13 -1 11 4
+93 191 107 5 11 0 11 5
+94 150 124 10 4 3 11 16
+95 12 242 8 2 0 -3 8
+96 12 49 3 3 2 11 8
+97 145 132 9 8 0 8 9
+98 33 186 9 11 0 11 9
+99 155 132 9 8 0 8 9
+100 43 186 9 11 0 11 9
+101 165 132 9 8 0 8 9
+102 197 107 5 11 0 11 5
+103 53 186 9 11 0 8 9
+104 178 156 8 11 0 11 8
+105 62 128 3 11 0 11 3
+106 230 192 4 14 0 11 4
+107 227 142 7 11 0 11 7
+108 84 128 3 11 0 11 3
+109 157 200 13 8 1 8 14
+110 224 76 8 8 0 8 8
+111 175 132 9 8 0 8 9
+112 63 186 9 11 0 8 9
+113 91 186 9 11 0 8 9
+114 74 106 8 8 0 8 7
+115 185 132 9 8 0 8 9
+116 57 138 7 10 0 10 7
+117 136 106 8 8 0 8 8
+118 144 106 8 8 0 8 7
+119 60 94 12 8 0 8 12
+120 222 106 8 8 0 8 8
+121 101 186 9 11 -1 8 7
+122 146 114 6 8 1 8 8
+123 142 76 6 14 1 11 8
+124 252 55 3 15 3 11 9
+125 148 76 6 14 1 11 8
+126 160 124 10 4 1 7 12
+160 0 256 0 0 0 0 11
+161 88 128 3 11 1 11 4
+162 127 186 9 11 1 9 11
+163 194 83 10 11 1 11 11
+164 235 132 9 8 0 10 10
+165 213 55 11 11 -1 11 9
+166 250 192 3 14 3 11 9
+167 1 184 9 11 0 11 9
+168 121 24 5 2 1 11 7
+169 97 27 13 11 0 11 13
+170 103 174 7 7 0 11 7
+171 40 115 7 5 0 7 8
+172 134 136 11 5 2 7 14
+173 128 202 4 2 1 5 6
+174 29 35 13 11 0 11 13
+175 0 186 4 2 2 11 8
+176 238 108 6 6 0 11 5
+177 102 138 9 9 2 8 13
+178 10 108 8 8 0 11 8
+179 176 116 7 8 0 11 7
+180 200 17 4 3 2 11 8
+181 22 85 10 11 -1 8 9
+182 186 156 8 11 0 11 8
+183 207 168 3 2 1 7 5
+184 28 19 5 5 2 0 8
+185 125 150 5 7 1 11 8
+186 171 124 7 7 0 11 7
+187 55 115 7 5 0 7 8
+188 220 11 15 11 1 11 16
+189 142 11 16 11 1 11 17
+190 158 11 16 11 0 11 16
+191 155 184 9 11 0 11 9
+192 139 256 11 15 0 15 11
+193 151 256 11 15 0 15 11
+194 163 256 11 15 0 15 11
+195 113 240 11 14 0 14 11
+196 137 240 11 14 0 14 11
+197 112 256 12 15 0 15 12
+198 52 256 17 11 -2 11 15
+199 175 256 11 15 0 11 11
+200 246 27 9 15 1 15 10
+201 88 29 9 15 1 15 10
+202 112 29 9 15 1 15 10
+203 216 226 9 14 1 14 10
+204 8 200 4 15 0 15 4
+205 112 200 4 15 1 15 4
+206 15 53 5 15 0 15 4
+207 48 242 5 14 -1 14 3
+208 0 212 12 11 0 11 12
+209 149 240 11 14 1 14 12
+210 187 256 11 15 0 15 11
+211 199 256 11 15 0 15 11
+212 211 256 11 15 0 15 11
+213 161 240 11 14 0 14 11
+214 173 240 11 14 0 14 11
+215 112 138 9 9 2 9 13
+216 136 226 11 13 0 12 11
+217 223 256 11 15 0 15 11
+218 235 256 11 15 0 15 11
+219 53 244 11 15 0 15 11
+220 185 240 11 14 0 14 11
+221 65 244 11 15 -1 15 9
+222 32 85 10 11 1 11 11
+223 194 156 8 11 0 11 8
+224 165 180 9 11 0 11 9
+225 175 180 9 11 0 11 9
+226 185 180 9 11 0 11 9
+227 195 180 9 11 0 11 9
+228 205 180 9 11 0 11 9
+229 103 224 9 12 0 12 9
+230 212 44 14 8 0 8 14
+231 13 198 9 12 0 8 9
+232 235 180 9 11 0 11 9
+233 73 178 9 11 0 11 9
+234 111 178 9 11 0 11 9
+235 215 178 9 11 0 11 9
+236 56 109 4 11 -1 11 3
+237 70 109 4 11 0 11 3
+238 20 109 5 11 -1 11 3
+239 26 109 5 11 -1 11 3
+240 93 198 9 12 0 12 9
+241 234 156 8 11 0 11 8
+242 225 178 9 11 0 11 9
+243 245 178 9 11 0 11 9
+244 137 176 9 11 0 11 9
+245 11 174 9 11 0 11 9
+246 21 174 9 11 0 11 9
+247 184 71 9 7 2 8 13
+248 243 142 9 10 0 9 9
+249 70 154 8 11 0 11 8
+250 100 154 8 11 0 11 8
+251 202 154 8 11 0 11 8
+252 210 154 8 11 0 11 8
+253 226 226 9 14 -1 11 7
+254 236 226 9 14 0 11 9
+255 0 200 8 14 0 11 8
+884 121 22 5 4 0 11 5
+885 241 28 5 4 0 2 5
+890 200 21 4 3 1 0 5
+894 253 200 3 11 1 8 4
+900 12 53 3 3 1 11 4
+901 94 228 7 3 -1 11 5
+902 104 212 12 11 -1 11 10
+903 211 168 3 2 1 6 5
+904 225 55 11 11 -1 11 11
+905 134 212 12 11 -1 11 11
+906 32 109 5 11 -1 11 5
+908 122 35 13 11 -1 11 12
+910 136 35 13 11 -1 11 12
+911 150 35 13 11 -1 11 12
+912 9 138 7 11 -2 11 3
+913 146 212 12 11 -1 11 10
+914 42 85 10 11 0 11 10
+915 218 154 8 11 1 11 9
+916 1 57 11 11 0 11 11
+917 52 85 10 11 1 11 11
+918 31 174 9 11 0 11 10
+919 62 85 10 11 1 11 11
+920 158 212 12 11 0 11 12
+921 253 154 3 11 1 11 5
+922 106 85 10 11 0 11 10
+923 197 59 11 11 0 11 10
+924 170 212 12 11 0 11 12
+925 116 85 10 11 1 11 11
+926 226 154 8 11 1 11 10
+927 182 212 12 11 0 11 12
+928 154 85 10 11 1 11 11
+929 164 85 10 11 0 11 10
+931 242 154 8 11 1 11 10
+932 41 174 9 11 0 11 9
+933 27 61 11 11 0 11 11
+934 48 26 13 12 0 11 13
+935 194 212 12 11 -1 11 10
+936 200 35 13 11 0 11 13
+937 206 212 12 11 0 11 12
+938 120 99 6 13 -1 13 4
+939 58 228 12 13 -1 13 10
+940 82 87 10 11 0 11 10
+941 17 138 7 11 0 11 7
+942 24 200 8 14 0 11 8
+943 113 128 3 11 0 11 3
+944 130 152 8 11 0 11 8
+945 244 100 10 8 0 8 10
+946 246 226 9 14 0 11 9
+947 51 174 9 11 0 8 8
+948 61 174 9 11 0 11 9
+949 184 116 7 8 0 8 7
+950 32 200 8 14 0 11 7
+951 10 150 8 11 0 8 8
+952 83 174 9 11 0 11 9
+953 10 184 3 8 0 8 3
+954 82 108 8 8 0 8 8
+955 18 150 8 11 0 11 8
+956 26 150 8 11 0 8 8
+957 114 108 8 8 0 8 8
+958 40 200 8 14 0 11 7
+959 245 132 9 8 0 8 9
+960 0 102 10 8 -1 8 9
+961 93 174 9 11 0 8 9
+962 34 150 8 11 0 8 8
+963 224 97 10 9 0 9 10
+964 66 118 6 8 0 8 6
+965 202 108 8 8 0 8 8
+966 39 61 11 11 0 8 11
+967 121 174 9 11 0 8 8
+968 51 61 11 11 0 8 11
+969 171 200 13 8 0 8 13
+970 38 109 5 11 -1 11 3
+971 42 150 8 11 0 11 8
+972 1 172 9 11 0 11 9
+973 50 150 8 11 0 11 8
+974 214 35 13 11 0 11 13
+976 147 172 9 11 0 11 9
+977 126 87 10 11 0 11 10
+978 63 61 11 11 0 11 10
+979 228 35 13 11 -1 11 11
+980 147 226 11 13 -1 13 10
+981 197 240 11 14 0 11 11
+982 185 200 13 8 0 8 13
+986 209 240 11 14 0 11 11
+988 48 200 8 14 1 11 9
+990 20 224 9 14 0 11 9
+992 121 61 11 11 0 11 11
+994 98 15 13 15 1 11 14
+995 61 26 13 12 0 8 13
+996 146 200 10 12 0 12 10
+997 169 192 9 12 0 9 9
+998 246 256 10 15 1 11 11
+999 0 136 9 9 0 9 9
+1000 157 168 9 11 0 11 9
+1001 58 150 8 11 0 8 8
+1002 136 87 10 11 0 11 10
+1003 60 102 10 8 0 8 9
+1004 179 192 9 12 0 12 9
+1005 10 99 10 9 0 9 10
+1006 174 87 10 11 0 11 9
+1007 234 192 8 12 -1 9 6
+1008 94 102 10 8 0 8 10
+1009 189 192 9 12 0 8 9
+1010 244 108 8 8 0 8 8
+1011 219 192 5 14 -2 11 3
+1025 110 43 10 13 1 13 11
+1026 1 37 13 11 0 11 13
+1027 134 75 8 13 1 13 9
+1028 133 61 11 11 0 11 11
+1029 224 87 10 11 0 11 10
+1030 117 128 3 11 1 11 5
+1031 152 99 6 13 -1 13 4
+1032 78 150 8 11 0 11 8
+1033 32 11 18 11 -1 11 17
+1034 174 11 16 11 1 11 17
+1035 15 37 13 11 0 11 13
+1036 136 200 9 13 1 13 10
+1038 221 240 11 14 0 14 10
+1039 0 226 10 14 1 11 11
+1040 218 212 12 11 -1 11 10
+1041 10 89 10 11 1 11 11
+1042 72 89 10 11 0 11 10
+1043 86 150 8 11 1 11 9
+1044 36 242 12 14 -1 11 11
+1045 92 91 10 11 1 11 11
+1046 235 11 15 11 0 11 15
+1047 204 91 10 11 0 11 10
+1048 214 91 10 11 1 11 11
+1049 28 49 10 13 1 13 11
+1050 167 168 9 11 1 11 10
+1051 145 61 11 11 -1 11 10
+1052 230 212 12 11 0 11 12
+1053 234 91 10 11 1 11 11
+1054 242 212 12 11 0 11 12
+1055 244 91 10 11 1 11 11
+1056 0 93 10 11 0 11 10
+1057 157 61 11 11 0 11 11
+1058 177 168 9 11 0 11 9
+1059 169 61 11 11 0 11 10
+1060 12 210 12 11 0 11 12
+1061 92 210 12 11 -1 11 10
+1062 88 242 12 14 1 11 13
+1063 184 95 10 11 0 11 10
+1064 43 37 13 11 1 11 14
+1065 51 14 15 14 1 11 16
+1066 57 37 13 11 0 11 13
+1067 71 37 13 11 1 11 14
+1068 194 95 10 11 1 11 11
+1069 87 63 11 11 0 11 11
+1070 33 23 15 11 1 11 16
+1071 80 202 12 11 -1 11 11
+1072 65 130 9 8 0 8 9
+1073 187 168 9 11 0 11 9
+1074 0 110 8 8 0 8 8
+1075 92 118 6 8 0 8 6
+1076 86 52 10 10 -1 8 9
+1077 93 130 9 8 0 8 9
+1078 158 94 11 8 0 8 11
+1079 192 116 7 8 0 8 7
+1080 60 110 8 8 0 8 8
+1081 108 150 8 11 0 11 8
+1082 200 116 7 8 0 8 7
+1083 121 130 9 8 0 8 9
+1084 104 102 10 8 0 8 10
+1085 90 110 8 8 0 8 8
+1086 131 130 9 8 0 8 9
+1087 98 110 8 8 0 8 8
+1088 197 168 9 11 0 8 9
+1089 106 110 8 8 0 8 8
+1090 238 116 7 8 0 8 7
+1091 116 150 8 11 0 8 8
+1092 191 14 13 14 0 11 13
+1093 152 110 8 8 0 8 8
+1094 235 168 9 11 0 8 9
+1095 160 110 8 8 0 8 8
+1096 198 200 13 8 0 8 13
+1097 163 37 13 11 0 8 13
+1098 158 102 10 8 0 8 10
+1099 127 96 11 8 0 8 11
+1100 230 110 8 8 0 8 8
+1101 246 116 7 8 0 8 8
+1102 102 94 12 8 0 8 12
+1103 122 112 8 8 0 8 8
+1105 71 166 9 11 0 11 9
+1106 94 224 9 14 0 11 9
+1107 216 103 6 11 0 11 6
+1108 0 118 7 8 1 8 8
+1109 168 112 8 8 0 8 8
+1110 41 126 3 11 0 11 3
+1111 44 109 5 11 -1 11 4
+1112 224 192 5 14 -2 11 3
+1113 226 44 14 8 0 8 14
+1114 212 200 13 8 0 8 13
+1115 103 166 9 11 0 11 9
+1116 25 138 7 11 0 11 7
+1118 56 200 8 14 0 11 8
+1119 0 148 8 11 0 8 8
+1120 127 23 15 11 0 11 15
+1121 226 200 13 8 0 8 13
+1122 181 63 11 11 0 11 11
+1123 207 166 9 11 0 11 9
+1124 218 23 14 11 1 11 15
+1125 170 96 11 8 0 8 11
+1126 237 63 11 11 0 11 11
+1127 72 98 11 8 -1 8 9
+1128 232 23 14 11 1 11 15
+1129 240 200 13 8 0 8 12
+1130 13 65 11 11 -1 11 9
+1131 138 98 11 8 -1 8 9
+1132 143 23 15 11 1 11 15
+1133 156 192 13 8 0 8 12
+1134 102 256 10 17 0 14 10
+1135 64 200 8 14 0 11 8
+1136 177 37 13 11 0 11 13
+1137 75 65 11 11 0 8 11
+1138 99 67 11 11 1 11 13
+1139 210 112 8 8 1 8 10
+1140 209 67 11 11 0 11 11
+1141 74 114 8 8 0 8 8
+1142 232 240 11 14 0 14 11
+1143 138 148 8 11 0 11 8
+1144 0 256 20 14 0 11 20
+1145 70 256 17 11 0 8 17
+1146 84 42 12 12 0 11 12
+1147 195 130 9 8 0 8 9
+1148 20 256 15 15 0 15 15
+1149 75 26 13 12 0 12 13
+1150 67 14 15 14 0 14 15
+1151 97 39 13 11 0 11 13
+1152 158 226 11 13 0 11 11
+1153 136 186 9 10 0 8 9
+1154 20 97 10 11 0 11 11
+1155 110 184 7 3 -1 12 5
+1156 146 176 6 3 0 12 6
+1157 82 178 7 3 -1 12 6
+1158 120 178 7 3 0 12 6
+1168 20 52 7 14 1 14 7
+1169 178 107 6 11 0 11 5
+1170 217 166 9 11 0 11 9
+1171 98 118 6 8 0 8 6
+1172 10 226 10 14 1 11 11
+1173 72 200 8 14 0 11 8
+1174 16 14 16 14 0 11 15
+1175 116 202 12 11 0 8 11
+1176 30 214 9 14 0 11 9
+1177 33 138 7 11 0 8 7
+1178 40 214 9 14 1 11 9
+1179 146 144 8 11 0 8 7
+1180 245 166 9 11 1 11 10
+1181 16 118 7 8 0 8 7
+1182 30 97 10 11 0 11 10
+1183 24 118 7 8 0 8 7
+1184 242 39 13 11 -1 11 12
+1185 126 104 10 8 0 8 9
+1186 244 240 11 14 1 11 12
+1187 131 164 9 11 0 8 9
+1188 0 25 14 11 1 11 15
+1189 168 104 10 8 0 8 10
+1190 76 244 11 15 1 11 12
+1191 199 192 9 12 0 8 9
+1192 124 242 12 14 0 11 12
+1193 11 162 9 11 0 8 9
+1194 101 238 11 14 0 11 11
+1195 21 162 9 11 0 8 9
+1196 50 214 9 14 0 11 9
+1197 41 138 7 11 0 8 7
+1198 221 67 11 11 0 11 11
+1199 31 162 9 11 0 8 8
+1200 1 69 11 11 0 11 10
+1201 41 162 9 11 -1 8 7
+1202 12 240 12 14 -1 11 10
+1203 51 162 9 11 0 8 8
+1204 83 14 15 14 0 11 15
+1205 193 71 11 11 0 8 11
+1206 35 228 11 14 0 11 10
+1207 61 162 9 11 0 8 8
+1208 40 97 10 11 0 11 10
+1209 130 114 8 8 0 8 8
+1210 50 97 10 11 1 11 11
+1211 154 144 8 11 0 11 8
+1212 14 25 14 11 -1 11 13
+1213 83 100 11 8 -1 8 10
+1214 112 14 14 14 -1 11 13
+1215 25 73 11 11 -1 8 10
+1216 45 126 3 11 1 11 5
+1217 87 256 15 13 0 13 15
+1218 37 73 11 11 0 11 11
+1219 24 240 10 15 1 11 10
+1220 242 192 8 12 0 8 7
+1223 0 242 11 15 1 11 12
+1224 209 192 9 12 0 8 9
+1227 112 226 10 14 0 11 10
+1228 162 144 8 11 0 8 8
+1232 70 228 12 13 -1 13 10
+1233 81 162 9 11 0 11 9
+1234 82 228 12 13 -1 13 10
+1235 170 144 8 11 0 11 9
+1236 158 23 15 11 0 11 16
+1237 0 46 14 8 0 8 15
+1238 60 214 9 14 1 14 11
+1239 91 162 9 11 0 11 9
+1240 49 73 11 11 0 11 11
+1241 205 130 9 8 0 8 9
+1242 169 226 11 13 0 13 11
+1243 113 162 9 11 0 11 9
+1244 36 256 16 13 -1 13 14
+1245 61 73 11 11 0 11 11
+1246 120 49 10 13 0 13 10
+1247 178 144 8 11 0 11 8
+1248 1 160 9 11 0 11 9
+1249 186 144 8 11 0 8 8
+1250 130 49 10 13 1 13 11
+1251 194 144 8 11 0 11 8
+1252 140 49 10 13 1 13 11
+1253 234 144 8 11 0 11 9
+1254 124 228 12 13 0 13 12
+1255 141 160 9 11 0 11 9
+1256 111 73 11 11 1 11 13
+1257 138 114 8 8 1 8 10
+1258 181 226 11 13 1 13 13
+1259 66 142 8 11 1 11 10
+1262 193 226 11 13 0 13 10
+1263 70 214 9 14 0 11 8
+1264 205 226 11 13 0 13 11
+1265 104 200 8 14 0 11 8
+1266 46 228 11 14 0 14 10
+1267 128 200 8 14 0 11 8
+1268 150 49 10 13 0 13 10
+1269 94 142 8 11 0 11 8
+1272 173 25 13 13 1 13 14
+1273 123 73 11 11 0 11 11
+1425 43 26 5 2 1 -1 7
+1426 12 212 6 2 0 10 6
+1427 34 240 2 5 2 12 6
+1428 24 55 3 3 2 11 6
+1429 84 29 4 3 1 11 6
+1430 131 166 3 2 1 -1 5
+1431 48 14 2 2 2 10 6
+1432 28 23 5 3 1 10 6
+1433 243 68 5 4 -1 11 6
+1434 90 190 3 4 3 0 6
+1435 4 186 4 2 1 -1 6
+1436 152 176 3 4 1 11 5
+1437 162 172 3 4 3 11 6
+1438 196 43 5 3 1 11 6
+1439 99 56 7 4 -1 11 5
+1440 164 184 4 4 3 11 6
+1441 196 47 5 3 0 11 6
+1443 110 180 4 2 1 -1 6
+1444 80 166 3 4 1 0 6
+1445 186 14 5 2 1 -1 7
+1446 156 172 6 3 0 0 6
+1447 208 55 4 3 1 0 6
+1448 83 92 5 4 1 11 7
+1449 140 164 4 4 -1 11 6
+1450 164 26 5 2 1 -1 7
+1451 109 154 3 4 1 12 6
+1452 214 180 4 2 1 11 6
+1453 203 156 3 2 3 -1 6
+1454 236 47 5 3 -1 10 6
+1455 192 59 4 3 1 10 6
+1456 106 55 3 3 2 0 6
+1457 112 166 6 3 0 0 6
+1458 208 51 5 3 0 0 5
+1459 236 51 5 3 0 0 5
+1460 67 150 3 2 2 -1 6
+1461 244 180 4 2 1 -1 6
+1462 232 59 4 3 1 0 6
+1463 67 148 3 2 1 -1 5
+1464 147 148 3 2 1 -1 5
+1465 67 146 3 2 2 10 6
+1467 192 55 5 3 0 0 6
+1468 147 146 3 2 2 5 6
+1469 67 144 3 2 2 -1 7
+1470 38 38 5 2 0 8 5
+1471 75 142 3 2 1 10 5
+1472 117 212 3 10 0 9 3
+1473 103 142 3 2 2 10 6
+1474 125 142 3 2 2 10 6
+1475 70 174 3 8 0 8 3
+1476 253 142 3 2 2 10 6
+1488 215 130 9 8 0 8 9
+1489 218 114 8 8 1 8 9
+1490 32 118 7 8 0 8 7
+1491 48 118 7 8 0 8 7
+1492 225 130 9 8 0 8 9
+1493 130 174 5 8 0 8 5
+1494 24 210 5 9 0 9 5
+1495 49 128 9 8 0 8 9
+1496 75 128 9 8 0 8 9
+1497 211 104 5 4 0 8 5
+1498 202 142 8 11 0 8 8
+1499 8 116 8 8 0 8 8
+1500 210 142 8 11 0 11 8
+1501 103 128 9 8 0 8 9
+1502 1 126 9 8 0 8 9
+1503 50 109 5 11 0 8 5
+1504 94 150 5 8 0 8 5
+1505 11 126 9 8 0 8 9
+1506 124 140 9 10 0 8 9
+1507 151 156 9 11 0 8 9
+1508 21 126 9 8 0 8 9
+1509 218 142 8 11 0 8 8
+1510 82 116 8 8 0 8 8
+1511 161 156 9 11 0 8 9
+1512 114 116 8 8 0 8 8
+1513 204 100 11 8 0 8 11
+1514 234 101 10 9 0 8 10
+1520 31 126 9 8 0 8 9
+1521 141 124 9 8 0 8 9
+1522 75 42 9 4 0 8 9
+1523 150 160 4 4 0 10 3
+1524 235 80 7 4 0 10 6
+65075 248 67 3 15 -1 13 16
+65533 124 256 14 13 1 12 16

binaries/data/mods/_test.minimal/shaders/globallight.vs

@@ -0,0 +1,11 @@
+uniform vec3 ambient;
+uniform vec3 sunDir;
+uniform vec3 sunColor;
+
+vec3 lighting(vec3 normal)
+{
+	vec3 color = ambient;
+	float d = max(0.0, -dot(normal, sunDir));
+	color += d * sunColor;
+	return color;
+}

binaries/data/mods/_test.minimal/shaders/instancing.vs

@@ -0,0 +1,10 @@
+vec4 InstancingPosition(vec4 position);
+
+void main()
+{
+	vec4 worldPos = InstancingPosition(gl_Vertex);	
+
+	gl_FrontColor = gl_Color;
+	gl_TexCoord[0] = gl_MultiTexCoord0;
+	gl_Position = gl_ModelViewProjectionMatrix * worldPos;
+}

binaries/data/mods/_test.minimal/shaders/instancing.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Program>
+	<Shaders>
+		<Shader type="VERTEX_SHADER">shaders/instancing.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/instancing_base.vs</Shader>
+	</Shaders>
+</Program>

binaries/data/mods/_test.minimal/shaders/instancing_base.vs

@@ -0,0 +1,29 @@
+
+// 3x4 part of the model-to-world matrix
+attribute vec4 Instancing1;
+attribute vec4 Instancing2;
+attribute vec4 Instancing3;
+
+// Calculate a normal that has been transformed for instancing
+vec3 InstancingNormal(vec3 normal)
+{
+	vec3 tmp;
+
+	tmp.x = dot(vec3(Instancing1), normal);
+	tmp.y = dot(vec3(Instancing2), normal);
+	tmp.z = dot(vec3(Instancing3), normal);
+	
+	return tmp;
+}
+
+// Calculate position, transformed for instancing
+vec4 InstancingPosition(vec4 position)
+{
+	vec3 tmp;
+
+	tmp.x = dot(Instancing1, position);
+	tmp.y = dot(Instancing2, position);
+	tmp.z = dot(Instancing3, position);
+	
+	return vec4(tmp, 1.0);
+}

binaries/data/mods/_test.minimal/shaders/instancing_light.vs

@@ -0,0 +1,14 @@
+vec3 lighting(vec3 normal);
+
+vec3 InstancingNormal(vec3 normal);
+vec4 InstancingPosition(vec4 position);
+
+void main()
+{
+	vec3 normal = InstancingNormal(gl_Normal);
+	vec4 worldPos = InstancingPosition(gl_Vertex);	
+
+	gl_FrontColor = vec4(lighting(normal),1.0) * gl_Color;
+	gl_TexCoord[0] = gl_MultiTexCoord0;
+	gl_Position = gl_ModelViewProjectionMatrix * worldPos;
+}

binaries/data/mods/_test.minimal/shaders/instancing_light.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Program>
+	<Shaders>
+		<Shader type="VERTEX_SHADER">shaders/instancing_light.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/instancing_base.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/globallight.vs</Shader>
+	</Shaders>
+</Program>

binaries/data/mods/_test.minimal/shaders/instancing_lightp.vs

@@ -0,0 +1,17 @@
+vec3 lighting(vec3 normal);
+
+vec3 InstancingNormal(vec3 normal);
+vec4 InstancingPosition(vec4 position);
+
+vec4 postouv1(vec4 pos);
+
+void main()
+{
+	vec3 normal = InstancingNormal(gl_Normal);
+	vec4 worldPos = InstancingPosition(gl_Vertex);
+
+	gl_FrontColor = vec4(lighting(normal),1.0) * gl_Color;
+	gl_TexCoord[0] = gl_MultiTexCoord0;
+	gl_TexCoord[1] = postouv1(worldPos);
+	gl_Position = gl_ModelViewProjectionMatrix * worldPos;
+}

binaries/data/mods/_test.minimal/shaders/instancing_lightp.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Program>
+	<Shaders>
+		<Shader type="VERTEX_SHADER">shaders/instancing_lightp.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/instancing_base.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/globallight.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/postouv1.vs</Shader>
+	</Shaders>
+</Program>

binaries/data/mods/_test.minimal/shaders/instancingp.vs

@@ -0,0 +1,12 @@
+vec4 InstancingPosition(vec4 position);
+vec4 postouv1(vec4 pos);
+
+void main()
+{
+	vec4 worldPos = InstancingPosition(gl_Vertex);
+
+	gl_FrontColor = gl_Color;
+	gl_TexCoord[0] = gl_MultiTexCoord0;
+	gl_TexCoord[1] = postouv1(worldPos);
+	gl_Position = gl_ModelViewProjectionMatrix * worldPos;
+}

binaries/data/mods/_test.minimal/shaders/instancingp.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Program>
+	<Shaders>
+		<Shader type="VERTEX_SHADER">shaders/instancingp.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/instancing_base.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/postouv1.vs</Shader>
+	</Shaders>
+</Program>

binaries/data/mods/_test.minimal/shaders/model_light.vs

@@ -0,0 +1,8 @@
+vec3 lighting(vec3 normal);
+
+void main()
+{
+	gl_FrontColor = vec4(lighting(gl_Normal),1.0) * gl_Color;
+	gl_TexCoord[0] = gl_MultiTexCoord0;
+	gl_Position = ftransform();
+}

binaries/data/mods/_test.minimal/shaders/model_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Program>
+	<Shaders>
+		<Shader type="VERTEX_SHADER">shaders/model_light.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/globallight.vs</Shader>
+	</Shaders>
+</Program>

binaries/data/mods/_test.minimal/shaders/model_lightp.vs

@@ -0,0 +1,10 @@
+vec3 lighting(vec3 normal);
+vec4 postouv1(vec4 pos);
+
+void main()
+{
+	gl_FrontColor = vec4(lighting(gl_Normal),1.0) * gl_Color;
+	gl_TexCoord[0] = gl_MultiTexCoord0;
+	gl_TexCoord[1] = postouv1(gl_Vertex);
+	gl_Position = ftransform();
+}

binaries/data/mods/_test.minimal/shaders/model_lightp.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Program>
+	<Shaders>
+		<Shader type="VERTEX_SHADER">shaders/model_lightp.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/globallight.vs</Shader>
+		<Shader type="VERTEX_SHADER">shaders/postouv1.vs</Shader>
+	</Shaders>
+</Program>

binaries/data/mods/_test.minimal/shaders/postouv1.vs

@@ -0,0 +1,14 @@
+uniform vec4 TextureMatrix1;
+uniform vec4 TextureMatrix2;
+uniform vec4 TextureMatrix3;
+
+vec4 postouv1(vec4 pos)
+{
+	vec3 tmp;
+
+	tmp.x = dot(TextureMatrix1, pos);
+	tmp.y = dot(TextureMatrix2, pos);
+	tmp.z = dot(TextureMatrix3, pos);
+
+	return vec4(tmp, 1.0);
+}

binaries/data/mods/_test.minimal/shaders/water_high.fs

@@ -0,0 +1,65 @@
+uniform vec3 ambient;
+uniform vec3 sunDir;
+uniform vec3 sunColor;
+uniform vec3 cameraPos;
+uniform sampler2D normalMap;
+uniform sampler2D reflectionMap;
+uniform sampler2D refractionMap;
+uniform float shininess;		// Blinn-Phong specular strength
+uniform float specularStrength;	// Scaling for specular reflection (specular color is (this,this,this))
+uniform float waviness;			// "Wildness" of the reflections and refractions; choose based on texture
+uniform vec3 tint;				// Tint for refraction (used to simulate particles in water)
+uniform float murkiness;		// Amount of tint to blend in with the refracted colour
+uniform float fullDepth;		// Depth at which to use full murkiness (shallower water will be clearer)
+uniform vec3 reflectionTint;	// Tint for reflection (used for really muddy water)
+uniform float reflectionTintStrength;	// Strength of reflection tint (how much of it to mix in)
+
+varying vec3 worldPos;
+varying float w;
+varying float waterDepth;
+varying float losMod;
+
+void main()
+{
+	vec3 n, l, h, v;		// Normal, light vector, half-vector and view vector (vector to eye)
+	float ndotl, ndoth, ndotv;
+	float fresnel;
+	float myMurkiness;		// Murkiness and tint at this pixel (tweaked based on lighting and depth)
+	float t;				// Temporary variable
+	vec2 reflCoords, refrCoords;
+	vec3 reflColor, refrColor, specular;
+	
+	n = normalize(texture2D(normalMap, gl_TexCoord[0].st).xzy - vec3(0.5, 0.5, 0.5));
+	l = -sunDir;
+	v = normalize(cameraPos - worldPos);
+	h = normalize(l + v);
+	
+	ndotl = dot(n, l);
+	ndoth = dot(n, h);
+	ndotv = dot(n, v);
+	
+	myMurkiness = murkiness * min(waterDepth / fullDepth, 1.0);
+	
+	fresnel = pow(1.0 - ndotv, 0.8);	// A rather random Fresnel approximation
+	
+	refrCoords = 0.5 * (gl_TexCoord[2].xy / gl_TexCoord[2].w) + 0.5;	// Unbias texture coords
+	refrCoords -= 0.8 * waviness * n.xz / w;		// Refractions can be slightly less wavy
+	
+	reflCoords = 0.5 * (gl_TexCoord[1].xy / gl_TexCoord[1].w) + 0.5;	// Unbias texture coords
+	reflCoords += waviness * n.xz / w;
+	
+	reflColor = mix(texture2D(reflectionMap, reflCoords).rgb, sunColor * reflectionTint, 
+					reflectionTintStrength);
+	
+	refrColor = (0.5 + 0.5*ndotl) * mix(texture2D(refractionMap, refrCoords).rgb, sunColor * tint,
+					myMurkiness);
+	
+	specular = pow(max(0.0, ndoth), shininess) * sunColor * specularStrength;
+	
+	gl_FragColor.rgb = mix(refrColor + 0.3*specular, reflColor + specular, fresnel) * losMod;
+	
+	// Make alpha vary based on both depth (so it blends with the shore) and view angle (make it
+	// become opaque faster at lower view angles so we can't look "underneath" the water plane)
+	t = 18.0 * max(0.0, 0.7 - v.y);
+	gl_FragColor.a = 0.15 * waterDepth * (1.2 + t + fresnel);
+}

binaries/data/mods/_test.minimal/shaders/water_high.vs

@@ -0,0 +1,23 @@
+uniform mat4 reflectionMatrix;
+uniform mat4 refractionMatrix;
+uniform vec4 translation;
+
+attribute float vertexDepth;
+attribute float losMultiplier;
+
+varying vec3 worldPos;
+varying float w;
+varying float waterDepth;
+varying float losMod;
+
+void main()
+{
+	worldPos = gl_Vertex.xyz;
+	waterDepth = vertexDepth;
+	losMod = losMultiplier;
+	gl_TexCoord[0] = gl_MultiTexCoord0 + translation;
+	gl_TexCoord[1] = reflectionMatrix * gl_Vertex;		// projective texturing
+	gl_TexCoord[2] = reflectionMatrix * gl_Vertex;
+	w = gl_TexCoord[1].w;
+	gl_Position = ftransform();
+}

binaries/data/mods/_test.minimal/shaders/water_high.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Program>
+	<Shaders>
+		<Shader type="VERTEX_SHADER">shaders/water_high.vs</Shader>
+		<Shader type="FRAGMENT_SHADER">shaders/water_high.fs</Shader>
+	</Shaders>
+</Program>

source/collada/tests/actorviewer.bat

@@ -0,0 +1,2 @@
+@cd ..\..\..\binaries\system
+@pyrogenesis_dbg.exe -editor -actorviewer -mod=_test.minimal -mod=_test.collada

source/collada/tests/tests.py

@@ -0,0 +1,68 @@
+from ctypes import *
+import sys
+import os
+import xml.etree.ElementTree as ET
+
+binaries = '../../../binaries'
+
+dll_filename = {
+	'posix': './libCollada_dbg.so',
+	'nt': 'Collada.dll',
+}[os.name]
+
+library = cdll.LoadLibrary('%s/system/%s' % (binaries, dll_filename))
+
+def log(severity, message):
+	print '[%s] %s' % (('INFO', 'WARNING', 'ERROR')[severity], message)
+
+clog = CFUNCTYPE(None, c_int, c_char_p)(log)
+	# (the CFUNCTYPE must not be GC'd, so try to keep a reference)
+library.set_logger(clog)
+
+def convert_dae_to_pmd(filename):
+	output = []
+	def cb(str, len):
+		output.append(string_at(str, len))
+
+	cbtype = CFUNCTYPE(None, POINTER(c_char), c_uint)
+	status = library.convert_dae_to_pmd(filename, cbtype(cb))
+	assert(status == 0)
+	return ''.join(output)
+
+def clean_dir(path):
+	# Remove all files first
+	try:
+		for f in os.listdir(path):
+			os.remove(path+'/'+f)
+		os.rmdir(path)
+	except OSError:
+		pass # (ignore errors if files are in use)
+	# Make sure the directory exists
+	try:
+		os.makedirs(path)
+	except OSError:
+		pass # (ignore errors if it already exists)
+	
+################################
+
+test_data = binaries + '/data/tests/collada'
+test_mod = binaries + '/data/mods/_test.collada'
+
+clean_dir(test_mod + '/art/meshes')
+clean_dir(test_mod + '/art/actors')
+
+for test_file in ['cube', 'jav2']:
+	input_filename = '%s/%s.dae' % (test_data, test_file)
+	output_filename = '%s/art/meshes/%s.pmd' % (test_mod, test_file)
+	
+	input = open(input_filename).read()
+	output = convert_dae_to_pmd(input)
+	open(output_filename, 'wb').write(output)
+
+	actor = ET.Element('actor', version='1')
+	group = ET.SubElement(actor, 'group')
+	variant = ET.SubElement(group, 'variant', frequency='100', name='Base')
+	ET.SubElement(variant, 'mesh').text = test_file+'.pmd'
+	ET.SubElement(variant, 'texture').text = 'male.dds'
+	
+	open('%s/art/actors/%s.xml' % (test_mod, test_file), 'w').write(ET.tostring(actor))

source/ps/GameSetup/Config.cpp

@@ -135,27 +135,8 @@ static void ProcessCommandLineArgs(const CmdLineArgs& args)
 	if (args.Has("listfiles"))
 		trace_enable(true);
 
-	std::vector<CStr> mods = args.GetMultiple("mod");
-	for (size_t i = 0; i < mods.size(); ++i)
-	{
-		const char* mod_name = mods[i];
-		char path[PATH_MAX];
-		snprintf(path, ARRAY_SIZE(path), "mods/%s", mod_name);
-		path[PATH_MAX-1] = '\0';
-		// note: default is 0. we should set this higher in case the
-		// mod file mtimes are actually older than the official
-		// version (*could* happen), otherwise the mod might not
-		// actually override as intended.
-		//
-		// HACK: since this is the only place where mods are added,
-		// we can get away with just setting it to 1.
-		// otherwise, add a static counter.
-		uint pri = 1;
-		(void)vfs_mount("", path, VFS_MOUNT_RECURSIVE|VFS_MOUNT_ARCHIVES|VFS_MOUNT_WATCH, pri);
-	}
-
 	if (args.Has("novbo"))
-		g_ConfigDB.CreateValue(CFG_COMMAND, "novbo")->m_String="true";
+		g_ConfigDB.CreateValue(CFG_COMMAND, "novbo")->m_String = "true";
 
 	if (args.Has("profile"))
 		g_ConfigDB.CreateValue(CFG_COMMAND, "profile")->m_String = args.Get("profile");

source/ps/GameSetup/GameSetup.cpp

@@ -552,7 +552,7 @@ static void InitScripting()
 }
 
 
-static void InitVfs(const char* argv0)
+static void InitVfs(const CmdLineArgs& args)
 {
 	TIMER("InitVfs");
 
@@ -568,7 +568,7 @@ static void InitVfs(const char* argv0)
 	// rationale for data/ being root: untrusted scripts must not be
 	// allowed to overwrite critical game (or worse, OS) files.
 	// the VFS prevents any accesses to files above this directory.
-	(void)file_set_root_dir(argv0, "../data");
+	(void)file_set_root_dir(args.GetArg0(), "../data");
 
 	vfs_init();
 
@@ -585,13 +585,28 @@ static void InitVfs(const char* argv0)
 	// [hot: 16ms]
 	vfs_mount("cache/", "cache", VFS_MOUNT_RECURSIVE|VFS_MOUNT_ARCHIVES|VFS_MOUNT_ARCHIVABLE);
 
-	// --- this belongs in a LoadMod function
-	// [hot: 150ms]
-	vfs_mount("", "mods/official", VFS_MOUNT_RECURSIVE|VFS_MOUNT_ARCHIVES|VFS_MOUNT_WATCH|VFS_MOUNT_ARCHIVABLE);
-	// ---
+	std::vector<CStr> mods = args.GetMultiple("mod");
+	if (mods.empty())
+		mods.push_back("official");
 
-	// TODO: once people can load multiple mods, set the top one to be the write target
-	vfs_set_write_target("mods/official");
+	for (size_t i = 0; i < mods.size(); ++i)
+	{
+		CStr path = "mods/" + mods[i];
+		uint priority = (uint)i;
+		uint flags = VFS_MOUNT_RECURSIVE|VFS_MOUNT_ARCHIVES|VFS_MOUNT_WATCH;
+
+		// TODO: currently only archive 'official' - probably ought to archive
+		// all mods instead?
+		if (mods[i] == "official")
+			flags |= VFS_MOUNT_ARCHIVABLE;
+
+		// [hot: 150ms for mods/official]
+		(void)vfs_mount("", path, flags, priority);
+	}
+
+	// set the top (last) mod to be the write target
+	CStr top_mod_path = "mods/" + mods.back(); // (mods is never empty)
+	vfs_set_write_target(top_mod_path);
 
 	// don't try vfs_display yet: SDL_Init hasn't yet redirected stdout
 }
@@ -893,7 +908,7 @@ void Init(const CmdLineArgs& args, uint flags)
 	// and will mess up the error reporting if anything
 	// crashes before the working directory is set.
 	MICROLOG(L"init vfs");
-	InitVfs(args.GetArg0().c_str());
+	InitVfs(args);
 
 	// This must come after VFS init, which sets the current directory
 	// (required for finding our output log files).