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.156 by root, Thu Sep 21 14:47:51 2006 UTC vs.
Revision 1.190 by root, Thu Apr 26 17:41:23 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# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
7#endif 9#endif
8 10
9#include "EXTERN.h" 11#include "EXTERN.h"
10#include "perl.h" 12#include "perl.h"
11#include "XSUB.h" 13#include "XSUB.h"
12 14
13#ifdef _WIN32 15#ifdef _WIN32
14# undef pipe 16# undef pipe
15#endif 17#endif
16 18
19#include <assert.h>
17#include <math.h> 20#include <math.h>
18#include <string.h> 21#include <string.h>
19#include <stdio.h> 22#include <stdio.h>
20#include <stdlib.h> 23#include <stdlib.h>
21 24
… …
36# include <sys/types.h> 39# include <sys/types.h>
37# include <sys/socket.h> 40# include <sys/socket.h>
38# include <netinet/in.h> 41# include <netinet/in.h>
39# include <netinet/tcp.h> 42# include <netinet/tcp.h>
40# include <inttypes.h> 43# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 44#endif
49 45
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 47
52#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
53 49
54#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
… …
59#if 0 55#if 0
60# define PARACHUTE SDL_INIT_NOPARACHUTE 56# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 57#else
62# define PARACHUTE 0 58# define PARACHUTE 0
63#endif 59#endif
60
61static AV *texture_av;
64 62
65static struct 63static struct
66{ 64{
67#define GL_FUNC(ptr,name) ptr name; 65#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 66#include "glfunc.h"
… …
159 157
160 *w = rect.width; 158 *w = rect.width;
161 *h = rect.height; 159 *h = rect.height;
162} 160}
163 161
162typedef uint16_t tileid;
164typedef uint16_t mapface; 163typedef uint16_t faceid;
165 164
166typedef struct { 165typedef struct {
167 GLint name; 166 int name;
168 int w, h; 167 int w, h;
169 float s, t; 168 float s, t;
170 uint8_t r, g, b, a; 169 uint8_t r, g, b, a;
170 tileid smoothtile;
171 uint8_t smoothlevel;
171} maptex; 172} maptex;
172 173
173typedef struct { 174typedef struct {
174 uint32_t player; 175 uint32_t player;
175 mapface face[3]; 176 tileid tile[3];
176 uint16_t darkness; 177 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags; 178 uint8_t stat_width, stat_hp, flags, smoothmax;
178} mapcell; 179} mapcell;
179 180
180typedef struct { 181typedef struct {
181 int32_t c0, c1; 182 int32_t c0, c1;
182 mapcell *col; 183 mapcell *col;
183} maprow; 184} maprow;
184 185
185typedef struct map { 186typedef struct map {
186 int x, y, w, h; 187 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 188 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 189 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 190 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 191
194 int32_t rows; 192 int32_t rows;
195 maprow *row; 193 maprow *row;
196} *CFPlus__Map; 194} *CFPlus__Map;
197 195
… …
217 return ptr; 215 return ptr;
218} 216}
219 217
220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 218#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
220
221static void
222need_facenum (struct map *self, faceid face)
223{
224 while (self->faces <= face)
225 {
226 Append (tileid, self->face2tile, self->faces, self->faces);
227 self->faces *= 2;
228 }
229}
230
231static void
232need_texid (struct map *self, int texid)
233{
234 while (self->texs <= texid)
235 {
236 Append (maptex, self->tex, self->texs, self->texs);
237 self->texs *= 2;
238 }
239}
222 240
223static maprow * 241static maprow *
224map_get_row (CFPlus__Map self, int y) 242map_get_row (CFPlus__Map self, int y)
225{ 243{
226 if (0 > y) 244 if (0 > y)
… …
321 cell->player = 0; 339 cell->player = 0;
322 } 340 }
323 } 341 }
324} 342}
325 343
344typedef struct {
345 tileid tile;
346 uint8_t x, y, level;
347} smooth_key;
348
349static void
350smooth_or_bits (HV *hv, smooth_key *key, IV bits)
351{
352 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
353
354 if (SvIOK (*sv))
355 SvIV_set (*sv, SvIVX (*sv) | bits);
356 else
357 sv_setiv (*sv, bits);
358}
359
326static void 360static void
327music_finished (void) 361music_finished (void)
328{ 362{
329 SDL_UserEvent ev; 363 SDL_UserEvent ev;
330 364
… …
363 n |= n >> 8; 397 n |= n >> 8;
364 n |= n >> 16; 398 n |= n >> 16;
365 399
366 return n + 1; 400 return n + 1;
367} 401}
402
403/* SDL should provide this, really. */
404#define SDLK_MODIFIER_MIN 300
405#define SDLK_MODIFIER_MAX 314
368 406
369MODULE = CFPlus PACKAGE = CFPlus 407MODULE = CFPlus PACKAGE = CFPlus
370 408
371PROTOTYPES: ENABLE 409PROTOTYPES: ENABLE
372 410
… …
376 static const struct { 414 static const struct {
377 const char *name; 415 const char *name;
378 IV iv; 416 IV iv;
379 } *civ, const_iv[] = { 417 } *civ, const_iv[] = {
380# define const_iv(name) { # name, (IV)name } 418# define const_iv(name) { # name, (IV)name }
419 const_iv (SDLK_MODIFIER_MIN),
420 const_iv (SDLK_MODIFIER_MAX),
421
381 const_iv (SDL_ACTIVEEVENT), 422 const_iv (SDL_ACTIVEEVENT),
382 const_iv (SDL_KEYDOWN), 423 const_iv (SDL_KEYDOWN),
383 const_iv (SDL_KEYUP), 424 const_iv (SDL_KEYUP),
384 const_iv (SDL_MOUSEMOTION), 425 const_iv (SDL_MOUSEMOTION),
385 const_iv (SDL_MOUSEBUTTONDOWN), 426 const_iv (SDL_MOUSEBUTTONDOWN),
… …
394 const_iv (SDL_EVENT_RESERVEDA), 435 const_iv (SDL_EVENT_RESERVEDA),
395 const_iv (SDL_EVENT_RESERVEDB), 436 const_iv (SDL_EVENT_RESERVEDB),
396 const_iv (SDL_VIDEORESIZE), 437 const_iv (SDL_VIDEORESIZE),
397 const_iv (SDL_VIDEOEXPOSE), 438 const_iv (SDL_VIDEOEXPOSE),
398 const_iv (SDL_USEREVENT), 439 const_iv (SDL_USEREVENT),
440
441 const_iv (SDL_APPINPUTFOCUS),
442 const_iv (SDL_APPMOUSEFOCUS),
443 const_iv (SDL_APPACTIVE),
444
399 const_iv (SDLK_KP0), 445 const_iv (SDLK_KP0),
400 const_iv (SDLK_KP1), 446 const_iv (SDLK_KP1),
401 const_iv (SDLK_KP2), 447 const_iv (SDLK_KP2),
402 const_iv (SDLK_KP3), 448 const_iv (SDLK_KP3),
403 const_iv (SDLK_KP4), 449 const_iv (SDLK_KP4),
… …
458 const_iv (SDLK_BREAK), 504 const_iv (SDLK_BREAK),
459 const_iv (SDLK_MENU), 505 const_iv (SDLK_MENU),
460 const_iv (SDLK_POWER), 506 const_iv (SDLK_POWER),
461 const_iv (SDLK_EURO), 507 const_iv (SDLK_EURO),
462 const_iv (SDLK_UNDO), 508 const_iv (SDLK_UNDO),
509
463 const_iv (KMOD_NONE), 510 const_iv (KMOD_NONE),
511 const_iv (KMOD_SHIFT),
464 const_iv (KMOD_LSHIFT), 512 const_iv (KMOD_LSHIFT),
465 const_iv (KMOD_RSHIFT), 513 const_iv (KMOD_RSHIFT),
514 const_iv (KMOD_CTRL),
466 const_iv (KMOD_LCTRL), 515 const_iv (KMOD_LCTRL),
467 const_iv (KMOD_RCTRL), 516 const_iv (KMOD_RCTRL),
517 const_iv (KMOD_ALT),
468 const_iv (KMOD_LALT), 518 const_iv (KMOD_LALT),
469 const_iv (KMOD_RALT), 519 const_iv (KMOD_RALT),
520 const_iv (KMOD_META),
470 const_iv (KMOD_LMETA), 521 const_iv (KMOD_LMETA),
471 const_iv (KMOD_RMETA), 522 const_iv (KMOD_RMETA),
472 const_iv (KMOD_NUM), 523 const_iv (KMOD_NUM),
473 const_iv (KMOD_CAPS), 524 const_iv (KMOD_CAPS),
474 const_iv (KMOD_MODE), 525 const_iv (KMOD_MODE),
475 const_iv (KMOD_CTRL),
476 const_iv (KMOD_SHIFT),
477 const_iv (KMOD_ALT),
478 const_iv (KMOD_META)
479# undef const_iv 526# undef const_iv
480 }; 527 };
481 528
482 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 529 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
483 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 530 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
531
532 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
533 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
484} 534}
535
536void
537weaken (SV *rv)
538 PROTOTYPE: $
539 CODE:
540 sv_rvweaken (rv);
485 541
486int 542int
487in_destruct () 543in_destruct ()
488 CODE: 544 CODE:
489 RETVAL = PL_main_cv == Nullcv; 545 RETVAL = PL_main_cv == Nullcv;
… …
560 RETVAL = !!SDL_SetVideoMode ( 616 RETVAL = !!SDL_SetVideoMode (
561 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 617 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
562 ); 618 );
563 if (RETVAL) 619 if (RETVAL)
564 { 620 {
621 av_clear (texture_av);
622
565 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 623 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
566# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 624# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
567# include "glfunc.h" 625# include "glfunc.h"
568# undef GL_FUNC 626# undef GL_FUNC
627
569 } 628 }
570 OUTPUT: 629 OUTPUT:
571 RETVAL 630 RETVAL
572 631
573void 632void
… …
592 case SDL_KEYDOWN: 651 case SDL_KEYDOWN:
593 case SDL_KEYUP: 652 case SDL_KEYUP:
594 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
595 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
596 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 655 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
656 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
597 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
598 break; 658 break;
599 659
600 case SDL_ACTIVEEVENT: 660 case SDL_ACTIVEEVENT:
601 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
646Mix_AllocateChannels (int numchans = -1) 706Mix_AllocateChannels (int numchans = -1)
647 707
648void 708void
649lowdelay (int fd, int val = 1) 709lowdelay (int fd, int val = 1)
650 CODE: 710 CODE:
711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
712
713void
714win32_proxy_info ()
715 PPCODE:
716{
651#ifndef _WIN32 717#ifdef _WIN32
652 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 718 char buffer[2048];
719 DWORD buflen;
720
721 EXTEND (SP, 3);
722
723 buflen = sizeof (buffer);
724 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
725 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
726 {
727 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
728
729 buflen = sizeof (buffer);
730 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
731 {
732 PUSHs (newSVpv (buffer, 0));
733
734 buflen = sizeof (buffer);
735 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
736 PUSHs (newSVpv (buffer, 0));
737 }
738 }
653#endif 739#endif
740}
654 741
655void 742void
656add_font (char *file) 743add_font (char *file)
657 CODE: 744 CODE:
658 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 745 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 849 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
763#endif 850#endif
764 _exit (1); 851 _exit (1);
765 852
766void 853void
767_exit (int retval) 854_exit (int retval = 0)
768 CODE: 855 CODE:
856#ifdef WIN32
857 ExitThread (retval); // unclean, please beam me up
858#else
769 _exit (retval); 859 _exit (retval);
860#endif
770 861
771MODULE = CFPlus PACKAGE = CFPlus::Font 862MODULE = CFPlus PACKAGE = CFPlus::Font
772 863
773CFPlus::Font 864CFPlus::Font
774new_from_file (SV *class, char *path, int id = 0) 865new_from_file (SV *class, char *path, int id = 0)
… …
1021xy_to_index (CFPlus::Layout self, int x, int y) 1112xy_to_index (CFPlus::Layout self, int x, int y)
1022 CODE: 1113 CODE:
1023{ 1114{
1024 int index, trailing; 1115 int index, trailing;
1025 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1116 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1026 RETVAL = index; 1117 RETVAL = index + trailing;
1027} 1118}
1028 OUTPUT: 1119 OUTPUT:
1029 RETVAL 1120 RETVAL
1030 1121
1031void 1122void
… …
1037 1128
1038 EXTEND (SP, 3); 1129 EXTEND (SP, 3);
1039 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1130 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1133}
1134
1135void
1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1137 PPCODE:
1138{
1139 int line, x;
1140
1141 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1142 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1143
1144 EXTEND (SP, 2);
1145 PUSHs (sv_2mortal (newSViv (line - 1)));
1146 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1147}
1148
1149void
1150line_x_to_index (CFPlus::Layout self, int line, int x)
1151 PPCODE:
1152{
1153 PangoLayoutLine *lp;
1154 int index, trailing;
1155
1156 if (line < 0)
1157 XSRETURN_EMPTY;
1158
1159 if (!(lp = pango_layout_get_line (self->pl, line)))
1160 XSRETURN_EMPTY; /* do better */
1161
1162 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1163
1164 EXTEND (SP, 2);
1165 if (GIMME_V == G_SCALAR)
1166 PUSHs (sv_2mortal (newSViv (index + trailing)));
1167 else
1168 {
1169 PUSHs (sv_2mortal (newSViv (index)));
1170 PUSHs (sv_2mortal (newSViv (trailing)));
1171 }
1042} 1172}
1043 1173
1044void 1174void
1045render (CFPlus::Layout self, float x, float y, int flags = 0) 1175render (CFPlus::Layout self, float x, float y, int flags = 0)
1046 PPCODE: 1176 PPCODE:
… …
1140} 1270}
1141 1271
1142MODULE = CFPlus PACKAGE = CFPlus::Map 1272MODULE = CFPlus PACKAGE = CFPlus::Map
1143 1273
1144CFPlus::Map 1274CFPlus::Map
1145new (SV *class, int map_width, int map_height) 1275new (SV *class)
1146 CODE: 1276 CODE:
1147 New (0, RETVAL, 1, struct map); 1277 New (0, RETVAL, 1, struct map);
1148 RETVAL->x = 0; 1278 RETVAL->x = 0;
1149 RETVAL->y = 0; 1279 RETVAL->y = 0;
1150 RETVAL->w = map_width; 1280 RETVAL->w = 0;
1151 RETVAL->h = map_height; 1281 RETVAL->h = 0;
1152 RETVAL->ox = 0; 1282 RETVAL->ox = 0;
1153 RETVAL->oy = 0; 1283 RETVAL->oy = 0;
1154 RETVAL->faces = 8192; 1284 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1155 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1285 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1156 RETVAL->texs = 8192;
1157 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1158 RETVAL->rows = 0; 1286 RETVAL->rows = 0;
1159 RETVAL->row = 0; 1287 RETVAL->row = 0;
1160 OUTPUT: 1288 OUTPUT:
1161 RETVAL 1289 RETVAL
1162 1290
1163void 1291void
1164DESTROY (CFPlus::Map self) 1292DESTROY (CFPlus::Map self)
1165 CODE: 1293 CODE:
1166{ 1294{
1167 map_clear (self); 1295 map_clear (self);
1168 Safefree (self->face); 1296 Safefree (self->face2tile);
1169 Safefree (self->tex); 1297 Safefree (self->tex);
1170 Safefree (self); 1298 Safefree (self);
1171} 1299}
1172 1300
1173void 1301void
1302resize (CFPlus::Map self, int map_width, int map_height)
1303 CODE:
1304 self->w = map_width;
1305 self->h = map_height;
1306
1307void
1174clear (CFPlus::Map self) 1308clear (CFPlus::Map self)
1175 CODE: 1309 CODE:
1176 map_clear (self); 1310 map_clear (self);
1177 1311
1178void 1312void
1179set_face (CFPlus::Map self, int face, int texid) 1313set_tileid (CFPlus::Map self, int face, int tile)
1180 CODE: 1314 CODE:
1181{ 1315{
1182 while (self->faces <= face) 1316 need_facenum (self, face); self->face2tile [face] = tile;
1183 { 1317 need_texid (self, tile);
1184 Append (mapface, self->face, self->faces, self->faces); 1318}
1185 self->faces *= 2;
1186 }
1187 1319
1188 self->face [face] = texid; 1320void
1321set_smooth (CFPlus::Map self, int face, int smooth, int level)
1322 CODE:
1323{
1324 tileid texid;
1325 maptex *tex;
1326
1327 if (face < 0 || face >= self->faces)
1328 return;
1329
1330 if (smooth < 0 || smooth >= self->faces)
1331 return;
1332
1333 texid = self->face2tile [face];
1334
1335 if (!texid)
1336 return;
1337
1338 tex = self->tex + texid;
1339 tex->smoothtile = self->face2tile [smooth];
1340 tex->smoothlevel = level;
1189} 1341}
1190 1342
1191void 1343void
1192set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1344set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1193 CODE: 1345 CODE:
1194{ 1346{
1195 while (self->texs <= texid) 1347 need_texid (self, texid);
1196 {
1197 Append (maptex, self->tex, self->texs, self->texs);
1198 self->texs *= 2;
1199 }
1200 1348
1201 { 1349 {
1202 maptex *tex = self->tex + texid; 1350 maptex *tex = self->tex + texid;
1203 1351
1204 tex->name = name; 1352 tex->name = name;
… …
1248 CODE: 1396 CODE:
1249{ 1397{
1250 if (dx > 0) 1398 if (dx > 0)
1251 map_blank (self, self->x, self->y, dx, self->h); 1399 map_blank (self, self->x, self->y, dx, self->h);
1252 else if (dx < 0) 1400 else if (dx < 0)
1253 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1401 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1254 1402
1255 if (dy > 0) 1403 if (dy > 0)
1256 map_blank (self, self->x, self->y, self->w, dy); 1404 map_blank (self, self->x, self->y, self->w, dy);
1257 else if (dy < 0) 1405 else if (dy < 0)
1258 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1406 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1259 1407
1260 self->ox += dx; self->x += dx; 1408 self->ox += dx; self->x += dx;
1261 self->oy += dy; self->y += dy; 1409 self->oy += dy; self->y += dy;
1262 1410
1263 while (self->y < 0) 1411 while (self->y < 0)
… …
1315 cell->stat_width = 1; 1463 cell->stat_width = 1;
1316 cell->stat_hp = *data++; 1464 cell->stat_hp = *data++;
1317 } 1465 }
1318 else if (cmd == 6) // monster width 1466 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1; 1467 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width 1468 else if (cmd == 0x47)
1321 { 1469 {
1322 if (*data == 4) 1470 if (*data == 4)
1323 ; // decode player tag 1471 ; // decode player count
1324 1472
1325 data += *data + 1; 1473 data += *data + 1;
1326 } 1474 }
1327 else if (cmd == 8) // cell flags 1475 else if (cmd == 8) // cell flags
1328 cell->flags = *data++; 1476 cell->flags = *data++;
… …
1337 cell->darkness = *data++ + 1; 1485 cell->darkness = *data++ + 1;
1338 } 1486 }
1339 1487
1340 if (flags & 4) 1488 if (flags & 4)
1341 { 1489 {
1342 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1490 faceid face = (data [0] << 8) + data [1]; data += 2;
1491 need_facenum (self, face);
1492 cell->tile [0] = self->face2tile [face];
1343 } 1493 }
1344 1494
1345 if (flags & 2) 1495 if (flags & 2)
1346 { 1496 {
1347 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1497 faceid face = (data [0] << 8) + data [1]; data += 2;
1498 need_facenum (self, face);
1499 cell->tile [1] = self->face2tile [face];
1348 } 1500 }
1349 1501
1350 if (flags & 1) 1502 if (flags & 1)
1351 { 1503 {
1352 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1504 faceid face = (data [0] << 8) + data [1]; data += 2;
1505 need_facenum (self, face);
1506 cell->tile [2] = self->face2tile [face];
1353 } 1507 }
1354 } 1508 }
1355 else 1509 else
1356 cell->darkness = 0; 1510 cell->darkness = 0;
1357 } 1511 }
… …
1387 { 1541 {
1388 mapcell *cell = row->col + (x - row->c0); 1542 mapcell *cell = row->col + (x - row->c0);
1389 1543
1390 for (z = 0; z <= 0; z++) 1544 for (z = 0; z <= 0; z++)
1391 { 1545 {
1392 mapface face = cell->face [z];
1393
1394 if (face)
1395 {
1396 maptex tex = self->tex [face]; 1546 maptex tex = self->tex [cell->tile [z]];
1397 int a0 = 255 - tex.a; 1547 int a0 = 255 - tex.a;
1398 int a1 = tex.a; 1548 int a1 = tex.a;
1399 1549
1400 r = (r * a0 + tex.r * a1) / 255; 1550 r = (r * a0 + tex.r * a1) / 255;
1401 g = (g * a0 + tex.g * a1) / 255; 1551 g = (g * a0 + tex.g * a1) / 255;
1402 b = (b * a0 + tex.b * a1) / 255; 1552 b = (b * a0 + tex.b * a1) / 255;
1403 a = (a * a0 + tex.a * a1) / 255; 1553 a = (a * a0 + tex.a * a1) / 255;
1404 }
1405 } 1554 }
1406 } 1555 }
1407 1556
1408 *map++ = (r ) 1557 *map++ = (r )
1409 | (g << 8) 1558 | (g << 8)
… …
1416} 1565}
1417 OUTPUT: 1566 OUTPUT:
1418 RETVAL 1567 RETVAL
1419 1568
1420void 1569void
1421draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1570draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1422 CODE: 1571 CODE:
1423{ 1572{
1424 int vx, vy; 1573 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1574 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1575 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1576 smooth_key skey;
1425 int x, y, z; 1577 int x, y, z;
1426 int last_name; 1578 int last_name;
1427 mapface face;
1428 1579
1429 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1580 // thats current max. sorry.
1430 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1581 if (sw > 255) sw = 255;
1582 if (sh > 255) sh = 255;
1431 1583
1432 /* 1584 // clear key, in case of extra padding
1433 int vx = self->vx = self->w >= sw 1585 memset (&skey, 0, sizeof (skey));
1434 ? self->x + (self->w - sw) / 2
1435 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1436
1437 int vy = self->vy = self->h >= sh
1438 ? self->y + (self->h - sh) / 2
1439 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1440 */
1441 1586
1442 glColor4ub (255, 255, 255, 255); 1587 glColor4ub (255, 255, 255, 255);
1443 1588
1444 glEnable (GL_BLEND); 1589 glEnable (GL_BLEND);
1445 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1590 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1448 1593
1449 glBegin (GL_QUADS); 1594 glBegin (GL_QUADS);
1450 1595
1451 last_name = 0; 1596 last_name = 0;
1452 1597
1598 mx += self->x;
1599 my += self->y;
1600
1601 // first pass: determine smooth_max
1602 // rather ugly, if you ask me
1603 // could also be stored inside mapcell and updated on change
1604 memset (smooth_max, 0, sizeof (smooth_max));
1605
1606 for (y = 0; y < sh; y++)
1607 if (0 <= y + my && y + my < self->rows)
1608 {
1609 maprow *row = self->row + (y + my);
1610
1611 for (x = 0; x < sw; x++)
1612 if (row->c0 <= x + mx && x + mx < row->c1)
1613 {
1614 mapcell *cell = row->col + (x + mx - row->c0);
1615
1616 smooth_max[x + 1][y + 1] =
1617 MAX (self->tex [cell->tile [0]].smoothlevel,
1618 MAX (self->tex [cell->tile [1]].smoothlevel,
1619 self->tex [cell->tile [2]].smoothlevel));
1620 }
1621 }
1622
1453 for (z = 0; z < 3; z++) 1623 for (z = 0; z <= 2; z++)
1624 {
1625 memset (smooth_level, 0, sizeof (smooth_level));
1626
1454 for (y = 0; y < sh; y++) 1627 for (y = 0; y < sh; y++)
1455 if (0 <= y + vy && y + vy < self->rows) 1628 if (0 <= y + my && y + my < self->rows)
1456 { 1629 {
1457 maprow *row = self->row + (y + vy); 1630 maprow *row = self->row + (y + my);
1458 1631
1459 for (x = 0; x < sw; x++) 1632 for (x = 0; x < sw; x++)
1460 if (row->c0 <= x + vx && x + vx < row->c1) 1633 if (row->c0 <= x + mx && x + mx < row->c1)
1461 { 1634 {
1462 mapcell *cell = row->col + (x + vx - row->c0); 1635 mapcell *cell = row->col + (x + mx - row->c0);
1463
1464 face = cell->face [z]; 1636 tileid tile = cell->tile [z];
1637
1638 if (tile)
1639 {
1640 maptex tex = self->tex [tile];
1641 int px = (x + 1) * T - tex.w;
1642 int py = (y + 1) * T - tex.h;
1465 1643
1466 if (face && face < self->texs) 1644 // suppressing texture state switches here
1645 // is only moderately effective, but worth the extra effort
1646 if (last_name != tex.name)
1647 {
1648 if (!tex.name)
1649 tex = self->tex [2]; /* missing, replace by noface */
1650
1651 glEnd ();
1652 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1653 glBegin (GL_QUADS);
1654 }
1655
1656 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1657 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1658 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1659 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1660
1661 if (cell->flags && z == 2)
1662 {
1663 if (cell->flags & 1)
1664 {
1665 maptex tex = self->tex [1];
1666 int px = x * T + T * 2 / 32;
1667 int py = y * T - T * 6 / 32;
1668
1669 glEnd ();
1670 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1671 glBegin (GL_QUADS);
1672
1673 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1674 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1675 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1676 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1677 }
1678 }
1679
1680 // update smooth hash
1681 if (tex.smoothtile)
1682 {
1683 skey.tile = tex.smoothtile;
1684 skey.level = tex.smoothlevel;
1685
1686 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1687
1688 // add bits to current tile and all neighbours. skey.x|y is
1689 // shifted +1|+1 so we always stay positive.
1690
1691 // bits is ___n cccc CCCC bbbb
1692 // n do not draw borders&corners
1693 // c draw these corners, but...
1694 // C ... not these
1695 // b draw these borders
1696
1697 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1698 // ┃· ·· ·┃ ━━
1699
1700 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1701 // ·· ·· ·┏ ┓·
1702
1703 // full tile
1704 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1705
1706 // borders
1707 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1708 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1709 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1710 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1711
1712 // corners
1713 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1714 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1715 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1716 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1717 }
1718 }
1719 }
1720 }
1721
1722 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort
1724 {
1725 int w, b;
1726
1727 for (w = 0; w < 256 / 32; ++w)
1728 {
1729 uint32_t smask = smooth_level [w];
1730 if (smask)
1731 for (b = 0; b < 32; ++b)
1732 if (smask & (((uint32_t)1) << b))
1467 { 1733 {
1468 maptex tex = self->tex [face]; 1734 int level = (w << 5) | b;
1469 int px = (x + 1) * 32 - tex.w; 1735 HE *he;
1470 int py = (y + 1) * 32 - tex.h;
1471 1736
1472 if (last_name != tex.name) 1737 hv_iterinit (smooth);
1738 while ((he = hv_iternext (smooth)))
1473 { 1739 {
1740 smooth_key *skey = (smooth_key *)HeKEY (he);
1741 IV bits = SvIVX (HeVAL (he));
1742
1743 if (!(bits & 0x1000)
1744 && skey->level == level
1745 && level >= smooth_max [skey->x][skey->y])
1746 {
1747 maptex tex = self->tex [skey->tile];
1748 int px = (((int)skey->x) - 1) * T;
1749 int py = (((int)skey->y) - 1) * T;
1750 int border = bits & 15;
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1752 float dx = tex.s * .0625f; // 16 images/row
1753 float dy = tex.t * .5f ; // 2 images/column
1754
1755 // this time naively avoiding texture state changes
1756 // save gobs of state changes.
1757 if (last_name != tex.name)
1758 {
1759 if (!tex.name)
1760 continue; // smoothing not yet available
1761
1474 glEnd (); 1762 glEnd ();
1475 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1476 glBegin (GL_QUADS); 1764 glBegin (GL_QUADS);
1765 }
1766
1767 if (border)
1768 {
1769 float ox = border * dx;
1770
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1775 }
1776
1777 if (corner)
1778 {
1779 float ox = corner * dx;
1780
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1785 }
1477 } 1786 }
1478
1479 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1480 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1481 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1482 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1483 }
1484
1485 if (cell->flags && z == 2)
1486 {
1487 if (cell->flags & 1)
1488 {
1489 maptex tex = self->tex [1];
1490 int px = (x + 1) * 32 - tex.w + 2;
1491 int py = (y + 1) * 32 - tex.h - 6;
1492
1493 glEnd ();
1494 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1495 glBegin (GL_QUADS);
1496
1497 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1498 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1499 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1500 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1501 } 1787 }
1502 } 1788 }
1503 }
1504 } 1789 }
1790 }
1791
1792 hv_clear (smooth);
1793 }
1505 1794
1506 glEnd (); 1795 glEnd ();
1507 1796
1508 glDisable (GL_TEXTURE_2D); 1797 glDisable (GL_TEXTURE_2D);
1509 glDisable (GL_BLEND); 1798 glDisable (GL_BLEND);
1510 1799
1511 // top layer: overlays such as the health bar 1800 // top layer: overlays such as the health bar
1512 for (y = 0; y < sh; y++) 1801 for (y = 0; y < sh; y++)
1513 if (0 <= y + vy && y + vy < self->rows) 1802 if (0 <= y + my && y + my < self->rows)
1514 { 1803 {
1515 maprow *row = self->row + (y + vy); 1804 maprow *row = self->row + (y + my);
1516 1805
1517 for (x = 0; x < sw; x++) 1806 for (x = 0; x < sw; x++)
1518 if (row->c0 <= x + vx && x + vx < row->c1) 1807 if (row->c0 <= x + mx && x + mx < row->c1)
1519 { 1808 {
1520 mapcell *cell = row->col + (x + vx - row->c0); 1809 mapcell *cell = row->col + (x + mx - row->c0);
1521 1810
1522 int px = x * 32; 1811 int px = x * T;
1523 int py = y * 32; 1812 int py = y * T;
1524 1813
1525 if (cell->stat_hp) 1814 if (cell->stat_hp)
1526 { 1815 {
1527 int width = cell->stat_width * 32; 1816 int width = cell->stat_width * T;
1528 int thick = sh / 28 + 1 + cell->stat_width; 1817 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1529 1818
1530 glColor3ub (0, 0, 0); 1819 glColor3ub (0, 0, 0);
1531 glRectf (px + 1, py - thick - 2, 1820 glRectf (px + 1, py - thick - 2,
1532 px + width - 1, py); 1821 px + width - 1, py);
1533 1822
… …
1599 glDisable (GL_BLEND); 1888 glDisable (GL_BLEND);
1600 glDisable (GL_TEXTURE_2D); 1889 glDisable (GL_TEXTURE_2D);
1601} 1890}
1602 1891
1603void 1892void
1604fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1893fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1605 PPCODE: 1894 PPCODE:
1606{ 1895{
1607 int vx, vy;
1608 int x, y; 1896 int x, y;
1609 int sw4 = (sw + 3) & ~3; 1897 int sw4 = (sw + 3) & ~3;
1610 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1898 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1611 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1899 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1612 1900
1613 memset (darkness, 255, sw4 * sh); 1901 memset (darkness, 255, sw4 * sh);
1614 SvPOK_only (darkness_sv); 1902 SvPOK_only (darkness_sv);
1615 SvCUR_set (darkness_sv, sw4 * sh); 1903 SvCUR_set (darkness_sv, sw4 * sh);
1616 1904
1617 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1905 mx += self->x;
1618 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1906 my += self->y;
1619 1907
1620 for (y = 0; y < sh; y++) 1908 for (y = 0; y < sh; y++)
1621 if (0 <= y + vy && y + vy < self->rows) 1909 if (0 <= y + my && y + my < self->rows)
1622 { 1910 {
1623 maprow *row = self->row + (y + vy); 1911 maprow *row = self->row + (y + my);
1624 1912
1625 for (x = 0; x < sw; x++) 1913 for (x = 0; x < sw; x++)
1626 if (row->c0 <= x + vx && x + vx < row->c1) 1914 if (row->c0 <= x + mx && x + mx < row->c1)
1627 { 1915 {
1628 mapcell *cell = row->col + (x + vx - row->c0); 1916 mapcell *cell = row->col + (x + mx - row->c0);
1629 1917
1630 darkness[y * sw4 + x] = cell->darkness 1918 darkness[y * sw4 + x] = cell->darkness
1631 ? 255 - (cell->darkness - 1) 1919 ? 255 - (cell->darkness - 1)
1632 : 255 - FOW_DARKNESS; 1920 : 255 - FOW_DARKNESS;
1633 } 1921 }
… …
1673 if (row && row->c0 <= x && x < row->c1) 1961 if (row && row->c0 <= x && x < row->c1)
1674 { 1962 {
1675 mapcell *cell = row->col + (x - row->c0); 1963 mapcell *cell = row->col + (x - row->c0);
1676 uint8_t flags = 0; 1964 uint8_t flags = 0;
1677 1965
1678 if (cell->face [0]) flags |= 1; 1966 if (cell->tile [0]) flags |= 1;
1679 if (cell->face [1]) flags |= 2; 1967 if (cell->tile [1]) flags |= 2;
1680 if (cell->face [2]) flags |= 4; 1968 if (cell->tile [2]) flags |= 4;
1681 1969
1682 *data++ = flags; 1970 *data++ = flags;
1683 1971
1684 if (flags & 1) 1972 if (flags & 1)
1685 { 1973 {
1974 tileid tile = cell->tile [0];
1686 *data++ = cell->face [0] >> 8; 1975 *data++ = tile >> 8;
1687 *data++ = cell->face [0]; 1976 *data++ = tile;
1688 } 1977 }
1689 1978
1690 if (flags & 2) 1979 if (flags & 2)
1691 { 1980 {
1981 tileid tile = cell->tile [1];
1692 *data++ = cell->face [1] >> 8; 1982 *data++ = tile >> 8;
1693 *data++ = cell->face [1]; 1983 *data++ = tile;
1694 } 1984 }
1695 1985
1696 if (flags & 4) 1986 if (flags & 4)
1697 { 1987 {
1988 tileid tile = cell->tile [2];
1698 *data++ = cell->face [2] >> 8; 1989 *data++ = tile >> 8;
1699 *data++ = cell->face [2]; 1990 *data++ = tile;
1700 } 1991 }
1701 } 1992 }
1702 else 1993 else
1703 *data++ = 0; 1994 *data++ = 0;
1704 } 1995 }
… …
1744 { 2035 {
1745 uint8_t flags = *data++; 2036 uint8_t flags = *data++;
1746 2037
1747 if (flags) 2038 if (flags)
1748 { 2039 {
1749 mapface face[3] = { 0, 0, 0 };
1750
1751 mapcell *cell = row_get_cell (row, x); 2040 mapcell *cell = row_get_cell (row, x);
2041 tileid tile[3] = { 0, 0, 0 };
1752 2042
1753 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2043 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1754 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2044 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1755 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2045 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1756 2046
1757 if (cell->darkness == 0) 2047 if (cell->darkness == 0)
1758 { 2048 {
1759 cell->darkness = 0; 2049 cell->darkness = 0;
1760 2050
1761 for (z = 0; z <= 2; z++) 2051 for (z = 0; z <= 2; z++)
1762 { 2052 {
1763 cell->face[z] = face[z]; 2053 tileid t = tile [z];
1764 2054
1765 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2055 if (t >= self->texs || (t && !self->tex [t].name))
2056 {
1766 XPUSHs (sv_2mortal (newSViv (face[z]))); 2057 XPUSHs (sv_2mortal (newSViv (t)));
2058 need_texid (self, t);
2059 }
2060
2061 cell->tile [z] = t;
1767 } 2062 }
1768 } 2063 }
1769 } 2064 }
1770 } 2065 }
1771 } 2066 }
… …
1920# undef const_iv 2215# undef const_iv
1921 }; 2216 };
1922 2217
1923 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2218 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1924 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2219 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2220
2221 texture_av = newAV ();
2222 AvREAL_off (texture_av);
1925} 2223}
1926 2224
1927char * 2225char *
1928gl_vendor () 2226gl_vendor ()
1929 CODE: 2227 CODE:
… …
2080 2378
2081int glGenTexture () 2379int glGenTexture ()
2082 CODE: 2380 CODE:
2083{ 2381{
2084 GLuint name; 2382 GLuint name;
2383 if (AvFILL (texture_av) >= 0)
2384 name = (GLuint)(size_t)av_pop (texture_av);
2385 else
2085 glGenTextures (1, &name); 2386 glGenTextures (1, &name);
2086 RETVAL = name; 2387 RETVAL = name;
2087} 2388}
2088 OUTPUT: 2389 OUTPUT:
2089 RETVAL 2390 RETVAL
2090 2391
2091void glDeleteTexture (int name) 2392void glDeleteTexture (int name)
2092 CODE: 2393 CODE:
2093{ 2394{
2094 GLuint name_ = name; 2395 /* make a half-assed attempt at returning the memory used by the texture */
2095 glDeleteTextures (1, &name_); 2396 /* textures are frequently being reused by cfplus anyway */
2397 /*glBindTexture (GL_TEXTURE_2D, name);*/
2398 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
2399 av_push (texture_av, (SV *)(size_t)name);
2400 /*{ GLuint name_ = name; glDeleteTextures (1, &name_); }*/
2096} 2401}
2097 2402
2098int glGenList () 2403int glGenList ()
2099 CODE: 2404 CODE:
2100 RETVAL = glGenLists (1); 2405 RETVAL = glGenLists (1);

Diff Legend

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