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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines