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.205 by root, Thu Jul 19 22:38:52 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
355MODULE = CFClient PACKAGE = CFClient 438MODULE = CFPlus PACKAGE = CFPlus
356 439
357PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
358 441
359BOOT: 442BOOT:
360{ 443{
361 HV *stash = gv_stashpv ("CFClient", 1); 444 HV *stash = gv_stashpv ("CFPlus", 1);
362 static const struct { 445 static const struct {
363 const char *name; 446 const char *name;
364 IV iv; 447 IV iv;
365 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
366# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
367 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
368 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
369 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
370 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
371 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
380 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
381 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
382 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
383 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
384 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
385 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
386 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
387 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
388 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
389 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
444 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
445 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
446 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
447 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
448 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
449 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
450 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
451 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
452 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
453 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
454 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
455 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
456 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
457 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
458 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
459 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
460 const_iv (KMOD_MODE), 556 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 557# undef const_iv
466 }; 558 };
467 559
468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
470} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
572
573int
574in_destruct ()
575 CODE:
576 RETVAL = PL_main_cv == Nullcv;
577 OUTPUT:
578 RETVAL
471 579
472NV floor (NV x) 580NV floor (NV x)
473 581
474NV ceil (NV x) 582NV ceil (NV x)
475 583
480 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
481 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 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); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
483} 591}
484 592
593char *
594SDL_GetError ()
595
485int 596int
486SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
487 598
488void 599void
489SDL_Quit () 600SDL_Quit ()
490 601
491void 602void
492SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
493 PPCODE: 604 PPCODE:
494{ 605{
495 SDL_Rect **m; 606 SDL_Rect **m;
496 607
497 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
498 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
499 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
500 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
501 612
502 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
503 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
504 615
505 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
509 620
510 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
511 622#if SDL_VERSION_ATLEAST(1,2,10)
512 SDL_EnableUNICODE (1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
513 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
514 626
515 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
516 628
517 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
518 while (*m) 630 while (*m)
519 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
520 AV *av = newAV (); 634 AV *av = newAV ();
521 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
522 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
523 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
524 641
525 ++m; 642 ++m;
526 } 643 }
527} 644}
528 645
529char *
530SDL_GetError ()
531
532int 646int
533SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
534 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
535 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
536 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
537 ); 660 );
661
538 if (RETVAL) 662 if (RETVAL)
539 { 663 {
664 av_clear (texture_av);
665
540 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
541# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
542# include "glfunc.h" 668#include "glfunc.h"
543# undef GL_FUNC 669#undef GL_FUNC
544 } 670 }
671}
545 OUTPUT: 672 OUTPUT:
546 RETVAL 673 RETVAL
547 674
548void 675void
549SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
550 677
551char * 678char *
552SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
553 680
681int
682SDL_GetAppState ()
683
554void 684void
555SDL_PollEvent () 685poll_events ()
556 PPCODE: 686 PPCODE:
557{ 687{
558 SDL_Event ev; 688 SDL_Event ev;
559 689
560 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
561 { 692 {
562 HV *hv = newHV (); 693 HV *hv = newHV ();
563 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
564 695
565 switch (ev.type) 696 switch (ev.type)
567 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
568 case SDL_KEYUP: 699 case SDL_KEYUP:
569 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
570 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
571 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
572 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
573 break; 705 break;
574 706
575 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
576 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
577 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
578 break; 710 break;
579 711
580 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
581 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
582
583 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
584 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
585 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
586 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
587 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
588 break; 738 break;
589 739
590 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
591 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
592 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
603 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
604 break; 754 break;
605 } 755 }
606 756
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
608 } 758 }
609} 759}
610 760
611int 761int
612Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
621Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
622 772
623void 773void
624lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
625 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
626#ifndef _WIN32 782#ifdef _WIN32
627 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
628#endif 804#endif
805}
629 806
630void 807void
631add_font (char *file) 808add_font (char *file)
632 CODE: 809 CODE:
633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
634 811
635void 812void
636load_image_inline (SV *image_) 813load_image_inline (SV *image_)
637 ALIAS: 814 ALIAS:
638 load_image_file = 1 815 load_image_file = 1
680 857
681 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 858 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
682 859
683 assert (surface2->pitch == surface2->w * 4); 860 assert (surface2->pitch == surface2->w * 4);
684 861
862 SDL_LockSurface (surface2);
685 EXTEND (SP, 5); 863 EXTEND (SP, 6);
686 PUSHs (sv_2mortal (newSViv (surface2->w))); 864 PUSHs (sv_2mortal (newSViv (surface2->w)));
687 PUSHs (sv_2mortal (newSViv (surface2->h))); 865 PUSHs (sv_2mortal (newSViv (surface2->h)));
688 SDL_LockSurface (surface2);
689 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 866 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))); 867 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
692 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 868 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
693 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 869 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
870 SDL_UnlockSurface (surface2);
694 871
695 SDL_FreeSurface (surface); 872 SDL_FreeSurface (surface);
696 SDL_FreeSurface (surface2); 873 SDL_FreeSurface (surface2);
697} 874}
698 875
737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
738#endif 915#endif
739 _exit (1); 916 _exit (1);
740 917
741void 918void
742_exit (int retval) 919_exit (int retval = 0)
743 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
744 _exit (retval); 924 _exit (retval);
925#endif
745 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
746MODULE = CFClient PACKAGE = CFClient::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
747 937
748CFClient::Font 938PROTOTYPES: DISABLE
939
940CFPlus::Font
749new_from_file (SV *class, char *path, int id = 0) 941new_from_file (SV *class, char *path, int id = 0)
750 CODE: 942 CODE:
751{ 943{
752 int count; 944 int count;
753 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 945 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
756} 948}
757 OUTPUT: 949 OUTPUT:
758 RETVAL 950 RETVAL
759 951
760void 952void
761DESTROY (CFClient::Font self) 953DESTROY (CFPlus::Font self)
762 CODE: 954 CODE:
763 pango_font_description_free (self); 955 pango_font_description_free (self);
764 956
765void 957void
766make_default (CFClient::Font self) 958make_default (CFPlus::Font self)
959 PROTOTYPE: $
767 CODE: 960 CODE:
768 default_font = self; 961 default_font = self;
769 962
770MODULE = CFClient PACKAGE = CFClient::Layout 963MODULE = CFPlus PACKAGE = CFPlus::Layout
771 964
965PROTOTYPES: DISABLE
966
772void 967void
773clear_font_cache () 968reset_glyph_cache ()
969 PROTOTYPE:
774 CODE: 970 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear (); 971 tc_clear ();
777 972
778CFClient::Layout 973CFPlus::Layout
779new (SV *class, int type = 0) 974new (SV *class)
780 CODE: 975 CODE:
781 New (0, RETVAL, 1, struct cf_layout); 976 New (0, RETVAL, 1, struct cf_layout);
782 977
783 RETVAL->pl = pango_layout_new (opengl_context); 978 RETVAL->pl = pango_layout_new (opengl_context);
784 RETVAL->r = 1.; 979 RETVAL->r = 1.;
792 layout_update_font (RETVAL); 987 layout_update_font (RETVAL);
793 OUTPUT: 988 OUTPUT:
794 RETVAL 989 RETVAL
795 990
796void 991void
797DESTROY (CFClient::Layout self) 992DESTROY (CFPlus::Layout self)
798 CODE: 993 CODE:
799 g_object_unref (self->pl); 994 g_object_unref (self->pl);
800 Safefree (self); 995 Safefree (self);
801 996
802void 997void
803set_text (CFClient::Layout self, SV *text_) 998set_text (CFPlus::Layout self, SV *text_)
804 CODE: 999 CODE:
805{ 1000{
806 STRLEN textlen; 1001 STRLEN textlen;
807 char *text = SvPVutf8 (text_, textlen); 1002 char *text = SvPVutf8 (text_, textlen);
808 1003
809 pango_layout_set_text (self->pl, text, textlen); 1004 pango_layout_set_text (self->pl, text, textlen);
810} 1005}
811 1006
812void 1007void
813set_markup (CFClient::Layout self, SV *text_) 1008set_markup (CFPlus::Layout self, SV *text_)
814 CODE: 1009 CODE:
815{ 1010{
816 STRLEN textlen; 1011 STRLEN textlen;
817 char *text = SvPVutf8 (text_, textlen); 1012 char *text = SvPVutf8 (text_, textlen);
818 1013
819 pango_layout_set_markup (self->pl, text, textlen); 1014 pango_layout_set_markup (self->pl, text, textlen);
820} 1015}
821 1016
822void 1017void
823set_shapes (CFClient::Layout self, ...) 1018set_shapes (CFPlus::Layout self, ...)
824 CODE: 1019 CODE:
825{ 1020{
826 PangoAttrList *attrs = 0; 1021 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl); 1022 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text; 1023 const char *pos = text;
863 if (attrs) 1058 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs); 1059 pango_layout_set_attributes (self->pl, attrs);
865} 1060}
866 1061
867void 1062void
868get_shapes (CFClient::Layout self) 1063get_shapes (CFPlus::Layout self)
869 PPCODE: 1064 PPCODE:
870{ 1065{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1066 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872 1067
873 do 1068 do
877 if (run && shape_attr_p (run)) 1072 if (run && shape_attr_p (run))
878 { 1073 {
879 PangoRectangle extents; 1074 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents); 1075 pango_layout_iter_get_run_extents (iter, 0, &extents);
881 1076
1077 EXTEND (SP, 2);
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1078 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1079 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 } 1080 }
885 } 1081 }
886 while (pango_layout_iter_next_run (iter)); 1082 while (pango_layout_iter_next_run (iter));
887 1083
888 pango_layout_iter_free (iter); 1084 pango_layout_iter_free (iter);
889} 1085}
890 1086
891int 1087int
892has_wrapped (CFClient::Layout self) 1088has_wrapped (CFPlus::Layout self)
893 CODE: 1089 CODE:
894{ 1090{
895 int lines = 1; 1091 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl); 1092 const char *text = pango_layout_get_text (self->pl);
897 1093
902} 1098}
903 OUTPUT: 1099 OUTPUT:
904 RETVAL 1100 RETVAL
905 1101
906SV * 1102SV *
907get_text (CFClient::Layout self) 1103get_text (CFPlus::Layout self)
908 CODE: 1104 CODE:
909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1105 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
910 sv_utf8_decode (RETVAL); 1106 sv_utf8_decode (RETVAL);
911 OUTPUT: 1107 OUTPUT:
912 RETVAL 1108 RETVAL
913 1109
914void 1110void
915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1111set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
916 CODE: 1112 CODE:
917 self->r = r; 1113 self->r = r;
918 self->g = g; 1114 self->g = g;
919 self->b = b; 1115 self->b = b;
920 self->a = a; 1116 self->a = a;
921 1117
922void 1118void
923set_font (CFClient::Layout self, CFClient::Font font = 0) 1119set_font (CFPlus::Layout self, CFPlus::Font font = 0)
924 CODE: 1120 CODE:
925 if (self->font != font) 1121 if (self->font != font)
926 { 1122 {
927 self->font = font; 1123 self->font = font;
928 layout_update_font (self); 1124 layout_update_font (self);
929 } 1125 }
930 1126
931void 1127void
932set_height (CFClient::Layout self, int base_height) 1128set_height (CFPlus::Layout self, int base_height)
933 CODE: 1129 CODE:
934 if (self->base_height != base_height) 1130 if (self->base_height != base_height)
935 { 1131 {
936 self->base_height = base_height; 1132 self->base_height = base_height;
937 layout_update_font (self); 1133 layout_update_font (self);
938 } 1134 }
939 1135
940void 1136void
941set_width (CFClient::Layout self, int max_width = -1) 1137set_width (CFPlus::Layout self, int max_width = -1)
942 CODE: 1138 CODE:
943 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1139 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
944 1140
945void 1141void
946set_indent (CFClient::Layout self, int indent) 1142set_indent (CFPlus::Layout self, int indent)
947 CODE: 1143 CODE:
948 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1144 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
949 1145
950void 1146void
951set_spacing (CFClient::Layout self, int spacing) 1147set_spacing (CFPlus::Layout self, int spacing)
952 CODE: 1148 CODE:
953 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1149 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
954 1150
955void 1151void
956set_ellipsise (CFClient::Layout self, int ellipsise) 1152set_ellipsise (CFPlus::Layout self, int ellipsise)
957 CODE: 1153 CODE:
958 pango_layout_set_ellipsize (self->pl, 1154 pango_layout_set_ellipsize (self->pl,
959 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1155 ellipsise == 1 ? PANGO_ELLIPSIZE_START
960 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1156 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
961 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1157 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
962 : PANGO_ELLIPSIZE_NONE 1158 : PANGO_ELLIPSIZE_NONE
963 ); 1159 );
964 1160
965void 1161void
966set_single_paragraph_mode (CFClient::Layout self, int spm) 1162set_single_paragraph_mode (CFPlus::Layout self, int spm)
967 CODE: 1163 CODE:
968 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1164 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
969 1165
970void 1166void
971size (CFClient::Layout self) 1167size (CFPlus::Layout self)
972 PPCODE: 1168 PPCODE:
973{ 1169{
974 int w, h; 1170 int w, h;
975 1171
976 layout_get_pixel_size (self, &w, &h); 1172 layout_get_pixel_size (self, &w, &h);
979 PUSHs (sv_2mortal (newSViv (w))); 1175 PUSHs (sv_2mortal (newSViv (w)));
980 PUSHs (sv_2mortal (newSViv (h))); 1176 PUSHs (sv_2mortal (newSViv (h)));
981} 1177}
982 1178
983int 1179int
984descent (CFClient::Layout self) 1180descent (CFPlus::Layout self)
985 CODE: 1181 CODE:
986{ 1182{
987 PangoRectangle rect; 1183 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1184 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect); 1185 pango_layout_line_get_pixel_extents (line, 0, &rect);
991} 1187}
992 OUTPUT: 1188 OUTPUT:
993 RETVAL 1189 RETVAL
994 1190
995int 1191int
996xy_to_index (CFClient::Layout self, int x, int y) 1192xy_to_index (CFPlus::Layout self, int x, int y)
997 CODE: 1193 CODE:
998{ 1194{
999 int index, trailing; 1195 int index, trailing;
1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1196 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1001 RETVAL = index; 1197 RETVAL = index + trailing;
1002} 1198}
1003 OUTPUT: 1199 OUTPUT:
1004 RETVAL 1200 RETVAL
1005 1201
1006void 1202void
1007cursor_pos (CFClient::Layout self, int index) 1203cursor_pos (CFPlus::Layout self, int index)
1008 PPCODE: 1204 PPCODE:
1009{ 1205{
1010 PangoRectangle strong_pos; 1206 PangoRectangle strong_pos;
1011 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1207 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1012 1208
1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1211 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1212 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1017} 1213}
1018 1214
1019void 1215void
1216index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1217 PPCODE:
1218{
1219 int line, x;
1220
1221 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1222 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1223
1224 EXTEND (SP, 2);
1225 PUSHs (sv_2mortal (newSViv (line - 1)));
1226 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1227}
1228
1229void
1230line_x_to_index (CFPlus::Layout self, int line, int x)
1231 PPCODE:
1232{
1233 PangoLayoutLine *lp;
1234 int index, trailing;
1235
1236 if (line < 0)
1237 XSRETURN_EMPTY;
1238
1239 if (!(lp = pango_layout_get_line (self->pl, line)))
1240 XSRETURN_EMPTY; /* do better */
1241
1242 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1243
1244 EXTEND (SP, 2);
1245 if (GIMME_V == G_SCALAR)
1246 PUSHs (sv_2mortal (newSViv (index + trailing)));
1247 else
1248 {
1249 PUSHs (sv_2mortal (newSViv (index)));
1250 PUSHs (sv_2mortal (newSViv (trailing)));
1251 }
1252}
1253
1254void
1020render (CFClient::Layout self, float x, float y) 1255render (CFPlus::Layout self, float x, float y, int flags = 0)
1021 PPCODE: 1256 PPCODE:
1022 pango_opengl_render_layout_subpixel ( 1257 pango_opengl_render_layout_subpixel (
1023 self->pl, 1258 self->pl,
1024 x * PANGO_SCALE, y * PANGO_SCALE, 1259 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a 1260 self->r, self->g, self->b, self->a,
1261 flags
1026 ); 1262 );
1027 1263
1028MODULE = CFClient PACKAGE = CFClient::Texture 1264MODULE = CFPlus PACKAGE = CFPlus::Texture
1029 1265
1030void 1266PROTOTYPES: ENABLE
1031pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE:
1033{
1034 int ow = SvIV (w_);
1035 int oh = SvIV (h_);
1036 1267
1037 if (ow && oh) 1268int minpot (int n)
1269
1270void
1271pad (SV *data_, int ow, int oh, int nw, int nh)
1272 CODE:
1273{
1274 if ((nw != ow || nh != oh) && SvOK (data_))
1038 { 1275 {
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; 1276 STRLEN datalen;
1047 char *data = SvPVbyte (data_, datalen); 1277 char *data = SvPVbyte (data_, datalen);
1048 int bpp = datalen / (ow * oh); 1278 int bpp = datalen / (ow * oh);
1049 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1279 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1050 1280
1051 SvPOK_only (result_); 1281 SvPOK_only (result_);
1052 SvCUR_set (result_, nw * nh * bpp); 1282 SvCUR_set (result_, nw * nh * bpp);
1053 1283
1054 memset (SvPVX (result_), 0, nw * nh * bpp); 1284 memset (SvPVX (result_), 0, nw * nh * bpp);
1055 while (oh--) 1285 while (oh--)
1056 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1286 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1057 1287
1058 sv_setsv (data_, result_); 1288 sv_setsv (data_, result_);
1059 }
1060
1061 sv_setiv (w_, nw);
1062 sv_setiv (h_, nh);
1063 }
1064 } 1289 }
1065} 1290}
1066 1291
1067void 1292void
1068draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1293draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1111 glDisable (GL_ALPHA_TEST); 1336 glDisable (GL_ALPHA_TEST);
1112 glDisable (GL_BLEND); 1337 glDisable (GL_BLEND);
1113 } 1338 }
1114} 1339}
1115 1340
1341IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1342 CODE:
1343{
1344 GLint width;
1345 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1346 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1347 RETVAL = width > 0;
1348}
1349 OUTPUT:
1350 RETVAL
1351
1116MODULE = CFClient PACKAGE = CFClient::Map 1352MODULE = CFPlus PACKAGE = CFPlus::Map
1117 1353
1118CFClient::Map 1354PROTOTYPES: DISABLE
1119new (SV *class, int map_width, int map_height) 1355
1356CFPlus::Map
1357new (SV *class)
1120 CODE: 1358 CODE:
1121 New (0, RETVAL, 1, struct map); 1359 New (0, RETVAL, 1, struct map);
1122 RETVAL->x = 0; 1360 RETVAL->x = 0;
1123 RETVAL->y = 0; 1361 RETVAL->y = 0;
1124 RETVAL->w = map_width; 1362 RETVAL->w = 0;
1125 RETVAL->h = map_height; 1363 RETVAL->h = 0;
1126 RETVAL->ox = 0; 1364 RETVAL->ox = 0;
1127 RETVAL->oy = 0; 1365 RETVAL->oy = 0;
1128 RETVAL->faces = 8192; 1366 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1129 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1367 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; 1368 RETVAL->rows = 0;
1133 RETVAL->row = 0; 1369 RETVAL->row = 0;
1134 OUTPUT: 1370 OUTPUT:
1135 RETVAL 1371 RETVAL
1136 1372
1137void 1373void
1138DESTROY (CFClient::Map self) 1374DESTROY (CFPlus::Map self)
1139 CODE: 1375 CODE:
1140{ 1376{
1141 map_clear (self); 1377 map_clear (self);
1142 Safefree (self->face); 1378 Safefree (self->face2tile);
1143 Safefree (self->tex); 1379 Safefree (self->tex);
1144 Safefree (self); 1380 Safefree (self);
1145} 1381}
1146 1382
1147void 1383void
1384resize (CFPlus::Map self, int map_width, int map_height)
1385 CODE:
1386 self->w = map_width;
1387 self->h = map_height;
1388
1389void
1148clear (CFClient::Map self) 1390clear (CFPlus::Map self)
1149 CODE: 1391 CODE:
1150 map_clear (self); 1392 map_clear (self);
1151 1393
1152void 1394void
1153set_face (CFClient::Map self, int face, int texid) 1395set_tileid (CFPlus::Map self, int face, int tile)
1154 CODE: 1396 CODE:
1155{ 1397{
1156 while (self->faces <= face) 1398 need_facenum (self, face); self->face2tile [face] = tile;
1157 { 1399 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} 1400}
1164 1401
1165void 1402void
1403set_smooth (CFPlus::Map self, int face, int smooth, int level)
1404 CODE:
1405{
1406 tileid texid;
1407 maptex *tex;
1408
1409 if (face < 0 || face >= self->faces)
1410 return;
1411
1412 if (smooth < 0 || smooth >= self->faces)
1413 return;
1414
1415 texid = self->face2tile [face];
1416
1417 if (!texid)
1418 return;
1419
1420 tex = self->tex + texid;
1421 tex->smoothtile = self->face2tile [smooth];
1422 tex->smoothlevel = level;
1423}
1424
1425void
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) 1426set_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: 1427 CODE:
1168{ 1428{
1169 while (self->texs <= texid) 1429 need_texid (self, texid);
1170 {
1171 Append (maptex, self->tex, self->texs, self->texs);
1172 self->texs *= 2;
1173 }
1174 1430
1175 { 1431 {
1176 maptex *tex = self->tex + texid; 1432 maptex *tex = self->tex + texid;
1177 1433
1178 tex->name = name; 1434 tex->name = name;
1195 // from transparent color bleeding and ugly wrapping effects. 1451 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1452 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1197} 1453}
1198 1454
1199int 1455int
1200ox (CFClient::Map self) 1456ox (CFPlus::Map self)
1201 ALIAS: 1457 ALIAS:
1202 oy = 1 1458 oy = 1
1203 x = 2 1459 x = 2
1204 y = 3 1460 y = 3
1205 w = 4 1461 w = 4
1216 } 1472 }
1217 OUTPUT: 1473 OUTPUT:
1218 RETVAL 1474 RETVAL
1219 1475
1220void 1476void
1221scroll (CFClient::Map self, int dx, int dy) 1477scroll (CFPlus::Map self, int dx, int dy)
1222 CODE: 1478 CODE:
1223{ 1479{
1224 if (dx > 0) 1480 if (dx > 0)
1225 map_blank (self, self->x, self->y, dx - 1, self->h); 1481 map_blank (self, self->x, self->y, dx, self->h);
1226 else if (dx < 0) 1482 else if (dx < 0)
1227 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1483 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1228 1484
1229 if (dy > 0) 1485 if (dy > 0)
1230 map_blank (self, self->x, self->y, self->w, dy - 1); 1486 map_blank (self, self->x, self->y, self->w, dy);
1231 else if (dy < 0) 1487 else if (dy < 0)
1232 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1488 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1233 1489
1234 self->ox += dx; self->x += dx; 1490 self->ox += dx; self->x += dx;
1235 self->oy += dy; self->y += dy; 1491 self->oy += dy; self->y += dy;
1236 1492
1237 while (self->y < 0) 1493 while (self->y < 0)
1242 self->y += MAP_EXTEND_Y; 1498 self->y += MAP_EXTEND_Y;
1243 } 1499 }
1244} 1500}
1245 1501
1246void 1502void
1247map1a_update (CFClient::Map self, SV *data_) 1503map1a_update (CFPlus::Map self, SV *data_, int extmap)
1248 CODE: 1504 CODE:
1249{ 1505{
1250 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1506 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1251 uint8_t *data_end = (uint8_t *)SvEND (data_); 1507 uint8_t *data_end = (uint8_t *)SvEND (data_);
1252 mapcell *cell; 1508 mapcell *cell;
1253 int x, y, flags; 1509 int x, y, flags;
1254 1510
1255 while (data < data_end) 1511 while (data < data_end - 1)
1256 { 1512 {
1257 flags = (data [0] << 8) + data [1]; data += 2; 1513 flags = (data [0] << 8) + data [1]; data += 2;
1258 1514
1259 x = self->x + ((flags >> 10) & 63); 1515 x = self->x + ((flags >> 10) & 63);
1260 y = self->y + ((flags >> 4) & 63); 1516 y = self->y + ((flags >> 4) & 63);
1261 1517
1262 cell = map_get_cell (self, x, y); 1518 cell = map_get_cell (self, x, y);
1263 1519
1264 if (flags & 15) 1520 if (flags & 15)
1265 { 1521 {
1266 if (cell->darkness < 0) 1522 if (!cell->darkness)
1267 { 1523 {
1524 memset (cell, 0, sizeof (*cell));
1268 cell->darkness = 0; 1525 cell->darkness = 256;
1269 cell->face [0] = 0;
1270 cell->face [1] = 0;
1271 cell->face [2] = 0;
1272 } 1526 }
1273 1527
1274 cell->darkness = flags & 8 ? *data++ : 255;
1275
1276 //TODO: don't trust server data to be in-range(!) 1528 //TODO: don't trust server data to be in-range(!)
1529
1530 if (flags & 8)
1531 {
1532 if (extmap)
1533 {
1534 uint8_t ext, cmd;
1535
1536 do
1537 {
1538 ext = *data++;
1539 cmd = ext & 0x3f;
1540
1541 if (cmd < 4)
1542 cell->darkness = 255 - ext * 64 + 1;
1543 else if (cmd == 5) // health
1544 {
1545 cell->stat_width = 1;
1546 cell->stat_hp = *data++;
1547 }
1548 else if (cmd == 6) // monster width
1549 cell->stat_width = *data++ + 1;
1550 else if (cmd == 0x47)
1551 {
1552 if (*data == 4)
1553 ; // decode player count
1554
1555 data += *data + 1;
1556 }
1557 else if (cmd == 8) // cell flags
1558 cell->flags = *data++;
1559 else if (ext & 0x40) // unknown, multibyte => skip
1560 data += *data + 1;
1561 else
1562 data++;
1563 }
1564 while (ext & 0x80);
1565 }
1566 else
1567 cell->darkness = *data++ + 1;
1568 }
1277 1569
1278 if (flags & 4) 1570 if (flags & 4)
1279 { 1571 {
1280 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1572 faceid face = (data [0] << 8) + data [1]; data += 2;
1573 need_facenum (self, face);
1574 cell->tile [0] = self->face2tile [face];
1281 } 1575 }
1282 1576
1283 if (flags & 2) 1577 if (flags & 2)
1284 { 1578 {
1285 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1579 faceid face = (data [0] << 8) + data [1]; data += 2;
1580 need_facenum (self, face);
1581 cell->tile [1] = self->face2tile [face];
1286 } 1582 }
1287 1583
1288 if (flags & 1) 1584 if (flags & 1)
1289 { 1585 {
1290 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1586 faceid face = (data [0] << 8) + data [1]; data += 2;
1587 need_facenum (self, face);
1588 cell->tile [2] = self->face2tile [face];
1291 } 1589 }
1292 } 1590 }
1293 else 1591 else
1294 cell->darkness = -1; 1592 cell->darkness = 0;
1295 } 1593 }
1296} 1594}
1297 1595
1298SV * 1596SV *
1299mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1597mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1300 CODE: 1598 CODE:
1301{ 1599{
1302 int x1, x; 1600 int x1, x;
1303 int y1, y; 1601 int y1, y;
1304 int z; 1602 int z;
1325 { 1623 {
1326 mapcell *cell = row->col + (x - row->c0); 1624 mapcell *cell = row->col + (x - row->c0);
1327 1625
1328 for (z = 0; z <= 0; z++) 1626 for (z = 0; z <= 0; z++)
1329 { 1627 {
1330 mapface face = cell->face [z];
1331
1332 if (face)
1333 {
1334 maptex tex = self->tex [face]; 1628 maptex tex = self->tex [cell->tile [z]];
1335 int a0 = 255 - tex.a; 1629 int a0 = 255 - tex.a;
1336 int a1 = tex.a; 1630 int a1 = tex.a;
1337 1631
1338 r = (r * a0 + tex.r * a1) / 255; 1632 r = (r * a0 + tex.r * a1) / 255;
1339 g = (g * a0 + tex.g * a1) / 255; 1633 g = (g * a0 + tex.g * a1) / 255;
1340 b = (b * a0 + tex.b * a1) / 255; 1634 b = (b * a0 + tex.b * a1) / 255;
1341 a = (a * a0 + tex.a * a1) / 255; 1635 a = (a * a0 + tex.a * a1) / 255;
1342 }
1343 } 1636 }
1344 } 1637 }
1345 1638
1346 *map++ = (r ) 1639 *map++ = (r )
1347 | (g << 8) 1640 | (g << 8)
1354} 1647}
1355 OUTPUT: 1648 OUTPUT:
1356 RETVAL 1649 RETVAL
1357 1650
1358void 1651void
1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1652draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1360 CODE: 1653 CODE:
1361{ 1654{
1362 int vx, vy; 1655 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1656 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1657 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1658 smooth_key skey;
1363 int x, y, z; 1659 int x, y, z;
1364 int last_name; 1660 int last_name;
1365 mapface face;
1366 1661
1367 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1662 // thats current max. sorry.
1368 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1663 if (sw > 255) sw = 255;
1664 if (sh > 255) sh = 255;
1369 1665
1370 /* 1666 // clear key, in case of extra padding
1371 int vx = self->vx = self->w >= sw 1667 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 1668
1380 glColor4ub (255, 255, 255, 255); 1669 glColor4ub (255, 255, 255, 255);
1381 1670
1382 glEnable (GL_BLEND); 1671 glEnable (GL_BLEND);
1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1672 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1386 1675
1387 glBegin (GL_QUADS); 1676 glBegin (GL_QUADS);
1388 1677
1389 last_name = 0; 1678 last_name = 0;
1390 1679
1680 mx += self->x;
1681 my += self->y;
1682
1683 // first pass: determine smooth_max
1684 // rather ugly, if you ask me
1685 // could also be stored inside mapcell and updated on change
1686 memset (smooth_max, 0, sizeof (smooth_max));
1687
1688 for (y = 0; y < sh; y++)
1689 if (0 <= y + my && y + my < self->rows)
1690 {
1691 maprow *row = self->row + (y + my);
1692
1693 for (x = 0; x < sw; x++)
1694 if (row->c0 <= x + mx && x + mx < row->c1)
1695 {
1696 mapcell *cell = row->col + (x + mx - row->c0);
1697
1698 smooth_max[x + 1][y + 1] =
1699 MAX (self->tex [cell->tile [0]].smoothlevel,
1700 MAX (self->tex [cell->tile [1]].smoothlevel,
1701 self->tex [cell->tile [2]].smoothlevel));
1702 }
1703 }
1704
1391 for (z = 0; z < 3; z++) 1705 for (z = 0; z <= 2; z++)
1706 {
1707 memset (smooth_level, 0, sizeof (smooth_level));
1708
1392 for (y = 0; y < sh; y++) 1709 for (y = 0; y < sh; y++)
1393 if (0 <= y + vy && y + vy < self->rows) 1710 if (0 <= y + my && y + my < self->rows)
1394 { 1711 {
1395 maprow *row = self->row + (y + vy); 1712 maprow *row = self->row + (y + my);
1396 1713
1397 for (x = 0; x < sw; x++) 1714 for (x = 0; x < sw; x++)
1398 if (row->c0 <= x + vx && x + vx < row->c1) 1715 if (row->c0 <= x + mx && x + mx < row->c1)
1399 { 1716 {
1400 mapcell *cell = row->col + (x + vx - row->c0); 1717 mapcell *cell = row->col + (x + mx - row->c0);
1401
1402 face = cell->face [z]; 1718 tileid tile = cell->tile [z];
1403 1719
1404 if (face) 1720 if (tile)
1721 {
1722 maptex tex = self->tex [tile];
1723 int px = (x + 1) * T - tex.w;
1724 int py = (y + 1) * T - tex.h;
1725
1726 // suppressing texture state switches here
1727 // is only moderately effective, but worth the extra effort
1728 if (last_name != tex.name)
1729 {
1730 if (!tex.name)
1731 tex = self->tex [2]; /* missing, replace by noface */
1732
1733 glEnd ();
1734 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1735 glBegin (GL_QUADS);
1736 }
1737
1738 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1739 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1740 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1741 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1742
1743 if (cell->flags && z == 2)
1744 {
1745 if (cell->flags & 1)
1746 {
1747 maptex tex = self->tex [1];
1748 int px = x * T + T * 2 / 32;
1749 int py = y * T - T * 6 / 32;
1750
1751 glEnd ();
1752 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1753 glBegin (GL_QUADS);
1754
1755 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1756 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1757 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1758 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1759 }
1760 }
1761
1762 // update smooth hash
1763 if (tex.smoothtile)
1764 {
1765 skey.tile = tex.smoothtile;
1766 skey.level = tex.smoothlevel;
1767
1768 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1769
1770 // add bits to current tile and all neighbours. skey.x|y is
1771 // shifted +1|+1 so we always stay positive.
1772
1773 // bits is ___n cccc CCCC bbbb
1774 // n do not draw borders&corners
1775 // c draw these corners, but...
1776 // C ... not these
1777 // b draw these borders
1778
1779 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1780 // ┃· ·· ·┃ ━━
1781
1782 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1783 // ·· ·· ·┏ ┓·
1784
1785 // full tile
1786 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1787
1788 // borders
1789 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1790 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1791 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1792 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1793
1794 // corners
1795 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1796 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1797 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1798 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1799 }
1800 }
1801 }
1802 }
1803
1804 // go through all smoothlevels, lowest to highest, then draw.
1805 // this is basically counting sort
1806 {
1807 int w, b;
1808
1809 for (w = 0; w < 256 / 32; ++w)
1810 {
1811 uint32_t smask = smooth_level [w];
1812 if (smask)
1813 for (b = 0; b < 32; ++b)
1814 if (smask & (((uint32_t)1) << b))
1405 { 1815 {
1406 maptex tex = self->tex [face]; 1816 int level = (w << 5) | b;
1817 HE *he;
1407 1818
1408 int px = (x + 1) * 32 - tex.w; 1819 hv_iterinit (smooth);
1409 int py = (y + 1) * 32 - tex.h; 1820 while ((he = hv_iternext (smooth)))
1410
1411 if (last_name != tex.name)
1412 { 1821 {
1822 smooth_key *skey = (smooth_key *)HeKEY (he);
1823 IV bits = SvIVX (HeVAL (he));
1824
1825 if (!(bits & 0x1000)
1826 && skey->level == level
1827 && level > smooth_max [skey->x][skey->y])
1828 {
1829 maptex tex = self->tex [skey->tile];
1830 int px = (((int)skey->x) - 1) * T;
1831 int py = (((int)skey->y) - 1) * T;
1832 int border = bits & 15;
1833 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1834 float dx = tex.s * .0625f; // 16 images/row
1835 float dy = tex.t * .5f ; // 2 images/column
1836
1837 // this time naively avoiding texture state changes
1838 // save gobs of state changes.
1839 if (last_name != tex.name)
1840 {
1841 if (!tex.name)
1842 continue; // smoothing not yet available
1843
1413 glEnd (); 1844 glEnd ();
1414 last_name = tex.name;
1415 glBindTexture (GL_TEXTURE_2D, last_name); 1845 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1416 glBegin (GL_QUADS); 1846 glBegin (GL_QUADS);
1847 }
1848
1849 if (border)
1850 {
1851 float ox = border * dx;
1852
1853 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1854 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1855 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1856 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1857 }
1858
1859 if (corner)
1860 {
1861 float ox = corner * dx;
1862
1863 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1864 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1865 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1866 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1867 }
1868 }
1417 } 1869 }
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 } 1870 }
1424 }
1425 } 1871 }
1872 }
1873
1874 hv_clear (smooth);
1875 }
1426 1876
1427 glEnd (); 1877 glEnd ();
1428 1878
1429 glDisable (GL_TEXTURE_2D); 1879 glDisable (GL_TEXTURE_2D);
1430 glDisable (GL_BLEND); 1880 glDisable (GL_BLEND);
1431}
1432 1881
1882 // top layer: overlays such as the health bar
1883 for (y = 0; y < sh; y++)
1884 if (0 <= y + my && y + my < self->rows)
1885 {
1886 maprow *row = self->row + (y + my);
1887
1888 for (x = 0; x < sw; x++)
1889 if (row->c0 <= x + mx && x + mx < row->c1)
1890 {
1891 mapcell *cell = row->col + (x + mx - row->c0);
1892
1893 int px = x * T;
1894 int py = y * T;
1895
1896 if (cell->stat_hp)
1897 {
1898 int width = cell->stat_width * T;
1899 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1900
1901 glColor3ub (0, 0, 0);
1902 glRectf (px + 1, py - thick - 2,
1903 px + width - 1, py);
1904
1905 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1906 glRectf (px + 2,
1907 py - thick - 1,
1908 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1909 }
1910 }
1911 }
1912}
1913
1433void 1914void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1915draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE: 1916 CODE:
1436{ 1917{
1437 static float color[16][3] = { 1918 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F }, 1919 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F }, 1920 { 1.00F, 1.00F, 1.00F },
1489 glDisable (GL_BLEND); 1970 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D); 1971 glDisable (GL_TEXTURE_2D);
1491} 1972}
1492 1973
1493void 1974void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1975fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1495 PPCODE: 1976 PPCODE:
1496{ 1977{
1497 int vx, vy;
1498 int x, y; 1978 int x, y;
1979 int sw1 = sw + 2;
1980 int sh1 = sh + 2;
1981 int sh3 = sh * 3;
1499 int sw4 = (sw + 3) & ~3; 1982 int sw34 = (sw * 3 + 3) & ~3;
1983 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1500 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1984 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1501 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1985 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1502 1986
1503 memset (darkness, 255, sw4 * sh);
1504 SvPOK_only (darkness_sv); 1987 SvPOK_only (darkness3_sv);
1505 SvCUR_set (darkness_sv, sw4 * sh); 1988 SvCUR_set (darkness3_sv, sw34 * sh3);
1506 1989
1507 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1990 mx += self->x - 1;
1508 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1991 my += self->y - 1;
1509 1992
1993 memset (darkness1, 255, sw1 * sh1);
1994
1510 for (y = 0; y < sh; y++) 1995 for (y = 0; y < sh1; y++)
1511 if (0 <= y + vy && y + vy < self->rows) 1996 if (0 <= y + my && y + my < self->rows)
1512 { 1997 {
1513 maprow *row = self->row + (y + vy); 1998 maprow *row = self->row + (y + my);
1514 1999
1515 for (x = 0; x < sw; x++) 2000 for (x = 0; x < sw1; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1) 2001 if (row->c0 <= x + mx && x + mx < row->c1)
1517 { 2002 {
1518 mapcell *cell = row->col + (x + vx - row->c0); 2003 mapcell *cell = row->col + (x + mx - row->c0);
1519 2004
1520 darkness[y * sw4 + x] = cell->darkness < 0 2005 darkness1 [y * sw1 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1)
1521 ? 255 - FOW_DARKNESS 2007 : 255 - FOW_DARKNESS;
1522 : 255 - cell->darkness;
1523 } 2008 }
1524 } 2009 }
1525 2010
2011 for (y = 0; y < sh; ++y)
2012 for (x = 0; x < sw; ++x)
2013 {
2014 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2015 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2016 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2017 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2018 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2019 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2020 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2021 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2022 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2023
2024 uint8_t r11 = (d11 + d21 + d12) / 3;
2025 uint8_t r21 = d21;
2026 uint8_t r31 = (d21 + d31 + d32) / 3;
2027
2028 uint8_t r12 = d12;
2029 uint8_t r22 = d22;
2030 uint8_t r32 = d32;
2031
2032 uint8_t r13 = (d13 + d23 + d12) / 3;
2033 uint8_t r23 = d23;
2034 uint8_t r33 = (d23 + d33 + d32) / 3;
2035
2036 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2037 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2038 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2039 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2040 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2041 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2042 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2043 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2044 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2045 }
2046
2047 free (darkness1);
2048
1526 EXTEND (SP, 3); 2049 EXTEND (SP, 3);
1527 PUSHs (sv_2mortal (newSViv (sw4))); 2050 PUSHs (sv_2mortal (newSViv (sw34)));
1528 PUSHs (sv_2mortal (newSViv (sh))); 2051 PUSHs (sv_2mortal (newSViv (sh3)));
1529 PUSHs (darkness_sv); 2052 PUSHs (darkness3_sv);
1530} 2053}
1531 2054
1532SV * 2055SV *
1533get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2056get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1534 CODE: 2057 CODE:
1535{ 2058{
1536 int x, y, x1, y1; 2059 int x, y, x1, y1;
1537 SV *data_sv = newSV (w * h * 7 + 5); 2060 SV *data_sv = newSV (w * h * 7 + 5);
1538 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2061 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1563 if (row && row->c0 <= x && x < row->c1) 2086 if (row && row->c0 <= x && x < row->c1)
1564 { 2087 {
1565 mapcell *cell = row->col + (x - row->c0); 2088 mapcell *cell = row->col + (x - row->c0);
1566 uint8_t flags = 0; 2089 uint8_t flags = 0;
1567 2090
1568 if (cell->face [0]) flags |= 1; 2091 if (cell->tile [0]) flags |= 1;
1569 if (cell->face [1]) flags |= 2; 2092 if (cell->tile [1]) flags |= 2;
1570 if (cell->face [2]) flags |= 4; 2093 if (cell->tile [2]) flags |= 4;
1571 2094
1572 *data++ = flags; 2095 *data++ = flags;
1573 2096
1574 if (flags & 1) 2097 if (flags & 1)
1575 { 2098 {
2099 tileid tile = cell->tile [0];
1576 *data++ = cell->face [0] >> 8; 2100 *data++ = tile >> 8;
1577 *data++ = cell->face [0]; 2101 *data++ = tile;
1578 } 2102 }
1579 2103
1580 if (flags & 2) 2104 if (flags & 2)
1581 { 2105 {
2106 tileid tile = cell->tile [1];
1582 *data++ = cell->face [1] >> 8; 2107 *data++ = tile >> 8;
1583 *data++ = cell->face [1]; 2108 *data++ = tile;
1584 } 2109 }
1585 2110
1586 if (flags & 4) 2111 if (flags & 4)
1587 { 2112 {
2113 tileid tile = cell->tile [2];
1588 *data++ = cell->face [2] >> 8; 2114 *data++ = tile >> 8;
1589 *data++ = cell->face [2]; 2115 *data++ = tile;
1590 } 2116 }
1591 } 2117 }
1592 else 2118 else
1593 *data++ = 0; 2119 *data++ = 0;
1594 } 2120 }
1600} 2126}
1601 OUTPUT: 2127 OUTPUT:
1602 RETVAL 2128 RETVAL
1603 2129
1604void 2130void
1605set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2131set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1606 PPCODE: 2132 PPCODE:
1607{ 2133{
1608 int x, y, z; 2134 int x, y, z;
1609 int w, h; 2135 int w, h;
1610 int x1, y1; 2136 int x1, y1;
1634 { 2160 {
1635 uint8_t flags = *data++; 2161 uint8_t flags = *data++;
1636 2162
1637 if (flags) 2163 if (flags)
1638 { 2164 {
1639 mapface face[3] = { 0, 0, 0 };
1640
1641 mapcell *cell = row_get_cell (row, x); 2165 mapcell *cell = row_get_cell (row, x);
2166 tileid tile[3] = { 0, 0, 0 };
1642 2167
1643 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2168 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1644 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2169 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1645 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2170 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1646 2171
1647 if (cell->darkness <= 0) 2172 if (cell->darkness == 0)
1648 { 2173 {
1649 cell->darkness = -1; 2174 cell->darkness = 0;
1650 2175
1651 for (z = 0; z <= 2; z++) 2176 for (z = 0; z <= 2; z++)
1652 { 2177 {
1653 cell->face[z] = face[z]; 2178 tileid t = tile [z];
1654 2179
1655 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2180 if (t >= self->texs || (t && !self->tex [t].name))
2181 {
1656 XPUSHs (sv_2mortal (newSViv (face[z]))); 2182 XPUSHs (sv_2mortal (newSViv (t)));
2183 need_texid (self, t);
2184 }
2185
2186 cell->tile [z] = t;
1657 } 2187 }
1658 } 2188 }
1659 } 2189 }
1660 } 2190 }
1661 } 2191 }
1662} 2192}
1663 2193
1664MODULE = CFClient PACKAGE = CFClient::MixChunk 2194MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1665 2195
2196PROTOTYPES: DISABLE
2197
1666CFClient::MixChunk 2198CFPlus::MixChunk
1667new_from_file (SV *class, char *path) 2199new_from_file (SV *class, char *path)
1668 CODE: 2200 CODE:
1669 RETVAL = Mix_LoadWAV (path); 2201 RETVAL = Mix_LoadWAV (path);
1670 OUTPUT: 2202 OUTPUT:
1671 RETVAL 2203 RETVAL
1672 2204
1673void 2205void
1674DESTROY (CFClient::MixChunk self) 2206DESTROY (CFPlus::MixChunk self)
1675 CODE: 2207 CODE:
1676 Mix_FreeChunk (self); 2208 Mix_FreeChunk (self);
1677 2209
1678int 2210int
1679volume (CFClient::MixChunk self, int volume = -1) 2211volume (CFPlus::MixChunk self, int volume = -1)
1680 CODE: 2212 CODE:
1681 RETVAL = Mix_VolumeChunk (self, volume); 2213 RETVAL = Mix_VolumeChunk (self, volume);
1682 OUTPUT: 2214 OUTPUT:
1683 RETVAL 2215 RETVAL
1684 2216
1685int 2217int
1686play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2218play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1687 CODE: 2219 CODE:
1688 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2220 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1689 OUTPUT: 2221 OUTPUT:
1690 RETVAL 2222 RETVAL
1691 2223
1692MODULE = CFClient PACKAGE = CFClient::MixMusic 2224MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1693 2225
1694int 2226int
1695volume (int volume = -1) 2227volume (int volume = -1)
2228 PROTOTYPE: ;$
1696 CODE: 2229 CODE:
1697 RETVAL = Mix_VolumeMusic (volume); 2230 RETVAL = Mix_VolumeMusic (volume);
1698 OUTPUT: 2231 OUTPUT:
1699 RETVAL 2232 RETVAL
1700 2233
2234int
2235fade_out (int ms)
2236 CODE:
2237 RETVAL = Mix_FadeOutMusic (ms);
2238 OUTPUT:
2239 RETVAL
2240
1701CFClient::MixMusic 2241CFPlus::MixMusic
1702new_from_file (SV *class, char *path) 2242new_from_file (SV *class, char *path)
1703 CODE: 2243 CODE:
1704 RETVAL = Mix_LoadMUS (path); 2244 RETVAL = Mix_LoadMUS (path);
1705 OUTPUT: 2245 OUTPUT:
1706 RETVAL 2246 RETVAL
1707 2247
1708void 2248void
1709DESTROY (CFClient::MixMusic self) 2249DESTROY (CFPlus::MixMusic self)
1710 CODE: 2250 CODE:
1711 Mix_FreeMusic (self); 2251 Mix_FreeMusic (self);
1712 2252
1713int 2253int
1714play (CFClient::MixMusic self, int loops = -1) 2254play (CFPlus::MixMusic self, int loops = -1)
1715 CODE: 2255 CODE:
1716 RETVAL = Mix_PlayMusic (self, loops); 2256 RETVAL = Mix_PlayMusic (self, loops);
1717 OUTPUT: 2257 OUTPUT:
1718 RETVAL 2258 RETVAL
1719 2259
2260int
2261fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2262 CODE:
2263 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2264 OUTPUT:
2265 RETVAL
2266
1720MODULE = CFClient PACKAGE = CFClient::OpenGL 2267MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2268
2269PROTOTYPES: ENABLE
1721 2270
1722BOOT: 2271BOOT:
1723{ 2272{
1724 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2273 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1725 static const struct { 2274 static const struct {
1726 const char *name; 2275 const char *name;
1727 IV iv; 2276 IV iv;
1728 } *civ, const_iv[] = { 2277 } *civ, const_iv[] = {
1729# define const_iv(name) { # name, (IV)name } 2278# define const_iv(name) { # name, (IV)name }
2279 const_iv (GL_VENDOR),
2280 const_iv (GL_VERSION),
2281 const_iv (GL_EXTENSIONS),
1730 const_iv (GL_COLOR_MATERIAL), 2282 const_iv (GL_COLOR_MATERIAL),
1731 const_iv (GL_SMOOTH), 2283 const_iv (GL_SMOOTH),
1732 const_iv (GL_FLAT), 2284 const_iv (GL_FLAT),
1733 const_iv (GL_DITHER), 2285 const_iv (GL_DITHER),
1734 const_iv (GL_BLEND), 2286 const_iv (GL_BLEND),
1761 const_iv (GL_LUMINANCE), 2313 const_iv (GL_LUMINANCE),
1762 const_iv (GL_LUMINANCE_ALPHA), 2314 const_iv (GL_LUMINANCE_ALPHA),
1763 const_iv (GL_FLOAT), 2315 const_iv (GL_FLOAT),
1764 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2316 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1765 const_iv (GL_COMPILE), 2317 const_iv (GL_COMPILE),
2318 const_iv (GL_PROXY_TEXTURE_1D),
2319 const_iv (GL_PROXY_TEXTURE_2D),
1766 const_iv (GL_TEXTURE_1D), 2320 const_iv (GL_TEXTURE_1D),
1767 const_iv (GL_TEXTURE_2D), 2321 const_iv (GL_TEXTURE_2D),
1768 const_iv (GL_TEXTURE_ENV), 2322 const_iv (GL_TEXTURE_ENV),
1769 const_iv (GL_TEXTURE_MAG_FILTER), 2323 const_iv (GL_TEXTURE_MAG_FILTER),
1770 const_iv (GL_TEXTURE_MIN_FILTER), 2324 const_iv (GL_TEXTURE_MIN_FILTER),
1792 const_iv (GL_SEPARABLE_2D), 2346 const_iv (GL_SEPARABLE_2D),
1793 const_iv (GL_CONVOLUTION_2D), 2347 const_iv (GL_CONVOLUTION_2D),
1794 const_iv (GL_CONVOLUTION_BORDER_MODE), 2348 const_iv (GL_CONVOLUTION_BORDER_MODE),
1795 const_iv (GL_CONSTANT_BORDER), 2349 const_iv (GL_CONSTANT_BORDER),
1796 const_iv (GL_LINES), 2350 const_iv (GL_LINES),
2351 const_iv (GL_LINE_STRIP),
1797 const_iv (GL_LINE_LOOP), 2352 const_iv (GL_LINE_LOOP),
1798 const_iv (GL_QUADS), 2353 const_iv (GL_QUADS),
1799 const_iv (GL_QUAD_STRIP), 2354 const_iv (GL_QUAD_STRIP),
1800 const_iv (GL_TRIANGLES), 2355 const_iv (GL_TRIANGLES),
1801 const_iv (GL_TRIANGLE_STRIP), 2356 const_iv (GL_TRIANGLE_STRIP),
1809# undef const_iv 2364# undef const_iv
1810 }; 2365 };
1811 2366
1812 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2367 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1813 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2368 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2369
2370 texture_av = newAV ();
2371 AvREAL_off (texture_av);
1814} 2372}
1815 2373
1816char * 2374char *
1817gl_vendor () 2375gl_vendor ()
1818 CODE: 2376 CODE:
1829 2387
1830char * 2388char *
1831gl_extensions () 2389gl_extensions ()
1832 CODE: 2390 CODE:
1833 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2391 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2392 OUTPUT:
2393 RETVAL
2394
2395const char *glGetString (GLenum pname)
2396
2397GLint glGetInteger (GLenum pname)
2398 CODE:
2399 glGetIntegerv (pname, &RETVAL);
2400 OUTPUT:
2401 RETVAL
2402
2403GLdouble glGetDouble (GLenum pname)
2404 CODE:
2405 glGetDoublev (pname, &RETVAL);
1834 OUTPUT: 2406 OUTPUT:
1835 RETVAL 2407 RETVAL
1836 2408
1837int glGetError () 2409int glGetError ()
1838 2410
1911 r *= a; 2483 r *= a;
1912 g *= a; 2484 g *= a;
1913 b *= a; 2485 b *= a;
1914 } 2486 }
1915 // microsoft visual "c" rounds instead of truncating... 2487 // microsoft visual "c" rounds instead of truncating...
1916 glColor4ub (MIN ((int)(r * 256.f), 255), 2488 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 2489
1921void glInterleavedArrays (int format, int stride, char *data) 2490void glInterleavedArrays (int format, int stride, char *data)
1922 2491
1923void glDrawElements (int mode, int count, int type, char *indices) 2492void glDrawElements (int mode, int count, int type, char *indices)
1924 2493
1966 2535
1967void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2536void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1968 2537
1969void glDrawPixels (int width, int height, int format, int type, char *pixels) 2538void glDrawPixels (int width, int height, int format, int type, char *pixels)
1970 2539
2540void glPixelZoom (float x, float y)
2541
1971void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2542void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1972 2543
1973int glGenTexture () 2544int glGenTexture ()
1974 CODE: 2545 CODE:
1975{ 2546 RETVAL = gen_texture ();
1976 GLuint name;
1977 glGenTextures (1, &name);
1978 RETVAL = name;
1979}
1980 OUTPUT: 2547 OUTPUT:
1981 RETVAL 2548 RETVAL
1982 2549
1983void glDeleteTexture (int name) 2550void glDeleteTexture (int name)
1984 CODE: 2551 CODE:
1985{
1986 GLuint name_ = name;
1987 glDeleteTextures (1, &name_); 2552 del_texture (name);
1988} 2553
1989
1990int glGenList () 2554int glGenList ()
1991 CODE: 2555 CODE:
1992 RETVAL = glGenLists (1); 2556 RETVAL = glGenLists (1);
1993 OUTPUT: 2557 OUTPUT:
1994 RETVAL 2558 RETVAL
2001 2565
2002void glEndList () 2566void glEndList ()
2003 2567
2004void glCallList (int list) 2568void glCallList (int list)
2005 2569
2006

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines