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.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.207 by root, Fri Jul 20 18:19:45 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)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22#endif
23
24#include <assert.h>
12#include <math.h> 25#include <math.h>
13#include <string.h> 26#include <string.h>
14#include <stdio.h> 27#include <stdio.h>
28#include <stdlib.h>
15 29
16#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
17#include <SDL_endian.h> 32#include <SDL_endian.h>
18#include <SDL_image.h> 33#include <SDL_image.h>
19#include <SDL_mixer.h> 34#include <SDL_mixer.h>
20#include <SDL_opengl.h> 35#include <SDL_opengl.h>
21 36
37#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS
39
22#include <glib/gmacros.h> 40#include <glib/gmacros.h>
23 41
24#include <pango/pango.h> 42#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 43
29#ifndef _WIN32 44#ifndef _WIN32
30# include <sys/types.h> 45# include <sys/types.h>
31# include <sys/socket.h> 46# include <sys/socket.h>
32# include <netinet/in.h> 47# include <netinet/in.h>
33# include <netinet/tcp.h> 48# include <netinet/tcp.h>
34# include <inttypes.h> 49# 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 50#endif
43 51
44#include "glext.h" 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 53
46#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
47 55
48#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
50 58
51#define MIN_FONT_HEIGHT 10 59#define MIN_FONT_HEIGHT 10
52 60
53#define GL_CALL(type,func,args) \ 61#if 0
54 { \ 62# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 63#else
56 static type fptr_; \ 64# define PARACHUTE 0
57 \ 65#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 66
67static AV *texture_av;
68
69static struct
70{
71#define GL_FUNC(ptr,name) ptr name;
72#include "glfunc.h"
73#undef GL_FUNC
74} gl;
75
76static void
77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
78{
79 if (gl.BlendFuncSeparate)
80 gl.BlendFuncSeparate (sa, da, saa, daa);
81 else if (gl.BlendFuncSeparateEXT)
82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
83 else
84 glBlendFunc (sa, da);
85}
86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
111#include "texcache.c"
112
113#include "pango-font.c"
114#include "pango-fontmap.c"
115#include "pango-render.c"
116
68typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
70 119
71typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
121
122static int
123shape_attr_p (PangoLayoutRun *run)
124{
125 GSList *attrs = run->item->analysis.extra_attrs;
126
127 while (attrs)
128 {
129 PangoAttribute *attr = attrs->data;
130
131 if (attr->klass->type == PANGO_ATTR_SHAPE)
132 return 1;
133
134 attrs = attrs->next;
135 }
136
137 return 0;
138}
72 139
73typedef struct cf_layout { 140typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 141 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
77 int base_height; 143 int base_height;
78 CFClient__Font font; 144 CFPlus__Font font;
79} *CFClient__Layout; 145} *CFPlus__Layout;
80 146
81static CFClient__Font default_font; 147static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 148static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 149static PangoFontMap *opengl_fontmap;
84 150
85static void 151static void
86substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
87{ 153{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 154 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 155#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 157#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 159}
95 160
96static void 161static void
97layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
98{ 163{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 164 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
101 */ 166 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
106 171
107 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
108} 173}
109 174
110static void 175static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
114 182
115 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 185
118 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
119} 187 if (!rect.height) rect.height = 1;
120 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
121typedef uint16_t mapface; 194typedef uint16_t faceid;
122 195
123typedef struct { 196typedef struct {
124 GLint name; 197 int name;
125 int w, h; 198 int w, h;
126 float s, t; 199 float s, t;
127 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
128} maptex; 203} maptex;
129 204
130typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
131 int16_t darkness; 208 uint16_t darkness;
132 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
133} mapcell; 210} mapcell;
134 211
135typedef struct { 212typedef struct {
136 int32_t c0, c1; 213 int32_t c0, c1;
137 mapcell *col; 214 mapcell *col;
138} maprow; 215} maprow;
139 216
140typedef struct map { 217typedef struct map {
141 int x, y, w, h; 218 int x, y, w, h;
142 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
143 int faces; 220 int faces; tileid *face2tile; // [faceid]
144 mapface *face; 221 int texs; maptex *tex; // [tileid]
145
146 int texs;
147 maptex *tex;
148 222
149 int32_t rows; 223 int32_t rows;
150 maprow *row; 224 maprow *row;
151} *CFClient__Map; 225} *CFPlus__Map;
152 226
153static char * 227static char *
154prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
155{ 229{
156 char *p; 230 char *p;
173} 247}
174 248
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
271
178static maprow * 272static maprow *
179map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
180{ 274{
181 if (0 > y) 275 if (0 > y)
182 { 276 {
183 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
222 316
223 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
224} 318}
225 319
226static mapcell * 320static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
228{ 322{
229 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
230} 324}
231 325
232static void 326static void
233map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
234{ 328{
235 int r; 329 int r;
236 330
237 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
246 self->row = 0; 340 self->row = 0;
247 self->rows = 0; 341 self->rows = 0;
248} 342}
249 343
250static void 344static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 346{
253 int x, y; 347 int x, y;
254 maprow *row; 348 maprow *row;
349 mapcell *cell;
255 350
256 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 352 if (y >= 0)
258 { 353 {
259 if (y >= self->rows) 354 if (y >= self->rows)
265 if (x >= row->c0) 360 if (x >= row->c0)
266 { 361 {
267 if (x >= row->c1) 362 if (x >= row->c1)
268 break; 363 break;
269 364
270 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
271 } 371 }
272 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
273} 389}
274 390
275static void 391static void
276music_finished (void) 392music_finished (void)
277{ 393{
296 ev.data2 = 0; 412 ev.data2 = 0;
297 413
298 SDL_PushEvent ((SDL_Event *)&ev); 414 SDL_PushEvent ((SDL_Event *)&ev);
299} 415}
300 416
417static unsigned int
418minpot (unsigned int n)
419{
420 if (!n)
421 return 0;
422
423 --n;
424
425 n |= n >> 1;
426 n |= n >> 2;
427 n |= n >> 4;
428 n |= n >> 8;
429 n |= n >> 16;
430
431 return n + 1;
432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
437
438/******************************************************************************/
439
440static int
441within_widget (SV *widget, NV x, NV y)
442{
443 HV *self;
444 SV **svp;
445 NV wx, ww, wy, wh;
446
447 if (!SvROK (widget))
448 return 0;
449
450 self = (HV *)SvRV (widget);
451
452 if (SvTYPE (self) != SVt_PVHV)
453 return 0;
454
455 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
456 if (y < wy)
457 return 0;
458
459 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
460 if (y >= wy + wh)
461 return 0;
462
463 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
464 if (x < wx)
465 return 0;
466
467 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
468 if (x >= wx + ww)
469 return 0;
470
471 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
472 if (!svp || !SvTRUE (*svp))
473 return 0;
474
475 return 1;
476}
477
301MODULE = CFClient PACKAGE = CFClient 478MODULE = CFPlus PACKAGE = CFPlus
302 479
303PROTOTYPES: ENABLE 480PROTOTYPES: ENABLE
304 481
305BOOT: 482BOOT:
306{ 483{
307 HV *stash = gv_stashpv ("CFClient", 1); 484 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 485 static const struct {
309 const char *name; 486 const char *name;
310 IV iv; 487 IV iv;
311 } *civ, const_iv[] = { 488 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 489# define const_iv(name) { # name, (IV)name }
490 const_iv (SDLK_MODIFIER_MIN),
491 const_iv (SDLK_MODIFIER_MAX),
492
313 const_iv (SDL_ACTIVEEVENT), 493 const_iv (SDL_ACTIVEEVENT),
314 const_iv (SDL_KEYDOWN), 494 const_iv (SDL_KEYDOWN),
315 const_iv (SDL_KEYUP), 495 const_iv (SDL_KEYUP),
316 const_iv (SDL_MOUSEMOTION), 496 const_iv (SDL_MOUSEMOTION),
317 const_iv (SDL_MOUSEBUTTONDOWN), 497 const_iv (SDL_MOUSEBUTTONDOWN),
326 const_iv (SDL_EVENT_RESERVEDA), 506 const_iv (SDL_EVENT_RESERVEDA),
327 const_iv (SDL_EVENT_RESERVEDB), 507 const_iv (SDL_EVENT_RESERVEDB),
328 const_iv (SDL_VIDEORESIZE), 508 const_iv (SDL_VIDEORESIZE),
329 const_iv (SDL_VIDEOEXPOSE), 509 const_iv (SDL_VIDEOEXPOSE),
330 const_iv (SDL_USEREVENT), 510 const_iv (SDL_USEREVENT),
511
512 const_iv (SDL_APPINPUTFOCUS),
513 const_iv (SDL_APPMOUSEFOCUS),
514 const_iv (SDL_APPACTIVE),
515
331 const_iv (SDLK_KP0), 516 const_iv (SDLK_KP0),
332 const_iv (SDLK_KP1), 517 const_iv (SDLK_KP1),
333 const_iv (SDLK_KP2), 518 const_iv (SDLK_KP2),
334 const_iv (SDLK_KP3), 519 const_iv (SDLK_KP3),
335 const_iv (SDLK_KP4), 520 const_iv (SDLK_KP4),
390 const_iv (SDLK_BREAK), 575 const_iv (SDLK_BREAK),
391 const_iv (SDLK_MENU), 576 const_iv (SDLK_MENU),
392 const_iv (SDLK_POWER), 577 const_iv (SDLK_POWER),
393 const_iv (SDLK_EURO), 578 const_iv (SDLK_EURO),
394 const_iv (SDLK_UNDO), 579 const_iv (SDLK_UNDO),
580
395 const_iv (KMOD_NONE), 581 const_iv (KMOD_NONE),
582 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_LSHIFT), 583 const_iv (KMOD_LSHIFT),
397 const_iv (KMOD_RSHIFT), 584 const_iv (KMOD_RSHIFT),
585 const_iv (KMOD_CTRL),
398 const_iv (KMOD_LCTRL), 586 const_iv (KMOD_LCTRL),
399 const_iv (KMOD_RCTRL), 587 const_iv (KMOD_RCTRL),
588 const_iv (KMOD_ALT),
400 const_iv (KMOD_LALT), 589 const_iv (KMOD_LALT),
401 const_iv (KMOD_RALT), 590 const_iv (KMOD_RALT),
591 const_iv (KMOD_META),
402 const_iv (KMOD_LMETA), 592 const_iv (KMOD_LMETA),
403 const_iv (KMOD_RMETA), 593 const_iv (KMOD_RMETA),
404 const_iv (KMOD_NUM), 594 const_iv (KMOD_NUM),
405 const_iv (KMOD_CAPS), 595 const_iv (KMOD_CAPS),
406 const_iv (KMOD_MODE), 596 const_iv (KMOD_MODE),
407 const_iv (KMOD_CTRL),
408 const_iv (KMOD_SHIFT),
409 const_iv (KMOD_ALT),
410 const_iv (KMOD_META)
411# undef const_iv 597# undef const_iv
412 }; 598 };
413 599
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 600 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 601 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
602
603 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
604 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416} 605}
606
607void
608weaken (SV *rv)
609 PROTOTYPE: $
610 CODE:
611 sv_rvweaken (rv);
612
613int
614in_destruct ()
615 CODE:
616 RETVAL = PL_main_cv == Nullcv;
617 OUTPUT:
618 RETVAL
619
620NV floor (NV x)
621
622NV ceil (NV x)
417 623
418void 624void
419pango_init () 625pango_init ()
420 CODE: 626 CODE:
421{ 627{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 628 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 629 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 630 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 631}
632
633char *
634SDL_GetError ()
430 635
431int 636int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 637SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 638
434void 639void
435SDL_Quit () 640SDL_Quit ()
436 641
437void 642void
438SDL_ListModes () 643SDL_ListModes (int rgb, int alpha)
439 PPCODE: 644 PPCODE:
440{ 645{
441 SDL_Rect **m; 646 SDL_Rect **m;
442 647
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 648 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 649 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 650 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 651 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
447 652
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 653 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 654 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
450 655
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 656 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 657 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 658 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 659 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 660
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 661 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
457 662#if SDL_VERSION_ATLEAST(1,2,10)
458 SDL_EnableUNICODE (1); 663 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 664 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
665#endif
460 666
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
462 668
463 if (m && m != (SDL_Rect **)-1) 669 if (m && m != (SDL_Rect **)-1)
464 while (*m) 670 while (*m)
465 { 671 {
672 if ((*m)->w >= 640 && (*m)->h >= 480)
673 {
466 AV *av = newAV (); 674 AV *av = newAV ();
467 av_push (av, newSViv ((*m)->w)); 675 av_push (av, newSViv ((*m)->w));
468 av_push (av, newSViv ((*m)->h)); 676 av_push (av, newSViv ((*m)->h));
677 av_push (av, newSViv (rgb));
678 av_push (av, newSViv (alpha));
469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 679 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
680 }
470 681
471 ++m; 682 ++m;
472 } 683 }
473} 684}
474 685
475char *
476SDL_GetError ()
477
478int 686int
479SDL_SetVideoMode (int w, int h, int fullscreen) 687SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
480 CODE: 688 CODE:
689{
690 SDL_EnableUNICODE (1);
691 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
692
693 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
694 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
695 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
696 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
697
481 RETVAL = !!SDL_SetVideoMode ( 698 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 699 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 700 );
701
702 if (RETVAL)
703 {
704 av_clear (texture_av);
705
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
707#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
708#include "glfunc.h"
709#undef GL_FUNC
710 }
711}
485 OUTPUT: 712 OUTPUT:
486 RETVAL 713 RETVAL
487 714
488void 715void
489SDL_GL_SwapBuffers () 716SDL_GL_SwapBuffers ()
490 717
718char *
719SDL_GetKeyName (int sym)
720
721int
722SDL_GetAppState ()
723
491void 724void
492SDL_PollEvent () 725poll_events ()
493 PPCODE: 726 PPCODE:
494{ 727{
495 SDL_Event ev; 728 SDL_Event ev;
496 int i;
497 static int modifier;
498 static int modkey[] = {
499 SDLK_RSHIFT, KMOD_RSHIFT,
500 SDLK_LSHIFT, KMOD_LSHIFT,
501 SDLK_RCTRL, KMOD_RCTRL,
502 SDLK_LCTRL, KMOD_LCTRL,
503 SDLK_RALT, KMOD_RALT,
504 SDLK_LALT, KMOD_LALT,
505 SDLK_RMETA, KMOD_RMETA,
506 SDLK_LMETA, KMOD_LMETA,
507 };
508 729
509 while (SDL_PollEvent (&ev)) 730 SDL_PumpEvents ();
731 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
510 { 732 {
511 HV *hv = newHV (); 733 HV *hv = newHV ();
512 hv_store (hv, "type", 4, newSViv (ev.type), 0); 734 hv_store (hv, "type", 4, newSViv (ev.type), 0);
513 735
514 switch (ev.type) 736 switch (ev.type)
515 { 737 {
516 case SDL_KEYDOWN: 738 case SDL_KEYDOWN:
517 case SDL_KEYUP: 739 case SDL_KEYUP:
518
519 for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520 if (modkey [i * 2] == ev.key.keysym.sym)
521 {
522 if (ev.type == SDL_KEYDOWN)
523 modifier |= modkey [i * 2 + 1];
524 else
525 modifier &= ~modkey [i * 2 + 1];
526 break;
527 }
528
529 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 740 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 741 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 742 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
743 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
532 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 744 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533 break; 745 break;
534 746
535 case SDL_ACTIVEEVENT: 747 case SDL_ACTIVEEVENT:
536 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 749 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538 break; 750 break;
539 751
540 case SDL_MOUSEMOTION: 752 case SDL_MOUSEMOTION:
753 {
754 int state = ev.motion.state;
755 int x = ev.motion.x;
756 int y = ev.motion.y;
757 int xrel = ev.motion.xrel;
758 int yrel = ev.motion.yrel;
759
760 /* do simplistic event compression */
761 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
762 && state == ev.motion.state)
763 {
764 xrel += ev.motion.xrel;
765 yrel += ev.motion.yrel;
766 x = ev.motion.x;
767 y = ev.motion.y;
768 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
769 }
770
541 hv_store (hv, "mod", 3, newSViv (modifier), 0); 771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542
543 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 772 hv_store (hv, "state", 5, newSViv (state), 0);
544 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 773 hv_store (hv, "x", 1, newSViv (x), 0);
545 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 774 hv_store (hv, "y", 1, newSViv (y), 0);
546 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 775 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
547 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 776 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 }
548 break; 778 break;
549 779
550 case SDL_MOUSEBUTTONDOWN: 780 case SDL_MOUSEBUTTONDOWN:
551 case SDL_MOUSEBUTTONUP: 781 case SDL_MOUSEBUTTONUP:
552 hv_store (hv, "mod", 3, newSViv (modifier), 0); 782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553 783
554 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 784 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 785 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 786 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 787 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
562 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 792 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
563 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 793 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
564 break; 794 break;
565 } 795 }
566 796
567 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 797 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
568 } 798 }
569} 799}
570 800
571int 801int
572Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 802Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
581Mix_AllocateChannels (int numchans = -1) 811Mix_AllocateChannels (int numchans = -1)
582 812
583void 813void
584lowdelay (int fd, int val = 1) 814lowdelay (int fd, int val = 1)
585 CODE: 815 CODE:
816 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
817
818void
819win32_proxy_info ()
820 PPCODE:
821{
586#ifndef _WIN32 822#ifdef _WIN32
587 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 823 char buffer[2048];
824 DWORD buflen;
825
826 EXTEND (SP, 3);
827
828 buflen = sizeof (buffer);
829 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
830 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
831 {
832 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
833
834 buflen = sizeof (buffer);
835 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
836 {
837 PUSHs (newSVpv (buffer, 0));
838
839 buflen = sizeof (buffer);
840 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
841 PUSHs (newSVpv (buffer, 0));
842 }
843 }
588#endif 844#endif
589 845}
590char *
591gl_vendor ()
592 CODE:
593 RETVAL = (char *)glGetString (GL_VENDOR);
594 OUTPUT:
595 RETVAL
596
597char *
598gl_version ()
599 CODE:
600 RETVAL = (char *)glGetString (GL_VERSION);
601 OUTPUT:
602 RETVAL
603
604char *
605gl_extensions ()
606 CODE:
607 RETVAL = (char *)glGetString (GL_EXTENSIONS);
608 OUTPUT:
609 RETVAL
610 846
611void 847void
612add_font (char *file) 848add_font (char *file)
613 CODE: 849 CODE:
614 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 850 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
615#ifdef _WIN32
616 // cairo... sigh... requires win2000
617 AddFontResourceEx (file, FR_PRIVATE, 0);
618#endif
619 851
620void 852void
621load_image_inline (SV *image_) 853load_image_inline (SV *image_)
622 ALIAS: 854 ALIAS:
623 load_image_file = 1 855 load_image_file = 1
665 897
666 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 898 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
667 899
668 assert (surface2->pitch == surface2->w * 4); 900 assert (surface2->pitch == surface2->w * 4);
669 901
902 SDL_LockSurface (surface2);
670 EXTEND (SP, 5); 903 EXTEND (SP, 6);
671 PUSHs (sv_2mortal (newSViv (surface2->w))); 904 PUSHs (sv_2mortal (newSViv (surface2->w)));
672 PUSHs (sv_2mortal (newSViv (surface2->h))); 905 PUSHs (sv_2mortal (newSViv (surface2->h)));
673 SDL_LockSurface (surface2);
674 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 906 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
675 SDL_UnlockSurface (surface2);
676 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 907 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
677 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 908 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
678 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 909 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
910 SDL_UnlockSurface (surface2);
679 911
680 SDL_FreeSurface (surface); 912 SDL_FreeSurface (surface);
681 SDL_FreeSurface (surface2); 913 SDL_FreeSurface (surface2);
682} 914}
683 915
719 CODE: 951 CODE:
720 fprintf (stderr, "FATAL: %s\n", message); 952 fprintf (stderr, "FATAL: %s\n", message);
721#ifdef _WIN32 953#ifdef _WIN32
722 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 954 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
723#endif 955#endif
724 exit (1); 956 _exit (1);
725 957
958void
959_exit (int retval = 0)
960 CODE:
961#ifdef WIN32
962 ExitThread (retval); // unclean, please beam me up
963#else
964 _exit (retval);
965#endif
966
967void
968debug ()
969 CODE:
970{
971#if DEBUG
972 VALGRIND_DO_LEAK_CHECK;
973#endif
974}
975
726MODULE = CFClient PACKAGE = CFClient::Font 976MODULE = CFPlus PACKAGE = CFPlus::Font
727 977
728CFClient::Font 978PROTOTYPES: DISABLE
979
980CFPlus::Font
729new_from_file (SV *class, char *path, int id = 0) 981new_from_file (SV *class, char *path, int id = 0)
730 CODE: 982 CODE:
731{ 983{
732 int count; 984 int count;
733 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 985 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
736} 988}
737 OUTPUT: 989 OUTPUT:
738 RETVAL 990 RETVAL
739 991
740void 992void
741DESTROY (CFClient::Font self) 993DESTROY (CFPlus::Font self)
742 CODE: 994 CODE:
743 pango_font_description_free (self); 995 pango_font_description_free (self);
744 996
745void 997void
746make_default (CFClient::Font self) 998make_default (CFPlus::Font self)
999 PROTOTYPE: $
747 CODE: 1000 CODE:
748 default_font = self; 1001 default_font = self;
749 1002
750MODULE = CFClient PACKAGE = CFClient::Layout 1003MODULE = CFPlus PACKAGE = CFPlus::Layout
751 1004
752CFClient::Layout 1005PROTOTYPES: DISABLE
753new (SV *class, int rgba = 0) 1006
1007void
1008reset_glyph_cache ()
1009 PROTOTYPE:
754 CODE: 1010 CODE:
755#if _WIN32 1011 tc_clear ();
756 rgba = 0;//D 1012
757#endif 1013CFPlus::Layout
1014new (SV *class)
1015 CODE:
758 New (0, RETVAL, 1, struct cf_layout); 1016 New (0, RETVAL, 1, struct cf_layout);
759 1017
760 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 1018 RETVAL->pl = pango_layout_new (opengl_context);
761 RETVAL->rgba = rgba;
762 RETVAL->r = 1.; 1019 RETVAL->r = 1.;
763 RETVAL->g = 1.; 1020 RETVAL->g = 1.;
764 RETVAL->b = 1.; 1021 RETVAL->b = 1.;
765 RETVAL->a = 1.; 1022 RETVAL->a = 1.;
766 RETVAL->base_height = MIN_FONT_HEIGHT; 1023 RETVAL->base_height = MIN_FONT_HEIGHT;
770 layout_update_font (RETVAL); 1027 layout_update_font (RETVAL);
771 OUTPUT: 1028 OUTPUT:
772 RETVAL 1029 RETVAL
773 1030
774void 1031void
775DESTROY (CFClient::Layout self) 1032DESTROY (CFPlus::Layout self)
776 CODE: 1033 CODE:
777 g_object_unref (self->pl); 1034 g_object_unref (self->pl);
778 Safefree (self); 1035 Safefree (self);
779 1036
780int
781is_rgba (CFClient::Layout self)
782 CODE:
783 RETVAL = self->rgba;
784 OUTPUT:
785 RETVAL
786
787void 1037void
788set_text (CFClient::Layout self, SV *text_) 1038set_text (CFPlus::Layout self, SV *text_)
789 CODE: 1039 CODE:
790{ 1040{
791 STRLEN textlen; 1041 STRLEN textlen;
792 char *text = SvPVutf8 (text_, textlen); 1042 char *text = SvPVutf8 (text_, textlen);
793 1043
794 pango_layout_set_text (self->pl, text, textlen); 1044 pango_layout_set_text (self->pl, text, textlen);
795} 1045}
796 1046
797void 1047void
798set_markup (CFClient::Layout self, SV *text_) 1048set_markup (CFPlus::Layout self, SV *text_)
799 CODE: 1049 CODE:
800{ 1050{
801 STRLEN textlen; 1051 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 1052 char *text = SvPVutf8 (text_, textlen);
803 1053
804 pango_layout_set_markup (self->pl, text, textlen); 1054 pango_layout_set_markup (self->pl, text, textlen);
805} 1055}
806 1056
1057void
1058set_shapes (CFPlus::Layout self, ...)
1059 CODE:
1060{
1061 PangoAttrList *attrs = 0;
1062 const char *text = pango_layout_get_text (self->pl);
1063 const char *pos = text;
1064 int arg = 4;
1065
1066 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1067 {
1068 PangoRectangle inkrect, rect;
1069 PangoAttribute *attr;
1070
1071 int x = SvIV (ST (arg - 3));
1072 int y = SvIV (ST (arg - 2));
1073 int w = SvIV (ST (arg - 1));
1074 int h = SvIV (ST (arg ));
1075
1076 inkrect.x = 0;
1077 inkrect.y = 0;
1078 inkrect.width = 0;
1079 inkrect.height = 0;
1080
1081 rect.x = x * PANGO_SCALE;
1082 rect.y = y * PANGO_SCALE;
1083 rect.width = w * PANGO_SCALE;
1084 rect.height = h * PANGO_SCALE;
1085
1086 if (!attrs)
1087 attrs = pango_layout_get_attributes (self->pl);
1088
1089 attr = pango_attr_shape_new (&inkrect, &rect);
1090 attr->start_index = pos - text;
1091 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1092 pango_attr_list_insert (attrs, attr);
1093
1094 arg += 4;
1095 pos += sizeof (OBJ_STR) - 1;
1096 }
1097
1098 if (attrs)
1099 pango_layout_set_attributes (self->pl, attrs);
1100}
1101
1102void
1103get_shapes (CFPlus::Layout self)
1104 PPCODE:
1105{
1106 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1107
1108 do
1109 {
1110 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1111
1112 if (run && shape_attr_p (run))
1113 {
1114 PangoRectangle extents;
1115 pango_layout_iter_get_run_extents (iter, 0, &extents);
1116
1117 EXTEND (SP, 2);
1118 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1119 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1120 }
1121 }
1122 while (pango_layout_iter_next_run (iter));
1123
1124 pango_layout_iter_free (iter);
1125}
1126
1127int
1128has_wrapped (CFPlus::Layout self)
1129 CODE:
1130{
1131 int lines = 1;
1132 const char *text = pango_layout_get_text (self->pl);
1133
1134 while (*text)
1135 lines += *text++ == '\n';
1136
1137 RETVAL = lines < pango_layout_get_line_count (self->pl);
1138}
1139 OUTPUT:
1140 RETVAL
1141
807SV * 1142SV *
808get_text (CFClient::Layout self) 1143get_text (CFPlus::Layout self)
809 CODE: 1144 CODE:
810 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1145 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811 SvUTF8_on (RETVAL); 1146 sv_utf8_decode (RETVAL);
812 OUTPUT: 1147 OUTPUT:
813 RETVAL 1148 RETVAL
814 1149
815void 1150void
816set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1151set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
817 CODE: 1152 CODE:
818 self->r = r; 1153 self->r = r;
819 self->g = g; 1154 self->g = g;
820 self->b = b; 1155 self->b = b;
821 self->a = a; 1156 self->a = a;
822 1157
823void 1158void
824set_font (CFClient::Layout self, CFClient::Font font = 0) 1159set_font (CFPlus::Layout self, CFPlus::Font font = 0)
825 CODE: 1160 CODE:
826 if (self->font != font) 1161 if (self->font != font)
827 { 1162 {
828 self->font = font; 1163 self->font = font;
829 layout_update_font (self); 1164 layout_update_font (self);
830 } 1165 }
831 1166
832void 1167void
833set_height (CFClient::Layout self, int base_height) 1168set_height (CFPlus::Layout self, int base_height)
834 CODE: 1169 CODE:
835 if (self->base_height != base_height) 1170 if (self->base_height != base_height)
836 { 1171 {
837 self->base_height = base_height; 1172 self->base_height = base_height;
838 layout_update_font (self); 1173 layout_update_font (self);
839 } 1174 }
840 1175
841void 1176void
842set_width (CFClient::Layout self, int max_width = -1) 1177set_width (CFPlus::Layout self, int max_width = -1)
843 CODE: 1178 CODE:
844 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1179 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
845 1180
846void 1181void
847set_indent (CFClient::Layout self, int indent) 1182set_indent (CFPlus::Layout self, int indent)
848 CODE: 1183 CODE:
849 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1184 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
850 1185
851void 1186void
852set_spacing (CFClient::Layout self, int spacing) 1187set_spacing (CFPlus::Layout self, int spacing)
853 CODE: 1188 CODE:
854 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1189 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
855 1190
856void 1191void
857set_ellipsise (CFClient::Layout self, int ellipsise) 1192set_ellipsise (CFPlus::Layout self, int ellipsise)
858 CODE: 1193 CODE:
859 pango_layout_set_ellipsize (self->pl, 1194 pango_layout_set_ellipsize (self->pl,
860 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1195 ellipsise == 1 ? PANGO_ELLIPSIZE_START
861 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1196 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
862 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1197 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
863 : PANGO_ELLIPSIZE_NONE 1198 : PANGO_ELLIPSIZE_NONE
864 ); 1199 );
865 1200
866void 1201void
867set_single_paragraph_mode (CFClient::Layout self, int spm) 1202set_single_paragraph_mode (CFPlus::Layout self, int spm)
868 CODE: 1203 CODE:
869 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1204 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
870 1205
871void 1206void
872size (CFClient::Layout self) 1207size (CFPlus::Layout self)
873 PPCODE: 1208 PPCODE:
874{ 1209{
875 int w, h; 1210 int w, h;
876 1211
877 layout_get_pixel_size (self, &w, &h); 1212 layout_get_pixel_size (self, &w, &h);
880 PUSHs (sv_2mortal (newSViv (w))); 1215 PUSHs (sv_2mortal (newSViv (w)));
881 PUSHs (sv_2mortal (newSViv (h))); 1216 PUSHs (sv_2mortal (newSViv (h)));
882} 1217}
883 1218
884int 1219int
1220descent (CFPlus::Layout self)
1221 CODE:
1222{
1223 PangoRectangle rect;
1224 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1225 pango_layout_line_get_pixel_extents (line, 0, &rect);
1226 RETVAL = PANGO_DESCENT (rect);
1227}
1228 OUTPUT:
1229 RETVAL
1230
1231int
885xy_to_index (CFClient::Layout self, int x, int y) 1232xy_to_index (CFPlus::Layout self, int x, int y)
886 CODE: 1233 CODE:
887{ 1234{
888 int index, trailing; 1235 int index, trailing;
889 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1236 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
890 RETVAL = index; 1237 RETVAL = index + trailing;
891} 1238}
892 OUTPUT: 1239 OUTPUT:
893 RETVAL 1240 RETVAL
894 1241
895void 1242void
896cursor_pos (CFClient::Layout self, int index) 1243cursor_pos (CFPlus::Layout self, int index)
897 PPCODE: 1244 PPCODE:
898{ 1245{
899 PangoRectangle strong_pos; 1246 PangoRectangle strong_pos;
900 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1247 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
901 1248
904 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1251 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
905 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1252 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
906} 1253}
907 1254
908void 1255void
909render (CFClient::Layout self) 1256index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
910 PPCODE: 1257 PPCODE:
911{ 1258{
912 SV *retval; 1259 int line, x;
913 int w, h;
914 1260
915 layout_get_pixel_size (self, &w, &h); 1261 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1262 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
916 1263
917 if (self->rgba)
918 {
919 cairo_surface_t *surface;
920 cairo_t *cairo;
921
922 retval = newSV (w * h * 4);
923 SvPOK_only (retval);
924 SvCUR_set (retval, w * h * 4);
925
926 memset (SvPVX (retval), 0, w * h * 4);
927
928 surface = cairo_image_surface_create_for_data (
929 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
930 cairo = cairo_create (surface);
931 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
932
933 pango_cairo_show_layout (cairo, self->pl);
934
935 cairo_destroy (cairo);
936 cairo_surface_destroy (surface);
937
938 // what a mess, and its premultiplied, too :(
939 {
940 uint32_t *p = (uint32_t *)SvPVX (retval);
941 uint32_t *e = p + w * h;
942
943 while (p < e)
944 {
945 uint32_t rgba = *p;
946 rgba = (rgba >> 24) | (rgba << 8);
947#if 0
948#ifdef _WIN32
949 {//D
950 uint8_t r = rgba >> 24;
951 uint8_t g = rgba >> 16;
952 uint8_t b = rgba >> 8;
953 uint8_t a = rgba >> 0;
954
955 rgba = (rgba & 0xffffff00) | a;
956 }
957#endif
958#endif
959 rgba = SDL_SwapBE32 (rgba);
960 *p++ = rgba;
961 }
962 }
963
964 EXTEND (SP, 5); 1264 EXTEND (SP, 2);
965 PUSHs (sv_2mortal (newSViv (w))); 1265 PUSHs (sv_2mortal (newSViv (line - 1)));
1266 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1267}
1268
1269void
1270line_x_to_index (CFPlus::Layout self, int line, int x)
1271 PPCODE:
1272{
1273 PangoLayoutLine *lp;
1274 int index, trailing;
1275
1276 if (line < 0)
1277 XSRETURN_EMPTY;
1278
1279 if (!(lp = pango_layout_get_line (self->pl, line)))
1280 XSRETURN_EMPTY; /* do better */
1281
1282 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1283
1284 EXTEND (SP, 2);
1285 if (GIMME_V == G_SCALAR)
966 PUSHs (sv_2mortal (newSViv (h))); 1286 PUSHs (sv_2mortal (newSViv (index + trailing)));
967 PUSHs (sv_2mortal (retval));
968 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
969 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
970 }
971 else 1287 else
972 { 1288 {
973 FT_Bitmap bitmap;
974
975 retval = newSV (w * h);
976 SvPOK_only (retval);
977 SvCUR_set (retval, w * h);
978
979 bitmap.rows = h;
980 bitmap.width = w;
981 bitmap.pitch = w;
982 bitmap.buffer = (unsigned char*)SvPVX (retval);
983 bitmap.num_grays = 256;
984 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
985
986 memset (bitmap.buffer, 0, w * h);
987
988 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
989
990 EXTEND (SP, 5);
991 PUSHs (sv_2mortal (newSViv (w))); 1289 PUSHs (sv_2mortal (newSViv (index)));
992 PUSHs (sv_2mortal (newSViv (h))); 1290 PUSHs (sv_2mortal (newSViv (trailing)));
993 PUSHs (sv_2mortal (retval));
994 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
995 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
996 } 1291 }
997} 1292}
998 1293
1294void
1295render (CFPlus::Layout self, float x, float y, int flags = 0)
1296 PPCODE:
1297 pango_opengl_render_layout_subpixel (
1298 self->pl,
1299 x * PANGO_SCALE, y * PANGO_SCALE,
1300 self->r, self->g, self->b, self->a,
1301 flags
1302 );
1303
999MODULE = CFClient PACKAGE = CFClient::Texture 1304MODULE = CFPlus PACKAGE = CFPlus::Texture
1000 1305
1306PROTOTYPES: ENABLE
1307
1308int minpot (int n)
1309
1001void 1310void
1311pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE:
1313{
1314 if ((nw != ow || nh != oh) && SvOK (data_))
1315 {
1316 STRLEN datalen;
1317 char *data = SvPVbyte (data_, datalen);
1318 int bpp = datalen / (ow * oh);
1319 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1320
1321 SvPOK_only (result_);
1322 SvCUR_set (result_, nw * nh * bpp);
1323
1324 memset (SvPVX (result_), 0, nw * nh * bpp);
1325 while (oh--)
1326 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1327
1328 sv_setsv (data_, result_);
1329 }
1330}
1331
1332void
1002draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1333draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1003 PROTOTYPE: $$$;$$ 1334 PROTOTYPE: $$$;$$
1004 ALIAS: 1335 ALIAS:
1005 draw_quad_alpha = 1 1336 draw_quad_alpha = 1
1006 draw_quad_alpha_premultiplied = 2 1337 draw_quad_alpha_premultiplied = 2
1007 CODE: 1338 CODE:
1008{ 1339{
1009 HV *hv = (HV *)SvRV (self); 1340 HV *hv = (HV *)SvRV (self);
1010 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1341 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1342 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1343 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014 1344
1015 if (items < 5) 1345 if (items < 5)
1016 { 1346 {
1017 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1347 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1348 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019 } 1349 }
1020 1350
1021 if (ix) 1351 if (ix)
1022 { 1352 {
1023 glEnable (GL_BLEND); 1353 glEnable (GL_BLEND);
1354
1355 if (ix == 2)
1024 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1356 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1357 else
1358 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1359 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1360
1025 glEnable (GL_ALPHA_TEST); 1361 glEnable (GL_ALPHA_TEST);
1026 glAlphaFunc (GL_GREATER, 0.01f); 1362 glAlphaFunc (GL_GREATER, 0.01f);
1027 } 1363 }
1028 1364
1029 glBindTexture (GL_TEXTURE_2D, name); 1365 glBindTexture (GL_TEXTURE_2D, name);
1030
1031 if (wrap_mode)
1032 {
1033 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035 }
1036 1366
1037 glBegin (GL_QUADS); 1367 glBegin (GL_QUADS);
1038 glTexCoord2f (0, 0); glVertex2f (x , y ); 1368 glTexCoord2f (0, 0); glVertex2f (x , y );
1039 glTexCoord2f (0, t); glVertex2f (x , y + h); 1369 glTexCoord2f (0, t); glVertex2f (x , y + h);
1040 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1370 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1046 glDisable (GL_ALPHA_TEST); 1376 glDisable (GL_ALPHA_TEST);
1047 glDisable (GL_BLEND); 1377 glDisable (GL_BLEND);
1048 } 1378 }
1049} 1379}
1050 1380
1381IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1382 CODE:
1383{
1384 GLint width;
1385 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1386 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1387 RETVAL = width > 0;
1388}
1389 OUTPUT:
1390 RETVAL
1391
1051MODULE = CFClient PACKAGE = CFClient::Map 1392MODULE = CFPlus PACKAGE = CFPlus::Map
1052 1393
1053CFClient::Map 1394PROTOTYPES: DISABLE
1054new (SV *class, int map_width, int map_height) 1395
1396CFPlus::Map
1397new (SV *class)
1055 CODE: 1398 CODE:
1056 New (0, RETVAL, 1, struct map); 1399 New (0, RETVAL, 1, struct map);
1057 RETVAL->x = 0; 1400 RETVAL->x = 0;
1058 RETVAL->y = 0; 1401 RETVAL->y = 0;
1059 RETVAL->w = map_width; 1402 RETVAL->w = 0;
1060 RETVAL->h = map_height; 1403 RETVAL->h = 0;
1061 RETVAL->ox = 0; 1404 RETVAL->ox = 0;
1062 RETVAL->oy = 0; 1405 RETVAL->oy = 0;
1063 RETVAL->faces = 8192; 1406 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1064 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1407 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1065 RETVAL->texs = 8192;
1066 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1067 RETVAL->rows = 0; 1408 RETVAL->rows = 0;
1068 RETVAL->row = 0; 1409 RETVAL->row = 0;
1069 OUTPUT: 1410 OUTPUT:
1070 RETVAL 1411 RETVAL
1071 1412
1072void 1413void
1073DESTROY (CFClient::Map self) 1414DESTROY (CFPlus::Map self)
1074 CODE: 1415 CODE:
1075{ 1416{
1076 map_clear (self); 1417 map_clear (self);
1077 Safefree (self->face); 1418 Safefree (self->face2tile);
1419 Safefree (self->tex);
1078 Safefree (self); 1420 Safefree (self);
1079} 1421}
1080 1422
1081void 1423void
1424resize (CFPlus::Map self, int map_width, int map_height)
1425 CODE:
1426 self->w = map_width;
1427 self->h = map_height;
1428
1429void
1082clear (CFClient::Map self) 1430clear (CFPlus::Map self)
1083 CODE: 1431 CODE:
1084 map_clear (self); 1432 map_clear (self);
1085 1433
1086void 1434void
1087set_face (CFClient::Map self, int face, int texid) 1435set_tileid (CFPlus::Map self, int face, int tile)
1088 CODE: 1436 CODE:
1089{ 1437{
1090 while (self->faces <= face) 1438 need_facenum (self, face); self->face2tile [face] = tile;
1091 { 1439 need_texid (self, tile);
1092 Append (mapface, self->face, self->faces, self->faces);
1093 self->faces *= 2;
1094 }
1095
1096 self->face [face] = texid;
1097} 1440}
1098 1441
1099void 1442void
1443set_smooth (CFPlus::Map self, int face, int smooth, int level)
1444 CODE:
1445{
1446 tileid texid;
1447 maptex *tex;
1448
1449 if (face < 0 || face >= self->faces)
1450 return;
1451
1452 if (smooth < 0 || smooth >= self->faces)
1453 return;
1454
1455 texid = self->face2tile [face];
1456
1457 if (!texid)
1458 return;
1459
1460 tex = self->tex + texid;
1461 tex->smoothtile = self->face2tile [smooth];
1462 tex->smoothlevel = level;
1463}
1464
1465void
1100set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1466set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1101 CODE: 1467 CODE:
1102{ 1468{
1103 while (self->texs <= texid) 1469 need_texid (self, texid);
1104 {
1105 Append (maptex, self->tex, self->texs, self->texs);
1106 self->texs *= 2;
1107 }
1108 1470
1109 { 1471 {
1110 maptex *tex = self->tex + texid; 1472 maptex *tex = self->tex + texid;
1111 1473
1112 tex->name = name; 1474 tex->name = name;
1117 tex->r = r; 1479 tex->r = r;
1118 tex->g = g; 1480 tex->g = g;
1119 tex->b = b; 1481 tex->b = b;
1120 tex->a = a; 1482 tex->a = a;
1121 } 1483 }
1484
1485 // somewhat hackish, but for textures that require it, it really
1486 // improves the look, and most others don't suffer.
1487 glBindTexture (GL_TEXTURE_2D, name);
1488 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1489 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1490 // use uglier nearest interpolation because linear suffers
1491 // from transparent color bleeding and ugly wrapping effects.
1492 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1122} 1493}
1123 1494
1124int 1495int
1125ox (CFClient::Map self) 1496ox (CFPlus::Map self)
1126 ALIAS: 1497 ALIAS:
1127 oy = 1 1498 oy = 1
1499 x = 2
1500 y = 3
1501 w = 4
1502 h = 5
1128 CODE: 1503 CODE:
1129 switch (ix) 1504 switch (ix)
1130 { 1505 {
1131 case 0: RETVAL = self->ox; break; 1506 case 0: RETVAL = self->ox; break;
1132 case 1: RETVAL = self->oy; break; 1507 case 1: RETVAL = self->oy; break;
1508 case 2: RETVAL = self->x; break;
1509 case 3: RETVAL = self->y; break;
1510 case 4: RETVAL = self->w; break;
1511 case 5: RETVAL = self->h; break;
1133 } 1512 }
1134 OUTPUT: 1513 OUTPUT:
1135 RETVAL 1514 RETVAL
1136 1515
1137void 1516void
1138scroll (CFClient::Map self, int dx, int dy) 1517scroll (CFPlus::Map self, int dx, int dy)
1139 CODE: 1518 CODE:
1140{ 1519{
1141 if (dx > 0) 1520 if (dx > 0)
1142 map_blank (self, self->x, self->y, dx - 1, self->h); 1521 map_blank (self, self->x, self->y, dx, self->h);
1143 else if (dx < 0) 1522 else if (dx < 0)
1144 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1523 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1145 1524
1146 if (dy > 0) 1525 if (dy > 0)
1147 map_blank (self, self->x, self->y, self->w, dy - 1); 1526 map_blank (self, self->x, self->y, self->w, dy);
1148 else if (dy < 0) 1527 else if (dy < 0)
1149 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1528 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1150 1529
1151 self->ox += dx; self->x += dx; 1530 self->ox += dx; self->x += dx;
1152 self->oy += dy; self->y += dy; 1531 self->oy += dy; self->y += dy;
1153 1532
1154 while (self->y < 0) 1533 while (self->y < 0)
1159 self->y += MAP_EXTEND_Y; 1538 self->y += MAP_EXTEND_Y;
1160 } 1539 }
1161} 1540}
1162 1541
1163void 1542void
1164map1a_update (CFClient::Map self, SV *data_) 1543map1a_update (CFPlus::Map self, SV *data_, int extmap)
1165 CODE: 1544 CODE:
1166{ 1545{
1167 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1546 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1168 uint8_t *data_end = (uint8_t *)SvEND (data_); 1547 uint8_t *data_end = (uint8_t *)SvEND (data_);
1169 mapcell *cell; 1548 mapcell *cell;
1170 int x, y, flags; 1549 int x, y, flags;
1171 1550
1172 while (data < data_end) 1551 while (data < data_end - 1)
1173 { 1552 {
1174 flags = (data [0] << 8) + data [1]; data += 2; 1553 flags = (data [0] << 8) + data [1]; data += 2;
1175 1554
1176 x = ((flags >> 10) & 63) + self->x; 1555 x = self->x + ((flags >> 10) & 63);
1177 y = ((flags >> 4) & 63) + self->y; 1556 y = self->y + ((flags >> 4) & 63);
1178 1557
1179 cell = map_get_cell (self, x, y); 1558 cell = map_get_cell (self, x, y);
1180 1559
1181 if (flags & 15) 1560 if (flags & 15)
1182 { 1561 {
1183 if (cell->darkness < 0) 1562 if (!cell->darkness)
1184 { 1563 {
1564 memset (cell, 0, sizeof (*cell));
1185 cell->darkness = 0; 1565 cell->darkness = 256;
1186 cell->face [0] = 0;
1187 cell->face [1] = 0;
1188 cell->face [2] = 0;
1189 } 1566 }
1190 1567
1191 cell->darkness = flags & 8 ? *data++ : 255;
1192
1193 //TODO: don't trust server data to be in-range(!) 1568 //TODO: don't trust server data to be in-range(!)
1569
1570 if (flags & 8)
1571 {
1572 if (extmap)
1573 {
1574 uint8_t ext, cmd;
1575
1576 do
1577 {
1578 ext = *data++;
1579 cmd = ext & 0x3f;
1580
1581 if (cmd < 4)
1582 cell->darkness = 255 - ext * 64 + 1;
1583 else if (cmd == 5) // health
1584 {
1585 cell->stat_width = 1;
1586 cell->stat_hp = *data++;
1587 }
1588 else if (cmd == 6) // monster width
1589 cell->stat_width = *data++ + 1;
1590 else if (cmd == 0x47)
1591 {
1592 if (*data == 4)
1593 ; // decode player count
1594
1595 data += *data + 1;
1596 }
1597 else if (cmd == 8) // cell flags
1598 cell->flags = *data++;
1599 else if (ext & 0x40) // unknown, multibyte => skip
1600 data += *data + 1;
1601 else
1602 data++;
1603 }
1604 while (ext & 0x80);
1605 }
1606 else
1607 cell->darkness = *data++ + 1;
1608 }
1194 1609
1195 if (flags & 4) 1610 if (flags & 4)
1196 { 1611 {
1197 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1612 faceid face = (data [0] << 8) + data [1]; data += 2;
1613 need_facenum (self, face);
1614 cell->tile [0] = self->face2tile [face];
1198 } 1615 }
1199 1616
1200 if (flags & 2) 1617 if (flags & 2)
1201 { 1618 {
1202 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1619 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face);
1621 cell->tile [1] = self->face2tile [face];
1203 } 1622 }
1204 1623
1205 if (flags & 1) 1624 if (flags & 1)
1206 { 1625 {
1207 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [2] = self->face2tile [face];
1208 } 1629 }
1209 } 1630 }
1210 else 1631 else
1211 cell->darkness = -1; 1632 cell->darkness = 0;
1212 } 1633 }
1213} 1634}
1214 1635
1215SV * 1636SV *
1216mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1637mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1217 CODE: 1638 CODE:
1218{ 1639{
1219 int x1, x; 1640 int x1, x;
1220 int y1, y; 1641 int y1, y;
1221 int z; 1642 int z;
1242 { 1663 {
1243 mapcell *cell = row->col + (x - row->c0); 1664 mapcell *cell = row->col + (x - row->c0);
1244 1665
1245 for (z = 0; z <= 0; z++) 1666 for (z = 0; z <= 0; z++)
1246 { 1667 {
1247 mapface face = cell->face [z];
1248
1249 if (face)
1250 {
1251 maptex tex = self->tex [face]; 1668 maptex tex = self->tex [cell->tile [z]];
1252 int a0 = 255 - tex.a; 1669 int a0 = 255 - tex.a;
1253 int a1 = tex.a; 1670 int a1 = tex.a;
1254 1671
1255 r = (r * a0 + tex.r * a1) / 255; 1672 r = (r * a0 + tex.r * a1) / 255;
1256 g = (g * a0 + tex.g * a1) / 255; 1673 g = (g * a0 + tex.g * a1) / 255;
1257 b = (b * a0 + tex.b * a1) / 255; 1674 b = (b * a0 + tex.b * a1) / 255;
1258 a = (a * a0 + tex.a * a1) / 255; 1675 a = (a * a0 + tex.a * a1) / 255;
1259 }
1260 } 1676 }
1261 } 1677 }
1262 1678
1263 *map++ = (r ) 1679 *map++ = (r )
1264 | (g << 8) 1680 | (g << 8)
1271} 1687}
1272 OUTPUT: 1688 OUTPUT:
1273 RETVAL 1689 RETVAL
1274 1690
1275void 1691void
1276draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1692draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1277 PPCODE: 1693 CODE:
1278{ 1694{
1279 int vx, vy; 1695 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1696 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1697 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1698 smooth_key skey;
1280 int x, y, z; 1699 int x, y, z;
1281 int last_name; 1700 int last_name;
1282 mapface face;
1283 int sw4 = (sw + 3) & ~3;
1284 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1285 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1286 1701
1287 memset (darkness, 255, sw4 * sh); 1702 // thats current max. sorry.
1288 SvPOK_only (darkness_sv); 1703 if (sw > 255) sw = 255;
1289 SvCUR_set (darkness_sv, sw4 * sh); 1704 if (sh > 255) sh = 255;
1290 1705
1291 vx = self->x + (self->w - sw) / 2 - shift_x; 1706 // clear key, in case of extra padding
1292 vy = self->y + (self->h - sh) / 2 - shift_y; 1707 memset (&skey, 0, sizeof (skey));
1293
1294 /*
1295 int vx = self->vx = self->w >= sw
1296 ? self->x + (self->w - sw) / 2
1297 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1298
1299 int vy = self->vy = self->h >= sh
1300 ? self->y + (self->h - sh) / 2
1301 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1302 */
1303 1708
1304 glColor4ub (255, 255, 255, 255); 1709 glColor4ub (255, 255, 255, 255);
1305 1710
1711 glEnable (GL_BLEND);
1306 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1712 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1307 glEnable (GL_BLEND);
1308 glEnable (GL_TEXTURE_2D); 1713 glEnable (GL_TEXTURE_2D);
1309 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1714 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1310 1715
1311 glBegin (GL_QUADS); 1716 glBegin (GL_QUADS);
1312 1717
1313 last_name = 0; 1718 last_name = 0;
1314 1719
1720 mx += self->x;
1721 my += self->y;
1722
1723 // first pass: determine smooth_max
1724 // rather ugly, if you ask me
1725 // could also be stored inside mapcell and updated on change
1726 memset (smooth_max, 0, sizeof (smooth_max));
1727
1728 for (y = 0; y < sh; y++)
1729 if (0 <= y + my && y + my < self->rows)
1730 {
1731 maprow *row = self->row + (y + my);
1732
1733 for (x = 0; x < sw; x++)
1734 if (row->c0 <= x + mx && x + mx < row->c1)
1735 {
1736 mapcell *cell = row->col + (x + mx - row->c0);
1737
1738 smooth_max[x + 1][y + 1] =
1739 MAX (self->tex [cell->tile [0]].smoothlevel,
1740 MAX (self->tex [cell->tile [1]].smoothlevel,
1741 self->tex [cell->tile [2]].smoothlevel));
1742 }
1743 }
1744
1315 for (z = 0; z < 3; z++) 1745 for (z = 0; z <= 2; z++)
1746 {
1747 memset (smooth_level, 0, sizeof (smooth_level));
1748
1316 for (y = 0; y < sh; y++) 1749 for (y = 0; y < sh; y++)
1317 if (0 <= y + vy && y + vy < self->rows) 1750 if (0 <= y + my && y + my < self->rows)
1318 { 1751 {
1319 maprow *row = self->row + (y + vy); 1752 maprow *row = self->row + (y + my);
1320 1753
1321 for (x = 0; x < sw; x++) 1754 for (x = 0; x < sw; x++)
1322 if (row->c0 <= x + vx && x + vx < row->c1) 1755 if (row->c0 <= x + mx && x + mx < row->c1)
1323 { 1756 {
1324 mapcell *cell = row->col + (x + vx - row->c0); 1757 mapcell *cell = row->col + (x + mx - row->c0);
1325
1326 darkness[y * sw4 + x] = cell->darkness < 0
1327 ? 255 - FOW_DARKNESS
1328 : 255 - cell->darkness;
1329
1330 face = cell->face [z]; 1758 tileid tile = cell->tile [z];
1331 1759
1332 if (face) 1760 if (tile)
1761 {
1762 maptex tex = self->tex [tile];
1763 int px = (x + 1) * T - tex.w;
1764 int py = (y + 1) * T - tex.h;
1765
1766 // suppressing texture state switches here
1767 // is only moderately effective, but worth the extra effort
1768 if (last_name != tex.name)
1769 {
1770 if (!tex.name)
1771 tex = self->tex [2]; /* missing, replace by noface */
1772
1773 glEnd ();
1774 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1775 glBegin (GL_QUADS);
1776 }
1777
1778 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1779 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1780 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1781 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1782
1783 if (cell->flags && z == 2)
1784 {
1785 if (cell->flags & 1)
1786 {
1787 maptex tex = self->tex [1];
1788 int px = x * T + T * 2 / 32;
1789 int py = y * T - T * 6 / 32;
1790
1791 glEnd ();
1792 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1793 glBegin (GL_QUADS);
1794
1795 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1796 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1797 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1798 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1799 }
1800 }
1801
1802 // update smooth hash
1803 if (tex.smoothtile)
1804 {
1805 skey.tile = tex.smoothtile;
1806 skey.level = tex.smoothlevel;
1807
1808 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1809
1810 // add bits to current tile and all neighbours. skey.x|y is
1811 // shifted +1|+1 so we always stay positive.
1812
1813 // bits is ___n cccc CCCC bbbb
1814 // n do not draw borders&corners
1815 // c draw these corners, but...
1816 // C ... not these
1817 // b draw these borders
1818
1819 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1820 // ┃· ·· ·┃ ━━
1821
1822 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1823 // ·· ·· ·┏ ┓·
1824
1825 // full tile
1826 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1827
1828 // borders
1829 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1830 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1831 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1832 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1833
1834 // corners
1835 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1836 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1837 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1838 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1839 }
1840 }
1841 }
1842 }
1843
1844 // go through all smoothlevels, lowest to highest, then draw.
1845 // this is basically counting sort
1846 {
1847 int w, b;
1848
1849 for (w = 0; w < 256 / 32; ++w)
1850 {
1851 uint32_t smask = smooth_level [w];
1852 if (smask)
1853 for (b = 0; b < 32; ++b)
1854 if (smask & (((uint32_t)1) << b))
1333 { 1855 {
1334 maptex tex = self->tex [face]; 1856 int level = (w << 5) | b;
1857 HE *he;
1335 1858
1336 int px = (x + 1) * 32 - tex.w; 1859 hv_iterinit (smooth);
1337 int py = (y + 1) * 32 - tex.h; 1860 while ((he = hv_iternext (smooth)))
1338
1339 if (last_name != tex.name)
1340 { 1861 {
1862 smooth_key *skey = (smooth_key *)HeKEY (he);
1863 IV bits = SvIVX (HeVAL (he));
1864
1865 if (!(bits & 0x1000)
1866 && skey->level == level
1867 && level > smooth_max [skey->x][skey->y])
1868 {
1869 maptex tex = self->tex [skey->tile];
1870 int px = (((int)skey->x) - 1) * T;
1871 int py = (((int)skey->y) - 1) * T;
1872 int border = bits & 15;
1873 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1874 float dx = tex.s * .0625f; // 16 images/row
1875 float dy = tex.t * .5f ; // 2 images/column
1876
1877 // this time naively avoiding texture state changes
1878 // save gobs of state changes.
1879 if (last_name != tex.name)
1880 {
1881 if (!tex.name)
1882 continue; // smoothing not yet available
1883
1341 glEnd (); 1884 glEnd ();
1342 last_name = tex.name;
1343 glBindTexture (GL_TEXTURE_2D, last_name); 1885 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1344 glBegin (GL_QUADS); 1886 glBegin (GL_QUADS);
1887 }
1888
1889 if (border)
1890 {
1891 float ox = border * dx;
1892
1893 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1894 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1895 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1896 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1897 }
1898
1899 if (corner)
1900 {
1901 float ox = corner * dx;
1902
1903 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1904 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1905 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1906 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1907 }
1908 }
1345 } 1909 }
1346
1347 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1348 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1349 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1350 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1351 } 1910 }
1352 }
1353 } 1911 }
1912 }
1913
1914 hv_clear (smooth);
1915 }
1354 1916
1355 glEnd (); 1917 glEnd ();
1356 1918
1357 glDisable (GL_TEXTURE_2D); 1919 glDisable (GL_TEXTURE_2D);
1358 glDisable (GL_BLEND); 1920 glDisable (GL_BLEND);
1359 1921
1922 // top layer: overlays such as the health bar
1923 for (y = 0; y < sh; y++)
1924 if (0 <= y + my && y + my < self->rows)
1925 {
1926 maprow *row = self->row + (y + my);
1927
1928 for (x = 0; x < sw; x++)
1929 if (row->c0 <= x + mx && x + mx < row->c1)
1930 {
1931 mapcell *cell = row->col + (x + mx - row->c0);
1932
1933 int px = x * T;
1934 int py = y * T;
1935
1936 if (cell->stat_hp)
1937 {
1938 int width = cell->stat_width * T;
1939 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1940
1941 glColor3ub (0, 0, 0);
1942 glRectf (px + 1, py - thick - 2,
1943 px + width - 1, py);
1944
1945 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1946 glRectf (px + 2,
1947 py - thick - 1,
1948 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1949 }
1950 }
1951 }
1952}
1953
1954void
1955draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1956 CODE:
1957{
1958 static float color[16][3] = {
1959 { 0.00F, 0.00F, 0.00F },
1960 { 1.00F, 1.00F, 1.00F },
1961 { 0.00F, 0.00F, 0.55F },
1962 { 1.00F, 0.00F, 0.00F },
1963
1964 { 1.00F, 0.54F, 0.00F },
1965 { 0.11F, 0.56F, 1.00F },
1966 { 0.93F, 0.46F, 0.00F },
1967 { 0.18F, 0.54F, 0.34F },
1968
1969 { 0.56F, 0.73F, 0.56F },
1970 { 0.80F, 0.80F, 0.80F },
1971 { 0.55F, 0.41F, 0.13F },
1972 { 0.99F, 0.77F, 0.26F },
1973
1974 { 0.74F, 0.65F, 0.41F },
1975
1976 { 0.00F, 1.00F, 1.00F },
1977 { 1.00F, 0.00F, 1.00F },
1978 { 1.00F, 1.00F, 0.00F },
1979 };
1980
1981 int x, y;
1982
1983 glEnable (GL_TEXTURE_2D);
1984 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1985 glEnable (GL_BLEND);
1986 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1987 glBegin (GL_QUADS);
1988
1989 for (y = 0; y < h; y++)
1990 for (x = 0; x < w; x++)
1991 {
1992 unsigned char m = data [x + y * w];
1993
1994 if (m)
1995 {
1996 float *c = color [m & 15];
1997
1998 float tx1 = m & 0x40 ? 0.5 : 0.;
1999 float tx2 = tx1 + 0.5;
2000
2001 glColor4f (c[0], c[1], c[2], 0.75);
2002 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2003 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2004 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2005 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2006 }
2007 }
2008
2009 glEnd ();
2010 glDisable (GL_BLEND);
2011 glDisable (GL_TEXTURE_2D);
2012}
2013
2014void
2015fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
2016 PPCODE:
2017{
2018 int x, y;
2019 int sw1 = sw + 2;
2020 int sh1 = sh + 2;
2021 int sh3 = sh * 3;
2022 int sw34 = (sw * 3 + 3) & ~3;
2023 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2024 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
2025 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2026
2027 SvPOK_only (darkness3_sv);
2028 SvCUR_set (darkness3_sv, sw34 * sh3);
2029
2030 mx += self->x - 1;
2031 my += self->y - 1;
2032
2033 memset (darkness1, 255, sw1 * sh1);
2034
2035 for (y = 0; y < sh1; y++)
2036 if (0 <= y + my && y + my < self->rows)
2037 {
2038 maprow *row = self->row + (y + my);
2039
2040 for (x = 0; x < sw1; x++)
2041 if (row->c0 <= x + mx && x + mx < row->c1)
2042 {
2043 mapcell *cell = row->col + (x + mx - row->c0);
2044
2045 darkness1 [y * sw1 + x] = cell->darkness
2046 ? 255 - (cell->darkness - 1)
2047 : 255 - FOW_DARKNESS;
2048 }
2049 }
2050
2051 for (y = 0; y < sh; ++y)
2052 for (x = 0; x < sw; ++x)
2053 {
2054 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2055 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2056 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2057 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2058 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2059 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2060 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2061 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2062 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2063
2064 uint8_t r11 = (d11 + d21 + d12) / 3;
2065 uint8_t r21 = d21;
2066 uint8_t r31 = (d21 + d31 + d32) / 3;
2067
2068 uint8_t r12 = d12;
2069 uint8_t r22 = d22;
2070 uint8_t r32 = d32;
2071
2072 uint8_t r13 = (d13 + d23 + d12) / 3;
2073 uint8_t r23 = d23;
2074 uint8_t r33 = (d23 + d33 + d32) / 3;
2075
2076 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2077 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2078 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2079 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2080 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2081 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2082 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2083 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2084 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2085 }
2086
2087 free (darkness1);
2088
1360 EXTEND (SP, 3); 2089 EXTEND (SP, 3);
1361 PUSHs (sv_2mortal (newSViv (sw4))); 2090 PUSHs (sv_2mortal (newSViv (sw34)));
1362 PUSHs (sv_2mortal (newSViv (sh))); 2091 PUSHs (sv_2mortal (newSViv (sh3)));
1363 PUSHs (darkness_sv); 2092 PUSHs (darkness3_sv);
1364} 2093}
1365 2094
1366SV * 2095SV *
1367get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2096get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1368 CODE: 2097 CODE:
1369{ 2098{
1370 int x, y, x1, y1; 2099 int x, y, x1, y1;
1371 SV *data_sv = newSV (w * h * 7 + 5); 2100 SV *data_sv = newSV (w * h * 7 + 5);
1372 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2101 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1397 if (row && row->c0 <= x && x < row->c1) 2126 if (row && row->c0 <= x && x < row->c1)
1398 { 2127 {
1399 mapcell *cell = row->col + (x - row->c0); 2128 mapcell *cell = row->col + (x - row->c0);
1400 uint8_t flags = 0; 2129 uint8_t flags = 0;
1401 2130
1402 if (cell->face [0]) flags |= 1; 2131 if (cell->tile [0]) flags |= 1;
1403 if (cell->face [1]) flags |= 2; 2132 if (cell->tile [1]) flags |= 2;
1404 if (cell->face [2]) flags |= 4; 2133 if (cell->tile [2]) flags |= 4;
1405 2134
1406 *data++ = flags; 2135 *data++ = flags;
1407 2136
1408 if (flags & 1) 2137 if (flags & 1)
1409 { 2138 {
2139 tileid tile = cell->tile [0];
1410 *data++ = cell->face [0] >> 8; 2140 *data++ = tile >> 8;
1411 *data++ = cell->face [0]; 2141 *data++ = tile;
1412 } 2142 }
1413 2143
1414 if (flags & 2) 2144 if (flags & 2)
1415 { 2145 {
2146 tileid tile = cell->tile [1];
1416 *data++ = cell->face [1] >> 8; 2147 *data++ = tile >> 8;
1417 *data++ = cell->face [1]; 2148 *data++ = tile;
1418 } 2149 }
1419 2150
1420 if (flags & 4) 2151 if (flags & 4)
1421 { 2152 {
2153 tileid tile = cell->tile [2];
1422 *data++ = cell->face [2] >> 8; 2154 *data++ = tile >> 8;
1423 *data++ = cell->face [2]; 2155 *data++ = tile;
1424 } 2156 }
1425 } 2157 }
1426 else 2158 else
1427 *data++ = 0; 2159 *data++ = 0;
1428 } 2160 }
1434} 2166}
1435 OUTPUT: 2167 OUTPUT:
1436 RETVAL 2168 RETVAL
1437 2169
1438void 2170void
1439set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2171set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1440 PPCODE: 2172 PPCODE:
1441{ 2173{
1442 int x, y, z; 2174 int x, y, z;
1443 int w, h; 2175 int w, h;
1444 int x1, y1; 2176 int x1, y1;
1468 { 2200 {
1469 uint8_t flags = *data++; 2201 uint8_t flags = *data++;
1470 2202
1471 if (flags) 2203 if (flags)
1472 { 2204 {
1473 mapface face[3] = { 0, 0, 0 };
1474
1475 mapcell *cell = row_get_cell (row, x); 2205 mapcell *cell = row_get_cell (row, x);
2206 tileid tile[3] = { 0, 0, 0 };
1476 2207
1477 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2208 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1478 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2209 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1479 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2210 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1480 2211
1481 if (cell->darkness <= 0) 2212 if (cell->darkness == 0)
1482 { 2213 {
1483 cell->darkness = -1; 2214 cell->darkness = 0;
1484 2215
1485 for (z = 0; z <= 2; z++) 2216 for (z = 0; z <= 2; z++)
1486 { 2217 {
1487 cell->face[z] = face[z]; 2218 tileid t = tile [z];
1488 2219
1489 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2220 if (t >= self->texs || (t && !self->tex [t].name))
2221 {
1490 XPUSHs (sv_2mortal (newSViv (face[z]))); 2222 XPUSHs (sv_2mortal (newSViv (t)));
2223 need_texid (self, t);
2224 }
2225
2226 cell->tile [z] = t;
1491 } 2227 }
1492 } 2228 }
1493 } 2229 }
1494 } 2230 }
1495 } 2231 }
1496} 2232}
1497 2233
1498MODULE = CFClient PACKAGE = CFClient::MixChunk 2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1499 2235
2236PROTOTYPES: DISABLE
2237
1500CFClient::MixChunk 2238CFPlus::MixChunk
1501new_from_file (SV *class, char *path) 2239new_from_file (SV *class, char *path)
1502 CODE: 2240 CODE:
1503 RETVAL = Mix_LoadWAV (path); 2241 RETVAL = Mix_LoadWAV (path);
1504 OUTPUT: 2242 OUTPUT:
1505 RETVAL 2243 RETVAL
1506 2244
1507void 2245void
1508DESTROY (CFClient::MixChunk self) 2246DESTROY (CFPlus::MixChunk self)
1509 CODE: 2247 CODE:
1510 Mix_FreeChunk (self); 2248 Mix_FreeChunk (self);
1511 2249
1512int 2250int
1513volume (CFClient::MixChunk self, int volume = -1) 2251volume (CFPlus::MixChunk self, int volume = -1)
1514 CODE: 2252 CODE:
1515 RETVAL = Mix_VolumeChunk (self, volume); 2253 RETVAL = Mix_VolumeChunk (self, volume);
1516 OUTPUT: 2254 OUTPUT:
1517 RETVAL 2255 RETVAL
1518 2256
1519int 2257int
1520play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2258play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1521 CODE: 2259 CODE:
1522 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2260 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1523 OUTPUT: 2261 OUTPUT:
1524 RETVAL 2262 RETVAL
1525 2263
1526MODULE = CFClient PACKAGE = CFClient::MixMusic 2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1527 2265
1528int 2266int
1529volume (int volume = -1) 2267volume (int volume = -1)
2268 PROTOTYPE: ;$
1530 CODE: 2269 CODE:
1531 RETVAL = Mix_VolumeMusic (volume); 2270 RETVAL = Mix_VolumeMusic (volume);
1532 OUTPUT: 2271 OUTPUT:
1533 RETVAL 2272 RETVAL
1534 2273
2274int
2275fade_out (int ms)
2276 CODE:
2277 RETVAL = Mix_FadeOutMusic (ms);
2278 OUTPUT:
2279 RETVAL
2280
1535CFClient::MixMusic 2281CFPlus::MixMusic
1536new_from_file (SV *class, char *path) 2282new_from_file (SV *class, char *path)
1537 CODE: 2283 CODE:
1538 RETVAL = Mix_LoadMUS (path); 2284 RETVAL = Mix_LoadMUS (path);
1539 OUTPUT: 2285 OUTPUT:
1540 RETVAL 2286 RETVAL
1541 2287
1542void 2288void
1543DESTROY (CFClient::MixMusic self) 2289DESTROY (CFPlus::MixMusic self)
1544 CODE: 2290 CODE:
1545 Mix_FreeMusic (self); 2291 Mix_FreeMusic (self);
1546 2292
1547int 2293int
1548play (CFClient::MixMusic self, int loops = -1) 2294play (CFPlus::MixMusic self, int loops = -1)
1549 CODE: 2295 CODE:
1550 RETVAL = Mix_PlayMusic (self, loops); 2296 RETVAL = Mix_PlayMusic (self, loops);
1551 OUTPUT: 2297 OUTPUT:
1552 RETVAL 2298 RETVAL
1553 2299
2300int
2301fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2302 CODE:
2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2304 OUTPUT:
2305 RETVAL
2306
1554MODULE = CFClient PACKAGE = CFClient::OpenGL 2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308
2309PROTOTYPES: ENABLE
1555 2310
1556BOOT: 2311BOOT:
1557{ 2312{
1558 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1559 static const struct { 2314 static const struct {
1560 const char *name; 2315 const char *name;
1561 IV iv; 2316 IV iv;
1562 } *civ, const_iv[] = { 2317 } *civ, const_iv[] = {
1563# define const_iv(name) { # name, (IV)name } 2318# define const_iv(name) { # name, (IV)name }
2319 const_iv (GL_VENDOR),
2320 const_iv (GL_VERSION),
2321 const_iv (GL_EXTENSIONS),
1564 const_iv (GL_COLOR_MATERIAL), 2322 const_iv (GL_COLOR_MATERIAL),
1565 const_iv (GL_SMOOTH), 2323 const_iv (GL_SMOOTH),
1566 const_iv (GL_FLAT), 2324 const_iv (GL_FLAT),
1567 const_iv (GL_DITHER), 2325 const_iv (GL_DITHER),
1568 const_iv (GL_BLEND), 2326 const_iv (GL_BLEND),
1570 const_iv (GL_SCISSOR_TEST), 2328 const_iv (GL_SCISSOR_TEST),
1571 const_iv (GL_DEPTH_TEST), 2329 const_iv (GL_DEPTH_TEST),
1572 const_iv (GL_ALPHA_TEST), 2330 const_iv (GL_ALPHA_TEST),
1573 const_iv (GL_NORMALIZE), 2331 const_iv (GL_NORMALIZE),
1574 const_iv (GL_RESCALE_NORMAL), 2332 const_iv (GL_RESCALE_NORMAL),
2333 const_iv (GL_FRONT),
2334 const_iv (GL_BACK),
2335 const_iv (GL_AUX0),
1575 const_iv (GL_AND), 2336 const_iv (GL_AND),
1576 const_iv (GL_ONE), 2337 const_iv (GL_ONE),
1577 const_iv (GL_ZERO), 2338 const_iv (GL_ZERO),
1578 const_iv (GL_SRC_ALPHA), 2339 const_iv (GL_SRC_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 2340 const_iv (GL_DST_ALPHA),
1580 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2341 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581 const_iv (GL_ONE_MINUS_DST_ALPHA), 2342 const_iv (GL_ONE_MINUS_DST_ALPHA),
2343 const_iv (GL_SRC_ALPHA_SATURATE),
1582 const_iv (GL_RGB), 2344 const_iv (GL_RGB),
1583 const_iv (GL_RGBA), 2345 const_iv (GL_RGBA),
2346 const_iv (GL_RGBA4),
2347 const_iv (GL_RGBA8),
2348 const_iv (GL_RGB5_A1),
1584 const_iv (GL_UNSIGNED_BYTE), 2349 const_iv (GL_UNSIGNED_BYTE),
1585 const_iv (GL_UNSIGNED_SHORT), 2350 const_iv (GL_UNSIGNED_SHORT),
1586 const_iv (GL_UNSIGNED_INT), 2351 const_iv (GL_UNSIGNED_INT),
1587 const_iv (GL_ALPHA), 2352 const_iv (GL_ALPHA),
1588 const_iv (GL_INTENSITY), 2353 const_iv (GL_INTENSITY),
1589 const_iv (GL_LUMINANCE), 2354 const_iv (GL_LUMINANCE),
1590 const_iv (GL_LUMINANCE_ALPHA), 2355 const_iv (GL_LUMINANCE_ALPHA),
1591 const_iv (GL_FLOAT), 2356 const_iv (GL_FLOAT),
1592 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2357 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1593 const_iv (GL_COMPILE), 2358 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D),
1594 const_iv (GL_TEXTURE_1D), 2361 const_iv (GL_TEXTURE_1D),
1595 const_iv (GL_TEXTURE_2D), 2362 const_iv (GL_TEXTURE_2D),
1596 const_iv (GL_TEXTURE_ENV), 2363 const_iv (GL_TEXTURE_ENV),
1597 const_iv (GL_TEXTURE_MAG_FILTER), 2364 const_iv (GL_TEXTURE_MAG_FILTER),
1598 const_iv (GL_TEXTURE_MIN_FILTER), 2365 const_iv (GL_TEXTURE_MIN_FILTER),
1599 const_iv (GL_TEXTURE_ENV_MODE), 2366 const_iv (GL_TEXTURE_ENV_MODE),
1600 const_iv (GL_TEXTURE_WRAP_S), 2367 const_iv (GL_TEXTURE_WRAP_S),
1601 const_iv (GL_TEXTURE_WRAP_T), 2368 const_iv (GL_TEXTURE_WRAP_T),
2369 const_iv (GL_REPEAT),
1602 const_iv (GL_CLAMP), 2370 const_iv (GL_CLAMP),
1603 const_iv (GL_REPEAT), 2371 const_iv (GL_CLAMP_TO_EDGE),
1604 const_iv (GL_NEAREST), 2372 const_iv (GL_NEAREST),
1605 const_iv (GL_LINEAR), 2373 const_iv (GL_LINEAR),
1606 const_iv (GL_NEAREST_MIPMAP_NEAREST), 2374 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607 const_iv (GL_LINEAR_MIPMAP_NEAREST), 2375 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608 const_iv (GL_NEAREST_MIPMAP_LINEAR), 2376 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1619 const_iv (GL_SEPARABLE_2D), 2387 const_iv (GL_SEPARABLE_2D),
1620 const_iv (GL_CONVOLUTION_2D), 2388 const_iv (GL_CONVOLUTION_2D),
1621 const_iv (GL_CONVOLUTION_BORDER_MODE), 2389 const_iv (GL_CONVOLUTION_BORDER_MODE),
1622 const_iv (GL_CONSTANT_BORDER), 2390 const_iv (GL_CONSTANT_BORDER),
1623 const_iv (GL_LINES), 2391 const_iv (GL_LINES),
2392 const_iv (GL_LINE_STRIP),
1624 const_iv (GL_LINE_LOOP), 2393 const_iv (GL_LINE_LOOP),
1625 const_iv (GL_QUADS), 2394 const_iv (GL_QUADS),
1626 const_iv (GL_QUAD_STRIP), 2395 const_iv (GL_QUAD_STRIP),
1627 const_iv (GL_TRIANGLES), 2396 const_iv (GL_TRIANGLES),
1628 const_iv (GL_TRIANGLE_STRIP), 2397 const_iv (GL_TRIANGLE_STRIP),
1629 const_iv (GL_TRIANGLE_FAN), 2398 const_iv (GL_TRIANGLE_FAN),
1630 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2399 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400 const_iv (GL_POINT_SMOOTH_HINT),
2401 const_iv (GL_LINE_SMOOTH_HINT),
2402 const_iv (GL_POLYGON_SMOOTH_HINT),
2403 const_iv (GL_GENERATE_MIPMAP_HINT),
1631 const_iv (GL_FASTEST), 2404 const_iv (GL_FASTEST),
2405 const_iv (GL_DONT_CARE),
2406 const_iv (GL_NICEST),
1632 const_iv (GL_V2F), 2407 const_iv (GL_V2F),
1633 const_iv (GL_V3F), 2408 const_iv (GL_V3F),
1634 const_iv (GL_T2F_V3F), 2409 const_iv (GL_T2F_V3F),
1635 const_iv (GL_T2F_N3F_V3F), 2410 const_iv (GL_T2F_N3F_V3F),
1636# undef const_iv 2411# undef const_iv
1637 }; 2412 };
1638 2413
1639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2416
2417 texture_av = newAV ();
2418 AvREAL_off (texture_av);
1641} 2419}
2420
2421char *
2422gl_vendor ()
2423 CODE:
2424 RETVAL = (char *)glGetString (GL_VENDOR);
2425 OUTPUT:
2426 RETVAL
2427
2428char *
2429gl_version ()
2430 CODE:
2431 RETVAL = (char *)glGetString (GL_VERSION);
2432 OUTPUT:
2433 RETVAL
2434
2435char *
2436gl_extensions ()
2437 CODE:
2438 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2439 OUTPUT:
2440 RETVAL
2441
2442const char *glGetString (GLenum pname)
2443
2444GLint glGetInteger (GLenum pname)
2445 CODE:
2446 glGetIntegerv (pname, &RETVAL);
2447 OUTPUT:
2448 RETVAL
2449
2450GLdouble glGetDouble (GLenum pname)
2451 CODE:
2452 glGetDoublev (pname, &RETVAL);
2453 OUTPUT:
2454 RETVAL
1642 2455
1643int glGetError () 2456int glGetError ()
2457
2458void glFinish ()
1644 2459
1645void glClear (int mask) 2460void glClear (int mask)
1646 2461
1647void glClearColor (float r, float g, float b, float a = 1.0) 2462void glClearColor (float r, float g, float b, float a = 1.0)
1648 PROTOTYPE: @ 2463 PROTOTYPE: @
1655 2470
1656void glHint (int target, int mode) 2471void glHint (int target, int mode)
1657 2472
1658void glBlendFunc (int sfactor, int dfactor) 2473void glBlendFunc (int sfactor, int dfactor)
1659 2474
2475void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2476 CODE:
2477 gl_BlendFuncSeparate (sa, da, saa, daa);
2478
1660void glDepthMask (int flag) 2479void glDepthMask (int flag)
1661 2480
1662void glLogicOp (int opcode) 2481void glLogicOp (int opcode)
1663 2482
1664void glColorMask (int red, int green, int blue, int alpha) 2483void glColorMask (int red, int green, int blue, int alpha)
1668void glPushMatrix () 2487void glPushMatrix ()
1669 2488
1670void glPopMatrix () 2489void glPopMatrix ()
1671 2490
1672void glLoadIdentity () 2491void glLoadIdentity ()
2492
2493void glDrawBuffer (int buffer)
2494
2495void glReadBuffer (int buffer)
1673 2496
1674# near_ and far_ are due to microsofts buggy "c" compiler 2497# near_ and far_ are due to microsofts buggy "c" compiler
1675void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2498void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676 2499
1677# near_ and far_ are due to microsofts buggy "c" compiler 2500# near_ and far_ are due to microsofts buggy "c" compiler
1697 2520
1698void glEnd () 2521void glEnd ()
1699 2522
1700void glColor (float r, float g, float b, float a = 1.0) 2523void glColor (float r, float g, float b, float a = 1.0)
1701 PROTOTYPE: @ 2524 PROTOTYPE: @
2525 ALIAS:
2526 glColor_premultiply = 1
1702 CODE: 2527 CODE:
2528 if (ix)
2529 {
2530 r *= a;
2531 g *= a;
2532 b *= a;
2533 }
1703 // microsoft visual "c" rounds instead of truncating... 2534 // microsoft visual "c" rounds instead of truncating...
1704 glColor4ub (MIN ((int)(r * 255.f), 255), 2535 glColor4f (r, g, b, a);
1705 MIN ((int)(g * 255.f), 255),
1706 MIN ((int)(b * 255.f), 255),
1707 MIN ((int)(a * 255.f), 255));
1708 2536
1709void glInterleavedArrays (int format, int stride, char *data) 2537void glInterleavedArrays (int format, int stride, char *data)
1710 2538
1711void glDrawElements (int mode, int count, int type, char *indices) 2539void glDrawElements (int mode, int count, int type, char *indices)
1712 2540
1735 2563
1736void glBindTexture (int target, int name) 2564void glBindTexture (int target, int name)
1737 2565
1738void glConvolutionParameter (int target, int pname, float params) 2566void glConvolutionParameter (int target, int pname, float params)
1739 CODE: 2567 CODE:
1740 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2568 if (gl.ConvolutionParameterf)
2569 gl.ConvolutionParameterf (target, pname, params);
1741 2570
1742void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2571void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1743 CODE: 2572 CODE:
1744 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2573 if (gl.ConvolutionFilter2D)
1745 (target, internalformat, width, height, format, type, data)); 2574 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746 2575
1747void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2576void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1748 CODE: 2577 CODE:
1749 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2578 if (gl.SeparableFilter2D)
1750 (target, internalformat, width, height, format, type, row, column)); 2579 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751 2580
1752void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2581void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1753 2582
1754void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2583void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1755 2584
1756void glDrawPixels (int width, int height, int format, int type, char *pixels) 2585void glDrawPixels (int width, int height, int format, int type, char *pixels)
2586
2587void glPixelZoom (float x, float y)
1757 2588
1758void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2589void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1759 2590
1760int glGenTexture () 2591int glGenTexture ()
1761 CODE: 2592 CODE:
1762{ 2593 RETVAL = gen_texture ();
1763 GLuint name;
1764 glGenTextures (1, &name);
1765 RETVAL = name;
1766}
1767 OUTPUT: 2594 OUTPUT:
1768 RETVAL 2595 RETVAL
1769 2596
1770void glDeleteTexture (int name) 2597void glDeleteTexture (int name)
1771 CODE: 2598 CODE:
1772{
1773 GLuint name_ = name;
1774 glDeleteTextures (1, &name_); 2599 del_texture (name);
1775} 2600
1776
1777int glGenList () 2601int glGenList ()
1778 CODE: 2602 CODE:
1779 RETVAL = glGenLists (1); 2603 RETVAL = glGenLists (1);
1780 OUTPUT: 2604 OUTPUT:
1781 RETVAL 2605 RETVAL
1788 2612
1789void glEndList () 2613void glEndList ()
1790 2614
1791void glCallList (int list) 2615void glCallList (int list)
1792 2616
2617MODULE = CFPlus PACKAGE = CFPlus::UI::Base
1793 2618
2619PROTOTYPES: DISABLE
2620
2621void
2622find_widget (SV *widget, NV x, NV y)
2623 PPCODE:
2624{
2625 if (within_widget (widget, x, y))
2626 XPUSHs (widget);
2627}
2628

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines