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.164 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.176 by root, Tue Apr 10 09:39:48 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:
… …
1177 RETVAL->y = 0; 1276 RETVAL->y = 0;
1178 RETVAL->w = 0; 1277 RETVAL->w = 0;
1179 RETVAL->h = 0; 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
… …
1208clear (CFPlus::Map self) 1305clear (CFPlus::Map self)
1209 CODE: 1306 CODE:
1210 map_clear (self); 1307 map_clear (self);
1211 1308
1212void 1309void
1213set_face (CFPlus::Map self, int face, int texid) 1310set_tileid (CFPlus::Map self, int face, int tile)
1214 CODE: 1311 CODE:
1215{ 1312{
1216 while (self->faces <= face) 1313 need_facenum (self, face); self->face2tile [face] = tile;
1217 { 1314 need_texid (self, tile);
1218 Append (mapface, self->face, self->faces, self->faces); 1315}
1219 self->faces *= 2;
1220 }
1221 1316
1222 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;
1223} 1338}
1224 1339
1225void 1340void
1226set_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)
1227 CODE: 1342 CODE:
1228{ 1343{
1229 while (self->texs <= texid) 1344 need_texid (self, texid);
1230 {
1231 Append (maptex, self->tex, self->texs, self->texs);
1232 self->texs *= 2;
1233 }
1234 1345
1235 { 1346 {
1236 maptex *tex = self->tex + texid; 1347 maptex *tex = self->tex + texid;
1237 1348
1238 tex->name = name; 1349 tex->name = name;
… …
1349 cell->stat_width = 1; 1460 cell->stat_width = 1;
1350 cell->stat_hp = *data++; 1461 cell->stat_hp = *data++;
1351 } 1462 }
1352 else if (cmd == 6) // monster width 1463 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1; 1464 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width 1465 else if (cmd == 0x47)
1355 { 1466 {
1356 if (*data == 4) 1467 if (*data == 8)
1357 ; // decode player tag 1468 ; // decode player uuid
1358 1469
1359 data += *data + 1; 1470 data += *data + 1;
1360 } 1471 }
1361 else if (cmd == 8) // cell flags 1472 else if (cmd == 8) // cell flags
1362 cell->flags = *data++; 1473 cell->flags = *data++;
… …
1371 cell->darkness = *data++ + 1; 1482 cell->darkness = *data++ + 1;
1372 } 1483 }
1373 1484
1374 if (flags & 4) 1485 if (flags & 4)
1375 { 1486 {
1376 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];
1377 } 1490 }
1378 1491
1379 if (flags & 2) 1492 if (flags & 2)
1380 { 1493 {
1381 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];
1382 } 1497 }
1383 1498
1384 if (flags & 1) 1499 if (flags & 1)
1385 { 1500 {
1386 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];
1387 } 1504 }
1388 } 1505 }
1389 else 1506 else
1390 cell->darkness = 0; 1507 cell->darkness = 0;
1391 } 1508 }
… …
1421 { 1538 {
1422 mapcell *cell = row->col + (x - row->c0); 1539 mapcell *cell = row->col + (x - row->c0);
1423 1540
1424 for (z = 0; z <= 0; z++) 1541 for (z = 0; z <= 0; z++)
1425 { 1542 {
1426 mapface face = cell->face [z];
1427
1428 if (face)
1429 {
1430 maptex tex = self->tex [face]; 1543 maptex tex = self->tex [cell->tile [z]];
1431 int a0 = 255 - tex.a; 1544 int a0 = 255 - tex.a;
1432 int a1 = tex.a; 1545 int a1 = tex.a;
1433 1546
1434 r = (r * a0 + tex.r * a1) / 255; 1547 r = (r * a0 + tex.r * a1) / 255;
1435 g = (g * a0 + tex.g * a1) / 255; 1548 g = (g * a0 + tex.g * a1) / 255;
1436 b = (b * a0 + tex.b * a1) / 255; 1549 b = (b * a0 + tex.b * a1) / 255;
1437 a = (a * a0 + tex.a * a1) / 255; 1550 a = (a * a0 + tex.a * a1) / 255;
1438 }
1439 } 1551 }
1440 } 1552 }
1441 1553
1442 *map++ = (r ) 1554 *map++ = (r )
1443 | (g << 8) 1555 | (g << 8)
… …
1450} 1562}
1451 OUTPUT: 1563 OUTPUT:
1452 RETVAL 1564 RETVAL
1453 1565
1454void 1566void
1455draw (CFPlus::Map self, int mx, int my, int sw, int sh) 1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1456 CODE: 1568 CODE:
1457{ 1569{
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256];
1573 smooth_key skey;
1458 int x, y, z; 1574 int x, y, z;
1459 int last_name; 1575 int last_name;
1460 mapface face; 1576
1577 // thats current max. sorry.
1578 if (sw > 255) sw = 255;
1579 if (sh > 255) sh = 255;
1580
1581 // clear key, in case of extra padding
1582 memset (&skey, 0, sizeof (skey));
1461 1583
1462 glColor4ub (255, 255, 255, 255); 1584 glColor4ub (255, 255, 255, 255);
1463 1585
1464 glEnable (GL_BLEND); 1586 glEnable (GL_BLEND);
1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1587 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1471 last_name = 0; 1593 last_name = 0;
1472 1594
1473 mx += self->x; 1595 mx += self->x;
1474 my += self->y; 1596 my += self->y;
1475 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 for (z = 0; z <= 2; z++)
1614 {
1615 uint8_t level = self->tex [cell->tile [z]].smoothlevel;
1616 if (level > smooth_max [x + 1][y + 1])
1617 smooth_max [x + 1][y + 1] = level;
1618 }
1619 }
1620 }
1621
1476 for (z = 0; z < 3; z++) 1622 for (z = 0; z <= 2; z++)
1623 {
1624 memset (smooth_level, 0, sizeof (smooth_level));
1625
1477 for (y = 0; y < sh; y++) 1626 for (y = 0; y < sh; y++)
1478 if (0 <= y + my && y + my < self->rows) 1627 if (0 <= y + my && y + my < self->rows)
1479 { 1628 {
1480 maprow *row = self->row + (y + my); 1629 maprow *row = self->row + (y + my);
1481 1630
1482 for (x = 0; x < sw; x++) 1631 for (x = 0; x < sw; x++)
1483 if (row->c0 <= x + mx && x + mx < row->c1) 1632 if (row->c0 <= x + mx && x + mx < row->c1)
1484 { 1633 {
1485 mapcell *cell = row->col + (x + mx - row->c0); 1634 mapcell *cell = row->col + (x + mx - row->c0);
1486
1487 face = cell->face [z]; 1635 tileid tile = cell->tile [z];
1636
1637 if (tile)
1638 {
1639 maptex tex = self->tex [tile];
1640 int px = (x + 1) * T - tex.w;
1641 int py = (y + 1) * T - tex.h;
1488 1642
1489 if (face && face < self->texs) 1643 // suppressing texture state switches here
1644 // is only moderately effective, but worth the extra effort
1645 if (last_name != tex.name)
1646 {
1647 if (!tex.name)
1648 tex = self->tex [2]; /* missing, replace by noface */
1649
1650 glEnd ();
1651 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1652 glBegin (GL_QUADS);
1653 }
1654
1655 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1656 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1657 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1658 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1659
1660 if (cell->flags && z == 2)
1661 {
1662 if (cell->flags & 1)
1663 {
1664 maptex tex = self->tex [1];
1665 int px = x * T + T * 2 / 32;
1666 int py = y * T - T * 6 / 32;
1667
1668 glEnd ();
1669 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1670 glBegin (GL_QUADS);
1671
1672 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1673 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1674 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1675 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1676 }
1677 }
1678
1679 // update smooth hash
1680 if (tex.smoothtile)
1681 {
1682 skey.tile = tex.smoothtile;
1683 skey.level = tex.smoothlevel;
1684
1685 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1686
1687 // add bits to current tile and all neighbours. skey.x|y is
1688 // shifted +1|+1 so we always stay positive.
1689
1690 // full tile
1691 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1692
1693 // borders
1694 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
1695 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
1696 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1697 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1698
1699 // corners
1700 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1701 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1702 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1703 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1704 }
1705 }
1706 }
1707 }
1708
1709 // go through all smoothlevels, lowest to highest, then draw
1710 // this is basically counting sort
1711 {
1712 int w, b;
1713
1714 for (w = 0; w < 256 / 32; ++w)
1715 {
1716 uint32_t smask = smooth_level [w];
1717 if (smask)
1718 for (b = 0; b < 32; ++b)
1719 if (smask & (((uint32_t)1) << b))
1490 { 1720 {
1491 maptex tex = self->tex [face]; 1721 int level = (w << 5) | b;
1492 int px = (x + 1) * 32 - tex.w; 1722 HE *he;
1493 int py = (y + 1) * 32 - tex.h;
1494 1723
1495 if (last_name != tex.name) 1724 hv_iterinit (smooth);
1725 while ((he = hv_iternext (smooth)))
1496 { 1726 {
1727 smooth_key *skey = (smooth_key *)HeKEY (he);
1728 IV bits = SvIVX (HeVAL (he));
1729
1730 // bits is ___n cccc CCCC bbbb
1731 // n do not draw borders&corners
1732 // c draw these corners, but...
1733 // C ... not these
1734 // b draw these borders
1735
1736 if (!(bits & 0x1000)
1737 && skey->level == level
1738 && level >= smooth_max [skey->x][skey->y])
1739 {
1740 maptex tex = self->tex [skey->tile];
1741 int px = (((int)skey->x) - 1) * T;
1742 int py = (((int)skey->y) - 1) * T;
1743 int border = bits & 15;
1744 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1745 float dx = tex.s * .0625f; // 16 images/row
1746 float dy = tex.t * .5f ; // 2 images/column
1747
1748 // this time naively avoiding texture state changes
1749 // save gobs of state changes.
1750 if (last_name != tex.name)
1751 {
1752 if (!tex.name)
1753 continue; // smoothing not yet available
1754
1497 glEnd (); 1755 glEnd ();
1498 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1499 glBegin (GL_QUADS); 1757 glBegin (GL_QUADS);
1758 }
1759
1760 if (border)
1761 {
1762 float ox = border * dx;
1763
1764 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1765 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1766 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1767 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1768 }
1769
1770 if (corner)
1771 {
1772 float ox = corner * dx;
1773
1774 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1775 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1776 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1777 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1778 }
1500 } 1779 }
1501
1502 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1503 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1504 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1505 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1506 }
1507
1508 if (cell->flags && z == 2)
1509 {
1510 if (cell->flags & 1)
1511 {
1512 maptex tex = self->tex [1];
1513 int px = (x + 1) * 32 - tex.w + 2;
1514 int py = (y + 1) * 32 - tex.h - 6;
1515
1516 glEnd ();
1517 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1518 glBegin (GL_QUADS);
1519
1520 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1521 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1522 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1523 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1524 } 1780 }
1525 } 1781 }
1526 }
1527 } 1782 }
1783 }
1784
1785 hv_clear (smooth);
1786 }
1528 1787
1529 glEnd (); 1788 glEnd ();
1530 1789
1531 glDisable (GL_TEXTURE_2D); 1790 glDisable (GL_TEXTURE_2D);
1532 glDisable (GL_BLEND); 1791 glDisable (GL_BLEND);
… …
1540 for (x = 0; x < sw; x++) 1799 for (x = 0; x < sw; x++)
1541 if (row->c0 <= x + mx && x + mx < row->c1) 1800 if (row->c0 <= x + mx && x + mx < row->c1)
1542 { 1801 {
1543 mapcell *cell = row->col + (x + mx - row->c0); 1802 mapcell *cell = row->col + (x + mx - row->c0);
1544 1803
1545 int px = x * 32; 1804 int px = x * T;
1546 int py = y * 32; 1805 int py = y * T;
1547 1806
1548 if (cell->stat_hp) 1807 if (cell->stat_hp)
1549 { 1808 {
1550 int width = cell->stat_width * 32; 1809 int width = cell->stat_width * T;
1551 int thick = sh / 28 + 1 + cell->stat_width; 1810 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1552 1811
1553 glColor3ub (0, 0, 0); 1812 glColor3ub (0, 0, 0);
1554 glRectf (px + 1, py - thick - 2, 1813 glRectf (px + 1, py - thick - 2,
1555 px + width - 1, py); 1814 px + width - 1, py);
1556 1815
… …
1695 if (row && row->c0 <= x && x < row->c1) 1954 if (row && row->c0 <= x && x < row->c1)
1696 { 1955 {
1697 mapcell *cell = row->col + (x - row->c0); 1956 mapcell *cell = row->col + (x - row->c0);
1698 uint8_t flags = 0; 1957 uint8_t flags = 0;
1699 1958
1700 if (cell->face [0]) flags |= 1; 1959 if (cell->tile [0]) flags |= 1;
1701 if (cell->face [1]) flags |= 2; 1960 if (cell->tile [1]) flags |= 2;
1702 if (cell->face [2]) flags |= 4; 1961 if (cell->tile [2]) flags |= 4;
1703 1962
1704 *data++ = flags; 1963 *data++ = flags;
1705 1964
1706 if (flags & 1) 1965 if (flags & 1)
1707 { 1966 {
1967 tileid tile = cell->tile [0];
1708 *data++ = cell->face [0] >> 8; 1968 *data++ = tile >> 8;
1709 *data++ = cell->face [0]; 1969 *data++ = tile;
1710 } 1970 }
1711 1971
1712 if (flags & 2) 1972 if (flags & 2)
1713 { 1973 {
1974 tileid tile = cell->tile [1];
1714 *data++ = cell->face [1] >> 8; 1975 *data++ = tile >> 8;
1715 *data++ = cell->face [1]; 1976 *data++ = tile;
1716 } 1977 }
1717 1978
1718 if (flags & 4) 1979 if (flags & 4)
1719 { 1980 {
1981 tileid tile = cell->tile [2];
1720 *data++ = cell->face [2] >> 8; 1982 *data++ = tile >> 8;
1721 *data++ = cell->face [2]; 1983 *data++ = tile;
1722 } 1984 }
1723 } 1985 }
1724 else 1986 else
1725 *data++ = 0; 1987 *data++ = 0;
1726 } 1988 }
… …
1766 { 2028 {
1767 uint8_t flags = *data++; 2029 uint8_t flags = *data++;
1768 2030
1769 if (flags) 2031 if (flags)
1770 { 2032 {
1771 mapface face[3] = { 0, 0, 0 };
1772
1773 mapcell *cell = row_get_cell (row, x); 2033 mapcell *cell = row_get_cell (row, x);
2034 tileid tile[3] = { 0, 0, 0 };
1774 2035
1775 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2036 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1776 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2037 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1777 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2038 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1778 2039
1779 if (cell->darkness == 0) 2040 if (cell->darkness == 0)
1780 { 2041 {
1781 cell->darkness = 0; 2042 cell->darkness = 0;
1782 2043
1783 for (z = 0; z <= 2; z++) 2044 for (z = 0; z <= 2; z++)
1784 { 2045 {
1785 cell->face[z] = face[z]; 2046 tileid t = tile [z];
1786 2047
1787 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2048 if (t >= self->texs || (t && !self->tex [t].name))
2049 {
1788 XPUSHs (sv_2mortal (newSViv (face[z]))); 2050 XPUSHs (sv_2mortal (newSViv (t)));
2051 need_texid (self, t);
2052 }
2053
2054 cell->tile [z] = t;
1789 } 2055 }
1790 } 2056 }
1791 } 2057 }
1792 } 2058 }
1793 } 2059 }

Diff Legend

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