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.127 by root, Wed Jul 5 00:16:44 2006 UTC vs.
Revision 1.208 by root, Sat Jul 21 16:07:53 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>
15#include <stdlib.h> 28#include <stdlib.h>
16 29
17#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
18#include <SDL_endian.h> 32#include <SDL_endian.h>
19#include <SDL_image.h> 33#include <SDL_image.h>
20#include <SDL_mixer.h> 34#include <SDL_mixer.h>
21#include <SDL_opengl.h> 35#include <SDL_opengl.h>
22 36
31# include <sys/types.h> 45# include <sys/types.h>
32# include <sys/socket.h> 46# include <sys/socket.h>
33# include <netinet/in.h> 47# include <netinet/in.h>
34# include <netinet/tcp.h> 48# include <netinet/tcp.h>
35# include <inttypes.h> 49# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 50#endif
44 51
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 53
49#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
50 55
51#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
57# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 63#else
59# define PARACHUTE 0 64# define PARACHUTE 0
60#endif 65#endif
61 66
67static AV *texture_av;
68
62static struct 69static struct
63{ 70{
64#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 72#include "glfunc.h"
66#undef GL_FUNC 73#undef GL_FUNC
67} gl; 74} gl;
68 75
76static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 78{
71 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 83 else
76 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
77} 85}
78 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
79#include "texcache.c" 111#include "texcache.c"
80 112
81#include "pango-font.c" 113#include "pango-font.c"
82#include "pango-fontmap.c" 114#include "pango-fontmap.c"
83#include "pango-render.c" 115#include "pango-render.c"
84 116
85typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
87 119
88typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
89 121
90static int 122static int
91shape_attr_p (PangoLayoutRun *run) 123shape_attr_p (PangoLayoutRun *run)
92{ 124{
93 GSList *attrs = run->item->analysis.extra_attrs; 125 GSList *attrs = run->item->analysis.extra_attrs;
107 139
108typedef struct cf_layout { 140typedef struct cf_layout {
109 PangoLayout *pl; 141 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
111 int base_height; 143 int base_height;
112 CFClient__Font font; 144 CFPlus__Font font;
113} *CFClient__Layout; 145} *CFPlus__Layout;
114 146
115static CFClient__Font default_font; 147static CFPlus__Font default_font;
116static PangoContext *opengl_context; 148static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 149static PangoFontMap *opengl_fontmap;
118 150
119static void 151static void
120substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
125#endif 157#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 159}
128 160
129static void 161static void
130layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
131{ 163{
132 /* 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
133 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
134 */ 166 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
139 171
140 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
141} 173}
142 174
143static void 175static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
147 182
148 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 185
151 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
152} 187 if (!rect.height) rect.height = 1;
153 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
154typedef uint16_t mapface; 194typedef uint16_t faceid;
155 195
156typedef struct { 196typedef struct {
157 GLint name; 197 int name;
158 int w, h; 198 int w, h;
159 float s, t; 199 float s, t;
160 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
161} maptex; 203} maptex;
162 204
163typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
164 int16_t darkness; 208 uint16_t darkness;
165 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 210} mapcell;
167 211
168typedef struct { 212typedef struct {
169 int32_t c0, c1; 213 int32_t c0, c1;
170 mapcell *col; 214 mapcell *col;
171} maprow; 215} maprow;
172 216
173typedef struct map { 217typedef struct map {
174 int x, y, w, h; 218 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 220 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 221 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 222
182 int32_t rows; 223 int32_t rows;
183 maprow *row; 224 maprow *row;
184} *CFClient__Map; 225} *CFPlus__Map;
185 226
186static char * 227static char *
187prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
188{ 229{
189 char *p; 230 char *p;
206} 247}
207 248
208#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))
209#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))
210 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
211static maprow * 272static maprow *
212map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
213{ 274{
214 if (0 > y) 275 if (0 > y)
215 { 276 {
216 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
255 316
256 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
257} 318}
258 319
259static mapcell * 320static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
261{ 322{
262 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
263} 324}
264 325
265static void 326static void
266map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
267{ 328{
268 int r; 329 int r;
269 330
270 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
279 self->row = 0; 340 self->row = 0;
280 self->rows = 0; 341 self->rows = 0;
281} 342}
282 343
283static void 344static void
284map_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)
285{ 346{
286 int x, y; 347 int x, y;
287 maprow *row; 348 maprow *row;
349 mapcell *cell;
288 350
289 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 352 if (y >= 0)
291 { 353 {
292 if (y >= self->rows) 354 if (y >= self->rows)
298 if (x >= row->c0) 360 if (x >= row->c0)
299 { 361 {
300 if (x >= row->c1) 362 if (x >= row->c1)
301 break; 363 break;
302 364
303 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;
304 } 371 }
305 } 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);
306} 389}
307 390
308static void 391static void
309music_finished (void) 392music_finished (void)
310{ 393{
346 n |= n >> 16; 429 n |= n >> 16;
347 430
348 return n + 1; 431 return n + 1;
349} 432}
350 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
351MODULE = CFClient PACKAGE = CFClient 478MODULE = CFPlus PACKAGE = CFPlus
352 479
353PROTOTYPES: ENABLE 480PROTOTYPES: ENABLE
354 481
355BOOT: 482BOOT:
356{ 483{
357 HV *stash = gv_stashpv ("CFClient", 1); 484 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 485 static const struct {
359 const char *name; 486 const char *name;
360 IV iv; 487 IV iv;
361 } *civ, const_iv[] = { 488 } *civ, const_iv[] = {
362# 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
363 const_iv (SDL_ACTIVEEVENT), 493 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 494 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 495 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 496 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 497 const_iv (SDL_MOUSEBUTTONDOWN),
376 const_iv (SDL_EVENT_RESERVEDA), 506 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 507 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 508 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 509 const_iv (SDL_VIDEOEXPOSE),
380 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
381 const_iv (SDLK_KP0), 516 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 517 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 518 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 519 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 520 const_iv (SDLK_KP4),
440 const_iv (SDLK_BREAK), 575 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 576 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 577 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 578 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 579 const_iv (SDLK_UNDO),
580
445 const_iv (KMOD_NONE), 581 const_iv (KMOD_NONE),
582 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 583 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 584 const_iv (KMOD_RSHIFT),
585 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 586 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 587 const_iv (KMOD_RCTRL),
588 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 589 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 590 const_iv (KMOD_RALT),
591 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 592 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 593 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 594 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 595 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 596 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL),
458 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_ALT),
460 const_iv (KMOD_META)
461# undef const_iv 597# undef const_iv
462 }; 598 };
463 599
464 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; )
465 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);
466} 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
467 619
468NV floor (NV x) 620NV floor (NV x)
469 621
470NV ceil (NV x) 622NV ceil (NV x)
471 623
476 opengl_fontmap = pango_opengl_font_map_new (); 628 opengl_fontmap = pango_opengl_font_map_new ();
477 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 629 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
478 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 630 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
479} 631}
480 632
633char *
634SDL_GetError ()
635
481int 636int
482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 637SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
483 638
484void 639void
485SDL_Quit () 640SDL_Quit ()
486 641
487void 642void
488SDL_ListModes () 643SDL_ListModes (int rgb, int alpha)
489 PPCODE: 644 PPCODE:
490{ 645{
491 SDL_Rect **m; 646 SDL_Rect **m;
492 647
493 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 648 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 649 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 650 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 651 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
497 652
498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 653 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 654 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
500 655
501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 656 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 657 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 658 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 659 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 660
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 661 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
507 662#if SDL_VERSION_ATLEAST(1,2,10)
508 SDL_EnableUNICODE (1); 663 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 664 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
665#endif
510 666
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
512 668
513 if (m && m != (SDL_Rect **)-1) 669 if (m && m != (SDL_Rect **)-1)
514 while (*m) 670 while (*m)
515 { 671 {
672 if ((*m)->w >= 640 && (*m)->h >= 480)
673 {
516 AV *av = newAV (); 674 AV *av = newAV ();
517 av_push (av, newSViv ((*m)->w)); 675 av_push (av, newSViv ((*m)->w));
518 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));
519 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 679 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
680 }
520 681
521 ++m; 682 ++m;
522 } 683 }
523} 684}
524 685
525char *
526SDL_GetError ()
527
528int 686int
529SDL_SetVideoMode (int w, int h, int fullscreen) 687SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
530 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
531 RETVAL = !!SDL_SetVideoMode ( 698 RETVAL = !!SDL_SetVideoMode (
532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 699 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
533 ); 700 );
701
534 if (RETVAL) 702 if (RETVAL)
535 { 703 {
704 av_clear (texture_av);
705
536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 707#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h" 708#include "glfunc.h"
539# undef GL_FUNC 709#undef GL_FUNC
540 } 710 }
711}
541 OUTPUT: 712 OUTPUT:
542 RETVAL 713 RETVAL
543 714
544void 715void
545SDL_GL_SwapBuffers () 716SDL_GL_SwapBuffers ()
546 717
547char * 718char *
548SDL_GetKeyName (int sym) 719SDL_GetKeyName (int sym)
549 720
721int
722SDL_GetAppState ()
723
550void 724void
551SDL_PollEvent () 725poll_events ()
552 PPCODE: 726 PPCODE:
553{ 727{
554 SDL_Event ev; 728 SDL_Event ev;
555 729
556 while (SDL_PollEvent (&ev)) 730 SDL_PumpEvents ();
731 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
557 { 732 {
558 HV *hv = newHV (); 733 HV *hv = newHV ();
559 hv_store (hv, "type", 4, newSViv (ev.type), 0); 734 hv_store (hv, "type", 4, newSViv (ev.type), 0);
560 735
561 switch (ev.type) 736 switch (ev.type)
563 case SDL_KEYDOWN: 738 case SDL_KEYDOWN:
564 case SDL_KEYUP: 739 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 740 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 741 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 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 */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 744 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 745 break;
570 746
571 case SDL_ACTIVEEVENT: 747 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 749 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
574 break; 750 break;
575 751
576 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
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
578
579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 772 hv_store (hv, "state", 5, newSViv (state), 0);
580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 773 hv_store (hv, "x", 1, newSViv (x), 0);
581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 774 hv_store (hv, "y", 1, newSViv (y), 0);
582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 775 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 776 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 }
584 break; 778 break;
585 779
586 case SDL_MOUSEBUTTONDOWN: 780 case SDL_MOUSEBUTTONDOWN:
587 case SDL_MOUSEBUTTONUP: 781 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 792 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 793 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 794 break;
601 } 795 }
602 796
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 797 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604 } 798 }
605} 799}
606 800
607int 801int
608Mix_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)
617Mix_AllocateChannels (int numchans = -1) 811Mix_AllocateChannels (int numchans = -1)
618 812
619void 813void
620lowdelay (int fd, int val = 1) 814lowdelay (int fd, int val = 1)
621 CODE: 815 CODE:
816 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
817
818void
819win32_proxy_info ()
820 PPCODE:
821{
622#ifndef _WIN32 822#ifdef _WIN32
623 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 }
624#endif 844#endif
845}
625 846
626void 847void
627add_font (char *file) 848add_font (char *file)
628 CODE: 849 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 850 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 851
631void 852void
632load_image_inline (SV *image_) 853load_image_inline (SV *image_)
633 ALIAS: 854 ALIAS:
634 load_image_file = 1 855 load_image_file = 1
676 897
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 898 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 899
679 assert (surface2->pitch == surface2->w * 4); 900 assert (surface2->pitch == surface2->w * 4);
680 901
902 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 903 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 904 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 905 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 906 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 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)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 908 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 909 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
910 SDL_UnlockSurface (surface2);
690 911
691 SDL_FreeSurface (surface); 912 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 913 SDL_FreeSurface (surface2);
693} 914}
694 915
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 954 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 955#endif
735 _exit (1); 956 _exit (1);
736 957
737void 958void
738_exit (int retval) 959_exit (int retval = 0)
739 CODE: 960 CODE:
961#ifdef WIN32
962 ExitThread (retval); // unclean, please beam me up
963#else
740 _exit (retval); 964 _exit (retval);
965#endif
741 966
967void
968debug ()
969 CODE:
970{
971#if DEBUG
972 VALGRIND_DO_LEAK_CHECK;
973#endif
974}
975
742MODULE = CFClient PACKAGE = CFClient::Font 976MODULE = CFPlus PACKAGE = CFPlus::Font
743 977
744CFClient::Font 978PROTOTYPES: DISABLE
979
980CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 981new_from_file (SV *class, char *path, int id = 0)
746 CODE: 982 CODE:
747{ 983{
748 int count; 984 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 985 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
752} 988}
753 OUTPUT: 989 OUTPUT:
754 RETVAL 990 RETVAL
755 991
756void 992void
757DESTROY (CFClient::Font self) 993DESTROY (CFPlus::Font self)
758 CODE: 994 CODE:
759 pango_font_description_free (self); 995 pango_font_description_free (self);
760 996
761void 997void
762make_default (CFClient::Font self) 998make_default (CFPlus::Font self)
999 PROTOTYPE: $
763 CODE: 1000 CODE:
764 default_font = self; 1001 default_font = self;
765 1002
766MODULE = CFClient PACKAGE = CFClient::Layout 1003MODULE = CFPlus PACKAGE = CFPlus::Layout
767 1004
1005PROTOTYPES: DISABLE
1006
768void 1007void
769clear_font_cache () 1008reset_glyph_cache ()
1009 PROTOTYPE:
770 CODE: 1010 CODE:
771 tc_clear (); 1011 tc_clear ();
772 1012
773CFClient::Layout 1013CFPlus::Layout
774new (SV *class, int type = 0) 1014new (SV *class)
775 CODE: 1015 CODE:
776 New (0, RETVAL, 1, struct cf_layout); 1016 New (0, RETVAL, 1, struct cf_layout);
777 1017
778 RETVAL->pl = pango_layout_new (opengl_context); 1018 RETVAL->pl = pango_layout_new (opengl_context);
779 RETVAL->r = 1.; 1019 RETVAL->r = 1.;
787 layout_update_font (RETVAL); 1027 layout_update_font (RETVAL);
788 OUTPUT: 1028 OUTPUT:
789 RETVAL 1029 RETVAL
790 1030
791void 1031void
792DESTROY (CFClient::Layout self) 1032DESTROY (CFPlus::Layout self)
793 CODE: 1033 CODE:
794 g_object_unref (self->pl); 1034 g_object_unref (self->pl);
795 Safefree (self); 1035 Safefree (self);
796 1036
797void 1037void
798set_text (CFClient::Layout self, SV *text_) 1038set_text (CFPlus::Layout self, SV *text_)
799 CODE: 1039 CODE:
800{ 1040{
801 STRLEN textlen; 1041 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 1042 char *text = SvPVutf8 (text_, textlen);
803 1043
804 pango_layout_set_text (self->pl, text, textlen); 1044 pango_layout_set_text (self->pl, text, textlen);
805} 1045}
806 1046
807void 1047void
808set_markup (CFClient::Layout self, SV *text_) 1048set_markup (CFPlus::Layout self, SV *text_)
809 CODE: 1049 CODE:
810{ 1050{
811 STRLEN textlen; 1051 STRLEN textlen;
812 char *text = SvPVutf8 (text_, textlen); 1052 char *text = SvPVutf8 (text_, textlen);
813 1053
814 pango_layout_set_markup (self->pl, text, textlen); 1054 pango_layout_set_markup (self->pl, text, textlen);
815} 1055}
816 1056
817void 1057void
818set_shapes (CFClient::Layout self, ...) 1058set_shapes (CFPlus::Layout self, ...)
819 CODE: 1059 CODE:
820{ 1060{
821 PangoAttrList *attrs = 0; 1061 PangoAttrList *attrs = 0;
822 const char *text = pango_layout_get_text (self->pl); 1062 const char *text = pango_layout_get_text (self->pl);
823 const char *pos = text; 1063 const char *pos = text;
858 if (attrs) 1098 if (attrs)
859 pango_layout_set_attributes (self->pl, attrs); 1099 pango_layout_set_attributes (self->pl, attrs);
860} 1100}
861 1101
862void 1102void
863get_shapes (CFClient::Layout self) 1103get_shapes (CFPlus::Layout self)
864 PPCODE: 1104 PPCODE:
865{ 1105{
866 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1106 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867 1107
868 do 1108 do
872 if (run && shape_attr_p (run)) 1112 if (run && shape_attr_p (run))
873 { 1113 {
874 PangoRectangle extents; 1114 PangoRectangle extents;
875 pango_layout_iter_get_run_extents (iter, 0, &extents); 1115 pango_layout_iter_get_run_extents (iter, 0, &extents);
876 1116
1117 EXTEND (SP, 2);
877 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1118 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1119 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879 } 1120 }
880 } 1121 }
881 while (pango_layout_iter_next_run (iter)); 1122 while (pango_layout_iter_next_run (iter));
882 1123
883 pango_layout_iter_free (iter); 1124 pango_layout_iter_free (iter);
884} 1125}
885 1126
886int 1127int
887has_wrapped (CFClient::Layout self) 1128has_wrapped (CFPlus::Layout self)
888 CODE: 1129 CODE:
889{ 1130{
890 int lines = 1; 1131 int lines = 1;
891 const char *text = pango_layout_get_text (self->pl); 1132 const char *text = pango_layout_get_text (self->pl);
892 1133
897} 1138}
898 OUTPUT: 1139 OUTPUT:
899 RETVAL 1140 RETVAL
900 1141
901SV * 1142SV *
902get_text (CFClient::Layout self) 1143get_text (CFPlus::Layout self)
903 CODE: 1144 CODE:
904 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1145 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
905 sv_utf8_decode (RETVAL); 1146 sv_utf8_decode (RETVAL);
906 OUTPUT: 1147 OUTPUT:
907 RETVAL 1148 RETVAL
908 1149
909void 1150void
910set_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.)
911 CODE: 1152 CODE:
912 self->r = r; 1153 self->r = r;
913 self->g = g; 1154 self->g = g;
914 self->b = b; 1155 self->b = b;
915 self->a = a; 1156 self->a = a;
916 1157
917void 1158void
918set_font (CFClient::Layout self, CFClient::Font font = 0) 1159set_font (CFPlus::Layout self, CFPlus::Font font = 0)
919 CODE: 1160 CODE:
920 if (self->font != font) 1161 if (self->font != font)
921 { 1162 {
922 self->font = font; 1163 self->font = font;
923 layout_update_font (self); 1164 layout_update_font (self);
924 } 1165 }
925 1166
926void 1167void
927set_height (CFClient::Layout self, int base_height) 1168set_height (CFPlus::Layout self, int base_height)
928 CODE: 1169 CODE:
929 if (self->base_height != base_height) 1170 if (self->base_height != base_height)
930 { 1171 {
931 self->base_height = base_height; 1172 self->base_height = base_height;
932 layout_update_font (self); 1173 layout_update_font (self);
933 } 1174 }
934 1175
935void 1176void
936set_width (CFClient::Layout self, int max_width = -1) 1177set_width (CFPlus::Layout self, int max_width = -1)
937 CODE: 1178 CODE:
938 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);
939 1180
940void 1181void
941set_indent (CFClient::Layout self, int indent) 1182set_indent (CFPlus::Layout self, int indent)
942 CODE: 1183 CODE:
943 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1184 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
944 1185
945void 1186void
946set_spacing (CFClient::Layout self, int spacing) 1187set_spacing (CFPlus::Layout self, int spacing)
947 CODE: 1188 CODE:
948 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1189 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
949 1190
950void 1191void
951set_ellipsise (CFClient::Layout self, int ellipsise) 1192set_ellipsise (CFPlus::Layout self, int ellipsise)
952 CODE: 1193 CODE:
953 pango_layout_set_ellipsize (self->pl, 1194 pango_layout_set_ellipsize (self->pl,
954 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1195 ellipsise == 1 ? PANGO_ELLIPSIZE_START
955 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1196 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
956 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1197 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
957 : PANGO_ELLIPSIZE_NONE 1198 : PANGO_ELLIPSIZE_NONE
958 ); 1199 );
959 1200
960void 1201void
961set_single_paragraph_mode (CFClient::Layout self, int spm) 1202set_single_paragraph_mode (CFPlus::Layout self, int spm)
962 CODE: 1203 CODE:
963 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1204 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
964 1205
965void 1206void
966size (CFClient::Layout self) 1207size (CFPlus::Layout self)
967 PPCODE: 1208 PPCODE:
968{ 1209{
969 int w, h; 1210 int w, h;
970 1211
971 layout_get_pixel_size (self, &w, &h); 1212 layout_get_pixel_size (self, &w, &h);
974 PUSHs (sv_2mortal (newSViv (w))); 1215 PUSHs (sv_2mortal (newSViv (w)));
975 PUSHs (sv_2mortal (newSViv (h))); 1216 PUSHs (sv_2mortal (newSViv (h)));
976} 1217}
977 1218
978int 1219int
979descent (CFClient::Layout self) 1220descent (CFPlus::Layout self)
980 CODE: 1221 CODE:
981{ 1222{
982 PangoRectangle rect; 1223 PangoRectangle rect;
983 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1224 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
984 pango_layout_line_get_pixel_extents (line, 0, &rect); 1225 pango_layout_line_get_pixel_extents (line, 0, &rect);
986} 1227}
987 OUTPUT: 1228 OUTPUT:
988 RETVAL 1229 RETVAL
989 1230
990int 1231int
991xy_to_index (CFClient::Layout self, int x, int y) 1232xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1233 CODE:
993{ 1234{
994 int index, trailing; 1235 int index, trailing;
995 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);
996 RETVAL = index; 1237 RETVAL = index + trailing;
997} 1238}
998 OUTPUT: 1239 OUTPUT:
999 RETVAL 1240 RETVAL
1000 1241
1001void 1242void
1002cursor_pos (CFClient::Layout self, int index) 1243cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1244 PPCODE:
1004{ 1245{
1005 PangoRectangle strong_pos; 1246 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1247 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1248
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1251 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1252 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1253}
1013 1254
1014void 1255void
1256index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1257 PPCODE:
1258{
1259 int line, x;
1260
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 */
1263
1264 EXTEND (SP, 2);
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)
1286 PUSHs (sv_2mortal (newSViv (index + trailing)));
1287 else
1288 {
1289 PUSHs (sv_2mortal (newSViv (index)));
1290 PUSHs (sv_2mortal (newSViv (trailing)));
1291 }
1292}
1293
1294void
1015render (CFClient::Layout self, float x, float y) 1295render (CFPlus::Layout self, float x, float y, int flags = 0)
1016 PPCODE: 1296 PPCODE:
1017 pango_opengl_render_layout_subpixel ( 1297 pango_opengl_render_layout_subpixel (
1018 self->pl, 1298 self->pl,
1019 x * PANGO_SCALE, y * PANGO_SCALE, 1299 x * PANGO_SCALE, y * PANGO_SCALE,
1020 self->r, self->g, self->b, self->a 1300 self->r, self->g, self->b, self->a,
1301 flags
1021 ); 1302 );
1022 1303
1023MODULE = CFClient PACKAGE = CFClient::Texture 1304MODULE = CFPlus PACKAGE = CFPlus::Texture
1024 1305
1025void 1306PROTOTYPES: ENABLE
1026pad2pot (SV *data_, SV *w_, SV *h_)
1027 CODE:
1028{
1029 int ow = SvIV (w_);
1030 int oh = SvIV (h_);
1031 1307
1032 if (ow && oh) 1308int minpot (int n)
1309
1310void
1311pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE:
1313{
1314 if ((nw != ow || nh != oh) && SvOK (data_))
1033 { 1315 {
1034 int nw = minpot (ow);
1035 int nh = minpot (oh);
1036
1037 if (nw != ow || nh != oh)
1038 {
1039 if (SvOK (data_))
1040 {
1041 STRLEN datalen; 1316 STRLEN datalen;
1042 char *data = SvPVbyte (data_, datalen); 1317 char *data = SvPVbyte (data_, datalen);
1043 int bpp = datalen / (ow * oh); 1318 int bpp = datalen / (ow * oh);
1044 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1319 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1045 1320
1046 SvPOK_only (result_); 1321 SvPOK_only (result_);
1047 SvCUR_set (result_, nw * nh * bpp); 1322 SvCUR_set (result_, nw * nh * bpp);
1048 1323
1049 memset (SvPVX (result_), 0, nw * nh * bpp); 1324 memset (SvPVX (result_), 0, nw * nh * bpp);
1050 while (oh--) 1325 while (oh--)
1051 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1326 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1052 1327
1053 sv_setsv (data_, result_); 1328 sv_setsv (data_, result_);
1054 }
1055
1056 sv_setiv (w_, nw);
1057 sv_setiv (h_, nh);
1058 }
1059 } 1329 }
1060} 1330}
1061 1331
1062void 1332void
1063draw_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.)
1106 glDisable (GL_ALPHA_TEST); 1376 glDisable (GL_ALPHA_TEST);
1107 glDisable (GL_BLEND); 1377 glDisable (GL_BLEND);
1108 } 1378 }
1109} 1379}
1110 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
1111MODULE = CFClient PACKAGE = CFClient::Map 1392MODULE = CFPlus PACKAGE = CFPlus::Map
1112 1393
1113CFClient::Map 1394PROTOTYPES: DISABLE
1114new (SV *class, int map_width, int map_height) 1395
1396CFPlus::Map
1397new (SV *class)
1115 CODE: 1398 CODE:
1116 New (0, RETVAL, 1, struct map); 1399 New (0, RETVAL, 1, struct map);
1117 RETVAL->x = 0; 1400 RETVAL->x = 0;
1118 RETVAL->y = 0; 1401 RETVAL->y = 0;
1119 RETVAL->w = map_width; 1402 RETVAL->w = 0;
1120 RETVAL->h = map_height; 1403 RETVAL->h = 0;
1121 RETVAL->ox = 0; 1404 RETVAL->ox = 0;
1122 RETVAL->oy = 0; 1405 RETVAL->oy = 0;
1123 RETVAL->faces = 8192; 1406 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1124 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1407 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1125 RETVAL->texs = 8192;
1126 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1127 RETVAL->rows = 0; 1408 RETVAL->rows = 0;
1128 RETVAL->row = 0; 1409 RETVAL->row = 0;
1129 OUTPUT: 1410 OUTPUT:
1130 RETVAL 1411 RETVAL
1131 1412
1132void 1413void
1133DESTROY (CFClient::Map self) 1414DESTROY (CFPlus::Map self)
1134 CODE: 1415 CODE:
1135{ 1416{
1136 map_clear (self); 1417 map_clear (self);
1137 Safefree (self->face); 1418 Safefree (self->face2tile);
1138 Safefree (self->tex); 1419 Safefree (self->tex);
1139 Safefree (self); 1420 Safefree (self);
1140} 1421}
1141 1422
1142void 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
1143clear (CFClient::Map self) 1430clear (CFPlus::Map self)
1144 CODE: 1431 CODE:
1145 map_clear (self); 1432 map_clear (self);
1146 1433
1147void 1434void
1148set_face (CFClient::Map self, int face, int texid) 1435set_tileid (CFPlus::Map self, int face, int tile)
1149 CODE: 1436 CODE:
1150{ 1437{
1151 while (self->faces <= face) 1438 need_facenum (self, face); self->face2tile [face] = tile;
1152 { 1439 need_texid (self, tile);
1153 Append (mapface, self->face, self->faces, self->faces);
1154 self->faces *= 2;
1155 }
1156
1157 self->face [face] = texid;
1158} 1440}
1159 1441
1160void 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
1161set_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)
1162 CODE: 1467 CODE:
1163{ 1468{
1164 while (self->texs <= texid) 1469 need_texid (self, texid);
1165 {
1166 Append (maptex, self->tex, self->texs, self->texs);
1167 self->texs *= 2;
1168 }
1169 1470
1170 { 1471 {
1171 maptex *tex = self->tex + texid; 1472 maptex *tex = self->tex + texid;
1172 1473
1173 tex->name = name; 1474 tex->name = name;
1190 // from transparent color bleeding and ugly wrapping effects. 1491 // from transparent color bleeding and ugly wrapping effects.
1191 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1492 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1192} 1493}
1193 1494
1194int 1495int
1195ox (CFClient::Map self) 1496ox (CFPlus::Map self)
1196 ALIAS: 1497 ALIAS:
1197 oy = 1 1498 oy = 1
1198 x = 2 1499 x = 2
1199 y = 3 1500 y = 3
1200 w = 4 1501 w = 4
1211 } 1512 }
1212 OUTPUT: 1513 OUTPUT:
1213 RETVAL 1514 RETVAL
1214 1515
1215void 1516void
1216scroll (CFClient::Map self, int dx, int dy) 1517scroll (CFPlus::Map self, int dx, int dy)
1217 CODE: 1518 CODE:
1218{ 1519{
1219 if (dx > 0) 1520 if (dx > 0)
1220 map_blank (self, self->x, self->y, dx - 1, self->h); 1521 map_blank (self, self->x, self->y, dx, self->h);
1221 else if (dx < 0) 1522 else if (dx < 0)
1222 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);
1223 1524
1224 if (dy > 0) 1525 if (dy > 0)
1225 map_blank (self, self->x, self->y, self->w, dy - 1); 1526 map_blank (self, self->x, self->y, self->w, dy);
1226 else if (dy < 0) 1527 else if (dy < 0)
1227 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);
1228 1529
1229 self->ox += dx; self->x += dx; 1530 self->ox += dx; self->x += dx;
1230 self->oy += dy; self->y += dy; 1531 self->oy += dy; self->y += dy;
1231 1532
1232 while (self->y < 0) 1533 while (self->y < 0)
1237 self->y += MAP_EXTEND_Y; 1538 self->y += MAP_EXTEND_Y;
1238 } 1539 }
1239} 1540}
1240 1541
1241void 1542void
1242map1a_update (CFClient::Map self, SV *data_) 1543map1a_update (CFPlus::Map self, SV *data_, int extmap)
1243 CODE: 1544 CODE:
1244{ 1545{
1245 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1546 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1246 uint8_t *data_end = (uint8_t *)SvEND (data_); 1547 uint8_t *data_end = (uint8_t *)SvEND (data_);
1247 mapcell *cell; 1548 mapcell *cell;
1248 int x, y, flags; 1549 int x, y, flags;
1249 1550
1250 while (data < data_end) 1551 while (data < data_end - 1)
1251 { 1552 {
1252 flags = (data [0] << 8) + data [1]; data += 2; 1553 flags = (data [0] << 8) + data [1]; data += 2;
1253 1554
1254 x = self->x + ((flags >> 10) & 63); 1555 x = self->x + ((flags >> 10) & 63);
1255 y = self->y + ((flags >> 4) & 63); 1556 y = self->y + ((flags >> 4) & 63);
1256 1557
1257 cell = map_get_cell (self, x, y); 1558 cell = map_get_cell (self, x, y);
1258 1559
1259 if (flags & 15) 1560 if (flags & 15)
1260 { 1561 {
1261 if (cell->darkness < 0) 1562 if (!cell->darkness)
1262 { 1563 {
1564 memset (cell, 0, sizeof (*cell));
1263 cell->darkness = 0; 1565 cell->darkness = 256;
1264 cell->face [0] = 0;
1265 cell->face [1] = 0;
1266 cell->face [2] = 0;
1267 } 1566 }
1268 1567
1269 cell->darkness = flags & 8 ? *data++ : 255;
1270
1271 //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 }
1272 1609
1273 if (flags & 4) 1610 if (flags & 4)
1274 { 1611 {
1275 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];
1276 } 1615 }
1277 1616
1278 if (flags & 2) 1617 if (flags & 2)
1279 { 1618 {
1280 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];
1281 } 1622 }
1282 1623
1283 if (flags & 1) 1624 if (flags & 1)
1284 { 1625 {
1285 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];
1286 } 1629 }
1287 } 1630 }
1288 else 1631 else
1289 cell->darkness = -1; 1632 cell->darkness = 0;
1290 } 1633 }
1291} 1634}
1292 1635
1293SV * 1636SV *
1294mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1637mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1295 CODE: 1638 CODE:
1296{ 1639{
1297 int x1, x; 1640 int x1, x;
1298 int y1, y; 1641 int y1, y;
1299 int z; 1642 int z;
1320 { 1663 {
1321 mapcell *cell = row->col + (x - row->c0); 1664 mapcell *cell = row->col + (x - row->c0);
1322 1665
1323 for (z = 0; z <= 0; z++) 1666 for (z = 0; z <= 0; z++)
1324 { 1667 {
1325 mapface face = cell->face [z];
1326
1327 if (face)
1328 {
1329 maptex tex = self->tex [face]; 1668 maptex tex = self->tex [cell->tile [z]];
1330 int a0 = 255 - tex.a; 1669 int a0 = 255 - tex.a;
1331 int a1 = tex.a; 1670 int a1 = tex.a;
1332 1671
1333 r = (r * a0 + tex.r * a1) / 255; 1672 r = (r * a0 + tex.r * a1) / 255;
1334 g = (g * a0 + tex.g * a1) / 255; 1673 g = (g * a0 + tex.g * a1) / 255;
1335 b = (b * a0 + tex.b * a1) / 255; 1674 b = (b * a0 + tex.b * a1) / 255;
1336 a = (a * a0 + tex.a * a1) / 255; 1675 a = (a * a0 + tex.a * a1) / 255;
1337 }
1338 } 1676 }
1339 } 1677 }
1340 1678
1341 *map++ = (r ) 1679 *map++ = (r )
1342 | (g << 8) 1680 | (g << 8)
1349} 1687}
1350 OUTPUT: 1688 OUTPUT:
1351 RETVAL 1689 RETVAL
1352 1690
1353void 1691void
1354draw (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)
1355 CODE: 1693 CODE:
1356{ 1694{
1357 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;
1358 int x, y, z; 1699 int x, y, z;
1359 int last_name; 1700 int last_name;
1360 mapface face;
1361 1701
1362 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1702 // thats current max. sorry.
1363 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1703 if (sw > 255) sw = 255;
1704 if (sh > 255) sh = 255;
1364 1705
1365 /* 1706 // clear key, in case of extra padding
1366 int vx = self->vx = self->w >= sw 1707 memset (&skey, 0, sizeof (skey));
1367 ? self->x + (self->w - sw) / 2
1368 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1369
1370 int vy = self->vy = self->h >= sh
1371 ? self->y + (self->h - sh) / 2
1372 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1373 */
1374 1708
1375 glColor4ub (255, 255, 255, 255); 1709 glColor4ub (255, 255, 255, 255);
1376 1710
1377 glEnable (GL_BLEND); 1711 glEnable (GL_BLEND);
1378 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1712 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1381 1715
1382 glBegin (GL_QUADS); 1716 glBegin (GL_QUADS);
1383 1717
1384 last_name = 0; 1718 last_name = 0;
1385 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
1386 for (z = 0; z < 3; z++) 1745 for (z = 0; z <= 2; z++)
1746 {
1747 memset (smooth_level, 0, sizeof (smooth_level));
1748
1387 for (y = 0; y < sh; y++) 1749 for (y = 0; y < sh; y++)
1388 if (0 <= y + vy && y + vy < self->rows) 1750 if (0 <= y + my && y + my < self->rows)
1389 { 1751 {
1390 maprow *row = self->row + (y + vy); 1752 maprow *row = self->row + (y + my);
1391 1753
1392 for (x = 0; x < sw; x++) 1754 for (x = 0; x < sw; x++)
1393 if (row->c0 <= x + vx && x + vx < row->c1) 1755 if (row->c0 <= x + mx && x + mx < row->c1)
1394 { 1756 {
1395 mapcell *cell = row->col + (x + vx - row->c0); 1757 mapcell *cell = row->col + (x + mx - row->c0);
1396
1397 face = cell->face [z]; 1758 tileid tile = cell->tile [z];
1398 1759
1399 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))
1400 { 1855 {
1401 maptex tex = self->tex [face]; 1856 int level = (w << 5) | b;
1857 HE *he;
1402 1858
1403 int px = (x + 1) * 32 - tex.w; 1859 hv_iterinit (smooth);
1404 int py = (y + 1) * 32 - tex.h; 1860 while ((he = hv_iternext (smooth)))
1405
1406 if (last_name != tex.name)
1407 { 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
1408 glEnd (); 1884 glEnd ();
1409 last_name = tex.name;
1410 glBindTexture (GL_TEXTURE_2D, last_name); 1885 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1411 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 }
1412 } 1909 }
1413
1414 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1415 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1416 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1417 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1418 } 1910 }
1419 }
1420 } 1911 }
1912 }
1913
1914 hv_clear (smooth);
1915 }
1421 1916
1422 glEnd (); 1917 glEnd ();
1423 1918
1424 glDisable (GL_TEXTURE_2D); 1919 glDisable (GL_TEXTURE_2D);
1425 glDisable (GL_BLEND); 1920 glDisable (GL_BLEND);
1426}
1427 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
1428void 1954void
1429draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1955draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430 CODE: 1956 CODE:
1431{ 1957{
1432 static float color[16][3] = { 1958 static float color[16][3] = {
1433 { 0.00F, 0.00F, 0.00F }, 1959 { 0.00F, 0.00F, 0.00F },
1434 { 1.00F, 1.00F, 1.00F }, 1960 { 1.00F, 1.00F, 1.00F },
1484 glDisable (GL_BLEND); 2010 glDisable (GL_BLEND);
1485 glDisable (GL_TEXTURE_2D); 2011 glDisable (GL_TEXTURE_2D);
1486} 2012}
1487 2013
1488void 2014void
1489fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2015fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1490 PPCODE: 2016 PPCODE:
1491{ 2017{
1492 int vx, vy;
1493 int x, y; 2018 int x, y;
2019 int sw1 = sw + 2;
2020 int sh1 = sh + 2;
2021 int sh3 = sh * 3;
1494 int sw4 = (sw + 3) & ~3; 2022 int sw34 = (sw * 3 + 3) & ~3;
2023 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1495 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2024 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1496 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2025 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1497 2026
1498 memset (darkness, 255, sw4 * sh);
1499 SvPOK_only (darkness_sv); 2027 SvPOK_only (darkness3_sv);
1500 SvCUR_set (darkness_sv, sw4 * sh); 2028 SvCUR_set (darkness3_sv, sw34 * sh3);
1501 2029
1502 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2030 mx += self->x - 1;
1503 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2031 my += self->y - 1;
1504 2032
2033 memset (darkness1, 255, sw1 * sh1);
2034
1505 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh1; y++)
1506 if (0 <= y + vy && y + vy < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1507 { 2037 {
1508 maprow *row = self->row + (y + vy); 2038 maprow *row = self->row + (y + my);
1509 2039
1510 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw1; x++)
1511 if (row->c0 <= x + vx && x + vx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
1512 { 2042 {
1513 mapcell *cell = row->col + (x + vx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
1514 2044
1515 darkness[y * sw4 + x] = cell->darkness < 0 2045 darkness1 [y * sw1 + x] = cell->darkness
2046 ? 255 - (cell->darkness - 1)
1516 ? 255 - FOW_DARKNESS 2047 : 255 - FOW_DARKNESS;
1517 : 255 - cell->darkness;
1518 } 2048 }
1519 } 2049 }
1520 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
1521 EXTEND (SP, 3); 2089 EXTEND (SP, 3);
1522 PUSHs (sv_2mortal (newSViv (sw4))); 2090 PUSHs (sv_2mortal (newSViv (sw34)));
1523 PUSHs (sv_2mortal (newSViv (sh))); 2091 PUSHs (sv_2mortal (newSViv (sh3)));
1524 PUSHs (darkness_sv); 2092 PUSHs (darkness3_sv);
1525} 2093}
1526 2094
1527SV * 2095SV *
1528get_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)
1529 CODE: 2097 CODE:
1530{ 2098{
1531 int x, y, x1, y1; 2099 int x, y, x1, y1;
1532 SV *data_sv = newSV (w * h * 7 + 5); 2100 SV *data_sv = newSV (w * h * 7 + 5);
1533 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2101 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1558 if (row && row->c0 <= x && x < row->c1) 2126 if (row && row->c0 <= x && x < row->c1)
1559 { 2127 {
1560 mapcell *cell = row->col + (x - row->c0); 2128 mapcell *cell = row->col + (x - row->c0);
1561 uint8_t flags = 0; 2129 uint8_t flags = 0;
1562 2130
1563 if (cell->face [0]) flags |= 1; 2131 if (cell->tile [0]) flags |= 1;
1564 if (cell->face [1]) flags |= 2; 2132 if (cell->tile [1]) flags |= 2;
1565 if (cell->face [2]) flags |= 4; 2133 if (cell->tile [2]) flags |= 4;
1566 2134
1567 *data++ = flags; 2135 *data++ = flags;
1568 2136
1569 if (flags & 1) 2137 if (flags & 1)
1570 { 2138 {
2139 tileid tile = cell->tile [0];
1571 *data++ = cell->face [0] >> 8; 2140 *data++ = tile >> 8;
1572 *data++ = cell->face [0]; 2141 *data++ = tile;
1573 } 2142 }
1574 2143
1575 if (flags & 2) 2144 if (flags & 2)
1576 { 2145 {
2146 tileid tile = cell->tile [1];
1577 *data++ = cell->face [1] >> 8; 2147 *data++ = tile >> 8;
1578 *data++ = cell->face [1]; 2148 *data++ = tile;
1579 } 2149 }
1580 2150
1581 if (flags & 4) 2151 if (flags & 4)
1582 { 2152 {
2153 tileid tile = cell->tile [2];
1583 *data++ = cell->face [2] >> 8; 2154 *data++ = tile >> 8;
1584 *data++ = cell->face [2]; 2155 *data++ = tile;
1585 } 2156 }
1586 } 2157 }
1587 else 2158 else
1588 *data++ = 0; 2159 *data++ = 0;
1589 } 2160 }
1595} 2166}
1596 OUTPUT: 2167 OUTPUT:
1597 RETVAL 2168 RETVAL
1598 2169
1599void 2170void
1600set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2171set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1601 PPCODE: 2172 PPCODE:
1602{ 2173{
1603 int x, y, z; 2174 int x, y, z;
1604 int w, h; 2175 int w, h;
1605 int x1, y1; 2176 int x1, y1;
1629 { 2200 {
1630 uint8_t flags = *data++; 2201 uint8_t flags = *data++;
1631 2202
1632 if (flags) 2203 if (flags)
1633 { 2204 {
1634 mapface face[3] = { 0, 0, 0 };
1635
1636 mapcell *cell = row_get_cell (row, x); 2205 mapcell *cell = row_get_cell (row, x);
2206 tileid tile[3] = { 0, 0, 0 };
1637 2207
1638 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2208 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1639 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2209 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1640 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2210 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1641 2211
1642 if (cell->darkness <= 0) 2212 if (cell->darkness == 0)
1643 { 2213 {
1644 cell->darkness = -1; 2214 cell->darkness = 0;
1645 2215
1646 for (z = 0; z <= 2; z++) 2216 for (z = 0; z <= 2; z++)
1647 { 2217 {
1648 cell->face[z] = face[z]; 2218 tileid t = tile [z];
1649 2219
1650 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2220 if (t >= self->texs || (t && !self->tex [t].name))
2221 {
1651 XPUSHs (sv_2mortal (newSViv (face[z]))); 2222 XPUSHs (sv_2mortal (newSViv (t)));
2223 need_texid (self, t);
2224 }
2225
2226 cell->tile [z] = t;
1652 } 2227 }
1653 } 2228 }
1654 } 2229 }
1655 } 2230 }
1656 } 2231 }
1657} 2232}
1658 2233
1659MODULE = CFClient PACKAGE = CFClient::MixChunk 2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1660 2235
2236PROTOTYPES: DISABLE
2237
1661CFClient::MixChunk 2238CFPlus::MixChunk
1662new_from_file (SV *class, char *path) 2239new_from_file (SV *class, char *path)
1663 CODE: 2240 CODE:
1664 RETVAL = Mix_LoadWAV (path); 2241 RETVAL = Mix_LoadWAV (path);
1665 OUTPUT: 2242 OUTPUT:
1666 RETVAL 2243 RETVAL
1667 2244
1668void 2245void
1669DESTROY (CFClient::MixChunk self) 2246DESTROY (CFPlus::MixChunk self)
1670 CODE: 2247 CODE:
1671 Mix_FreeChunk (self); 2248 Mix_FreeChunk (self);
1672 2249
1673int 2250int
1674volume (CFClient::MixChunk self, int volume = -1) 2251volume (CFPlus::MixChunk self, int volume = -1)
1675 CODE: 2252 CODE:
1676 RETVAL = Mix_VolumeChunk (self, volume); 2253 RETVAL = Mix_VolumeChunk (self, volume);
1677 OUTPUT: 2254 OUTPUT:
1678 RETVAL 2255 RETVAL
1679 2256
1680int 2257int
1681play (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)
1682 CODE: 2259 CODE:
1683 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2260 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1684 OUTPUT: 2261 OUTPUT:
1685 RETVAL 2262 RETVAL
1686 2263
1687MODULE = CFClient PACKAGE = CFClient::MixMusic 2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1688 2265
1689int 2266int
1690volume (int volume = -1) 2267volume (int volume = -1)
2268 PROTOTYPE: ;$
1691 CODE: 2269 CODE:
1692 RETVAL = Mix_VolumeMusic (volume); 2270 RETVAL = Mix_VolumeMusic (volume);
1693 OUTPUT: 2271 OUTPUT:
1694 RETVAL 2272 RETVAL
1695 2273
2274int
2275fade_out (int ms)
2276 CODE:
2277 RETVAL = Mix_FadeOutMusic (ms);
2278 OUTPUT:
2279 RETVAL
2280
1696CFClient::MixMusic 2281CFPlus::MixMusic
1697new_from_file (SV *class, char *path) 2282new_from_file (SV *class, char *path)
1698 CODE: 2283 CODE:
1699 RETVAL = Mix_LoadMUS (path); 2284 RETVAL = Mix_LoadMUS (path);
1700 OUTPUT: 2285 OUTPUT:
1701 RETVAL 2286 RETVAL
1702 2287
1703void 2288void
1704DESTROY (CFClient::MixMusic self) 2289DESTROY (CFPlus::MixMusic self)
1705 CODE: 2290 CODE:
1706 Mix_FreeMusic (self); 2291 Mix_FreeMusic (self);
1707 2292
1708int 2293int
1709play (CFClient::MixMusic self, int loops = -1) 2294play (CFPlus::MixMusic self, int loops = -1)
1710 CODE: 2295 CODE:
1711 RETVAL = Mix_PlayMusic (self, loops); 2296 RETVAL = Mix_PlayMusic (self, loops);
1712 OUTPUT: 2297 OUTPUT:
1713 RETVAL 2298 RETVAL
1714 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
1715MODULE = CFClient PACKAGE = CFClient::OpenGL 2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308
2309PROTOTYPES: ENABLE
1716 2310
1717BOOT: 2311BOOT:
1718{ 2312{
1719 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1720 static const struct { 2314 static const struct {
1721 const char *name; 2315 const char *name;
1722 IV iv; 2316 IV iv;
1723 } *civ, const_iv[] = { 2317 } *civ, const_iv[] = {
1724# 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),
1725 const_iv (GL_COLOR_MATERIAL), 2322 const_iv (GL_COLOR_MATERIAL),
1726 const_iv (GL_SMOOTH), 2323 const_iv (GL_SMOOTH),
1727 const_iv (GL_FLAT), 2324 const_iv (GL_FLAT),
1728 const_iv (GL_DITHER), 2325 const_iv (GL_DITHER),
1729 const_iv (GL_BLEND), 2326 const_iv (GL_BLEND),
1733 const_iv (GL_ALPHA_TEST), 2330 const_iv (GL_ALPHA_TEST),
1734 const_iv (GL_NORMALIZE), 2331 const_iv (GL_NORMALIZE),
1735 const_iv (GL_RESCALE_NORMAL), 2332 const_iv (GL_RESCALE_NORMAL),
1736 const_iv (GL_FRONT), 2333 const_iv (GL_FRONT),
1737 const_iv (GL_BACK), 2334 const_iv (GL_BACK),
2335 const_iv (GL_AUX0),
1738 const_iv (GL_AND), 2336 const_iv (GL_AND),
1739 const_iv (GL_ONE), 2337 const_iv (GL_ONE),
1740 const_iv (GL_ZERO), 2338 const_iv (GL_ZERO),
1741 const_iv (GL_SRC_ALPHA), 2339 const_iv (GL_SRC_ALPHA),
1742 const_iv (GL_DST_ALPHA), 2340 const_iv (GL_DST_ALPHA),
1756 const_iv (GL_LUMINANCE), 2354 const_iv (GL_LUMINANCE),
1757 const_iv (GL_LUMINANCE_ALPHA), 2355 const_iv (GL_LUMINANCE_ALPHA),
1758 const_iv (GL_FLOAT), 2356 const_iv (GL_FLOAT),
1759 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2357 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1760 const_iv (GL_COMPILE), 2358 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D),
1761 const_iv (GL_TEXTURE_1D), 2361 const_iv (GL_TEXTURE_1D),
1762 const_iv (GL_TEXTURE_2D), 2362 const_iv (GL_TEXTURE_2D),
1763 const_iv (GL_TEXTURE_ENV), 2363 const_iv (GL_TEXTURE_ENV),
1764 const_iv (GL_TEXTURE_MAG_FILTER), 2364 const_iv (GL_TEXTURE_MAG_FILTER),
1765 const_iv (GL_TEXTURE_MIN_FILTER), 2365 const_iv (GL_TEXTURE_MIN_FILTER),
1786 const_iv (GL_COLOR_LOGIC_OP), 2386 const_iv (GL_COLOR_LOGIC_OP),
1787 const_iv (GL_SEPARABLE_2D), 2387 const_iv (GL_SEPARABLE_2D),
1788 const_iv (GL_CONVOLUTION_2D), 2388 const_iv (GL_CONVOLUTION_2D),
1789 const_iv (GL_CONVOLUTION_BORDER_MODE), 2389 const_iv (GL_CONVOLUTION_BORDER_MODE),
1790 const_iv (GL_CONSTANT_BORDER), 2390 const_iv (GL_CONSTANT_BORDER),
2391 const_iv (GL_POINTS),
1791 const_iv (GL_LINES), 2392 const_iv (GL_LINES),
2393 const_iv (GL_LINE_STRIP),
1792 const_iv (GL_LINE_LOOP), 2394 const_iv (GL_LINE_LOOP),
1793 const_iv (GL_QUADS), 2395 const_iv (GL_QUADS),
1794 const_iv (GL_QUAD_STRIP), 2396 const_iv (GL_QUAD_STRIP),
1795 const_iv (GL_TRIANGLES), 2397 const_iv (GL_TRIANGLES),
1796 const_iv (GL_TRIANGLE_STRIP), 2398 const_iv (GL_TRIANGLE_STRIP),
1797 const_iv (GL_TRIANGLE_FAN), 2399 const_iv (GL_TRIANGLE_FAN),
2400 const_iv (GL_POLYGON),
1798 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2402 const_iv (GL_POINT_SMOOTH_HINT),
2403 const_iv (GL_LINE_SMOOTH_HINT),
2404 const_iv (GL_POLYGON_SMOOTH_HINT),
2405 const_iv (GL_GENERATE_MIPMAP_HINT),
1799 const_iv (GL_FASTEST), 2406 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST),
1800 const_iv (GL_V2F), 2409 const_iv (GL_V2F),
1801 const_iv (GL_V3F), 2410 const_iv (GL_V3F),
1802 const_iv (GL_T2F_V3F), 2411 const_iv (GL_T2F_V3F),
1803 const_iv (GL_T2F_N3F_V3F), 2412 const_iv (GL_T2F_N3F_V3F),
1804# undef const_iv 2413# undef const_iv
1805 }; 2414 };
1806 2415
1807 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1808 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2418
2419 texture_av = newAV ();
2420 AvREAL_off (texture_av);
1809} 2421}
1810 2422
1811char * 2423char *
1812gl_vendor () 2424gl_vendor ()
1813 CODE: 2425 CODE:
1827 CODE: 2439 CODE:
1828 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2440 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1829 OUTPUT: 2441 OUTPUT:
1830 RETVAL 2442 RETVAL
1831 2443
2444const char *glGetString (GLenum pname)
2445
2446GLint glGetInteger (GLenum pname)
2447 CODE:
2448 glGetIntegerv (pname, &RETVAL);
2449 OUTPUT:
2450 RETVAL
2451
2452GLdouble glGetDouble (GLenum pname)
2453 CODE:
2454 glGetDoublev (pname, &RETVAL);
2455 OUTPUT:
2456 RETVAL
2457
1832int glGetError () 2458int glGetError ()
1833 2459
1834void glFinish () 2460void glFinish ()
1835 2461
1836void glClear (int mask) 2462void glClear (int mask)
1873# near_ and far_ are due to microsofts buggy "c" compiler 2499# near_ and far_ are due to microsofts buggy "c" compiler
1874void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2500void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1875 2501
1876# near_ and far_ are due to microsofts buggy "c" compiler 2502# near_ and far_ are due to microsofts buggy "c" compiler
1877void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2503void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2504
2505PROTOTYPES: DISABLE
1878 2506
1879void glViewport (int x, int y, int width, int height) 2507void glViewport (int x, int y, int width, int height)
1880 2508
1881void glScissor (int x, int y, int width, int height) 2509void glScissor (int x, int y, int width, int height)
1882 2510
1890 2518
1891void glRotate (float angle, float x, float y, float z) 2519void glRotate (float angle, float x, float y, float z)
1892 CODE: 2520 CODE:
1893 glRotatef (angle, x, y, z); 2521 glRotatef (angle, x, y, z);
1894 2522
1895void glBegin (int mode)
1896
1897void glEnd ()
1898
1899void glColor (float r, float g, float b, float a = 1.0) 2523void glColor (float r, float g, float b, float a = 1.0)
1900 PROTOTYPE: @
1901 ALIAS: 2524 ALIAS:
1902 glColor_premultiply = 1 2525 glColor_premultiply = 1
1903 CODE: 2526 CODE:
1904 if (ix) 2527 if (ix)
1905 { 2528 {
1906 r *= a; 2529 r *= a;
1907 g *= a; 2530 g *= a;
1908 b *= a; 2531 b *= a;
1909 } 2532 }
1910 // microsoft visual "c" rounds instead of truncating... 2533 // microsoft visual "c" rounds instead of truncating...
1911 glColor4ub (MIN ((int)(r * 256.f), 255), 2534 glColor4f (r, g, b, a);
1912 MIN ((int)(g * 256.f), 255),
1913 MIN ((int)(b * 256.f), 255),
1914 MIN ((int)(a * 256.f), 255));
1915
1916void glInterleavedArrays (int format, int stride, char *data)
1917
1918void glDrawElements (int mode, int count, int type, char *indices)
1919
1920# 1.2 void glDrawRangeElements (int mode, int start, int end
1921 2535
1922void glRasterPos (float x, float y, float z = 0.) 2536void glRasterPos (float x, float y, float z = 0.)
1923 CODE: 2537 CODE:
1924 glRasterPos3f (0, 0, z); 2538 glRasterPos3f (0, 0, z);
1925 glBitmap (0, 0, 0, 0, x, y, 0); 2539 glBitmap (0, 0, 0, 0, x, y, 0);
1930 2544
1931void glTexCoord (float s, float t) 2545void glTexCoord (float s, float t)
1932 CODE: 2546 CODE:
1933 glTexCoord2f (s, t); 2547 glTexCoord2f (s, t);
1934 2548
2549PROTOTYPES: ENABLE
2550
2551void glBegin (int mode)
2552
2553void glEnd ()
2554
2555void glPointSize (GLfloat size)
2556
2557void glLineWidth (GLfloat width)
2558
2559void glInterleavedArrays (int format, int stride, char *data)
2560
2561void glDrawElements (int mode, int count, int type, char *indices)
2562
2563# 1.2 void glDrawRangeElements (int mode, int start, int end
2564
1935void glTexEnv (int target, int pname, float param) 2565void glTexEnv (int target, int pname, float param)
1936 CODE: 2566 CODE:
1937 glTexEnvf (target, pname, param); 2567 glTexEnvf (target, pname, param);
1938 2568
1939void glTexParameter (int target, int pname, float param) 2569void glTexParameter (int target, int pname, float param)
1961 2591
1962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2592void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1963 2593
1964void glDrawPixels (int width, int height, int format, int type, char *pixels) 2594void glDrawPixels (int width, int height, int format, int type, char *pixels)
1965 2595
2596void glPixelZoom (float x, float y)
2597
1966void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2598void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1967 2599
1968int glGenTexture () 2600int glGenTexture ()
1969 CODE: 2601 CODE:
1970{ 2602 RETVAL = gen_texture ();
1971 GLuint name;
1972 glGenTextures (1, &name);
1973 RETVAL = name;
1974}
1975 OUTPUT: 2603 OUTPUT:
1976 RETVAL 2604 RETVAL
1977 2605
1978void glDeleteTexture (int name) 2606void glDeleteTexture (int name)
1979 CODE: 2607 CODE:
1980{
1981 GLuint name_ = name;
1982 glDeleteTextures (1, &name_); 2608 del_texture (name);
1983} 2609
1984
1985int glGenList () 2610int glGenList ()
1986 CODE: 2611 CODE:
1987 RETVAL = glGenLists (1); 2612 RETVAL = glGenLists (1);
1988 OUTPUT: 2613 OUTPUT:
1989 RETVAL 2614 RETVAL
1996 2621
1997void glEndList () 2622void glEndList ()
1998 2623
1999void glCallList (int list) 2624void glCallList (int list)
2000 2625
2626MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2001 2627
2628PROTOTYPES: DISABLE
2629
2630void
2631find_widget (SV *widget, NV x, NV y)
2632 PPCODE:
2633{
2634 if (within_widget (widget, x, y))
2635 XPUSHs (widget);
2636}
2637

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines