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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines