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