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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines