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.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.174 by root, Fri Apr 6 07:45:34 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;
128} maptex; 168} maptex;
129 169
130typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
131 int16_t darkness; 173 uint16_t darkness;
132 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
133} mapcell; 175} mapcell;
134 176
135typedef struct { 177typedef struct {
136 int32_t c0, c1; 178 int32_t c0, c1;
137 mapcell *col; 179 mapcell *col;
138} maprow; 180} maprow;
139 181
140typedef struct map { 182typedef struct map {
141 int x, y, w, h; 183 int x, y, w, h;
142 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
143 int faces; 185 int faces; tileid *face2tile; // [faceid]
144 mapface *face; 186 int texs; maptex *tex; // [tileid]
145
146 int texs;
147 maptex *tex;
148 187
149 int32_t rows; 188 int32_t rows;
150 maprow *row; 189 maprow *row;
151} *CFClient__Map; 190} *CFPlus__Map;
152 191
153static char * 192static char *
154prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
155{ 194{
156 char *p; 195 char *p;
173} 212}
174 213
175#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))
176#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))
177 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
178static maprow * 237static maprow *
179map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
180{ 239{
181 if (0 > y) 240 if (0 > y)
182 { 241 {
183 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
222 281
223 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
224} 283}
225 284
226static mapcell * 285static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
228{ 287{
229 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
230} 289}
231 290
232static void 291static void
233map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
234{ 293{
235 int r; 294 int r;
236 295
237 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
246 self->row = 0; 305 self->row = 0;
247 self->rows = 0; 306 self->rows = 0;
248} 307}
249 308
250static void 309static void
251map_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)
252{ 311{
253 int x, y; 312 int x, y;
254 maprow *row; 313 maprow *row;
314 mapcell *cell;
255 315
256 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 317 if (y >= 0)
258 { 318 {
259 if (y >= self->rows) 319 if (y >= self->rows)
265 if (x >= row->c0) 325 if (x >= row->c0)
266 { 326 {
267 if (x >= row->c1) 327 if (x >= row->c1)
268 break; 328 break;
269 329
270 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;
271 } 336 }
272 } 337 }
273} 338}
274 339
275static void 340static void
296 ev.data2 = 0; 361 ev.data2 = 0;
297 362
298 SDL_PushEvent ((SDL_Event *)&ev); 363 SDL_PushEvent ((SDL_Event *)&ev);
299} 364}
300 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
301MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
302 388
303PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
304 390
305BOOT: 391BOOT:
306{ 392{
307 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 394 static const struct {
309 const char *name; 395 const char *name;
310 IV iv; 396 IV iv;
311 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
312# 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
313 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
314 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
315 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
316 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
317 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
326 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
327 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
328 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
329 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
330 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
331 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
332 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
333 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
334 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
335 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
390 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
391 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
392 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
393 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
394 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
395 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
397 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
398 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
399 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
400 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
401 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
402 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
403 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
404 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
405 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
406 const_iv (KMOD_MODE), 505 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 506# undef const_iv
412 }; 507 };
413 508
414 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; )
415 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);
416} 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)
417 532
418void 533void
419pango_init () 534pango_init ()
420 CODE: 535 CODE:
421{ 536{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 537 opengl_fontmap = pango_opengl_font_map_new ();
424 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);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 539 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} 540}
430 541
431int 542int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 543SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 544
434void 545void
435SDL_Quit () 546SDL_Quit ()
436 547
437void 548void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 555 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 556 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 557 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 558
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 559 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 560 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 561
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 562 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 566
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 567 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568#if SDL_VERSION_ATLEAST(1,2,10)
569 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571#endif
457 572
458 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 575
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 594SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 595 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 596 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 597 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 598 );
599 if (RETVAL)
600 {
484 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 }
485 OUTPUT: 606 OUTPUT:
486 RETVAL 607 RETVAL
487 608
488void 609void
489SDL_GL_SwapBuffers () 610SDL_GL_SwapBuffers ()
490 611
612char *
613SDL_GetKeyName (int sym)
614
491void 615void
492SDL_PollEvent () 616SDL_PollEvent ()
493 PPCODE: 617 PPCODE:
494{ 618{
495 SDL_Event ev; 619 SDL_Event ev;
496 int i;
497 static int modifier;
498 static int modkey[] = {
499 SDLK_RSHIFT, KMOD_RSHIFT,
500 SDLK_LSHIFT, KMOD_LSHIFT,
501 SDLK_RCTRL, KMOD_RCTRL,
502 SDLK_LCTRL, KMOD_LCTRL,
503 SDLK_RALT, KMOD_RALT,
504 SDLK_LALT, KMOD_LALT,
505 SDLK_RMETA, KMOD_RMETA,
506 SDLK_LMETA, KMOD_LMETA,
507 };
508 620
509 while (SDL_PollEvent (&ev)) 621 while (SDL_PollEvent (&ev))
510 { 622 {
511 HV *hv = newHV (); 623 HV *hv = newHV ();
512 hv_store (hv, "type", 4, newSViv (ev.type), 0); 624 hv_store (hv, "type", 4, newSViv (ev.type), 0);
513 625
514 switch (ev.type) 626 switch (ev.type)
515 { 627 {
516 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
517 case SDL_KEYUP: 629 case SDL_KEYUP:
518
519 for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520 if (modkey [i * 2] == ev.key.keysym.sym)
521 {
522 if (ev.type == SDL_KEYDOWN)
523 modifier |= modkey [i * 2 + 1];
524 else
525 modifier &= ~modkey [i * 2 + 1];
526 break;
527 }
528
529 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531 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 */
532 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533 break; 635 break;
534 636
535 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
536 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 639 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538 break; 640 break;
539 641
540 case SDL_MOUSEMOTION: 642 case SDL_MOUSEMOTION:
541 hv_store (hv, "mod", 3, newSViv (modifier), 0); 643 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542 644
543 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 645 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 646 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 647 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 648 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 649 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548 break; 650 break;
549 651
550 case SDL_MOUSEBUTTONDOWN: 652 case SDL_MOUSEBUTTONDOWN:
551 case SDL_MOUSEBUTTONUP: 653 case SDL_MOUSEBUTTONUP:
552 hv_store (hv, "mod", 3, newSViv (modifier), 0); 654 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553 655
554 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 656 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 657 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 658 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 659 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
562 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
563 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
564 break; 666 break;
565 } 667 }
566 668
567 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
568 } 670 }
569} 671}
570 672
571int 673int
572Mix_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)
585 CODE: 687 CODE:
586#ifndef _WIN32 688#ifndef _WIN32
587 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588#endif 690#endif
589 691
590char * 692void
591gl_vendor () 693win32_proxy_info ()
592 CODE: 694 PPCODE:
593 RETVAL = (char *)glGetString (GL_VENDOR); 695{
594 OUTPUT: 696#ifdef _WIN32
595 RETVAL 697 char buffer[2048];
698 DWORD buflen;
596 699
597char * 700 EXTEND (SP, 3);
598gl_version () 701
599 CODE: 702 buflen = sizeof (buffer);
600 RETVAL = (char *)glGetString (GL_VERSION); 703 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
601 OUTPUT: 704 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
602 RETVAL 705 {
706 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
603 707
604char * 708 buflen = sizeof (buffer);
605gl_extensions () 709 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
606 CODE: 710 {
607 RETVAL = (char *)glGetString (GL_EXTENSIONS); 711 PUSHs (newSVpv (buffer, 0));
608 OUTPUT: 712
609 RETVAL 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}
610 720
611void 721void
612add_font (char *file) 722add_font (char *file)
613 CODE: 723 CODE:
614 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
615#ifdef _WIN32
616 // cairo... sigh... requires win2000
617 AddFontResourceEx (file, FR_PRIVATE, 0);
618#endif
619 725
620void 726void
621load_image_inline (SV *image_) 727load_image_inline (SV *image_)
622 ALIAS: 728 ALIAS:
623 load_image_file = 1 729 load_image_file = 1
665 771
666 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
667 773
668 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
669 775
776 SDL_LockSurface (surface2);
670 EXTEND (SP, 5); 777 EXTEND (SP, 6);
671 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
672 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
673 SDL_LockSurface (surface2);
674 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
675 SDL_UnlockSurface (surface2);
676 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)));
677 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
678 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
679 785
680 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
681 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
682} 788}
683 789
719 CODE: 825 CODE:
720 fprintf (stderr, "FATAL: %s\n", message); 826 fprintf (stderr, "FATAL: %s\n", message);
721#ifdef _WIN32 827#ifdef _WIN32
722 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
723#endif 829#endif
724 exit (1); 830 _exit (1);
725 831
832void
833_exit (int retval = 0)
834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
838 _exit (retval);
839#endif
840
726MODULE = CFClient PACKAGE = CFClient::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
727 842
728CFClient::Font 843CFPlus::Font
729new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
730 CODE: 845 CODE:
731{ 846{
732 int count; 847 int count;
733 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
736} 851}
737 OUTPUT: 852 OUTPUT:
738 RETVAL 853 RETVAL
739 854
740void 855void
741DESTROY (CFClient::Font self) 856DESTROY (CFPlus::Font self)
742 CODE: 857 CODE:
743 pango_font_description_free (self); 858 pango_font_description_free (self);
744 859
745void 860void
746make_default (CFClient::Font self) 861make_default (CFPlus::Font self)
747 CODE: 862 CODE:
748 default_font = self; 863 default_font = self;
749 864
750MODULE = CFClient PACKAGE = CFClient::Layout 865MODULE = CFPlus PACKAGE = CFPlus::Layout
751 866
752CFClient::Layout 867void
753new (SV *class, int rgba = 0) 868reset_glyph_cache ()
754 CODE: 869 CODE:
755#if _WIN32 870 tc_clear ();
756 rgba = 0;//D 871
757#endif 872CFPlus::Layout
873new (SV *class)
874 CODE:
758 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
759 876
760 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 877 RETVAL->pl = pango_layout_new (opengl_context);
761 RETVAL->rgba = rgba;
762 RETVAL->r = 1.; 878 RETVAL->r = 1.;
763 RETVAL->g = 1.; 879 RETVAL->g = 1.;
764 RETVAL->b = 1.; 880 RETVAL->b = 1.;
765 RETVAL->a = 1.; 881 RETVAL->a = 1.;
766 RETVAL->base_height = MIN_FONT_HEIGHT; 882 RETVAL->base_height = MIN_FONT_HEIGHT;
770 layout_update_font (RETVAL); 886 layout_update_font (RETVAL);
771 OUTPUT: 887 OUTPUT:
772 RETVAL 888 RETVAL
773 889
774void 890void
775DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
776 CODE: 892 CODE:
777 g_object_unref (self->pl); 893 g_object_unref (self->pl);
778 Safefree (self); 894 Safefree (self);
779 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
780int 986int
781is_rgba (CFClient::Layout self) 987has_wrapped (CFPlus::Layout self)
782 CODE: 988 CODE:
783 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}
784 OUTPUT: 998 OUTPUT:
785 RETVAL 999 RETVAL
786 1000
787void
788set_text (CFClient::Layout self, SV *text_)
789 CODE:
790{
791 STRLEN textlen;
792 char *text = SvPVutf8 (text_, textlen);
793
794 pango_layout_set_text (self->pl, text, textlen);
795}
796
797void
798set_markup (CFClient::Layout self, SV *text_)
799 CODE:
800{
801 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen);
803
804 pango_layout_set_markup (self->pl, text, textlen);
805}
806
807SV * 1001SV *
808get_text (CFClient::Layout self) 1002get_text (CFPlus::Layout self)
809 CODE: 1003 CODE:
810 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811 SvUTF8_on (RETVAL); 1005 sv_utf8_decode (RETVAL);
812 OUTPUT: 1006 OUTPUT:
813 RETVAL 1007 RETVAL
814 1008
815void 1009void
816set_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.)
817 CODE: 1011 CODE:
818 self->r = r; 1012 self->r = r;
819 self->g = g; 1013 self->g = g;
820 self->b = b; 1014 self->b = b;
821 self->a = a; 1015 self->a = a;
822 1016
823void 1017void
824set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
825 CODE: 1019 CODE:
826 if (self->font != font) 1020 if (self->font != font)
827 { 1021 {
828 self->font = font; 1022 self->font = font;
829 layout_update_font (self); 1023 layout_update_font (self);
830 } 1024 }
831 1025
832void 1026void
833set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
834 CODE: 1028 CODE:
835 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
836 { 1030 {
837 self->base_height = base_height; 1031 self->base_height = base_height;
838 layout_update_font (self); 1032 layout_update_font (self);
839 } 1033 }
840 1034
841void 1035void
842set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
843 CODE: 1037 CODE:
844 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);
845 1039
846void 1040void
847set_indent (CFClient::Layout self, int indent) 1041set_indent (CFPlus::Layout self, int indent)
848 CODE: 1042 CODE:
849 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
850 1044
851void 1045void
852set_spacing (CFClient::Layout self, int spacing) 1046set_spacing (CFPlus::Layout self, int spacing)
853 CODE: 1047 CODE:
854 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
855 1049
856void 1050void
857set_ellipsise (CFClient::Layout self, int ellipsise) 1051set_ellipsise (CFPlus::Layout self, int ellipsise)
858 CODE: 1052 CODE:
859 pango_layout_set_ellipsize (self->pl, 1053 pango_layout_set_ellipsize (self->pl,
860 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
861 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
862 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
863 : PANGO_ELLIPSIZE_NONE 1057 : PANGO_ELLIPSIZE_NONE
864 ); 1058 );
865 1059
866void 1060void
867set_single_paragraph_mode (CFClient::Layout self, int spm) 1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
868 CODE: 1062 CODE:
869 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
870 1064
871void 1065void
872size (CFClient::Layout self) 1066size (CFPlus::Layout self)
873 PPCODE: 1067 PPCODE:
874{ 1068{
875 int w, h; 1069 int w, h;
876 1070
877 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
880 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
881 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
882} 1076}
883 1077
884int 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
885xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
886 CODE: 1092 CODE:
887{ 1093{
888 int index, trailing; 1094 int index, trailing;
889 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);
890 RETVAL = index; 1096 RETVAL = index + trailing;
891} 1097}
892 OUTPUT: 1098 OUTPUT:
893 RETVAL 1099 RETVAL
894 1100
895void 1101void
896cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
897 PPCODE: 1103 PPCODE:
898{ 1104{
899 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
900 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
901 1107
904 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
905 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
906} 1112}
907 1113
908void 1114void
909render (CFClient::Layout self) 1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
910 PPCODE: 1116 PPCODE:
911{ 1117{
912 SV *retval; 1118 int line, x;
913 int w, h;
914 1119
915 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 */
916 1122
917 if (self->rgba)
918 {
919 cairo_surface_t *surface;
920 cairo_t *cairo;
921
922 retval = newSV (w * h * 4);
923 SvPOK_only (retval);
924 SvCUR_set (retval, w * h * 4);
925
926 memset (SvPVX (retval), 0, w * h * 4);
927
928 surface = cairo_image_surface_create_for_data (
929 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
930 cairo = cairo_create (surface);
931 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
932
933 pango_cairo_show_layout (cairo, self->pl);
934
935 cairo_destroy (cairo);
936 cairo_surface_destroy (surface);
937
938 // what a mess, and its premultiplied, too :(
939 {
940 uint32_t *p = (uint32_t *)SvPVX (retval);
941 uint32_t *e = p + w * h;
942
943 while (p < e)
944 {
945 uint32_t rgba = *p;
946 rgba = (rgba >> 24) | (rgba << 8);
947#if 0
948#ifdef _WIN32
949 {//D
950 uint8_t r = rgba >> 24;
951 uint8_t g = rgba >> 16;
952 uint8_t b = rgba >> 8;
953 uint8_t a = rgba >> 0;
954
955 rgba = (rgba & 0xffffff00) | a;
956 }
957#endif
958#endif
959 rgba = SDL_SwapBE32 (rgba);
960 *p++ = rgba;
961 }
962 }
963
964 EXTEND (SP, 5); 1123 EXTEND (SP, 2);
965 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)
966 PUSHs (sv_2mortal (newSViv (h))); 1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
967 PUSHs (sv_2mortal (retval));
968 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
969 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
970 }
971 else 1146 else
972 { 1147 {
973 FT_Bitmap bitmap;
974
975 retval = newSV (w * h);
976 SvPOK_only (retval);
977 SvCUR_set (retval, w * h);
978
979 bitmap.rows = h;
980 bitmap.width = w;
981 bitmap.pitch = w;
982 bitmap.buffer = (unsigned char*)SvPVX (retval);
983 bitmap.num_grays = 256;
984 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
985
986 memset (bitmap.buffer, 0, w * h);
987
988 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
989
990 EXTEND (SP, 5);
991 PUSHs (sv_2mortal (newSViv (w))); 1148 PUSHs (sv_2mortal (newSViv (index)));
992 PUSHs (sv_2mortal (newSViv (h))); 1149 PUSHs (sv_2mortal (newSViv (trailing)));
993 PUSHs (sv_2mortal (retval));
994 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
995 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
996 } 1150 }
997} 1151}
998 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
999MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
1000 1164
1001void 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
1002draw_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.)
1003 PROTOTYPE: $$$;$$ 1204 PROTOTYPE: $$$;$$
1004 ALIAS: 1205 ALIAS:
1005 draw_quad_alpha = 1 1206 draw_quad_alpha = 1
1006 draw_quad_alpha_premultiplied = 2 1207 draw_quad_alpha_premultiplied = 2
1007 CODE: 1208 CODE:
1008{ 1209{
1009 HV *hv = (HV *)SvRV (self); 1210 HV *hv = (HV *)SvRV (self);
1010 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1211 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1212 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1213 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014 1214
1015 if (items < 5) 1215 if (items < 5)
1016 { 1216 {
1017 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1217 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1218 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019 } 1219 }
1020 1220
1021 if (ix) 1221 if (ix)
1022 { 1222 {
1023 glEnable (GL_BLEND); 1223 glEnable (GL_BLEND);
1224
1225 if (ix == 2)
1024 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
1025 glEnable (GL_ALPHA_TEST); 1231 glEnable (GL_ALPHA_TEST);
1026 glAlphaFunc (GL_GREATER, 0.01f); 1232 glAlphaFunc (GL_GREATER, 0.01f);
1027 } 1233 }
1028 1234
1029 glBindTexture (GL_TEXTURE_2D, name); 1235 glBindTexture (GL_TEXTURE_2D, name);
1030
1031 if (wrap_mode)
1032 {
1033 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035 }
1036 1236
1037 glBegin (GL_QUADS); 1237 glBegin (GL_QUADS);
1038 glTexCoord2f (0, 0); glVertex2f (x , y ); 1238 glTexCoord2f (0, 0); glVertex2f (x , y );
1039 glTexCoord2f (0, t); glVertex2f (x , y + h); 1239 glTexCoord2f (0, t); glVertex2f (x , y + h);
1040 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1240 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1046 glDisable (GL_ALPHA_TEST); 1246 glDisable (GL_ALPHA_TEST);
1047 glDisable (GL_BLEND); 1247 glDisable (GL_BLEND);
1048 } 1248 }
1049} 1249}
1050 1250
1051MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1052 1252
1053CFClient::Map 1253CFPlus::Map
1054new (SV *class, int map_width, int map_height) 1254new (SV *class)
1055 CODE: 1255 CODE:
1056 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1057 RETVAL->x = 0; 1257 RETVAL->x = 0;
1058 RETVAL->y = 0; 1258 RETVAL->y = 0;
1059 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1060 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1061 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1062 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1063 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1064 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1065 RETVAL->texs = 8192;
1066 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1067 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1068 RETVAL->row = 0; 1266 RETVAL->row = 0;
1069 OUTPUT: 1267 OUTPUT:
1070 RETVAL 1268 RETVAL
1071 1269
1072void 1270void
1073DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
1074 CODE: 1272 CODE:
1075{ 1273{
1076 map_clear (self); 1274 map_clear (self);
1077 Safefree (self->face); 1275 Safefree (self->face2tile);
1276 Safefree (self->tex);
1078 Safefree (self); 1277 Safefree (self);
1079} 1278}
1080 1279
1081void 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
1082clear (CFClient::Map self) 1287clear (CFPlus::Map self)
1083 CODE: 1288 CODE:
1084 map_clear (self); 1289 map_clear (self);
1085 1290
1086void 1291void
1087set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1088 CODE: 1293 CODE:
1089{ 1294{
1090 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1091 { 1296 need_texid (self, tile);
1092 Append (mapface, self->face, self->faces, self->faces);
1093 self->faces *= 2;
1094 }
1095
1096 self->face [face] = texid;
1097} 1297}
1098 1298
1099void 1299void
1100set_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)
1101 CODE: 1301 CODE:
1102{ 1302{
1103 while (self->texs <= texid) 1303 need_texid (self, texid);
1104 {
1105 Append (maptex, self->tex, self->texs, self->texs);
1106 self->texs *= 2;
1107 }
1108 1304
1109 { 1305 {
1110 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1111 1307
1112 tex->name = name; 1308 tex->name = name;
1117 tex->r = r; 1313 tex->r = r;
1118 tex->g = g; 1314 tex->g = g;
1119 tex->b = b; 1315 tex->b = b;
1120 tex->a = a; 1316 tex->a = a;
1121 } 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);
1122} 1327}
1123 1328
1124int 1329int
1125ox (CFClient::Map self) 1330ox (CFPlus::Map self)
1126 ALIAS: 1331 ALIAS:
1127 oy = 1 1332 oy = 1
1333 x = 2
1334 y = 3
1335 w = 4
1336 h = 5
1128 CODE: 1337 CODE:
1129 switch (ix) 1338 switch (ix)
1130 { 1339 {
1131 case 0: RETVAL = self->ox; break; 1340 case 0: RETVAL = self->ox; break;
1132 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;
1133 } 1346 }
1134 OUTPUT: 1347 OUTPUT:
1135 RETVAL 1348 RETVAL
1136 1349
1137void 1350void
1138scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1139 CODE: 1352 CODE:
1140{ 1353{
1141 if (dx > 0) 1354 if (dx > 0)
1142 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1143 else if (dx < 0) 1356 else if (dx < 0)
1144 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);
1145 1358
1146 if (dy > 0) 1359 if (dy > 0)
1147 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1148 else if (dy < 0) 1361 else if (dy < 0)
1149 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);
1150 1363
1151 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1152 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1153 1366
1154 while (self->y < 0) 1367 while (self->y < 0)
1159 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1160 } 1373 }
1161} 1374}
1162 1375
1163void 1376void
1164map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1165 CODE: 1378 CODE:
1166{ 1379{
1167 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1168 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1169 mapcell *cell; 1382 mapcell *cell;
1170 int x, y, flags; 1383 int x, y, flags;
1171 1384
1172 while (data < data_end) 1385 while (data < data_end - 1)
1173 { 1386 {
1174 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1175 1388
1176 x = ((flags >> 10) & 63) + self->x; 1389 x = self->x + ((flags >> 10) & 63);
1177 y = ((flags >> 4) & 63) + self->y; 1390 y = self->y + ((flags >> 4) & 63);
1178 1391
1179 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1180 1393
1181 if (flags & 15) 1394 if (flags & 15)
1182 { 1395 {
1183 if (cell->darkness < 0) 1396 if (!cell->darkness)
1184 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1185 cell->darkness = 0; 1399 cell->darkness = 256;
1186 cell->face [0] = 0;
1187 cell->face [1] = 0;
1188 cell->face [2] = 0;
1189 } 1400 }
1190 1401
1191 cell->darkness = flags & 8 ? *data++ : 255;
1192
1193 //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 }
1194 1443
1195 if (flags & 4) 1444 if (flags & 4)
1196 { 1445 {
1197 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];
1198 } 1449 }
1199 1450
1200 if (flags & 2) 1451 if (flags & 2)
1201 { 1452 {
1202 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];
1203 } 1456 }
1204 1457
1205 if (flags & 1) 1458 if (flags & 1)
1206 { 1459 {
1207 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];
1208 } 1463 }
1209 } 1464 }
1210 else 1465 else
1211 cell->darkness = -1; 1466 cell->darkness = 0;
1212 } 1467 }
1213} 1468}
1214 1469
1215SV * 1470SV *
1216mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1217 CODE: 1472 CODE:
1218{ 1473{
1219 int x1, x; 1474 int x1, x;
1220 int y1, y; 1475 int y1, y;
1221 int z; 1476 int z;
1242 { 1497 {
1243 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1244 1499
1245 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1246 { 1501 {
1247 mapface face = cell->face [z];
1248
1249 if (face)
1250 {
1251 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1252 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1253 int a1 = tex.a; 1504 int a1 = tex.a;
1254 1505
1255 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1256 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1257 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1258 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1259 }
1260 } 1510 }
1261 } 1511 }
1262 1512
1263 *map++ = (r ) 1513 *map++ = (r )
1264 | (g << 8) 1514 | (g << 8)
1271} 1521}
1272 OUTPUT: 1522 OUTPUT:
1273 RETVAL 1523 RETVAL
1274 1524
1275void 1525void
1276draw (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)
1277 PPCODE: 1527 CODE:
1278{ 1528{
1279 int vx, vy;
1280 int x, y, z; 1529 int x, y, z;
1281 int last_name; 1530 int last_name;
1282 mapface face;
1283 int sw4 = (sw + 3) & ~3;
1284 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1285 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1286
1287 memset (darkness, 255, sw4 * sh);
1288 SvPOK_only (darkness_sv);
1289 SvCUR_set (darkness_sv, sw4 * sh);
1290
1291 vx = self->x + (self->w - sw) / 2 - shift_x;
1292 vy = self->y + (self->h - sh) / 2 - shift_y;
1293
1294 /*
1295 int vx = self->vx = self->w >= sw
1296 ? self->x + (self->w - sw) / 2
1297 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1298
1299 int vy = self->vy = self->h >= sh
1300 ? self->y + (self->h - sh) / 2
1301 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1302 */
1303 1531
1304 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1305 1533
1534 glEnable (GL_BLEND);
1306 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1307 glEnable (GL_BLEND);
1308 glEnable (GL_TEXTURE_2D); 1536 glEnable (GL_TEXTURE_2D);
1309 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1310 1538
1311 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1312 1540
1313 last_name = 0; 1541 last_name = 0;
1314 1542
1543 mx += self->x;
1544 my += self->y;
1545
1315 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1316 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1317 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1318 { 1549 {
1319 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1320 1551
1321 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1322 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1323 { 1554 {
1324 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1325
1326 darkness[y * sw4 + x] = cell->darkness < 0
1327 ? 255 - FOW_DARKNESS
1328 : 255 - cell->darkness;
1329
1330 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1331 1557
1332 if (face) 1558 if (tile)
1333 { 1559 {
1334 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1335
1336 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1337 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1338 1563
1339 if (last_name != tex.name) 1564 if (last_name != tex.name)
1340 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1341 glEnd (); 1569 glEnd ();
1342 last_name = tex.name;
1343 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1344 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1345 } 1572 }
1346 1573
1347 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1348 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1349 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);
1350 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 }
1351 } 1597 }
1352 } 1598 }
1353 } 1599 }
1354 1600
1355 glEnd (); 1601 glEnd ();
1356 1602
1357 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1358 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 }
1359 1729
1360 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1361 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1362 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1363 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1364} 1734}
1365 1735
1366SV * 1736SV *
1367get_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)
1368 CODE: 1738 CODE:
1369{ 1739{
1370 int x, y, x1, y1; 1740 int x, y, x1, y1;
1371 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1372 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1397 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1398 { 1768 {
1399 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1400 uint8_t flags = 0; 1770 uint8_t flags = 0;
1401 1771
1402 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1403 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1404 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1405 1775
1406 *data++ = flags; 1776 *data++ = flags;
1407 1777
1408 if (flags & 1) 1778 if (flags & 1)
1409 { 1779 {
1780 tileid tile = cell->tile [0];
1410 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1411 *data++ = cell->face [0]; 1782 *data++ = tile;
1412 } 1783 }
1413 1784
1414 if (flags & 2) 1785 if (flags & 2)
1415 { 1786 {
1787 tileid tile = cell->tile [1];
1416 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1417 *data++ = cell->face [1]; 1789 *data++ = tile;
1418 } 1790 }
1419 1791
1420 if (flags & 4) 1792 if (flags & 4)
1421 { 1793 {
1794 tileid tile = cell->tile [2];
1422 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1423 *data++ = cell->face [2]; 1796 *data++ = tile;
1424 } 1797 }
1425 } 1798 }
1426 else 1799 else
1427 *data++ = 0; 1800 *data++ = 0;
1428 } 1801 }
1434} 1807}
1435 OUTPUT: 1808 OUTPUT:
1436 RETVAL 1809 RETVAL
1437 1810
1438void 1811void
1439set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1440 PPCODE: 1813 PPCODE:
1441{ 1814{
1442 int x, y, z; 1815 int x, y, z;
1443 int w, h; 1816 int w, h;
1444 int x1, y1; 1817 int x1, y1;
1468 { 1841 {
1469 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1470 1843
1471 if (flags) 1844 if (flags)
1472 { 1845 {
1473 mapface face[3] = { 0, 0, 0 };
1474
1475 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1476 1848
1477 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1478 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1479 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1480 1852
1481 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1482 { 1854 {
1483 cell->darkness = -1; 1855 cell->darkness = 0;
1484 1856
1485 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1486 { 1858 {
1487 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1488 1860
1489 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1490 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1491 } 1868 }
1492 } 1869 }
1493 } 1870 }
1494 } 1871 }
1495 } 1872 }
1496} 1873}
1497 1874
1498MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1499 1876
1500CFClient::MixChunk 1877CFPlus::MixChunk
1501new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1502 CODE: 1879 CODE:
1503 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1504 OUTPUT: 1881 OUTPUT:
1505 RETVAL 1882 RETVAL
1506 1883
1507void 1884void
1508DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1509 CODE: 1886 CODE:
1510 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1511 1888
1512int 1889int
1513volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1514 CODE: 1891 CODE:
1515 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1516 OUTPUT: 1893 OUTPUT:
1517 RETVAL 1894 RETVAL
1518 1895
1519int 1896int
1520play (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)
1521 CODE: 1898 CODE:
1522 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1523 OUTPUT: 1900 OUTPUT:
1524 RETVAL 1901 RETVAL
1525 1902
1526MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1527 1904
1528int 1905int
1529volume (int volume = -1) 1906volume (int volume = -1)
1530 CODE: 1907 CODE:
1531 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1532 OUTPUT: 1909 OUTPUT:
1533 RETVAL 1910 RETVAL
1534 1911
1535CFClient::MixMusic 1912CFPlus::MixMusic
1536new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1537 CODE: 1914 CODE:
1538 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1539 OUTPUT: 1916 OUTPUT:
1540 RETVAL 1917 RETVAL
1541 1918
1542void 1919void
1543DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1544 CODE: 1921 CODE:
1545 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1546 1923
1547int 1924int
1548play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1549 CODE: 1926 CODE:
1550 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1551 OUTPUT: 1928 OUTPUT:
1552 RETVAL 1929 RETVAL
1553 1930
1554MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1555 1932
1556BOOT: 1933BOOT:
1557{ 1934{
1558 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1559 static const struct { 1936 static const struct {
1560 const char *name; 1937 const char *name;
1561 IV iv; 1938 IV iv;
1562 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1563# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
1570 const_iv (GL_SCISSOR_TEST), 1947 const_iv (GL_SCISSOR_TEST),
1571 const_iv (GL_DEPTH_TEST), 1948 const_iv (GL_DEPTH_TEST),
1572 const_iv (GL_ALPHA_TEST), 1949 const_iv (GL_ALPHA_TEST),
1573 const_iv (GL_NORMALIZE), 1950 const_iv (GL_NORMALIZE),
1574 const_iv (GL_RESCALE_NORMAL), 1951 const_iv (GL_RESCALE_NORMAL),
1952 const_iv (GL_FRONT),
1953 const_iv (GL_BACK),
1575 const_iv (GL_AND), 1954 const_iv (GL_AND),
1576 const_iv (GL_ONE), 1955 const_iv (GL_ONE),
1577 const_iv (GL_ZERO), 1956 const_iv (GL_ZERO),
1578 const_iv (GL_SRC_ALPHA), 1957 const_iv (GL_SRC_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 1958 const_iv (GL_DST_ALPHA),
1580 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1959 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581 const_iv (GL_ONE_MINUS_DST_ALPHA), 1960 const_iv (GL_ONE_MINUS_DST_ALPHA),
1961 const_iv (GL_SRC_ALPHA_SATURATE),
1582 const_iv (GL_RGB), 1962 const_iv (GL_RGB),
1583 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),
1584 const_iv (GL_UNSIGNED_BYTE), 1967 const_iv (GL_UNSIGNED_BYTE),
1585 const_iv (GL_UNSIGNED_SHORT), 1968 const_iv (GL_UNSIGNED_SHORT),
1586 const_iv (GL_UNSIGNED_INT), 1969 const_iv (GL_UNSIGNED_INT),
1587 const_iv (GL_ALPHA), 1970 const_iv (GL_ALPHA),
1588 const_iv (GL_INTENSITY), 1971 const_iv (GL_INTENSITY),
1597 const_iv (GL_TEXTURE_MAG_FILTER), 1980 const_iv (GL_TEXTURE_MAG_FILTER),
1598 const_iv (GL_TEXTURE_MIN_FILTER), 1981 const_iv (GL_TEXTURE_MIN_FILTER),
1599 const_iv (GL_TEXTURE_ENV_MODE), 1982 const_iv (GL_TEXTURE_ENV_MODE),
1600 const_iv (GL_TEXTURE_WRAP_S), 1983 const_iv (GL_TEXTURE_WRAP_S),
1601 const_iv (GL_TEXTURE_WRAP_T), 1984 const_iv (GL_TEXTURE_WRAP_T),
1985 const_iv (GL_REPEAT),
1602 const_iv (GL_CLAMP), 1986 const_iv (GL_CLAMP),
1603 const_iv (GL_REPEAT), 1987 const_iv (GL_CLAMP_TO_EDGE),
1604 const_iv (GL_NEAREST), 1988 const_iv (GL_NEAREST),
1605 const_iv (GL_LINEAR), 1989 const_iv (GL_LINEAR),
1606 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1990 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1991 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1992 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1619 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1620 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1621 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1622 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1623 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
1624 const_iv (GL_LINE_LOOP), 2009 const_iv (GL_LINE_LOOP),
1625 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1626 const_iv (GL_QUAD_STRIP), 2011 const_iv (GL_QUAD_STRIP),
1627 const_iv (GL_TRIANGLES), 2012 const_iv (GL_TRIANGLES),
1628 const_iv (GL_TRIANGLE_STRIP), 2013 const_iv (GL_TRIANGLE_STRIP),
1638 2023
1639 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; )
1640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2025 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641} 2026}
1642 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
1643int glGetError () 2049int glGetError ()
2050
2051void glFinish ()
1644 2052
1645void glClear (int mask) 2053void glClear (int mask)
1646 2054
1647void glClearColor (float r, float g, float b, float a = 1.0) 2055void glClearColor (float r, float g, float b, float a = 1.0)
1648 PROTOTYPE: @ 2056 PROTOTYPE: @
1655 2063
1656void glHint (int target, int mode) 2064void glHint (int target, int mode)
1657 2065
1658void glBlendFunc (int sfactor, int dfactor) 2066void glBlendFunc (int sfactor, int dfactor)
1659 2067
2068void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2069 CODE:
2070 gl_BlendFuncSeparate (sa, da, saa, daa);
2071
1660void glDepthMask (int flag) 2072void glDepthMask (int flag)
1661 2073
1662void glLogicOp (int opcode) 2074void glLogicOp (int opcode)
1663 2075
1664void glColorMask (int red, int green, int blue, int alpha) 2076void glColorMask (int red, int green, int blue, int alpha)
1668void glPushMatrix () 2080void glPushMatrix ()
1669 2081
1670void glPopMatrix () 2082void glPopMatrix ()
1671 2083
1672void glLoadIdentity () 2084void glLoadIdentity ()
2085
2086void glDrawBuffer (int buffer)
2087
2088void glReadBuffer (int buffer)
1673 2089
1674# near_ and far_ are due to microsofts buggy "c" compiler 2090# near_ and far_ are due to microsofts buggy "c" compiler
1675void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2091void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676 2092
1677# near_ and far_ are due to microsofts buggy "c" compiler 2093# near_ and far_ are due to microsofts buggy "c" compiler
1697 2113
1698void glEnd () 2114void glEnd ()
1699 2115
1700void glColor (float r, float g, float b, float a = 1.0) 2116void glColor (float r, float g, float b, float a = 1.0)
1701 PROTOTYPE: @ 2117 PROTOTYPE: @
2118 ALIAS:
2119 glColor_premultiply = 1
1702 CODE: 2120 CODE:
2121 if (ix)
2122 {
2123 r *= a;
2124 g *= a;
2125 b *= a;
2126 }
1703 // microsoft visual "c" rounds instead of truncating... 2127 // microsoft visual "c" rounds instead of truncating...
1704 glColor4ub (MIN ((int)(r * 255.f), 255), 2128 glColor4f (r, g, b, a);
1705 MIN ((int)(g * 255.f), 255),
1706 MIN ((int)(b * 255.f), 255),
1707 MIN ((int)(a * 255.f), 255));
1708 2129
1709void glInterleavedArrays (int format, int stride, char *data) 2130void glInterleavedArrays (int format, int stride, char *data)
1710 2131
1711void glDrawElements (int mode, int count, int type, char *indices) 2132void glDrawElements (int mode, int count, int type, char *indices)
1712 2133
1735 2156
1736void glBindTexture (int target, int name) 2157void glBindTexture (int target, int name)
1737 2158
1738void glConvolutionParameter (int target, int pname, float params) 2159void glConvolutionParameter (int target, int pname, float params)
1739 CODE: 2160 CODE:
1740 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2161 if (gl.ConvolutionParameterf)
2162 gl.ConvolutionParameterf (target, pname, params);
1741 2163
1742void 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)
1743 CODE: 2165 CODE:
1744 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2166 if (gl.ConvolutionFilter2D)
1745 (target, internalformat, width, height, format, type, data)); 2167 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746 2168
1747void 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)
1748 CODE: 2170 CODE:
1749 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2171 if (gl.SeparableFilter2D)
1750 (target, internalformat, width, height, format, type, row, column)); 2172 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751 2173
1752void 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)
1753 2175
1754void 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)
1755 2177
1788 2210
1789void glEndList () 2211void glEndList ()
1790 2212
1791void glCallList (int list) 2213void glCallList (int list)
1792 2214
1793

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines