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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines