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.112 by root, Mon Jun 12 14:55:41 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_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
15#include <stdlib.h> 23#include <stdlib.h>
16 24
18#include <SDL_endian.h> 26#include <SDL_endian.h>
19#include <SDL_image.h> 27#include <SDL_image.h>
20#include <SDL_mixer.h> 28#include <SDL_mixer.h>
21#include <SDL_opengl.h> 29#include <SDL_opengl.h>
22 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
23#include <glib/gmacros.h> 34#include <glib/gmacros.h>
24 35
25#include <pango/pango.h> 36#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 37
30#ifndef _WIN32 38#ifndef _WIN32
31# include <sys/types.h> 39# include <sys/types.h>
32# include <sys/socket.h> 40# include <sys/socket.h>
33# include <netinet/in.h> 41# include <netinet/in.h>
34# include <netinet/tcp.h> 42# include <netinet/tcp.h>
35# include <inttypes.h> 43# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 44#endif
44 45
45#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 47
47#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
48 49
49#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
51 52
52#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
54
55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else
58# define PARACHUTE 0
59#endif
60
61static AV *texture_av;
53 62
54static struct 63static struct
55{ 64{
56#define GL_FUNC(ptr,name) ptr name; 65#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 66#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 75 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 76 else
68 glBlendFunc (sa, da); 77 glBlendFunc (sa, da);
69} 78}
70 79
80#include "texcache.c"
81
82#include "pango-font.c"
83#include "pango-fontmap.c"
84#include "pango-render.c"
85
71typedef Mix_Chunk *CFClient__MixChunk; 86typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 87typedef Mix_Music *CFPlus__MixMusic;
73 88
74typedef PangoFontDescription *CFClient__Font; 89typedef PangoFontDescription *CFPlus__Font;
90
91static int
92shape_attr_p (PangoLayoutRun *run)
93{
94 GSList *attrs = run->item->analysis.extra_attrs;
95
96 while (attrs)
97 {
98 PangoAttribute *attr = attrs->data;
99
100 if (attr->klass->type == PANGO_ATTR_SHAPE)
101 return 1;
102
103 attrs = attrs->next;
104 }
105
106 return 0;
107}
75 108
76typedef struct cf_layout { 109typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 110 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 111 float r, g, b, a; // default color for rgba mode
80 int base_height; 112 int base_height;
81 CFClient__Font font; 113 CFPlus__Font font;
82} *CFClient__Layout; 114} *CFPlus__Layout;
83 115
84static CFClient__Font default_font; 116static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 117static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 118static PangoFontMap *opengl_fontmap;
87 119
88static void 120static void
89substitute_func (FcPattern *pattern, gpointer data) 121substitute_func (FcPattern *pattern, gpointer data)
90{ 122{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 123 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 124#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 125 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 126#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 127 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 128}
101 129
102static void 130static void
103layout_update_font (CFClient__Layout self) 131layout_update_font (CFPlus__Layout self)
104{ 132{
105 /* use a random scale factor to account for unknown descenders, 0.8 works 133 /* use a random scale factor to account for unknown descenders, 0.8 works
106 * reasonably well with bitstream vera 134 * reasonably well with bitstream vera
107 */ 135 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 136 PangoFontDescription *font = self->font ? self->font : default_font;
112 140
113 pango_layout_set_font_description (self->pl, font); 141 pango_layout_set_font_description (self->pl, font);
114} 142}
115 143
116static void 144static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 145layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 146{
147 PangoRectangle rect;
148
149 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 150 pango_layout_get_extents (self->pl, 0, &rect);
120 151
121 if (!*w) *w = 1; 152 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 153 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 154
124 *w = (*w + 3) & ~3; 155 if (!rect.width) rect.width = 1;
125} 156 if (!rect.height) rect.height = 1;
126 157
158 *w = rect.width;
159 *h = rect.height;
160}
161
162typedef uint16_t tileid;
127typedef uint16_t mapface; 163typedef uint16_t faceid;
128 164
129typedef struct { 165typedef struct {
130 GLint name; 166 int name;
131 int w, h; 167 int w, h;
132 float s, t; 168 float s, t;
133 uint8_t r, g, b, a; 169 uint8_t r, g, b, a;
170 tileid smoothtile;
171 uint8_t smoothlevel;
134} maptex; 172} maptex;
135 173
136typedef struct { 174typedef struct {
175 uint32_t player;
176 tileid tile[3];
137 int16_t darkness; 177 uint16_t darkness;
138 mapface face[3]; 178 uint8_t stat_width, stat_hp, flags, smoothmax;
139} mapcell; 179} mapcell;
140 180
141typedef struct { 181typedef struct {
142 int32_t c0, c1; 182 int32_t c0, c1;
143 mapcell *col; 183 mapcell *col;
144} maprow; 184} maprow;
145 185
146typedef struct map { 186typedef struct map {
147 int x, y, w, h; 187 int x, y, w, h;
148 int ox, oy; /* offset to virtual global coordinate system */ 188 int ox, oy; /* offset to virtual global coordinate system */
149 int faces; 189 int faces; tileid *face2tile; // [faceid]
150 mapface *face; 190 int texs; maptex *tex; // [tileid]
151
152 int texs;
153 maptex *tex;
154 191
155 int32_t rows; 192 int32_t rows;
156 maprow *row; 193 maprow *row;
157} *CFClient__Map; 194} *CFPlus__Map;
158 195
159static char * 196static char *
160prepend (char *ptr, int sze, int inc) 197prepend (char *ptr, int sze, int inc)
161{ 198{
162 char *p; 199 char *p;
179} 216}
180 217
181#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))
182#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))
183 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}
240
184static maprow * 241static maprow *
185map_get_row (CFClient__Map self, int y) 242map_get_row (CFPlus__Map self, int y)
186{ 243{
187 if (0 > y) 244 if (0 > y)
188 { 245 {
189 int extend = - y + MAP_EXTEND_Y; 246 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 247 Prepend (maprow, self->row, self->rows, extend);
228 285
229 return row->col + (x - row->c0); 286 return row->col + (x - row->c0);
230} 287}
231 288
232static mapcell * 289static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 290map_get_cell (CFPlus__Map self, int x, int y)
234{ 291{
235 return row_get_cell (map_get_row (self, y), x); 292 return row_get_cell (map_get_row (self, y), x);
236} 293}
237 294
238static void 295static void
239map_clear (CFClient__Map self) 296map_clear (CFPlus__Map self)
240{ 297{
241 int r; 298 int r;
242 299
243 for (r = 0; r < self->rows; r++) 300 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 301 Safefree (self->row[r].col);
252 self->row = 0; 309 self->row = 0;
253 self->rows = 0; 310 self->rows = 0;
254} 311}
255 312
256static void 313static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 314map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 315{
259 int x, y; 316 int x, y;
260 maprow *row; 317 maprow *row;
318 mapcell *cell;
261 319
262 for (y = y0; y < y0 + h; y++) 320 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 321 if (y >= 0)
264 { 322 {
265 if (y >= self->rows) 323 if (y >= self->rows)
271 if (x >= row->c0) 329 if (x >= row->c0)
272 { 330 {
273 if (x >= row->c1) 331 if (x >= row->c1)
274 break; 332 break;
275 333
276 row->col[x - row->c0].darkness = -1; 334 cell = row->col + x - row->c0;
335
336 cell->darkness = 0;
337 cell->stat_hp = 0;
338 cell->flags = 0;
339 cell->player = 0;
277 } 340 }
278 } 341 }
342}
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);
279} 358}
280 359
281static void 360static void
282music_finished (void) 361music_finished (void)
283{ 362{
302 ev.data2 = 0; 381 ev.data2 = 0;
303 382
304 SDL_PushEvent ((SDL_Event *)&ev); 383 SDL_PushEvent ((SDL_Event *)&ev);
305} 384}
306 385
386static unsigned int
387minpot (unsigned int n)
388{
389 if (!n)
390 return 0;
391
392 --n;
393
394 n |= n >> 1;
395 n |= n >> 2;
396 n |= n >> 4;
397 n |= n >> 8;
398 n |= n >> 16;
399
400 return n + 1;
401}
402
403/* SDL should provide this, really. */
404#define SDLK_MODIFIER_MIN 300
405#define SDLK_MODIFIER_MAX 314
406
307MODULE = CFClient PACKAGE = CFClient 407MODULE = CFPlus PACKAGE = CFPlus
308 408
309PROTOTYPES: ENABLE 409PROTOTYPES: ENABLE
310 410
311BOOT: 411BOOT:
312{ 412{
313 HV *stash = gv_stashpv ("CFClient", 1); 413 HV *stash = gv_stashpv ("CFPlus", 1);
314 static const struct { 414 static const struct {
315 const char *name; 415 const char *name;
316 IV iv; 416 IV iv;
317 } *civ, const_iv[] = { 417 } *civ, const_iv[] = {
318# 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
319 const_iv (SDL_ACTIVEEVENT), 422 const_iv (SDL_ACTIVEEVENT),
320 const_iv (SDL_KEYDOWN), 423 const_iv (SDL_KEYDOWN),
321 const_iv (SDL_KEYUP), 424 const_iv (SDL_KEYUP),
322 const_iv (SDL_MOUSEMOTION), 425 const_iv (SDL_MOUSEMOTION),
323 const_iv (SDL_MOUSEBUTTONDOWN), 426 const_iv (SDL_MOUSEBUTTONDOWN),
332 const_iv (SDL_EVENT_RESERVEDA), 435 const_iv (SDL_EVENT_RESERVEDA),
333 const_iv (SDL_EVENT_RESERVEDB), 436 const_iv (SDL_EVENT_RESERVEDB),
334 const_iv (SDL_VIDEORESIZE), 437 const_iv (SDL_VIDEORESIZE),
335 const_iv (SDL_VIDEOEXPOSE), 438 const_iv (SDL_VIDEOEXPOSE),
336 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
337 const_iv (SDLK_KP0), 445 const_iv (SDLK_KP0),
338 const_iv (SDLK_KP1), 446 const_iv (SDLK_KP1),
339 const_iv (SDLK_KP2), 447 const_iv (SDLK_KP2),
340 const_iv (SDLK_KP3), 448 const_iv (SDLK_KP3),
341 const_iv (SDLK_KP4), 449 const_iv (SDLK_KP4),
396 const_iv (SDLK_BREAK), 504 const_iv (SDLK_BREAK),
397 const_iv (SDLK_MENU), 505 const_iv (SDLK_MENU),
398 const_iv (SDLK_POWER), 506 const_iv (SDLK_POWER),
399 const_iv (SDLK_EURO), 507 const_iv (SDLK_EURO),
400 const_iv (SDLK_UNDO), 508 const_iv (SDLK_UNDO),
509
401 const_iv (KMOD_NONE), 510 const_iv (KMOD_NONE),
511 const_iv (KMOD_SHIFT),
402 const_iv (KMOD_LSHIFT), 512 const_iv (KMOD_LSHIFT),
403 const_iv (KMOD_RSHIFT), 513 const_iv (KMOD_RSHIFT),
514 const_iv (KMOD_CTRL),
404 const_iv (KMOD_LCTRL), 515 const_iv (KMOD_LCTRL),
405 const_iv (KMOD_RCTRL), 516 const_iv (KMOD_RCTRL),
517 const_iv (KMOD_ALT),
406 const_iv (KMOD_LALT), 518 const_iv (KMOD_LALT),
407 const_iv (KMOD_RALT), 519 const_iv (KMOD_RALT),
520 const_iv (KMOD_META),
408 const_iv (KMOD_LMETA), 521 const_iv (KMOD_LMETA),
409 const_iv (KMOD_RMETA), 522 const_iv (KMOD_RMETA),
410 const_iv (KMOD_NUM), 523 const_iv (KMOD_NUM),
411 const_iv (KMOD_CAPS), 524 const_iv (KMOD_CAPS),
412 const_iv (KMOD_MODE), 525 const_iv (KMOD_MODE),
413 const_iv (KMOD_CTRL),
414 const_iv (KMOD_SHIFT),
415 const_iv (KMOD_ALT),
416 const_iv (KMOD_META)
417# undef const_iv 526# undef const_iv
418 }; 527 };
419 528
420 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; )
421 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);
422} 534}
535
536void
537weaken (SV *rv)
538 PROTOTYPE: $
539 CODE:
540 sv_rvweaken (rv);
541
542int
543in_destruct ()
544 CODE:
545 RETVAL = PL_main_cv == Nullcv;
546 OUTPUT:
547 RETVAL
548
549NV floor (NV x)
550
551NV ceil (NV x)
423 552
424void 553void
425pango_init () 554pango_init ()
426 CODE: 555 CODE:
427 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{ 556{
429 {
430 ft2_fontmap = pango_ft2_font_map_new (); 557 opengl_fontmap = pango_opengl_font_map_new ();
431 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 558 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
432 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 559 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433 }
434 {
435 cairo_font_options_t *fopt = cairo_font_options_create ();
436 cairo_fontmap = pango_cairo_font_map_get_default ();
437 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438#ifdef _WIN32
439 // cairo looks like shit eaten twice on windows
440 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441#else
442 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443#endif
444 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446 pango_cairo_context_set_font_options (cairo_context, fopt);
447 cairo_font_options_destroy (fopt);
448 }
449} 560}
450 561
451int 562int
452SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 563SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
453 564
454void 565void
455SDL_Quit () 566SDL_Quit ()
456 567
457void 568void
464 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 575 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 576 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 577 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467 578
468 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 579 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 580 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470 581
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 582 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 583 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 584 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 585 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475 586
476 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 587 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
588#if SDL_VERSION_ATLEAST(1,2,10)
589 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
590 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
591#endif
477 592
478 SDL_EnableUNICODE (1); 593 SDL_EnableUNICODE (1);
479 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 594 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480 595
481 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 596 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
501 RETVAL = !!SDL_SetVideoMode ( 616 RETVAL = !!SDL_SetVideoMode (
502 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 617 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
503 ); 618 );
504 if (RETVAL) 619 if (RETVAL)
505 { 620 {
621 av_clear (texture_av);
622
506 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 623 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
507# 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);
508# include "glfunc.h" 625# include "glfunc.h"
509# undef GL_FUNC 626# undef GL_FUNC
627
510 } 628 }
511 OUTPUT: 629 OUTPUT:
512 RETVAL 630 RETVAL
513 631
514void 632void
533 case SDL_KEYDOWN: 651 case SDL_KEYDOWN:
534 case SDL_KEYUP: 652 case SDL_KEYUP:
535 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
536 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
537 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 */
538 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
539 break; 658 break;
540 659
541 case SDL_ACTIVEEVENT: 660 case SDL_ACTIVEEVENT:
542 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
568 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 687 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 688 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570 break; 689 break;
571 } 690 }
572 691
573 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 692 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574 } 693 }
575} 694}
576 695
577int 696int
578Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 697Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
587Mix_AllocateChannels (int numchans = -1) 706Mix_AllocateChannels (int numchans = -1)
588 707
589void 708void
590lowdelay (int fd, int val = 1) 709lowdelay (int fd, int val = 1)
591 CODE: 710 CODE:
711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
712
713void
714win32_proxy_info ()
715 PPCODE:
716{
592#ifndef _WIN32 717#ifdef _WIN32
593 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 }
594#endif 739#endif
740}
595 741
596void 742void
597add_font (char *file) 743add_font (char *file)
598 CODE: 744 CODE:
599 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 745 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600#ifdef _WIN32
601 // cairo... sigh... requires win2000
602 AddFontResourceEx (file, FR_PRIVATE, 0);
603#endif
604 746
605void 747void
606load_image_inline (SV *image_) 748load_image_inline (SV *image_)
607 ALIAS: 749 ALIAS:
608 load_image_file = 1 750 load_image_file = 1
650 792
651 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 793 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652 794
653 assert (surface2->pitch == surface2->w * 4); 795 assert (surface2->pitch == surface2->w * 4);
654 796
797 SDL_LockSurface (surface2);
655 EXTEND (SP, 5); 798 EXTEND (SP, 6);
656 PUSHs (sv_2mortal (newSViv (surface2->w))); 799 PUSHs (sv_2mortal (newSViv (surface2->w)));
657 PUSHs (sv_2mortal (newSViv (surface2->h))); 800 PUSHs (sv_2mortal (newSViv (surface2->h)));
658 SDL_LockSurface (surface2);
659 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 801 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660 SDL_UnlockSurface (surface2);
661 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 802 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
662 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 803 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 804 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
805 SDL_UnlockSurface (surface2);
664 806
665 SDL_FreeSurface (surface); 807 SDL_FreeSurface (surface);
666 SDL_FreeSurface (surface2); 808 SDL_FreeSurface (surface2);
667} 809}
668 810
707 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 849 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
708#endif 850#endif
709 _exit (1); 851 _exit (1);
710 852
711void 853void
712_exit (int retval) 854_exit (int retval = 0)
713 CODE: 855 CODE:
856#ifdef WIN32
857 ExitThread (retval); // unclean, please beam me up
858#else
714 _exit (retval); 859 _exit (retval);
860#endif
715 861
716MODULE = CFClient PACKAGE = CFClient::Font 862MODULE = CFPlus PACKAGE = CFPlus::Font
717 863
718CFClient::Font 864CFPlus::Font
719new_from_file (SV *class, char *path, int id = 0) 865new_from_file (SV *class, char *path, int id = 0)
720 CODE: 866 CODE:
721{ 867{
722 int count; 868 int count;
723 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 869 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
726} 872}
727 OUTPUT: 873 OUTPUT:
728 RETVAL 874 RETVAL
729 875
730void 876void
731DESTROY (CFClient::Font self) 877DESTROY (CFPlus::Font self)
732 CODE: 878 CODE:
733 pango_font_description_free (self); 879 pango_font_description_free (self);
734 880
735void 881void
736make_default (CFClient::Font self) 882make_default (CFPlus::Font self)
737 CODE: 883 CODE:
738 default_font = self; 884 default_font = self;
739 885
740MODULE = CFClient PACKAGE = CFClient::Layout 886MODULE = CFPlus PACKAGE = CFPlus::Layout
741 887
742CFClient::Layout 888void
743new (SV *class, int rgba = 0) 889reset_glyph_cache ()
890 CODE:
891 tc_clear ();
892
893CFPlus::Layout
894new (SV *class)
744 CODE: 895 CODE:
745 New (0, RETVAL, 1, struct cf_layout); 896 New (0, RETVAL, 1, struct cf_layout);
746 897
747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 898 RETVAL->pl = pango_layout_new (opengl_context);
748 RETVAL->rgba = rgba;
749 RETVAL->r = 1.; 899 RETVAL->r = 1.;
750 RETVAL->g = 1.; 900 RETVAL->g = 1.;
751 RETVAL->b = 1.; 901 RETVAL->b = 1.;
752 RETVAL->a = 1.; 902 RETVAL->a = 1.;
753 RETVAL->base_height = MIN_FONT_HEIGHT; 903 RETVAL->base_height = MIN_FONT_HEIGHT;
757 layout_update_font (RETVAL); 907 layout_update_font (RETVAL);
758 OUTPUT: 908 OUTPUT:
759 RETVAL 909 RETVAL
760 910
761void 911void
762DESTROY (CFClient::Layout self) 912DESTROY (CFPlus::Layout self)
763 CODE: 913 CODE:
764 g_object_unref (self->pl); 914 g_object_unref (self->pl);
765 Safefree (self); 915 Safefree (self);
766 916
917void
918set_text (CFPlus::Layout self, SV *text_)
919 CODE:
920{
921 STRLEN textlen;
922 char *text = SvPVutf8 (text_, textlen);
923
924 pango_layout_set_text (self->pl, text, textlen);
925}
926
927void
928set_markup (CFPlus::Layout self, SV *text_)
929 CODE:
930{
931 STRLEN textlen;
932 char *text = SvPVutf8 (text_, textlen);
933
934 pango_layout_set_markup (self->pl, text, textlen);
935}
936
937void
938set_shapes (CFPlus::Layout self, ...)
939 CODE:
940{
941 PangoAttrList *attrs = 0;
942 const char *text = pango_layout_get_text (self->pl);
943 const char *pos = text;
944 int arg = 4;
945
946 while (arg < items && (pos = strstr (pos, OBJ_STR)))
947 {
948 PangoRectangle inkrect, rect;
949 PangoAttribute *attr;
950
951 int x = SvIV (ST (arg - 3));
952 int y = SvIV (ST (arg - 2));
953 int w = SvIV (ST (arg - 1));
954 int h = SvIV (ST (arg ));
955
956 inkrect.x = 0;
957 inkrect.y = 0;
958 inkrect.width = 0;
959 inkrect.height = 0;
960
961 rect.x = x * PANGO_SCALE;
962 rect.y = y * PANGO_SCALE;
963 rect.width = w * PANGO_SCALE;
964 rect.height = h * PANGO_SCALE;
965
966 if (!attrs)
967 attrs = pango_layout_get_attributes (self->pl);
968
969 attr = pango_attr_shape_new (&inkrect, &rect);
970 attr->start_index = pos - text;
971 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
972 pango_attr_list_insert (attrs, attr);
973
974 arg += 4;
975 pos += sizeof (OBJ_STR) - 1;
976 }
977
978 if (attrs)
979 pango_layout_set_attributes (self->pl, attrs);
980}
981
982void
983get_shapes (CFPlus::Layout self)
984 PPCODE:
985{
986 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
987
988 do
989 {
990 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
991
992 if (run && shape_attr_p (run))
993 {
994 PangoRectangle extents;
995 pango_layout_iter_get_run_extents (iter, 0, &extents);
996
997 EXTEND (SP, 2);
998 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
999 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1000 }
1001 }
1002 while (pango_layout_iter_next_run (iter));
1003
1004 pango_layout_iter_free (iter);
1005}
1006
767int 1007int
768is_rgba (CFClient::Layout self) 1008has_wrapped (CFPlus::Layout self)
769 CODE: 1009 CODE:
770 RETVAL = self->rgba; 1010{
1011 int lines = 1;
1012 const char *text = pango_layout_get_text (self->pl);
1013
1014 while (*text)
1015 lines += *text++ == '\n';
1016
1017 RETVAL = lines < pango_layout_get_line_count (self->pl);
1018}
771 OUTPUT: 1019 OUTPUT:
772 RETVAL 1020 RETVAL
773 1021
774void
775set_text (CFClient::Layout self, SV *text_)
776 CODE:
777{
778 STRLEN textlen;
779 char *text = SvPVutf8 (text_, textlen);
780
781 pango_layout_set_text (self->pl, text, textlen);
782}
783
784void
785set_markup (CFClient::Layout self, SV *text_)
786 CODE:
787{
788 STRLEN textlen;
789 char *text = SvPVutf8 (text_, textlen);
790
791 pango_layout_set_markup (self->pl, text, textlen);
792}
793
794SV * 1022SV *
795get_text (CFClient::Layout self) 1023get_text (CFPlus::Layout self)
796 CODE: 1024 CODE:
797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1025 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798 sv_utf8_decode (RETVAL); 1026 sv_utf8_decode (RETVAL);
799 OUTPUT: 1027 OUTPUT:
800 RETVAL 1028 RETVAL
801 1029
802void 1030void
803set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1031set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
804 CODE: 1032 CODE:
805 self->r = r; 1033 self->r = r;
806 self->g = g; 1034 self->g = g;
807 self->b = b; 1035 self->b = b;
808 self->a = a; 1036 self->a = a;
809 1037
810void 1038void
811set_font (CFClient::Layout self, CFClient::Font font = 0) 1039set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812 CODE: 1040 CODE:
813 if (self->font != font) 1041 if (self->font != font)
814 { 1042 {
815 self->font = font; 1043 self->font = font;
816 layout_update_font (self); 1044 layout_update_font (self);
817 } 1045 }
818 1046
819void 1047void
820set_height (CFClient::Layout self, int base_height) 1048set_height (CFPlus::Layout self, int base_height)
821 CODE: 1049 CODE:
822 if (self->base_height != base_height) 1050 if (self->base_height != base_height)
823 { 1051 {
824 self->base_height = base_height; 1052 self->base_height = base_height;
825 layout_update_font (self); 1053 layout_update_font (self);
826 } 1054 }
827 1055
828void 1056void
829set_width (CFClient::Layout self, int max_width = -1) 1057set_width (CFPlus::Layout self, int max_width = -1)
830 CODE: 1058 CODE:
831 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1059 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
832 1060
833void 1061void
834set_indent (CFClient::Layout self, int indent) 1062set_indent (CFPlus::Layout self, int indent)
835 CODE: 1063 CODE:
836 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1064 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837 1065
838void 1066void
839set_spacing (CFClient::Layout self, int spacing) 1067set_spacing (CFPlus::Layout self, int spacing)
840 CODE: 1068 CODE:
841 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1069 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842 1070
843void 1071void
844set_ellipsise (CFClient::Layout self, int ellipsise) 1072set_ellipsise (CFPlus::Layout self, int ellipsise)
845 CODE: 1073 CODE:
846 pango_layout_set_ellipsize (self->pl, 1074 pango_layout_set_ellipsize (self->pl,
847 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1075 ellipsise == 1 ? PANGO_ELLIPSIZE_START
848 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1076 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1077 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
850 : PANGO_ELLIPSIZE_NONE 1078 : PANGO_ELLIPSIZE_NONE
851 ); 1079 );
852 1080
853void 1081void
854set_single_paragraph_mode (CFClient::Layout self, int spm) 1082set_single_paragraph_mode (CFPlus::Layout self, int spm)
855 CODE: 1083 CODE:
856 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1084 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857 1085
858void 1086void
859size (CFClient::Layout self) 1087size (CFPlus::Layout self)
860 PPCODE: 1088 PPCODE:
861{ 1089{
862 int w, h; 1090 int w, h;
863 1091
864 layout_get_pixel_size (self, &w, &h); 1092 layout_get_pixel_size (self, &w, &h);
867 PUSHs (sv_2mortal (newSViv (w))); 1095 PUSHs (sv_2mortal (newSViv (w)));
868 PUSHs (sv_2mortal (newSViv (h))); 1096 PUSHs (sv_2mortal (newSViv (h)));
869} 1097}
870 1098
871int 1099int
1100descent (CFPlus::Layout self)
1101 CODE:
1102{
1103 PangoRectangle rect;
1104 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1105 pango_layout_line_get_pixel_extents (line, 0, &rect);
1106 RETVAL = PANGO_DESCENT (rect);
1107}
1108 OUTPUT:
1109 RETVAL
1110
1111int
872xy_to_index (CFClient::Layout self, int x, int y) 1112xy_to_index (CFPlus::Layout self, int x, int y)
873 CODE: 1113 CODE:
874{ 1114{
875 int index, trailing; 1115 int index, trailing;
876 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);
877 RETVAL = index; 1117 RETVAL = index + trailing;
878} 1118}
879 OUTPUT: 1119 OUTPUT:
880 RETVAL 1120 RETVAL
881 1121
882void 1122void
883cursor_pos (CFClient::Layout self, int index) 1123cursor_pos (CFPlus::Layout self, int index)
884 PPCODE: 1124 PPCODE:
885{ 1125{
886 PangoRectangle strong_pos; 1126 PangoRectangle strong_pos;
887 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1127 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888 1128
891 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893} 1133}
894 1134
895void 1135void
896render (CFClient::Layout self) 1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
897 PPCODE: 1137 PPCODE:
898{ 1138{
899 SV *retval; 1139 int line, x;
900 int w, h;
901 1140
902 layout_get_pixel_size (self, &w, &h); 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 */
903 1143
904 if (self->rgba)
905 {
906 cairo_surface_t *surface;
907 cairo_t *cairo;
908
909 retval = newSV (w * h * 4);
910 SvPOK_only (retval);
911 SvCUR_set (retval, w * h * 4);
912
913 memset (SvPVX (retval), 0, w * h * 4);
914
915 surface = cairo_image_surface_create_for_data (
916 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
917 cairo = cairo_create (surface);
918 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920 pango_cairo_show_layout (cairo, self->pl);
921
922 cairo_destroy (cairo);
923 cairo_surface_destroy (surface);
924
925 // what a mess, and its premultiplied, too :(
926 {
927 uint32_t *p = (uint32_t *)SvPVX (retval);
928 uint32_t *e = p + w * h;
929
930 while (p < e)
931 {
932 uint32_t rgba = *p;
933 rgba = (rgba >> 24) | (rgba << 8);
934#if 0
935#ifdef _WIN32
936 {//D
937 uint8_t r = rgba >> 24;
938 uint8_t g = rgba >> 16;
939 uint8_t b = rgba >> 8;
940 uint8_t a = rgba >> 0;
941
942 rgba = (rgba & 0xffffff00) | a;
943 }
944#endif
945#endif
946 rgba = SDL_SwapBE32 (rgba);
947 *p++ = rgba;
948 }
949 }
950
951 EXTEND (SP, 5); 1144 EXTEND (SP, 2);
952 PUSHs (sv_2mortal (newSViv (w))); 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)
953 PUSHs (sv_2mortal (newSViv (h))); 1166 PUSHs (sv_2mortal (newSViv (index + trailing)));
954 PUSHs (sv_2mortal (retval));
955 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957 }
958 else 1167 else
959 { 1168 {
960 FT_Bitmap bitmap;
961
962 retval = newSV (w * h);
963 SvPOK_only (retval);
964 SvCUR_set (retval, w * h);
965
966 bitmap.rows = h;
967 bitmap.width = w;
968 bitmap.pitch = w;
969 bitmap.buffer = (unsigned char*)SvPVX (retval);
970 bitmap.num_grays = 256;
971 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973 memset (bitmap.buffer, 0, w * h);
974
975 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977 EXTEND (SP, 5);
978 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (index)));
979 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (trailing)));
980 PUSHs (sv_2mortal (retval));
981 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983 } 1171 }
984} 1172}
985 1173
1174void
1175render (CFPlus::Layout self, float x, float y, int flags = 0)
1176 PPCODE:
1177 pango_opengl_render_layout_subpixel (
1178 self->pl,
1179 x * PANGO_SCALE, y * PANGO_SCALE,
1180 self->r, self->g, self->b, self->a,
1181 flags
1182 );
1183
986MODULE = CFClient PACKAGE = CFClient::Texture 1184MODULE = CFPlus PACKAGE = CFPlus::Texture
987 1185
988void 1186void
1187pad2pot (SV *data_, SV *w_, SV *h_)
1188 CODE:
1189{
1190 int ow = SvIV (w_);
1191 int oh = SvIV (h_);
1192
1193 if (ow && oh)
1194 {
1195 int nw = minpot (ow);
1196 int nh = minpot (oh);
1197
1198 if (nw != ow || nh != oh)
1199 {
1200 if (SvOK (data_))
1201 {
1202 STRLEN datalen;
1203 char *data = SvPVbyte (data_, datalen);
1204 int bpp = datalen / (ow * oh);
1205 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1206
1207 SvPOK_only (result_);
1208 SvCUR_set (result_, nw * nh * bpp);
1209
1210 memset (SvPVX (result_), 0, nw * nh * bpp);
1211 while (oh--)
1212 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1213
1214 sv_setsv (data_, result_);
1215 }
1216
1217 sv_setiv (w_, nw);
1218 sv_setiv (h_, nh);
1219 }
1220 }
1221}
1222
1223void
989draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1224draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990 PROTOTYPE: $$$;$$ 1225 PROTOTYPE: $$$;$$
991 ALIAS: 1226 ALIAS:
992 draw_quad_alpha = 1 1227 draw_quad_alpha = 1
993 draw_quad_alpha_premultiplied = 2 1228 draw_quad_alpha_premultiplied = 2
994 CODE: 1229 CODE:
1032 glDisable (GL_ALPHA_TEST); 1267 glDisable (GL_ALPHA_TEST);
1033 glDisable (GL_BLEND); 1268 glDisable (GL_BLEND);
1034 } 1269 }
1035} 1270}
1036 1271
1037MODULE = CFClient PACKAGE = CFClient::Map 1272MODULE = CFPlus PACKAGE = CFPlus::Map
1038 1273
1039CFClient::Map 1274CFPlus::Map
1040new (SV *class, int map_width, int map_height) 1275new (SV *class)
1041 CODE: 1276 CODE:
1042 New (0, RETVAL, 1, struct map); 1277 New (0, RETVAL, 1, struct map);
1043 RETVAL->x = 0; 1278 RETVAL->x = 0;
1044 RETVAL->y = 0; 1279 RETVAL->y = 0;
1045 RETVAL->w = map_width; 1280 RETVAL->w = 0;
1046 RETVAL->h = map_height; 1281 RETVAL->h = 0;
1047 RETVAL->ox = 0; 1282 RETVAL->ox = 0;
1048 RETVAL->oy = 0; 1283 RETVAL->oy = 0;
1049 RETVAL->faces = 8192; 1284 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1050 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1285 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1051 RETVAL->texs = 8192;
1052 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1053 RETVAL->rows = 0; 1286 RETVAL->rows = 0;
1054 RETVAL->row = 0; 1287 RETVAL->row = 0;
1055 OUTPUT: 1288 OUTPUT:
1056 RETVAL 1289 RETVAL
1057 1290
1058void 1291void
1059DESTROY (CFClient::Map self) 1292DESTROY (CFPlus::Map self)
1060 CODE: 1293 CODE:
1061{ 1294{
1062 map_clear (self); 1295 map_clear (self);
1063 Safefree (self->face); 1296 Safefree (self->face2tile);
1064 Safefree (self->tex); 1297 Safefree (self->tex);
1065 Safefree (self); 1298 Safefree (self);
1066} 1299}
1067 1300
1068void 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
1069clear (CFClient::Map self) 1308clear (CFPlus::Map self)
1070 CODE: 1309 CODE:
1071 map_clear (self); 1310 map_clear (self);
1072 1311
1073void 1312void
1074set_face (CFClient::Map self, int face, int texid) 1313set_tileid (CFPlus::Map self, int face, int tile)
1075 CODE: 1314 CODE:
1076{ 1315{
1077 while (self->faces <= face) 1316 need_facenum (self, face); self->face2tile [face] = tile;
1078 { 1317 need_texid (self, tile);
1079 Append (mapface, self->face, self->faces, self->faces);
1080 self->faces *= 2;
1081 }
1082
1083 self->face [face] = texid;
1084} 1318}
1085 1319
1086void 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;
1341}
1342
1343void
1087set_texture (CFClient::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)
1088 CODE: 1345 CODE:
1089{ 1346{
1090 while (self->texs <= texid) 1347 need_texid (self, texid);
1091 {
1092 Append (maptex, self->tex, self->texs, self->texs);
1093 self->texs *= 2;
1094 }
1095 1348
1096 { 1349 {
1097 maptex *tex = self->tex + texid; 1350 maptex *tex = self->tex + texid;
1098 1351
1099 tex->name = name; 1352 tex->name = name;
1116 // from transparent color bleeding and ugly wrapping effects. 1369 // from transparent color bleeding and ugly wrapping effects.
1117 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1370 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118} 1371}
1119 1372
1120int 1373int
1121ox (CFClient::Map self) 1374ox (CFPlus::Map self)
1122 ALIAS: 1375 ALIAS:
1123 oy = 1 1376 oy = 1
1124 x = 2 1377 x = 2
1125 y = 3 1378 y = 3
1126 w = 4 1379 w = 4
1137 } 1390 }
1138 OUTPUT: 1391 OUTPUT:
1139 RETVAL 1392 RETVAL
1140 1393
1141void 1394void
1142scroll (CFClient::Map self, int dx, int dy) 1395scroll (CFPlus::Map self, int dx, int dy)
1143 CODE: 1396 CODE:
1144{ 1397{
1145 if (dx > 0) 1398 if (dx > 0)
1146 map_blank (self, self->x, self->y, dx - 1, self->h); 1399 map_blank (self, self->x, self->y, dx, self->h);
1147 else if (dx < 0) 1400 else if (dx < 0)
1148 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1401 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1149 1402
1150 if (dy > 0) 1403 if (dy > 0)
1151 map_blank (self, self->x, self->y, self->w, dy - 1); 1404 map_blank (self, self->x, self->y, self->w, dy);
1152 else if (dy < 0) 1405 else if (dy < 0)
1153 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1406 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1154 1407
1155 self->ox += dx; self->x += dx; 1408 self->ox += dx; self->x += dx;
1156 self->oy += dy; self->y += dy; 1409 self->oy += dy; self->y += dy;
1157 1410
1158 while (self->y < 0) 1411 while (self->y < 0)
1163 self->y += MAP_EXTEND_Y; 1416 self->y += MAP_EXTEND_Y;
1164 } 1417 }
1165} 1418}
1166 1419
1167void 1420void
1168map1a_update (CFClient::Map self, SV *data_) 1421map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169 CODE: 1422 CODE:
1170{ 1423{
1171 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1424 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172 uint8_t *data_end = (uint8_t *)SvEND (data_); 1425 uint8_t *data_end = (uint8_t *)SvEND (data_);
1173 mapcell *cell; 1426 mapcell *cell;
1174 int x, y, flags; 1427 int x, y, flags;
1175 1428
1176 while (data < data_end) 1429 while (data < data_end - 1)
1177 { 1430 {
1178 flags = (data [0] << 8) + data [1]; data += 2; 1431 flags = (data [0] << 8) + data [1]; data += 2;
1179 1432
1180 x = ((flags >> 10) & 63) + self->x; 1433 x = self->x + ((flags >> 10) & 63);
1181 y = ((flags >> 4) & 63) + self->y; 1434 y = self->y + ((flags >> 4) & 63);
1182 1435
1183 cell = map_get_cell (self, x, y); 1436 cell = map_get_cell (self, x, y);
1184 1437
1185 if (flags & 15) 1438 if (flags & 15)
1186 { 1439 {
1187 if (cell->darkness < 0) 1440 if (!cell->darkness)
1188 { 1441 {
1442 memset (cell, 0, sizeof (*cell));
1189 cell->darkness = 0; 1443 cell->darkness = 256;
1190 cell->face [0] = 0;
1191 cell->face [1] = 0;
1192 cell->face [2] = 0;
1193 } 1444 }
1194 1445
1195 cell->darkness = flags & 8 ? *data++ : 255;
1196
1197 //TODO: don't trust server data to be in-range(!) 1446 //TODO: don't trust server data to be in-range(!)
1447
1448 if (flags & 8)
1449 {
1450 if (extmap)
1451 {
1452 uint8_t ext, cmd;
1453
1454 do
1455 {
1456 ext = *data++;
1457 cmd = ext & 0x3f;
1458
1459 if (cmd < 4)
1460 cell->darkness = 255 - ext * 64 + 1;
1461 else if (cmd == 5) // health
1462 {
1463 cell->stat_width = 1;
1464 cell->stat_hp = *data++;
1465 }
1466 else if (cmd == 6) // monster width
1467 cell->stat_width = *data++ + 1;
1468 else if (cmd == 0x47)
1469 {
1470 if (*data == 4)
1471 ; // decode player count
1472
1473 data += *data + 1;
1474 }
1475 else if (cmd == 8) // cell flags
1476 cell->flags = *data++;
1477 else if (ext & 0x40) // unknown, multibyte => skip
1478 data += *data + 1;
1479 else
1480 data++;
1481 }
1482 while (ext & 0x80);
1483 }
1484 else
1485 cell->darkness = *data++ + 1;
1486 }
1198 1487
1199 if (flags & 4) 1488 if (flags & 4)
1200 { 1489 {
1201 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];
1202 } 1493 }
1203 1494
1204 if (flags & 2) 1495 if (flags & 2)
1205 { 1496 {
1206 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];
1207 } 1500 }
1208 1501
1209 if (flags & 1) 1502 if (flags & 1)
1210 { 1503 {
1211 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];
1212 } 1507 }
1213 } 1508 }
1214 else 1509 else
1215 cell->darkness = -1; 1510 cell->darkness = 0;
1216 } 1511 }
1217} 1512}
1218 1513
1219SV * 1514SV *
1220mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1515mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221 CODE: 1516 CODE:
1222{ 1517{
1223 int x1, x; 1518 int x1, x;
1224 int y1, y; 1519 int y1, y;
1225 int z; 1520 int z;
1246 { 1541 {
1247 mapcell *cell = row->col + (x - row->c0); 1542 mapcell *cell = row->col + (x - row->c0);
1248 1543
1249 for (z = 0; z <= 0; z++) 1544 for (z = 0; z <= 0; z++)
1250 { 1545 {
1251 mapface face = cell->face [z];
1252
1253 if (face)
1254 {
1255 maptex tex = self->tex [face]; 1546 maptex tex = self->tex [cell->tile [z]];
1256 int a0 = 255 - tex.a; 1547 int a0 = 255 - tex.a;
1257 int a1 = tex.a; 1548 int a1 = tex.a;
1258 1549
1259 r = (r * a0 + tex.r * a1) / 255; 1550 r = (r * a0 + tex.r * a1) / 255;
1260 g = (g * a0 + tex.g * a1) / 255; 1551 g = (g * a0 + tex.g * a1) / 255;
1261 b = (b * a0 + tex.b * a1) / 255; 1552 b = (b * a0 + tex.b * a1) / 255;
1262 a = (a * a0 + tex.a * a1) / 255; 1553 a = (a * a0 + tex.a * a1) / 255;
1263 }
1264 } 1554 }
1265 } 1555 }
1266 1556
1267 *map++ = (r ) 1557 *map++ = (r )
1268 | (g << 8) 1558 | (g << 8)
1275} 1565}
1276 OUTPUT: 1566 OUTPUT:
1277 RETVAL 1567 RETVAL
1278 1568
1279void 1569void
1280draw (CFClient::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)
1281 PPCODE: 1571 CODE:
1282{ 1572{
1283 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;
1284 int x, y, z; 1577 int x, y, z;
1285 int last_name; 1578 int last_name;
1286 mapface face; 1579
1580 // thats current max. sorry.
1581 if (sw > 255) sw = 255;
1582 if (sh > 255) sh = 255;
1583
1584 // clear key, in case of extra padding
1585 memset (&skey, 0, sizeof (skey));
1586
1587 glColor4ub (255, 255, 255, 255);
1588
1589 glEnable (GL_BLEND);
1590 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1591 glEnable (GL_TEXTURE_2D);
1592 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1593
1594 glBegin (GL_QUADS);
1595
1596 last_name = 0;
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
1623 for (z = 0; z <= 2; z++)
1624 {
1625 memset (smooth_level, 0, sizeof (smooth_level));
1626
1627 for (y = 0; y < sh; y++)
1628 if (0 <= y + my && y + my < self->rows)
1629 {
1630 maprow *row = self->row + (y + my);
1631
1632 for (x = 0; x < sw; x++)
1633 if (row->c0 <= x + mx && x + mx < row->c1)
1634 {
1635 mapcell *cell = row->col + (x + mx - row->c0);
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;
1643
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))
1733 {
1734 int level = (w << 5) | b;
1735 HE *he;
1736
1737 hv_iterinit (smooth);
1738 while ((he = hv_iternext (smooth)))
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
1762 glEnd ();
1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
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 }
1786 }
1787 }
1788 }
1789 }
1790 }
1791
1792 hv_clear (smooth);
1793 }
1794
1795 glEnd ();
1796
1797 glDisable (GL_TEXTURE_2D);
1798 glDisable (GL_BLEND);
1799
1800 // top layer: overlays such as the health bar
1801 for (y = 0; y < sh; y++)
1802 if (0 <= y + my && y + my < self->rows)
1803 {
1804 maprow *row = self->row + (y + my);
1805
1806 for (x = 0; x < sw; x++)
1807 if (row->c0 <= x + mx && x + mx < row->c1)
1808 {
1809 mapcell *cell = row->col + (x + mx - row->c0);
1810
1811 int px = x * T;
1812 int py = y * T;
1813
1814 if (cell->stat_hp)
1815 {
1816 int width = cell->stat_width * T;
1817 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1818
1819 glColor3ub (0, 0, 0);
1820 glRectf (px + 1, py - thick - 2,
1821 px + width - 1, py);
1822
1823 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1824 glRectf (px + 2,
1825 py - thick - 1,
1826 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1827 }
1828 }
1829 }
1830}
1831
1832void
1833draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1834 CODE:
1835{
1836 static float color[16][3] = {
1837 { 0.00F, 0.00F, 0.00F },
1838 { 1.00F, 1.00F, 1.00F },
1839 { 0.00F, 0.00F, 0.55F },
1840 { 1.00F, 0.00F, 0.00F },
1841
1842 { 1.00F, 0.54F, 0.00F },
1843 { 0.11F, 0.56F, 1.00F },
1844 { 0.93F, 0.46F, 0.00F },
1845 { 0.18F, 0.54F, 0.34F },
1846
1847 { 0.56F, 0.73F, 0.56F },
1848 { 0.80F, 0.80F, 0.80F },
1849 { 0.55F, 0.41F, 0.13F },
1850 { 0.99F, 0.77F, 0.26F },
1851
1852 { 0.74F, 0.65F, 0.41F },
1853
1854 { 0.00F, 1.00F, 1.00F },
1855 { 1.00F, 0.00F, 1.00F },
1856 { 1.00F, 1.00F, 0.00F },
1857 };
1858
1859 int x, y;
1860
1861 glEnable (GL_TEXTURE_2D);
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1863 glEnable (GL_BLEND);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glBegin (GL_QUADS);
1866
1867 for (y = 0; y < h; y++)
1868 for (x = 0; x < w; x++)
1869 {
1870 unsigned char m = data [x + y * w];
1871
1872 if (m)
1873 {
1874 float *c = color [m & 15];
1875
1876 float tx1 = m & 0x40 ? 0.5 : 0.;
1877 float tx2 = tx1 + 0.5;
1878
1879 glColor4f (c[0], c[1], c[2], 0.75);
1880 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1881 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1882 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1883 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1884 }
1885 }
1886
1887 glEnd ();
1888 glDisable (GL_BLEND);
1889 glDisable (GL_TEXTURE_2D);
1890}
1891
1892void
1893fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1894 PPCODE:
1895{
1896 int x, y;
1287 int sw4 = (sw + 3) & ~3; 1897 int sw4 = (sw + 3) & ~3;
1288 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1898 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1899 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290 1900
1291 memset (darkness, 255, sw4 * sh); 1901 memset (darkness, 255, sw4 * sh);
1292 SvPOK_only (darkness_sv); 1902 SvPOK_only (darkness_sv);
1293 SvCUR_set (darkness_sv, sw4 * sh); 1903 SvCUR_set (darkness_sv, sw4 * sh);
1294 1904
1295 vx = self->x + (self->w - sw) / 2 - shift_x; 1905 mx += self->x;
1296 vy = self->y + (self->h - sh) / 2 - shift_y; 1906 my += self->y;
1297 1907
1298 /*
1299 int vx = self->vx = self->w >= sw
1300 ? self->x + (self->w - sw) / 2
1301 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1302
1303 int vy = self->vy = self->h >= sh
1304 ? self->y + (self->h - sh) / 2
1305 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306 */
1307
1308 glColor4ub (255, 255, 255, 255);
1309
1310 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311 glEnable (GL_BLEND);
1312 glEnable (GL_TEXTURE_2D);
1313 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314
1315 glBegin (GL_QUADS);
1316
1317 last_name = 0;
1318
1319 for (z = 0; z < 3; z++)
1320 for (y = 0; y < sh; y++) 1908 for (y = 0; y < sh; y++)
1321 if (0 <= y + vy && y + vy < self->rows) 1909 if (0 <= y + my && y + my < self->rows)
1322 { 1910 {
1323 maprow *row = self->row + (y + vy); 1911 maprow *row = self->row + (y + my);
1324 1912
1325 for (x = 0; x < sw; x++) 1913 for (x = 0; x < sw; x++)
1326 if (row->c0 <= x + vx && x + vx < row->c1) 1914 if (row->c0 <= x + mx && x + mx < row->c1)
1327 { 1915 {
1328 mapcell *cell = row->col + (x + vx - row->c0); 1916 mapcell *cell = row->col + (x + mx - row->c0);
1329 1917
1330 darkness[y * sw4 + x] = cell->darkness < 0 1918 darkness[y * sw4 + x] = cell->darkness
1919 ? 255 - (cell->darkness - 1)
1331 ? 255 - FOW_DARKNESS 1920 : 255 - FOW_DARKNESS;
1332 : 255 - cell->darkness;
1333
1334 face = cell->face [z];
1335
1336 if (face)
1337 {
1338 maptex tex = self->tex [face];
1339
1340 int px = (x + 1) * 32 - tex.w;
1341 int py = (y + 1) * 32 - tex.h;
1342
1343 if (last_name != tex.name)
1344 {
1345 glEnd ();
1346 last_name = tex.name;
1347 glBindTexture (GL_TEXTURE_2D, last_name);
1348 glBegin (GL_QUADS);
1349 }
1350
1351 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1352 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1353 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1354 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1355 }
1356 } 1921 }
1357 } 1922 }
1358
1359 glEnd ();
1360
1361 glDisable (GL_TEXTURE_2D);
1362 glDisable (GL_BLEND);
1363 1923
1364 EXTEND (SP, 3); 1924 EXTEND (SP, 3);
1365 PUSHs (sv_2mortal (newSViv (sw4))); 1925 PUSHs (sv_2mortal (newSViv (sw4)));
1366 PUSHs (sv_2mortal (newSViv (sh))); 1926 PUSHs (sv_2mortal (newSViv (sh)));
1367 PUSHs (darkness_sv); 1927 PUSHs (darkness_sv);
1368} 1928}
1369 1929
1370SV * 1930SV *
1371get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1931get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1372 CODE: 1932 CODE:
1373{ 1933{
1374 int x, y, x1, y1; 1934 int x, y, x1, y1;
1375 SV *data_sv = newSV (w * h * 7 + 5); 1935 SV *data_sv = newSV (w * h * 7 + 5);
1376 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1936 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1401 if (row && row->c0 <= x && x < row->c1) 1961 if (row && row->c0 <= x && x < row->c1)
1402 { 1962 {
1403 mapcell *cell = row->col + (x - row->c0); 1963 mapcell *cell = row->col + (x - row->c0);
1404 uint8_t flags = 0; 1964 uint8_t flags = 0;
1405 1965
1406 if (cell->face [0]) flags |= 1; 1966 if (cell->tile [0]) flags |= 1;
1407 if (cell->face [1]) flags |= 2; 1967 if (cell->tile [1]) flags |= 2;
1408 if (cell->face [2]) flags |= 4; 1968 if (cell->tile [2]) flags |= 4;
1409 1969
1410 *data++ = flags; 1970 *data++ = flags;
1411 1971
1412 if (flags & 1) 1972 if (flags & 1)
1413 { 1973 {
1974 tileid tile = cell->tile [0];
1414 *data++ = cell->face [0] >> 8; 1975 *data++ = tile >> 8;
1415 *data++ = cell->face [0]; 1976 *data++ = tile;
1416 } 1977 }
1417 1978
1418 if (flags & 2) 1979 if (flags & 2)
1419 { 1980 {
1981 tileid tile = cell->tile [1];
1420 *data++ = cell->face [1] >> 8; 1982 *data++ = tile >> 8;
1421 *data++ = cell->face [1]; 1983 *data++ = tile;
1422 } 1984 }
1423 1985
1424 if (flags & 4) 1986 if (flags & 4)
1425 { 1987 {
1988 tileid tile = cell->tile [2];
1426 *data++ = cell->face [2] >> 8; 1989 *data++ = tile >> 8;
1427 *data++ = cell->face [2]; 1990 *data++ = tile;
1428 } 1991 }
1429 } 1992 }
1430 else 1993 else
1431 *data++ = 0; 1994 *data++ = 0;
1432 } 1995 }
1438} 2001}
1439 OUTPUT: 2002 OUTPUT:
1440 RETVAL 2003 RETVAL
1441 2004
1442void 2005void
1443set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2006set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444 PPCODE: 2007 PPCODE:
1445{ 2008{
1446 int x, y, z; 2009 int x, y, z;
1447 int w, h; 2010 int w, h;
1448 int x1, y1; 2011 int x1, y1;
1472 { 2035 {
1473 uint8_t flags = *data++; 2036 uint8_t flags = *data++;
1474 2037
1475 if (flags) 2038 if (flags)
1476 { 2039 {
1477 mapface face[3] = { 0, 0, 0 };
1478
1479 mapcell *cell = row_get_cell (row, x); 2040 mapcell *cell = row_get_cell (row, x);
2041 tileid tile[3] = { 0, 0, 0 };
1480 2042
1481 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2043 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1482 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2044 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1483 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2045 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1484 2046
1485 if (cell->darkness <= 0) 2047 if (cell->darkness == 0)
1486 { 2048 {
1487 cell->darkness = -1; 2049 cell->darkness = 0;
1488 2050
1489 for (z = 0; z <= 2; z++) 2051 for (z = 0; z <= 2; z++)
1490 { 2052 {
1491 cell->face[z] = face[z]; 2053 tileid t = tile [z];
1492 2054
1493 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2055 if (t >= self->texs || (t && !self->tex [t].name))
2056 {
1494 XPUSHs (sv_2mortal (newSViv (face[z]))); 2057 XPUSHs (sv_2mortal (newSViv (t)));
2058 need_texid (self, t);
2059 }
2060
2061 cell->tile [z] = t;
1495 } 2062 }
1496 } 2063 }
1497 } 2064 }
1498 } 2065 }
1499 } 2066 }
1500} 2067}
1501 2068
1502MODULE = CFClient PACKAGE = CFClient::MixChunk 2069MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503 2070
1504CFClient::MixChunk 2071CFPlus::MixChunk
1505new_from_file (SV *class, char *path) 2072new_from_file (SV *class, char *path)
1506 CODE: 2073 CODE:
1507 RETVAL = Mix_LoadWAV (path); 2074 RETVAL = Mix_LoadWAV (path);
1508 OUTPUT: 2075 OUTPUT:
1509 RETVAL 2076 RETVAL
1510 2077
1511void 2078void
1512DESTROY (CFClient::MixChunk self) 2079DESTROY (CFPlus::MixChunk self)
1513 CODE: 2080 CODE:
1514 Mix_FreeChunk (self); 2081 Mix_FreeChunk (self);
1515 2082
1516int 2083int
1517volume (CFClient::MixChunk self, int volume = -1) 2084volume (CFPlus::MixChunk self, int volume = -1)
1518 CODE: 2085 CODE:
1519 RETVAL = Mix_VolumeChunk (self, volume); 2086 RETVAL = Mix_VolumeChunk (self, volume);
1520 OUTPUT: 2087 OUTPUT:
1521 RETVAL 2088 RETVAL
1522 2089
1523int 2090int
1524play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2091play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1525 CODE: 2092 CODE:
1526 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2093 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527 OUTPUT: 2094 OUTPUT:
1528 RETVAL 2095 RETVAL
1529 2096
1530MODULE = CFClient PACKAGE = CFClient::MixMusic 2097MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531 2098
1532int 2099int
1533volume (int volume = -1) 2100volume (int volume = -1)
1534 CODE: 2101 CODE:
1535 RETVAL = Mix_VolumeMusic (volume); 2102 RETVAL = Mix_VolumeMusic (volume);
1536 OUTPUT: 2103 OUTPUT:
1537 RETVAL 2104 RETVAL
1538 2105
1539CFClient::MixMusic 2106CFPlus::MixMusic
1540new_from_file (SV *class, char *path) 2107new_from_file (SV *class, char *path)
1541 CODE: 2108 CODE:
1542 RETVAL = Mix_LoadMUS (path); 2109 RETVAL = Mix_LoadMUS (path);
1543 OUTPUT: 2110 OUTPUT:
1544 RETVAL 2111 RETVAL
1545 2112
1546void 2113void
1547DESTROY (CFClient::MixMusic self) 2114DESTROY (CFPlus::MixMusic self)
1548 CODE: 2115 CODE:
1549 Mix_FreeMusic (self); 2116 Mix_FreeMusic (self);
1550 2117
1551int 2118int
1552play (CFClient::MixMusic self, int loops = -1) 2119play (CFPlus::MixMusic self, int loops = -1)
1553 CODE: 2120 CODE:
1554 RETVAL = Mix_PlayMusic (self, loops); 2121 RETVAL = Mix_PlayMusic (self, loops);
1555 OUTPUT: 2122 OUTPUT:
1556 RETVAL 2123 RETVAL
1557 2124
1558MODULE = CFClient PACKAGE = CFClient::OpenGL 2125MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559 2126
1560BOOT: 2127BOOT:
1561{ 2128{
1562 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2129 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563 static const struct { 2130 static const struct {
1564 const char *name; 2131 const char *name;
1565 IV iv; 2132 IV iv;
1566 } *civ, const_iv[] = { 2133 } *civ, const_iv[] = {
1567# define const_iv(name) { # name, (IV)name } 2134# define const_iv(name) { # name, (IV)name }
1574 const_iv (GL_SCISSOR_TEST), 2141 const_iv (GL_SCISSOR_TEST),
1575 const_iv (GL_DEPTH_TEST), 2142 const_iv (GL_DEPTH_TEST),
1576 const_iv (GL_ALPHA_TEST), 2143 const_iv (GL_ALPHA_TEST),
1577 const_iv (GL_NORMALIZE), 2144 const_iv (GL_NORMALIZE),
1578 const_iv (GL_RESCALE_NORMAL), 2145 const_iv (GL_RESCALE_NORMAL),
2146 const_iv (GL_FRONT),
2147 const_iv (GL_BACK),
1579 const_iv (GL_AND), 2148 const_iv (GL_AND),
1580 const_iv (GL_ONE), 2149 const_iv (GL_ONE),
1581 const_iv (GL_ZERO), 2150 const_iv (GL_ZERO),
1582 const_iv (GL_SRC_ALPHA), 2151 const_iv (GL_SRC_ALPHA),
1583 const_iv (GL_DST_ALPHA), 2152 const_iv (GL_DST_ALPHA),
1584 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2153 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585 const_iv (GL_ONE_MINUS_DST_ALPHA), 2154 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE), 2155 const_iv (GL_SRC_ALPHA_SATURATE),
1587 const_iv (GL_RGB), 2156 const_iv (GL_RGB),
1588 const_iv (GL_RGBA), 2157 const_iv (GL_RGBA),
2158 const_iv (GL_RGBA4),
2159 const_iv (GL_RGBA8),
2160 const_iv (GL_RGB5_A1),
1589 const_iv (GL_UNSIGNED_BYTE), 2161 const_iv (GL_UNSIGNED_BYTE),
1590 const_iv (GL_UNSIGNED_SHORT), 2162 const_iv (GL_UNSIGNED_SHORT),
1591 const_iv (GL_UNSIGNED_INT), 2163 const_iv (GL_UNSIGNED_INT),
1592 const_iv (GL_ALPHA), 2164 const_iv (GL_ALPHA),
1593 const_iv (GL_INTENSITY), 2165 const_iv (GL_INTENSITY),
1625 const_iv (GL_SEPARABLE_2D), 2197 const_iv (GL_SEPARABLE_2D),
1626 const_iv (GL_CONVOLUTION_2D), 2198 const_iv (GL_CONVOLUTION_2D),
1627 const_iv (GL_CONVOLUTION_BORDER_MODE), 2199 const_iv (GL_CONVOLUTION_BORDER_MODE),
1628 const_iv (GL_CONSTANT_BORDER), 2200 const_iv (GL_CONSTANT_BORDER),
1629 const_iv (GL_LINES), 2201 const_iv (GL_LINES),
2202 const_iv (GL_LINE_STRIP),
1630 const_iv (GL_LINE_LOOP), 2203 const_iv (GL_LINE_LOOP),
1631 const_iv (GL_QUADS), 2204 const_iv (GL_QUADS),
1632 const_iv (GL_QUAD_STRIP), 2205 const_iv (GL_QUAD_STRIP),
1633 const_iv (GL_TRIANGLES), 2206 const_iv (GL_TRIANGLES),
1634 const_iv (GL_TRIANGLE_STRIP), 2207 const_iv (GL_TRIANGLE_STRIP),
1642# undef const_iv 2215# undef const_iv
1643 }; 2216 };
1644 2217
1645 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; )
1646 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);
1647} 2223}
1648 2224
1649char * 2225char *
1650gl_vendor () 2226gl_vendor ()
1651 CODE: 2227 CODE:
1667 OUTPUT: 2243 OUTPUT:
1668 RETVAL 2244 RETVAL
1669 2245
1670int glGetError () 2246int glGetError ()
1671 2247
2248void glFinish ()
2249
1672void glClear (int mask) 2250void glClear (int mask)
1673 2251
1674void glClearColor (float r, float g, float b, float a = 1.0) 2252void glClearColor (float r, float g, float b, float a = 1.0)
1675 PROTOTYPE: @ 2253 PROTOTYPE: @
1676 2254
1699void glPushMatrix () 2277void glPushMatrix ()
1700 2278
1701void glPopMatrix () 2279void glPopMatrix ()
1702 2280
1703void glLoadIdentity () 2281void glLoadIdentity ()
2282
2283void glDrawBuffer (int buffer)
2284
2285void glReadBuffer (int buffer)
1704 2286
1705# near_ and far_ are due to microsofts buggy "c" compiler 2287# near_ and far_ are due to microsofts buggy "c" compiler
1706void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2288void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707 2289
1708# near_ and far_ are due to microsofts buggy "c" compiler 2290# near_ and far_ are due to microsofts buggy "c" compiler
1738 r *= a; 2320 r *= a;
1739 g *= a; 2321 g *= a;
1740 b *= a; 2322 b *= a;
1741 } 2323 }
1742 // microsoft visual "c" rounds instead of truncating... 2324 // microsoft visual "c" rounds instead of truncating...
1743 glColor4ub (MIN ((int)(r * 256.f), 255), 2325 glColor4f (r, g, b, a);
1744 MIN ((int)(g * 256.f), 255),
1745 MIN ((int)(b * 256.f), 255),
1746 MIN ((int)(a * 256.f), 255));
1747 2326
1748void glInterleavedArrays (int format, int stride, char *data) 2327void glInterleavedArrays (int format, int stride, char *data)
1749 2328
1750void glDrawElements (int mode, int count, int type, char *indices) 2329void glDrawElements (int mode, int count, int type, char *indices)
1751 2330
1799 2378
1800int glGenTexture () 2379int glGenTexture ()
1801 CODE: 2380 CODE:
1802{ 2381{
1803 GLuint name; 2382 GLuint name;
2383 if (AvFILL (texture_av) >= 0)
2384 name = (GLuint)(size_t)av_pop (texture_av);
2385 else
1804 glGenTextures (1, &name); 2386 glGenTextures (1, &name);
1805 RETVAL = name; 2387 RETVAL = name;
1806} 2388}
1807 OUTPUT: 2389 OUTPUT:
1808 RETVAL 2390 RETVAL
1809 2391
1810void glDeleteTexture (int name) 2392void glDeleteTexture (int name)
1811 CODE: 2393 CODE:
1812{ 2394{
1813 GLuint name_ = name; 2395 /* make a half-assed attempt at returning the memory used by the texture */
1814 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_); }*/
1815} 2401}
1816 2402
1817int glGenList () 2403int glGenList ()
1818 CODE: 2404 CODE:
1819 RETVAL = glGenLists (1); 2405 RETVAL = glGenLists (1);
1828 2414
1829void glEndList () 2415void glEndList ()
1830 2416
1831void glCallList (int list) 2417void glCallList (int list)
1832 2418
1833

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines