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.58 by root, Sun Apr 23 00:57:38 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_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
6# include <wininet.h>
7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
3#endif 9#endif
4 10
5#include "EXTERN.h" 11#include "EXTERN.h"
6#include "perl.h" 12#include "perl.h"
7#include "XSUB.h" 13#include "XSUB.h"
8 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
20#include <math.h>
9#include <string.h> 21#include <string.h>
10#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
11 24
12#include <SDL.h> 25#include <SDL.h>
26#include <SDL_endian.h>
13#include <SDL_image.h> 27#include <SDL_image.h>
14#include <SDL_mixer.h> 28#include <SDL_mixer.h>
15#include <SDL_opengl.h> 29#include <SDL_opengl.h>
16 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
17#include <glib/gmacros.h> 34#include <glib/gmacros.h>
18 35
19#include <pango/pango.h> 36#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 37
23#ifndef _WIN32 38#ifndef _WIN32
24# include <sys/types.h> 39# include <sys/types.h>
25# include <sys/socket.h> 40# include <sys/socket.h>
26# include <netinet/in.h> 41# include <netinet/in.h>
27# include <netinet/tcp.h> 42# include <netinet/tcp.h>
28# include <inttypes.h> 43# include <inttypes.h>
29#else
30 typedef unsigned char uint8_t;
31 typedef unsigned short uint16_t;
32 typedef unsigned int uint32_t;
33 typedef signed char int8_t;
34 typedef signed short int16_t;
35 typedef signed int int32_t;
36#endif 44#endif
37 45
38#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
39 47
40#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
41 49
42#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
44 52
45#define MIN_FONT_HEIGHT 8 * PANGO_SCALE 53#define MIN_FONT_HEIGHT 10
46 54
55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else
58# define PARACHUTE 0
59#endif
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
47typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
49 86
50static PangoContext *context; 87typedef PangoFontDescription *CFPlus__Font;
51static PangoFontMap *fontmap; 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}
52 106
53typedef struct cf_layout { 107typedef struct cf_layout {
54 PangoLayout *pl; 108 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode
55 int base_height; 110 int base_height;
111 CFPlus__Font font;
56} *CFClient__Layout; 112} *CFPlus__Layout;
113
114static CFPlus__Font default_font;
115static PangoContext *opengl_context;
116static PangoFontMap *opengl_fontmap;
57 117
58static void 118static void
59substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
60{ 120{
61 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
62 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63} 126}
64 127
65static void 128static void
66layout_update (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
67{ 130{
68 /* 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
69 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
70 */ 133 */
71 PangoFontDescription *font = pango_context_get_font_description (context); 134 PangoFontDescription *font = self->font ? self->font : default_font;
72 135
73 int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75 if (height < MIN_FONT_HEIGHT)
76 height = MIN_FONT_HEIGHT;
77
78 if (pango_font_description_get_size (font) != height)
79 {
80 pango_font_description_set_absolute_size (font, height); 136 pango_font_description_set_absolute_size (font,
81 pango_layout_context_changed (self->pl); 137 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
82 } 138
139 pango_layout_set_font_description (self->pl, font);
83} 140}
84 141
85static void 142static void
86layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
87{ 144{
88 layout_update (self); 145 PangoRectangle rect;
89 146
147 // get_pixel_* wrongly rounds down
90 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
91 149
92 *w = (*w + 3) & ~3; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
93 if (!*w) *w = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
94 if (!*h) *h = 1;
95}
96 152
153 if (!rect.width) rect.width = 1;
154 if (!rect.height) rect.height = 1;
155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
97typedef uint16_t mapface; 161typedef uint16_t faceid;
98 162
99typedef struct { 163typedef struct {
100 GLint name; 164 int name;
101 int w, h; 165 int w, h;
102 float s, t; 166 float s, t;
103 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
104} maptex; 168} maptex;
105 169
106typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
107 int16_t darkness; 173 uint16_t darkness;
108 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
109} mapcell; 175} mapcell;
110 176
111typedef struct { 177typedef struct {
112 int32_t c0, c1; 178 int32_t c0, c1;
113 mapcell *col; 179 mapcell *col;
114} maprow; 180} maprow;
115 181
116typedef struct map { 182typedef struct map {
117 int x, y, w, h; 183 int x, y, w, h;
118 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
119 int faces; 185 int faces; tileid *face2tile; // [faceid]
120 mapface *face; 186 int texs; maptex *tex; // [tileid]
121
122 int texs;
123 maptex *tex;
124 187
125 int32_t rows; 188 int32_t rows;
126 maprow *row; 189 maprow *row;
127} *CFClient__Map; 190} *CFPlus__Map;
128 191
129static char * 192static char *
130prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
131{ 194{
132 char *p; 195 char *p;
149} 212}
150 213
151#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))
152#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))
153 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
154static maprow * 237static maprow *
155map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
156{ 239{
157 if (0 > y) 240 if (0 > y)
158 { 241 {
159 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
160 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
198 281
199 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
200} 283}
201 284
202static mapcell * 285static mapcell *
203map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
204{ 287{
205 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
206} 289}
207 290
208static void 291static void
209map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
210{ 293{
211 int r; 294 int r;
212 295
213 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
214 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
222 self->row = 0; 305 self->row = 0;
223 self->rows = 0; 306 self->rows = 0;
224} 307}
225 308
226static void 309static void
227map_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)
228{ 311{
229 int x, y; 312 int x, y;
230 maprow *row; 313 maprow *row;
314 mapcell *cell;
231 315
232 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
233 if (y >= 0) 317 if (y >= 0)
234 { 318 {
235 if (y >= self->rows) 319 if (y >= self->rows)
241 if (x >= row->c0) 325 if (x >= row->c0)
242 { 326 {
243 if (x >= row->c1) 327 if (x >= row->c1)
244 break; 328 break;
245 329
246 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;
247 } 336 }
248 } 337 }
249} 338}
250 339
251static void 340static void
252music_finished () 341music_finished (void)
253{ 342{
254 SDL_UserEvent ev; 343 SDL_UserEvent ev;
255 344
256 ev.type = SDL_USEREVENT; 345 ev.type = SDL_USEREVENT;
257 ev.code = 0; 346 ev.code = 0;
259 ev.data2 = 0; 348 ev.data2 = 0;
260 349
261 SDL_PushEvent ((SDL_Event *)&ev); 350 SDL_PushEvent ((SDL_Event *)&ev);
262} 351}
263 352
353static void
354channel_finished (int channel)
355{
356 SDL_UserEvent ev;
357
358 ev.type = SDL_USEREVENT;
359 ev.code = 1;
360 ev.data1 = (void *)(long)channel;
361 ev.data2 = 0;
362
363 SDL_PushEvent ((SDL_Event *)&ev);
364}
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
264MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
265 388
266PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
267 390
268BOOT: 391BOOT:
269{ 392{
270 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
271 static const struct { 394 static const struct {
272 const char *name; 395 const char *name;
273 IV iv; 396 IV iv;
274 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
275# 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
276 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
277 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
278 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
279 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
280 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
289 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
290 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
291 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
292 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
293 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
294 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
295 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
296 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
297 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
298 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
353 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
354 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
355 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
356 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
357 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
358 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
359 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
360 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
361 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
362 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
363 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
364 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
365 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
366 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
367 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
368 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
369 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
370 const_iv (KMOD_CTRL),
371 const_iv (KMOD_SHIFT),
372 const_iv (KMOD_ALT),
373 const_iv (KMOD_META)
374# undef const_iv 506# undef const_iv
375 }; 507 };
376 508
377 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; )
378 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 510 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
379 511
380 fontmap = pango_ft2_font_map_new (); 512 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
381 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 513 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
382 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
383} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
384 521
385int 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)
532
533void
534pango_init ()
535 CODE:
536{
537 opengl_fontmap = pango_opengl_font_map_new ();
538 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
539 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
540}
541
542int
386SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 543SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
387 544
388void 545void
389SDL_Quit () 546SDL_Quit ()
390 547
391void 548void
397 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 554 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
398 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 555 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
399 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 556 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
400 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 557 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
401 558
559 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
561
402 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 562 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
403 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
404 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
405 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
406 566
407 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 567 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568#if SDL_VERSION_ATLEAST(1,2,10)
408 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 569 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
409 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 570 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571#endif
410 572
411 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
412 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
413 575
414 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
423 585
424 ++m; 586 ++m;
425 } 587 }
426} 588}
427 589
590char *
591SDL_GetError ()
592
428int 593int
429SDL_SetVideoMode (int w, int h, int fullscreen) 594SDL_SetVideoMode (int w, int h, int fullscreen)
430 CODE: 595 CODE:
431 RETVAL = !!SDL_SetVideoMode ( 596 RETVAL = !!SDL_SetVideoMode (
432 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 597 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
433 ); 598 );
599 if (RETVAL)
600 {
434 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 }
435 OUTPUT: 606 OUTPUT:
436 RETVAL 607 RETVAL
437 608
438void 609void
439SDL_GL_SwapBuffers () 610SDL_GL_SwapBuffers ()
611
612char *
613SDL_GetKeyName (int sym)
440 614
441void 615void
442SDL_PollEvent () 616SDL_PollEvent ()
443 PPCODE: 617 PPCODE:
444{ 618{
446 620
447 while (SDL_PollEvent (&ev)) 621 while (SDL_PollEvent (&ev))
448 { 622 {
449 HV *hv = newHV (); 623 HV *hv = newHV ();
450 hv_store (hv, "type", 4, newSViv (ev.type), 0); 624 hv_store (hv, "type", 4, newSViv (ev.type), 0);
625
451 switch (ev.type) 626 switch (ev.type)
452 { 627 {
453 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
454 case SDL_KEYUP: 629 case SDL_KEYUP:
455 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
456 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
457 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 */
458 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
459 break; 635 break;
460 636
461 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
462 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
463 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 639 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
464 break; 640 break;
465 641
466 case SDL_MOUSEMOTION: 642 case SDL_MOUSEMOTION:
643 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
467 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 645 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
468 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 646 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
469 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 647 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
470 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 648 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
471 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 649 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
472 break; 650 break;
473 651
474 case SDL_MOUSEBUTTONDOWN: 652 case SDL_MOUSEBUTTONDOWN:
475 case SDL_MOUSEBUTTONUP: 653 case SDL_MOUSEBUTTONUP:
654 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
655
476 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 656 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
477 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 657 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
478 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 658 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
479 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 659 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
660 break;
661
662 case SDL_USEREVENT:
663 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
666 break;
480 } 667 }
481 668
482 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
483 } 670 }
484} 671}
485 672
486int 673int
487Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 674Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
488 POSTCALL: 675 POSTCALL:
489 Mix_HookMusicFinished (music_finished); 676 Mix_HookMusicFinished (music_finished);
677 Mix_ChannelFinished (channel_finished);
490 678
491void 679void
492Mix_CloseAudio () 680Mix_CloseAudio ()
493 681
494int 682int
499 CODE: 687 CODE:
500#ifndef _WIN32 688#ifndef _WIN32
501 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
502#endif 690#endif
503 691
504char * 692void
505gl_version () 693win32_proxy_info ()
506 CODE: 694 PPCODE:
507 RETVAL = (char *)glGetString (GL_VERSION); 695{
508 OUTPUT: 696#ifdef _WIN32
509 RETVAL 697 char buffer[2048];
698 DWORD buflen;
510 699
511char * 700 EXTEND (SP, 3);
512gl_extensions () 701
513 CODE: 702 buflen = sizeof (buffer);
514 RETVAL = (char *)glGetString (GL_EXTENSIONS); 703 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
515 OUTPUT: 704 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
516 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}
517 720
518void 721void
519add_font (char *file) 722add_font (char *file)
520 CODE: 723 CODE:
521 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
522
523void
524set_font (char *file)
525 CODE:
526{
527 int count;
528 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
529 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
530 FcPatternDestroy (pattern);
531 pango_context_set_font_description (context, font);
532}
533 725
534void 726void
535load_image_inline (SV *image_) 727load_image_inline (SV *image_)
536 ALIAS: 728 ALIAS:
537 load_image_file = 1 729 load_image_file = 1
579 771
580 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
581 773
582 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
583 775
776 SDL_LockSurface (surface2);
584 EXTEND (SP, 5); 777 EXTEND (SP, 6);
585 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
586 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
587 SDL_LockSurface (surface2);
588 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
589 SDL_UnlockSurface (surface2);
590 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)));
591 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
592 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
593 785
594 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
595 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
596} 788}
597 789
619 PUSHs (sv_2mortal (newSViv (b / y))); 811 PUSHs (sv_2mortal (newSViv (b / y)));
620 PUSHs (sv_2mortal (newSViv (a / y))); 812 PUSHs (sv_2mortal (newSViv (a / y)));
621} 813}
622 814
623void 815void
816error (char *message)
817 CODE:
818 fprintf (stderr, "ERROR: %s\n", message);
819#ifdef _WIN32
820 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
821#endif
822
823void
624fatal (char *message) 824fatal (char *message)
625 CODE: 825 CODE:
826 fprintf (stderr, "FATAL: %s\n", message);
626#ifdef _WIN32 827#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 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
628#else 837#else
629 fprintf (stderr, "FATAL: %s\n", message); 838 _exit (retval);
630#endif 839#endif
631 exit (1);
632 840
633MODULE = CFClient PACKAGE = CFClient::Layout 841MODULE = CFPlus PACKAGE = CFPlus::Font
634 842
635CFClient::Layout 843CFPlus::Font
636new (SV *class, int base_height = 10) 844new_from_file (SV *class, char *path, int id = 0)
637 CODE: 845 CODE:
638 New (0, RETVAL, 1, struct cf_layout); 846{
639 RETVAL->base_height = base_height; 847 int count;
640 RETVAL->pl = pango_layout_new (context); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
641 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 849 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
850 FcPatternDestroy (pattern);
851}
642 OUTPUT: 852 OUTPUT:
643 RETVAL 853 RETVAL
644 854
645void 855void
856DESTROY (CFPlus::Font self)
857 CODE:
858 pango_font_description_free (self);
859
860void
861make_default (CFPlus::Font self)
862 CODE:
863 default_font = self;
864
865MODULE = CFPlus PACKAGE = CFPlus::Layout
866
867void
868reset_glyph_cache ()
869 CODE:
870 tc_clear ();
871
872CFPlus::Layout
873new (SV *class)
874 CODE:
875 New (0, RETVAL, 1, struct cf_layout);
876
877 RETVAL->pl = pango_layout_new (opengl_context);
878 RETVAL->r = 1.;
879 RETVAL->g = 1.;
880 RETVAL->b = 1.;
881 RETVAL->a = 1.;
882 RETVAL->base_height = MIN_FONT_HEIGHT;
883 RETVAL->font = 0;
884
885 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
886 layout_update_font (RETVAL);
887 OUTPUT:
888 RETVAL
889
890void
646DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
647 CODE: 892 CODE:
648 g_object_unref (self->pl); 893 g_object_unref (self->pl);
649 Safefree (self); 894 Safefree (self);
650 895
651void 896void
652set_text (CFClient::Layout self, SV *text_) 897set_text (CFPlus::Layout self, SV *text_)
653 CODE: 898 CODE:
654{ 899{
655 STRLEN textlen; 900 STRLEN textlen;
656 char *text = SvPVutf8 (text_, textlen); 901 char *text = SvPVutf8 (text_, textlen);
657 902
658 pango_layout_set_text (self->pl, text, textlen); 903 pango_layout_set_text (self->pl, text, textlen);
659} 904}
660 905
661void 906void
662set_markup (CFClient::Layout self, SV *text_) 907set_markup (CFPlus::Layout self, SV *text_)
663 CODE: 908 CODE:
664{ 909{
665 STRLEN textlen; 910 STRLEN textlen;
666 char *text = SvPVutf8 (text_, textlen); 911 char *text = SvPVutf8 (text_, textlen);
667 912
668 pango_layout_set_markup (self->pl, text, textlen); 913 pango_layout_set_markup (self->pl, text, textlen);
669} 914}
670 915
671SV * 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
672get_text (CFClient::Layout self) 962get_shapes (CFPlus::Layout self)
673 CODE: 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
986int
987has_wrapped (CFPlus::Layout self)
988 CODE:
989{
990 int lines = 1;
991 const char *text = pango_layout_get_text (self->pl);
992
993 while (*text)
994 lines += *text++ == '\n';
995
674 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 996 RETVAL = lines < pango_layout_get_line_count (self->pl);
675 SvUTF8_on (RETVAL); 997}
676 OUTPUT: 998 OUTPUT:
677 RETVAL 999 RETVAL
678 1000
1001SV *
1002get_text (CFPlus::Layout self)
1003 CODE:
1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1005 sv_utf8_decode (RETVAL);
1006 OUTPUT:
1007 RETVAL
1008
679void 1009void
1010set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
1011 CODE:
1012 self->r = r;
1013 self->g = g;
1014 self->b = b;
1015 self->a = a;
1016
1017void
1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
1019 CODE:
1020 if (self->font != font)
1021 {
1022 self->font = font;
1023 layout_update_font (self);
1024 }
1025
1026void
680set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
681 CODE: 1028 CODE:
1029 if (self->base_height != base_height)
1030 {
682 self->base_height = base_height; 1031 self->base_height = base_height;
1032 layout_update_font (self);
1033 }
683 1034
684void 1035void
685set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
686 CODE: 1037 CODE:
687 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);
688 1039
689void 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
690size (CFClient::Layout self) 1066size (CFPlus::Layout self)
691 PPCODE: 1067 PPCODE:
692{ 1068{
693 int w, h; 1069 int w, h;
694 1070
695 layout_update (self);
696 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
697 1072
698 EXTEND (SP, 2); 1073 EXTEND (SP, 2);
699 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
700 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
701} 1076}
702 1077
703int 1078int
704xy_to_index (CFClient::Layout self, int x, int y) 1079descent (CFPlus::Layout self)
705 CODE: 1080 CODE:
706{ 1081{
707 int index, trailing; 1082 PangoRectangle rect;
708 1083 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
709 layout_update (self); 1084 pango_layout_line_get_pixel_extents (line, 0, &rect);
710 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1085 RETVAL = PANGO_DESCENT (rect);
711
712 RETVAL = index;
713} 1086}
714 OUTPUT: 1087 OUTPUT:
715 RETVAL 1088 RETVAL
716 1089
1090int
1091xy_to_index (CFPlus::Layout self, int x, int y)
1092 CODE:
1093{
1094 int index, trailing;
1095 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1096 RETVAL = index + trailing;
1097}
1098 OUTPUT:
1099 RETVAL
1100
717void 1101void
718cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
719 PPCODE: 1103 PPCODE:
720{ 1104{
721 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
722 layout_update (self);
723 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
724 1107
725 EXTEND (SP, 3); 1108 EXTEND (SP, 3);
726 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1109 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
727 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
728 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
729} 1112}
730 1113
731void 1114void
732render (CFClient::Layout self) 1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
733 PPCODE: 1116 PPCODE:
734{ 1117{
735 SV *retval; 1118 int line, x;
736 int w, h;
737 FT_Bitmap bitmap;
738 1119
739 layout_update (self); 1120 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
740 layout_get_pixel_size (self, &w, &h); 1121 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
741 1122
742 retval = newSV (w * h);
743 SvPOK_only (retval);
744 SvCUR_set (retval, w * h);
745
746 bitmap.rows = h;
747 bitmap.width = w;
748 bitmap.pitch = w;
749 bitmap.buffer = (unsigned char*)SvPVX (retval);
750 bitmap.num_grays = 256;
751 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
752
753 memset (bitmap.buffer, 0, w * h);
754
755 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
756
757 EXTEND (SP, 3); 1123 EXTEND (SP, 2);
758 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)
1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
1146 else
1147 {
759 PUSHs (sv_2mortal (newSViv (h))); 1148 PUSHs (sv_2mortal (newSViv (index)));
760 PUSHs (sv_2mortal (retval)); 1149 PUSHs (sv_2mortal (newSViv (trailing)));
1150 }
761} 1151}
762 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
763MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
764 1164
765void 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
766draw_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.)
767 PROTOTYPE: $$$;$$ 1204 PROTOTYPE: $$$;$$
1205 ALIAS:
1206 draw_quad_alpha = 1
1207 draw_quad_alpha_premultiplied = 2
768 CODE: 1208 CODE:
769{ 1209{
770 HV *hv = (HV *)SvRV (self); 1210 HV *hv = (HV *)SvRV (self);
771 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1211 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
772 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1212 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
773 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1213 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
774 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
775 1214
776 if (items < 5) 1215 if (items < 5)
777 { 1216 {
778 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1217 w = SvNV (*hv_fetch (hv, "w", 1, 1));
779 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1218 h = SvNV (*hv_fetch (hv, "h", 1, 1));
780 } 1219 }
781 1220
1221 if (ix)
1222 {
1223 glEnable (GL_BLEND);
1224
1225 if (ix == 2)
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);
1233 }
1234
782 glBindTexture (GL_TEXTURE_2D, name); 1235 glBindTexture (GL_TEXTURE_2D, name);
783 if (wrap_mode) { 1236
784 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
785 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
786 }
787 glBegin (GL_QUADS); 1237 glBegin (GL_QUADS);
788 glTexCoord2f (0, 0); glVertex2f (x , y ); 1238 glTexCoord2f (0, 0); glVertex2f (x , y );
789 glTexCoord2f (0, t); glVertex2f (x , y + h); 1239 glTexCoord2f (0, t); glVertex2f (x , y + h);
790 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1240 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
791 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1241 glTexCoord2f (s, 0); glVertex2f (x + w, y );
792 glEnd (); 1242 glEnd ();
793}
794 1243
1244 if (ix)
1245 {
1246 glDisable (GL_ALPHA_TEST);
1247 glDisable (GL_BLEND);
1248 }
1249}
1250
795MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
796 1252
797CFClient::Map 1253CFPlus::Map
798new (SV *class, int map_width, int map_height) 1254new (SV *class)
799 CODE: 1255 CODE:
800 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
801 RETVAL->x = 0; 1257 RETVAL->x = 0;
802 RETVAL->y = 0; 1258 RETVAL->y = 0;
803 RETVAL->w = map_width; 1259 RETVAL->w = 0;
804 RETVAL->h = map_height; 1260 RETVAL->h = 0;
805 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
806 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
807 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
808 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
809 RETVAL->texs = 8192;
810 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
811 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
812 RETVAL->row = 0; 1266 RETVAL->row = 0;
813 OUTPUT: 1267 OUTPUT:
814 RETVAL 1268 RETVAL
815 1269
816void 1270void
817DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
818 CODE: 1272 CODE:
819{ 1273{
820 map_clear (self); 1274 map_clear (self);
821 Safefree (self->face); 1275 Safefree (self->face2tile);
1276 Safefree (self->tex);
822 Safefree (self); 1277 Safefree (self);
823} 1278}
824 1279
825void 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
826clear (CFClient::Map self) 1287clear (CFPlus::Map self)
827 CODE: 1288 CODE:
828 map_clear (self); 1289 map_clear (self);
829 1290
830void 1291void
831set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
832 CODE: 1293 CODE:
833{ 1294{
834 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
835 { 1296 need_texid (self, tile);
836 Append (mapface, self->face, self->faces, self->faces);
837 self->faces *= 2;
838 }
839
840 self->face [face] = texid;
841} 1297}
842 1298
843void 1299void
844set_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)
845 CODE: 1301 CODE:
846{ 1302{
847 while (self->texs <= texid) 1303 need_texid (self, texid);
848 {
849 Append (maptex, self->tex, self->texs, self->texs);
850 self->texs *= 2;
851 }
852 1304
853 { 1305 {
854 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
855 1307
856 tex->name = name; 1308 tex->name = name;
861 tex->r = r; 1313 tex->r = r;
862 tex->g = g; 1314 tex->g = g;
863 tex->b = b; 1315 tex->b = b;
864 tex->a = a; 1316 tex->a = a;
865 } 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);
866} 1327}
867 1328
868int 1329int
869ox (CFClient::Map self) 1330ox (CFPlus::Map self)
870 ALIAS: 1331 ALIAS:
871 oy = 1 1332 oy = 1
1333 x = 2
1334 y = 3
1335 w = 4
1336 h = 5
872 CODE: 1337 CODE:
873 switch (ix) 1338 switch (ix)
874 { 1339 {
875 case 0: RETVAL = self->ox; break; 1340 case 0: RETVAL = self->ox; break;
876 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;
877 } 1346 }
878 OUTPUT: 1347 OUTPUT:
879 RETVAL 1348 RETVAL
880 1349
881void 1350void
882scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
883 CODE: 1352 CODE:
884{ 1353{
885 if (dx > 0) 1354 if (dx > 0)
886 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
887 else if (dx < 0) 1356 else if (dx < 0)
888 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);
889 1358
890 if (dy > 0) 1359 if (dy > 0)
891 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
892 else if (dy < 0) 1361 else if (dy < 0)
893 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);
894 1363
895 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
896 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
897 1366
898 while (self->y < 0) 1367 while (self->y < 0)
903 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
904 } 1373 }
905} 1374}
906 1375
907void 1376void
908map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
909 CODE: 1378 CODE:
910{ 1379{
911 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
912 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
913 mapcell *cell; 1382 mapcell *cell;
914 int x, y, flags; 1383 int x, y, flags;
915 1384
916 while (data < data_end) 1385 while (data < data_end - 1)
917 { 1386 {
918 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
919 1388
920 x = ((flags >> 10) & 63) + self->x; 1389 x = self->x + ((flags >> 10) & 63);
921 y = ((flags >> 4) & 63) + self->y; 1390 y = self->y + ((flags >> 4) & 63);
922 1391
923 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
924 1393
925 if (flags & 15) 1394 if (flags & 15)
926 { 1395 {
927 if (cell->darkness < 0) 1396 if (!cell->darkness)
928 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
929 cell->darkness = 0; 1399 cell->darkness = 256;
930 cell->face [0] = 0;
931 cell->face [1] = 0;
932 cell->face [2] = 0;
933 } 1400 }
934 1401
935 cell->darkness = flags & 8 ? *data++ : 255;
936
937 //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 }
938 1443
939 if (flags & 4) 1444 if (flags & 4)
940 { 1445 {
941 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];
942 } 1449 }
943 1450
944 if (flags & 2) 1451 if (flags & 2)
945 { 1452 {
946 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];
947 } 1456 }
948 1457
949 if (flags & 1) 1458 if (flags & 1)
950 { 1459 {
951 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];
952 } 1463 }
953 } 1464 }
954 else 1465 else
955 cell->darkness = -1; 1466 cell->darkness = 0;
956 } 1467 }
957} 1468}
958 1469
959SV * 1470SV *
960mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
961 CODE: 1472 CODE:
962{ 1473{
963 int x1, x; 1474 int x1, x;
964 int y1, y; 1475 int y1, y;
965 int z; 1476 int z;
986 { 1497 {
987 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
988 1499
989 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
990 { 1501 {
991 mapface face = cell->face [z];
992
993 if (face)
994 {
995 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
996 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
997 int a1 = tex.a; 1504 int a1 = tex.a;
998 1505
999 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1000 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1001 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1002 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1003 }
1004 } 1510 }
1005 } 1511 }
1006 1512
1007 *map++ = (r ) 1513 *map++ = (r )
1008 | (g << 8) 1514 | (g << 8)
1015} 1521}
1016 OUTPUT: 1522 OUTPUT:
1017 RETVAL 1523 RETVAL
1018 1524
1019void 1525void
1020draw (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)
1021 PPCODE: 1527 CODE:
1022{ 1528{
1023 int vx, vy;
1024 int x, y, z; 1529 int x, y, z;
1025 int last_name; 1530 int last_name;
1026 mapface face;
1027 int sw4 = (sw + 3) & ~3;
1028 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1029 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1030
1031 memset (darkness, 255, sw4 * sh);
1032 SvPOK_only (darkness_sv);
1033 SvCUR_set (darkness_sv, sw4 * sh);
1034
1035 vx = self->x + (self->w - sw) / 2 - shift_x;
1036 vy = self->y + (self->h - sh) / 2 - shift_y;
1037
1038 /*
1039 int vx = self->vx = self->w >= sw
1040 ? self->x + (self->w - sw) / 2
1041 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1042
1043 int vy = self->vy = self->h >= sh
1044 ? self->y + (self->h - sh) / 2
1045 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1046 */
1047 1531
1048 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1049 1533
1534 glEnable (GL_BLEND);
1050 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1051 glEnable (GL_BLEND);
1052 glEnable (GL_TEXTURE_2D); 1536 glEnable (GL_TEXTURE_2D);
1053 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1054 1538
1055 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1056 1540
1057 last_name = 0; 1541 last_name = 0;
1058 1542
1543 mx += self->x;
1544 my += self->y;
1545
1059 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1060 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1061 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1062 { 1549 {
1063 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1064 1551
1065 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1066 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1067 { 1554 {
1068 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1069
1070 darkness[y * sw4 + x] = cell->darkness < 0
1071 ? 255 - FOW_DARKNESS
1072 : 255 - cell->darkness;
1073
1074 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1075 1557
1076 if (face) 1558 if (tile)
1077 { 1559 {
1078 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1079
1080 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1081 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1082 1563
1083 if (last_name != tex.name) 1564 if (last_name != tex.name)
1084 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1085 glEnd (); 1569 glEnd ();
1086 last_name = tex.name;
1087 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1088 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1089 } 1572 }
1090 1573
1091 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1092 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1093 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);
1094 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 }
1095 } 1597 }
1096 } 1598 }
1097 } 1599 }
1098 1600
1099 glEnd (); 1601 glEnd ();
1100 1602
1101 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1102 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 }
1103 1729
1104 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1105 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1106 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1107 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1108} 1734}
1109 1735
1110SV * 1736SV *
1111get_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)
1112 CODE: 1738 CODE:
1113{ 1739{
1114 int x, y, x1, y1; 1740 int x, y, x1, y1;
1115 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1116 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1141 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1142 { 1768 {
1143 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1144 uint8_t flags = 0; 1770 uint8_t flags = 0;
1145 1771
1146 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1147 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1148 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1149 1775
1150 *data++ = flags; 1776 *data++ = flags;
1151 1777
1152 if (flags & 1) 1778 if (flags & 1)
1153 { 1779 {
1780 tileid tile = cell->tile [0];
1154 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1155 *data++ = cell->face [0]; 1782 *data++ = tile;
1156 } 1783 }
1157 1784
1158 if (flags & 2) 1785 if (flags & 2)
1159 { 1786 {
1787 tileid tile = cell->tile [1];
1160 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1161 *data++ = cell->face [1]; 1789 *data++ = tile;
1162 } 1790 }
1163 1791
1164 if (flags & 4) 1792 if (flags & 4)
1165 { 1793 {
1794 tileid tile = cell->tile [2];
1166 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1167 *data++ = cell->face [2]; 1796 *data++ = tile;
1168 } 1797 }
1169 } 1798 }
1170 else 1799 else
1171 *data++ = 0; 1800 *data++ = 0;
1172 } 1801 }
1178} 1807}
1179 OUTPUT: 1808 OUTPUT:
1180 RETVAL 1809 RETVAL
1181 1810
1182void 1811void
1183set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1184 PPCODE: 1813 PPCODE:
1185{ 1814{
1186 int x, y, z; 1815 int x, y, z;
1187 int w, h; 1816 int w, h;
1188 int x1, y1; 1817 int x1, y1;
1212 { 1841 {
1213 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1214 1843
1215 if (flags) 1844 if (flags)
1216 { 1845 {
1217 mapface face[3] = { 0, 0, 0 };
1218
1219 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1220 1848
1221 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1222 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1223 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1224 1852
1225 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1226 { 1854 {
1227 cell->darkness = -1; 1855 cell->darkness = 0;
1228 1856
1229 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1230 { 1858 {
1231 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1232 1860
1233 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || (t && !self->tex [t].name))
1862 {
1234 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1235 } 1868 }
1236 } 1869 }
1237 } 1870 }
1238 } 1871 }
1239 } 1872 }
1240} 1873}
1241 1874
1242MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1243 1876
1244CFClient::MixChunk 1877CFPlus::MixChunk
1245new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1246 CODE: 1879 CODE:
1247 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1248 OUTPUT: 1881 OUTPUT:
1249 RETVAL 1882 RETVAL
1250 1883
1251void 1884void
1252DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1253 CODE: 1886 CODE:
1254 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1255 1888
1256int 1889int
1257volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1258 CODE: 1891 CODE:
1259 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1260 OUTPUT: 1893 OUTPUT:
1261 RETVAL 1894 RETVAL
1262 1895
1263int 1896int
1264play (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)
1265 CODE: 1898 CODE:
1266 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1267 OUTPUT: 1900 OUTPUT:
1268 RETVAL 1901 RETVAL
1269 1902
1270MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1271 1904
1272int 1905int
1273volume (int volume = -1) 1906volume (int volume = -1)
1274 CODE: 1907 CODE:
1275 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1276 OUTPUT: 1909 OUTPUT:
1277 RETVAL 1910 RETVAL
1278 1911
1279CFClient::MixMusic 1912CFPlus::MixMusic
1280new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1281 CODE: 1914 CODE:
1282 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1283 OUTPUT: 1916 OUTPUT:
1284 RETVAL 1917 RETVAL
1285 1918
1286void 1919void
1287DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1288 CODE: 1921 CODE:
1289 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1290 1923
1291int 1924int
1292play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1293 CODE: 1926 CODE:
1294 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1295 OUTPUT: 1928 OUTPUT:
1296 RETVAL 1929 RETVAL
1297 1930
1298MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1299 1932
1300BOOT: 1933BOOT:
1301{ 1934{
1302 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1303 static const struct { 1936 static const struct {
1304 const char *name; 1937 const char *name;
1305 IV iv; 1938 IV iv;
1306 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1307# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
1308 const_iv (GL_COLOR_MATERIAL), 1941 const_iv (GL_COLOR_MATERIAL),
1309 const_iv (GL_SMOOTH), 1942 const_iv (GL_SMOOTH),
1310 const_iv (GL_FLAT), 1943 const_iv (GL_FLAT),
1944 const_iv (GL_DITHER),
1311 const_iv (GL_BLEND), 1945 const_iv (GL_BLEND),
1946 const_iv (GL_CULL_FACE),
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),
1312 const_iv (GL_AND), 1954 const_iv (GL_AND),
1955 const_iv (GL_ONE),
1956 const_iv (GL_ZERO),
1313 const_iv (GL_SRC_ALPHA), 1957 const_iv (GL_SRC_ALPHA),
1958 const_iv (GL_DST_ALPHA),
1314 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1959 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1960 const_iv (GL_ONE_MINUS_DST_ALPHA),
1961 const_iv (GL_SRC_ALPHA_SATURATE),
1315 const_iv (GL_RGB), 1962 const_iv (GL_RGB),
1316 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),
1317 const_iv (GL_UNSIGNED_BYTE), 1967 const_iv (GL_UNSIGNED_BYTE),
1318 const_iv (GL_ALPHA4), 1968 const_iv (GL_UNSIGNED_SHORT),
1969 const_iv (GL_UNSIGNED_INT),
1319 const_iv (GL_ALPHA), 1970 const_iv (GL_ALPHA),
1971 const_iv (GL_INTENSITY),
1972 const_iv (GL_LUMINANCE),
1973 const_iv (GL_LUMINANCE_ALPHA),
1320 const_iv (GL_FLOAT), 1974 const_iv (GL_FLOAT),
1321 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1975 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1322 const_iv (GL_COMPILE), 1976 const_iv (GL_COMPILE),
1323 const_iv (GL_TEXTURE_1D), 1977 const_iv (GL_TEXTURE_1D),
1324 const_iv (GL_TEXTURE_2D), 1978 const_iv (GL_TEXTURE_2D),
1326 const_iv (GL_TEXTURE_MAG_FILTER), 1980 const_iv (GL_TEXTURE_MAG_FILTER),
1327 const_iv (GL_TEXTURE_MIN_FILTER), 1981 const_iv (GL_TEXTURE_MIN_FILTER),
1328 const_iv (GL_TEXTURE_ENV_MODE), 1982 const_iv (GL_TEXTURE_ENV_MODE),
1329 const_iv (GL_TEXTURE_WRAP_S), 1983 const_iv (GL_TEXTURE_WRAP_S),
1330 const_iv (GL_TEXTURE_WRAP_T), 1984 const_iv (GL_TEXTURE_WRAP_T),
1985 const_iv (GL_REPEAT),
1331 const_iv (GL_CLAMP), 1986 const_iv (GL_CLAMP),
1332 const_iv (GL_REPEAT), 1987 const_iv (GL_CLAMP_TO_EDGE),
1333 const_iv (GL_NEAREST), 1988 const_iv (GL_NEAREST),
1334 const_iv (GL_LINEAR), 1989 const_iv (GL_LINEAR),
1335 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1990 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1336 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1991 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1337 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1992 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1338 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1993 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1339 const_iv (GL_GENERATE_MIPMAP), 1994 const_iv (GL_GENERATE_MIPMAP),
1340 const_iv (GL_LINEAR),
1341 const_iv (GL_MODULATE), 1995 const_iv (GL_MODULATE),
1996 const_iv (GL_DECAL),
1342 const_iv (GL_REPLACE), 1997 const_iv (GL_REPLACE),
1998 const_iv (GL_DEPTH_BUFFER_BIT),
1343 const_iv (GL_COLOR_BUFFER_BIT), 1999 const_iv (GL_COLOR_BUFFER_BIT),
1344 const_iv (GL_PROJECTION), 2000 const_iv (GL_PROJECTION),
1345 const_iv (GL_MODELVIEW), 2001 const_iv (GL_MODELVIEW),
1346 const_iv (GL_COLOR_LOGIC_OP), 2002 const_iv (GL_COLOR_LOGIC_OP),
2003 const_iv (GL_SEPARABLE_2D),
1347 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1348 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1349 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1350 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
2009 const_iv (GL_LINE_LOOP),
1351 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1352 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),
1353 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2015 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1354 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),
1355# undef const_iv 2021# undef const_iv
1356 }; 2022 };
1357 2023
1358 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; )
1359 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2025 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1360} 2026}
1361 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
1362int glGetError () 2049int glGetError ()
2050
2051void glFinish ()
1363 2052
1364void glClear (int mask) 2053void glClear (int mask)
1365 2054
1366void glClearColor (float r, float g, float b, float a = 1.0) 2055void glClearColor (float r, float g, float b, float a = 1.0)
1367 PROTOTYPE: @ 2056 PROTOTYPE: @
1374 2063
1375void glHint (int target, int mode) 2064void glHint (int target, int mode)
1376 2065
1377void glBlendFunc (int sfactor, int dfactor) 2066void glBlendFunc (int sfactor, int dfactor)
1378 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
1379void glLogicOp (int opcode) 2074void glLogicOp (int opcode)
1380 2075
2076void glColorMask (int red, int green, int blue, int alpha)
2077
1381void glMatrixMode (int mode) 2078void glMatrixMode (int mode)
1382 2079
1383void glPushMatrix () 2080void glPushMatrix ()
1384 2081
1385void glPopMatrix () 2082void glPopMatrix ()
1386 2083
1387void glLoadIdentity () 2084void glLoadIdentity ()
1388 2085
2086void glDrawBuffer (int buffer)
2087
2088void glReadBuffer (int buffer)
2089
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
1389void 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_)
1390 2095
1391void glViewport (int x, int y, int width, int height) 2096void glViewport (int x, int y, int width, int height)
2097
2098void glScissor (int x, int y, int width, int height)
1392 2099
1393void glTranslate (float x, float y, float z = 0.) 2100void glTranslate (float x, float y, float z = 0.)
1394 CODE: 2101 CODE:
1395 glTranslatef (x, y, z); 2102 glTranslatef (x, y, z);
1396 2103
1397void glScale (float x, float y, float z) 2104void glScale (float x, float y, float z = 1.)
1398 CODE: 2105 CODE:
1399 glScalef (x, y, z); 2106 glScalef (x, y, z);
1400 2107
1401void glRotate (float angle, float x, float y, float z) 2108void glRotate (float angle, float x, float y, float z)
1402 CODE: 2109 CODE:
1406 2113
1407void glEnd () 2114void glEnd ()
1408 2115
1409void glColor (float r, float g, float b, float a = 1.0) 2116void glColor (float r, float g, float b, float a = 1.0)
1410 PROTOTYPE: @ 2117 PROTOTYPE: @
2118 ALIAS:
2119 glColor_premultiply = 1
1411 CODE: 2120 CODE:
2121 if (ix)
2122 {
2123 r *= a;
2124 g *= a;
2125 b *= a;
2126 }
2127 // microsoft visual "c" rounds instead of truncating...
1412 glColor4f (r, g, b, a); 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);
1413 2140
1414void glVertex (float x, float y, float z = 0.) 2141void glVertex (float x, float y, float z = 0.)
1415 CODE: 2142 CODE:
1416 glVertex3f (x, y, z); 2143 glVertex3f (x, y, z);
1417 2144
1429 2156
1430void glBindTexture (int target, int name) 2157void glBindTexture (int target, int name)
1431 2158
1432void glConvolutionParameter (int target, int pname, float params) 2159void glConvolutionParameter (int target, int pname, float params)
1433 CODE: 2160 CODE:
2161 if (gl.ConvolutionParameterf)
1434 glConvolutionParameterf (target, pname, params); 2162 gl.ConvolutionParameterf (target, pname, params);
1435 2163
1436void 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)
2165 CODE:
2166 if (gl.ConvolutionFilter2D)
2167 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2168
2169void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2170 CODE:
2171 if (gl.SeparableFilter2D)
2172 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1437 2173
1438void 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)
1439 2175
1440void 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)
2177
2178void glDrawPixels (int width, int height, int format, int type, char *pixels)
2179
2180void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1441 2181
1442int glGenTexture () 2182int glGenTexture ()
1443 CODE: 2183 CODE:
1444{ 2184{
1445 GLuint name; 2185 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines