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.101 by root, Sat Jun 3 21:57:23 2006 UTC vs.
Revision 1.183 by root, Fri Apr 20 16:56:08 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
15 24
16#include <SDL.h> 25#include <SDL.h>
17#include <SDL_endian.h> 26#include <SDL_endian.h>
18#include <SDL_image.h> 27#include <SDL_image.h>
19#include <SDL_mixer.h> 28#include <SDL_mixer.h>
20#include <SDL_opengl.h> 29#include <SDL_opengl.h>
21 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
22#include <glib/gmacros.h> 34#include <glib/gmacros.h>
23 35
24#include <pango/pango.h> 36#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 37
29#ifndef _WIN32 38#ifndef _WIN32
30# include <sys/types.h> 39# include <sys/types.h>
31# include <sys/socket.h> 40# include <sys/socket.h>
32# include <netinet/in.h> 41# include <netinet/in.h>
33# include <netinet/tcp.h> 42# include <netinet/tcp.h>
34# include <inttypes.h> 43# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 44#endif
43 45
44#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 47
46#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
47 49
48#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
50 52
51#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
52 54
53#define GL_CALL(type,func,args) \ 55#if 0
54 { \ 56# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 57#else
56 static type fptr_; \ 58# define PARACHUTE 0
57 \ 59#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 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
68typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
70 86
71typedef 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}
72 106
73typedef struct cf_layout { 107typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 108 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
77 int base_height; 110 int base_height;
78 CFClient__Font font; 111 CFPlus__Font font;
79} *CFClient__Layout; 112} *CFPlus__Layout;
80 113
81static CFClient__Font default_font; 114static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 115static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 116static PangoFontMap *opengl_fontmap;
84 117
85static void 118static void
86substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
87{ 120{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 122#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 124#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 126}
95 127
96static void 128static void
97layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
98{ 130{
99 /* 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
100 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
101 */ 133 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
106 138
107 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
108} 140}
109 141
110static void 142static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
114 149
115 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 152
118 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
119} 154 if (!rect.height) rect.height = 1;
120 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
121typedef uint16_t mapface; 161typedef uint16_t faceid;
122 162
123typedef struct { 163typedef struct {
124 GLint name; 164 int name;
125 int w, h; 165 int w, h;
126 float s, t; 166 float s, t;
127 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
168 tileid smoothtile;
169 uint8_t smoothlevel;
128} maptex; 170} maptex;
129 171
130typedef struct { 172typedef struct {
173 uint32_t player;
174 tileid tile[3];
131 int16_t darkness; 175 uint16_t darkness;
132 mapface face[3]; 176 uint8_t stat_width, stat_hp, flags, smoothmax;
133} mapcell; 177} mapcell;
134 178
135typedef struct { 179typedef struct {
136 int32_t c0, c1; 180 int32_t c0, c1;
137 mapcell *col; 181 mapcell *col;
138} maprow; 182} maprow;
139 183
140typedef struct map { 184typedef struct map {
141 int x, y, w, h; 185 int x, y, w, h;
142 int ox, oy; /* offset to virtual global coordinate system */ 186 int ox, oy; /* offset to virtual global coordinate system */
143 int faces; 187 int faces; tileid *face2tile; // [faceid]
144 mapface *face; 188 int texs; maptex *tex; // [tileid]
145
146 int texs;
147 maptex *tex;
148 189
149 int32_t rows; 190 int32_t rows;
150 maprow *row; 191 maprow *row;
151} *CFClient__Map; 192} *CFPlus__Map;
152 193
153static char * 194static char *
154prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
155{ 196{
156 char *p; 197 char *p;
173} 214}
174 215
175#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))
176#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))
177 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
178static maprow * 239static maprow *
179map_get_row (CFClient__Map self, int y) 240map_get_row (CFPlus__Map self, int y)
180{ 241{
181 if (0 > y) 242 if (0 > y)
182 { 243 {
183 int extend = - y + MAP_EXTEND_Y; 244 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 245 Prepend (maprow, self->row, self->rows, extend);
222 283
223 return row->col + (x - row->c0); 284 return row->col + (x - row->c0);
224} 285}
225 286
226static mapcell * 287static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 288map_get_cell (CFPlus__Map self, int x, int y)
228{ 289{
229 return row_get_cell (map_get_row (self, y), x); 290 return row_get_cell (map_get_row (self, y), x);
230} 291}
231 292
232static void 293static void
233map_clear (CFClient__Map self) 294map_clear (CFPlus__Map self)
234{ 295{
235 int r; 296 int r;
236 297
237 for (r = 0; r < self->rows; r++) 298 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 299 Safefree (self->row[r].col);
246 self->row = 0; 307 self->row = 0;
247 self->rows = 0; 308 self->rows = 0;
248} 309}
249 310
250static void 311static void
251map_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)
252{ 313{
253 int x, y; 314 int x, y;
254 maprow *row; 315 maprow *row;
316 mapcell *cell;
255 317
256 for (y = y0; y < y0 + h; y++) 318 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 319 if (y >= 0)
258 { 320 {
259 if (y >= self->rows) 321 if (y >= self->rows)
265 if (x >= row->c0) 327 if (x >= row->c0)
266 { 328 {
267 if (x >= row->c1) 329 if (x >= row->c1)
268 break; 330 break;
269 331
270 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;
271 } 338 }
272 } 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);
273} 356}
274 357
275static void 358static void
276music_finished (void) 359music_finished (void)
277{ 360{
296 ev.data2 = 0; 379 ev.data2 = 0;
297 380
298 SDL_PushEvent ((SDL_Event *)&ev); 381 SDL_PushEvent ((SDL_Event *)&ev);
299} 382}
300 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
405static AV *texture_av;
406
301MODULE = CFClient PACKAGE = CFClient 407MODULE = CFPlus PACKAGE = CFPlus
302 408
303PROTOTYPES: ENABLE 409PROTOTYPES: ENABLE
304 410
305BOOT: 411BOOT:
306{ 412{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
307 HV *stash = gv_stashpv ("CFClient", 1); 416 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 417 static const struct {
309 const char *name; 418 const char *name;
310 IV iv; 419 IV iv;
311 } *civ, const_iv[] = { 420 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 421# define const_iv(name) { # name, (IV)name }
422 const_iv (SDLK_MODIFIER_MIN),
423 const_iv (SDLK_MODIFIER_MAX),
424
313 const_iv (SDL_ACTIVEEVENT), 425 const_iv (SDL_ACTIVEEVENT),
314 const_iv (SDL_KEYDOWN), 426 const_iv (SDL_KEYDOWN),
315 const_iv (SDL_KEYUP), 427 const_iv (SDL_KEYUP),
316 const_iv (SDL_MOUSEMOTION), 428 const_iv (SDL_MOUSEMOTION),
317 const_iv (SDL_MOUSEBUTTONDOWN), 429 const_iv (SDL_MOUSEBUTTONDOWN),
326 const_iv (SDL_EVENT_RESERVEDA), 438 const_iv (SDL_EVENT_RESERVEDA),
327 const_iv (SDL_EVENT_RESERVEDB), 439 const_iv (SDL_EVENT_RESERVEDB),
328 const_iv (SDL_VIDEORESIZE), 440 const_iv (SDL_VIDEORESIZE),
329 const_iv (SDL_VIDEOEXPOSE), 441 const_iv (SDL_VIDEOEXPOSE),
330 const_iv (SDL_USEREVENT), 442 const_iv (SDL_USEREVENT),
443
444 const_iv (SDL_APPINPUTFOCUS),
445 const_iv (SDL_APPMOUSEFOCUS),
446 const_iv (SDL_APPACTIVE),
447
331 const_iv (SDLK_KP0), 448 const_iv (SDLK_KP0),
332 const_iv (SDLK_KP1), 449 const_iv (SDLK_KP1),
333 const_iv (SDLK_KP2), 450 const_iv (SDLK_KP2),
334 const_iv (SDLK_KP3), 451 const_iv (SDLK_KP3),
335 const_iv (SDLK_KP4), 452 const_iv (SDLK_KP4),
390 const_iv (SDLK_BREAK), 507 const_iv (SDLK_BREAK),
391 const_iv (SDLK_MENU), 508 const_iv (SDLK_MENU),
392 const_iv (SDLK_POWER), 509 const_iv (SDLK_POWER),
393 const_iv (SDLK_EURO), 510 const_iv (SDLK_EURO),
394 const_iv (SDLK_UNDO), 511 const_iv (SDLK_UNDO),
512
395 const_iv (KMOD_NONE), 513 const_iv (KMOD_NONE),
514 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_LSHIFT), 515 const_iv (KMOD_LSHIFT),
397 const_iv (KMOD_RSHIFT), 516 const_iv (KMOD_RSHIFT),
517 const_iv (KMOD_CTRL),
398 const_iv (KMOD_LCTRL), 518 const_iv (KMOD_LCTRL),
399 const_iv (KMOD_RCTRL), 519 const_iv (KMOD_RCTRL),
520 const_iv (KMOD_ALT),
400 const_iv (KMOD_LALT), 521 const_iv (KMOD_LALT),
401 const_iv (KMOD_RALT), 522 const_iv (KMOD_RALT),
523 const_iv (KMOD_META),
402 const_iv (KMOD_LMETA), 524 const_iv (KMOD_LMETA),
403 const_iv (KMOD_RMETA), 525 const_iv (KMOD_RMETA),
404 const_iv (KMOD_NUM), 526 const_iv (KMOD_NUM),
405 const_iv (KMOD_CAPS), 527 const_iv (KMOD_CAPS),
406 const_iv (KMOD_MODE), 528 const_iv (KMOD_MODE),
407 const_iv (KMOD_CTRL),
408 const_iv (KMOD_SHIFT),
409 const_iv (KMOD_ALT),
410 const_iv (KMOD_META)
411# undef const_iv 529# undef const_iv
412 }; 530 };
413 531
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 532 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 533 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
534
535 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
536 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416} 537}
538
539void
540weaken (SV *rv)
541 PROTOTYPE: $
542 CODE:
543 sv_rvweaken (rv);
544
545int
546in_destruct ()
547 CODE:
548 RETVAL = PL_main_cv == Nullcv;
549 OUTPUT:
550 RETVAL
551
552NV floor (NV x)
553
554NV ceil (NV x)
417 555
418void 556void
419pango_init () 557pango_init ()
420 CODE: 558 CODE:
421{ 559{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 560 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 561 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 562 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 563}
430 564
431int 565int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 566SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 567
434void 568void
435SDL_Quit () 569SDL_Quit ()
436 570
437void 571void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 578 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 579 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 580 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 581
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 582 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 583 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 584
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 585 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 586 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 587 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 588 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 589
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 590 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
591#if SDL_VERSION_ATLEAST(1,2,10)
592 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
593 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
594#endif
457 595
458 SDL_EnableUNICODE (1); 596 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 597 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 598
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 599 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 617SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 618 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 619 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 620 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 621 );
622 if (RETVAL)
623 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 624 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
625# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
626# include "glfunc.h"
627# undef GL_FUNC
628 }
485 OUTPUT: 629 OUTPUT:
486 RETVAL 630 RETVAL
487 631
488void 632void
489SDL_GL_SwapBuffers () 633SDL_GL_SwapBuffers ()
507 case SDL_KEYDOWN: 651 case SDL_KEYDOWN:
508 case SDL_KEYUP: 652 case SDL_KEYUP:
509 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
510 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
511 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 655 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
656 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
512 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
513 break; 658 break;
514 659
515 case SDL_ACTIVEEVENT: 660 case SDL_ACTIVEEVENT:
516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
542 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 687 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 688 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544 break; 689 break;
545 } 690 }
546 691
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 692 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548 } 693 }
549} 694}
550 695
551int 696int
552Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 697Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
561Mix_AllocateChannels (int numchans = -1) 706Mix_AllocateChannels (int numchans = -1)
562 707
563void 708void
564lowdelay (int fd, int val = 1) 709lowdelay (int fd, int val = 1)
565 CODE: 710 CODE:
711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
712
713void
714win32_proxy_info ()
715 PPCODE:
716{
566#ifndef _WIN32 717#ifdef _WIN32
567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 718 char buffer[2048];
719 DWORD buflen;
720
721 EXTEND (SP, 3);
722
723 buflen = sizeof (buffer);
724 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
725 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
726 {
727 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
728
729 buflen = sizeof (buffer);
730 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
731 {
732 PUSHs (newSVpv (buffer, 0));
733
734 buflen = sizeof (buffer);
735 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
736 PUSHs (newSVpv (buffer, 0));
737 }
738 }
568#endif 739#endif
740}
569 741
570void 742void
571add_font (char *file) 743add_font (char *file)
572 CODE: 744 CODE:
573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 745 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574#ifdef _WIN32
575 // cairo... sigh... requires win2000
576 AddFontResourceEx (file, FR_PRIVATE, 0);
577#endif
578 746
579void 747void
580load_image_inline (SV *image_) 748load_image_inline (SV *image_)
581 ALIAS: 749 ALIAS:
582 load_image_file = 1 750 load_image_file = 1
624 792
625 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 793 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626 794
627 assert (surface2->pitch == surface2->w * 4); 795 assert (surface2->pitch == surface2->w * 4);
628 796
797 SDL_LockSurface (surface2);
629 EXTEND (SP, 5); 798 EXTEND (SP, 6);
630 PUSHs (sv_2mortal (newSViv (surface2->w))); 799 PUSHs (sv_2mortal (newSViv (surface2->w)));
631 PUSHs (sv_2mortal (newSViv (surface2->h))); 800 PUSHs (sv_2mortal (newSViv (surface2->h)));
632 SDL_LockSurface (surface2);
633 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 801 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634 SDL_UnlockSurface (surface2);
635 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 802 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 803 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 804 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
805 SDL_UnlockSurface (surface2);
638 806
639 SDL_FreeSurface (surface); 807 SDL_FreeSurface (surface);
640 SDL_FreeSurface (surface2); 808 SDL_FreeSurface (surface2);
641} 809}
642 810
678 CODE: 846 CODE:
679 fprintf (stderr, "FATAL: %s\n", message); 847 fprintf (stderr, "FATAL: %s\n", message);
680#ifdef _WIN32 848#ifdef _WIN32
681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 849 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
682#endif 850#endif
683 exit (1); 851 _exit (1);
684 852
853void
854_exit (int retval = 0)
855 CODE:
856#ifdef WIN32
857 ExitThread (retval); // unclean, please beam me up
858#else
859 _exit (retval);
860#endif
861
685MODULE = CFClient PACKAGE = CFClient::Font 862MODULE = CFPlus PACKAGE = CFPlus::Font
686 863
687CFClient::Font 864CFPlus::Font
688new_from_file (SV *class, char *path, int id = 0) 865new_from_file (SV *class, char *path, int id = 0)
689 CODE: 866 CODE:
690{ 867{
691 int count; 868 int count;
692 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 869 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
695} 872}
696 OUTPUT: 873 OUTPUT:
697 RETVAL 874 RETVAL
698 875
699void 876void
700DESTROY (CFClient::Font self) 877DESTROY (CFPlus::Font self)
701 CODE: 878 CODE:
702 pango_font_description_free (self); 879 pango_font_description_free (self);
703 880
704void 881void
705make_default (CFClient::Font self) 882make_default (CFPlus::Font self)
706 CODE: 883 CODE:
707 default_font = self; 884 default_font = self;
708 885
709MODULE = CFClient PACKAGE = CFClient::Layout 886MODULE = CFPlus PACKAGE = CFPlus::Layout
710 887
711CFClient::Layout 888void
712new (SV *class, int rgba = 0) 889reset_glyph_cache ()
713 CODE: 890 CODE:
714#if _WIN32 891 tc_clear ();
715 //rgba = 0;//D make stext nicer, breaks TextView 892
716#endif 893CFPlus::Layout
894new (SV *class)
895 CODE:
717 New (0, RETVAL, 1, struct cf_layout); 896 New (0, RETVAL, 1, struct cf_layout);
718 897
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 898 RETVAL->pl = pango_layout_new (opengl_context);
720 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 899 RETVAL->r = 1.;
722 RETVAL->g = 1.; 900 RETVAL->g = 1.;
723 RETVAL->b = 1.; 901 RETVAL->b = 1.;
724 RETVAL->a = 1.; 902 RETVAL->a = 1.;
725 RETVAL->base_height = MIN_FONT_HEIGHT; 903 RETVAL->base_height = MIN_FONT_HEIGHT;
729 layout_update_font (RETVAL); 907 layout_update_font (RETVAL);
730 OUTPUT: 908 OUTPUT:
731 RETVAL 909 RETVAL
732 910
733void 911void
734DESTROY (CFClient::Layout self) 912DESTROY (CFPlus::Layout self)
735 CODE: 913 CODE:
736 g_object_unref (self->pl); 914 g_object_unref (self->pl);
737 Safefree (self); 915 Safefree (self);
738 916
917void
918set_text (CFPlus::Layout self, SV *text_)
919 CODE:
920{
921 STRLEN textlen;
922 char *text = SvPVutf8 (text_, textlen);
923
924 pango_layout_set_text (self->pl, text, textlen);
925}
926
927void
928set_markup (CFPlus::Layout self, SV *text_)
929 CODE:
930{
931 STRLEN textlen;
932 char *text = SvPVutf8 (text_, textlen);
933
934 pango_layout_set_markup (self->pl, text, textlen);
935}
936
937void
938set_shapes (CFPlus::Layout self, ...)
939 CODE:
940{
941 PangoAttrList *attrs = 0;
942 const char *text = pango_layout_get_text (self->pl);
943 const char *pos = text;
944 int arg = 4;
945
946 while (arg < items && (pos = strstr (pos, OBJ_STR)))
947 {
948 PangoRectangle inkrect, rect;
949 PangoAttribute *attr;
950
951 int x = SvIV (ST (arg - 3));
952 int y = SvIV (ST (arg - 2));
953 int w = SvIV (ST (arg - 1));
954 int h = SvIV (ST (arg ));
955
956 inkrect.x = 0;
957 inkrect.y = 0;
958 inkrect.width = 0;
959 inkrect.height = 0;
960
961 rect.x = x * PANGO_SCALE;
962 rect.y = y * PANGO_SCALE;
963 rect.width = w * PANGO_SCALE;
964 rect.height = h * PANGO_SCALE;
965
966 if (!attrs)
967 attrs = pango_layout_get_attributes (self->pl);
968
969 attr = pango_attr_shape_new (&inkrect, &rect);
970 attr->start_index = pos - text;
971 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
972 pango_attr_list_insert (attrs, attr);
973
974 arg += 4;
975 pos += sizeof (OBJ_STR) - 1;
976 }
977
978 if (attrs)
979 pango_layout_set_attributes (self->pl, attrs);
980}
981
982void
983get_shapes (CFPlus::Layout self)
984 PPCODE:
985{
986 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
987
988 do
989 {
990 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
991
992 if (run && shape_attr_p (run))
993 {
994 PangoRectangle extents;
995 pango_layout_iter_get_run_extents (iter, 0, &extents);
996
997 EXTEND (SP, 2);
998 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
999 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1000 }
1001 }
1002 while (pango_layout_iter_next_run (iter));
1003
1004 pango_layout_iter_free (iter);
1005}
1006
739int 1007int
740is_rgba (CFClient::Layout self) 1008has_wrapped (CFPlus::Layout self)
741 CODE: 1009 CODE:
742 RETVAL = self->rgba; 1010{
1011 int lines = 1;
1012 const char *text = pango_layout_get_text (self->pl);
1013
1014 while (*text)
1015 lines += *text++ == '\n';
1016
1017 RETVAL = lines < pango_layout_get_line_count (self->pl);
1018}
743 OUTPUT: 1019 OUTPUT:
744 RETVAL 1020 RETVAL
745 1021
746void
747set_text (CFClient::Layout self, SV *text_)
748 CODE:
749{
750 STRLEN textlen;
751 char *text = SvPVutf8 (text_, textlen);
752
753 pango_layout_set_text (self->pl, text, textlen);
754}
755
756void
757set_markup (CFClient::Layout self, SV *text_)
758 CODE:
759{
760 STRLEN textlen;
761 char *text = SvPVutf8 (text_, textlen);
762
763 pango_layout_set_markup (self->pl, text, textlen);
764}
765
766SV * 1022SV *
767get_text (CFClient::Layout self) 1023get_text (CFPlus::Layout self)
768 CODE: 1024 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1025 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 1026 sv_utf8_decode (RETVAL);
771 OUTPUT: 1027 OUTPUT:
772 RETVAL 1028 RETVAL
773 1029
774void 1030void
775set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1031set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776 CODE: 1032 CODE:
777 self->r = r; 1033 self->r = r;
778 self->g = g; 1034 self->g = g;
779 self->b = b; 1035 self->b = b;
780 self->a = a; 1036 self->a = a;
781 1037
782void 1038void
783set_font (CFClient::Layout self, CFClient::Font font = 0) 1039set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784 CODE: 1040 CODE:
785 if (self->font != font) 1041 if (self->font != font)
786 { 1042 {
787 self->font = font; 1043 self->font = font;
788 layout_update_font (self); 1044 layout_update_font (self);
789 } 1045 }
790 1046
791void 1047void
792set_height (CFClient::Layout self, int base_height) 1048set_height (CFPlus::Layout self, int base_height)
793 CODE: 1049 CODE:
794 if (self->base_height != base_height) 1050 if (self->base_height != base_height)
795 { 1051 {
796 self->base_height = base_height; 1052 self->base_height = base_height;
797 layout_update_font (self); 1053 layout_update_font (self);
798 } 1054 }
799 1055
800void 1056void
801set_width (CFClient::Layout self, int max_width = -1) 1057set_width (CFPlus::Layout self, int max_width = -1)
802 CODE: 1058 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1059 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 1060
805void 1061void
806set_indent (CFClient::Layout self, int indent) 1062set_indent (CFPlus::Layout self, int indent)
807 CODE: 1063 CODE:
808 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1064 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809 1065
810void 1066void
811set_spacing (CFClient::Layout self, int spacing) 1067set_spacing (CFPlus::Layout self, int spacing)
812 CODE: 1068 CODE:
813 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1069 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814 1070
815void 1071void
816set_ellipsise (CFClient::Layout self, int ellipsise) 1072set_ellipsise (CFPlus::Layout self, int ellipsise)
817 CODE: 1073 CODE:
818 pango_layout_set_ellipsize (self->pl, 1074 pango_layout_set_ellipsize (self->pl,
819 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1075 ellipsise == 1 ? PANGO_ELLIPSIZE_START
820 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1076 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1077 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
822 : PANGO_ELLIPSIZE_NONE 1078 : PANGO_ELLIPSIZE_NONE
823 ); 1079 );
824 1080
825void 1081void
826set_single_paragraph_mode (CFClient::Layout self, int spm) 1082set_single_paragraph_mode (CFPlus::Layout self, int spm)
827 CODE: 1083 CODE:
828 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1084 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829 1085
830void 1086void
831size (CFClient::Layout self) 1087size (CFPlus::Layout self)
832 PPCODE: 1088 PPCODE:
833{ 1089{
834 int w, h; 1090 int w, h;
835 1091
836 layout_get_pixel_size (self, &w, &h); 1092 layout_get_pixel_size (self, &w, &h);
839 PUSHs (sv_2mortal (newSViv (w))); 1095 PUSHs (sv_2mortal (newSViv (w)));
840 PUSHs (sv_2mortal (newSViv (h))); 1096 PUSHs (sv_2mortal (newSViv (h)));
841} 1097}
842 1098
843int 1099int
1100descent (CFPlus::Layout self)
1101 CODE:
1102{
1103 PangoRectangle rect;
1104 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1105 pango_layout_line_get_pixel_extents (line, 0, &rect);
1106 RETVAL = PANGO_DESCENT (rect);
1107}
1108 OUTPUT:
1109 RETVAL
1110
1111int
844xy_to_index (CFClient::Layout self, int x, int y) 1112xy_to_index (CFPlus::Layout self, int x, int y)
845 CODE: 1113 CODE:
846{ 1114{
847 int index, trailing; 1115 int index, trailing;
848 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1116 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849 RETVAL = index; 1117 RETVAL = index + trailing;
850} 1118}
851 OUTPUT: 1119 OUTPUT:
852 RETVAL 1120 RETVAL
853 1121
854void 1122void
855cursor_pos (CFClient::Layout self, int index) 1123cursor_pos (CFPlus::Layout self, int index)
856 PPCODE: 1124 PPCODE:
857{ 1125{
858 PangoRectangle strong_pos; 1126 PangoRectangle strong_pos;
859 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1127 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860 1128
863 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865} 1133}
866 1134
867void 1135void
868render (CFClient::Layout self) 1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
869 PPCODE: 1137 PPCODE:
870{ 1138{
871 SV *retval; 1139 int line, x;
872 int w, h;
873 1140
874 layout_get_pixel_size (self, &w, &h); 1141 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1142 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
875 1143
876 if (self->rgba)
877 {
878 cairo_surface_t *surface;
879 cairo_t *cairo;
880
881 retval = newSV (w * h * 4);
882 SvPOK_only (retval);
883 SvCUR_set (retval, w * h * 4);
884
885 memset (SvPVX (retval), 0, w * h * 4);
886
887 surface = cairo_image_surface_create_for_data (
888 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
889 cairo = cairo_create (surface);
890 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
891
892 pango_cairo_show_layout (cairo, self->pl);
893
894 cairo_destroy (cairo);
895 cairo_surface_destroy (surface);
896
897 // what a mess, and its premultiplied, too :(
898 {
899 uint32_t *p = (uint32_t *)SvPVX (retval);
900 uint32_t *e = p + w * h;
901
902 while (p < e)
903 {
904 uint32_t rgba = *p;
905 rgba = (rgba >> 24) | (rgba << 8);
906#if 0
907#ifdef _WIN32
908 {//D
909 uint8_t r = rgba >> 24;
910 uint8_t g = rgba >> 16;
911 uint8_t b = rgba >> 8;
912 uint8_t a = rgba >> 0;
913
914 rgba = (rgba & 0xffffff00) | a;
915 }
916#endif
917#endif
918 rgba = SDL_SwapBE32 (rgba);
919 *p++ = rgba;
920 }
921 }
922
923 EXTEND (SP, 5); 1144 EXTEND (SP, 2);
924 PUSHs (sv_2mortal (newSViv (w))); 1145 PUSHs (sv_2mortal (newSViv (line - 1)));
1146 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1147}
1148
1149void
1150line_x_to_index (CFPlus::Layout self, int line, int x)
1151 PPCODE:
1152{
1153 PangoLayoutLine *lp;
1154 int index, trailing;
1155
1156 if (line < 0)
1157 XSRETURN_EMPTY;
1158
1159 if (!(lp = pango_layout_get_line (self->pl, line)))
1160 XSRETURN_EMPTY; /* do better */
1161
1162 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1163
1164 EXTEND (SP, 2);
1165 if (GIMME_V == G_SCALAR)
925 PUSHs (sv_2mortal (newSViv (h))); 1166 PUSHs (sv_2mortal (newSViv (index + trailing)));
926 PUSHs (sv_2mortal (retval));
927 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
928 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
929 }
930 else 1167 else
931 { 1168 {
932 FT_Bitmap bitmap;
933
934 retval = newSV (w * h);
935 SvPOK_only (retval);
936 SvCUR_set (retval, w * h);
937
938 bitmap.rows = h;
939 bitmap.width = w;
940 bitmap.pitch = w;
941 bitmap.buffer = (unsigned char*)SvPVX (retval);
942 bitmap.num_grays = 256;
943 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945 memset (bitmap.buffer, 0, w * h);
946
947 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949 EXTEND (SP, 5);
950 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (index)));
951 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (trailing)));
952 PUSHs (sv_2mortal (retval));
953 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955 } 1171 }
956} 1172}
957 1173
1174void
1175render (CFPlus::Layout self, float x, float y, int flags = 0)
1176 PPCODE:
1177 pango_opengl_render_layout_subpixel (
1178 self->pl,
1179 x * PANGO_SCALE, y * PANGO_SCALE,
1180 self->r, self->g, self->b, self->a,
1181 flags
1182 );
1183
958MODULE = CFClient PACKAGE = CFClient::Texture 1184MODULE = CFPlus PACKAGE = CFPlus::Texture
959 1185
960void 1186void
1187pad2pot (SV *data_, SV *w_, SV *h_)
1188 CODE:
1189{
1190 int ow = SvIV (w_);
1191 int oh = SvIV (h_);
1192
1193 if (ow && oh)
1194 {
1195 int nw = minpot (ow);
1196 int nh = minpot (oh);
1197
1198 if (nw != ow || nh != oh)
1199 {
1200 if (SvOK (data_))
1201 {
1202 STRLEN datalen;
1203 char *data = SvPVbyte (data_, datalen);
1204 int bpp = datalen / (ow * oh);
1205 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1206
1207 SvPOK_only (result_);
1208 SvCUR_set (result_, nw * nh * bpp);
1209
1210 memset (SvPVX (result_), 0, nw * nh * bpp);
1211 while (oh--)
1212 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1213
1214 sv_setsv (data_, result_);
1215 }
1216
1217 sv_setiv (w_, nw);
1218 sv_setiv (h_, nh);
1219 }
1220 }
1221}
1222
1223void
961draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1224draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962 PROTOTYPE: $$$;$$ 1225 PROTOTYPE: $$$;$$
963 ALIAS: 1226 ALIAS:
964 draw_quad_alpha = 1 1227 draw_quad_alpha = 1
965 draw_quad_alpha_premultiplied = 2 1228 draw_quad_alpha_premultiplied = 2
966 CODE: 1229 CODE:
977 } 1240 }
978 1241
979 if (ix) 1242 if (ix)
980 { 1243 {
981 glEnable (GL_BLEND); 1244 glEnable (GL_BLEND);
1245
1246 if (ix == 2)
982 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1247 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1248 else
1249 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1250 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1251
983 glEnable (GL_ALPHA_TEST); 1252 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1253 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1254 }
986 1255
987 glBindTexture (GL_TEXTURE_2D, name); 1256 glBindTexture (GL_TEXTURE_2D, name);
998 glDisable (GL_ALPHA_TEST); 1267 glDisable (GL_ALPHA_TEST);
999 glDisable (GL_BLEND); 1268 glDisable (GL_BLEND);
1000 } 1269 }
1001} 1270}
1002 1271
1003MODULE = CFClient PACKAGE = CFClient::Map 1272MODULE = CFPlus PACKAGE = CFPlus::Map
1004 1273
1005CFClient::Map 1274CFPlus::Map
1006new (SV *class, int map_width, int map_height) 1275new (SV *class)
1007 CODE: 1276 CODE:
1008 New (0, RETVAL, 1, struct map); 1277 New (0, RETVAL, 1, struct map);
1009 RETVAL->x = 0; 1278 RETVAL->x = 0;
1010 RETVAL->y = 0; 1279 RETVAL->y = 0;
1011 RETVAL->w = map_width; 1280 RETVAL->w = 0;
1012 RETVAL->h = map_height; 1281 RETVAL->h = 0;
1013 RETVAL->ox = 0; 1282 RETVAL->ox = 0;
1014 RETVAL->oy = 0; 1283 RETVAL->oy = 0;
1015 RETVAL->faces = 8192; 1284 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1016 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1285 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1017 RETVAL->texs = 8192;
1018 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1019 RETVAL->rows = 0; 1286 RETVAL->rows = 0;
1020 RETVAL->row = 0; 1287 RETVAL->row = 0;
1021 OUTPUT: 1288 OUTPUT:
1022 RETVAL 1289 RETVAL
1023 1290
1024void 1291void
1025DESTROY (CFClient::Map self) 1292DESTROY (CFPlus::Map self)
1026 CODE: 1293 CODE:
1027{ 1294{
1028 map_clear (self); 1295 map_clear (self);
1029 Safefree (self->face); 1296 Safefree (self->face2tile);
1297 Safefree (self->tex);
1030 Safefree (self); 1298 Safefree (self);
1031} 1299}
1032 1300
1033void 1301void
1302resize (CFPlus::Map self, int map_width, int map_height)
1303 CODE:
1304 self->w = map_width;
1305 self->h = map_height;
1306
1307void
1034clear (CFClient::Map self) 1308clear (CFPlus::Map self)
1035 CODE: 1309 CODE:
1036 map_clear (self); 1310 map_clear (self);
1037 1311
1038void 1312void
1039set_face (CFClient::Map self, int face, int texid) 1313set_tileid (CFPlus::Map self, int face, int tile)
1040 CODE: 1314 CODE:
1041{ 1315{
1042 while (self->faces <= face) 1316 need_facenum (self, face); self->face2tile [face] = tile;
1043 { 1317 need_texid (self, tile);
1044 Append (mapface, self->face, self->faces, self->faces);
1045 self->faces *= 2;
1046 }
1047
1048 self->face [face] = texid;
1049} 1318}
1050 1319
1051void 1320void
1321set_smooth (CFPlus::Map self, int face, int smooth, int level)
1322 CODE:
1323{
1324 tileid texid;
1325 maptex *tex;
1326
1327 if (face < 0 || face >= self->faces)
1328 return;
1329
1330 if (smooth < 0 || smooth >= self->faces)
1331 return;
1332
1333 texid = self->face2tile [face];
1334
1335 if (!texid)
1336 return;
1337
1338 tex = self->tex + texid;
1339 tex->smoothtile = self->face2tile [smooth];
1340 tex->smoothlevel = level;
1341}
1342
1343void
1052set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1344set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1053 CODE: 1345 CODE:
1054{ 1346{
1055 while (self->texs <= texid) 1347 need_texid (self, texid);
1056 {
1057 Append (maptex, self->tex, self->texs, self->texs);
1058 self->texs *= 2;
1059 }
1060 1348
1061 { 1349 {
1062 maptex *tex = self->tex + texid; 1350 maptex *tex = self->tex + texid;
1063 1351
1064 tex->name = name; 1352 tex->name = name;
1081 // from transparent color bleeding and ugly wrapping effects. 1369 // from transparent color bleeding and ugly wrapping effects.
1082 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1370 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1083} 1371}
1084 1372
1085int 1373int
1086ox (CFClient::Map self) 1374ox (CFPlus::Map self)
1087 ALIAS: 1375 ALIAS:
1088 oy = 1 1376 oy = 1
1089 x = 2 1377 x = 2
1090 y = 3 1378 y = 3
1379 w = 4
1380 h = 5
1091 CODE: 1381 CODE:
1092 switch (ix) 1382 switch (ix)
1093 { 1383 {
1094 case 0: RETVAL = self->ox; break; 1384 case 0: RETVAL = self->ox; break;
1095 case 1: RETVAL = self->oy; break; 1385 case 1: RETVAL = self->oy; break;
1096 case 2: RETVAL = self->x; break; 1386 case 2: RETVAL = self->x; break;
1097 case 3: RETVAL = self->y; break; 1387 case 3: RETVAL = self->y; break;
1388 case 4: RETVAL = self->w; break;
1389 case 5: RETVAL = self->h; break;
1098 } 1390 }
1099 OUTPUT: 1391 OUTPUT:
1100 RETVAL 1392 RETVAL
1101 1393
1102void 1394void
1103scroll (CFClient::Map self, int dx, int dy) 1395scroll (CFPlus::Map self, int dx, int dy)
1104 CODE: 1396 CODE:
1105{ 1397{
1106 if (dx > 0) 1398 if (dx > 0)
1107 map_blank (self, self->x, self->y, dx - 1, self->h); 1399 map_blank (self, self->x, self->y, dx, self->h);
1108 else if (dx < 0) 1400 else if (dx < 0)
1109 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1401 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1110 1402
1111 if (dy > 0) 1403 if (dy > 0)
1112 map_blank (self, self->x, self->y, self->w, dy - 1); 1404 map_blank (self, self->x, self->y, self->w, dy);
1113 else if (dy < 0) 1405 else if (dy < 0)
1114 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1406 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1115 1407
1116 self->ox += dx; self->x += dx; 1408 self->ox += dx; self->x += dx;
1117 self->oy += dy; self->y += dy; 1409 self->oy += dy; self->y += dy;
1118 1410
1119 while (self->y < 0) 1411 while (self->y < 0)
1124 self->y += MAP_EXTEND_Y; 1416 self->y += MAP_EXTEND_Y;
1125 } 1417 }
1126} 1418}
1127 1419
1128void 1420void
1129map1a_update (CFClient::Map self, SV *data_) 1421map1a_update (CFPlus::Map self, SV *data_, int extmap)
1130 CODE: 1422 CODE:
1131{ 1423{
1132 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1424 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1133 uint8_t *data_end = (uint8_t *)SvEND (data_); 1425 uint8_t *data_end = (uint8_t *)SvEND (data_);
1134 mapcell *cell; 1426 mapcell *cell;
1135 int x, y, flags; 1427 int x, y, flags;
1136 1428
1137 while (data < data_end) 1429 while (data < data_end - 1)
1138 { 1430 {
1139 flags = (data [0] << 8) + data [1]; data += 2; 1431 flags = (data [0] << 8) + data [1]; data += 2;
1140 1432
1141 x = ((flags >> 10) & 63) + self->x; 1433 x = self->x + ((flags >> 10) & 63);
1142 y = ((flags >> 4) & 63) + self->y; 1434 y = self->y + ((flags >> 4) & 63);
1143 1435
1144 cell = map_get_cell (self, x, y); 1436 cell = map_get_cell (self, x, y);
1145 1437
1146 if (flags & 15) 1438 if (flags & 15)
1147 { 1439 {
1148 if (cell->darkness < 0) 1440 if (!cell->darkness)
1149 { 1441 {
1442 memset (cell, 0, sizeof (*cell));
1150 cell->darkness = 0; 1443 cell->darkness = 256;
1151 cell->face [0] = 0;
1152 cell->face [1] = 0;
1153 cell->face [2] = 0;
1154 } 1444 }
1155 1445
1156 cell->darkness = flags & 8 ? *data++ : 255;
1157
1158 //TODO: don't trust server data to be in-range(!) 1446 //TODO: don't trust server data to be in-range(!)
1447
1448 if (flags & 8)
1449 {
1450 if (extmap)
1451 {
1452 uint8_t ext, cmd;
1453
1454 do
1455 {
1456 ext = *data++;
1457 cmd = ext & 0x3f;
1458
1459 if (cmd < 4)
1460 cell->darkness = 255 - ext * 64 + 1;
1461 else if (cmd == 5) // health
1462 {
1463 cell->stat_width = 1;
1464 cell->stat_hp = *data++;
1465 }
1466 else if (cmd == 6) // monster width
1467 cell->stat_width = *data++ + 1;
1468 else if (cmd == 0x47)
1469 {
1470 if (*data == 4)
1471 ; // decode player count
1472
1473 data += *data + 1;
1474 }
1475 else if (cmd == 8) // cell flags
1476 cell->flags = *data++;
1477 else if (ext & 0x40) // unknown, multibyte => skip
1478 data += *data + 1;
1479 else
1480 data++;
1481 }
1482 while (ext & 0x80);
1483 }
1484 else
1485 cell->darkness = *data++ + 1;
1486 }
1159 1487
1160 if (flags & 4) 1488 if (flags & 4)
1161 { 1489 {
1162 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1490 faceid face = (data [0] << 8) + data [1]; data += 2;
1491 need_facenum (self, face);
1492 cell->tile [0] = self->face2tile [face];
1163 } 1493 }
1164 1494
1165 if (flags & 2) 1495 if (flags & 2)
1166 { 1496 {
1167 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1497 faceid face = (data [0] << 8) + data [1]; data += 2;
1498 need_facenum (self, face);
1499 cell->tile [1] = self->face2tile [face];
1168 } 1500 }
1169 1501
1170 if (flags & 1) 1502 if (flags & 1)
1171 { 1503 {
1172 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1504 faceid face = (data [0] << 8) + data [1]; data += 2;
1505 need_facenum (self, face);
1506 cell->tile [2] = self->face2tile [face];
1173 } 1507 }
1174 } 1508 }
1175 else 1509 else
1176 cell->darkness = -1; 1510 cell->darkness = 0;
1177 } 1511 }
1178} 1512}
1179 1513
1180SV * 1514SV *
1181mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1515mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1182 CODE: 1516 CODE:
1183{ 1517{
1184 int x1, x; 1518 int x1, x;
1185 int y1, y; 1519 int y1, y;
1186 int z; 1520 int z;
1207 { 1541 {
1208 mapcell *cell = row->col + (x - row->c0); 1542 mapcell *cell = row->col + (x - row->c0);
1209 1543
1210 for (z = 0; z <= 0; z++) 1544 for (z = 0; z <= 0; z++)
1211 { 1545 {
1212 mapface face = cell->face [z];
1213
1214 if (face)
1215 {
1216 maptex tex = self->tex [face]; 1546 maptex tex = self->tex [cell->tile [z]];
1217 int a0 = 255 - tex.a; 1547 int a0 = 255 - tex.a;
1218 int a1 = tex.a; 1548 int a1 = tex.a;
1219 1549
1220 r = (r * a0 + tex.r * a1) / 255; 1550 r = (r * a0 + tex.r * a1) / 255;
1221 g = (g * a0 + tex.g * a1) / 255; 1551 g = (g * a0 + tex.g * a1) / 255;
1222 b = (b * a0 + tex.b * a1) / 255; 1552 b = (b * a0 + tex.b * a1) / 255;
1223 a = (a * a0 + tex.a * a1) / 255; 1553 a = (a * a0 + tex.a * a1) / 255;
1224 }
1225 } 1554 }
1226 } 1555 }
1227 1556
1228 *map++ = (r ) 1557 *map++ = (r )
1229 | (g << 8) 1558 | (g << 8)
1236} 1565}
1237 OUTPUT: 1566 OUTPUT:
1238 RETVAL 1567 RETVAL
1239 1568
1240void 1569void
1241draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1570draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1242 PPCODE: 1571 CODE:
1243{ 1572{
1244 int vx, vy; 1573 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1574 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1575 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1576 smooth_key skey;
1245 int x, y, z; 1577 int x, y, z;
1246 int last_name; 1578 int last_name;
1247 mapface face; 1579
1580 // thats current max. sorry.
1581 if (sw > 255) sw = 255;
1582 if (sh > 255) sh = 255;
1583
1584 // clear key, in case of extra padding
1585 memset (&skey, 0, sizeof (skey));
1586
1587 glColor4ub (255, 255, 255, 255);
1588
1589 glEnable (GL_BLEND);
1590 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1591 glEnable (GL_TEXTURE_2D);
1592 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1593
1594 glBegin (GL_QUADS);
1595
1596 last_name = 0;
1597
1598 mx += self->x;
1599 my += self->y;
1600
1601 // first pass: determine smooth_max
1602 // rather ugly, if you ask me
1603 // could also be stored inside mapcell and updated on change
1604 memset (smooth_max, 0, sizeof (smooth_max));
1605
1606 for (y = 0; y < sh; y++)
1607 if (0 <= y + my && y + my < self->rows)
1608 {
1609 maprow *row = self->row + (y + my);
1610
1611 for (x = 0; x < sw; x++)
1612 if (row->c0 <= x + mx && x + mx < row->c1)
1613 {
1614 mapcell *cell = row->col + (x + mx - row->c0);
1615
1616 smooth_max[x + 1][y + 1] =
1617 MAX (self->tex [cell->tile [0]].smoothlevel,
1618 MAX (self->tex [cell->tile [1]].smoothlevel,
1619 self->tex [cell->tile [2]].smoothlevel));
1620 }
1621 }
1622
1623 for (z = 0; z <= 2; z++)
1624 {
1625 memset (smooth_level, 0, sizeof (smooth_level));
1626
1627 for (y = 0; y < sh; y++)
1628 if (0 <= y + my && y + my < self->rows)
1629 {
1630 maprow *row = self->row + (y + my);
1631
1632 for (x = 0; x < sw; x++)
1633 if (row->c0 <= x + mx && x + mx < row->c1)
1634 {
1635 mapcell *cell = row->col + (x + mx - row->c0);
1636 tileid tile = cell->tile [z];
1637
1638 if (tile)
1639 {
1640 maptex tex = self->tex [tile];
1641 int px = (x + 1) * T - tex.w;
1642 int py = (y + 1) * T - tex.h;
1643
1644 // suppressing texture state switches here
1645 // is only moderately effective, but worth the extra effort
1646 if (last_name != tex.name)
1647 {
1648 if (!tex.name)
1649 tex = self->tex [2]; /* missing, replace by noface */
1650
1651 glEnd ();
1652 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1653 glBegin (GL_QUADS);
1654 }
1655
1656 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1657 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1658 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1659 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1660
1661 if (cell->flags && z == 2)
1662 {
1663 if (cell->flags & 1)
1664 {
1665 maptex tex = self->tex [1];
1666 int px = x * T + T * 2 / 32;
1667 int py = y * T - T * 6 / 32;
1668
1669 glEnd ();
1670 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1671 glBegin (GL_QUADS);
1672
1673 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1674 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1675 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1676 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1677 }
1678 }
1679
1680 // update smooth hash
1681 if (tex.smoothtile)
1682 {
1683 skey.tile = tex.smoothtile;
1684 skey.level = tex.smoothlevel;
1685
1686 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1687
1688 // add bits to current tile and all neighbours. skey.x|y is
1689 // shifted +1|+1 so we always stay positive.
1690
1691 // bits is ___n cccc CCCC bbbb
1692 // n do not draw borders&corners
1693 // c draw these corners, but...
1694 // C ... not these
1695 // b draw these borders
1696
1697 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1698 // ┃· ·· ·┃ ━━
1699
1700 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1701 // ·· ·· ·┏ ┓·
1702
1703 // full tile
1704 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1705
1706 // borders
1707 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1708 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1709 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1710 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1711
1712 // corners
1713 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1714 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1715 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1716 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1717 }
1718 }
1719 }
1720 }
1721
1722 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort
1724 {
1725 int w, b;
1726
1727 for (w = 0; w < 256 / 32; ++w)
1728 {
1729 uint32_t smask = smooth_level [w];
1730 if (smask)
1731 for (b = 0; b < 32; ++b)
1732 if (smask & (((uint32_t)1) << b))
1733 {
1734 int level = (w << 5) | b;
1735 HE *he;
1736
1737 hv_iterinit (smooth);
1738 while ((he = hv_iternext (smooth)))
1739 {
1740 smooth_key *skey = (smooth_key *)HeKEY (he);
1741 IV bits = SvIVX (HeVAL (he));
1742
1743 if (!(bits & 0x1000)
1744 && skey->level == level
1745 && level >= smooth_max [skey->x][skey->y])
1746 {
1747 maptex tex = self->tex [skey->tile];
1748 int px = (((int)skey->x) - 1) * T;
1749 int py = (((int)skey->y) - 1) * T;
1750 int border = bits & 15;
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1752 float dx = tex.s * .0625f; // 16 images/row
1753 float dy = tex.t * .5f ; // 2 images/column
1754
1755 // this time naively avoiding texture state changes
1756 // save gobs of state changes.
1757 if (last_name != tex.name)
1758 {
1759 if (!tex.name)
1760 continue; // smoothing not yet available
1761
1762 glEnd ();
1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1764 glBegin (GL_QUADS);
1765 }
1766
1767 if (border)
1768 {
1769 float ox = border * dx;
1770
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1775 }
1776
1777 if (corner)
1778 {
1779 float ox = corner * dx;
1780
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1785 }
1786 }
1787 }
1788 }
1789 }
1790 }
1791
1792 hv_clear (smooth);
1793 }
1794
1795 glEnd ();
1796
1797 glDisable (GL_TEXTURE_2D);
1798 glDisable (GL_BLEND);
1799
1800 // top layer: overlays such as the health bar
1801 for (y = 0; y < sh; y++)
1802 if (0 <= y + my && y + my < self->rows)
1803 {
1804 maprow *row = self->row + (y + my);
1805
1806 for (x = 0; x < sw; x++)
1807 if (row->c0 <= x + mx && x + mx < row->c1)
1808 {
1809 mapcell *cell = row->col + (x + mx - row->c0);
1810
1811 int px = x * T;
1812 int py = y * T;
1813
1814 if (cell->stat_hp)
1815 {
1816 int width = cell->stat_width * T;
1817 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1818
1819 glColor3ub (0, 0, 0);
1820 glRectf (px + 1, py - thick - 2,
1821 px + width - 1, py);
1822
1823 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1824 glRectf (px + 2,
1825 py - thick - 1,
1826 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1827 }
1828 }
1829 }
1830}
1831
1832void
1833draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1834 CODE:
1835{
1836 static float color[16][3] = {
1837 { 0.00F, 0.00F, 0.00F },
1838 { 1.00F, 1.00F, 1.00F },
1839 { 0.00F, 0.00F, 0.55F },
1840 { 1.00F, 0.00F, 0.00F },
1841
1842 { 1.00F, 0.54F, 0.00F },
1843 { 0.11F, 0.56F, 1.00F },
1844 { 0.93F, 0.46F, 0.00F },
1845 { 0.18F, 0.54F, 0.34F },
1846
1847 { 0.56F, 0.73F, 0.56F },
1848 { 0.80F, 0.80F, 0.80F },
1849 { 0.55F, 0.41F, 0.13F },
1850 { 0.99F, 0.77F, 0.26F },
1851
1852 { 0.74F, 0.65F, 0.41F },
1853
1854 { 0.00F, 1.00F, 1.00F },
1855 { 1.00F, 0.00F, 1.00F },
1856 { 1.00F, 1.00F, 0.00F },
1857 };
1858
1859 int x, y;
1860
1861 glEnable (GL_TEXTURE_2D);
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1863 glEnable (GL_BLEND);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glBegin (GL_QUADS);
1866
1867 for (y = 0; y < h; y++)
1868 for (x = 0; x < w; x++)
1869 {
1870 unsigned char m = data [x + y * w];
1871
1872 if (m)
1873 {
1874 float *c = color [m & 15];
1875
1876 float tx1 = m & 0x40 ? 0.5 : 0.;
1877 float tx2 = tx1 + 0.5;
1878
1879 glColor4f (c[0], c[1], c[2], 0.75);
1880 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1881 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1882 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1883 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1884 }
1885 }
1886
1887 glEnd ();
1888 glDisable (GL_BLEND);
1889 glDisable (GL_TEXTURE_2D);
1890}
1891
1892void
1893fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1894 PPCODE:
1895{
1896 int x, y;
1248 int sw4 = (sw + 3) & ~3; 1897 int sw4 = (sw + 3) & ~3;
1249 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1898 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1250 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1899 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1251 1900
1252 memset (darkness, 255, sw4 * sh); 1901 memset (darkness, 255, sw4 * sh);
1253 SvPOK_only (darkness_sv); 1902 SvPOK_only (darkness_sv);
1254 SvCUR_set (darkness_sv, sw4 * sh); 1903 SvCUR_set (darkness_sv, sw4 * sh);
1255 1904
1256 vx = self->x + (self->w - sw) / 2 - shift_x; 1905 mx += self->x;
1257 vy = self->y + (self->h - sh) / 2 - shift_y; 1906 my += self->y;
1258 1907
1259 /*
1260 int vx = self->vx = self->w >= sw
1261 ? self->x + (self->w - sw) / 2
1262 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1263
1264 int vy = self->vy = self->h >= sh
1265 ? self->y + (self->h - sh) / 2
1266 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1267 */
1268
1269 glColor4ub (255, 255, 255, 255);
1270
1271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1272 glEnable (GL_BLEND);
1273 glEnable (GL_TEXTURE_2D);
1274 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1275
1276 glBegin (GL_QUADS);
1277
1278 last_name = 0;
1279
1280 for (z = 0; z < 3; z++)
1281 for (y = 0; y < sh; y++) 1908 for (y = 0; y < sh; y++)
1282 if (0 <= y + vy && y + vy < self->rows) 1909 if (0 <= y + my && y + my < self->rows)
1283 { 1910 {
1284 maprow *row = self->row + (y + vy); 1911 maprow *row = self->row + (y + my);
1285 1912
1286 for (x = 0; x < sw; x++) 1913 for (x = 0; x < sw; x++)
1287 if (row->c0 <= x + vx && x + vx < row->c1) 1914 if (row->c0 <= x + mx && x + mx < row->c1)
1288 { 1915 {
1289 mapcell *cell = row->col + (x + vx - row->c0); 1916 mapcell *cell = row->col + (x + mx - row->c0);
1290 1917
1291 darkness[y * sw4 + x] = cell->darkness < 0 1918 darkness[y * sw4 + x] = cell->darkness
1919 ? 255 - (cell->darkness - 1)
1292 ? 255 - FOW_DARKNESS 1920 : 255 - FOW_DARKNESS;
1293 : 255 - cell->darkness;
1294
1295 face = cell->face [z];
1296
1297 if (face)
1298 {
1299 maptex tex = self->tex [face];
1300
1301 int px = (x + 1) * 32 - tex.w;
1302 int py = (y + 1) * 32 - tex.h;
1303
1304 if (last_name != tex.name)
1305 {
1306 glEnd ();
1307 last_name = tex.name;
1308 glBindTexture (GL_TEXTURE_2D, last_name);
1309 glBegin (GL_QUADS);
1310 }
1311
1312 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1313 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1314 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1315 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1316 }
1317 } 1921 }
1318 } 1922 }
1319
1320 glEnd ();
1321
1322 glDisable (GL_TEXTURE_2D);
1323 glDisable (GL_BLEND);
1324 1923
1325 EXTEND (SP, 3); 1924 EXTEND (SP, 3);
1326 PUSHs (sv_2mortal (newSViv (sw4))); 1925 PUSHs (sv_2mortal (newSViv (sw4)));
1327 PUSHs (sv_2mortal (newSViv (sh))); 1926 PUSHs (sv_2mortal (newSViv (sh)));
1328 PUSHs (darkness_sv); 1927 PUSHs (darkness_sv);
1329} 1928}
1330 1929
1331SV * 1930SV *
1332get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1931get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1333 CODE: 1932 CODE:
1334{ 1933{
1335 int x, y, x1, y1; 1934 int x, y, x1, y1;
1336 SV *data_sv = newSV (w * h * 7 + 5); 1935 SV *data_sv = newSV (w * h * 7 + 5);
1337 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1936 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1362 if (row && row->c0 <= x && x < row->c1) 1961 if (row && row->c0 <= x && x < row->c1)
1363 { 1962 {
1364 mapcell *cell = row->col + (x - row->c0); 1963 mapcell *cell = row->col + (x - row->c0);
1365 uint8_t flags = 0; 1964 uint8_t flags = 0;
1366 1965
1367 if (cell->face [0]) flags |= 1; 1966 if (cell->tile [0]) flags |= 1;
1368 if (cell->face [1]) flags |= 2; 1967 if (cell->tile [1]) flags |= 2;
1369 if (cell->face [2]) flags |= 4; 1968 if (cell->tile [2]) flags |= 4;
1370 1969
1371 *data++ = flags; 1970 *data++ = flags;
1372 1971
1373 if (flags & 1) 1972 if (flags & 1)
1374 { 1973 {
1974 tileid tile = cell->tile [0];
1375 *data++ = cell->face [0] >> 8; 1975 *data++ = tile >> 8;
1376 *data++ = cell->face [0]; 1976 *data++ = tile;
1377 } 1977 }
1378 1978
1379 if (flags & 2) 1979 if (flags & 2)
1380 { 1980 {
1981 tileid tile = cell->tile [1];
1381 *data++ = cell->face [1] >> 8; 1982 *data++ = tile >> 8;
1382 *data++ = cell->face [1]; 1983 *data++ = tile;
1383 } 1984 }
1384 1985
1385 if (flags & 4) 1986 if (flags & 4)
1386 { 1987 {
1988 tileid tile = cell->tile [2];
1387 *data++ = cell->face [2] >> 8; 1989 *data++ = tile >> 8;
1388 *data++ = cell->face [2]; 1990 *data++ = tile;
1389 } 1991 }
1390 } 1992 }
1391 else 1993 else
1392 *data++ = 0; 1994 *data++ = 0;
1393 } 1995 }
1399} 2001}
1400 OUTPUT: 2002 OUTPUT:
1401 RETVAL 2003 RETVAL
1402 2004
1403void 2005void
1404set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2006set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1405 PPCODE: 2007 PPCODE:
1406{ 2008{
1407 int x, y, z; 2009 int x, y, z;
1408 int w, h; 2010 int w, h;
1409 int x1, y1; 2011 int x1, y1;
1433 { 2035 {
1434 uint8_t flags = *data++; 2036 uint8_t flags = *data++;
1435 2037
1436 if (flags) 2038 if (flags)
1437 { 2039 {
1438 mapface face[3] = { 0, 0, 0 };
1439
1440 mapcell *cell = row_get_cell (row, x); 2040 mapcell *cell = row_get_cell (row, x);
2041 tileid tile[3] = { 0, 0, 0 };
1441 2042
1442 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2043 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1443 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2044 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1444 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2045 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1445 2046
1446 if (cell->darkness <= 0) 2047 if (cell->darkness == 0)
1447 { 2048 {
1448 cell->darkness = -1; 2049 cell->darkness = 0;
1449 2050
1450 for (z = 0; z <= 2; z++) 2051 for (z = 0; z <= 2; z++)
1451 { 2052 {
1452 cell->face[z] = face[z]; 2053 tileid t = tile [z];
1453 2054
1454 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2055 if (t >= self->texs || (t && !self->tex [t].name))
2056 {
1455 XPUSHs (sv_2mortal (newSViv (face[z]))); 2057 XPUSHs (sv_2mortal (newSViv (t)));
2058 need_texid (self, t);
2059 }
2060
2061 cell->tile [z] = t;
1456 } 2062 }
1457 } 2063 }
1458 } 2064 }
1459 } 2065 }
1460 } 2066 }
1461} 2067}
1462 2068
1463MODULE = CFClient PACKAGE = CFClient::MixChunk 2069MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1464 2070
1465CFClient::MixChunk 2071CFPlus::MixChunk
1466new_from_file (SV *class, char *path) 2072new_from_file (SV *class, char *path)
1467 CODE: 2073 CODE:
1468 RETVAL = Mix_LoadWAV (path); 2074 RETVAL = Mix_LoadWAV (path);
1469 OUTPUT: 2075 OUTPUT:
1470 RETVAL 2076 RETVAL
1471 2077
1472void 2078void
1473DESTROY (CFClient::MixChunk self) 2079DESTROY (CFPlus::MixChunk self)
1474 CODE: 2080 CODE:
1475 Mix_FreeChunk (self); 2081 Mix_FreeChunk (self);
1476 2082
1477int 2083int
1478volume (CFClient::MixChunk self, int volume = -1) 2084volume (CFPlus::MixChunk self, int volume = -1)
1479 CODE: 2085 CODE:
1480 RETVAL = Mix_VolumeChunk (self, volume); 2086 RETVAL = Mix_VolumeChunk (self, volume);
1481 OUTPUT: 2087 OUTPUT:
1482 RETVAL 2088 RETVAL
1483 2089
1484int 2090int
1485play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2091play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1486 CODE: 2092 CODE:
1487 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2093 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1488 OUTPUT: 2094 OUTPUT:
1489 RETVAL 2095 RETVAL
1490 2096
1491MODULE = CFClient PACKAGE = CFClient::MixMusic 2097MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1492 2098
1493int 2099int
1494volume (int volume = -1) 2100volume (int volume = -1)
1495 CODE: 2101 CODE:
1496 RETVAL = Mix_VolumeMusic (volume); 2102 RETVAL = Mix_VolumeMusic (volume);
1497 OUTPUT: 2103 OUTPUT:
1498 RETVAL 2104 RETVAL
1499 2105
1500CFClient::MixMusic 2106CFPlus::MixMusic
1501new_from_file (SV *class, char *path) 2107new_from_file (SV *class, char *path)
1502 CODE: 2108 CODE:
1503 RETVAL = Mix_LoadMUS (path); 2109 RETVAL = Mix_LoadMUS (path);
1504 OUTPUT: 2110 OUTPUT:
1505 RETVAL 2111 RETVAL
1506 2112
1507void 2113void
1508DESTROY (CFClient::MixMusic self) 2114DESTROY (CFPlus::MixMusic self)
1509 CODE: 2115 CODE:
1510 Mix_FreeMusic (self); 2116 Mix_FreeMusic (self);
1511 2117
1512int 2118int
1513play (CFClient::MixMusic self, int loops = -1) 2119play (CFPlus::MixMusic self, int loops = -1)
1514 CODE: 2120 CODE:
1515 RETVAL = Mix_PlayMusic (self, loops); 2121 RETVAL = Mix_PlayMusic (self, loops);
1516 OUTPUT: 2122 OUTPUT:
1517 RETVAL 2123 RETVAL
1518 2124
1519MODULE = CFClient PACKAGE = CFClient::OpenGL 2125MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1520 2126
1521BOOT: 2127BOOT:
1522{ 2128{
1523 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2129 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1524 static const struct { 2130 static const struct {
1525 const char *name; 2131 const char *name;
1526 IV iv; 2132 IV iv;
1527 } *civ, const_iv[] = { 2133 } *civ, const_iv[] = {
1528# define const_iv(name) { # name, (IV)name } 2134# define const_iv(name) { # name, (IV)name }
1535 const_iv (GL_SCISSOR_TEST), 2141 const_iv (GL_SCISSOR_TEST),
1536 const_iv (GL_DEPTH_TEST), 2142 const_iv (GL_DEPTH_TEST),
1537 const_iv (GL_ALPHA_TEST), 2143 const_iv (GL_ALPHA_TEST),
1538 const_iv (GL_NORMALIZE), 2144 const_iv (GL_NORMALIZE),
1539 const_iv (GL_RESCALE_NORMAL), 2145 const_iv (GL_RESCALE_NORMAL),
2146 const_iv (GL_FRONT),
2147 const_iv (GL_BACK),
1540 const_iv (GL_AND), 2148 const_iv (GL_AND),
1541 const_iv (GL_ONE), 2149 const_iv (GL_ONE),
1542 const_iv (GL_ZERO), 2150 const_iv (GL_ZERO),
1543 const_iv (GL_SRC_ALPHA), 2151 const_iv (GL_SRC_ALPHA),
1544 const_iv (GL_SRC_ALPHA_SATURATE), 2152 const_iv (GL_DST_ALPHA),
1545 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2153 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1546 const_iv (GL_ONE_MINUS_DST_ALPHA), 2154 const_iv (GL_ONE_MINUS_DST_ALPHA),
2155 const_iv (GL_SRC_ALPHA_SATURATE),
1547 const_iv (GL_RGB), 2156 const_iv (GL_RGB),
1548 const_iv (GL_RGBA), 2157 const_iv (GL_RGBA),
2158 const_iv (GL_RGBA4),
2159 const_iv (GL_RGBA8),
2160 const_iv (GL_RGB5_A1),
1549 const_iv (GL_UNSIGNED_BYTE), 2161 const_iv (GL_UNSIGNED_BYTE),
1550 const_iv (GL_UNSIGNED_SHORT), 2162 const_iv (GL_UNSIGNED_SHORT),
1551 const_iv (GL_UNSIGNED_INT), 2163 const_iv (GL_UNSIGNED_INT),
1552 const_iv (GL_ALPHA), 2164 const_iv (GL_ALPHA),
1553 const_iv (GL_INTENSITY), 2165 const_iv (GL_INTENSITY),
1585 const_iv (GL_SEPARABLE_2D), 2197 const_iv (GL_SEPARABLE_2D),
1586 const_iv (GL_CONVOLUTION_2D), 2198 const_iv (GL_CONVOLUTION_2D),
1587 const_iv (GL_CONVOLUTION_BORDER_MODE), 2199 const_iv (GL_CONVOLUTION_BORDER_MODE),
1588 const_iv (GL_CONSTANT_BORDER), 2200 const_iv (GL_CONSTANT_BORDER),
1589 const_iv (GL_LINES), 2201 const_iv (GL_LINES),
2202 const_iv (GL_LINE_STRIP),
1590 const_iv (GL_LINE_LOOP), 2203 const_iv (GL_LINE_LOOP),
1591 const_iv (GL_QUADS), 2204 const_iv (GL_QUADS),
1592 const_iv (GL_QUAD_STRIP), 2205 const_iv (GL_QUAD_STRIP),
1593 const_iv (GL_TRIANGLES), 2206 const_iv (GL_TRIANGLES),
1594 const_iv (GL_TRIANGLE_STRIP), 2207 const_iv (GL_TRIANGLE_STRIP),
1627 OUTPUT: 2240 OUTPUT:
1628 RETVAL 2241 RETVAL
1629 2242
1630int glGetError () 2243int glGetError ()
1631 2244
2245void glFinish ()
2246
1632void glClear (int mask) 2247void glClear (int mask)
1633 2248
1634void glClearColor (float r, float g, float b, float a = 1.0) 2249void glClearColor (float r, float g, float b, float a = 1.0)
1635 PROTOTYPE: @ 2250 PROTOTYPE: @
1636 2251
1642 2257
1643void glHint (int target, int mode) 2258void glHint (int target, int mode)
1644 2259
1645void glBlendFunc (int sfactor, int dfactor) 2260void glBlendFunc (int sfactor, int dfactor)
1646 2261
2262void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2263 CODE:
2264 gl_BlendFuncSeparate (sa, da, saa, daa);
2265
1647void glDepthMask (int flag) 2266void glDepthMask (int flag)
1648 2267
1649void glLogicOp (int opcode) 2268void glLogicOp (int opcode)
1650 2269
1651void glColorMask (int red, int green, int blue, int alpha) 2270void glColorMask (int red, int green, int blue, int alpha)
1655void glPushMatrix () 2274void glPushMatrix ()
1656 2275
1657void glPopMatrix () 2276void glPopMatrix ()
1658 2277
1659void glLoadIdentity () 2278void glLoadIdentity ()
2279
2280void glDrawBuffer (int buffer)
2281
2282void glReadBuffer (int buffer)
1660 2283
1661# near_ and far_ are due to microsofts buggy "c" compiler 2284# near_ and far_ are due to microsofts buggy "c" compiler
1662void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2285void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1663 2286
1664# near_ and far_ are due to microsofts buggy "c" compiler 2287# near_ and far_ are due to microsofts buggy "c" compiler
1684 2307
1685void glEnd () 2308void glEnd ()
1686 2309
1687void glColor (float r, float g, float b, float a = 1.0) 2310void glColor (float r, float g, float b, float a = 1.0)
1688 PROTOTYPE: @ 2311 PROTOTYPE: @
2312 ALIAS:
2313 glColor_premultiply = 1
1689 CODE: 2314 CODE:
2315 if (ix)
2316 {
2317 r *= a;
2318 g *= a;
2319 b *= a;
2320 }
1690 // microsoft visual "c" rounds instead of truncating... 2321 // microsoft visual "c" rounds instead of truncating...
1691 glColor4ub (MIN ((int)(r * 256.f), 255), 2322 glColor4f (r, g, b, a);
1692 MIN ((int)(g * 256.f), 255),
1693 MIN ((int)(b * 256.f), 255),
1694 MIN ((int)(a * 256.f), 255));
1695 2323
1696void glInterleavedArrays (int format, int stride, char *data) 2324void glInterleavedArrays (int format, int stride, char *data)
1697 2325
1698void glDrawElements (int mode, int count, int type, char *indices) 2326void glDrawElements (int mode, int count, int type, char *indices)
1699 2327
1722 2350
1723void glBindTexture (int target, int name) 2351void glBindTexture (int target, int name)
1724 2352
1725void glConvolutionParameter (int target, int pname, float params) 2353void glConvolutionParameter (int target, int pname, float params)
1726 CODE: 2354 CODE:
1727 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2355 if (gl.ConvolutionParameterf)
2356 gl.ConvolutionParameterf (target, pname, params);
1728 2357
1729void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2358void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1730 CODE: 2359 CODE:
1731 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2360 if (gl.ConvolutionFilter2D)
1732 (target, internalformat, width, height, format, type, data)); 2361 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1733 2362
1734void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2363void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1735 CODE: 2364 CODE:
1736 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2365 if (gl.SeparableFilter2D)
1737 (target, internalformat, width, height, format, type, row, column)); 2366 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1738 2367
1739void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2368void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1740 2369
1741void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2370void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1742 2371
1746 2375
1747int glGenTexture () 2376int glGenTexture ()
1748 CODE: 2377 CODE:
1749{ 2378{
1750 GLuint name; 2379 GLuint name;
2380 if (AvFILL (texture_av) >= 0)
2381 name = (GLuint)av_pop (texture_av);
2382 else
1751 glGenTextures (1, &name); 2383 glGenTextures (1, &name);
1752 RETVAL = name; 2384 RETVAL = name;
1753} 2385}
1754 OUTPUT: 2386 OUTPUT:
1755 RETVAL 2387 RETVAL
1756 2388
1757void glDeleteTexture (int name) 2389void glDeleteTexture (int name)
1758 CODE: 2390 CODE:
1759{ 2391{
1760 GLuint name_ = name; 2392 glBindTexture (GL_TEXTURE_2D, name);
2393 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2394 av_push (texture_av, (SV *)name);
1761 glDeleteTextures (1, &name_); 2395 /*glDeleteTextures (1, &name_);*/
1762} 2396}
1763 2397
1764int glGenList () 2398int glGenList ()
1765 CODE: 2399 CODE:
1766 RETVAL = glGenLists (1); 2400 RETVAL = glGenLists (1);
1775 2409
1776void glEndList () 2410void glEndList ()
1777 2411
1778void glCallList (int list) 2412void glCallList (int list)
1779 2413
1780

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines