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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines