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.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.174 by root, Fri Apr 6 07:45:34 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines