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.176 by root, Tue Apr 10 09:39:48 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;
168 tileid smoothtile;
169 uint8_t smoothlevel;
116} maptex; 170} maptex;
117 171
118typedef struct { 172typedef struct {
173 uint32_t player;
174 tileid tile[3];
119 int16_t darkness; 175 uint16_t darkness;
120 mapface face[3]; 176 uint8_t stat_width, stat_hp, flags, smoothmax;
121} mapcell; 177} mapcell;
122 178
123typedef struct { 179typedef struct {
124 int32_t c0, c1; 180 int32_t c0, c1;
125 mapcell *col; 181 mapcell *col;
126} maprow; 182} maprow;
127 183
128typedef struct map { 184typedef struct map {
129 int x, y, w, h; 185 int x, y, w, h;
130 int ox, oy; /* offset to virtual global coordinate system */ 186 int ox, oy; /* offset to virtual global coordinate system */
131 int faces; 187 int faces; tileid *face2tile; // [faceid]
132 mapface *face; 188 int texs; maptex *tex; // [tileid]
133
134 int texs;
135 maptex *tex;
136 189
137 int32_t rows; 190 int32_t rows;
138 maprow *row; 191 maprow *row;
139} *CFClient__Map; 192} *CFPlus__Map;
140 193
141static char * 194static char *
142prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
143{ 196{
144 char *p; 197 char *p;
161} 214}
162 215
163#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#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)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
165 218
219static void
220need_facenum (struct map *self, faceid face)
221{
222 while (self->faces <= face)
223 {
224 Append (tileid, self->face2tile, self->faces, self->faces);
225 self->faces *= 2;
226 }
227}
228
229static void
230need_texid (struct map *self, int texid)
231{
232 while (self->texs <= texid)
233 {
234 Append (maptex, self->tex, self->texs, self->texs);
235 self->texs *= 2;
236 }
237}
238
166static maprow * 239static maprow *
167map_get_row (CFClient__Map self, int y) 240map_get_row (CFPlus__Map self, int y)
168{ 241{
169 if (0 > y) 242 if (0 > y)
170 { 243 {
171 int extend = - y + MAP_EXTEND_Y; 244 int extend = - y + MAP_EXTEND_Y;
172 Prepend (maprow, self->row, self->rows, extend); 245 Prepend (maprow, self->row, self->rows, extend);
210 283
211 return row->col + (x - row->c0); 284 return row->col + (x - row->c0);
212} 285}
213 286
214static mapcell * 287static mapcell *
215map_get_cell (CFClient__Map self, int x, int y) 288map_get_cell (CFPlus__Map self, int x, int y)
216{ 289{
217 return row_get_cell (map_get_row (self, y), x); 290 return row_get_cell (map_get_row (self, y), x);
218} 291}
219 292
220static void 293static void
221map_clear (CFClient__Map self) 294map_clear (CFPlus__Map self)
222{ 295{
223 int r; 296 int r;
224 297
225 for (r = 0; r < self->rows; r++) 298 for (r = 0; r < self->rows; r++)
226 Safefree (self->row[r].col); 299 Safefree (self->row[r].col);
234 self->row = 0; 307 self->row = 0;
235 self->rows = 0; 308 self->rows = 0;
236} 309}
237 310
238static void 311static void
239map_blank (CFClient__Map self, int x0, int y0, int w, int h) 312map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
240{ 313{
241 int x, y; 314 int x, y;
242 maprow *row; 315 maprow *row;
316 mapcell *cell;
243 317
244 for (y = y0; y < y0 + h; y++) 318 for (y = y0; y < y0 + h; y++)
245 if (y >= 0) 319 if (y >= 0)
246 { 320 {
247 if (y >= self->rows) 321 if (y >= self->rows)
253 if (x >= row->c0) 327 if (x >= row->c0)
254 { 328 {
255 if (x >= row->c1) 329 if (x >= row->c1)
256 break; 330 break;
257 331
258 row->col[x - row->c0].darkness = -1; 332 cell = row->col + x - row->c0;
333
334 cell->darkness = 0;
335 cell->stat_hp = 0;
336 cell->flags = 0;
337 cell->player = 0;
259 } 338 }
260 } 339 }
340}
341
342typedef struct {
343 tileid tile;
344 uint8_t x, y, level;
345} smooth_key;
346
347static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1);
351
352 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else
355 sv_setiv (*sv, bits);
261} 356}
262 357
263static void 358static void
264music_finished (void) 359music_finished (void)
265{ 360{
284 ev.data2 = 0; 379 ev.data2 = 0;
285 380
286 SDL_PushEvent ((SDL_Event *)&ev); 381 SDL_PushEvent ((SDL_Event *)&ev);
287} 382}
288 383
384static unsigned int
385minpot (unsigned int n)
386{
387 if (!n)
388 return 0;
389
390 --n;
391
392 n |= n >> 1;
393 n |= n >> 2;
394 n |= n >> 4;
395 n |= n >> 8;
396 n |= n >> 16;
397
398 return n + 1;
399}
400
401/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314
404
289MODULE = CFClient PACKAGE = CFClient 405MODULE = CFPlus PACKAGE = CFPlus
290 406
291PROTOTYPES: ENABLE 407PROTOTYPES: ENABLE
292 408
293BOOT: 409BOOT:
294{ 410{
295 HV *stash = gv_stashpv ("CFClient", 1); 411 HV *stash = gv_stashpv ("CFPlus", 1);
296 static const struct { 412 static const struct {
297 const char *name; 413 const char *name;
298 IV iv; 414 IV iv;
299 } *civ, const_iv[] = { 415 } *civ, const_iv[] = {
300# define const_iv(name) { # name, (IV)name } 416# define const_iv(name) { # name, (IV)name }
417 const_iv (SDLK_MODIFIER_MIN),
418 const_iv (SDLK_MODIFIER_MAX),
419
301 const_iv (SDL_ACTIVEEVENT), 420 const_iv (SDL_ACTIVEEVENT),
302 const_iv (SDL_KEYDOWN), 421 const_iv (SDL_KEYDOWN),
303 const_iv (SDL_KEYUP), 422 const_iv (SDL_KEYUP),
304 const_iv (SDL_MOUSEMOTION), 423 const_iv (SDL_MOUSEMOTION),
305 const_iv (SDL_MOUSEBUTTONDOWN), 424 const_iv (SDL_MOUSEBUTTONDOWN),
314 const_iv (SDL_EVENT_RESERVEDA), 433 const_iv (SDL_EVENT_RESERVEDA),
315 const_iv (SDL_EVENT_RESERVEDB), 434 const_iv (SDL_EVENT_RESERVEDB),
316 const_iv (SDL_VIDEORESIZE), 435 const_iv (SDL_VIDEORESIZE),
317 const_iv (SDL_VIDEOEXPOSE), 436 const_iv (SDL_VIDEOEXPOSE),
318 const_iv (SDL_USEREVENT), 437 const_iv (SDL_USEREVENT),
438
439 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE),
442
319 const_iv (SDLK_KP0), 443 const_iv (SDLK_KP0),
320 const_iv (SDLK_KP1), 444 const_iv (SDLK_KP1),
321 const_iv (SDLK_KP2), 445 const_iv (SDLK_KP2),
322 const_iv (SDLK_KP3), 446 const_iv (SDLK_KP3),
323 const_iv (SDLK_KP4), 447 const_iv (SDLK_KP4),
378 const_iv (SDLK_BREAK), 502 const_iv (SDLK_BREAK),
379 const_iv (SDLK_MENU), 503 const_iv (SDLK_MENU),
380 const_iv (SDLK_POWER), 504 const_iv (SDLK_POWER),
381 const_iv (SDLK_EURO), 505 const_iv (SDLK_EURO),
382 const_iv (SDLK_UNDO), 506 const_iv (SDLK_UNDO),
507
383 const_iv (KMOD_NONE), 508 const_iv (KMOD_NONE),
509 const_iv (KMOD_SHIFT),
384 const_iv (KMOD_LSHIFT), 510 const_iv (KMOD_LSHIFT),
385 const_iv (KMOD_RSHIFT), 511 const_iv (KMOD_RSHIFT),
512 const_iv (KMOD_CTRL),
386 const_iv (KMOD_LCTRL), 513 const_iv (KMOD_LCTRL),
387 const_iv (KMOD_RCTRL), 514 const_iv (KMOD_RCTRL),
515 const_iv (KMOD_ALT),
388 const_iv (KMOD_LALT), 516 const_iv (KMOD_LALT),
389 const_iv (KMOD_RALT), 517 const_iv (KMOD_RALT),
518 const_iv (KMOD_META),
390 const_iv (KMOD_LMETA), 519 const_iv (KMOD_LMETA),
391 const_iv (KMOD_RMETA), 520 const_iv (KMOD_RMETA),
392 const_iv (KMOD_NUM), 521 const_iv (KMOD_NUM),
393 const_iv (KMOD_CAPS), 522 const_iv (KMOD_CAPS),
394 const_iv (KMOD_MODE), 523 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 524# undef const_iv
400 }; 525 };
401 526
402 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 527 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
404 529
405 fontmap = pango_ft2_font_map_new (); 530 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
406 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 531 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
407 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
408} 532}
533
534void
535weaken (SV *rv)
536 PROTOTYPE: $
537 CODE:
538 sv_rvweaken (rv);
409 539
410int 540int
541in_destruct ()
542 CODE:
543 RETVAL = PL_main_cv == Nullcv;
544 OUTPUT:
545 RETVAL
546
547NV floor (NV x)
548
549NV ceil (NV x)
550
551void
552pango_init ()
553 CODE:
554{
555 opengl_fontmap = pango_opengl_font_map_new ();
556 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
557 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
558}
559
560int
411SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
412 562
413void 563void
414SDL_Quit () 564SDL_Quit ()
415 565
416void 566void
422 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 572 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426 576
577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
579
427 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431 584
432 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586#if SDL_VERSION_ATLEAST(1,2,10)
433 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 587 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
434 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 588 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589#endif
435 590
436 SDL_EnableUNICODE (1); 591 SDL_EnableUNICODE (1);
437 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438 593
439 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
448 603
449 ++m; 604 ++m;
450 } 605 }
451} 606}
452 607
608char *
609SDL_GetError ()
610
453int 611int
454SDL_SetVideoMode (int w, int h, int fullscreen) 612SDL_SetVideoMode (int w, int h, int fullscreen)
455 CODE: 613 CODE:
456 RETVAL = !!SDL_SetVideoMode ( 614 RETVAL = !!SDL_SetVideoMode (
457 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
458 ); 616 );
617 if (RETVAL)
618 {
459 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h"
622# undef GL_FUNC
623 }
460 OUTPUT: 624 OUTPUT:
461 RETVAL 625 RETVAL
462 626
463void 627void
464SDL_GL_SwapBuffers () 628SDL_GL_SwapBuffers ()
629
630char *
631SDL_GetKeyName (int sym)
465 632
466void 633void
467SDL_PollEvent () 634SDL_PollEvent ()
468 PPCODE: 635 PPCODE:
469{ 636{
479 case SDL_KEYDOWN: 646 case SDL_KEYDOWN:
480 case SDL_KEYUP: 647 case SDL_KEYUP:
481 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
482 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
483 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 650 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
651 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
484 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
485 break; 653 break;
486 654
487 case SDL_ACTIVEEVENT: 655 case SDL_ACTIVEEVENT:
488 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490 break; 658 break;
491 659
492 case SDL_MOUSEMOTION: 660 case SDL_MOUSEMOTION:
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
662
493 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498 break; 668 break;
499 669
500 case SDL_MOUSEBUTTONDOWN: 670 case SDL_MOUSEBUTTONDOWN:
501 case SDL_MOUSEBUTTONUP: 671 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
673
502 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 674 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 675 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 676 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 677 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506 break; 678 break;
510 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 682 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 683 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512 break; 684 break;
513 } 685 }
514 686
515 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 687 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
516 } 688 }
517} 689}
518 690
519int 691int
520Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 692Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
533 CODE: 705 CODE:
534#ifndef _WIN32 706#ifndef _WIN32
535 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536#endif 708#endif
537 709
538char * 710void
539gl_version () 711win32_proxy_info ()
540 CODE: 712 PPCODE:
541 RETVAL = (char *)glGetString (GL_VERSION); 713{
542 OUTPUT: 714#ifdef _WIN32
543 RETVAL 715 char buffer[2048];
716 DWORD buflen;
544 717
545char * 718 EXTEND (SP, 3);
546gl_extensions () 719
547 CODE: 720 buflen = sizeof (buffer);
548 RETVAL = (char *)glGetString (GL_EXTENSIONS); 721 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
549 OUTPUT: 722 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
550 RETVAL 723 {
724 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
725
726 buflen = sizeof (buffer);
727 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
728 {
729 PUSHs (newSVpv (buffer, 0));
730
731 buflen = sizeof (buffer);
732 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
733 PUSHs (newSVpv (buffer, 0));
734 }
735 }
736#endif
737}
551 738
552void 739void
553add_font (char *file) 740add_font (char *file)
554 CODE: 741 CODE:
555 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 742 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
556 743
557void 744void
558load_image_inline (SV *image_) 745load_image_inline (SV *image_)
559 ALIAS: 746 ALIAS:
560 load_image_file = 1 747 load_image_file = 1
602 789
603 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 790 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
604 791
605 assert (surface2->pitch == surface2->w * 4); 792 assert (surface2->pitch == surface2->w * 4);
606 793
794 SDL_LockSurface (surface2);
607 EXTEND (SP, 5); 795 EXTEND (SP, 6);
608 PUSHs (sv_2mortal (newSViv (surface2->w))); 796 PUSHs (sv_2mortal (newSViv (surface2->w)));
609 PUSHs (sv_2mortal (newSViv (surface2->h))); 797 PUSHs (sv_2mortal (newSViv (surface2->h)));
610 SDL_LockSurface (surface2);
611 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 798 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))); 799 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
614 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 800 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
615 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 801 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
802 SDL_UnlockSurface (surface2);
616 803
617 SDL_FreeSurface (surface); 804 SDL_FreeSurface (surface);
618 SDL_FreeSurface (surface2); 805 SDL_FreeSurface (surface2);
619} 806}
620 807
644} 831}
645 832
646void 833void
647error (char *message) 834error (char *message)
648 CODE: 835 CODE:
836 fprintf (stderr, "ERROR: %s\n", message);
649#ifdef _WIN32 837#ifdef _WIN32
650 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 838 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
839#endif
840
841void
842fatal (char *message)
843 CODE:
844 fprintf (stderr, "FATAL: %s\n", message);
845#ifdef _WIN32
846 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
847#endif
848 _exit (1);
849
850void
851_exit (int retval = 0)
852 CODE:
853#ifdef WIN32
854 ExitThread (retval); // unclean, please beam me up
651#else 855#else
652 fprintf (stderr, "ERROR: %s\n", message); 856 _exit (retval);
653#endif 857#endif
654 858
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 859MODULE = CFPlus PACKAGE = CFPlus::Font
666 860
667CFClient::Font 861CFPlus::Font
668new_from_file (SV *class, char *path, int id = 0) 862new_from_file (SV *class, char *path, int id = 0)
669 CODE: 863 CODE:
670{ 864{
671 int count; 865 int count;
672 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 866 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
675} 869}
676 OUTPUT: 870 OUTPUT:
677 RETVAL 871 RETVAL
678 872
679void 873void
680DESTROY (CFClient::Font self) 874DESTROY (CFPlus::Font self)
681 CODE: 875 CODE:
682 pango_font_description_free (self); 876 pango_font_description_free (self);
683 877
684void 878void
685make_default (CFClient::Font self) 879make_default (CFPlus::Font self)
686 CODE: 880 CODE:
687 default_font = self; 881 default_font = self;
688 882
689MODULE = CFClient PACKAGE = CFClient::Layout 883MODULE = CFPlus PACKAGE = CFPlus::Layout
690 884
691CFClient::Layout 885void
692new (SV *class, int base_height = MIN_FONT_HEIGHT) 886reset_glyph_cache ()
887 CODE:
888 tc_clear ();
889
890CFPlus::Layout
891new (SV *class)
693 CODE: 892 CODE:
694 New (0, RETVAL, 1, struct cf_layout); 893 New (0, RETVAL, 1, struct cf_layout);
894
695 RETVAL->pl = pango_layout_new (context); 895 RETVAL->pl = pango_layout_new (opengl_context);
696 RETVAL->base_height = base_height; 896 RETVAL->r = 1.;
897 RETVAL->g = 1.;
898 RETVAL->b = 1.;
899 RETVAL->a = 1.;
900 RETVAL->base_height = MIN_FONT_HEIGHT;
697 RETVAL->font = 0; 901 RETVAL->font = 0;
902
698 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 903 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699 pango_layout_set_font_description (RETVAL->pl, default_font); 904 layout_update_font (RETVAL);
700 OUTPUT: 905 OUTPUT:
701 RETVAL 906 RETVAL
702 907
703void 908void
704DESTROY (CFClient::Layout self) 909DESTROY (CFPlus::Layout self)
705 CODE: 910 CODE:
706 g_object_unref (self->pl); 911 g_object_unref (self->pl);
707 Safefree (self); 912 Safefree (self);
708 913
709void 914void
710set_text (CFClient::Layout self, SV *text_) 915set_text (CFPlus::Layout self, SV *text_)
711 CODE: 916 CODE:
712{ 917{
713 STRLEN textlen; 918 STRLEN textlen;
714 char *text = SvPVutf8 (text_, textlen); 919 char *text = SvPVutf8 (text_, textlen);
715 920
716 pango_layout_set_text (self->pl, text, textlen); 921 pango_layout_set_text (self->pl, text, textlen);
717} 922}
718 923
719void 924void
720set_markup (CFClient::Layout self, SV *text_) 925set_markup (CFPlus::Layout self, SV *text_)
721 CODE: 926 CODE:
722{ 927{
723 STRLEN textlen; 928 STRLEN textlen;
724 char *text = SvPVutf8 (text_, textlen); 929 char *text = SvPVutf8 (text_, textlen);
725 930
726 pango_layout_set_markup (self->pl, text, textlen); 931 pango_layout_set_markup (self->pl, text, textlen);
727} 932}
728 933
729SV * 934void
935set_shapes (CFPlus::Layout self, ...)
936 CODE:
937{
938 PangoAttrList *attrs = 0;
939 const char *text = pango_layout_get_text (self->pl);
940 const char *pos = text;
941 int arg = 4;
942
943 while (arg < items && (pos = strstr (pos, OBJ_STR)))
944 {
945 PangoRectangle inkrect, rect;
946 PangoAttribute *attr;
947
948 int x = SvIV (ST (arg - 3));
949 int y = SvIV (ST (arg - 2));
950 int w = SvIV (ST (arg - 1));
951 int h = SvIV (ST (arg ));
952
953 inkrect.x = 0;
954 inkrect.y = 0;
955 inkrect.width = 0;
956 inkrect.height = 0;
957
958 rect.x = x * PANGO_SCALE;
959 rect.y = y * PANGO_SCALE;
960 rect.width = w * PANGO_SCALE;
961 rect.height = h * PANGO_SCALE;
962
963 if (!attrs)
964 attrs = pango_layout_get_attributes (self->pl);
965
966 attr = pango_attr_shape_new (&inkrect, &rect);
967 attr->start_index = pos - text;
968 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
969 pango_attr_list_insert (attrs, attr);
970
971 arg += 4;
972 pos += sizeof (OBJ_STR) - 1;
973 }
974
975 if (attrs)
976 pango_layout_set_attributes (self->pl, attrs);
977}
978
979void
730get_text (CFClient::Layout self) 980get_shapes (CFPlus::Layout self)
731 CODE: 981 PPCODE:
982{
983 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
984
985 do
986 {
987 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
988
989 if (run && shape_attr_p (run))
990 {
991 PangoRectangle extents;
992 pango_layout_iter_get_run_extents (iter, 0, &extents);
993
994 EXTEND (SP, 2);
995 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
996 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
997 }
998 }
999 while (pango_layout_iter_next_run (iter));
1000
1001 pango_layout_iter_free (iter);
1002}
1003
1004int
1005has_wrapped (CFPlus::Layout self)
1006 CODE:
1007{
1008 int lines = 1;
1009 const char *text = pango_layout_get_text (self->pl);
1010
1011 while (*text)
1012 lines += *text++ == '\n';
1013
732 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1014 RETVAL = lines < pango_layout_get_line_count (self->pl);
733 SvUTF8_on (RETVAL); 1015}
734 OUTPUT: 1016 OUTPUT:
735 RETVAL 1017 RETVAL
736 1018
1019SV *
1020get_text (CFPlus::Layout self)
1021 CODE:
1022 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1023 sv_utf8_decode (RETVAL);
1024 OUTPUT:
1025 RETVAL
1026
737void 1027void
1028set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
1029 CODE:
1030 self->r = r;
1031 self->g = g;
1032 self->b = b;
1033 self->a = a;
1034
1035void
738set_font (CFClient::Layout self, CFClient::Font font = 0) 1036set_font (CFPlus::Layout self, CFPlus::Font font = 0)
739 CODE: 1037 CODE:
740 if (self->font != font) 1038 if (self->font != font)
741 { 1039 {
742 self->font = font; 1040 self->font = font;
743 layout_update_font (self); 1041 layout_update_font (self);
744 } 1042 }
745 1043
746void 1044void
747set_height (CFClient::Layout self, int base_height) 1045set_height (CFPlus::Layout self, int base_height)
748 CODE: 1046 CODE:
749 if (self->base_height != base_height) 1047 if (self->base_height != base_height)
750 { 1048 {
751 self->base_height = base_height; 1049 self->base_height = base_height;
752 layout_update_font (self); 1050 layout_update_font (self);
753 } 1051 }
754 1052
755void 1053void
756set_width (CFClient::Layout self, int max_width = -1) 1054set_width (CFPlus::Layout self, int max_width = -1)
757 CODE: 1055 CODE:
758 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1056 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
759 1057
760void 1058void
1059set_indent (CFPlus::Layout self, int indent)
1060 CODE:
1061 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1062
1063void
1064set_spacing (CFPlus::Layout self, int spacing)
1065 CODE:
1066 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1067
1068void
1069set_ellipsise (CFPlus::Layout self, int ellipsise)
1070 CODE:
1071 pango_layout_set_ellipsize (self->pl,
1072 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1073 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1074 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1075 : PANGO_ELLIPSIZE_NONE
1076 );
1077
1078void
1079set_single_paragraph_mode (CFPlus::Layout self, int spm)
1080 CODE:
1081 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1082
1083void
761size (CFClient::Layout self) 1084size (CFPlus::Layout self)
762 PPCODE: 1085 PPCODE:
763{ 1086{
764 int w, h; 1087 int w, h;
765 1088
766 layout_get_pixel_size (self, &w, &h); 1089 layout_get_pixel_size (self, &w, &h);
769 PUSHs (sv_2mortal (newSViv (w))); 1092 PUSHs (sv_2mortal (newSViv (w)));
770 PUSHs (sv_2mortal (newSViv (h))); 1093 PUSHs (sv_2mortal (newSViv (h)));
771} 1094}
772 1095
773int 1096int
1097descent (CFPlus::Layout self)
1098 CODE:
1099{
1100 PangoRectangle rect;
1101 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1102 pango_layout_line_get_pixel_extents (line, 0, &rect);
1103 RETVAL = PANGO_DESCENT (rect);
1104}
1105 OUTPUT:
1106 RETVAL
1107
1108int
774xy_to_index (CFClient::Layout self, int x, int y) 1109xy_to_index (CFPlus::Layout self, int x, int y)
775 CODE: 1110 CODE:
776{ 1111{
777 int index, trailing; 1112 int index, trailing;
778 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1113 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
779 RETVAL = index; 1114 RETVAL = index + trailing;
780} 1115}
781 OUTPUT: 1116 OUTPUT:
782 RETVAL 1117 RETVAL
783 1118
784void 1119void
785cursor_pos (CFClient::Layout self, int index) 1120cursor_pos (CFPlus::Layout self, int index)
786 PPCODE: 1121 PPCODE:
787{ 1122{
788 PangoRectangle strong_pos; 1123 PangoRectangle strong_pos;
789 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1124 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
790 1125
793 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1128 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
794 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1129 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
795} 1130}
796 1131
797void 1132void
798render (CFClient::Layout self) 1133index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
799 PPCODE: 1134 PPCODE:
800{ 1135{
801 SV *retval; 1136 int line, x;
802 int w, h;
803 FT_Bitmap bitmap;
804 1137
805 layout_get_pixel_size (self, &w, &h); 1138 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1139 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
806 1140
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); 1141 EXTEND (SP, 2);
823 PUSHs (sv_2mortal (newSViv (w))); 1142 PUSHs (sv_2mortal (newSViv (line - 1)));
1143 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1144}
1145
1146void
1147line_x_to_index (CFPlus::Layout self, int line, int x)
1148 PPCODE:
1149{
1150 PangoLayoutLine *lp;
1151 int index, trailing;
1152
1153 if (line < 0)
1154 XSRETURN_EMPTY;
1155
1156 if (!(lp = pango_layout_get_line (self->pl, line)))
1157 XSRETURN_EMPTY; /* do better */
1158
1159 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1160
1161 EXTEND (SP, 2);
1162 if (GIMME_V == G_SCALAR)
1163 PUSHs (sv_2mortal (newSViv (index + trailing)));
1164 else
1165 {
824 PUSHs (sv_2mortal (newSViv (h))); 1166 PUSHs (sv_2mortal (newSViv (index)));
825 PUSHs (sv_2mortal (retval)); 1167 PUSHs (sv_2mortal (newSViv (trailing)));
1168 }
826} 1169}
827 1170
1171void
1172render (CFPlus::Layout self, float x, float y, int flags = 0)
1173 PPCODE:
1174 pango_opengl_render_layout_subpixel (
1175 self->pl,
1176 x * PANGO_SCALE, y * PANGO_SCALE,
1177 self->r, self->g, self->b, self->a,
1178 flags
1179 );
1180
828MODULE = CFClient PACKAGE = CFClient::Texture 1181MODULE = CFPlus PACKAGE = CFPlus::Texture
829 1182
830void 1183void
1184pad2pot (SV *data_, SV *w_, SV *h_)
1185 CODE:
1186{
1187 int ow = SvIV (w_);
1188 int oh = SvIV (h_);
1189
1190 if (ow && oh)
1191 {
1192 int nw = minpot (ow);
1193 int nh = minpot (oh);
1194
1195 if (nw != ow || nh != oh)
1196 {
1197 if (SvOK (data_))
1198 {
1199 STRLEN datalen;
1200 char *data = SvPVbyte (data_, datalen);
1201 int bpp = datalen / (ow * oh);
1202 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1203
1204 SvPOK_only (result_);
1205 SvCUR_set (result_, nw * nh * bpp);
1206
1207 memset (SvPVX (result_), 0, nw * nh * bpp);
1208 while (oh--)
1209 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1210
1211 sv_setsv (data_, result_);
1212 }
1213
1214 sv_setiv (w_, nw);
1215 sv_setiv (h_, nh);
1216 }
1217 }
1218}
1219
1220void
831draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1221draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
832 PROTOTYPE: $$$;$$ 1222 PROTOTYPE: $$$;$$
1223 ALIAS:
1224 draw_quad_alpha = 1
1225 draw_quad_alpha_premultiplied = 2
833 CODE: 1226 CODE:
834{ 1227{
835 HV *hv = (HV *)SvRV (self); 1228 HV *hv = (HV *)SvRV (self);
836 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1229 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1230 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1231 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840 1232
841 if (items < 5) 1233 if (items < 5)
842 { 1234 {
843 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1235 w = SvNV (*hv_fetch (hv, "w", 1, 1));
844 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1236 h = SvNV (*hv_fetch (hv, "h", 1, 1));
845 } 1237 }
846 1238
1239 if (ix)
1240 {
1241 glEnable (GL_BLEND);
1242
1243 if (ix == 2)
1244 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1245 else
1246 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1247 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1248
1249 glEnable (GL_ALPHA_TEST);
1250 glAlphaFunc (GL_GREATER, 0.01f);
1251 }
1252
847 glBindTexture (GL_TEXTURE_2D, name); 1253 glBindTexture (GL_TEXTURE_2D, name);
848 if (wrap_mode) { 1254
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); 1255 glBegin (GL_QUADS);
853 glTexCoord2f (0, 0); glVertex2f (x , y ); 1256 glTexCoord2f (0, 0); glVertex2f (x , y );
854 glTexCoord2f (0, t); glVertex2f (x , y + h); 1257 glTexCoord2f (0, t); glVertex2f (x , y + h);
855 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1258 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1259 glTexCoord2f (s, 0); glVertex2f (x + w, y );
857 glEnd (); 1260 glEnd ();
858}
859 1261
1262 if (ix)
1263 {
1264 glDisable (GL_ALPHA_TEST);
1265 glDisable (GL_BLEND);
1266 }
1267}
1268
860MODULE = CFClient PACKAGE = CFClient::Map 1269MODULE = CFPlus PACKAGE = CFPlus::Map
861 1270
862CFClient::Map 1271CFPlus::Map
863new (SV *class, int map_width, int map_height) 1272new (SV *class)
864 CODE: 1273 CODE:
865 New (0, RETVAL, 1, struct map); 1274 New (0, RETVAL, 1, struct map);
866 RETVAL->x = 0; 1275 RETVAL->x = 0;
867 RETVAL->y = 0; 1276 RETVAL->y = 0;
868 RETVAL->w = map_width; 1277 RETVAL->w = 0;
869 RETVAL->h = map_height; 1278 RETVAL->h = 0;
870 RETVAL->ox = 0; 1279 RETVAL->ox = 0;
871 RETVAL->oy = 0; 1280 RETVAL->oy = 0;
872 RETVAL->faces = 8192; 1281 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
873 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1282 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; 1283 RETVAL->rows = 0;
877 RETVAL->row = 0; 1284 RETVAL->row = 0;
878 OUTPUT: 1285 OUTPUT:
879 RETVAL 1286 RETVAL
880 1287
881void 1288void
882DESTROY (CFClient::Map self) 1289DESTROY (CFPlus::Map self)
883 CODE: 1290 CODE:
884{ 1291{
885 map_clear (self); 1292 map_clear (self);
886 Safefree (self->face); 1293 Safefree (self->face2tile);
1294 Safefree (self->tex);
887 Safefree (self); 1295 Safefree (self);
888} 1296}
889 1297
890void 1298void
1299resize (CFPlus::Map self, int map_width, int map_height)
1300 CODE:
1301 self->w = map_width;
1302 self->h = map_height;
1303
1304void
891clear (CFClient::Map self) 1305clear (CFPlus::Map self)
892 CODE: 1306 CODE:
893 map_clear (self); 1307 map_clear (self);
894 1308
895void 1309void
896set_face (CFClient::Map self, int face, int texid) 1310set_tileid (CFPlus::Map self, int face, int tile)
897 CODE: 1311 CODE:
898{ 1312{
899 while (self->faces <= face) 1313 need_facenum (self, face); self->face2tile [face] = tile;
900 { 1314 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} 1315}
907 1316
908void 1317void
1318set_smooth (CFPlus::Map self, int face, int smooth, int level)
1319 CODE:
1320{
1321 tileid texid;
1322 maptex *tex;
1323
1324 if (face < 0 || face >= self->faces)
1325 return;
1326
1327 if (smooth < 0 || smooth >= self->faces)
1328 return;
1329
1330 texid = self->face2tile [face];
1331
1332 if (!texid)
1333 return;
1334
1335 tex = self->tex + texid;
1336 tex->smoothtile = self->face2tile [smooth];
1337 tex->smoothlevel = level;
1338}
1339
1340void
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) 1341set_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: 1342 CODE:
911{ 1343{
912 while (self->texs <= texid) 1344 need_texid (self, texid);
913 {
914 Append (maptex, self->tex, self->texs, self->texs);
915 self->texs *= 2;
916 }
917 1345
918 { 1346 {
919 maptex *tex = self->tex + texid; 1347 maptex *tex = self->tex + texid;
920 1348
921 tex->name = name; 1349 tex->name = name;
926 tex->r = r; 1354 tex->r = r;
927 tex->g = g; 1355 tex->g = g;
928 tex->b = b; 1356 tex->b = b;
929 tex->a = a; 1357 tex->a = a;
930 } 1358 }
1359
1360 // somewhat hackish, but for textures that require it, it really
1361 // improves the look, and most others don't suffer.
1362 glBindTexture (GL_TEXTURE_2D, name);
1363 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1364 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1365 // use uglier nearest interpolation because linear suffers
1366 // from transparent color bleeding and ugly wrapping effects.
1367 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
931} 1368}
932 1369
933int 1370int
934ox (CFClient::Map self) 1371ox (CFPlus::Map self)
935 ALIAS: 1372 ALIAS:
936 oy = 1 1373 oy = 1
1374 x = 2
1375 y = 3
1376 w = 4
1377 h = 5
937 CODE: 1378 CODE:
938 switch (ix) 1379 switch (ix)
939 { 1380 {
940 case 0: RETVAL = self->ox; break; 1381 case 0: RETVAL = self->ox; break;
941 case 1: RETVAL = self->oy; break; 1382 case 1: RETVAL = self->oy; break;
1383 case 2: RETVAL = self->x; break;
1384 case 3: RETVAL = self->y; break;
1385 case 4: RETVAL = self->w; break;
1386 case 5: RETVAL = self->h; break;
942 } 1387 }
943 OUTPUT: 1388 OUTPUT:
944 RETVAL 1389 RETVAL
945 1390
946void 1391void
947scroll (CFClient::Map self, int dx, int dy) 1392scroll (CFPlus::Map self, int dx, int dy)
948 CODE: 1393 CODE:
949{ 1394{
950 if (dx > 0) 1395 if (dx > 0)
951 map_blank (self, self->x, self->y, dx - 1, self->h); 1396 map_blank (self, self->x, self->y, dx, self->h);
952 else if (dx < 0) 1397 else if (dx < 0)
953 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1398 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
954 1399
955 if (dy > 0) 1400 if (dy > 0)
956 map_blank (self, self->x, self->y, self->w, dy - 1); 1401 map_blank (self, self->x, self->y, self->w, dy);
957 else if (dy < 0) 1402 else if (dy < 0)
958 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1403 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
959 1404
960 self->ox += dx; self->x += dx; 1405 self->ox += dx; self->x += dx;
961 self->oy += dy; self->y += dy; 1406 self->oy += dy; self->y += dy;
962 1407
963 while (self->y < 0) 1408 while (self->y < 0)
968 self->y += MAP_EXTEND_Y; 1413 self->y += MAP_EXTEND_Y;
969 } 1414 }
970} 1415}
971 1416
972void 1417void
973map1a_update (CFClient::Map self, SV *data_) 1418map1a_update (CFPlus::Map self, SV *data_, int extmap)
974 CODE: 1419 CODE:
975{ 1420{
976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1421 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
977 uint8_t *data_end = (uint8_t *)SvEND (data_); 1422 uint8_t *data_end = (uint8_t *)SvEND (data_);
978 mapcell *cell; 1423 mapcell *cell;
979 int x, y, flags; 1424 int x, y, flags;
980 1425
981 while (data < data_end) 1426 while (data < data_end - 1)
982 { 1427 {
983 flags = (data [0] << 8) + data [1]; data += 2; 1428 flags = (data [0] << 8) + data [1]; data += 2;
984 1429
985 x = ((flags >> 10) & 63) + self->x; 1430 x = self->x + ((flags >> 10) & 63);
986 y = ((flags >> 4) & 63) + self->y; 1431 y = self->y + ((flags >> 4) & 63);
987 1432
988 cell = map_get_cell (self, x, y); 1433 cell = map_get_cell (self, x, y);
989 1434
990 if (flags & 15) 1435 if (flags & 15)
991 { 1436 {
992 if (cell->darkness < 0) 1437 if (!cell->darkness)
993 { 1438 {
1439 memset (cell, 0, sizeof (*cell));
994 cell->darkness = 0; 1440 cell->darkness = 256;
995 cell->face [0] = 0;
996 cell->face [1] = 0;
997 cell->face [2] = 0;
998 } 1441 }
999 1442
1000 cell->darkness = flags & 8 ? *data++ : 255;
1001
1002 //TODO: don't trust server data to be in-range(!) 1443 //TODO: don't trust server data to be in-range(!)
1444
1445 if (flags & 8)
1446 {
1447 if (extmap)
1448 {
1449 uint8_t ext, cmd;
1450
1451 do
1452 {
1453 ext = *data++;
1454 cmd = ext & 0x3f;
1455
1456 if (cmd < 4)
1457 cell->darkness = 255 - ext * 64 + 1;
1458 else if (cmd == 5) // health
1459 {
1460 cell->stat_width = 1;
1461 cell->stat_hp = *data++;
1462 }
1463 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47)
1466 {
1467 if (*data == 8)
1468 ; // decode player uuid
1469
1470 data += *data + 1;
1471 }
1472 else if (cmd == 8) // cell flags
1473 cell->flags = *data++;
1474 else if (ext & 0x40) // unknown, multibyte => skip
1475 data += *data + 1;
1476 else
1477 data++;
1478 }
1479 while (ext & 0x80);
1480 }
1481 else
1482 cell->darkness = *data++ + 1;
1483 }
1003 1484
1004 if (flags & 4) 1485 if (flags & 4)
1005 { 1486 {
1006 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1487 faceid face = (data [0] << 8) + data [1]; data += 2;
1488 need_facenum (self, face);
1489 cell->tile [0] = self->face2tile [face];
1007 } 1490 }
1008 1491
1009 if (flags & 2) 1492 if (flags & 2)
1010 { 1493 {
1011 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1494 faceid face = (data [0] << 8) + data [1]; data += 2;
1495 need_facenum (self, face);
1496 cell->tile [1] = self->face2tile [face];
1012 } 1497 }
1013 1498
1014 if (flags & 1) 1499 if (flags & 1)
1015 { 1500 {
1016 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1501 faceid face = (data [0] << 8) + data [1]; data += 2;
1502 need_facenum (self, face);
1503 cell->tile [2] = self->face2tile [face];
1017 } 1504 }
1018 } 1505 }
1019 else 1506 else
1020 cell->darkness = -1; 1507 cell->darkness = 0;
1021 } 1508 }
1022} 1509}
1023 1510
1024SV * 1511SV *
1025mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1512mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1026 CODE: 1513 CODE:
1027{ 1514{
1028 int x1, x; 1515 int x1, x;
1029 int y1, y; 1516 int y1, y;
1030 int z; 1517 int z;
1051 { 1538 {
1052 mapcell *cell = row->col + (x - row->c0); 1539 mapcell *cell = row->col + (x - row->c0);
1053 1540
1054 for (z = 0; z <= 0; z++) 1541 for (z = 0; z <= 0; z++)
1055 { 1542 {
1056 mapface face = cell->face [z];
1057
1058 if (face)
1059 {
1060 maptex tex = self->tex [face]; 1543 maptex tex = self->tex [cell->tile [z]];
1061 int a0 = 255 - tex.a; 1544 int a0 = 255 - tex.a;
1062 int a1 = tex.a; 1545 int a1 = tex.a;
1063 1546
1064 r = (r * a0 + tex.r * a1) / 255; 1547 r = (r * a0 + tex.r * a1) / 255;
1065 g = (g * a0 + tex.g * a1) / 255; 1548 g = (g * a0 + tex.g * a1) / 255;
1066 b = (b * a0 + tex.b * a1) / 255; 1549 b = (b * a0 + tex.b * a1) / 255;
1067 a = (a * a0 + tex.a * a1) / 255; 1550 a = (a * a0 + tex.a * a1) / 255;
1068 }
1069 } 1551 }
1070 } 1552 }
1071 1553
1072 *map++ = (r ) 1554 *map++ = (r )
1073 | (g << 8) 1555 | (g << 8)
1080} 1562}
1081 OUTPUT: 1563 OUTPUT:
1082 RETVAL 1564 RETVAL
1083 1565
1084void 1566void
1085draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1086 PPCODE: 1568 CODE:
1087{ 1569{
1088 int vx, vy; 1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256];
1573 smooth_key skey;
1089 int x, y, z; 1574 int x, y, z;
1090 int last_name; 1575 int last_name;
1091 mapface face; 1576
1577 // thats current max. sorry.
1578 if (sw > 255) sw = 255;
1579 if (sh > 255) sh = 255;
1580
1581 // clear key, in case of extra padding
1582 memset (&skey, 0, sizeof (skey));
1583
1584 glColor4ub (255, 255, 255, 255);
1585
1586 glEnable (GL_BLEND);
1587 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1588 glEnable (GL_TEXTURE_2D);
1589 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1590
1591 glBegin (GL_QUADS);
1592
1593 last_name = 0;
1594
1595 mx += self->x;
1596 my += self->y;
1597
1598 // first pass: determine smooth_max
1599 // rather ugly, if you ask me
1600 // could also be stored inside mapcell and updated on change
1601 memset (smooth_max, 0, sizeof (smooth_max));
1602
1603 for (y = 0; y < sh; y++)
1604 if (0 <= y + my && y + my < self->rows)
1605 {
1606 maprow *row = self->row + (y + my);
1607
1608 for (x = 0; x < sw; x++)
1609 if (row->c0 <= x + mx && x + mx < row->c1)
1610 {
1611 mapcell *cell = row->col + (x + mx - row->c0);
1612
1613 for (z = 0; z <= 2; z++)
1614 {
1615 uint8_t level = self->tex [cell->tile [z]].smoothlevel;
1616 if (level > smooth_max [x + 1][y + 1])
1617 smooth_max [x + 1][y + 1] = level;
1618 }
1619 }
1620 }
1621
1622 for (z = 0; z <= 2; z++)
1623 {
1624 memset (smooth_level, 0, sizeof (smooth_level));
1625
1626 for (y = 0; y < sh; y++)
1627 if (0 <= y + my && y + my < self->rows)
1628 {
1629 maprow *row = self->row + (y + my);
1630
1631 for (x = 0; x < sw; x++)
1632 if (row->c0 <= x + mx && x + mx < row->c1)
1633 {
1634 mapcell *cell = row->col + (x + mx - row->c0);
1635 tileid tile = cell->tile [z];
1636
1637 if (tile)
1638 {
1639 maptex tex = self->tex [tile];
1640 int px = (x + 1) * T - tex.w;
1641 int py = (y + 1) * T - tex.h;
1642
1643 // suppressing texture state switches here
1644 // is only moderately effective, but worth the extra effort
1645 if (last_name != tex.name)
1646 {
1647 if (!tex.name)
1648 tex = self->tex [2]; /* missing, replace by noface */
1649
1650 glEnd ();
1651 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1652 glBegin (GL_QUADS);
1653 }
1654
1655 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1656 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1657 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1658 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1659
1660 if (cell->flags && z == 2)
1661 {
1662 if (cell->flags & 1)
1663 {
1664 maptex tex = self->tex [1];
1665 int px = x * T + T * 2 / 32;
1666 int py = y * T - T * 6 / 32;
1667
1668 glEnd ();
1669 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1670 glBegin (GL_QUADS);
1671
1672 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1673 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1674 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1675 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1676 }
1677 }
1678
1679 // update smooth hash
1680 if (tex.smoothtile)
1681 {
1682 skey.tile = tex.smoothtile;
1683 skey.level = tex.smoothlevel;
1684
1685 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1686
1687 // add bits to current tile and all neighbours. skey.x|y is
1688 // shifted +1|+1 so we always stay positive.
1689
1690 // full tile
1691 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1692
1693 // borders
1694 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
1695 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
1696 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1697 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1698
1699 // corners
1700 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1701 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1702 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1703 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1704 }
1705 }
1706 }
1707 }
1708
1709 // go through all smoothlevels, lowest to highest, then draw
1710 // this is basically counting sort
1711 {
1712 int w, b;
1713
1714 for (w = 0; w < 256 / 32; ++w)
1715 {
1716 uint32_t smask = smooth_level [w];
1717 if (smask)
1718 for (b = 0; b < 32; ++b)
1719 if (smask & (((uint32_t)1) << b))
1720 {
1721 int level = (w << 5) | b;
1722 HE *he;
1723
1724 hv_iterinit (smooth);
1725 while ((he = hv_iternext (smooth)))
1726 {
1727 smooth_key *skey = (smooth_key *)HeKEY (he);
1728 IV bits = SvIVX (HeVAL (he));
1729
1730 // bits is ___n cccc CCCC bbbb
1731 // n do not draw borders&corners
1732 // c draw these corners, but...
1733 // C ... not these
1734 // b draw these borders
1735
1736 if (!(bits & 0x1000)
1737 && skey->level == level
1738 && level >= smooth_max [skey->x][skey->y])
1739 {
1740 maptex tex = self->tex [skey->tile];
1741 int px = (((int)skey->x) - 1) * T;
1742 int py = (((int)skey->y) - 1) * T;
1743 int border = bits & 15;
1744 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1745 float dx = tex.s * .0625f; // 16 images/row
1746 float dy = tex.t * .5f ; // 2 images/column
1747
1748 // this time naively avoiding texture state changes
1749 // save gobs of state changes.
1750 if (last_name != tex.name)
1751 {
1752 if (!tex.name)
1753 continue; // smoothing not yet available
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758 }
1759
1760 if (border)
1761 {
1762 float ox = border * dx;
1763
1764 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1765 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1766 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1767 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1768 }
1769
1770 if (corner)
1771 {
1772 float ox = corner * dx;
1773
1774 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1775 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1776 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1777 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1778 }
1779 }
1780 }
1781 }
1782 }
1783 }
1784
1785 hv_clear (smooth);
1786 }
1787
1788 glEnd ();
1789
1790 glDisable (GL_TEXTURE_2D);
1791 glDisable (GL_BLEND);
1792
1793 // top layer: overlays such as the health bar
1794 for (y = 0; y < sh; y++)
1795 if (0 <= y + my && y + my < self->rows)
1796 {
1797 maprow *row = self->row + (y + my);
1798
1799 for (x = 0; x < sw; x++)
1800 if (row->c0 <= x + mx && x + mx < row->c1)
1801 {
1802 mapcell *cell = row->col + (x + mx - row->c0);
1803
1804 int px = x * T;
1805 int py = y * T;
1806
1807 if (cell->stat_hp)
1808 {
1809 int width = cell->stat_width * T;
1810 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1811
1812 glColor3ub (0, 0, 0);
1813 glRectf (px + 1, py - thick - 2,
1814 px + width - 1, py);
1815
1816 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1817 glRectf (px + 2,
1818 py - thick - 1,
1819 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1820 }
1821 }
1822 }
1823}
1824
1825void
1826draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1827 CODE:
1828{
1829 static float color[16][3] = {
1830 { 0.00F, 0.00F, 0.00F },
1831 { 1.00F, 1.00F, 1.00F },
1832 { 0.00F, 0.00F, 0.55F },
1833 { 1.00F, 0.00F, 0.00F },
1834
1835 { 1.00F, 0.54F, 0.00F },
1836 { 0.11F, 0.56F, 1.00F },
1837 { 0.93F, 0.46F, 0.00F },
1838 { 0.18F, 0.54F, 0.34F },
1839
1840 { 0.56F, 0.73F, 0.56F },
1841 { 0.80F, 0.80F, 0.80F },
1842 { 0.55F, 0.41F, 0.13F },
1843 { 0.99F, 0.77F, 0.26F },
1844
1845 { 0.74F, 0.65F, 0.41F },
1846
1847 { 0.00F, 1.00F, 1.00F },
1848 { 1.00F, 0.00F, 1.00F },
1849 { 1.00F, 1.00F, 0.00F },
1850 };
1851
1852 int x, y;
1853
1854 glEnable (GL_TEXTURE_2D);
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 glEnable (GL_BLEND);
1857 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1858 glBegin (GL_QUADS);
1859
1860 for (y = 0; y < h; y++)
1861 for (x = 0; x < w; x++)
1862 {
1863 unsigned char m = data [x + y * w];
1864
1865 if (m)
1866 {
1867 float *c = color [m & 15];
1868
1869 float tx1 = m & 0x40 ? 0.5 : 0.;
1870 float tx2 = tx1 + 0.5;
1871
1872 glColor4f (c[0], c[1], c[2], 0.75);
1873 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1874 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1875 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1876 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1877 }
1878 }
1879
1880 glEnd ();
1881 glDisable (GL_BLEND);
1882 glDisable (GL_TEXTURE_2D);
1883}
1884
1885void
1886fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1887 PPCODE:
1888{
1889 int x, y;
1092 int sw4 = (sw + 3) & ~3; 1890 int sw4 = (sw + 3) & ~3;
1093 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1891 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1094 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1892 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1095 1893
1096 memset (darkness, 255, sw4 * sh); 1894 memset (darkness, 255, sw4 * sh);
1097 SvPOK_only (darkness_sv); 1895 SvPOK_only (darkness_sv);
1098 SvCUR_set (darkness_sv, sw4 * sh); 1896 SvCUR_set (darkness_sv, sw4 * sh);
1099 1897
1100 vx = self->x + (self->w - sw) / 2 - shift_x; 1898 mx += self->x;
1101 vy = self->y + (self->h - sh) / 2 - shift_y; 1899 my += self->y;
1102 1900
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
1113 glColor4ub (255, 255, 255, 255);
1114
1115 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1116 glEnable (GL_BLEND);
1117 glEnable (GL_TEXTURE_2D);
1118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1119
1120 glBegin (GL_QUADS);
1121
1122 last_name = 0;
1123
1124 for (z = 0; z < 3; z++)
1125 for (y = 0; y < sh; y++) 1901 for (y = 0; y < sh; y++)
1126 if (0 <= y + vy && y + vy < self->rows) 1902 if (0 <= y + my && y + my < self->rows)
1127 { 1903 {
1128 maprow *row = self->row + (y + vy); 1904 maprow *row = self->row + (y + my);
1129 1905
1130 for (x = 0; x < sw; x++) 1906 for (x = 0; x < sw; x++)
1131 if (row->c0 <= x + vx && x + vx < row->c1) 1907 if (row->c0 <= x + mx && x + mx < row->c1)
1132 { 1908 {
1133 mapcell *cell = row->col + (x + vx - row->c0); 1909 mapcell *cell = row->col + (x + mx - row->c0);
1134 1910
1135 darkness[y * sw4 + x] = cell->darkness < 0 1911 darkness[y * sw4 + x] = cell->darkness
1912 ? 255 - (cell->darkness - 1)
1136 ? 255 - FOW_DARKNESS 1913 : 255 - FOW_DARKNESS;
1137 : 255 - cell->darkness;
1138
1139 face = cell->face [z];
1140
1141 if (face)
1142 {
1143 maptex tex = self->tex [face];
1144
1145 int px = (x + 1) * 32 - tex.w;
1146 int py = (y + 1) * 32 - tex.h;
1147
1148 if (last_name != tex.name)
1149 {
1150 glEnd ();
1151 last_name = tex.name;
1152 glBindTexture (GL_TEXTURE_2D, last_name);
1153 glBegin (GL_QUADS);
1154 }
1155
1156 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1157 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1158 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1159 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1160 }
1161 } 1914 }
1162 } 1915 }
1163
1164 glEnd ();
1165
1166 glDisable (GL_TEXTURE_2D);
1167 glDisable (GL_BLEND);
1168 1916
1169 EXTEND (SP, 3); 1917 EXTEND (SP, 3);
1170 PUSHs (sv_2mortal (newSViv (sw4))); 1918 PUSHs (sv_2mortal (newSViv (sw4)));
1171 PUSHs (sv_2mortal (newSViv (sh))); 1919 PUSHs (sv_2mortal (newSViv (sh)));
1172 PUSHs (darkness_sv); 1920 PUSHs (darkness_sv);
1173} 1921}
1174 1922
1175SV * 1923SV *
1176get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1924get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1177 CODE: 1925 CODE:
1178{ 1926{
1179 int x, y, x1, y1; 1927 int x, y, x1, y1;
1180 SV *data_sv = newSV (w * h * 7 + 5); 1928 SV *data_sv = newSV (w * h * 7 + 5);
1181 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1929 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1206 if (row && row->c0 <= x && x < row->c1) 1954 if (row && row->c0 <= x && x < row->c1)
1207 { 1955 {
1208 mapcell *cell = row->col + (x - row->c0); 1956 mapcell *cell = row->col + (x - row->c0);
1209 uint8_t flags = 0; 1957 uint8_t flags = 0;
1210 1958
1211 if (cell->face [0]) flags |= 1; 1959 if (cell->tile [0]) flags |= 1;
1212 if (cell->face [1]) flags |= 2; 1960 if (cell->tile [1]) flags |= 2;
1213 if (cell->face [2]) flags |= 4; 1961 if (cell->tile [2]) flags |= 4;
1214 1962
1215 *data++ = flags; 1963 *data++ = flags;
1216 1964
1217 if (flags & 1) 1965 if (flags & 1)
1218 { 1966 {
1967 tileid tile = cell->tile [0];
1219 *data++ = cell->face [0] >> 8; 1968 *data++ = tile >> 8;
1220 *data++ = cell->face [0]; 1969 *data++ = tile;
1221 } 1970 }
1222 1971
1223 if (flags & 2) 1972 if (flags & 2)
1224 { 1973 {
1974 tileid tile = cell->tile [1];
1225 *data++ = cell->face [1] >> 8; 1975 *data++ = tile >> 8;
1226 *data++ = cell->face [1]; 1976 *data++ = tile;
1227 } 1977 }
1228 1978
1229 if (flags & 4) 1979 if (flags & 4)
1230 { 1980 {
1981 tileid tile = cell->tile [2];
1231 *data++ = cell->face [2] >> 8; 1982 *data++ = tile >> 8;
1232 *data++ = cell->face [2]; 1983 *data++ = tile;
1233 } 1984 }
1234 } 1985 }
1235 else 1986 else
1236 *data++ = 0; 1987 *data++ = 0;
1237 } 1988 }
1243} 1994}
1244 OUTPUT: 1995 OUTPUT:
1245 RETVAL 1996 RETVAL
1246 1997
1247void 1998void
1248set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1999set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1249 PPCODE: 2000 PPCODE:
1250{ 2001{
1251 int x, y, z; 2002 int x, y, z;
1252 int w, h; 2003 int w, h;
1253 int x1, y1; 2004 int x1, y1;
1277 { 2028 {
1278 uint8_t flags = *data++; 2029 uint8_t flags = *data++;
1279 2030
1280 if (flags) 2031 if (flags)
1281 { 2032 {
1282 mapface face[3] = { 0, 0, 0 };
1283
1284 mapcell *cell = row_get_cell (row, x); 2033 mapcell *cell = row_get_cell (row, x);
2034 tileid tile[3] = { 0, 0, 0 };
1285 2035
1286 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2036 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1287 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2037 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1288 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2038 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1289 2039
1290 if (cell->darkness <= 0) 2040 if (cell->darkness == 0)
1291 { 2041 {
1292 cell->darkness = -1; 2042 cell->darkness = 0;
1293 2043
1294 for (z = 0; z <= 2; z++) 2044 for (z = 0; z <= 2; z++)
1295 { 2045 {
1296 cell->face[z] = face[z]; 2046 tileid t = tile [z];
1297 2047
1298 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2048 if (t >= self->texs || (t && !self->tex [t].name))
2049 {
1299 XPUSHs (sv_2mortal (newSViv (face[z]))); 2050 XPUSHs (sv_2mortal (newSViv (t)));
2051 need_texid (self, t);
2052 }
2053
2054 cell->tile [z] = t;
1300 } 2055 }
1301 } 2056 }
1302 } 2057 }
1303 } 2058 }
1304 } 2059 }
1305} 2060}
1306 2061
1307MODULE = CFClient PACKAGE = CFClient::MixChunk 2062MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1308 2063
1309CFClient::MixChunk 2064CFPlus::MixChunk
1310new_from_file (SV *class, char *path) 2065new_from_file (SV *class, char *path)
1311 CODE: 2066 CODE:
1312 RETVAL = Mix_LoadWAV (path); 2067 RETVAL = Mix_LoadWAV (path);
1313 OUTPUT: 2068 OUTPUT:
1314 RETVAL 2069 RETVAL
1315 2070
1316void 2071void
1317DESTROY (CFClient::MixChunk self) 2072DESTROY (CFPlus::MixChunk self)
1318 CODE: 2073 CODE:
1319 Mix_FreeChunk (self); 2074 Mix_FreeChunk (self);
1320 2075
1321int 2076int
1322volume (CFClient::MixChunk self, int volume = -1) 2077volume (CFPlus::MixChunk self, int volume = -1)
1323 CODE: 2078 CODE:
1324 RETVAL = Mix_VolumeChunk (self, volume); 2079 RETVAL = Mix_VolumeChunk (self, volume);
1325 OUTPUT: 2080 OUTPUT:
1326 RETVAL 2081 RETVAL
1327 2082
1328int 2083int
1329play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2084play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1330 CODE: 2085 CODE:
1331 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2086 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1332 OUTPUT: 2087 OUTPUT:
1333 RETVAL 2088 RETVAL
1334 2089
1335MODULE = CFClient PACKAGE = CFClient::MixMusic 2090MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1336 2091
1337int 2092int
1338volume (int volume = -1) 2093volume (int volume = -1)
1339 CODE: 2094 CODE:
1340 RETVAL = Mix_VolumeMusic (volume); 2095 RETVAL = Mix_VolumeMusic (volume);
1341 OUTPUT: 2096 OUTPUT:
1342 RETVAL 2097 RETVAL
1343 2098
1344CFClient::MixMusic 2099CFPlus::MixMusic
1345new_from_file (SV *class, char *path) 2100new_from_file (SV *class, char *path)
1346 CODE: 2101 CODE:
1347 RETVAL = Mix_LoadMUS (path); 2102 RETVAL = Mix_LoadMUS (path);
1348 OUTPUT: 2103 OUTPUT:
1349 RETVAL 2104 RETVAL
1350 2105
1351void 2106void
1352DESTROY (CFClient::MixMusic self) 2107DESTROY (CFPlus::MixMusic self)
1353 CODE: 2108 CODE:
1354 Mix_FreeMusic (self); 2109 Mix_FreeMusic (self);
1355 2110
1356int 2111int
1357play (CFClient::MixMusic self, int loops = -1) 2112play (CFPlus::MixMusic self, int loops = -1)
1358 CODE: 2113 CODE:
1359 RETVAL = Mix_PlayMusic (self, loops); 2114 RETVAL = Mix_PlayMusic (self, loops);
1360 OUTPUT: 2115 OUTPUT:
1361 RETVAL 2116 RETVAL
1362 2117
1363MODULE = CFClient PACKAGE = CFClient::OpenGL 2118MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1364 2119
1365BOOT: 2120BOOT:
1366{ 2121{
1367 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2122 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1368 static const struct { 2123 static const struct {
1369 const char *name; 2124 const char *name;
1370 IV iv; 2125 IV iv;
1371 } *civ, const_iv[] = { 2126 } *civ, const_iv[] = {
1372# define const_iv(name) { # name, (IV)name } 2127# define const_iv(name) { # name, (IV)name }
1373 const_iv (GL_COLOR_MATERIAL), 2128 const_iv (GL_COLOR_MATERIAL),
1374 const_iv (GL_SMOOTH), 2129 const_iv (GL_SMOOTH),
1375 const_iv (GL_FLAT), 2130 const_iv (GL_FLAT),
1376 const_iv (GL_DITHER), 2131 const_iv (GL_DITHER),
1377 const_iv (GL_BLEND), 2132 const_iv (GL_BLEND),
2133 const_iv (GL_CULL_FACE),
1378 const_iv (GL_SCISSOR_TEST), 2134 const_iv (GL_SCISSOR_TEST),
2135 const_iv (GL_DEPTH_TEST),
2136 const_iv (GL_ALPHA_TEST),
2137 const_iv (GL_NORMALIZE),
2138 const_iv (GL_RESCALE_NORMAL),
2139 const_iv (GL_FRONT),
2140 const_iv (GL_BACK),
1379 const_iv (GL_AND), 2141 const_iv (GL_AND),
1380 const_iv (GL_ONE), 2142 const_iv (GL_ONE),
1381 const_iv (GL_ZERO), 2143 const_iv (GL_ZERO),
1382 const_iv (GL_SRC_ALPHA), 2144 const_iv (GL_SRC_ALPHA),
1383 const_iv (GL_SRC_ALPHA_SATURATE), 2145 const_iv (GL_DST_ALPHA),
1384 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2146 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385 const_iv (GL_ONE_MINUS_DST_ALPHA), 2147 const_iv (GL_ONE_MINUS_DST_ALPHA),
2148 const_iv (GL_SRC_ALPHA_SATURATE),
1386 const_iv (GL_RGB), 2149 const_iv (GL_RGB),
1387 const_iv (GL_RGBA), 2150 const_iv (GL_RGBA),
2151 const_iv (GL_RGBA4),
2152 const_iv (GL_RGBA8),
2153 const_iv (GL_RGB5_A1),
1388 const_iv (GL_UNSIGNED_BYTE), 2154 const_iv (GL_UNSIGNED_BYTE),
2155 const_iv (GL_UNSIGNED_SHORT),
2156 const_iv (GL_UNSIGNED_INT),
1389 const_iv (GL_ALPHA), 2157 const_iv (GL_ALPHA),
2158 const_iv (GL_INTENSITY),
2159 const_iv (GL_LUMINANCE),
2160 const_iv (GL_LUMINANCE_ALPHA),
1390 const_iv (GL_FLOAT), 2161 const_iv (GL_FLOAT),
1391 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2162 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392 const_iv (GL_COMPILE), 2163 const_iv (GL_COMPILE),
1393 const_iv (GL_TEXTURE_1D), 2164 const_iv (GL_TEXTURE_1D),
1394 const_iv (GL_TEXTURE_2D), 2165 const_iv (GL_TEXTURE_2D),
1396 const_iv (GL_TEXTURE_MAG_FILTER), 2167 const_iv (GL_TEXTURE_MAG_FILTER),
1397 const_iv (GL_TEXTURE_MIN_FILTER), 2168 const_iv (GL_TEXTURE_MIN_FILTER),
1398 const_iv (GL_TEXTURE_ENV_MODE), 2169 const_iv (GL_TEXTURE_ENV_MODE),
1399 const_iv (GL_TEXTURE_WRAP_S), 2170 const_iv (GL_TEXTURE_WRAP_S),
1400 const_iv (GL_TEXTURE_WRAP_T), 2171 const_iv (GL_TEXTURE_WRAP_T),
2172 const_iv (GL_REPEAT),
1401 const_iv (GL_CLAMP), 2173 const_iv (GL_CLAMP),
1402 const_iv (GL_REPEAT), 2174 const_iv (GL_CLAMP_TO_EDGE),
1403 const_iv (GL_NEAREST), 2175 const_iv (GL_NEAREST),
1404 const_iv (GL_LINEAR), 2176 const_iv (GL_LINEAR),
1405 const_iv (GL_NEAREST_MIPMAP_NEAREST), 2177 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406 const_iv (GL_LINEAR_MIPMAP_NEAREST), 2178 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407 const_iv (GL_NEAREST_MIPMAP_LINEAR), 2179 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408 const_iv (GL_LINEAR_MIPMAP_LINEAR), 2180 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409 const_iv (GL_GENERATE_MIPMAP), 2181 const_iv (GL_GENERATE_MIPMAP),
1410 const_iv (GL_MODULATE), 2182 const_iv (GL_MODULATE),
1411 const_iv (GL_DECAL), 2183 const_iv (GL_DECAL),
1412 const_iv (GL_REPLACE), 2184 const_iv (GL_REPLACE),
2185 const_iv (GL_DEPTH_BUFFER_BIT),
1413 const_iv (GL_COLOR_BUFFER_BIT), 2186 const_iv (GL_COLOR_BUFFER_BIT),
1414 const_iv (GL_PROJECTION), 2187 const_iv (GL_PROJECTION),
1415 const_iv (GL_MODELVIEW), 2188 const_iv (GL_MODELVIEW),
1416 const_iv (GL_COLOR_LOGIC_OP), 2189 const_iv (GL_COLOR_LOGIC_OP),
1417 const_iv (GL_SEPARABLE_2D), 2190 const_iv (GL_SEPARABLE_2D),
1418 const_iv (GL_CONVOLUTION_2D), 2191 const_iv (GL_CONVOLUTION_2D),
1419 const_iv (GL_CONVOLUTION_BORDER_MODE), 2192 const_iv (GL_CONVOLUTION_BORDER_MODE),
1420 const_iv (GL_CONSTANT_BORDER), 2193 const_iv (GL_CONSTANT_BORDER),
1421 const_iv (GL_LINES), 2194 const_iv (GL_LINES),
2195 const_iv (GL_LINE_STRIP),
2196 const_iv (GL_LINE_LOOP),
1422 const_iv (GL_QUADS), 2197 const_iv (GL_QUADS),
1423 const_iv (GL_LINE_LOOP), 2198 const_iv (GL_QUAD_STRIP),
2199 const_iv (GL_TRIANGLES),
2200 const_iv (GL_TRIANGLE_STRIP),
2201 const_iv (GL_TRIANGLE_FAN),
1424 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2202 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425 const_iv (GL_FASTEST), 2203 const_iv (GL_FASTEST),
2204 const_iv (GL_V2F),
2205 const_iv (GL_V3F),
2206 const_iv (GL_T2F_V3F),
2207 const_iv (GL_T2F_N3F_V3F),
1426# undef const_iv 2208# undef const_iv
1427 }; 2209 };
1428 2210
1429 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2211 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1430 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2212 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431} 2213}
1432 2214
2215char *
2216gl_vendor ()
2217 CODE:
2218 RETVAL = (char *)glGetString (GL_VENDOR);
2219 OUTPUT:
2220 RETVAL
2221
2222char *
2223gl_version ()
2224 CODE:
2225 RETVAL = (char *)glGetString (GL_VERSION);
2226 OUTPUT:
2227 RETVAL
2228
2229char *
2230gl_extensions ()
2231 CODE:
2232 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2233 OUTPUT:
2234 RETVAL
2235
1433int glGetError () 2236int glGetError ()
2237
2238void glFinish ()
1434 2239
1435void glClear (int mask) 2240void glClear (int mask)
1436 2241
1437void glClearColor (float r, float g, float b, float a = 1.0) 2242void glClearColor (float r, float g, float b, float a = 1.0)
1438 PROTOTYPE: @ 2243 PROTOTYPE: @
1445 2250
1446void glHint (int target, int mode) 2251void glHint (int target, int mode)
1447 2252
1448void glBlendFunc (int sfactor, int dfactor) 2253void glBlendFunc (int sfactor, int dfactor)
1449 2254
2255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2256 CODE:
2257 gl_BlendFuncSeparate (sa, da, saa, daa);
2258
2259void glDepthMask (int flag)
2260
1450void glLogicOp (int opcode) 2261void glLogicOp (int opcode)
1451 2262
1452void glColorMask (int red, int green, int blue, int alpha) 2263void glColorMask (int red, int green, int blue, int alpha)
1453 2264
1454void glMatrixMode (int mode) 2265void glMatrixMode (int mode)
1457 2268
1458void glPopMatrix () 2269void glPopMatrix ()
1459 2270
1460void glLoadIdentity () 2271void glLoadIdentity ()
1461 2272
2273void glDrawBuffer (int buffer)
2274
2275void glReadBuffer (int buffer)
2276
1462# near and far are due to microsofts buggy c compiler 2277# near_ and far_ are due to microsofts buggy "c" compiler
2278void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2279
2280# near_ and far_ are due to microsofts buggy "c" compiler
1463void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2281void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464 2282
1465void glViewport (int x, int y, int width, int height) 2283void glViewport (int x, int y, int width, int height)
1466 2284
1467void glScissor (int x, int y, int width, int height) 2285void glScissor (int x, int y, int width, int height)
1482 2300
1483void glEnd () 2301void glEnd ()
1484 2302
1485void glColor (float r, float g, float b, float a = 1.0) 2303void glColor (float r, float g, float b, float a = 1.0)
1486 PROTOTYPE: @ 2304 PROTOTYPE: @
2305 ALIAS:
2306 glColor_premultiply = 1
1487 CODE: 2307 CODE:
1488 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 2308 if (ix)
2309 {
2310 r *= a;
2311 g *= a;
2312 b *= a;
2313 }
2314 // microsoft visual "c" rounds instead of truncating...
2315 glColor4f (r, g, b, a);
2316
2317void glInterleavedArrays (int format, int stride, char *data)
2318
2319void glDrawElements (int mode, int count, int type, char *indices)
2320
2321# 1.2 void glDrawRangeElements (int mode, int start, int end
2322
2323void glRasterPos (float x, float y, float z = 0.)
2324 CODE:
2325 glRasterPos3f (0, 0, z);
2326 glBitmap (0, 0, 0, 0, x, y, 0);
1489 2327
1490void glVertex (float x, float y, float z = 0.) 2328void glVertex (float x, float y, float z = 0.)
1491 CODE: 2329 CODE:
1492 glVertex3f (x, y, z); 2330 glVertex3f (x, y, z);
1493 2331
1505 2343
1506void glBindTexture (int target, int name) 2344void glBindTexture (int target, int name)
1507 2345
1508void glConvolutionParameter (int target, int pname, float params) 2346void glConvolutionParameter (int target, int pname, float params)
1509 CODE: 2347 CODE:
1510 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2348 if (gl.ConvolutionParameterf)
2349 gl.ConvolutionParameterf (target, pname, params);
1511 2350
1512void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2351void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1513 CODE: 2352 CODE:
1514 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2353 if (gl.ConvolutionFilter2D)
1515 (target, internalformat, width, height, format, type, data)); 2354 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1516 2355
1517void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2356void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1518 CODE: 2357 CODE:
1519 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2358 if (gl.SeparableFilter2D)
1520 (target, internalformat, width, height, format, type, row, column)); 2359 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1521 2360
1522void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2361void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1523 2362
1524void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2363void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525 2364
1526void glRasterPos (int x, int y) 2365void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527 CODE:
1528 glRasterPos2i (x, y);
1529 2366
1530void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2367void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1531 2368
1532int glGenTexture () 2369int glGenTexture ()
1533 CODE: 2370 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines