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.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.175 by root, Fri Apr 6 08:09:42 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);
122#ifdef FC_HINT_STYLE
123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
124#endif
89 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
90} 126}
91 127
92static void 128static void
93layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
94{ 130{
95 /* 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
96 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
97 */ 133 */
98 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
102 138
103 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
104} 140}
105 141
106static void 142static void
107layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
108{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
109 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
110 149
111 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
112 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
113 152
114 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
115} 154 if (!rect.height) rect.height = 1;
116 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
117typedef uint16_t mapface; 161typedef uint16_t faceid;
118 162
119typedef struct { 163typedef struct {
120 GLint name; 164 int name;
121 int w, h; 165 int w, h;
122 float s, t; 166 float s, t;
123 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
124} maptex; 168} maptex;
125 169
126typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
127 int16_t darkness; 173 uint16_t darkness;
128 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
129} mapcell; 175} mapcell;
130 176
131typedef struct { 177typedef struct {
132 int32_t c0, c1; 178 int32_t c0, c1;
133 mapcell *col; 179 mapcell *col;
134} maprow; 180} maprow;
135 181
136typedef struct map { 182typedef struct map {
137 int x, y, w, h; 183 int x, y, w, h;
138 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
139 int faces; 185 int faces; tileid *face2tile; // [faceid]
140 mapface *face; 186 int texs; maptex *tex; // [tileid]
141
142 int texs;
143 maptex *tex;
144 187
145 int32_t rows; 188 int32_t rows;
146 maprow *row; 189 maprow *row;
147} *CFClient__Map; 190} *CFPlus__Map;
148 191
149static char * 192static char *
150prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
151{ 194{
152 char *p; 195 char *p;
169} 212}
170 213
171#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 214#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
172#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
173 216
217static void
218need_facenum (struct map *self, faceid face)
219{
220 while (self->faces <= face)
221 {
222 Append (tileid, self->face2tile, self->faces, self->faces);
223 self->faces *= 2;
224 }
225}
226
227static void
228need_texid (struct map *self, int texid)
229{
230 while (self->texs <= texid)
231 {
232 Append (maptex, self->tex, self->texs, self->texs);
233 self->texs *= 2;
234 }
235}
236
174static maprow * 237static maprow *
175map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
176{ 239{
177 if (0 > y) 240 if (0 > y)
178 { 241 {
179 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
180 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
218 281
219 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
220} 283}
221 284
222static mapcell * 285static mapcell *
223map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
224{ 287{
225 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
226} 289}
227 290
228static void 291static void
229map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
230{ 293{
231 int r; 294 int r;
232 295
233 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
234 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
242 self->row = 0; 305 self->row = 0;
243 self->rows = 0; 306 self->rows = 0;
244} 307}
245 308
246static void 309static void
247map_blank (CFClient__Map self, int x0, int y0, int w, int h) 310map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
248{ 311{
249 int x, y; 312 int x, y;
250 maprow *row; 313 maprow *row;
314 mapcell *cell;
251 315
252 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
253 if (y >= 0) 317 if (y >= 0)
254 { 318 {
255 if (y >= self->rows) 319 if (y >= self->rows)
261 if (x >= row->c0) 325 if (x >= row->c0)
262 { 326 {
263 if (x >= row->c1) 327 if (x >= row->c1)
264 break; 328 break;
265 329
266 row->col[x - row->c0].darkness = -1; 330 cell = row->col + x - row->c0;
331
332 cell->darkness = 0;
333 cell->stat_hp = 0;
334 cell->flags = 0;
335 cell->player = 0;
267 } 336 }
268 } 337 }
269} 338}
270 339
271static void 340static void
292 ev.data2 = 0; 361 ev.data2 = 0;
293 362
294 SDL_PushEvent ((SDL_Event *)&ev); 363 SDL_PushEvent ((SDL_Event *)&ev);
295} 364}
296 365
366static unsigned int
367minpot (unsigned int n)
368{
369 if (!n)
370 return 0;
371
372 --n;
373
374 n |= n >> 1;
375 n |= n >> 2;
376 n |= n >> 4;
377 n |= n >> 8;
378 n |= n >> 16;
379
380 return n + 1;
381}
382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
386
297MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
298 388
299PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
300 390
301BOOT: 391BOOT:
302{ 392{
303 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
304 static const struct { 394 static const struct {
305 const char *name; 395 const char *name;
306 IV iv; 396 IV iv;
307 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
308# define const_iv(name) { # name, (IV)name } 398# define const_iv(name) { # name, (IV)name }
399 const_iv (SDLK_MODIFIER_MIN),
400 const_iv (SDLK_MODIFIER_MAX),
401
309 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
310 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
311 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
312 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
313 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
322 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
323 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
324 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
325 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
326 const_iv (SDL_USEREVENT), 419 const_iv (SDL_USEREVENT),
420
421 const_iv (SDL_APPINPUTFOCUS),
422 const_iv (SDL_APPMOUSEFOCUS),
423 const_iv (SDL_APPACTIVE),
424
327 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
328 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
329 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
330 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
331 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
386 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
387 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
388 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
389 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
390 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
391 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
392 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
393 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
394 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
395 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
396 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
397 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
398 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
399 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
400 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
401 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
402 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
403 const_iv (KMOD_CTRL),
404 const_iv (KMOD_SHIFT),
405 const_iv (KMOD_ALT),
406 const_iv (KMOD_META)
407# undef const_iv 506# undef const_iv
408 }; 507 };
409 508
410 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 509 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
411 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 510 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
511
512 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
513 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
412} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
521
522int
523in_destruct ()
524 CODE:
525 RETVAL = PL_main_cv == Nullcv;
526 OUTPUT:
527 RETVAL
528
529NV floor (NV x)
530
531NV ceil (NV x)
413 532
414void 533void
415pango_init () 534pango_init ()
416 CODE: 535 CODE:
417{ 536{
418 // delayed, so it can pick up new fonts added by AddFontResourceEx
419 ft2_fontmap = pango_ft2_font_map_new (); 537 opengl_fontmap = pango_opengl_font_map_new ();
420 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 538 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
421 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 539 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
422
423 cairo_fontmap = pango_cairo_font_map_get_default ();
424 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
425} 540}
426 541
427int 542int
428SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 543SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
429 544
430void 545void
431SDL_Quit () 546SDL_Quit ()
432 547
433void 548void
439 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 554 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 555 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 556 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 557 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443 558
559 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
561
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 562 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448 566
449 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 567 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568#if SDL_VERSION_ATLEAST(1,2,10)
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 569 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 570 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571#endif
452 572
453 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
454 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455 575
456 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
465 585
466 ++m; 586 ++m;
467 } 587 }
468} 588}
469 589
590char *
591SDL_GetError ()
592
470int 593int
471SDL_SetVideoMode (int w, int h, int fullscreen) 594SDL_SetVideoMode (int w, int h, int fullscreen)
472 CODE: 595 CODE:
473 RETVAL = !!SDL_SetVideoMode ( 596 RETVAL = !!SDL_SetVideoMode (
474 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 597 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
475 ); 598 );
599 if (RETVAL)
600 {
476 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 601 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
602# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
603# include "glfunc.h"
604# undef GL_FUNC
605 }
477 OUTPUT: 606 OUTPUT:
478 RETVAL 607 RETVAL
479 608
480void 609void
481SDL_GL_SwapBuffers () 610SDL_GL_SwapBuffers ()
611
612char *
613SDL_GetKeyName (int sym)
482 614
483void 615void
484SDL_PollEvent () 616SDL_PollEvent ()
485 PPCODE: 617 PPCODE:
486{ 618{
496 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
497 case SDL_KEYUP: 629 case SDL_KEYUP:
498 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
499 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
500 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 632 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
633 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
501 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
502 break; 635 break;
503 636
504 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
505 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 639 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507 break; 640 break;
508 641
509 case SDL_MOUSEMOTION: 642 case SDL_MOUSEMOTION:
643 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
510 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 645 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 646 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 647 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 648 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 649 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515 break; 650 break;
516 651
517 case SDL_MOUSEBUTTONDOWN: 652 case SDL_MOUSEBUTTONDOWN:
518 case SDL_MOUSEBUTTONUP: 653 case SDL_MOUSEBUTTONUP:
654 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
655
519 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 656 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 657 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 658 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 659 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523 break; 660 break;
527 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
528 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
529 break; 666 break;
530 } 667 }
531 668
532 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
533 } 670 }
534} 671}
535 672
536int 673int
537Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 674Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
550 CODE: 687 CODE:
551#ifndef _WIN32 688#ifndef _WIN32
552 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553#endif 690#endif
554 691
555char * 692void
556gl_version () 693win32_proxy_info ()
557 CODE: 694 PPCODE:
558 RETVAL = (char *)glGetString (GL_VERSION); 695{
559 OUTPUT: 696#ifdef _WIN32
560 RETVAL 697 char buffer[2048];
698 DWORD buflen;
561 699
562char * 700 EXTEND (SP, 3);
563gl_extensions () 701
564 CODE: 702 buflen = sizeof (buffer);
565 RETVAL = (char *)glGetString (GL_EXTENSIONS); 703 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
566 OUTPUT: 704 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
567 RETVAL 705 {
706 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
707
708 buflen = sizeof (buffer);
709 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
710 {
711 PUSHs (newSVpv (buffer, 0));
712
713 buflen = sizeof (buffer);
714 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
715 PUSHs (newSVpv (buffer, 0));
716 }
717 }
718#endif
719}
568 720
569void 721void
570add_font (char *file) 722add_font (char *file)
571 CODE: 723 CODE:
572 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
573#ifdef _WIN32
574 // cairo... sigh... requires win2000
575 AddFontResourceEx (file, FR_PRIVATE, 0);
576#endif
577 725
578void 726void
579load_image_inline (SV *image_) 727load_image_inline (SV *image_)
580 ALIAS: 728 ALIAS:
581 load_image_file = 1 729 load_image_file = 1
623 771
624 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
625 773
626 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
627 775
776 SDL_LockSurface (surface2);
628 EXTEND (SP, 5); 777 EXTEND (SP, 6);
629 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
630 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
631 SDL_LockSurface (surface2);
632 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
633 SDL_UnlockSurface (surface2);
634 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 781 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
635 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
636 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
637 785
638 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
639 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
640} 788}
641 789
665} 813}
666 814
667void 815void
668error (char *message) 816error (char *message)
669 CODE: 817 CODE:
818 fprintf (stderr, "ERROR: %s\n", message);
670#ifdef _WIN32 819#ifdef _WIN32
671 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 820 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
821#endif
822
823void
824fatal (char *message)
825 CODE:
826 fprintf (stderr, "FATAL: %s\n", message);
827#ifdef _WIN32
828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
829#endif
830 _exit (1);
831
832void
833_exit (int retval = 0)
834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
672#else 837#else
673 fprintf (stderr, "ERROR: %s\n", message); 838 _exit (retval);
674#endif 839#endif
675 840
676void
677fatal (char *message)
678 CODE:
679#ifdef _WIN32
680 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
681#else
682 fprintf (stderr, "FATAL: %s\n", message);
683#endif
684 exit (1);
685
686MODULE = CFClient PACKAGE = CFClient::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
687 842
688CFClient::Font 843CFPlus::Font
689new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
690 CODE: 845 CODE:
691{ 846{
692 int count; 847 int count;
693 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
696} 851}
697 OUTPUT: 852 OUTPUT:
698 RETVAL 853 RETVAL
699 854
700void 855void
701DESTROY (CFClient::Font self) 856DESTROY (CFPlus::Font self)
702 CODE: 857 CODE:
703 pango_font_description_free (self); 858 pango_font_description_free (self);
704 859
705void 860void
706make_default (CFClient::Font self) 861make_default (CFPlus::Font self)
707 CODE: 862 CODE:
708 default_font = self; 863 default_font = self;
709 864
710MODULE = CFClient PACKAGE = CFClient::Layout 865MODULE = CFPlus PACKAGE = CFPlus::Layout
711 866
712CFClient::Layout 867void
713new (SV *class, int rgba = 0) 868reset_glyph_cache ()
869 CODE:
870 tc_clear ();
871
872CFPlus::Layout
873new (SV *class)
714 CODE: 874 CODE:
715 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
716 876
717 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 877 RETVAL->pl = pango_layout_new (opengl_context);
718 RETVAL->rgba = rgba;
719 RETVAL->r = 1.; 878 RETVAL->r = 1.;
720 RETVAL->g = 1.; 879 RETVAL->g = 1.;
721 RETVAL->b = 1.; 880 RETVAL->b = 1.;
722 RETVAL->a = 1.; 881 RETVAL->a = 1.;
723 RETVAL->base_height = MIN_FONT_HEIGHT; 882 RETVAL->base_height = MIN_FONT_HEIGHT;
727 layout_update_font (RETVAL); 886 layout_update_font (RETVAL);
728 OUTPUT: 887 OUTPUT:
729 RETVAL 888 RETVAL
730 889
731void 890void
732DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
733 CODE: 892 CODE:
734 g_object_unref (self->pl); 893 g_object_unref (self->pl);
735 Safefree (self); 894 Safefree (self);
736 895
896void
897set_text (CFPlus::Layout self, SV *text_)
898 CODE:
899{
900 STRLEN textlen;
901 char *text = SvPVutf8 (text_, textlen);
902
903 pango_layout_set_text (self->pl, text, textlen);
904}
905
906void
907set_markup (CFPlus::Layout self, SV *text_)
908 CODE:
909{
910 STRLEN textlen;
911 char *text = SvPVutf8 (text_, textlen);
912
913 pango_layout_set_markup (self->pl, text, textlen);
914}
915
916void
917set_shapes (CFPlus::Layout self, ...)
918 CODE:
919{
920 PangoAttrList *attrs = 0;
921 const char *text = pango_layout_get_text (self->pl);
922 const char *pos = text;
923 int arg = 4;
924
925 while (arg < items && (pos = strstr (pos, OBJ_STR)))
926 {
927 PangoRectangle inkrect, rect;
928 PangoAttribute *attr;
929
930 int x = SvIV (ST (arg - 3));
931 int y = SvIV (ST (arg - 2));
932 int w = SvIV (ST (arg - 1));
933 int h = SvIV (ST (arg ));
934
935 inkrect.x = 0;
936 inkrect.y = 0;
937 inkrect.width = 0;
938 inkrect.height = 0;
939
940 rect.x = x * PANGO_SCALE;
941 rect.y = y * PANGO_SCALE;
942 rect.width = w * PANGO_SCALE;
943 rect.height = h * PANGO_SCALE;
944
945 if (!attrs)
946 attrs = pango_layout_get_attributes (self->pl);
947
948 attr = pango_attr_shape_new (&inkrect, &rect);
949 attr->start_index = pos - text;
950 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
951 pango_attr_list_insert (attrs, attr);
952
953 arg += 4;
954 pos += sizeof (OBJ_STR) - 1;
955 }
956
957 if (attrs)
958 pango_layout_set_attributes (self->pl, attrs);
959}
960
961void
962get_shapes (CFPlus::Layout self)
963 PPCODE:
964{
965 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
966
967 do
968 {
969 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
970
971 if (run && shape_attr_p (run))
972 {
973 PangoRectangle extents;
974 pango_layout_iter_get_run_extents (iter, 0, &extents);
975
976 EXTEND (SP, 2);
977 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
978 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
979 }
980 }
981 while (pango_layout_iter_next_run (iter));
982
983 pango_layout_iter_free (iter);
984}
985
737int 986int
738is_rgba (CFClient::Layout self) 987has_wrapped (CFPlus::Layout self)
739 CODE: 988 CODE:
740 RETVAL = self->rgba; 989{
990 int lines = 1;
991 const char *text = pango_layout_get_text (self->pl);
992
993 while (*text)
994 lines += *text++ == '\n';
995
996 RETVAL = lines < pango_layout_get_line_count (self->pl);
997}
741 OUTPUT: 998 OUTPUT:
742 RETVAL 999 RETVAL
743 1000
744void
745set_text (CFClient::Layout self, SV *text_)
746 CODE:
747{
748 STRLEN textlen;
749 char *text = SvPVutf8 (text_, textlen);
750
751 pango_layout_set_text (self->pl, text, textlen);
752}
753
754void
755set_markup (CFClient::Layout self, SV *text_)
756 CODE:
757{
758 STRLEN textlen;
759 char *text = SvPVutf8 (text_, textlen);
760
761 pango_layout_set_markup (self->pl, text, textlen);
762}
763
764SV * 1001SV *
765get_text (CFClient::Layout self) 1002get_text (CFPlus::Layout self)
766 CODE: 1003 CODE:
767 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
768 SvUTF8_on (RETVAL); 1005 sv_utf8_decode (RETVAL);
769 OUTPUT: 1006 OUTPUT:
770 RETVAL 1007 RETVAL
771 1008
772void 1009void
773set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1010set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
774 CODE: 1011 CODE:
775 self->r = r; 1012 self->r = r;
776 self->g = g; 1013 self->g = g;
777 self->b = b; 1014 self->b = b;
778 self->a = a; 1015 self->a = a;
779 1016
780void 1017void
781set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
782 CODE: 1019 CODE:
783 if (self->font != font) 1020 if (self->font != font)
784 { 1021 {
785 self->font = font; 1022 self->font = font;
786 layout_update_font (self); 1023 layout_update_font (self);
787 } 1024 }
788 1025
789void 1026void
790set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
791 CODE: 1028 CODE:
792 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
793 { 1030 {
794 self->base_height = base_height; 1031 self->base_height = base_height;
795 layout_update_font (self); 1032 layout_update_font (self);
796 } 1033 }
797 1034
798void 1035void
799set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
800 CODE: 1037 CODE:
801 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1038 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
802 1039
803void 1040void
1041set_indent (CFPlus::Layout self, int indent)
1042 CODE:
1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1044
1045void
1046set_spacing (CFPlus::Layout self, int spacing)
1047 CODE:
1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1049
1050void
1051set_ellipsise (CFPlus::Layout self, int ellipsise)
1052 CODE:
1053 pango_layout_set_ellipsize (self->pl,
1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1057 : PANGO_ELLIPSIZE_NONE
1058 );
1059
1060void
1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
1062 CODE:
1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1064
1065void
804size (CFClient::Layout self) 1066size (CFPlus::Layout self)
805 PPCODE: 1067 PPCODE:
806{ 1068{
807 int w, h; 1069 int w, h;
808 1070
809 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
812 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
813 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
814} 1076}
815 1077
816int 1078int
1079descent (CFPlus::Layout self)
1080 CODE:
1081{
1082 PangoRectangle rect;
1083 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1084 pango_layout_line_get_pixel_extents (line, 0, &rect);
1085 RETVAL = PANGO_DESCENT (rect);
1086}
1087 OUTPUT:
1088 RETVAL
1089
1090int
817xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
818 CODE: 1092 CODE:
819{ 1093{
820 int index, trailing; 1094 int index, trailing;
821 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1095 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
822 RETVAL = index; 1096 RETVAL = index + trailing;
823} 1097}
824 OUTPUT: 1098 OUTPUT:
825 RETVAL 1099 RETVAL
826 1100
827void 1101void
828cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
829 PPCODE: 1103 PPCODE:
830{ 1104{
831 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
832 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
833 1107
836 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
837 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
838} 1112}
839 1113
840void 1114void
841render (CFClient::Layout self) 1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
842 PPCODE: 1116 PPCODE:
843{ 1117{
844 SV *retval; 1118 int line, x;
845 int w, h;
846 1119
847 layout_get_pixel_size (self, &w, &h); 1120 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1121 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
848 1122
849 if (self->rgba)
850 {
851 cairo_surface_t *surface;
852 cairo_t *cairo;
853
854 retval = newSV (w * h * 4);
855 SvPOK_only (retval);
856 SvCUR_set (retval, w * h * 4);
857
858 memset (SvPVX (retval), 0, w * h * 4);
859
860 surface = cairo_image_surface_create_for_data (
861 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
862 cairo = cairo_create (surface);
863 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
864
865 pango_cairo_show_layout (cairo, self->pl);
866
867 cairo_destroy (cairo);
868 cairo_surface_destroy (surface);
869
870 // what a mess, and its premultiplied, too :(
871 {
872 uint32_t *p = (uint32_t *)SvPVX (retval);
873 uint32_t *e = p + w * h;
874
875 while (p < e)
876 {
877 uint32_t rgba = *p;
878 rgba = (rgba >> 24) | (rgba << 8);
879 rgba = SDL_SwapBE32 (rgba);
880 *p++ = rgba;
881 }
882 }
883
884 EXTEND (SP, 5); 1123 EXTEND (SP, 2);
885 PUSHs (sv_2mortal (newSViv (w))); 1124 PUSHs (sv_2mortal (newSViv (line - 1)));
1125 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1126}
1127
1128void
1129line_x_to_index (CFPlus::Layout self, int line, int x)
1130 PPCODE:
1131{
1132 PangoLayoutLine *lp;
1133 int index, trailing;
1134
1135 if (line < 0)
1136 XSRETURN_EMPTY;
1137
1138 if (!(lp = pango_layout_get_line (self->pl, line)))
1139 XSRETURN_EMPTY; /* do better */
1140
1141 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1142
1143 EXTEND (SP, 2);
1144 if (GIMME_V == G_SCALAR)
886 PUSHs (sv_2mortal (newSViv (h))); 1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
887 PUSHs (sv_2mortal (retval));
888 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
890 }
891 else 1146 else
892 { 1147 {
893 FT_Bitmap bitmap;
894
895 retval = newSV (w * h);
896 SvPOK_only (retval);
897 SvCUR_set (retval, w * h);
898
899 bitmap.rows = h;
900 bitmap.width = w;
901 bitmap.pitch = w;
902 bitmap.buffer = (unsigned char*)SvPVX (retval);
903 bitmap.num_grays = 256;
904 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
905
906 memset (bitmap.buffer, 0, w * h);
907
908 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
909
910 EXTEND (SP, 5);
911 PUSHs (sv_2mortal (newSViv (w))); 1148 PUSHs (sv_2mortal (newSViv (index)));
912 PUSHs (sv_2mortal (newSViv (h))); 1149 PUSHs (sv_2mortal (newSViv (trailing)));
913 PUSHs (sv_2mortal (retval));
914 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
916 } 1150 }
917} 1151}
918 1152
1153void
1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1155 PPCODE:
1156 pango_opengl_render_layout_subpixel (
1157 self->pl,
1158 x * PANGO_SCALE, y * PANGO_SCALE,
1159 self->r, self->g, self->b, self->a,
1160 flags
1161 );
1162
919MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
920 1164
921void 1165void
1166pad2pot (SV *data_, SV *w_, SV *h_)
1167 CODE:
1168{
1169 int ow = SvIV (w_);
1170 int oh = SvIV (h_);
1171
1172 if (ow && oh)
1173 {
1174 int nw = minpot (ow);
1175 int nh = minpot (oh);
1176
1177 if (nw != ow || nh != oh)
1178 {
1179 if (SvOK (data_))
1180 {
1181 STRLEN datalen;
1182 char *data = SvPVbyte (data_, datalen);
1183 int bpp = datalen / (ow * oh);
1184 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1185
1186 SvPOK_only (result_);
1187 SvCUR_set (result_, nw * nh * bpp);
1188
1189 memset (SvPVX (result_), 0, nw * nh * bpp);
1190 while (oh--)
1191 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1192
1193 sv_setsv (data_, result_);
1194 }
1195
1196 sv_setiv (w_, nw);
1197 sv_setiv (h_, nh);
1198 }
1199 }
1200}
1201
1202void
922draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1203draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
923 PROTOTYPE: $$$;$$ 1204 PROTOTYPE: $$$;$$
924 ALIAS: 1205 ALIAS:
925 draw_quad_alpha = 1 1206 draw_quad_alpha = 1
926 draw_quad_alpha_premultiplied = 2 1207 draw_quad_alpha_premultiplied = 2
927 CODE: 1208 CODE:
928{ 1209{
929 HV *hv = (HV *)SvRV (self); 1210 HV *hv = (HV *)SvRV (self);
930 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1211 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
931 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1212 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
932 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1213 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
933 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
934 1214
935 if (items < 5) 1215 if (items < 5)
936 { 1216 {
937 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1217 w = SvNV (*hv_fetch (hv, "w", 1, 1));
938 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1218 h = SvNV (*hv_fetch (hv, "h", 1, 1));
939 } 1219 }
940 1220
941 if (ix) 1221 if (ix)
942 { 1222 {
943 glEnable (GL_BLEND); 1223 glEnable (GL_BLEND);
1224
1225 if (ix == 2)
944 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1226 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1227 else
1228 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1229 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1230
1231 glEnable (GL_ALPHA_TEST);
1232 glAlphaFunc (GL_GREATER, 0.01f);
945 } 1233 }
946 1234
947 glBindTexture (GL_TEXTURE_2D, name); 1235 glBindTexture (GL_TEXTURE_2D, name);
948
949 if (wrap_mode)
950 {
951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
952 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
953 }
954 1236
955 glBegin (GL_QUADS); 1237 glBegin (GL_QUADS);
956 glTexCoord2f (0, 0); glVertex2f (x , y ); 1238 glTexCoord2f (0, 0); glVertex2f (x , y );
957 glTexCoord2f (0, t); glVertex2f (x , y + h); 1239 glTexCoord2f (0, t); glVertex2f (x , y + h);
958 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1240 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1241 glTexCoord2f (s, 0); glVertex2f (x + w, y );
960 glEnd (); 1242 glEnd ();
961 1243
962 if (ix) 1244 if (ix)
1245 {
1246 glDisable (GL_ALPHA_TEST);
963 glDisable (GL_BLEND); 1247 glDisable (GL_BLEND);
1248 }
964} 1249}
965 1250
966MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
967 1252
968CFClient::Map 1253CFPlus::Map
969new (SV *class, int map_width, int map_height) 1254new (SV *class)
970 CODE: 1255 CODE:
971 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
972 RETVAL->x = 0; 1257 RETVAL->x = 0;
973 RETVAL->y = 0; 1258 RETVAL->y = 0;
974 RETVAL->w = map_width; 1259 RETVAL->w = 0;
975 RETVAL->h = map_height; 1260 RETVAL->h = 0;
976 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
977 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
978 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
979 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
980 RETVAL->texs = 8192;
981 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
982 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
983 RETVAL->row = 0; 1266 RETVAL->row = 0;
984 OUTPUT: 1267 OUTPUT:
985 RETVAL 1268 RETVAL
986 1269
987void 1270void
988DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
989 CODE: 1272 CODE:
990{ 1273{
991 map_clear (self); 1274 map_clear (self);
992 Safefree (self->face); 1275 Safefree (self->face2tile);
1276 Safefree (self->tex);
993 Safefree (self); 1277 Safefree (self);
994} 1278}
995 1279
996void 1280void
1281resize (CFPlus::Map self, int map_width, int map_height)
1282 CODE:
1283 self->w = map_width;
1284 self->h = map_height;
1285
1286void
997clear (CFClient::Map self) 1287clear (CFPlus::Map self)
998 CODE: 1288 CODE:
999 map_clear (self); 1289 map_clear (self);
1000 1290
1001void 1291void
1002set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1003 CODE: 1293 CODE:
1004{ 1294{
1005 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1006 { 1296 need_texid (self, tile);
1007 Append (mapface, self->face, self->faces, self->faces);
1008 self->faces *= 2;
1009 }
1010
1011 self->face [face] = texid;
1012} 1297}
1013 1298
1014void 1299void
1015set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1300set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1016 CODE: 1301 CODE:
1017{ 1302{
1018 while (self->texs <= texid) 1303 need_texid (self, texid);
1019 {
1020 Append (maptex, self->tex, self->texs, self->texs);
1021 self->texs *= 2;
1022 }
1023 1304
1024 { 1305 {
1025 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1026 1307
1027 tex->name = name; 1308 tex->name = name;
1032 tex->r = r; 1313 tex->r = r;
1033 tex->g = g; 1314 tex->g = g;
1034 tex->b = b; 1315 tex->b = b;
1035 tex->a = a; 1316 tex->a = a;
1036 } 1317 }
1318
1319 // somewhat hackish, but for textures that require it, it really
1320 // improves the look, and most others don't suffer.
1321 glBindTexture (GL_TEXTURE_2D, name);
1322 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1323 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1324 // use uglier nearest interpolation because linear suffers
1325 // from transparent color bleeding and ugly wrapping effects.
1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1037} 1327}
1038 1328
1039int 1329int
1040ox (CFClient::Map self) 1330ox (CFPlus::Map self)
1041 ALIAS: 1331 ALIAS:
1042 oy = 1 1332 oy = 1
1333 x = 2
1334 y = 3
1335 w = 4
1336 h = 5
1043 CODE: 1337 CODE:
1044 switch (ix) 1338 switch (ix)
1045 { 1339 {
1046 case 0: RETVAL = self->ox; break; 1340 case 0: RETVAL = self->ox; break;
1047 case 1: RETVAL = self->oy; break; 1341 case 1: RETVAL = self->oy; break;
1342 case 2: RETVAL = self->x; break;
1343 case 3: RETVAL = self->y; break;
1344 case 4: RETVAL = self->w; break;
1345 case 5: RETVAL = self->h; break;
1048 } 1346 }
1049 OUTPUT: 1347 OUTPUT:
1050 RETVAL 1348 RETVAL
1051 1349
1052void 1350void
1053scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1054 CODE: 1352 CODE:
1055{ 1353{
1056 if (dx > 0) 1354 if (dx > 0)
1057 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1058 else if (dx < 0) 1356 else if (dx < 0)
1059 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1357 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1060 1358
1061 if (dy > 0) 1359 if (dy > 0)
1062 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1063 else if (dy < 0) 1361 else if (dy < 0)
1064 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1362 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1065 1363
1066 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1067 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1068 1366
1069 while (self->y < 0) 1367 while (self->y < 0)
1074 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1075 } 1373 }
1076} 1374}
1077 1375
1078void 1376void
1079map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1080 CODE: 1378 CODE:
1081{ 1379{
1082 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1083 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1084 mapcell *cell; 1382 mapcell *cell;
1085 int x, y, flags; 1383 int x, y, flags;
1086 1384
1087 while (data < data_end) 1385 while (data < data_end - 1)
1088 { 1386 {
1089 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1090 1388
1091 x = ((flags >> 10) & 63) + self->x; 1389 x = self->x + ((flags >> 10) & 63);
1092 y = ((flags >> 4) & 63) + self->y; 1390 y = self->y + ((flags >> 4) & 63);
1093 1391
1094 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1095 1393
1096 if (flags & 15) 1394 if (flags & 15)
1097 { 1395 {
1098 if (cell->darkness < 0) 1396 if (!cell->darkness)
1099 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1100 cell->darkness = 0; 1399 cell->darkness = 256;
1101 cell->face [0] = 0;
1102 cell->face [1] = 0;
1103 cell->face [2] = 0;
1104 } 1400 }
1105 1401
1106 cell->darkness = flags & 8 ? *data++ : 255;
1107
1108 //TODO: don't trust server data to be in-range(!) 1402 //TODO: don't trust server data to be in-range(!)
1403
1404 if (flags & 8)
1405 {
1406 if (extmap)
1407 {
1408 uint8_t ext, cmd;
1409
1410 do
1411 {
1412 ext = *data++;
1413 cmd = ext & 0x3f;
1414
1415 if (cmd < 4)
1416 cell->darkness = 255 - ext * 64 + 1;
1417 else if (cmd == 5) // health
1418 {
1419 cell->stat_width = 1;
1420 cell->stat_hp = *data++;
1421 }
1422 else if (cmd == 6) // monster width
1423 cell->stat_width = *data++ + 1;
1424 else if (cmd == 0x47)
1425 {
1426 if (*data == 8)
1427 ; // decode player uuid
1428
1429 data += *data + 1;
1430 }
1431 else if (cmd == 8) // cell flags
1432 cell->flags = *data++;
1433 else if (ext & 0x40) // unknown, multibyte => skip
1434 data += *data + 1;
1435 else
1436 data++;
1437 }
1438 while (ext & 0x80);
1439 }
1440 else
1441 cell->darkness = *data++ + 1;
1442 }
1109 1443
1110 if (flags & 4) 1444 if (flags & 4)
1111 { 1445 {
1112 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1446 faceid face = (data [0] << 8) + data [1]; data += 2;
1447 need_facenum (self, face);
1448 cell->tile [0] = self->face2tile [face];
1113 } 1449 }
1114 1450
1115 if (flags & 2) 1451 if (flags & 2)
1116 { 1452 {
1117 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1453 faceid face = (data [0] << 8) + data [1]; data += 2;
1454 need_facenum (self, face);
1455 cell->tile [1] = self->face2tile [face];
1118 } 1456 }
1119 1457
1120 if (flags & 1) 1458 if (flags & 1)
1121 { 1459 {
1122 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1460 faceid face = (data [0] << 8) + data [1]; data += 2;
1461 need_facenum (self, face);
1462 cell->tile [2] = self->face2tile [face];
1123 } 1463 }
1124 } 1464 }
1125 else 1465 else
1126 cell->darkness = -1; 1466 cell->darkness = 0;
1127 } 1467 }
1128} 1468}
1129 1469
1130SV * 1470SV *
1131mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1132 CODE: 1472 CODE:
1133{ 1473{
1134 int x1, x; 1474 int x1, x;
1135 int y1, y; 1475 int y1, y;
1136 int z; 1476 int z;
1157 { 1497 {
1158 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1159 1499
1160 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1161 { 1501 {
1162 mapface face = cell->face [z];
1163
1164 if (face)
1165 {
1166 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1167 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1168 int a1 = tex.a; 1504 int a1 = tex.a;
1169 1505
1170 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1171 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1172 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1173 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1174 }
1175 } 1510 }
1176 } 1511 }
1177 1512
1178 *map++ = (r ) 1513 *map++ = (r )
1179 | (g << 8) 1514 | (g << 8)
1186} 1521}
1187 OUTPUT: 1522 OUTPUT:
1188 RETVAL 1523 RETVAL
1189 1524
1190void 1525void
1191draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1526draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1192 PPCODE: 1527 CODE:
1193{ 1528{
1194 int vx, vy;
1195 int x, y, z; 1529 int x, y, z;
1196 int last_name; 1530 int last_name;
1197 mapface face;
1198 int sw4 = (sw + 3) & ~3;
1199 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1200 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1201
1202 memset (darkness, 255, sw4 * sh);
1203 SvPOK_only (darkness_sv);
1204 SvCUR_set (darkness_sv, sw4 * sh);
1205
1206 vx = self->x + (self->w - sw) / 2 - shift_x;
1207 vy = self->y + (self->h - sh) / 2 - shift_y;
1208
1209 /*
1210 int vx = self->vx = self->w >= sw
1211 ? self->x + (self->w - sw) / 2
1212 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1213
1214 int vy = self->vy = self->h >= sh
1215 ? self->y + (self->h - sh) / 2
1216 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1217 */
1218 1531
1219 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1220 1533
1534 glEnable (GL_BLEND);
1221 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1222 glEnable (GL_BLEND);
1223 glEnable (GL_TEXTURE_2D); 1536 glEnable (GL_TEXTURE_2D);
1224 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1225 1538
1226 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1227 1540
1228 last_name = 0; 1541 last_name = 0;
1229 1542
1543 mx += self->x;
1544 my += self->y;
1545
1230 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1231 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1232 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1233 { 1549 {
1234 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1235 1551
1236 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1237 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1238 { 1554 {
1239 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1240
1241 darkness[y * sw4 + x] = cell->darkness < 0
1242 ? 255 - FOW_DARKNESS
1243 : 255 - cell->darkness;
1244
1245 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1246 1557
1247 if (face) 1558 if (tile)
1248 { 1559 {
1249 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1250
1251 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1252 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1253 1563
1254 if (last_name != tex.name) 1564 if (last_name != tex.name)
1255 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1256 glEnd (); 1569 glEnd ();
1257 last_name = tex.name;
1258 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1259 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1260 } 1572 }
1261 1573
1262 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1263 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1264 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1576 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1265 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1577 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579 if (cell->flags && z == 2)
1580 {
1581 if (cell->flags & 1)
1582 {
1583 maptex tex = self->tex [1];
1584 int px = x * T + T * 2 / 32;
1585 int py = y * T - T * 6 / 32;
1586
1587 glEnd ();
1588 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589 glBegin (GL_QUADS);
1590
1591 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1592 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1593 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1594 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1595 }
1596 }
1266 } 1597 }
1267 } 1598 }
1268 } 1599 }
1269 1600
1270 glEnd (); 1601 glEnd ();
1271 1602
1272 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1273 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1605
1606 // top layer: overlays such as the health bar
1607 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows)
1609 {
1610 maprow *row = self->row + (y + my);
1611
1612 for (x = 0; x < sw; x++)
1613 if (row->c0 <= x + mx && x + mx < row->c1)
1614 {
1615 mapcell *cell = row->col + (x + mx - row->c0);
1616
1617 int px = x * T;
1618 int py = y * T;
1619
1620 if (cell->stat_hp)
1621 {
1622 int width = cell->stat_width * T;
1623 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1624
1625 glColor3ub (0, 0, 0);
1626 glRectf (px + 1, py - thick - 2,
1627 px + width - 1, py);
1628
1629 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1630 glRectf (px + 2,
1631 py - thick - 1,
1632 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1633 }
1634 }
1635 }
1636}
1637
1638void
1639draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1640 CODE:
1641{
1642 static float color[16][3] = {
1643 { 0.00F, 0.00F, 0.00F },
1644 { 1.00F, 1.00F, 1.00F },
1645 { 0.00F, 0.00F, 0.55F },
1646 { 1.00F, 0.00F, 0.00F },
1647
1648 { 1.00F, 0.54F, 0.00F },
1649 { 0.11F, 0.56F, 1.00F },
1650 { 0.93F, 0.46F, 0.00F },
1651 { 0.18F, 0.54F, 0.34F },
1652
1653 { 0.56F, 0.73F, 0.56F },
1654 { 0.80F, 0.80F, 0.80F },
1655 { 0.55F, 0.41F, 0.13F },
1656 { 0.99F, 0.77F, 0.26F },
1657
1658 { 0.74F, 0.65F, 0.41F },
1659
1660 { 0.00F, 1.00F, 1.00F },
1661 { 1.00F, 0.00F, 1.00F },
1662 { 1.00F, 1.00F, 0.00F },
1663 };
1664
1665 int x, y;
1666
1667 glEnable (GL_TEXTURE_2D);
1668 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1669 glEnable (GL_BLEND);
1670 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1671 glBegin (GL_QUADS);
1672
1673 for (y = 0; y < h; y++)
1674 for (x = 0; x < w; x++)
1675 {
1676 unsigned char m = data [x + y * w];
1677
1678 if (m)
1679 {
1680 float *c = color [m & 15];
1681
1682 float tx1 = m & 0x40 ? 0.5 : 0.;
1683 float tx2 = tx1 + 0.5;
1684
1685 glColor4f (c[0], c[1], c[2], 0.75);
1686 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1687 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1688 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1689 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1690 }
1691 }
1692
1693 glEnd ();
1694 glDisable (GL_BLEND);
1695 glDisable (GL_TEXTURE_2D);
1696}
1697
1698void
1699fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1700 PPCODE:
1701{
1702 int x, y;
1703 int sw4 = (sw + 3) & ~3;
1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1706
1707 memset (darkness, 255, sw4 * sh);
1708 SvPOK_only (darkness_sv);
1709 SvCUR_set (darkness_sv, sw4 * sh);
1710
1711 mx += self->x;
1712 my += self->y;
1713
1714 for (y = 0; y < sh; y++)
1715 if (0 <= y + my && y + my < self->rows)
1716 {
1717 maprow *row = self->row + (y + my);
1718
1719 for (x = 0; x < sw; x++)
1720 if (row->c0 <= x + mx && x + mx < row->c1)
1721 {
1722 mapcell *cell = row->col + (x + mx - row->c0);
1723
1724 darkness[y * sw4 + x] = cell->darkness
1725 ? 255 - (cell->darkness - 1)
1726 : 255 - FOW_DARKNESS;
1727 }
1728 }
1274 1729
1275 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1276 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1277 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1278 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1279} 1734}
1280 1735
1281SV * 1736SV *
1282get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1737get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1283 CODE: 1738 CODE:
1284{ 1739{
1285 int x, y, x1, y1; 1740 int x, y, x1, y1;
1286 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1287 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1312 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1313 { 1768 {
1314 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1315 uint8_t flags = 0; 1770 uint8_t flags = 0;
1316 1771
1317 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1318 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1319 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1320 1775
1321 *data++ = flags; 1776 *data++ = flags;
1322 1777
1323 if (flags & 1) 1778 if (flags & 1)
1324 { 1779 {
1780 tileid tile = cell->tile [0];
1325 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1326 *data++ = cell->face [0]; 1782 *data++ = tile;
1327 } 1783 }
1328 1784
1329 if (flags & 2) 1785 if (flags & 2)
1330 { 1786 {
1787 tileid tile = cell->tile [1];
1331 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1332 *data++ = cell->face [1]; 1789 *data++ = tile;
1333 } 1790 }
1334 1791
1335 if (flags & 4) 1792 if (flags & 4)
1336 { 1793 {
1794 tileid tile = cell->tile [2];
1337 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1338 *data++ = cell->face [2]; 1796 *data++ = tile;
1339 } 1797 }
1340 } 1798 }
1341 else 1799 else
1342 *data++ = 0; 1800 *data++ = 0;
1343 } 1801 }
1349} 1807}
1350 OUTPUT: 1808 OUTPUT:
1351 RETVAL 1809 RETVAL
1352 1810
1353void 1811void
1354set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1355 PPCODE: 1813 PPCODE:
1356{ 1814{
1357 int x, y, z; 1815 int x, y, z;
1358 int w, h; 1816 int w, h;
1359 int x1, y1; 1817 int x1, y1;
1383 { 1841 {
1384 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1385 1843
1386 if (flags) 1844 if (flags)
1387 { 1845 {
1388 mapface face[3] = { 0, 0, 0 };
1389
1390 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1391 1848
1392 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1393 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1394 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1395 1852
1396 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1397 { 1854 {
1398 cell->darkness = -1; 1855 cell->darkness = 0;
1399 1856
1400 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1401 { 1858 {
1402 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1403 1860
1404 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || (t && !self->tex [t].name))
1862 {
1405 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1406 } 1868 }
1407 } 1869 }
1408 } 1870 }
1409 } 1871 }
1410 } 1872 }
1411} 1873}
1412 1874
1413MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1414 1876
1415CFClient::MixChunk 1877CFPlus::MixChunk
1416new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1417 CODE: 1879 CODE:
1418 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1419 OUTPUT: 1881 OUTPUT:
1420 RETVAL 1882 RETVAL
1421 1883
1422void 1884void
1423DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1424 CODE: 1886 CODE:
1425 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1426 1888
1427int 1889int
1428volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1429 CODE: 1891 CODE:
1430 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1431 OUTPUT: 1893 OUTPUT:
1432 RETVAL 1894 RETVAL
1433 1895
1434int 1896int
1435play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1897play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1436 CODE: 1898 CODE:
1437 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1438 OUTPUT: 1900 OUTPUT:
1439 RETVAL 1901 RETVAL
1440 1902
1441MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1442 1904
1443int 1905int
1444volume (int volume = -1) 1906volume (int volume = -1)
1445 CODE: 1907 CODE:
1446 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1447 OUTPUT: 1909 OUTPUT:
1448 RETVAL 1910 RETVAL
1449 1911
1450CFClient::MixMusic 1912CFPlus::MixMusic
1451new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1452 CODE: 1914 CODE:
1453 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1454 OUTPUT: 1916 OUTPUT:
1455 RETVAL 1917 RETVAL
1456 1918
1457void 1919void
1458DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1459 CODE: 1921 CODE:
1460 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1461 1923
1462int 1924int
1463play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1464 CODE: 1926 CODE:
1465 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1466 OUTPUT: 1928 OUTPUT:
1467 RETVAL 1929 RETVAL
1468 1930
1469MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1470 1932
1471BOOT: 1933BOOT:
1472{ 1934{
1473 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1474 static const struct { 1936 static const struct {
1475 const char *name; 1937 const char *name;
1476 IV iv; 1938 IV iv;
1477 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1478# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
1479 const_iv (GL_COLOR_MATERIAL), 1941 const_iv (GL_COLOR_MATERIAL),
1480 const_iv (GL_SMOOTH), 1942 const_iv (GL_SMOOTH),
1481 const_iv (GL_FLAT), 1943 const_iv (GL_FLAT),
1482 const_iv (GL_DITHER), 1944 const_iv (GL_DITHER),
1483 const_iv (GL_BLEND), 1945 const_iv (GL_BLEND),
1946 const_iv (GL_CULL_FACE),
1484 const_iv (GL_SCISSOR_TEST), 1947 const_iv (GL_SCISSOR_TEST),
1948 const_iv (GL_DEPTH_TEST),
1949 const_iv (GL_ALPHA_TEST),
1950 const_iv (GL_NORMALIZE),
1951 const_iv (GL_RESCALE_NORMAL),
1952 const_iv (GL_FRONT),
1953 const_iv (GL_BACK),
1485 const_iv (GL_AND), 1954 const_iv (GL_AND),
1486 const_iv (GL_ONE), 1955 const_iv (GL_ONE),
1487 const_iv (GL_ZERO), 1956 const_iv (GL_ZERO),
1488 const_iv (GL_SRC_ALPHA), 1957 const_iv (GL_SRC_ALPHA),
1489 const_iv (GL_SRC_ALPHA_SATURATE), 1958 const_iv (GL_DST_ALPHA),
1490 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1959 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491 const_iv (GL_ONE_MINUS_DST_ALPHA), 1960 const_iv (GL_ONE_MINUS_DST_ALPHA),
1961 const_iv (GL_SRC_ALPHA_SATURATE),
1492 const_iv (GL_RGB), 1962 const_iv (GL_RGB),
1493 const_iv (GL_RGBA), 1963 const_iv (GL_RGBA),
1964 const_iv (GL_RGBA4),
1965 const_iv (GL_RGBA8),
1966 const_iv (GL_RGB5_A1),
1494 const_iv (GL_UNSIGNED_BYTE), 1967 const_iv (GL_UNSIGNED_BYTE),
1968 const_iv (GL_UNSIGNED_SHORT),
1969 const_iv (GL_UNSIGNED_INT),
1495 const_iv (GL_ALPHA), 1970 const_iv (GL_ALPHA),
1971 const_iv (GL_INTENSITY),
1496 const_iv (GL_LUMINANCE), 1972 const_iv (GL_LUMINANCE),
1973 const_iv (GL_LUMINANCE_ALPHA),
1497 const_iv (GL_FLOAT), 1974 const_iv (GL_FLOAT),
1498 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1975 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499 const_iv (GL_COMPILE), 1976 const_iv (GL_COMPILE),
1500 const_iv (GL_TEXTURE_1D), 1977 const_iv (GL_TEXTURE_1D),
1501 const_iv (GL_TEXTURE_2D), 1978 const_iv (GL_TEXTURE_2D),
1503 const_iv (GL_TEXTURE_MAG_FILTER), 1980 const_iv (GL_TEXTURE_MAG_FILTER),
1504 const_iv (GL_TEXTURE_MIN_FILTER), 1981 const_iv (GL_TEXTURE_MIN_FILTER),
1505 const_iv (GL_TEXTURE_ENV_MODE), 1982 const_iv (GL_TEXTURE_ENV_MODE),
1506 const_iv (GL_TEXTURE_WRAP_S), 1983 const_iv (GL_TEXTURE_WRAP_S),
1507 const_iv (GL_TEXTURE_WRAP_T), 1984 const_iv (GL_TEXTURE_WRAP_T),
1985 const_iv (GL_REPEAT),
1508 const_iv (GL_CLAMP), 1986 const_iv (GL_CLAMP),
1509 const_iv (GL_REPEAT), 1987 const_iv (GL_CLAMP_TO_EDGE),
1510 const_iv (GL_NEAREST), 1988 const_iv (GL_NEAREST),
1511 const_iv (GL_LINEAR), 1989 const_iv (GL_LINEAR),
1512 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1990 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1513 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1991 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1514 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1992 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1515 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1993 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516 const_iv (GL_GENERATE_MIPMAP), 1994 const_iv (GL_GENERATE_MIPMAP),
1517 const_iv (GL_MODULATE), 1995 const_iv (GL_MODULATE),
1518 const_iv (GL_DECAL), 1996 const_iv (GL_DECAL),
1519 const_iv (GL_REPLACE), 1997 const_iv (GL_REPLACE),
1998 const_iv (GL_DEPTH_BUFFER_BIT),
1520 const_iv (GL_COLOR_BUFFER_BIT), 1999 const_iv (GL_COLOR_BUFFER_BIT),
1521 const_iv (GL_PROJECTION), 2000 const_iv (GL_PROJECTION),
1522 const_iv (GL_MODELVIEW), 2001 const_iv (GL_MODELVIEW),
1523 const_iv (GL_COLOR_LOGIC_OP), 2002 const_iv (GL_COLOR_LOGIC_OP),
1524 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1525 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1526 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1527 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1528 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
2009 const_iv (GL_LINE_LOOP),
1529 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1530 const_iv (GL_LINE_LOOP), 2011 const_iv (GL_QUAD_STRIP),
2012 const_iv (GL_TRIANGLES),
2013 const_iv (GL_TRIANGLE_STRIP),
2014 const_iv (GL_TRIANGLE_FAN),
1531 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2015 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532 const_iv (GL_FASTEST), 2016 const_iv (GL_FASTEST),
2017 const_iv (GL_V2F),
2018 const_iv (GL_V3F),
2019 const_iv (GL_T2F_V3F),
2020 const_iv (GL_T2F_N3F_V3F),
1533# undef const_iv 2021# undef const_iv
1534 }; 2022 };
1535 2023
1536 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2024 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1537 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2025 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1538} 2026}
1539 2027
2028char *
2029gl_vendor ()
2030 CODE:
2031 RETVAL = (char *)glGetString (GL_VENDOR);
2032 OUTPUT:
2033 RETVAL
2034
2035char *
2036gl_version ()
2037 CODE:
2038 RETVAL = (char *)glGetString (GL_VERSION);
2039 OUTPUT:
2040 RETVAL
2041
2042char *
2043gl_extensions ()
2044 CODE:
2045 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2046 OUTPUT:
2047 RETVAL
2048
1540int glGetError () 2049int glGetError ()
2050
2051void glFinish ()
1541 2052
1542void glClear (int mask) 2053void glClear (int mask)
1543 2054
1544void glClearColor (float r, float g, float b, float a = 1.0) 2055void glClearColor (float r, float g, float b, float a = 1.0)
1545 PROTOTYPE: @ 2056 PROTOTYPE: @
1552 2063
1553void glHint (int target, int mode) 2064void glHint (int target, int mode)
1554 2065
1555void glBlendFunc (int sfactor, int dfactor) 2066void glBlendFunc (int sfactor, int dfactor)
1556 2067
2068void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2069 CODE:
2070 gl_BlendFuncSeparate (sa, da, saa, daa);
2071
2072void glDepthMask (int flag)
2073
1557void glLogicOp (int opcode) 2074void glLogicOp (int opcode)
1558 2075
1559void glColorMask (int red, int green, int blue, int alpha) 2076void glColorMask (int red, int green, int blue, int alpha)
1560 2077
1561void glMatrixMode (int mode) 2078void glMatrixMode (int mode)
1564 2081
1565void glPopMatrix () 2082void glPopMatrix ()
1566 2083
1567void glLoadIdentity () 2084void glLoadIdentity ()
1568 2085
2086void glDrawBuffer (int buffer)
2087
2088void glReadBuffer (int buffer)
2089
1569# near and far are due to microsofts buggy c compiler 2090# near_ and far_ are due to microsofts buggy "c" compiler
2091void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2092
2093# near_ and far_ are due to microsofts buggy "c" compiler
1570void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2094void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1571 2095
1572void glViewport (int x, int y, int width, int height) 2096void glViewport (int x, int y, int width, int height)
1573 2097
1574void glScissor (int x, int y, int width, int height) 2098void glScissor (int x, int y, int width, int height)
1589 2113
1590void glEnd () 2114void glEnd ()
1591 2115
1592void glColor (float r, float g, float b, float a = 1.0) 2116void glColor (float r, float g, float b, float a = 1.0)
1593 PROTOTYPE: @ 2117 PROTOTYPE: @
2118 ALIAS:
2119 glColor_premultiply = 1
1594 CODE: 2120 CODE:
1595 glColor4ub (MIN ((int)r * 256., 255), 2121 if (ix)
1596 MIN ((int)g * 256., 255), 2122 {
1597 MIN ((int)b * 256., 255), 2123 r *= a;
1598 MIN ((int)a * 256., 255)); 2124 g *= a;
2125 b *= a;
2126 }
2127 // microsoft visual "c" rounds instead of truncating...
2128 glColor4f (r, g, b, a);
2129
2130void glInterleavedArrays (int format, int stride, char *data)
2131
2132void glDrawElements (int mode, int count, int type, char *indices)
2133
2134# 1.2 void glDrawRangeElements (int mode, int start, int end
2135
2136void glRasterPos (float x, float y, float z = 0.)
2137 CODE:
2138 glRasterPos3f (0, 0, z);
2139 glBitmap (0, 0, 0, 0, x, y, 0);
1599 2140
1600void glVertex (float x, float y, float z = 0.) 2141void glVertex (float x, float y, float z = 0.)
1601 CODE: 2142 CODE:
1602 glVertex3f (x, y, z); 2143 glVertex3f (x, y, z);
1603 2144
1615 2156
1616void glBindTexture (int target, int name) 2157void glBindTexture (int target, int name)
1617 2158
1618void glConvolutionParameter (int target, int pname, float params) 2159void glConvolutionParameter (int target, int pname, float params)
1619 CODE: 2160 CODE:
1620 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2161 if (gl.ConvolutionParameterf)
2162 gl.ConvolutionParameterf (target, pname, params);
1621 2163
1622void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2164void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1623 CODE: 2165 CODE:
1624 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2166 if (gl.ConvolutionFilter2D)
1625 (target, internalformat, width, height, format, type, data)); 2167 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1626 2168
1627void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2169void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1628 CODE: 2170 CODE:
1629 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2171 if (gl.SeparableFilter2D)
1630 (target, internalformat, width, height, format, type, row, column)); 2172 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1631 2173
1632void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2174void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1633 2175
1634void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2176void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1635 2177
1636void glRasterPos (int x, int y) 2178void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637 CODE:
1638 glRasterPos2i (x, y);
1639 2179
1640void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2180void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1641 2181
1642int glGenTexture () 2182int glGenTexture ()
1643 CODE: 2183 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines