ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.162 by root, Fri Oct 13 19:23:08 2006 UTC vs.
Revision 1.178 by root, Tue Apr 10 11:12:53 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
… …
14 14
15#ifdef _WIN32 15#ifdef _WIN32
16# undef pipe 16# undef pipe
17#endif 17#endif
18 18
19#include <assert.h>
19#include <math.h> 20#include <math.h>
20#include <string.h> 21#include <string.h>
21#include <stdio.h> 22#include <stdio.h>
22#include <stdlib.h> 23#include <stdlib.h>
23 24
… …
154 155
155 *w = rect.width; 156 *w = rect.width;
156 *h = rect.height; 157 *h = rect.height;
157} 158}
158 159
160typedef uint16_t tileid;
159typedef uint16_t mapface; 161typedef uint16_t faceid;
160 162
161typedef struct { 163typedef struct {
162 GLint name; 164 int name;
163 int w, h; 165 int w, h;
164 float s, t; 166 float s, t;
165 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
168 tileid smoothtile;
169 uint8_t smoothlevel;
166} maptex; 170} maptex;
167 171
168typedef struct { 172typedef struct {
169 uint32_t player; 173 uint32_t player;
170 mapface face[3]; 174 tileid tile[3];
171 uint16_t darkness; 175 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags; 176 uint8_t stat_width, stat_hp, flags, smoothmax;
173} mapcell; 177} mapcell;
174 178
175typedef struct { 179typedef struct {
176 int32_t c0, c1; 180 int32_t c0, c1;
177 mapcell *col; 181 mapcell *col;
178} maprow; 182} maprow;
179 183
180typedef struct map { 184typedef struct map {
181 int x, y, w, h; 185 int x, y, w, h;
182 int ox, oy; /* offset to virtual global coordinate system */ 186 int ox, oy; /* offset to virtual global coordinate system */
183 int faces; 187 int faces; tileid *face2tile; // [faceid]
184 mapface *face; 188 int texs; maptex *tex; // [tileid]
185
186 int texs;
187 maptex *tex;
188 189
189 int32_t rows; 190 int32_t rows;
190 maprow *row; 191 maprow *row;
191} *CFPlus__Map; 192} *CFPlus__Map;
192 193
… …
212 return ptr; 213 return ptr;
213} 214}
214 215
215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
218
219static void
220need_facenum (struct map *self, faceid face)
221{
222 while (self->faces <= face)
223 {
224 Append (tileid, self->face2tile, self->faces, self->faces);
225 self->faces *= 2;
226 }
227}
228
229static void
230need_texid (struct map *self, int texid)
231{
232 while (self->texs <= texid)
233 {
234 Append (maptex, self->tex, self->texs, self->texs);
235 self->texs *= 2;
236 }
237}
217 238
218static maprow * 239static maprow *
219map_get_row (CFPlus__Map self, int y) 240map_get_row (CFPlus__Map self, int y)
220{ 241{
221 if (0 > y) 242 if (0 > y)
… …
316 cell->player = 0; 337 cell->player = 0;
317 } 338 }
318 } 339 }
319} 340}
320 341
342typedef struct {
343 tileid tile;
344 uint8_t x, y, level;
345} smooth_key;
346
347static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1);
351
352 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else
355 sv_setiv (*sv, bits);
356}
357
321static void 358static void
322music_finished (void) 359music_finished (void)
323{ 360{
324 SDL_UserEvent ev; 361 SDL_UserEvent ev;
325 362
… …
358 n |= n >> 8; 395 n |= n >> 8;
359 n |= n >> 16; 396 n |= n >> 16;
360 397
361 return n + 1; 398 return n + 1;
362} 399}
400
401/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314
363 404
364MODULE = CFPlus PACKAGE = CFPlus 405MODULE = CFPlus PACKAGE = CFPlus
365 406
366PROTOTYPES: ENABLE 407PROTOTYPES: ENABLE
367 408
… …
371 static const struct { 412 static const struct {
372 const char *name; 413 const char *name;
373 IV iv; 414 IV iv;
374 } *civ, const_iv[] = { 415 } *civ, const_iv[] = {
375# define const_iv(name) { # name, (IV)name } 416# define const_iv(name) { # name, (IV)name }
417 const_iv (SDLK_MODIFIER_MIN),
418 const_iv (SDLK_MODIFIER_MAX),
419
376 const_iv (SDL_ACTIVEEVENT), 420 const_iv (SDL_ACTIVEEVENT),
377 const_iv (SDL_KEYDOWN), 421 const_iv (SDL_KEYDOWN),
378 const_iv (SDL_KEYUP), 422 const_iv (SDL_KEYUP),
379 const_iv (SDL_MOUSEMOTION), 423 const_iv (SDL_MOUSEMOTION),
380 const_iv (SDL_MOUSEBUTTONDOWN), 424 const_iv (SDL_MOUSEBUTTONDOWN),
… …
389 const_iv (SDL_EVENT_RESERVEDA), 433 const_iv (SDL_EVENT_RESERVEDA),
390 const_iv (SDL_EVENT_RESERVEDB), 434 const_iv (SDL_EVENT_RESERVEDB),
391 const_iv (SDL_VIDEORESIZE), 435 const_iv (SDL_VIDEORESIZE),
392 const_iv (SDL_VIDEOEXPOSE), 436 const_iv (SDL_VIDEOEXPOSE),
393 const_iv (SDL_USEREVENT), 437 const_iv (SDL_USEREVENT),
438
439 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE),
442
394 const_iv (SDLK_KP0), 443 const_iv (SDLK_KP0),
395 const_iv (SDLK_KP1), 444 const_iv (SDLK_KP1),
396 const_iv (SDLK_KP2), 445 const_iv (SDLK_KP2),
397 const_iv (SDLK_KP3), 446 const_iv (SDLK_KP3),
398 const_iv (SDLK_KP4), 447 const_iv (SDLK_KP4),
… …
453 const_iv (SDLK_BREAK), 502 const_iv (SDLK_BREAK),
454 const_iv (SDLK_MENU), 503 const_iv (SDLK_MENU),
455 const_iv (SDLK_POWER), 504 const_iv (SDLK_POWER),
456 const_iv (SDLK_EURO), 505 const_iv (SDLK_EURO),
457 const_iv (SDLK_UNDO), 506 const_iv (SDLK_UNDO),
507
458 const_iv (KMOD_NONE), 508 const_iv (KMOD_NONE),
509 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_LSHIFT), 510 const_iv (KMOD_LSHIFT),
460 const_iv (KMOD_RSHIFT), 511 const_iv (KMOD_RSHIFT),
512 const_iv (KMOD_CTRL),
461 const_iv (KMOD_LCTRL), 513 const_iv (KMOD_LCTRL),
462 const_iv (KMOD_RCTRL), 514 const_iv (KMOD_RCTRL),
515 const_iv (KMOD_ALT),
463 const_iv (KMOD_LALT), 516 const_iv (KMOD_LALT),
464 const_iv (KMOD_RALT), 517 const_iv (KMOD_RALT),
518 const_iv (KMOD_META),
465 const_iv (KMOD_LMETA), 519 const_iv (KMOD_LMETA),
466 const_iv (KMOD_RMETA), 520 const_iv (KMOD_RMETA),
467 const_iv (KMOD_NUM), 521 const_iv (KMOD_NUM),
468 const_iv (KMOD_CAPS), 522 const_iv (KMOD_CAPS),
469 const_iv (KMOD_MODE), 523 const_iv (KMOD_MODE),
470 const_iv (KMOD_CTRL),
471 const_iv (KMOD_SHIFT),
472 const_iv (KMOD_ALT),
473 const_iv (KMOD_META)
474# undef const_iv 524# undef const_iv
475 }; 525 };
476 526
477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 527 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
529
530 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
531 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
479} 532}
533
534void
535weaken (SV *rv)
536 PROTOTYPE: $
537 CODE:
538 sv_rvweaken (rv);
480 539
481int 540int
482in_destruct () 541in_destruct ()
483 CODE: 542 CODE:
484 RETVAL = PL_main_cv == Nullcv; 543 RETVAL = PL_main_cv == Nullcv;
… …
587 case SDL_KEYDOWN: 646 case SDL_KEYDOWN:
588 case SDL_KEYUP: 647 case SDL_KEYUP:
589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 650 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
651 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
592 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593 break; 653 break;
594 654
595 case SDL_ACTIVEEVENT: 655 case SDL_ACTIVEEVENT:
596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
1049xy_to_index (CFPlus::Layout self, int x, int y) 1109xy_to_index (CFPlus::Layout self, int x, int y)
1050 CODE: 1110 CODE:
1051{ 1111{
1052 int index, trailing; 1112 int index, trailing;
1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1113 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1054 RETVAL = index; 1114 RETVAL = index + trailing;
1055} 1115}
1056 OUTPUT: 1116 OUTPUT:
1057 RETVAL 1117 RETVAL
1058 1118
1059void 1119void
… …
1065 1125
1066 EXTEND (SP, 3); 1126 EXTEND (SP, 3);
1067 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1127 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1128 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1129 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1130}
1131
1132void
1133index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1134 PPCODE:
1135{
1136 int line, x;
1137
1138 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1139 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1140
1141 EXTEND (SP, 2);
1142 PUSHs (sv_2mortal (newSViv (line - 1)));
1143 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1144}
1145
1146void
1147line_x_to_index (CFPlus::Layout self, int line, int x)
1148 PPCODE:
1149{
1150 PangoLayoutLine *lp;
1151 int index, trailing;
1152
1153 if (line < 0)
1154 XSRETURN_EMPTY;
1155
1156 if (!(lp = pango_layout_get_line (self->pl, line)))
1157 XSRETURN_EMPTY; /* do better */
1158
1159 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1160
1161 EXTEND (SP, 2);
1162 if (GIMME_V == G_SCALAR)
1163 PUSHs (sv_2mortal (newSViv (index + trailing)));
1164 else
1165 {
1166 PUSHs (sv_2mortal (newSViv (index)));
1167 PUSHs (sv_2mortal (newSViv (trailing)));
1168 }
1070} 1169}
1071 1170
1072void 1171void
1073render (CFPlus::Layout self, float x, float y, int flags = 0) 1172render (CFPlus::Layout self, float x, float y, int flags = 0)
1074 PPCODE: 1173 PPCODE:
… …
1168} 1267}
1169 1268
1170MODULE = CFPlus PACKAGE = CFPlus::Map 1269MODULE = CFPlus PACKAGE = CFPlus::Map
1171 1270
1172CFPlus::Map 1271CFPlus::Map
1173new (SV *class, int map_width, int map_height) 1272new (SV *class)
1174 CODE: 1273 CODE:
1175 New (0, RETVAL, 1, struct map); 1274 New (0, RETVAL, 1, struct map);
1176 RETVAL->x = 0; 1275 RETVAL->x = 0;
1177 RETVAL->y = 0; 1276 RETVAL->y = 0;
1178 RETVAL->w = map_width; 1277 RETVAL->w = 0;
1179 RETVAL->h = map_height; 1278 RETVAL->h = 0;
1180 RETVAL->ox = 0; 1279 RETVAL->ox = 0;
1181 RETVAL->oy = 0; 1280 RETVAL->oy = 0;
1182 RETVAL->faces = 8192; 1281 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1183 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1282 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1184 RETVAL->texs = 8192;
1185 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1186 RETVAL->rows = 0; 1283 RETVAL->rows = 0;
1187 RETVAL->row = 0; 1284 RETVAL->row = 0;
1188 OUTPUT: 1285 OUTPUT:
1189 RETVAL 1286 RETVAL
1190 1287
1191void 1288void
1192DESTROY (CFPlus::Map self) 1289DESTROY (CFPlus::Map self)
1193 CODE: 1290 CODE:
1194{ 1291{
1195 map_clear (self); 1292 map_clear (self);
1196 Safefree (self->face); 1293 Safefree (self->face2tile);
1197 Safefree (self->tex); 1294 Safefree (self->tex);
1198 Safefree (self); 1295 Safefree (self);
1199} 1296}
1200 1297
1201void 1298void
1299resize (CFPlus::Map self, int map_width, int map_height)
1300 CODE:
1301 self->w = map_width;
1302 self->h = map_height;
1303
1304void
1202clear (CFPlus::Map self) 1305clear (CFPlus::Map self)
1203 CODE: 1306 CODE:
1204 map_clear (self); 1307 map_clear (self);
1205 1308
1206void 1309void
1207set_face (CFPlus::Map self, int face, int texid) 1310set_tileid (CFPlus::Map self, int face, int tile)
1208 CODE: 1311 CODE:
1209{ 1312{
1210 while (self->faces <= face) 1313 need_facenum (self, face); self->face2tile [face] = tile;
1211 { 1314 need_texid (self, tile);
1212 Append (mapface, self->face, self->faces, self->faces); 1315}
1213 self->faces *= 2;
1214 }
1215 1316
1216 self->face [face] = texid; 1317void
1318set_smooth (CFPlus::Map self, int face, int smooth, int level)
1319 CODE:
1320{
1321 tileid texid;
1322 maptex *tex;
1323
1324 if (face < 0 || face >= self->faces)
1325 return;
1326
1327 if (smooth < 0 || smooth >= self->faces)
1328 return;
1329
1330 texid = self->face2tile [face];
1331
1332 if (!texid)
1333 return;
1334
1335 tex = self->tex + texid;
1336 tex->smoothtile = self->face2tile [smooth];
1337 tex->smoothlevel = level;
1217} 1338}
1218 1339
1219void 1340void
1220set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1341set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1221 CODE: 1342 CODE:
1222{ 1343{
1223 while (self->texs <= texid) 1344 need_texid (self, texid);
1224 {
1225 Append (maptex, self->tex, self->texs, self->texs);
1226 self->texs *= 2;
1227 }
1228 1345
1229 { 1346 {
1230 maptex *tex = self->tex + texid; 1347 maptex *tex = self->tex + texid;
1231 1348
1232 tex->name = name; 1349 tex->name = name;
… …
1343 cell->stat_width = 1; 1460 cell->stat_width = 1;
1344 cell->stat_hp = *data++; 1461 cell->stat_hp = *data++;
1345 } 1462 }
1346 else if (cmd == 6) // monster width 1463 else if (cmd == 6) // monster width
1347 cell->stat_width = *data++ + 1; 1464 cell->stat_width = *data++ + 1;
1348 else if (cmd == 0x47) // monster width 1465 else if (cmd == 0x47)
1349 { 1466 {
1350 if (*data == 4) 1467 if (*data == 8)
1351 ; // decode player tag 1468 ; // decode player uuid
1352 1469
1353 data += *data + 1; 1470 data += *data + 1;
1354 } 1471 }
1355 else if (cmd == 8) // cell flags 1472 else if (cmd == 8) // cell flags
1356 cell->flags = *data++; 1473 cell->flags = *data++;
… …
1365 cell->darkness = *data++ + 1; 1482 cell->darkness = *data++ + 1;
1366 } 1483 }
1367 1484
1368 if (flags & 4) 1485 if (flags & 4)
1369 { 1486 {
1370 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1487 faceid face = (data [0] << 8) + data [1]; data += 2;
1488 need_facenum (self, face);
1489 cell->tile [0] = self->face2tile [face];
1371 } 1490 }
1372 1491
1373 if (flags & 2) 1492 if (flags & 2)
1374 { 1493 {
1375 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1494 faceid face = (data [0] << 8) + data [1]; data += 2;
1495 need_facenum (self, face);
1496 cell->tile [1] = self->face2tile [face];
1376 } 1497 }
1377 1498
1378 if (flags & 1) 1499 if (flags & 1)
1379 { 1500 {
1380 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1501 faceid face = (data [0] << 8) + data [1]; data += 2;
1502 need_facenum (self, face);
1503 cell->tile [2] = self->face2tile [face];
1381 } 1504 }
1382 } 1505 }
1383 else 1506 else
1384 cell->darkness = 0; 1507 cell->darkness = 0;
1385 } 1508 }
… …
1415 { 1538 {
1416 mapcell *cell = row->col + (x - row->c0); 1539 mapcell *cell = row->col + (x - row->c0);
1417 1540
1418 for (z = 0; z <= 0; z++) 1541 for (z = 0; z <= 0; z++)
1419 { 1542 {
1420 mapface face = cell->face [z];
1421
1422 if (face)
1423 {
1424 maptex tex = self->tex [face]; 1543 maptex tex = self->tex [cell->tile [z]];
1425 int a0 = 255 - tex.a; 1544 int a0 = 255 - tex.a;
1426 int a1 = tex.a; 1545 int a1 = tex.a;
1427 1546
1428 r = (r * a0 + tex.r * a1) / 255; 1547 r = (r * a0 + tex.r * a1) / 255;
1429 g = (g * a0 + tex.g * a1) / 255; 1548 g = (g * a0 + tex.g * a1) / 255;
1430 b = (b * a0 + tex.b * a1) / 255; 1549 b = (b * a0 + tex.b * a1) / 255;
1431 a = (a * a0 + tex.a * a1) / 255; 1550 a = (a * a0 + tex.a * a1) / 255;
1432 }
1433 } 1551 }
1434 } 1552 }
1435 1553
1436 *map++ = (r ) 1554 *map++ = (r )
1437 | (g << 8) 1555 | (g << 8)
… …
1444} 1562}
1445 OUTPUT: 1563 OUTPUT:
1446 RETVAL 1564 RETVAL
1447 1565
1448void 1566void
1449draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1450 CODE: 1568 CODE:
1451{ 1569{
1452 int vx, vy; 1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1573 smooth_key skey;
1453 int x, y, z; 1574 int x, y, z;
1454 int last_name; 1575 int last_name;
1455 mapface face;
1456 1576
1457 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1577 // thats current max. sorry.
1458 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1578 if (sw > 255) sw = 255;
1579 if (sh > 255) sh = 255;
1459 1580
1460 /* 1581 // clear key, in case of extra padding
1461 int vx = self->vx = self->w >= sw 1582 memset (&skey, 0, sizeof (skey));
1462 ? self->x + (self->w - sw) / 2
1463 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1464
1465 int vy = self->vy = self->h >= sh
1466 ? self->y + (self->h - sh) / 2
1467 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1468 */
1469 1583
1470 glColor4ub (255, 255, 255, 255); 1584 glColor4ub (255, 255, 255, 255);
1471 1585
1472 glEnable (GL_BLEND); 1586 glEnable (GL_BLEND);
1473 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1587 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1476 1590
1477 glBegin (GL_QUADS); 1591 glBegin (GL_QUADS);
1478 1592
1479 last_name = 0; 1593 last_name = 0;
1480 1594
1595 mx += self->x;
1596 my += self->y;
1597
1598 // first pass: determine smooth_max
1599 // rather ugly, if you ask me
1600 // could also be stored inside mapcell and updated on change
1601 memset (smooth_max, 0, sizeof (smooth_max));
1602
1603 for (y = 0; y < sh; y++)
1604 if (0 <= y + my && y + my < self->rows)
1605 {
1606 maprow *row = self->row + (y + my);
1607
1608 for (x = 0; x < sw; x++)
1609 if (row->c0 <= x + mx && x + mx < row->c1)
1610 {
1611 mapcell *cell = row->col + (x + mx - row->c0);
1612
1613 smooth_max[x + 1][y + 1] =
1614 MAX (self->tex [cell->tile [0]].smoothlevel,
1615 MAX (self->tex [cell->tile [1]].smoothlevel,
1616 self->tex [cell->tile [2]].smoothlevel));
1617 }
1618 }
1619
1481 for (z = 0; z < 3; z++) 1620 for (z = 0; z <= 2; z++)
1621 {
1622 memset (smooth_level, 0, sizeof (smooth_level));
1623
1482 for (y = 0; y < sh; y++) 1624 for (y = 0; y < sh; y++)
1483 if (0 <= y + vy && y + vy < self->rows) 1625 if (0 <= y + my && y + my < self->rows)
1484 { 1626 {
1485 maprow *row = self->row + (y + vy); 1627 maprow *row = self->row + (y + my);
1486 1628
1487 for (x = 0; x < sw; x++) 1629 for (x = 0; x < sw; x++)
1488 if (row->c0 <= x + vx && x + vx < row->c1) 1630 if (row->c0 <= x + mx && x + mx < row->c1)
1489 { 1631 {
1490 mapcell *cell = row->col + (x + vx - row->c0); 1632 mapcell *cell = row->col + (x + mx - row->c0);
1491
1492 face = cell->face [z]; 1633 tileid tile = cell->tile [z];
1634
1635 if (tile)
1636 {
1637 maptex tex = self->tex [tile];
1638 int px = (x + 1) * T - tex.w;
1639 int py = (y + 1) * T - tex.h;
1493 1640
1494 if (face && face < self->texs) 1641 // suppressing texture state switches here
1642 // is only moderately effective, but worth the extra effort
1643 if (last_name != tex.name)
1644 {
1645 if (!tex.name)
1646 tex = self->tex [2]; /* missing, replace by noface */
1647
1648 glEnd ();
1649 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1650 glBegin (GL_QUADS);
1651 }
1652
1653 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1654 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1655 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1656 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1657
1658 if (cell->flags && z == 2)
1659 {
1660 if (cell->flags & 1)
1661 {
1662 maptex tex = self->tex [1];
1663 int px = x * T + T * 2 / 32;
1664 int py = y * T - T * 6 / 32;
1665
1666 glEnd ();
1667 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1668 glBegin (GL_QUADS);
1669
1670 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1671 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1672 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1673 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1674 }
1675 }
1676
1677 // update smooth hash
1678 if (tex.smoothtile)
1679 {
1680 skey.tile = tex.smoothtile;
1681 skey.level = tex.smoothlevel;
1682
1683 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1684
1685 // add bits to current tile and all neighbours. skey.x|y is
1686 // shifted +1|+1 so we always stay positive.
1687
1688 // full tile
1689 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1690
1691 // borders
1692 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
1693 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
1694 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1695 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1696
1697 // corners
1698 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1699 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1700 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1701 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1702 }
1703 }
1704 }
1705 }
1706
1707 // go through all smoothlevels, lowest to highest, then draw
1708 // this is basically counting sort
1709 {
1710 int w, b;
1711
1712 for (w = 0; w < 256 / 32; ++w)
1713 {
1714 uint32_t smask = smooth_level [w];
1715 if (smask)
1716 for (b = 0; b < 32; ++b)
1717 if (smask & (((uint32_t)1) << b))
1495 { 1718 {
1496 maptex tex = self->tex [face]; 1719 int level = (w << 5) | b;
1497 int px = (x + 1) * 32 - tex.w; 1720 HE *he;
1498 int py = (y + 1) * 32 - tex.h;
1499 1721
1500 if (last_name != tex.name) 1722 hv_iterinit (smooth);
1723 while ((he = hv_iternext (smooth)))
1501 { 1724 {
1725 smooth_key *skey = (smooth_key *)HeKEY (he);
1726 IV bits = SvIVX (HeVAL (he));
1727
1728 // bits is ___n cccc CCCC bbbb
1729 // n do not draw borders&corners
1730 // c draw these corners, but...
1731 // C ... not these
1732 // b draw these borders
1733
1734 if (!(bits & 0x1000)
1735 && skey->level == level
1736 && level >= smooth_max [skey->x][skey->y])
1737 {
1738 maptex tex = self->tex [skey->tile];
1739 int px = (((int)skey->x) - 1) * T;
1740 int py = (((int)skey->y) - 1) * T;
1741 int border = bits & 15;
1742 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1743 float dx = tex.s * .0625f; // 16 images/row
1744 float dy = tex.t * .5f ; // 2 images/column
1745
1746 // this time naively avoiding texture state changes
1747 // save gobs of state changes.
1748 if (last_name != tex.name)
1749 {
1750 if (!tex.name)
1751 continue; // smoothing not yet available
1752
1502 glEnd (); 1753 glEnd ();
1503 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1754 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1504 glBegin (GL_QUADS); 1755 glBegin (GL_QUADS);
1756 }
1757
1758 if (border)
1759 {
1760 float ox = border * dx;
1761
1762 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1763 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1764 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1765 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1766 }
1767
1768 if (corner)
1769 {
1770 float ox = corner * dx;
1771
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1773 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1774 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1775 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1776 }
1505 } 1777 }
1506
1507 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1508 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1509 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1510 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1511 }
1512
1513 if (cell->flags && z == 2)
1514 {
1515 if (cell->flags & 1)
1516 {
1517 maptex tex = self->tex [1];
1518 int px = (x + 1) * 32 - tex.w + 2;
1519 int py = (y + 1) * 32 - tex.h - 6;
1520
1521 glEnd ();
1522 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1523 glBegin (GL_QUADS);
1524
1525 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1526 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1527 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1528 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1529 } 1778 }
1530 } 1779 }
1531 }
1532 } 1780 }
1781 }
1782
1783 hv_clear (smooth);
1784 }
1533 1785
1534 glEnd (); 1786 glEnd ();
1535 1787
1536 glDisable (GL_TEXTURE_2D); 1788 glDisable (GL_TEXTURE_2D);
1537 glDisable (GL_BLEND); 1789 glDisable (GL_BLEND);
1538 1790
1539 // top layer: overlays such as the health bar 1791 // top layer: overlays such as the health bar
1540 for (y = 0; y < sh; y++) 1792 for (y = 0; y < sh; y++)
1541 if (0 <= y + vy && y + vy < self->rows) 1793 if (0 <= y + my && y + my < self->rows)
1542 { 1794 {
1543 maprow *row = self->row + (y + vy); 1795 maprow *row = self->row + (y + my);
1544 1796
1545 for (x = 0; x < sw; x++) 1797 for (x = 0; x < sw; x++)
1546 if (row->c0 <= x + vx && x + vx < row->c1) 1798 if (row->c0 <= x + mx && x + mx < row->c1)
1547 { 1799 {
1548 mapcell *cell = row->col + (x + vx - row->c0); 1800 mapcell *cell = row->col + (x + mx - row->c0);
1549 1801
1550 int px = x * 32; 1802 int px = x * T;
1551 int py = y * 32; 1803 int py = y * T;
1552 1804
1553 if (cell->stat_hp) 1805 if (cell->stat_hp)
1554 { 1806 {
1555 int width = cell->stat_width * 32; 1807 int width = cell->stat_width * T;
1556 int thick = sh / 28 + 1 + cell->stat_width; 1808 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1557 1809
1558 glColor3ub (0, 0, 0); 1810 glColor3ub (0, 0, 0);
1559 glRectf (px + 1, py - thick - 2, 1811 glRectf (px + 1, py - thick - 2,
1560 px + width - 1, py); 1812 px + width - 1, py);
1561 1813
… …
1627 glDisable (GL_BLEND); 1879 glDisable (GL_BLEND);
1628 glDisable (GL_TEXTURE_2D); 1880 glDisable (GL_TEXTURE_2D);
1629} 1881}
1630 1882
1631void 1883void
1632fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1884fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1633 PPCODE: 1885 PPCODE:
1634{ 1886{
1635 int vx, vy;
1636 int x, y; 1887 int x, y;
1637 int sw4 = (sw + 3) & ~3; 1888 int sw4 = (sw + 3) & ~3;
1638 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1889 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1639 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1890 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1640 1891
1641 memset (darkness, 255, sw4 * sh); 1892 memset (darkness, 255, sw4 * sh);
1642 SvPOK_only (darkness_sv); 1893 SvPOK_only (darkness_sv);
1643 SvCUR_set (darkness_sv, sw4 * sh); 1894 SvCUR_set (darkness_sv, sw4 * sh);
1644 1895
1645 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1896 mx += self->x;
1646 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1897 my += self->y;
1647 1898
1648 for (y = 0; y < sh; y++) 1899 for (y = 0; y < sh; y++)
1649 if (0 <= y + vy && y + vy < self->rows) 1900 if (0 <= y + my && y + my < self->rows)
1650 { 1901 {
1651 maprow *row = self->row + (y + vy); 1902 maprow *row = self->row + (y + my);
1652 1903
1653 for (x = 0; x < sw; x++) 1904 for (x = 0; x < sw; x++)
1654 if (row->c0 <= x + vx && x + vx < row->c1) 1905 if (row->c0 <= x + mx && x + mx < row->c1)
1655 { 1906 {
1656 mapcell *cell = row->col + (x + vx - row->c0); 1907 mapcell *cell = row->col + (x + mx - row->c0);
1657 1908
1658 darkness[y * sw4 + x] = cell->darkness 1909 darkness[y * sw4 + x] = cell->darkness
1659 ? 255 - (cell->darkness - 1) 1910 ? 255 - (cell->darkness - 1)
1660 : 255 - FOW_DARKNESS; 1911 : 255 - FOW_DARKNESS;
1661 } 1912 }
… …
1701 if (row && row->c0 <= x && x < row->c1) 1952 if (row && row->c0 <= x && x < row->c1)
1702 { 1953 {
1703 mapcell *cell = row->col + (x - row->c0); 1954 mapcell *cell = row->col + (x - row->c0);
1704 uint8_t flags = 0; 1955 uint8_t flags = 0;
1705 1956
1706 if (cell->face [0]) flags |= 1; 1957 if (cell->tile [0]) flags |= 1;
1707 if (cell->face [1]) flags |= 2; 1958 if (cell->tile [1]) flags |= 2;
1708 if (cell->face [2]) flags |= 4; 1959 if (cell->tile [2]) flags |= 4;
1709 1960
1710 *data++ = flags; 1961 *data++ = flags;
1711 1962
1712 if (flags & 1) 1963 if (flags & 1)
1713 { 1964 {
1965 tileid tile = cell->tile [0];
1714 *data++ = cell->face [0] >> 8; 1966 *data++ = tile >> 8;
1715 *data++ = cell->face [0]; 1967 *data++ = tile;
1716 } 1968 }
1717 1969
1718 if (flags & 2) 1970 if (flags & 2)
1719 { 1971 {
1972 tileid tile = cell->tile [1];
1720 *data++ = cell->face [1] >> 8; 1973 *data++ = tile >> 8;
1721 *data++ = cell->face [1]; 1974 *data++ = tile;
1722 } 1975 }
1723 1976
1724 if (flags & 4) 1977 if (flags & 4)
1725 { 1978 {
1979 tileid tile = cell->tile [2];
1726 *data++ = cell->face [2] >> 8; 1980 *data++ = tile >> 8;
1727 *data++ = cell->face [2]; 1981 *data++ = tile;
1728 } 1982 }
1729 } 1983 }
1730 else 1984 else
1731 *data++ = 0; 1985 *data++ = 0;
1732 } 1986 }
… …
1772 { 2026 {
1773 uint8_t flags = *data++; 2027 uint8_t flags = *data++;
1774 2028
1775 if (flags) 2029 if (flags)
1776 { 2030 {
1777 mapface face[3] = { 0, 0, 0 };
1778
1779 mapcell *cell = row_get_cell (row, x); 2031 mapcell *cell = row_get_cell (row, x);
2032 tileid tile[3] = { 0, 0, 0 };
1780 2033
1781 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2034 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1782 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2035 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1783 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2036 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1784 2037
1785 if (cell->darkness == 0) 2038 if (cell->darkness == 0)
1786 { 2039 {
1787 cell->darkness = 0; 2040 cell->darkness = 0;
1788 2041
1789 for (z = 0; z <= 2; z++) 2042 for (z = 0; z <= 2; z++)
1790 { 2043 {
1791 cell->face[z] = face[z]; 2044 tileid t = tile [z];
1792 2045
1793 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2046 if (t >= self->texs || (t && !self->tex [t].name))
2047 {
1794 XPUSHs (sv_2mortal (newSViv (face[z]))); 2048 XPUSHs (sv_2mortal (newSViv (t)));
2049 need_texid (self, t);
2050 }
2051
2052 cell->tile [z] = t;
1795 } 2053 }
1796 } 2054 }
1797 } 2055 }
1798 } 2056 }
1799 } 2057 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines