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