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.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.189 by root, Sat Apr 21 23:54: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>
23#include <stdlib.h>
15 24
16#include <SDL.h> 25#include <SDL.h>
17#include <SDL_endian.h> 26#include <SDL_endian.h>
18#include <SDL_image.h> 27#include <SDL_image.h>
19#include <SDL_mixer.h> 28#include <SDL_mixer.h>
20#include <SDL_opengl.h> 29#include <SDL_opengl.h>
21 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
22#include <glib/gmacros.h> 34#include <glib/gmacros.h>
23 35
24#include <pango/pango.h> 36#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 37
29#ifndef _WIN32 38#ifndef _WIN32
30# include <sys/types.h> 39# include <sys/types.h>
31# include <sys/socket.h> 40# include <sys/socket.h>
32# include <netinet/in.h> 41# include <netinet/in.h>
33# include <netinet/tcp.h> 42# include <netinet/tcp.h>
34# include <inttypes.h> 43# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 44#endif
43 45
44#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 47
46#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
47 49
48#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
50 52
51#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;
52 62
53static struct 63static struct
54{ 64{
55#define GL_FUNC(ptr,name) ptr name; 65#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 66#include "glfunc.h"
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 75 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 76 else
67 glBlendFunc (sa, da); 77 glBlendFunc (sa, da);
68} 78}
69 79
80#include "texcache.c"
81
82#include "pango-font.c"
83#include "pango-fontmap.c"
84#include "pango-render.c"
85
70typedef Mix_Chunk *CFClient__MixChunk; 86typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 87typedef Mix_Music *CFPlus__MixMusic;
72 88
73typedef 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}
74 108
75typedef struct cf_layout { 109typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 110 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 111 float r, g, b, a; // default color for rgba mode
79 int base_height; 112 int base_height;
80 CFClient__Font font; 113 CFPlus__Font font;
81} *CFClient__Layout; 114} *CFPlus__Layout;
82 115
83static CFClient__Font default_font; 116static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 117static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 118static PangoFontMap *opengl_fontmap;
86 119
87static void 120static void
88substitute_func (FcPattern *pattern, gpointer data) 121substitute_func (FcPattern *pattern, gpointer data)
89{ 122{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 123 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef _WIN32 124#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 125 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#else 126#endif
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 127 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
96} 128}
97 129
98static void 130static void
99layout_update_font (CFClient__Layout self) 131layout_update_font (CFPlus__Layout self)
100{ 132{
101 /* 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
102 * reasonably well with bitstream vera 134 * reasonably well with bitstream vera
103 */ 135 */
104 PangoFontDescription *font = self->font ? self->font : default_font; 136 PangoFontDescription *font = self->font ? self->font : default_font;
108 140
109 pango_layout_set_font_description (self->pl, font); 141 pango_layout_set_font_description (self->pl, font);
110} 142}
111 143
112static void 144static void
113layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 145layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114{ 146{
147 PangoRectangle rect;
148
149 // get_pixel_* wrongly rounds down
115 pango_layout_get_pixel_size (self->pl, w, h); 150 pango_layout_get_extents (self->pl, 0, &rect);
116 151
117 if (!*w) *w = 1; 152 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118 if (!*h) *h = 1; 153 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119 154
120 *w = (*w + 3) & ~3; 155 if (!rect.width) rect.width = 1;
121} 156 if (!rect.height) rect.height = 1;
122 157
158 *w = rect.width;
159 *h = rect.height;
160}
161
162typedef uint16_t tileid;
123typedef uint16_t mapface; 163typedef uint16_t faceid;
124 164
125typedef struct { 165typedef struct {
126 GLint name; 166 int name;
127 int w, h; 167 int w, h;
128 float s, t; 168 float s, t;
129 uint8_t r, g, b, a; 169 uint8_t r, g, b, a;
170 tileid smoothtile;
171 uint8_t smoothlevel;
130} maptex; 172} maptex;
131 173
132typedef struct { 174typedef struct {
175 uint32_t player;
176 tileid tile[3];
133 int16_t darkness; 177 uint16_t darkness;
134 mapface face[3]; 178 uint8_t stat_width, stat_hp, flags, smoothmax;
135} mapcell; 179} mapcell;
136 180
137typedef struct { 181typedef struct {
138 int32_t c0, c1; 182 int32_t c0, c1;
139 mapcell *col; 183 mapcell *col;
140} maprow; 184} maprow;
141 185
142typedef struct map { 186typedef struct map {
143 int x, y, w, h; 187 int x, y, w, h;
144 int ox, oy; /* offset to virtual global coordinate system */ 188 int ox, oy; /* offset to virtual global coordinate system */
145 int faces; 189 int faces; tileid *face2tile; // [faceid]
146 mapface *face; 190 int texs; maptex *tex; // [tileid]
147
148 int texs;
149 maptex *tex;
150 191
151 int32_t rows; 192 int32_t rows;
152 maprow *row; 193 maprow *row;
153} *CFClient__Map; 194} *CFPlus__Map;
154 195
155static char * 196static char *
156prepend (char *ptr, int sze, int inc) 197prepend (char *ptr, int sze, int inc)
157{ 198{
158 char *p; 199 char *p;
175} 216}
176 217
177#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))
178#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))
179 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
180static maprow * 241static maprow *
181map_get_row (CFClient__Map self, int y) 242map_get_row (CFPlus__Map self, int y)
182{ 243{
183 if (0 > y) 244 if (0 > y)
184 { 245 {
185 int extend = - y + MAP_EXTEND_Y; 246 int extend = - y + MAP_EXTEND_Y;
186 Prepend (maprow, self->row, self->rows, extend); 247 Prepend (maprow, self->row, self->rows, extend);
224 285
225 return row->col + (x - row->c0); 286 return row->col + (x - row->c0);
226} 287}
227 288
228static mapcell * 289static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 290map_get_cell (CFPlus__Map self, int x, int y)
230{ 291{
231 return row_get_cell (map_get_row (self, y), x); 292 return row_get_cell (map_get_row (self, y), x);
232} 293}
233 294
234static void 295static void
235map_clear (CFClient__Map self) 296map_clear (CFPlus__Map self)
236{ 297{
237 int r; 298 int r;
238 299
239 for (r = 0; r < self->rows; r++) 300 for (r = 0; r < self->rows; r++)
240 Safefree (self->row[r].col); 301 Safefree (self->row[r].col);
248 self->row = 0; 309 self->row = 0;
249 self->rows = 0; 310 self->rows = 0;
250} 311}
251 312
252static void 313static void
253map_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)
254{ 315{
255 int x, y; 316 int x, y;
256 maprow *row; 317 maprow *row;
318 mapcell *cell;
257 319
258 for (y = y0; y < y0 + h; y++) 320 for (y = y0; y < y0 + h; y++)
259 if (y >= 0) 321 if (y >= 0)
260 { 322 {
261 if (y >= self->rows) 323 if (y >= self->rows)
267 if (x >= row->c0) 329 if (x >= row->c0)
268 { 330 {
269 if (x >= row->c1) 331 if (x >= row->c1)
270 break; 332 break;
271 333
272 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;
273 } 340 }
274 } 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);
275} 358}
276 359
277static void 360static void
278music_finished (void) 361music_finished (void)
279{ 362{
298 ev.data2 = 0; 381 ev.data2 = 0;
299 382
300 SDL_PushEvent ((SDL_Event *)&ev); 383 SDL_PushEvent ((SDL_Event *)&ev);
301} 384}
302 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
303MODULE = CFClient PACKAGE = CFClient 407MODULE = CFPlus PACKAGE = CFPlus
304 408
305PROTOTYPES: ENABLE 409PROTOTYPES: ENABLE
306 410
307BOOT: 411BOOT:
308{ 412{
309 HV *stash = gv_stashpv ("CFClient", 1); 413 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 414 static const struct {
311 const char *name; 415 const char *name;
312 IV iv; 416 IV iv;
313 } *civ, const_iv[] = { 417 } *civ, const_iv[] = {
314# 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
315 const_iv (SDL_ACTIVEEVENT), 422 const_iv (SDL_ACTIVEEVENT),
316 const_iv (SDL_KEYDOWN), 423 const_iv (SDL_KEYDOWN),
317 const_iv (SDL_KEYUP), 424 const_iv (SDL_KEYUP),
318 const_iv (SDL_MOUSEMOTION), 425 const_iv (SDL_MOUSEMOTION),
319 const_iv (SDL_MOUSEBUTTONDOWN), 426 const_iv (SDL_MOUSEBUTTONDOWN),
328 const_iv (SDL_EVENT_RESERVEDA), 435 const_iv (SDL_EVENT_RESERVEDA),
329 const_iv (SDL_EVENT_RESERVEDB), 436 const_iv (SDL_EVENT_RESERVEDB),
330 const_iv (SDL_VIDEORESIZE), 437 const_iv (SDL_VIDEORESIZE),
331 const_iv (SDL_VIDEOEXPOSE), 438 const_iv (SDL_VIDEOEXPOSE),
332 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
333 const_iv (SDLK_KP0), 445 const_iv (SDLK_KP0),
334 const_iv (SDLK_KP1), 446 const_iv (SDLK_KP1),
335 const_iv (SDLK_KP2), 447 const_iv (SDLK_KP2),
336 const_iv (SDLK_KP3), 448 const_iv (SDLK_KP3),
337 const_iv (SDLK_KP4), 449 const_iv (SDLK_KP4),
392 const_iv (SDLK_BREAK), 504 const_iv (SDLK_BREAK),
393 const_iv (SDLK_MENU), 505 const_iv (SDLK_MENU),
394 const_iv (SDLK_POWER), 506 const_iv (SDLK_POWER),
395 const_iv (SDLK_EURO), 507 const_iv (SDLK_EURO),
396 const_iv (SDLK_UNDO), 508 const_iv (SDLK_UNDO),
509
397 const_iv (KMOD_NONE), 510 const_iv (KMOD_NONE),
511 const_iv (KMOD_SHIFT),
398 const_iv (KMOD_LSHIFT), 512 const_iv (KMOD_LSHIFT),
399 const_iv (KMOD_RSHIFT), 513 const_iv (KMOD_RSHIFT),
514 const_iv (KMOD_CTRL),
400 const_iv (KMOD_LCTRL), 515 const_iv (KMOD_LCTRL),
401 const_iv (KMOD_RCTRL), 516 const_iv (KMOD_RCTRL),
517 const_iv (KMOD_ALT),
402 const_iv (KMOD_LALT), 518 const_iv (KMOD_LALT),
403 const_iv (KMOD_RALT), 519 const_iv (KMOD_RALT),
520 const_iv (KMOD_META),
404 const_iv (KMOD_LMETA), 521 const_iv (KMOD_LMETA),
405 const_iv (KMOD_RMETA), 522 const_iv (KMOD_RMETA),
406 const_iv (KMOD_NUM), 523 const_iv (KMOD_NUM),
407 const_iv (KMOD_CAPS), 524 const_iv (KMOD_CAPS),
408 const_iv (KMOD_MODE), 525 const_iv (KMOD_MODE),
409 const_iv (KMOD_CTRL),
410 const_iv (KMOD_SHIFT),
411 const_iv (KMOD_ALT),
412 const_iv (KMOD_META)
413# undef const_iv 526# undef const_iv
414 }; 527 };
415 528
416 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; )
417 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);
418} 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)
419 552
420void 553void
421pango_init () 554pango_init ()
422 CODE: 555 CODE:
423{ 556{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425 ft2_fontmap = pango_ft2_font_map_new (); 557 opengl_fontmap = pango_opengl_font_map_new ();
426 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);
427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 559 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429 cairo_fontmap = pango_cairo_font_map_get_default ();
430 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431} 560}
432 561
433int 562int
434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 563SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435 564
436void 565void
437SDL_Quit () 566SDL_Quit ()
438 567
439void 568void
446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 575 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 576 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 577 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449 578
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 579 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 580 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 581
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 582 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 583 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 584 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 585 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457 586
458 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
459 592
460 SDL_EnableUNICODE (1); 593 SDL_EnableUNICODE (1);
461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 594 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462 595
463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 596 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
483 RETVAL = !!SDL_SetVideoMode ( 616 RETVAL = !!SDL_SetVideoMode (
484 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 617 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
485 ); 618 );
486 if (RETVAL) 619 if (RETVAL)
487 { 620 {
621 av_clear (texture_av);
622
488 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 623 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
489# 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);
490# include "glfunc.h" 625# include "glfunc.h"
491# undef GL_FUNC 626# undef GL_FUNC
627
492 } 628 }
493 OUTPUT: 629 OUTPUT:
494 RETVAL 630 RETVAL
495 631
496void 632void
515 case SDL_KEYDOWN: 651 case SDL_KEYDOWN:
516 case SDL_KEYUP: 652 case SDL_KEYUP:
517 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
518 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
519 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 */
520 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
521 break; 658 break;
522 659
523 case SDL_ACTIVEEVENT: 660 case SDL_ACTIVEEVENT:
524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
550 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 687 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 688 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552 break; 689 break;
553 } 690 }
554 691
555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 692 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556 } 693 }
557} 694}
558 695
559int 696int
560Mix_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)
569Mix_AllocateChannels (int numchans = -1) 706Mix_AllocateChannels (int numchans = -1)
570 707
571void 708void
572lowdelay (int fd, int val = 1) 709lowdelay (int fd, int val = 1)
573 CODE: 710 CODE:
711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
712
713void
714win32_proxy_info ()
715 PPCODE:
716{
574#ifndef _WIN32 717#ifdef _WIN32
575 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 }
576#endif 739#endif
740}
577 741
578void 742void
579add_font (char *file) 743add_font (char *file)
580 CODE: 744 CODE:
581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 745 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582#ifdef _WIN32
583 // cairo... sigh... requires win2000
584 AddFontResourceEx (file, FR_PRIVATE, 0);
585#endif
586 746
587void 747void
588load_image_inline (SV *image_) 748load_image_inline (SV *image_)
589 ALIAS: 749 ALIAS:
590 load_image_file = 1 750 load_image_file = 1
632 792
633 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 793 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634 794
635 assert (surface2->pitch == surface2->w * 4); 795 assert (surface2->pitch == surface2->w * 4);
636 796
797 SDL_LockSurface (surface2);
637 EXTEND (SP, 5); 798 EXTEND (SP, 6);
638 PUSHs (sv_2mortal (newSViv (surface2->w))); 799 PUSHs (sv_2mortal (newSViv (surface2->w)));
639 PUSHs (sv_2mortal (newSViv (surface2->h))); 800 PUSHs (sv_2mortal (newSViv (surface2->h)));
640 SDL_LockSurface (surface2);
641 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 801 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642 SDL_UnlockSurface (surface2);
643 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)));
644 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 803 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 804 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
805 SDL_UnlockSurface (surface2);
646 806
647 SDL_FreeSurface (surface); 807 SDL_FreeSurface (surface);
648 SDL_FreeSurface (surface2); 808 SDL_FreeSurface (surface2);
649} 809}
650 810
686 CODE: 846 CODE:
687 fprintf (stderr, "FATAL: %s\n", message); 847 fprintf (stderr, "FATAL: %s\n", message);
688#ifdef _WIN32 848#ifdef _WIN32
689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 849 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690#endif 850#endif
691 exit (1); 851 _exit (1);
692 852
853void
854_exit (int retval = 0)
855 CODE:
856#ifdef WIN32
857 ExitThread (retval); // unclean, please beam me up
858#else
859 _exit (retval);
860#endif
861
693MODULE = CFClient PACKAGE = CFClient::Font 862MODULE = CFPlus PACKAGE = CFPlus::Font
694 863
695CFClient::Font 864CFPlus::Font
696new_from_file (SV *class, char *path, int id = 0) 865new_from_file (SV *class, char *path, int id = 0)
697 CODE: 866 CODE:
698{ 867{
699 int count; 868 int count;
700 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 869 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
703} 872}
704 OUTPUT: 873 OUTPUT:
705 RETVAL 874 RETVAL
706 875
707void 876void
708DESTROY (CFClient::Font self) 877DESTROY (CFPlus::Font self)
709 CODE: 878 CODE:
710 pango_font_description_free (self); 879 pango_font_description_free (self);
711 880
712void 881void
713make_default (CFClient::Font self) 882make_default (CFPlus::Font self)
714 CODE: 883 CODE:
715 default_font = self; 884 default_font = self;
716 885
717MODULE = CFClient PACKAGE = CFClient::Layout 886MODULE = CFPlus PACKAGE = CFPlus::Layout
718 887
719CFClient::Layout 888void
720new (SV *class, int rgba = 0) 889reset_glyph_cache ()
721 CODE: 890 CODE:
722#if _WIN32 891 tc_clear ();
723 //rgba = 0;//D makes text nicer, breaks TextView 892
724#endif 893CFPlus::Layout
894new (SV *class)
895 CODE:
725 New (0, RETVAL, 1, struct cf_layout); 896 New (0, RETVAL, 1, struct cf_layout);
726 897
727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 898 RETVAL->pl = pango_layout_new (opengl_context);
728 RETVAL->rgba = rgba;
729 RETVAL->r = 1.; 899 RETVAL->r = 1.;
730 RETVAL->g = 1.; 900 RETVAL->g = 1.;
731 RETVAL->b = 1.; 901 RETVAL->b = 1.;
732 RETVAL->a = 1.; 902 RETVAL->a = 1.;
733 RETVAL->base_height = MIN_FONT_HEIGHT; 903 RETVAL->base_height = MIN_FONT_HEIGHT;
737 layout_update_font (RETVAL); 907 layout_update_font (RETVAL);
738 OUTPUT: 908 OUTPUT:
739 RETVAL 909 RETVAL
740 910
741void 911void
742DESTROY (CFClient::Layout self) 912DESTROY (CFPlus::Layout self)
743 CODE: 913 CODE:
744 g_object_unref (self->pl); 914 g_object_unref (self->pl);
745 Safefree (self); 915 Safefree (self);
746 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
747int 1007int
748is_rgba (CFClient::Layout self) 1008has_wrapped (CFPlus::Layout self)
749 CODE: 1009 CODE:
750 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}
751 OUTPUT: 1019 OUTPUT:
752 RETVAL 1020 RETVAL
753 1021
754void
755set_text (CFClient::Layout self, SV *text_)
756 CODE:
757{
758 STRLEN textlen;
759 char *text = SvPVutf8 (text_, textlen);
760
761 pango_layout_set_text (self->pl, text, textlen);
762}
763
764void
765set_markup (CFClient::Layout self, SV *text_)
766 CODE:
767{
768 STRLEN textlen;
769 char *text = SvPVutf8 (text_, textlen);
770
771 pango_layout_set_markup (self->pl, text, textlen);
772}
773
774SV * 1022SV *
775get_text (CFClient::Layout self) 1023get_text (CFPlus::Layout self)
776 CODE: 1024 CODE:
777 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1025 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778 SvUTF8_on (RETVAL); 1026 sv_utf8_decode (RETVAL);
779 OUTPUT: 1027 OUTPUT:
780 RETVAL 1028 RETVAL
781 1029
782void 1030void
783set_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.)
784 CODE: 1032 CODE:
785 self->r = r; 1033 self->r = r;
786 self->g = g; 1034 self->g = g;
787 self->b = b; 1035 self->b = b;
788 self->a = a; 1036 self->a = a;
789 1037
790void 1038void
791set_font (CFClient::Layout self, CFClient::Font font = 0) 1039set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792 CODE: 1040 CODE:
793 if (self->font != font) 1041 if (self->font != font)
794 { 1042 {
795 self->font = font; 1043 self->font = font;
796 layout_update_font (self); 1044 layout_update_font (self);
797 } 1045 }
798 1046
799void 1047void
800set_height (CFClient::Layout self, int base_height) 1048set_height (CFPlus::Layout self, int base_height)
801 CODE: 1049 CODE:
802 if (self->base_height != base_height) 1050 if (self->base_height != base_height)
803 { 1051 {
804 self->base_height = base_height; 1052 self->base_height = base_height;
805 layout_update_font (self); 1053 layout_update_font (self);
806 } 1054 }
807 1055
808void 1056void
809set_width (CFClient::Layout self, int max_width = -1) 1057set_width (CFPlus::Layout self, int max_width = -1)
810 CODE: 1058 CODE:
811 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);
812 1060
813void 1061void
814set_indent (CFClient::Layout self, int indent) 1062set_indent (CFPlus::Layout self, int indent)
815 CODE: 1063 CODE:
816 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1064 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817 1065
818void 1066void
819set_spacing (CFClient::Layout self, int spacing) 1067set_spacing (CFPlus::Layout self, int spacing)
820 CODE: 1068 CODE:
821 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1069 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822 1070
823void 1071void
824set_ellipsise (CFClient::Layout self, int ellipsise) 1072set_ellipsise (CFPlus::Layout self, int ellipsise)
825 CODE: 1073 CODE:
826 pango_layout_set_ellipsize (self->pl, 1074 pango_layout_set_ellipsize (self->pl,
827 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1075 ellipsise == 1 ? PANGO_ELLIPSIZE_START
828 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1076 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1077 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
830 : PANGO_ELLIPSIZE_NONE 1078 : PANGO_ELLIPSIZE_NONE
831 ); 1079 );
832 1080
833void 1081void
834set_single_paragraph_mode (CFClient::Layout self, int spm) 1082set_single_paragraph_mode (CFPlus::Layout self, int spm)
835 CODE: 1083 CODE:
836 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1084 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837 1085
838void 1086void
839size (CFClient::Layout self) 1087size (CFPlus::Layout self)
840 PPCODE: 1088 PPCODE:
841{ 1089{
842 int w, h; 1090 int w, h;
843 1091
844 layout_get_pixel_size (self, &w, &h); 1092 layout_get_pixel_size (self, &w, &h);
847 PUSHs (sv_2mortal (newSViv (w))); 1095 PUSHs (sv_2mortal (newSViv (w)));
848 PUSHs (sv_2mortal (newSViv (h))); 1096 PUSHs (sv_2mortal (newSViv (h)));
849} 1097}
850 1098
851int 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
852xy_to_index (CFClient::Layout self, int x, int y) 1112xy_to_index (CFPlus::Layout self, int x, int y)
853 CODE: 1113 CODE:
854{ 1114{
855 int index, trailing; 1115 int index, trailing;
856 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);
857 RETVAL = index; 1117 RETVAL = index + trailing;
858} 1118}
859 OUTPUT: 1119 OUTPUT:
860 RETVAL 1120 RETVAL
861 1121
862void 1122void
863cursor_pos (CFClient::Layout self, int index) 1123cursor_pos (CFPlus::Layout self, int index)
864 PPCODE: 1124 PPCODE:
865{ 1125{
866 PangoRectangle strong_pos; 1126 PangoRectangle strong_pos;
867 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1127 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868 1128
871 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873} 1133}
874 1134
875void 1135void
876render (CFClient::Layout self) 1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
877 PPCODE: 1137 PPCODE:
878{ 1138{
879 SV *retval; 1139 int line, x;
880 int w, h;
881 1140
882 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 */
883 1143
884 if (self->rgba)
885 {
886 cairo_surface_t *surface;
887 cairo_t *cairo;
888
889 retval = newSV (w * h * 4);
890 SvPOK_only (retval);
891 SvCUR_set (retval, w * h * 4);
892
893 memset (SvPVX (retval), 0, w * h * 4);
894
895 surface = cairo_image_surface_create_for_data (
896 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
897 cairo = cairo_create (surface);
898 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900 pango_cairo_show_layout (cairo, self->pl);
901
902 cairo_destroy (cairo);
903 cairo_surface_destroy (surface);
904
905 // what a mess, and its premultiplied, too :(
906 {
907 uint32_t *p = (uint32_t *)SvPVX (retval);
908 uint32_t *e = p + w * h;
909
910 while (p < e)
911 {
912 uint32_t rgba = *p;
913 rgba = (rgba >> 24) | (rgba << 8);
914#if 0
915#ifdef _WIN32
916 {//D
917 uint8_t r = rgba >> 24;
918 uint8_t g = rgba >> 16;
919 uint8_t b = rgba >> 8;
920 uint8_t a = rgba >> 0;
921
922 rgba = (rgba & 0xffffff00) | a;
923 }
924#endif
925#endif
926 rgba = SDL_SwapBE32 (rgba);
927 *p++ = rgba;
928 }
929 }
930
931 EXTEND (SP, 5); 1144 EXTEND (SP, 2);
932 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)
933 PUSHs (sv_2mortal (newSViv (h))); 1166 PUSHs (sv_2mortal (newSViv (index + trailing)));
934 PUSHs (sv_2mortal (retval));
935 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 }
938 else 1167 else
939 { 1168 {
940 FT_Bitmap bitmap;
941
942 retval = newSV (w * h);
943 SvPOK_only (retval);
944 SvCUR_set (retval, w * h);
945
946 bitmap.rows = h;
947 bitmap.width = w;
948 bitmap.pitch = w;
949 bitmap.buffer = (unsigned char*)SvPVX (retval);
950 bitmap.num_grays = 256;
951 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953 memset (bitmap.buffer, 0, w * h);
954
955 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957 EXTEND (SP, 5);
958 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (index)));
959 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (trailing)));
960 PUSHs (sv_2mortal (retval));
961 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 } 1171 }
964} 1172}
965 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
966MODULE = CFClient PACKAGE = CFClient::Texture 1184MODULE = CFPlus PACKAGE = CFPlus::Texture
967 1185
968void 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
969draw_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.)
970 PROTOTYPE: $$$;$$ 1225 PROTOTYPE: $$$;$$
971 ALIAS: 1226 ALIAS:
972 draw_quad_alpha = 1 1227 draw_quad_alpha = 1
973 draw_quad_alpha_premultiplied = 2 1228 draw_quad_alpha_premultiplied = 2
974 CODE: 1229 CODE:
990 1245
991 if (ix == 2) 1246 if (ix == 2)
992 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1247 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993 else 1248 else
994 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1249 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995 GL_ONE_MINUS_DST_ALPHA, GL_ONE); 1250 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996 1251
997 glEnable (GL_ALPHA_TEST); 1252 glEnable (GL_ALPHA_TEST);
998 glAlphaFunc (GL_GREATER, 0.01f); 1253 glAlphaFunc (GL_GREATER, 0.01f);
999 } 1254 }
1000 1255
1012 glDisable (GL_ALPHA_TEST); 1267 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND); 1268 glDisable (GL_BLEND);
1014 } 1269 }
1015} 1270}
1016 1271
1017MODULE = CFClient PACKAGE = CFClient::Map 1272MODULE = CFPlus PACKAGE = CFPlus::Map
1018 1273
1019CFClient::Map 1274CFPlus::Map
1020new (SV *class, int map_width, int map_height) 1275new (SV *class)
1021 CODE: 1276 CODE:
1022 New (0, RETVAL, 1, struct map); 1277 New (0, RETVAL, 1, struct map);
1023 RETVAL->x = 0; 1278 RETVAL->x = 0;
1024 RETVAL->y = 0; 1279 RETVAL->y = 0;
1025 RETVAL->w = map_width; 1280 RETVAL->w = 0;
1026 RETVAL->h = map_height; 1281 RETVAL->h = 0;
1027 RETVAL->ox = 0; 1282 RETVAL->ox = 0;
1028 RETVAL->oy = 0; 1283 RETVAL->oy = 0;
1029 RETVAL->faces = 8192; 1284 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1030 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1285 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1031 RETVAL->texs = 8192;
1032 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1033 RETVAL->rows = 0; 1286 RETVAL->rows = 0;
1034 RETVAL->row = 0; 1287 RETVAL->row = 0;
1035 OUTPUT: 1288 OUTPUT:
1036 RETVAL 1289 RETVAL
1037 1290
1038void 1291void
1039DESTROY (CFClient::Map self) 1292DESTROY (CFPlus::Map self)
1040 CODE: 1293 CODE:
1041{ 1294{
1042 map_clear (self); 1295 map_clear (self);
1043 Safefree (self->face); 1296 Safefree (self->face2tile);
1297 Safefree (self->tex);
1044 Safefree (self); 1298 Safefree (self);
1045} 1299}
1046 1300
1047void 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
1048clear (CFClient::Map self) 1308clear (CFPlus::Map self)
1049 CODE: 1309 CODE:
1050 map_clear (self); 1310 map_clear (self);
1051 1311
1052void 1312void
1053set_face (CFClient::Map self, int face, int texid) 1313set_tileid (CFPlus::Map self, int face, int tile)
1054 CODE: 1314 CODE:
1055{ 1315{
1056 while (self->faces <= face) 1316 need_facenum (self, face); self->face2tile [face] = tile;
1057 { 1317 need_texid (self, tile);
1058 Append (mapface, self->face, self->faces, self->faces);
1059 self->faces *= 2;
1060 }
1061
1062 self->face [face] = texid;
1063} 1318}
1064 1319
1065void 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
1066set_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)
1067 CODE: 1345 CODE:
1068{ 1346{
1069 while (self->texs <= texid) 1347 need_texid (self, texid);
1070 {
1071 Append (maptex, self->tex, self->texs, self->texs);
1072 self->texs *= 2;
1073 }
1074 1348
1075 { 1349 {
1076 maptex *tex = self->tex + texid; 1350 maptex *tex = self->tex + texid;
1077 1351
1078 tex->name = name; 1352 tex->name = name;
1095 // from transparent color bleeding and ugly wrapping effects. 1369 // from transparent color bleeding and ugly wrapping effects.
1096 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1370 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097} 1371}
1098 1372
1099int 1373int
1100ox (CFClient::Map self) 1374ox (CFPlus::Map self)
1101 ALIAS: 1375 ALIAS:
1102 oy = 1 1376 oy = 1
1103 x = 2 1377 x = 2
1104 y = 3 1378 y = 3
1105 w = 4 1379 w = 4
1116 } 1390 }
1117 OUTPUT: 1391 OUTPUT:
1118 RETVAL 1392 RETVAL
1119 1393
1120void 1394void
1121scroll (CFClient::Map self, int dx, int dy) 1395scroll (CFPlus::Map self, int dx, int dy)
1122 CODE: 1396 CODE:
1123{ 1397{
1124 if (dx > 0) 1398 if (dx > 0)
1125 map_blank (self, self->x, self->y, dx - 1, self->h); 1399 map_blank (self, self->x, self->y, dx, self->h);
1126 else if (dx < 0) 1400 else if (dx < 0)
1127 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);
1128 1402
1129 if (dy > 0) 1403 if (dy > 0)
1130 map_blank (self, self->x, self->y, self->w, dy - 1); 1404 map_blank (self, self->x, self->y, self->w, dy);
1131 else if (dy < 0) 1405 else if (dy < 0)
1132 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);
1133 1407
1134 self->ox += dx; self->x += dx; 1408 self->ox += dx; self->x += dx;
1135 self->oy += dy; self->y += dy; 1409 self->oy += dy; self->y += dy;
1136 1410
1137 while (self->y < 0) 1411 while (self->y < 0)
1142 self->y += MAP_EXTEND_Y; 1416 self->y += MAP_EXTEND_Y;
1143 } 1417 }
1144} 1418}
1145 1419
1146void 1420void
1147map1a_update (CFClient::Map self, SV *data_) 1421map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148 CODE: 1422 CODE:
1149{ 1423{
1150 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1424 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1151 uint8_t *data_end = (uint8_t *)SvEND (data_); 1425 uint8_t *data_end = (uint8_t *)SvEND (data_);
1152 mapcell *cell; 1426 mapcell *cell;
1153 int x, y, flags; 1427 int x, y, flags;
1154 1428
1155 while (data < data_end) 1429 while (data < data_end - 1)
1156 { 1430 {
1157 flags = (data [0] << 8) + data [1]; data += 2; 1431 flags = (data [0] << 8) + data [1]; data += 2;
1158 1432
1159 x = ((flags >> 10) & 63) + self->x; 1433 x = self->x + ((flags >> 10) & 63);
1160 y = ((flags >> 4) & 63) + self->y; 1434 y = self->y + ((flags >> 4) & 63);
1161 1435
1162 cell = map_get_cell (self, x, y); 1436 cell = map_get_cell (self, x, y);
1163 1437
1164 if (flags & 15) 1438 if (flags & 15)
1165 { 1439 {
1166 if (cell->darkness < 0) 1440 if (!cell->darkness)
1167 { 1441 {
1442 memset (cell, 0, sizeof (*cell));
1168 cell->darkness = 0; 1443 cell->darkness = 256;
1169 cell->face [0] = 0;
1170 cell->face [1] = 0;
1171 cell->face [2] = 0;
1172 } 1444 }
1173 1445
1174 cell->darkness = flags & 8 ? *data++ : 255;
1175
1176 //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 }
1177 1487
1178 if (flags & 4) 1488 if (flags & 4)
1179 { 1489 {
1180 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];
1181 } 1493 }
1182 1494
1183 if (flags & 2) 1495 if (flags & 2)
1184 { 1496 {
1185 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];
1186 } 1500 }
1187 1501
1188 if (flags & 1) 1502 if (flags & 1)
1189 { 1503 {
1190 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];
1191 } 1507 }
1192 } 1508 }
1193 else 1509 else
1194 cell->darkness = -1; 1510 cell->darkness = 0;
1195 } 1511 }
1196} 1512}
1197 1513
1198SV * 1514SV *
1199mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1515mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200 CODE: 1516 CODE:
1201{ 1517{
1202 int x1, x; 1518 int x1, x;
1203 int y1, y; 1519 int y1, y;
1204 int z; 1520 int z;
1225 { 1541 {
1226 mapcell *cell = row->col + (x - row->c0); 1542 mapcell *cell = row->col + (x - row->c0);
1227 1543
1228 for (z = 0; z <= 0; z++) 1544 for (z = 0; z <= 0; z++)
1229 { 1545 {
1230 mapface face = cell->face [z];
1231
1232 if (face)
1233 {
1234 maptex tex = self->tex [face]; 1546 maptex tex = self->tex [cell->tile [z]];
1235 int a0 = 255 - tex.a; 1547 int a0 = 255 - tex.a;
1236 int a1 = tex.a; 1548 int a1 = tex.a;
1237 1549
1238 r = (r * a0 + tex.r * a1) / 255; 1550 r = (r * a0 + tex.r * a1) / 255;
1239 g = (g * a0 + tex.g * a1) / 255; 1551 g = (g * a0 + tex.g * a1) / 255;
1240 b = (b * a0 + tex.b * a1) / 255; 1552 b = (b * a0 + tex.b * a1) / 255;
1241 a = (a * a0 + tex.a * a1) / 255; 1553 a = (a * a0 + tex.a * a1) / 255;
1242 }
1243 } 1554 }
1244 } 1555 }
1245 1556
1246 *map++ = (r ) 1557 *map++ = (r )
1247 | (g << 8) 1558 | (g << 8)
1254} 1565}
1255 OUTPUT: 1566 OUTPUT:
1256 RETVAL 1567 RETVAL
1257 1568
1258void 1569void
1259draw (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)
1260 PPCODE: 1571 CODE:
1261{ 1572{
1262 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;
1263 int x, y, z; 1577 int x, y, z;
1264 int last_name; 1578 int last_name;
1265 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;
1266 int sw4 = (sw + 3) & ~3; 1897 int sw4 = (sw + 3) & ~3;
1267 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1898 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1268 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1899 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1269 1900
1270 memset (darkness, 255, sw4 * sh); 1901 memset (darkness, 255, sw4 * sh);
1271 SvPOK_only (darkness_sv); 1902 SvPOK_only (darkness_sv);
1272 SvCUR_set (darkness_sv, sw4 * sh); 1903 SvCUR_set (darkness_sv, sw4 * sh);
1273 1904
1274 vx = self->x + (self->w - sw) / 2 - shift_x; 1905 mx += self->x;
1275 vy = self->y + (self->h - sh) / 2 - shift_y; 1906 my += self->y;
1276 1907
1277 /*
1278 int vx = self->vx = self->w >= sw
1279 ? self->x + (self->w - sw) / 2
1280 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1281
1282 int vy = self->vy = self->h >= sh
1283 ? self->y + (self->h - sh) / 2
1284 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285 */
1286
1287 glColor4ub (255, 255, 255, 255);
1288
1289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290 glEnable (GL_BLEND);
1291 glEnable (GL_TEXTURE_2D);
1292 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293
1294 glBegin (GL_QUADS);
1295
1296 last_name = 0;
1297
1298 for (z = 0; z < 3; z++)
1299 for (y = 0; y < sh; y++) 1908 for (y = 0; y < sh; y++)
1300 if (0 <= y + vy && y + vy < self->rows) 1909 if (0 <= y + my && y + my < self->rows)
1301 { 1910 {
1302 maprow *row = self->row + (y + vy); 1911 maprow *row = self->row + (y + my);
1303 1912
1304 for (x = 0; x < sw; x++) 1913 for (x = 0; x < sw; x++)
1305 if (row->c0 <= x + vx && x + vx < row->c1) 1914 if (row->c0 <= x + mx && x + mx < row->c1)
1306 { 1915 {
1307 mapcell *cell = row->col + (x + vx - row->c0); 1916 mapcell *cell = row->col + (x + mx - row->c0);
1308 1917
1309 darkness[y * sw4 + x] = cell->darkness < 0 1918 darkness[y * sw4 + x] = cell->darkness
1919 ? 255 - (cell->darkness - 1)
1310 ? 255 - FOW_DARKNESS 1920 : 255 - FOW_DARKNESS;
1311 : 255 - cell->darkness;
1312
1313 face = cell->face [z];
1314
1315 if (face)
1316 {
1317 maptex tex = self->tex [face];
1318
1319 int px = (x + 1) * 32 - tex.w;
1320 int py = (y + 1) * 32 - tex.h;
1321
1322 if (last_name != tex.name)
1323 {
1324 glEnd ();
1325 last_name = tex.name;
1326 glBindTexture (GL_TEXTURE_2D, last_name);
1327 glBegin (GL_QUADS);
1328 }
1329
1330 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1331 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1332 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1333 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1334 }
1335 } 1921 }
1336 } 1922 }
1337
1338 glEnd ();
1339
1340 glDisable (GL_TEXTURE_2D);
1341 glDisable (GL_BLEND);
1342 1923
1343 EXTEND (SP, 3); 1924 EXTEND (SP, 3);
1344 PUSHs (sv_2mortal (newSViv (sw4))); 1925 PUSHs (sv_2mortal (newSViv (sw4)));
1345 PUSHs (sv_2mortal (newSViv (sh))); 1926 PUSHs (sv_2mortal (newSViv (sh)));
1346 PUSHs (darkness_sv); 1927 PUSHs (darkness_sv);
1347} 1928}
1348 1929
1349SV * 1930SV *
1350get_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)
1351 CODE: 1932 CODE:
1352{ 1933{
1353 int x, y, x1, y1; 1934 int x, y, x1, y1;
1354 SV *data_sv = newSV (w * h * 7 + 5); 1935 SV *data_sv = newSV (w * h * 7 + 5);
1355 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1936 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1380 if (row && row->c0 <= x && x < row->c1) 1961 if (row && row->c0 <= x && x < row->c1)
1381 { 1962 {
1382 mapcell *cell = row->col + (x - row->c0); 1963 mapcell *cell = row->col + (x - row->c0);
1383 uint8_t flags = 0; 1964 uint8_t flags = 0;
1384 1965
1385 if (cell->face [0]) flags |= 1; 1966 if (cell->tile [0]) flags |= 1;
1386 if (cell->face [1]) flags |= 2; 1967 if (cell->tile [1]) flags |= 2;
1387 if (cell->face [2]) flags |= 4; 1968 if (cell->tile [2]) flags |= 4;
1388 1969
1389 *data++ = flags; 1970 *data++ = flags;
1390 1971
1391 if (flags & 1) 1972 if (flags & 1)
1392 { 1973 {
1974 tileid tile = cell->tile [0];
1393 *data++ = cell->face [0] >> 8; 1975 *data++ = tile >> 8;
1394 *data++ = cell->face [0]; 1976 *data++ = tile;
1395 } 1977 }
1396 1978
1397 if (flags & 2) 1979 if (flags & 2)
1398 { 1980 {
1981 tileid tile = cell->tile [1];
1399 *data++ = cell->face [1] >> 8; 1982 *data++ = tile >> 8;
1400 *data++ = cell->face [1]; 1983 *data++ = tile;
1401 } 1984 }
1402 1985
1403 if (flags & 4) 1986 if (flags & 4)
1404 { 1987 {
1988 tileid tile = cell->tile [2];
1405 *data++ = cell->face [2] >> 8; 1989 *data++ = tile >> 8;
1406 *data++ = cell->face [2]; 1990 *data++ = tile;
1407 } 1991 }
1408 } 1992 }
1409 else 1993 else
1410 *data++ = 0; 1994 *data++ = 0;
1411 } 1995 }
1417} 2001}
1418 OUTPUT: 2002 OUTPUT:
1419 RETVAL 2003 RETVAL
1420 2004
1421void 2005void
1422set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2006set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423 PPCODE: 2007 PPCODE:
1424{ 2008{
1425 int x, y, z; 2009 int x, y, z;
1426 int w, h; 2010 int w, h;
1427 int x1, y1; 2011 int x1, y1;
1451 { 2035 {
1452 uint8_t flags = *data++; 2036 uint8_t flags = *data++;
1453 2037
1454 if (flags) 2038 if (flags)
1455 { 2039 {
1456 mapface face[3] = { 0, 0, 0 };
1457
1458 mapcell *cell = row_get_cell (row, x); 2040 mapcell *cell = row_get_cell (row, x);
2041 tileid tile[3] = { 0, 0, 0 };
1459 2042
1460 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2043 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1461 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2044 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1462 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2045 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1463 2046
1464 if (cell->darkness <= 0) 2047 if (cell->darkness == 0)
1465 { 2048 {
1466 cell->darkness = -1; 2049 cell->darkness = 0;
1467 2050
1468 for (z = 0; z <= 2; z++) 2051 for (z = 0; z <= 2; z++)
1469 { 2052 {
1470 cell->face[z] = face[z]; 2053 tileid t = tile [z];
1471 2054
1472 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2055 if (t >= self->texs || (t && !self->tex [t].name))
2056 {
1473 XPUSHs (sv_2mortal (newSViv (face[z]))); 2057 XPUSHs (sv_2mortal (newSViv (t)));
2058 need_texid (self, t);
2059 }
2060
2061 cell->tile [z] = t;
1474 } 2062 }
1475 } 2063 }
1476 } 2064 }
1477 } 2065 }
1478 } 2066 }
1479} 2067}
1480 2068
1481MODULE = CFClient PACKAGE = CFClient::MixChunk 2069MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482 2070
1483CFClient::MixChunk 2071CFPlus::MixChunk
1484new_from_file (SV *class, char *path) 2072new_from_file (SV *class, char *path)
1485 CODE: 2073 CODE:
1486 RETVAL = Mix_LoadWAV (path); 2074 RETVAL = Mix_LoadWAV (path);
1487 OUTPUT: 2075 OUTPUT:
1488 RETVAL 2076 RETVAL
1489 2077
1490void 2078void
1491DESTROY (CFClient::MixChunk self) 2079DESTROY (CFPlus::MixChunk self)
1492 CODE: 2080 CODE:
1493 Mix_FreeChunk (self); 2081 Mix_FreeChunk (self);
1494 2082
1495int 2083int
1496volume (CFClient::MixChunk self, int volume = -1) 2084volume (CFPlus::MixChunk self, int volume = -1)
1497 CODE: 2085 CODE:
1498 RETVAL = Mix_VolumeChunk (self, volume); 2086 RETVAL = Mix_VolumeChunk (self, volume);
1499 OUTPUT: 2087 OUTPUT:
1500 RETVAL 2088 RETVAL
1501 2089
1502int 2090int
1503play (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)
1504 CODE: 2092 CODE:
1505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2093 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506 OUTPUT: 2094 OUTPUT:
1507 RETVAL 2095 RETVAL
1508 2096
1509MODULE = CFClient PACKAGE = CFClient::MixMusic 2097MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510 2098
1511int 2099int
1512volume (int volume = -1) 2100volume (int volume = -1)
1513 CODE: 2101 CODE:
1514 RETVAL = Mix_VolumeMusic (volume); 2102 RETVAL = Mix_VolumeMusic (volume);
1515 OUTPUT: 2103 OUTPUT:
1516 RETVAL 2104 RETVAL
1517 2105
1518CFClient::MixMusic 2106CFPlus::MixMusic
1519new_from_file (SV *class, char *path) 2107new_from_file (SV *class, char *path)
1520 CODE: 2108 CODE:
1521 RETVAL = Mix_LoadMUS (path); 2109 RETVAL = Mix_LoadMUS (path);
1522 OUTPUT: 2110 OUTPUT:
1523 RETVAL 2111 RETVAL
1524 2112
1525void 2113void
1526DESTROY (CFClient::MixMusic self) 2114DESTROY (CFPlus::MixMusic self)
1527 CODE: 2115 CODE:
1528 Mix_FreeMusic (self); 2116 Mix_FreeMusic (self);
1529 2117
1530int 2118int
1531play (CFClient::MixMusic self, int loops = -1) 2119play (CFPlus::MixMusic self, int loops = -1)
1532 CODE: 2120 CODE:
1533 RETVAL = Mix_PlayMusic (self, loops); 2121 RETVAL = Mix_PlayMusic (self, loops);
1534 OUTPUT: 2122 OUTPUT:
1535 RETVAL 2123 RETVAL
1536 2124
1537MODULE = CFClient PACKAGE = CFClient::OpenGL 2125MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538 2126
1539BOOT: 2127BOOT:
1540{ 2128{
1541 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2129 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542 static const struct { 2130 static const struct {
1543 const char *name; 2131 const char *name;
1544 IV iv; 2132 IV iv;
1545 } *civ, const_iv[] = { 2133 } *civ, const_iv[] = {
1546# define const_iv(name) { # name, (IV)name } 2134# define const_iv(name) { # name, (IV)name }
1553 const_iv (GL_SCISSOR_TEST), 2141 const_iv (GL_SCISSOR_TEST),
1554 const_iv (GL_DEPTH_TEST), 2142 const_iv (GL_DEPTH_TEST),
1555 const_iv (GL_ALPHA_TEST), 2143 const_iv (GL_ALPHA_TEST),
1556 const_iv (GL_NORMALIZE), 2144 const_iv (GL_NORMALIZE),
1557 const_iv (GL_RESCALE_NORMAL), 2145 const_iv (GL_RESCALE_NORMAL),
2146 const_iv (GL_FRONT),
2147 const_iv (GL_BACK),
1558 const_iv (GL_AND), 2148 const_iv (GL_AND),
1559 const_iv (GL_ONE), 2149 const_iv (GL_ONE),
1560 const_iv (GL_ZERO), 2150 const_iv (GL_ZERO),
1561 const_iv (GL_SRC_ALPHA), 2151 const_iv (GL_SRC_ALPHA),
1562 const_iv (GL_SRC_ALPHA_SATURATE), 2152 const_iv (GL_DST_ALPHA),
1563 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2153 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564 const_iv (GL_ONE_MINUS_DST_ALPHA), 2154 const_iv (GL_ONE_MINUS_DST_ALPHA),
2155 const_iv (GL_SRC_ALPHA_SATURATE),
1565 const_iv (GL_RGB), 2156 const_iv (GL_RGB),
1566 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),
1567 const_iv (GL_UNSIGNED_BYTE), 2161 const_iv (GL_UNSIGNED_BYTE),
1568 const_iv (GL_UNSIGNED_SHORT), 2162 const_iv (GL_UNSIGNED_SHORT),
1569 const_iv (GL_UNSIGNED_INT), 2163 const_iv (GL_UNSIGNED_INT),
1570 const_iv (GL_ALPHA), 2164 const_iv (GL_ALPHA),
1571 const_iv (GL_INTENSITY), 2165 const_iv (GL_INTENSITY),
1603 const_iv (GL_SEPARABLE_2D), 2197 const_iv (GL_SEPARABLE_2D),
1604 const_iv (GL_CONVOLUTION_2D), 2198 const_iv (GL_CONVOLUTION_2D),
1605 const_iv (GL_CONVOLUTION_BORDER_MODE), 2199 const_iv (GL_CONVOLUTION_BORDER_MODE),
1606 const_iv (GL_CONSTANT_BORDER), 2200 const_iv (GL_CONSTANT_BORDER),
1607 const_iv (GL_LINES), 2201 const_iv (GL_LINES),
2202 const_iv (GL_LINE_STRIP),
1608 const_iv (GL_LINE_LOOP), 2203 const_iv (GL_LINE_LOOP),
1609 const_iv (GL_QUADS), 2204 const_iv (GL_QUADS),
1610 const_iv (GL_QUAD_STRIP), 2205 const_iv (GL_QUAD_STRIP),
1611 const_iv (GL_TRIANGLES), 2206 const_iv (GL_TRIANGLES),
1612 const_iv (GL_TRIANGLE_STRIP), 2207 const_iv (GL_TRIANGLE_STRIP),
1620# undef const_iv 2215# undef const_iv
1621 }; 2216 };
1622 2217
1623 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; )
1624 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);
1625} 2223}
1626 2224
1627char * 2225char *
1628gl_vendor () 2226gl_vendor ()
1629 CODE: 2227 CODE:
1645 OUTPUT: 2243 OUTPUT:
1646 RETVAL 2244 RETVAL
1647 2245
1648int glGetError () 2246int glGetError ()
1649 2247
2248void glFinish ()
2249
1650void glClear (int mask) 2250void glClear (int mask)
1651 2251
1652void glClearColor (float r, float g, float b, float a = 1.0) 2252void glClearColor (float r, float g, float b, float a = 1.0)
1653 PROTOTYPE: @ 2253 PROTOTYPE: @
1654 2254
1677void glPushMatrix () 2277void glPushMatrix ()
1678 2278
1679void glPopMatrix () 2279void glPopMatrix ()
1680 2280
1681void glLoadIdentity () 2281void glLoadIdentity ()
2282
2283void glDrawBuffer (int buffer)
2284
2285void glReadBuffer (int buffer)
1682 2286
1683# near_ and far_ are due to microsofts buggy "c" compiler 2287# near_ and far_ are due to microsofts buggy "c" compiler
1684void 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_)
1685 2289
1686# near_ and far_ are due to microsofts buggy "c" compiler 2290# near_ and far_ are due to microsofts buggy "c" compiler
1716 r *= a; 2320 r *= a;
1717 g *= a; 2321 g *= a;
1718 b *= a; 2322 b *= a;
1719 } 2323 }
1720 // microsoft visual "c" rounds instead of truncating... 2324 // microsoft visual "c" rounds instead of truncating...
1721 glColor4ub (MIN ((int)(r * 256.f), 255), 2325 glColor4f (r, g, b, a);
1722 MIN ((int)(g * 256.f), 255),
1723 MIN ((int)(b * 256.f), 255),
1724 MIN ((int)(a * 256.f), 255));
1725 2326
1726void glInterleavedArrays (int format, int stride, char *data) 2327void glInterleavedArrays (int format, int stride, char *data)
1727 2328
1728void glDrawElements (int mode, int count, int type, char *indices) 2329void glDrawElements (int mode, int count, int type, char *indices)
1729 2330
1777 2378
1778int glGenTexture () 2379int glGenTexture ()
1779 CODE: 2380 CODE:
1780{ 2381{
1781 GLuint name; 2382 GLuint name;
2383 if (AvFILL (texture_av) >= 0)
2384 name = (GLuint)(size_t)av_pop (texture_av);
2385 else
1782 glGenTextures (1, &name); 2386 glGenTextures (1, &name);
1783 RETVAL = name; 2387 RETVAL = name;
1784} 2388}
1785 OUTPUT: 2389 OUTPUT:
1786 RETVAL 2390 RETVAL
1787 2391
1788void glDeleteTexture (int name) 2392void glDeleteTexture (int name)
1789 CODE: 2393 CODE:
1790{ 2394{
1791 GLuint name_ = name; 2395 /* make a half-assed attempt at returning the memory used by the texture */
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);
1792 glDeleteTextures (1, &name_); 2400 /*glDeleteTextures (1, &name_);*/
1793} 2401}
1794 2402
1795int glGenList () 2403int glGenList ()
1796 CODE: 2404 CODE:
1797 RETVAL = glGenLists (1); 2405 RETVAL = glGenLists (1);
1806 2414
1807void glEndList () 2415void glEndList ()
1808 2416
1809void glCallList (int list) 2417void glCallList (int list)
1810 2418
1811

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines