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.179 by root, Wed Apr 11 04:32:51 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);
… …
641Mix_AllocateChannels (int numchans = -1) 701Mix_AllocateChannels (int numchans = -1)
642 702
643void 703void
644lowdelay (int fd, int val = 1) 704lowdelay (int fd, int val = 1)
645 CODE: 705 CODE:
646#ifndef _WIN32
647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 706 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648#endif
649 707
650void 708void
651win32_proxy_info () 709win32_proxy_info ()
652 PPCODE: 710 PPCODE:
653{ 711{
… …
1049xy_to_index (CFPlus::Layout self, int x, int y) 1107xy_to_index (CFPlus::Layout self, int x, int y)
1050 CODE: 1108 CODE:
1051{ 1109{
1052 int index, trailing; 1110 int index, trailing;
1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1111 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1054 RETVAL = index; 1112 RETVAL = index + trailing;
1055} 1113}
1056 OUTPUT: 1114 OUTPUT:
1057 RETVAL 1115 RETVAL
1058 1116
1059void 1117void
… …
1065 1123
1066 EXTEND (SP, 3); 1124 EXTEND (SP, 3);
1067 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1125 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1126 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1127 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1128}
1129
1130void
1131index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1132 PPCODE:
1133{
1134 int line, x;
1135
1136 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1137 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1138
1139 EXTEND (SP, 2);
1140 PUSHs (sv_2mortal (newSViv (line - 1)));
1141 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1142}
1143
1144void
1145line_x_to_index (CFPlus::Layout self, int line, int x)
1146 PPCODE:
1147{
1148 PangoLayoutLine *lp;
1149 int index, trailing;
1150
1151 if (line < 0)
1152 XSRETURN_EMPTY;
1153
1154 if (!(lp = pango_layout_get_line (self->pl, line)))
1155 XSRETURN_EMPTY; /* do better */
1156
1157 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1158
1159 EXTEND (SP, 2);
1160 if (GIMME_V == G_SCALAR)
1161 PUSHs (sv_2mortal (newSViv (index + trailing)));
1162 else
1163 {
1164 PUSHs (sv_2mortal (newSViv (index)));
1165 PUSHs (sv_2mortal (newSViv (trailing)));
1166 }
1070} 1167}
1071 1168
1072void 1169void
1073render (CFPlus::Layout self, float x, float y, int flags = 0) 1170render (CFPlus::Layout self, float x, float y, int flags = 0)
1074 PPCODE: 1171 PPCODE:
… …
1177 RETVAL->y = 0; 1274 RETVAL->y = 0;
1178 RETVAL->w = 0; 1275 RETVAL->w = 0;
1179 RETVAL->h = 0; 1276 RETVAL->h = 0;
1180 RETVAL->ox = 0; 1277 RETVAL->ox = 0;
1181 RETVAL->oy = 0; 1278 RETVAL->oy = 0;
1182 RETVAL->faces = 8192; 1279 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1183 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1280 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; 1281 RETVAL->rows = 0;
1187 RETVAL->row = 0; 1282 RETVAL->row = 0;
1188 OUTPUT: 1283 OUTPUT:
1189 RETVAL 1284 RETVAL
1190 1285
1191void 1286void
1192DESTROY (CFPlus::Map self) 1287DESTROY (CFPlus::Map self)
1193 CODE: 1288 CODE:
1194{ 1289{
1195 map_clear (self); 1290 map_clear (self);
1196 Safefree (self->face); 1291 Safefree (self->face2tile);
1197 Safefree (self->tex); 1292 Safefree (self->tex);
1198 Safefree (self); 1293 Safefree (self);
1199} 1294}
1200 1295
1201void 1296void
… …
1208clear (CFPlus::Map self) 1303clear (CFPlus::Map self)
1209 CODE: 1304 CODE:
1210 map_clear (self); 1305 map_clear (self);
1211 1306
1212void 1307void
1213set_face (CFPlus::Map self, int face, int texid) 1308set_tileid (CFPlus::Map self, int face, int tile)
1214 CODE: 1309 CODE:
1215{ 1310{
1216 while (self->faces <= face) 1311 need_facenum (self, face); self->face2tile [face] = tile;
1217 { 1312 need_texid (self, tile);
1218 Append (mapface, self->face, self->faces, self->faces); 1313}
1219 self->faces *= 2;
1220 }
1221 1314
1222 self->face [face] = texid; 1315void
1316set_smooth (CFPlus::Map self, int face, int smooth, int level)
1317 CODE:
1318{
1319 tileid texid;
1320 maptex *tex;
1321
1322 if (face < 0 || face >= self->faces)
1323 return;
1324
1325 if (smooth < 0 || smooth >= self->faces)
1326 return;
1327
1328 texid = self->face2tile [face];
1329
1330 if (!texid)
1331 return;
1332
1333 tex = self->tex + texid;
1334 tex->smoothtile = self->face2tile [smooth];
1335 tex->smoothlevel = level;
1223} 1336}
1224 1337
1225void 1338void
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) 1339set_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: 1340 CODE:
1228{ 1341{
1229 while (self->texs <= texid) 1342 need_texid (self, texid);
1230 {
1231 Append (maptex, self->tex, self->texs, self->texs);
1232 self->texs *= 2;
1233 }
1234 1343
1235 { 1344 {
1236 maptex *tex = self->tex + texid; 1345 maptex *tex = self->tex + texid;
1237 1346
1238 tex->name = name; 1347 tex->name = name;
… …
1349 cell->stat_width = 1; 1458 cell->stat_width = 1;
1350 cell->stat_hp = *data++; 1459 cell->stat_hp = *data++;
1351 } 1460 }
1352 else if (cmd == 6) // monster width 1461 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1; 1462 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width 1463 else if (cmd == 0x47)
1355 { 1464 {
1356 if (*data == 4) 1465 if (*data == 8)
1357 ; // decode player tag 1466 ; // decode player uuid
1358 1467
1359 data += *data + 1; 1468 data += *data + 1;
1360 } 1469 }
1361 else if (cmd == 8) // cell flags 1470 else if (cmd == 8) // cell flags
1362 cell->flags = *data++; 1471 cell->flags = *data++;
… …
1371 cell->darkness = *data++ + 1; 1480 cell->darkness = *data++ + 1;
1372 } 1481 }
1373 1482
1374 if (flags & 4) 1483 if (flags & 4)
1375 { 1484 {
1376 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1485 faceid face = (data [0] << 8) + data [1]; data += 2;
1486 need_facenum (self, face);
1487 cell->tile [0] = self->face2tile [face];
1377 } 1488 }
1378 1489
1379 if (flags & 2) 1490 if (flags & 2)
1380 { 1491 {
1381 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1492 faceid face = (data [0] << 8) + data [1]; data += 2;
1493 need_facenum (self, face);
1494 cell->tile [1] = self->face2tile [face];
1382 } 1495 }
1383 1496
1384 if (flags & 1) 1497 if (flags & 1)
1385 { 1498 {
1386 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1499 faceid face = (data [0] << 8) + data [1]; data += 2;
1500 need_facenum (self, face);
1501 cell->tile [2] = self->face2tile [face];
1387 } 1502 }
1388 } 1503 }
1389 else 1504 else
1390 cell->darkness = 0; 1505 cell->darkness = 0;
1391 } 1506 }
… …
1421 { 1536 {
1422 mapcell *cell = row->col + (x - row->c0); 1537 mapcell *cell = row->col + (x - row->c0);
1423 1538
1424 for (z = 0; z <= 0; z++) 1539 for (z = 0; z <= 0; z++)
1425 { 1540 {
1426 mapface face = cell->face [z];
1427
1428 if (face)
1429 {
1430 maptex tex = self->tex [face]; 1541 maptex tex = self->tex [cell->tile [z]];
1431 int a0 = 255 - tex.a; 1542 int a0 = 255 - tex.a;
1432 int a1 = tex.a; 1543 int a1 = tex.a;
1433 1544
1434 r = (r * a0 + tex.r * a1) / 255; 1545 r = (r * a0 + tex.r * a1) / 255;
1435 g = (g * a0 + tex.g * a1) / 255; 1546 g = (g * a0 + tex.g * a1) / 255;
1436 b = (b * a0 + tex.b * a1) / 255; 1547 b = (b * a0 + tex.b * a1) / 255;
1437 a = (a * a0 + tex.a * a1) / 255; 1548 a = (a * a0 + tex.a * a1) / 255;
1438 }
1439 } 1549 }
1440 } 1550 }
1441 1551
1442 *map++ = (r ) 1552 *map++ = (r )
1443 | (g << 8) 1553 | (g << 8)
… …
1450} 1560}
1451 OUTPUT: 1561 OUTPUT:
1452 RETVAL 1562 RETVAL
1453 1563
1454void 1564void
1455draw (CFPlus::Map self, int mx, int my, int sw, int sh) 1565draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1456 CODE: 1566 CODE:
1457{ 1567{
1568 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1569 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1570 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1571 smooth_key skey;
1458 int x, y, z; 1572 int x, y, z;
1459 int last_name; 1573 int last_name;
1460 mapface face; 1574
1575 // thats current max. sorry.
1576 if (sw > 255) sw = 255;
1577 if (sh > 255) sh = 255;
1578
1579 // clear key, in case of extra padding
1580 memset (&skey, 0, sizeof (skey));
1461 1581
1462 glColor4ub (255, 255, 255, 255); 1582 glColor4ub (255, 255, 255, 255);
1463 1583
1464 glEnable (GL_BLEND); 1584 glEnable (GL_BLEND);
1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1585 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1471 last_name = 0; 1591 last_name = 0;
1472 1592
1473 mx += self->x; 1593 mx += self->x;
1474 my += self->y; 1594 my += self->y;
1475 1595
1596 // first pass: determine smooth_max
1597 // rather ugly, if you ask me
1598 // could also be stored inside mapcell and updated on change
1599 memset (smooth_max, 0, sizeof (smooth_max));
1600
1601 for (y = 0; y < sh; y++)
1602 if (0 <= y + my && y + my < self->rows)
1603 {
1604 maprow *row = self->row + (y + my);
1605
1606 for (x = 0; x < sw; x++)
1607 if (row->c0 <= x + mx && x + mx < row->c1)
1608 {
1609 mapcell *cell = row->col + (x + mx - row->c0);
1610
1611 smooth_max[x + 1][y + 1] =
1612 MAX (self->tex [cell->tile [0]].smoothlevel,
1613 MAX (self->tex [cell->tile [1]].smoothlevel,
1614 self->tex [cell->tile [2]].smoothlevel));
1615 }
1616 }
1617
1476 for (z = 0; z < 3; z++) 1618 for (z = 0; z <= 2; z++)
1619 {
1620 memset (smooth_level, 0, sizeof (smooth_level));
1621
1477 for (y = 0; y < sh; y++) 1622 for (y = 0; y < sh; y++)
1478 if (0 <= y + my && y + my < self->rows) 1623 if (0 <= y + my && y + my < self->rows)
1479 { 1624 {
1480 maprow *row = self->row + (y + my); 1625 maprow *row = self->row + (y + my);
1481 1626
1482 for (x = 0; x < sw; x++) 1627 for (x = 0; x < sw; x++)
1483 if (row->c0 <= x + mx && x + mx < row->c1) 1628 if (row->c0 <= x + mx && x + mx < row->c1)
1484 { 1629 {
1485 mapcell *cell = row->col + (x + mx - row->c0); 1630 mapcell *cell = row->col + (x + mx - row->c0);
1486
1487 face = cell->face [z]; 1631 tileid tile = cell->tile [z];
1632
1633 if (tile)
1634 {
1635 maptex tex = self->tex [tile];
1636 int px = (x + 1) * T - tex.w;
1637 int py = (y + 1) * T - tex.h;
1488 1638
1489 if (face && face < self->texs) 1639 // suppressing texture state switches here
1640 // is only moderately effective, but worth the extra effort
1641 if (last_name != tex.name)
1642 {
1643 if (!tex.name)
1644 tex = self->tex [2]; /* missing, replace by noface */
1645
1646 glEnd ();
1647 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1648 glBegin (GL_QUADS);
1649 }
1650
1651 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1652 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1653 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1654 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1655
1656 if (cell->flags && z == 2)
1657 {
1658 if (cell->flags & 1)
1659 {
1660 maptex tex = self->tex [1];
1661 int px = x * T + T * 2 / 32;
1662 int py = y * T - T * 6 / 32;
1663
1664 glEnd ();
1665 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1666 glBegin (GL_QUADS);
1667
1668 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1669 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1670 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1671 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1672 }
1673 }
1674
1675 // update smooth hash
1676 if (tex.smoothtile)
1677 {
1678 skey.tile = tex.smoothtile;
1679 skey.level = tex.smoothlevel;
1680
1681 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1682
1683 // add bits to current tile and all neighbours. skey.x|y is
1684 // shifted +1|+1 so we always stay positive.
1685
1686 // full tile
1687 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1688
1689 // borders
1690 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
1691 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
1692 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1693 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1694
1695 // corners
1696 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1697 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1698 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1699 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1700 }
1701 }
1702 }
1703 }
1704
1705 // go through all smoothlevels, lowest to highest, then draw
1706 // this is basically counting sort
1707 {
1708 int w, b;
1709
1710 for (w = 0; w < 256 / 32; ++w)
1711 {
1712 uint32_t smask = smooth_level [w];
1713 if (smask)
1714 for (b = 0; b < 32; ++b)
1715 if (smask & (((uint32_t)1) << b))
1490 { 1716 {
1491 maptex tex = self->tex [face]; 1717 int level = (w << 5) | b;
1492 int px = (x + 1) * 32 - tex.w; 1718 HE *he;
1493 int py = (y + 1) * 32 - tex.h;
1494 1719
1495 if (last_name != tex.name) 1720 hv_iterinit (smooth);
1721 while ((he = hv_iternext (smooth)))
1496 { 1722 {
1723 smooth_key *skey = (smooth_key *)HeKEY (he);
1724 IV bits = SvIVX (HeVAL (he));
1725
1726 // bits is ___n cccc CCCC bbbb
1727 // n do not draw borders&corners
1728 // c draw these corners, but...
1729 // C ... not these
1730 // b draw these borders
1731
1732 if (!(bits & 0x1000)
1733 && skey->level == level
1734 && level >= smooth_max [skey->x][skey->y])
1735 {
1736 maptex tex = self->tex [skey->tile];
1737 int px = (((int)skey->x) - 1) * T;
1738 int py = (((int)skey->y) - 1) * T;
1739 int border = bits & 15;
1740 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1741 float dx = tex.s * .0625f; // 16 images/row
1742 float dy = tex.t * .5f ; // 2 images/column
1743
1744 // this time naively avoiding texture state changes
1745 // save gobs of state changes.
1746 if (last_name != tex.name)
1747 {
1748 if (!tex.name)
1749 continue; // smoothing not yet available
1750
1497 glEnd (); 1751 glEnd ();
1498 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1752 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1499 glBegin (GL_QUADS); 1753 glBegin (GL_QUADS);
1754 }
1755
1756 if (border)
1757 {
1758 float ox = border * dx;
1759
1760 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1761 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1762 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1763 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1764 }
1765
1766 if (corner)
1767 {
1768 float ox = corner * dx;
1769
1770 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1771 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1772 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1774 }
1500 } 1775 }
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 } 1776 }
1525 } 1777 }
1526 }
1527 } 1778 }
1779 }
1780
1781 hv_clear (smooth);
1782 }
1528 1783
1529 glEnd (); 1784 glEnd ();
1530 1785
1531 glDisable (GL_TEXTURE_2D); 1786 glDisable (GL_TEXTURE_2D);
1532 glDisable (GL_BLEND); 1787 glDisable (GL_BLEND);
… …
1540 for (x = 0; x < sw; x++) 1795 for (x = 0; x < sw; x++)
1541 if (row->c0 <= x + mx && x + mx < row->c1) 1796 if (row->c0 <= x + mx && x + mx < row->c1)
1542 { 1797 {
1543 mapcell *cell = row->col + (x + mx - row->c0); 1798 mapcell *cell = row->col + (x + mx - row->c0);
1544 1799
1545 int px = x * 32; 1800 int px = x * T;
1546 int py = y * 32; 1801 int py = y * T;
1547 1802
1548 if (cell->stat_hp) 1803 if (cell->stat_hp)
1549 { 1804 {
1550 int width = cell->stat_width * 32; 1805 int width = cell->stat_width * T;
1551 int thick = sh / 28 + 1 + cell->stat_width; 1806 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1552 1807
1553 glColor3ub (0, 0, 0); 1808 glColor3ub (0, 0, 0);
1554 glRectf (px + 1, py - thick - 2, 1809 glRectf (px + 1, py - thick - 2,
1555 px + width - 1, py); 1810 px + width - 1, py);
1556 1811
… …
1695 if (row && row->c0 <= x && x < row->c1) 1950 if (row && row->c0 <= x && x < row->c1)
1696 { 1951 {
1697 mapcell *cell = row->col + (x - row->c0); 1952 mapcell *cell = row->col + (x - row->c0);
1698 uint8_t flags = 0; 1953 uint8_t flags = 0;
1699 1954
1700 if (cell->face [0]) flags |= 1; 1955 if (cell->tile [0]) flags |= 1;
1701 if (cell->face [1]) flags |= 2; 1956 if (cell->tile [1]) flags |= 2;
1702 if (cell->face [2]) flags |= 4; 1957 if (cell->tile [2]) flags |= 4;
1703 1958
1704 *data++ = flags; 1959 *data++ = flags;
1705 1960
1706 if (flags & 1) 1961 if (flags & 1)
1707 { 1962 {
1963 tileid tile = cell->tile [0];
1708 *data++ = cell->face [0] >> 8; 1964 *data++ = tile >> 8;
1709 *data++ = cell->face [0]; 1965 *data++ = tile;
1710 } 1966 }
1711 1967
1712 if (flags & 2) 1968 if (flags & 2)
1713 { 1969 {
1970 tileid tile = cell->tile [1];
1714 *data++ = cell->face [1] >> 8; 1971 *data++ = tile >> 8;
1715 *data++ = cell->face [1]; 1972 *data++ = tile;
1716 } 1973 }
1717 1974
1718 if (flags & 4) 1975 if (flags & 4)
1719 { 1976 {
1977 tileid tile = cell->tile [2];
1720 *data++ = cell->face [2] >> 8; 1978 *data++ = tile >> 8;
1721 *data++ = cell->face [2]; 1979 *data++ = tile;
1722 } 1980 }
1723 } 1981 }
1724 else 1982 else
1725 *data++ = 0; 1983 *data++ = 0;
1726 } 1984 }
… …
1766 { 2024 {
1767 uint8_t flags = *data++; 2025 uint8_t flags = *data++;
1768 2026
1769 if (flags) 2027 if (flags)
1770 { 2028 {
1771 mapface face[3] = { 0, 0, 0 };
1772
1773 mapcell *cell = row_get_cell (row, x); 2029 mapcell *cell = row_get_cell (row, x);
2030 tileid tile[3] = { 0, 0, 0 };
1774 2031
1775 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2032 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1776 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2033 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1777 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2034 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1778 2035
1779 if (cell->darkness == 0) 2036 if (cell->darkness == 0)
1780 { 2037 {
1781 cell->darkness = 0; 2038 cell->darkness = 0;
1782 2039
1783 for (z = 0; z <= 2; z++) 2040 for (z = 0; z <= 2; z++)
1784 { 2041 {
1785 cell->face[z] = face[z]; 2042 tileid t = tile [z];
1786 2043
1787 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2044 if (t >= self->texs || (t && !self->tex [t].name))
2045 {
1788 XPUSHs (sv_2mortal (newSViv (face[z]))); 2046 XPUSHs (sv_2mortal (newSViv (t)));
2047 need_texid (self, t);
2048 }
2049
2050 cell->tile [z] = t;
1789 } 2051 }
1790 } 2052 }
1791 } 2053 }
1792 } 2054 }
1793 } 2055 }

Diff Legend

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