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.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 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>
15#include <stdlib.h> 28#include <stdlib.h>
16 29
17#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
18#include <SDL_endian.h> 32#include <SDL_endian.h>
19#include <SDL_image.h> 33#include <SDL_image.h>
20#include <SDL_mixer.h> 34#include <SDL_mixer.h>
21#include <SDL_opengl.h> 35#include <SDL_opengl.h>
22 36
37#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS
39
23#include <glib/gmacros.h> 40#include <glib/gmacros.h>
24 41
25#include <pango/pango.h> 42#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 43
30#ifndef _WIN32 44#ifndef _WIN32
31# include <sys/types.h> 45# include <sys/types.h>
32# include <sys/socket.h> 46# include <sys/socket.h>
33# include <netinet/in.h> 47# include <netinet/in.h>
34# include <netinet/tcp.h> 48# include <netinet/tcp.h>
35# include <inttypes.h> 49# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 50#endif
44 51
45#include "glext.h" 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 53
47#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
48 55
49#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
51 58
52#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;
53 68
54static struct 69static struct
55{ 70{
56#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 72#include "glfunc.h"
58#undef GL_FUNC 73#undef GL_FUNC
59} gl; 74} gl;
60 75
76static void
61static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
62{ 78{
63 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
64 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
65 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 83 else
68 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
69} 85}
70 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
71typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
73 119
74typedef 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}
75 139
76typedef struct cf_layout { 140typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 141 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
80 int base_height; 143 int base_height;
81 CFClient__Font font; 144 CFPlus__Font font;
82} *CFClient__Layout; 145} *CFPlus__Layout;
83 146
84static CFClient__Font default_font; 147static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 148static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 149static PangoFontMap *opengl_fontmap;
87 150
88static void 151static void
89substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
90{ 153{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 154 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 155#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 157#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 159}
101 160
102static void 161static void
103layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
104{ 163{
105 /* 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
106 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
107 */ 166 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
112 171
113 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
114} 173}
115 174
116static void 175static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
120 182
121 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 185
124 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
125} 187 if (!rect.height) rect.height = 1;
126 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
127typedef uint16_t mapface; 194typedef uint16_t faceid;
128 195
129typedef struct { 196typedef struct {
130 GLint name; 197 int name;
131 int w, h; 198 int w, h;
132 float s, t; 199 float s, t;
133 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
134} maptex; 203} maptex;
135 204
136typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
137 int16_t darkness; 208 uint16_t darkness;
138 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
139} mapcell; 210} mapcell;
140 211
141typedef struct { 212typedef struct {
142 int32_t c0, c1; 213 int32_t c0, c1;
143 mapcell *col; 214 mapcell *col;
144} maprow; 215} maprow;
145 216
146typedef struct map { 217typedef struct map {
147 int x, y, w, h; 218 int x, y, w, h;
148 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
149 int faces; 220 int faces; tileid *face2tile; // [faceid]
150 mapface *face; 221 int texs; maptex *tex; // [tileid]
151
152 int texs;
153 maptex *tex;
154 222
155 int32_t rows; 223 int32_t rows;
156 maprow *row; 224 maprow *row;
157} *CFClient__Map; 225} *CFPlus__Map;
158 226
159static char * 227static char *
160prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
161{ 229{
162 char *p; 230 char *p;
179} 247}
180 248
181#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))
182#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))
183 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
184static maprow * 272static maprow *
185map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
186{ 274{
187 if (0 > y) 275 if (0 > y)
188 { 276 {
189 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
228 316
229 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
230} 318}
231 319
232static mapcell * 320static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
234{ 322{
235 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
236} 324}
237 325
238static void 326static void
239map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
240{ 328{
241 int r; 329 int r;
242 330
243 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
252 self->row = 0; 340 self->row = 0;
253 self->rows = 0; 341 self->rows = 0;
254} 342}
255 343
256static void 344static void
257map_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)
258{ 346{
259 int x, y; 347 int x, y;
260 maprow *row; 348 maprow *row;
349 mapcell *cell;
261 350
262 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 352 if (y >= 0)
264 { 353 {
265 if (y >= self->rows) 354 if (y >= self->rows)
271 if (x >= row->c0) 360 if (x >= row->c0)
272 { 361 {
273 if (x >= row->c1) 362 if (x >= row->c1)
274 break; 363 break;
275 364
276 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;
277 } 371 }
278 } 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);
279} 389}
280 390
281static void 391static void
282music_finished (void) 392music_finished (void)
283{ 393{
302 ev.data2 = 0; 412 ev.data2 = 0;
303 413
304 SDL_PushEvent ((SDL_Event *)&ev); 414 SDL_PushEvent ((SDL_Event *)&ev);
305} 415}
306 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
307MODULE = CFClient PACKAGE = CFClient 438MODULE = CFPlus PACKAGE = CFPlus
308 439
309PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
310 441
311BOOT: 442BOOT:
312{ 443{
313 HV *stash = gv_stashpv ("CFClient", 1); 444 HV *stash = gv_stashpv ("CFPlus", 1);
314 static const struct { 445 static const struct {
315 const char *name; 446 const char *name;
316 IV iv; 447 IV iv;
317 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
318# 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
319 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
320 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
321 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
322 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
323 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
332 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
333 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
334 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
335 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
336 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
337 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
338 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
339 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
340 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
341 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
396 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
397 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
398 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
399 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
400 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
401 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
402 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
403 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
404 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
405 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
406 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
407 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
408 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
409 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
410 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
411 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
412 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
413 const_iv (KMOD_CTRL),
414 const_iv (KMOD_SHIFT),
415 const_iv (KMOD_ALT),
416 const_iv (KMOD_META)
417# undef const_iv 557# undef const_iv
418 }; 558 };
419 559
420 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; )
421 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);
422} 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)
423 583
424void 584void
425pango_init () 585pango_init ()
426 CODE: 586 CODE:
427 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{ 587{
429 {
430 ft2_fontmap = pango_ft2_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
431 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);
432 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433 }
434 {
435 cairo_font_options_t *fopt = cairo_font_options_create ();
436 cairo_fontmap = pango_cairo_font_map_get_default ();
437 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438#ifdef _WIN32
439 // cairo looks like shit eaten twice on windows
440 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441#else
442 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443#endif
444 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446 pango_cairo_context_set_font_options (cairo_context, fopt);
447 cairo_font_options_destroy (fopt);
448 }
449} 591}
592
593char *
594SDL_GetError ()
450 595
451int 596int
452SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
453 598
454void 599void
455SDL_Quit () 600SDL_Quit ()
456 601
457void 602void
458SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
459 PPCODE: 604 PPCODE:
460{ 605{
461 SDL_Rect **m; 606 SDL_Rect **m;
462 607
463 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
464 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
465 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
466 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
467 612
468 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
470 615
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
474 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475 620
476 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
477 622#if SDL_VERSION_ATLEAST(1,2,10)
478 SDL_EnableUNICODE (1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
479 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
480 626
481 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
482 628
483 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
484 while (*m) 630 while (*m)
485 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
486 AV *av = newAV (); 634 AV *av = newAV ();
487 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
488 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));
489 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
490 641
491 ++m; 642 ++m;
492 } 643 }
493} 644}
494 645
495char *
496SDL_GetError ()
497
498int 646int
499SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
500 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
501 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
502 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
503 ); 660 );
661
504 if (RETVAL) 662 if (RETVAL)
505 { 663 {
664 av_clear (texture_av);
665
506 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
507# 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);
508# include "glfunc.h" 668#include "glfunc.h"
509# undef GL_FUNC 669#undef GL_FUNC
510 } 670 }
671}
511 OUTPUT: 672 OUTPUT:
512 RETVAL 673 RETVAL
513 674
514void 675void
515SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
516 677
517char * 678char *
518SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
519 680
681int
682SDL_GetAppState ()
683
520void 684void
521SDL_PollEvent () 685poll_events ()
522 PPCODE: 686 PPCODE:
523{ 687{
524 SDL_Event ev; 688 SDL_Event ev;
525 689
526 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
527 { 692 {
528 HV *hv = newHV (); 693 HV *hv = newHV ();
529 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
530 695
531 switch (ev.type) 696 switch (ev.type)
533 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
534 case SDL_KEYUP: 699 case SDL_KEYUP:
535 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
536 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
537 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 */
538 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
539 break; 705 break;
540 706
541 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
542 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
543 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
544 break; 710 break;
545 711
546 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
547 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
548
549 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
550 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
551 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
552 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
553 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
554 break; 738 break;
555 739
556 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
557 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
558 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
568 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570 break; 754 break;
571 } 755 }
572 756
573 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574 } 758 }
575} 759}
576 760
577int 761int
578Mix_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)
587Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
588 772
589void 773void
590lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
591 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
592#ifndef _WIN32 782#ifdef _WIN32
593 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 }
594#endif 804#endif
805}
595 806
596void 807void
597add_font (char *file) 808add_font (char *file)
598 CODE: 809 CODE:
599 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600#ifdef _WIN32
601 // cairo... sigh... requires win2000
602 AddFontResourceEx (file, FR_PRIVATE, 0);
603#endif
604 811
605void 812void
606load_image_inline (SV *image_) 813load_image_inline (SV *image_)
607 ALIAS: 814 ALIAS:
608 load_image_file = 1 815 load_image_file = 1
650 857
651 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 858 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652 859
653 assert (surface2->pitch == surface2->w * 4); 860 assert (surface2->pitch == surface2->w * 4);
654 861
862 SDL_LockSurface (surface2);
655 EXTEND (SP, 5); 863 EXTEND (SP, 6);
656 PUSHs (sv_2mortal (newSViv (surface2->w))); 864 PUSHs (sv_2mortal (newSViv (surface2->w)));
657 PUSHs (sv_2mortal (newSViv (surface2->h))); 865 PUSHs (sv_2mortal (newSViv (surface2->h)));
658 SDL_LockSurface (surface2);
659 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 866 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660 SDL_UnlockSurface (surface2);
661 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)));
662 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 868 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 869 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
870 SDL_UnlockSurface (surface2);
664 871
665 SDL_FreeSurface (surface); 872 SDL_FreeSurface (surface);
666 SDL_FreeSurface (surface2); 873 SDL_FreeSurface (surface2);
667} 874}
668 875
704 CODE: 911 CODE:
705 fprintf (stderr, "FATAL: %s\n", message); 912 fprintf (stderr, "FATAL: %s\n", message);
706#ifdef _WIN32 913#ifdef _WIN32
707 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
708#endif 915#endif
709 _Exit (1); 916 _exit (1);
710 917
711void 918void
712_exit (int retval) 919_exit (int retval = 0)
713 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
714 _Exit (retval); 924 _exit (retval);
925#endif
715 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
716MODULE = CFClient PACKAGE = CFClient::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
717 937
718CFClient::Font 938CFPlus::Font
719new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
720 CODE: 940 CODE:
721{ 941{
722 int count; 942 int count;
723 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
726} 946}
727 OUTPUT: 947 OUTPUT:
728 RETVAL 948 RETVAL
729 949
730void 950void
731DESTROY (CFClient::Font self) 951DESTROY (CFPlus::Font self)
732 CODE: 952 CODE:
733 pango_font_description_free (self); 953 pango_font_description_free (self);
734 954
735void 955void
736make_default (CFClient::Font self) 956make_default (CFPlus::Font self)
737 CODE: 957 CODE:
738 default_font = self; 958 default_font = self;
739 959
740MODULE = CFClient PACKAGE = CFClient::Layout 960MODULE = CFPlus PACKAGE = CFPlus::Layout
741 961
742CFClient::Layout 962void
743new (SV *class, int rgba = 0) 963reset_glyph_cache ()
964 CODE:
965 tc_clear ();
966
967CFPlus::Layout
968new (SV *class)
744 CODE: 969 CODE:
745 New (0, RETVAL, 1, struct cf_layout); 970 New (0, RETVAL, 1, struct cf_layout);
746 971
747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 972 RETVAL->pl = pango_layout_new (opengl_context);
748 RETVAL->rgba = rgba;
749 RETVAL->r = 1.; 973 RETVAL->r = 1.;
750 RETVAL->g = 1.; 974 RETVAL->g = 1.;
751 RETVAL->b = 1.; 975 RETVAL->b = 1.;
752 RETVAL->a = 1.; 976 RETVAL->a = 1.;
753 RETVAL->base_height = MIN_FONT_HEIGHT; 977 RETVAL->base_height = MIN_FONT_HEIGHT;
757 layout_update_font (RETVAL); 981 layout_update_font (RETVAL);
758 OUTPUT: 982 OUTPUT:
759 RETVAL 983 RETVAL
760 984
761void 985void
762DESTROY (CFClient::Layout self) 986DESTROY (CFPlus::Layout self)
763 CODE: 987 CODE:
764 g_object_unref (self->pl); 988 g_object_unref (self->pl);
765 Safefree (self); 989 Safefree (self);
766 990
767int
768is_rgba (CFClient::Layout self)
769 CODE:
770 RETVAL = self->rgba;
771 OUTPUT:
772 RETVAL
773
774void 991void
775set_text (CFClient::Layout self, SV *text_) 992set_text (CFPlus::Layout self, SV *text_)
776 CODE: 993 CODE:
777{ 994{
778 STRLEN textlen; 995 STRLEN textlen;
779 char *text = SvPVutf8 (text_, textlen); 996 char *text = SvPVutf8 (text_, textlen);
780 997
781 pango_layout_set_text (self->pl, text, textlen); 998 pango_layout_set_text (self->pl, text, textlen);
782} 999}
783 1000
784void 1001void
785set_markup (CFClient::Layout self, SV *text_) 1002set_markup (CFPlus::Layout self, SV *text_)
786 CODE: 1003 CODE:
787{ 1004{
788 STRLEN textlen; 1005 STRLEN textlen;
789 char *text = SvPVutf8 (text_, textlen); 1006 char *text = SvPVutf8 (text_, textlen);
790 1007
791 pango_layout_set_markup (self->pl, text, textlen); 1008 pango_layout_set_markup (self->pl, text, textlen);
792} 1009}
793 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
794SV * 1096SV *
795get_text (CFClient::Layout self) 1097get_text (CFPlus::Layout self)
796 CODE: 1098 CODE:
797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798 sv_utf8_decode (RETVAL); 1100 sv_utf8_decode (RETVAL);
799 OUTPUT: 1101 OUTPUT:
800 RETVAL 1102 RETVAL
801 1103
802void 1104void
803set_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.)
804 CODE: 1106 CODE:
805 self->r = r; 1107 self->r = r;
806 self->g = g; 1108 self->g = g;
807 self->b = b; 1109 self->b = b;
808 self->a = a; 1110 self->a = a;
809 1111
810void 1112void
811set_font (CFClient::Layout self, CFClient::Font font = 0) 1113set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812 CODE: 1114 CODE:
813 if (self->font != font) 1115 if (self->font != font)
814 { 1116 {
815 self->font = font; 1117 self->font = font;
816 layout_update_font (self); 1118 layout_update_font (self);
817 } 1119 }
818 1120
819void 1121void
820set_height (CFClient::Layout self, int base_height) 1122set_height (CFPlus::Layout self, int base_height)
821 CODE: 1123 CODE:
822 if (self->base_height != base_height) 1124 if (self->base_height != base_height)
823 { 1125 {
824 self->base_height = base_height; 1126 self->base_height = base_height;
825 layout_update_font (self); 1127 layout_update_font (self);
826 } 1128 }
827 1129
828void 1130void
829set_width (CFClient::Layout self, int max_width = -1) 1131set_width (CFPlus::Layout self, int max_width = -1)
830 CODE: 1132 CODE:
831 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);
832 1134
833void 1135void
834set_indent (CFClient::Layout self, int indent) 1136set_indent (CFPlus::Layout self, int indent)
835 CODE: 1137 CODE:
836 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837 1139
838void 1140void
839set_spacing (CFClient::Layout self, int spacing) 1141set_spacing (CFPlus::Layout self, int spacing)
840 CODE: 1142 CODE:
841 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842 1144
843void 1145void
844set_ellipsise (CFClient::Layout self, int ellipsise) 1146set_ellipsise (CFPlus::Layout self, int ellipsise)
845 CODE: 1147 CODE:
846 pango_layout_set_ellipsize (self->pl, 1148 pango_layout_set_ellipsize (self->pl,
847 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START
848 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
850 : PANGO_ELLIPSIZE_NONE 1152 : PANGO_ELLIPSIZE_NONE
851 ); 1153 );
852 1154
853void 1155void
854set_single_paragraph_mode (CFClient::Layout self, int spm) 1156set_single_paragraph_mode (CFPlus::Layout self, int spm)
855 CODE: 1157 CODE:
856 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857 1159
858void 1160void
859size (CFClient::Layout self) 1161size (CFPlus::Layout self)
860 PPCODE: 1162 PPCODE:
861{ 1163{
862 int w, h; 1164 int w, h;
863 1165
864 layout_get_pixel_size (self, &w, &h); 1166 layout_get_pixel_size (self, &w, &h);
867 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (w)));
868 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (h)));
869} 1171}
870 1172
871int 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
872xy_to_index (CFClient::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
873 CODE: 1187 CODE:
874{ 1188{
875 int index, trailing; 1189 int index, trailing;
876 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);
877 RETVAL = index; 1191 RETVAL = index + trailing;
878} 1192}
879 OUTPUT: 1193 OUTPUT:
880 RETVAL 1194 RETVAL
881 1195
882void 1196void
883cursor_pos (CFClient::Layout self, int index) 1197cursor_pos (CFPlus::Layout self, int index)
884 PPCODE: 1198 PPCODE:
885{ 1199{
886 PangoRectangle strong_pos; 1200 PangoRectangle strong_pos;
887 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888 1202
891 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893} 1207}
894 1208
895void 1209void
896render (CFClient::Layout self) 1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
897 PPCODE: 1211 PPCODE:
898{ 1212{
899 SV *retval; 1213 int line, x;
900 int w, h;
901 1214
902 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 */
903 1217
904 if (self->rgba)
905 {
906 cairo_surface_t *surface;
907 cairo_t *cairo;
908
909 retval = newSV (w * h * 4);
910 SvPOK_only (retval);
911 SvCUR_set (retval, w * h * 4);
912
913 memset (SvPVX (retval), 0, w * h * 4);
914
915 surface = cairo_image_surface_create_for_data (
916 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
917 cairo = cairo_create (surface);
918 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920 pango_cairo_show_layout (cairo, self->pl);
921
922 cairo_destroy (cairo);
923 cairo_surface_destroy (surface);
924
925 // what a mess, and its premultiplied, too :(
926 {
927 uint32_t *p = (uint32_t *)SvPVX (retval);
928 uint32_t *e = p + w * h;
929
930 while (p < e)
931 {
932 uint32_t rgba = *p;
933 rgba = (rgba >> 24) | (rgba << 8);
934#if 0
935#ifdef _WIN32
936 {//D
937 uint8_t r = rgba >> 24;
938 uint8_t g = rgba >> 16;
939 uint8_t b = rgba >> 8;
940 uint8_t a = rgba >> 0;
941
942 rgba = (rgba & 0xffffff00) | a;
943 }
944#endif
945#endif
946 rgba = SDL_SwapBE32 (rgba);
947 *p++ = rgba;
948 }
949 }
950
951 EXTEND (SP, 5); 1218 EXTEND (SP, 2);
952 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)
953 PUSHs (sv_2mortal (newSViv (h))); 1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
954 PUSHs (sv_2mortal (retval));
955 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957 }
958 else 1241 else
959 { 1242 {
960 FT_Bitmap bitmap;
961
962 retval = newSV (w * h);
963 SvPOK_only (retval);
964 SvCUR_set (retval, w * h);
965
966 bitmap.rows = h;
967 bitmap.width = w;
968 bitmap.pitch = w;
969 bitmap.buffer = (unsigned char*)SvPVX (retval);
970 bitmap.num_grays = 256;
971 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973 memset (bitmap.buffer, 0, w * h);
974
975 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977 EXTEND (SP, 5);
978 PUSHs (sv_2mortal (newSViv (w))); 1243 PUSHs (sv_2mortal (newSViv (index)));
979 PUSHs (sv_2mortal (newSViv (h))); 1244 PUSHs (sv_2mortal (newSViv (trailing)));
980 PUSHs (sv_2mortal (retval));
981 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983 } 1245 }
984} 1246}
985 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
986MODULE = CFClient PACKAGE = CFClient::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
987 1259
1260int minpot (int n)
1261
988void 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
989draw_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.)
990 PROTOTYPE: $$$;$$ 1286 PROTOTYPE: $$$;$$
991 ALIAS: 1287 ALIAS:
992 draw_quad_alpha = 1 1288 draw_quad_alpha = 1
993 draw_quad_alpha_premultiplied = 2 1289 draw_quad_alpha_premultiplied = 2
994 CODE: 1290 CODE:
1032 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1033 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1034 } 1330 }
1035} 1331}
1036 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
1037MODULE = CFClient PACKAGE = CFClient::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1038 1345
1039CFClient::Map 1346CFPlus::Map
1040new (SV *class, int map_width, int map_height) 1347new (SV *class)
1041 CODE: 1348 CODE:
1042 New (0, RETVAL, 1, struct map); 1349 New (0, RETVAL, 1, struct map);
1043 RETVAL->x = 0; 1350 RETVAL->x = 0;
1044 RETVAL->y = 0; 1351 RETVAL->y = 0;
1045 RETVAL->w = map_width; 1352 RETVAL->w = 0;
1046 RETVAL->h = map_height; 1353 RETVAL->h = 0;
1047 RETVAL->ox = 0; 1354 RETVAL->ox = 0;
1048 RETVAL->oy = 0; 1355 RETVAL->oy = 0;
1049 RETVAL->faces = 8192; 1356 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1050 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1357 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1051 RETVAL->texs = 8192;
1052 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1053 RETVAL->rows = 0; 1358 RETVAL->rows = 0;
1054 RETVAL->row = 0; 1359 RETVAL->row = 0;
1055 OUTPUT: 1360 OUTPUT:
1056 RETVAL 1361 RETVAL
1057 1362
1058void 1363void
1059DESTROY (CFClient::Map self) 1364DESTROY (CFPlus::Map self)
1060 CODE: 1365 CODE:
1061{ 1366{
1062 map_clear (self); 1367 map_clear (self);
1063 Safefree (self->face); 1368 Safefree (self->face2tile);
1064 Safefree (self->tex); 1369 Safefree (self->tex);
1065 Safefree (self); 1370 Safefree (self);
1066} 1371}
1067 1372
1068void 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
1069clear (CFClient::Map self) 1380clear (CFPlus::Map self)
1070 CODE: 1381 CODE:
1071 map_clear (self); 1382 map_clear (self);
1072 1383
1073void 1384void
1074set_face (CFClient::Map self, int face, int texid) 1385set_tileid (CFPlus::Map self, int face, int tile)
1075 CODE: 1386 CODE:
1076{ 1387{
1077 while (self->faces <= face) 1388 need_facenum (self, face); self->face2tile [face] = tile;
1078 { 1389 need_texid (self, tile);
1079 Append (mapface, self->face, self->faces, self->faces);
1080 self->faces *= 2;
1081 }
1082
1083 self->face [face] = texid;
1084} 1390}
1085 1391
1086void 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
1087set_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)
1088 CODE: 1417 CODE:
1089{ 1418{
1090 while (self->texs <= texid) 1419 need_texid (self, texid);
1091 {
1092 Append (maptex, self->tex, self->texs, self->texs);
1093 self->texs *= 2;
1094 }
1095 1420
1096 { 1421 {
1097 maptex *tex = self->tex + texid; 1422 maptex *tex = self->tex + texid;
1098 1423
1099 tex->name = name; 1424 tex->name = name;
1116 // from transparent color bleeding and ugly wrapping effects. 1441 // from transparent color bleeding and ugly wrapping effects.
1117 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118} 1443}
1119 1444
1120int 1445int
1121ox (CFClient::Map self) 1446ox (CFPlus::Map self)
1122 ALIAS: 1447 ALIAS:
1123 oy = 1 1448 oy = 1
1124 x = 2 1449 x = 2
1125 y = 3 1450 y = 3
1126 w = 4 1451 w = 4
1137 } 1462 }
1138 OUTPUT: 1463 OUTPUT:
1139 RETVAL 1464 RETVAL
1140 1465
1141void 1466void
1142scroll (CFClient::Map self, int dx, int dy) 1467scroll (CFPlus::Map self, int dx, int dy)
1143 CODE: 1468 CODE:
1144{ 1469{
1145 if (dx > 0) 1470 if (dx > 0)
1146 map_blank (self, self->x, self->y, dx - 1, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1147 else if (dx < 0) 1472 else if (dx < 0)
1148 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);
1149 1474
1150 if (dy > 0) 1475 if (dy > 0)
1151 map_blank (self, self->x, self->y, self->w, dy - 1); 1476 map_blank (self, self->x, self->y, self->w, dy);
1152 else if (dy < 0) 1477 else if (dy < 0)
1153 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);
1154 1479
1155 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1156 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1157 1482
1158 while (self->y < 0) 1483 while (self->y < 0)
1163 self->y += MAP_EXTEND_Y; 1488 self->y += MAP_EXTEND_Y;
1164 } 1489 }
1165} 1490}
1166 1491
1167void 1492void
1168map1a_update (CFClient::Map self, SV *data_) 1493map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169 CODE: 1494 CODE:
1170{ 1495{
1171 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172 uint8_t *data_end = (uint8_t *)SvEND (data_); 1497 uint8_t *data_end = (uint8_t *)SvEND (data_);
1173 mapcell *cell; 1498 mapcell *cell;
1174 int x, y, flags; 1499 int x, y, flags;
1175 1500
1176 while (data < data_end) 1501 while (data < data_end - 1)
1177 { 1502 {
1178 flags = (data [0] << 8) + data [1]; data += 2; 1503 flags = (data [0] << 8) + data [1]; data += 2;
1179 1504
1180 x = ((flags >> 10) & 63) + self->x; 1505 x = self->x + ((flags >> 10) & 63);
1181 y = ((flags >> 4) & 63) + self->y; 1506 y = self->y + ((flags >> 4) & 63);
1182 1507
1183 cell = map_get_cell (self, x, y); 1508 cell = map_get_cell (self, x, y);
1184 1509
1185 if (flags & 15) 1510 if (flags & 15)
1186 { 1511 {
1187 if (cell->darkness < 0) 1512 if (!cell->darkness)
1188 { 1513 {
1514 memset (cell, 0, sizeof (*cell));
1189 cell->darkness = 0; 1515 cell->darkness = 256;
1190 cell->face [0] = 0;
1191 cell->face [1] = 0;
1192 cell->face [2] = 0;
1193 } 1516 }
1194 1517
1195 cell->darkness = flags & 8 ? *data++ : 255;
1196
1197 //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 }
1198 1559
1199 if (flags & 4) 1560 if (flags & 4)
1200 { 1561 {
1201 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];
1202 } 1565 }
1203 1566
1204 if (flags & 2) 1567 if (flags & 2)
1205 { 1568 {
1206 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];
1207 } 1572 }
1208 1573
1209 if (flags & 1) 1574 if (flags & 1)
1210 { 1575 {
1211 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];
1212 } 1579 }
1213 } 1580 }
1214 else 1581 else
1215 cell->darkness = -1; 1582 cell->darkness = 0;
1216 } 1583 }
1217} 1584}
1218 1585
1219SV * 1586SV *
1220mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221 CODE: 1588 CODE:
1222{ 1589{
1223 int x1, x; 1590 int x1, x;
1224 int y1, y; 1591 int y1, y;
1225 int z; 1592 int z;
1246 { 1613 {
1247 mapcell *cell = row->col + (x - row->c0); 1614 mapcell *cell = row->col + (x - row->c0);
1248 1615
1249 for (z = 0; z <= 0; z++) 1616 for (z = 0; z <= 0; z++)
1250 { 1617 {
1251 mapface face = cell->face [z];
1252
1253 if (face)
1254 {
1255 maptex tex = self->tex [face]; 1618 maptex tex = self->tex [cell->tile [z]];
1256 int a0 = 255 - tex.a; 1619 int a0 = 255 - tex.a;
1257 int a1 = tex.a; 1620 int a1 = tex.a;
1258 1621
1259 r = (r * a0 + tex.r * a1) / 255; 1622 r = (r * a0 + tex.r * a1) / 255;
1260 g = (g * a0 + tex.g * a1) / 255; 1623 g = (g * a0 + tex.g * a1) / 255;
1261 b = (b * a0 + tex.b * a1) / 255; 1624 b = (b * a0 + tex.b * a1) / 255;
1262 a = (a * a0 + tex.a * a1) / 255; 1625 a = (a * a0 + tex.a * a1) / 255;
1263 }
1264 } 1626 }
1265 } 1627 }
1266 1628
1267 *map++ = (r ) 1629 *map++ = (r )
1268 | (g << 8) 1630 | (g << 8)
1275} 1637}
1276 OUTPUT: 1638 OUTPUT:
1277 RETVAL 1639 RETVAL
1278 1640
1279void 1641void
1280draw (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)
1281 PPCODE: 1643 CODE:
1282{ 1644{
1283 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;
1284 int x, y, z; 1649 int x, y, z;
1285 int last_name; 1650 int last_name;
1286 mapface face; 1651
1652 // thats current max. sorry.
1653 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255;
1655
1656 // clear key, in case of extra padding
1657 memset (&skey, 0, sizeof (skey));
1658
1659 glColor4ub (255, 255, 255, 255);
1660
1661 glEnable (GL_BLEND);
1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1663 glEnable (GL_TEXTURE_2D);
1664 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1665
1666 glBegin (GL_QUADS);
1667
1668 last_name = 0;
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
1695 for (z = 0; z <= 2; z++)
1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1699 for (y = 0; y < sh; y++)
1700 if (0 <= y + my && y + my < self->rows)
1701 {
1702 maprow *row = self->row + (y + my);
1703
1704 for (x = 0; x < sw; x++)
1705 if (row->c0 <= x + mx && x + mx < row->c1)
1706 {
1707 mapcell *cell = row->col + (x + mx - row->c0);
1708 tileid tile = cell->tile [z];
1709
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))
1805 {
1806 int level = (w << 5) | b;
1807 HE *he;
1808
1809 hv_iterinit (smooth);
1810 while ((he = hv_iternext (smooth)))
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
1834 glEnd ();
1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
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 }
1859 }
1860 }
1861 }
1862 }
1863
1864 hv_clear (smooth);
1865 }
1866
1867 glEnd ();
1868
1869 glDisable (GL_TEXTURE_2D);
1870 glDisable (GL_BLEND);
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, int smoothing, const char *matrix)
1966 PPCODE:
1967{
1968 int x, y;
1287 int sw4 = (sw + 3) & ~3; 1969 int sw4 = (sw + 3) & ~3;
1288 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290 1972
1291 memset (darkness, 255, sw4 * sh); 1973 memset (darkness, 255, sw4 * sh);
1292 SvPOK_only (darkness_sv); 1974 SvPOK_only (darkness_sv);
1293 SvCUR_set (darkness_sv, sw4 * sh); 1975 SvCUR_set (darkness_sv, sw4 * sh);
1294 1976
1295 vx = self->x + (self->w - sw) / 2 - shift_x; 1977 mx += self->x;
1296 vy = self->y + (self->h - sh) / 2 - shift_y; 1978 my += self->y;
1297 1979
1298 /*
1299 int vx = self->vx = self->w >= sw
1300 ? self->x + (self->w - sw) / 2
1301 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1302
1303 int vy = self->vy = self->h >= sh
1304 ? self->y + (self->h - sh) / 2
1305 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306 */
1307
1308 glColor4ub (255, 255, 255, 255);
1309
1310 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311 glEnable (GL_BLEND);
1312 glEnable (GL_TEXTURE_2D);
1313 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314
1315 glBegin (GL_QUADS);
1316
1317 last_name = 0;
1318
1319 for (z = 0; z < 3; z++)
1320 for (y = 0; y < sh; y++) 1980 for (y = 0; y < sh; y++)
1321 if (0 <= y + vy && y + vy < self->rows) 1981 if (0 <= y + my && y + my < self->rows)
1322 { 1982 {
1323 maprow *row = self->row + (y + vy); 1983 maprow *row = self->row + (y + my);
1324 1984
1325 for (x = 0; x < sw; x++) 1985 for (x = 0; x < sw; x++)
1326 if (row->c0 <= x + vx && x + vx < row->c1) 1986 if (row->c0 <= x + mx && x + mx < row->c1)
1327 { 1987 {
1328 mapcell *cell = row->col + (x + vx - row->c0); 1988 mapcell *cell = row->col + (x + mx - row->c0);
1329 1989
1330 darkness[y * sw4 + x] = cell->darkness < 0 1990 darkness[y * sw4 + x] = cell->darkness
1991 ? 255 - (cell->darkness - 1)
1331 ? 255 - FOW_DARKNESS 1992 : 255 - FOW_DARKNESS;
1332 : 255 - cell->darkness; 1993 }
1994 }
1333 1995
1334 face = cell->face [z]; 1996 if (smoothing)
1997 {
1998 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
1999 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
1335 2000
1336 if (face) 2001 SvPOK_only (darkness2_sv);
2002 SvCUR_set (darkness2_sv, sw4 * sh);
2003
2004 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x)
2006 {
2007 float *f = (float *)matrix;
2008 int dx, dy;
2009 float sum = 0.f;
2010
2011 for (dy = -1; dy <= 1; ++dy)
2012 for (dx = -1; dx <= 1; ++dx)
1337 { 2013 {
1338 maptex tex = self->tex [face]; 2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
1339 2016
1340 int px = (x + 1) * 32 - tex.w; 2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
1341 int py = (y + 1) * 32 - tex.h;
1342
1343 if (last_name != tex.name)
1344 {
1345 glEnd ();
1346 last_name = tex.name;
1347 glBindTexture (GL_TEXTURE_2D, last_name);
1348 glBegin (GL_QUADS);
1349 }
1350
1351 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1352 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1353 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1354 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1355 } 2018 }
1356 } 2019
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
1357 } 2021 }
1358 2022
1359 glEnd (); 2023 darkness_sv = darkness2_sv;
1360 2024 }
1361 glDisable (GL_TEXTURE_2D);
1362 glDisable (GL_BLEND);
1363 2025
1364 EXTEND (SP, 3); 2026 EXTEND (SP, 3);
1365 PUSHs (sv_2mortal (newSViv (sw4))); 2027 PUSHs (sv_2mortal (newSViv (sw4)));
1366 PUSHs (sv_2mortal (newSViv (sh))); 2028 PUSHs (sv_2mortal (newSViv (sh)));
1367 PUSHs (darkness_sv); 2029 PUSHs (darkness_sv);
1368} 2030}
1369 2031
1370SV * 2032SV *
1371get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2033get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1372 CODE: 2034 CODE:
1373{ 2035{
1374 int x, y, x1, y1; 2036 int x, y, x1, y1;
1375 SV *data_sv = newSV (w * h * 7 + 5); 2037 SV *data_sv = newSV (w * h * 7 + 5);
1376 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2038 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1401 if (row && row->c0 <= x && x < row->c1) 2063 if (row && row->c0 <= x && x < row->c1)
1402 { 2064 {
1403 mapcell *cell = row->col + (x - row->c0); 2065 mapcell *cell = row->col + (x - row->c0);
1404 uint8_t flags = 0; 2066 uint8_t flags = 0;
1405 2067
1406 if (cell->face [0]) flags |= 1; 2068 if (cell->tile [0]) flags |= 1;
1407 if (cell->face [1]) flags |= 2; 2069 if (cell->tile [1]) flags |= 2;
1408 if (cell->face [2]) flags |= 4; 2070 if (cell->tile [2]) flags |= 4;
1409 2071
1410 *data++ = flags; 2072 *data++ = flags;
1411 2073
1412 if (flags & 1) 2074 if (flags & 1)
1413 { 2075 {
2076 tileid tile = cell->tile [0];
1414 *data++ = cell->face [0] >> 8; 2077 *data++ = tile >> 8;
1415 *data++ = cell->face [0]; 2078 *data++ = tile;
1416 } 2079 }
1417 2080
1418 if (flags & 2) 2081 if (flags & 2)
1419 { 2082 {
2083 tileid tile = cell->tile [1];
1420 *data++ = cell->face [1] >> 8; 2084 *data++ = tile >> 8;
1421 *data++ = cell->face [1]; 2085 *data++ = tile;
1422 } 2086 }
1423 2087
1424 if (flags & 4) 2088 if (flags & 4)
1425 { 2089 {
2090 tileid tile = cell->tile [2];
1426 *data++ = cell->face [2] >> 8; 2091 *data++ = tile >> 8;
1427 *data++ = cell->face [2]; 2092 *data++ = tile;
1428 } 2093 }
1429 } 2094 }
1430 else 2095 else
1431 *data++ = 0; 2096 *data++ = 0;
1432 } 2097 }
1438} 2103}
1439 OUTPUT: 2104 OUTPUT:
1440 RETVAL 2105 RETVAL
1441 2106
1442void 2107void
1443set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2108set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444 PPCODE: 2109 PPCODE:
1445{ 2110{
1446 int x, y, z; 2111 int x, y, z;
1447 int w, h; 2112 int w, h;
1448 int x1, y1; 2113 int x1, y1;
1472 { 2137 {
1473 uint8_t flags = *data++; 2138 uint8_t flags = *data++;
1474 2139
1475 if (flags) 2140 if (flags)
1476 { 2141 {
1477 mapface face[3] = { 0, 0, 0 };
1478
1479 mapcell *cell = row_get_cell (row, x); 2142 mapcell *cell = row_get_cell (row, x);
2143 tileid tile[3] = { 0, 0, 0 };
1480 2144
1481 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2145 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1482 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2146 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1483 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2147 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1484 2148
1485 if (cell->darkness <= 0) 2149 if (cell->darkness == 0)
1486 { 2150 {
1487 cell->darkness = -1; 2151 cell->darkness = 0;
1488 2152
1489 for (z = 0; z <= 2; z++) 2153 for (z = 0; z <= 2; z++)
1490 { 2154 {
1491 cell->face[z] = face[z]; 2155 tileid t = tile [z];
1492 2156
1493 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2157 if (t >= self->texs || (t && !self->tex [t].name))
2158 {
1494 XPUSHs (sv_2mortal (newSViv (face[z]))); 2159 XPUSHs (sv_2mortal (newSViv (t)));
2160 need_texid (self, t);
2161 }
2162
2163 cell->tile [z] = t;
1495 } 2164 }
1496 } 2165 }
1497 } 2166 }
1498 } 2167 }
1499 } 2168 }
1500} 2169}
1501 2170
1502MODULE = CFClient PACKAGE = CFClient::MixChunk 2171MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503 2172
1504CFClient::MixChunk 2173CFPlus::MixChunk
1505new_from_file (SV *class, char *path) 2174new_from_file (SV *class, char *path)
1506 CODE: 2175 CODE:
1507 RETVAL = Mix_LoadWAV (path); 2176 RETVAL = Mix_LoadWAV (path);
1508 OUTPUT: 2177 OUTPUT:
1509 RETVAL 2178 RETVAL
1510 2179
1511void 2180void
1512DESTROY (CFClient::MixChunk self) 2181DESTROY (CFPlus::MixChunk self)
1513 CODE: 2182 CODE:
1514 Mix_FreeChunk (self); 2183 Mix_FreeChunk (self);
1515 2184
1516int 2185int
1517volume (CFClient::MixChunk self, int volume = -1) 2186volume (CFPlus::MixChunk self, int volume = -1)
1518 CODE: 2187 CODE:
1519 RETVAL = Mix_VolumeChunk (self, volume); 2188 RETVAL = Mix_VolumeChunk (self, volume);
1520 OUTPUT: 2189 OUTPUT:
1521 RETVAL 2190 RETVAL
1522 2191
1523int 2192int
1524play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2193play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1525 CODE: 2194 CODE:
1526 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2195 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527 OUTPUT: 2196 OUTPUT:
1528 RETVAL 2197 RETVAL
1529 2198
1530MODULE = CFClient PACKAGE = CFClient::MixMusic 2199MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531 2200
1532int 2201int
1533volume (int volume = -1) 2202volume (int volume = -1)
1534 CODE: 2203 CODE:
1535 RETVAL = Mix_VolumeMusic (volume); 2204 RETVAL = Mix_VolumeMusic (volume);
1536 OUTPUT: 2205 OUTPUT:
1537 RETVAL 2206 RETVAL
1538 2207
2208int
2209fade_out (int ms)
2210 CODE:
2211 RETVAL = Mix_FadeOutMusic (ms);
2212 OUTPUT:
2213 RETVAL
2214
1539CFClient::MixMusic 2215CFPlus::MixMusic
1540new_from_file (SV *class, char *path) 2216new_from_file (SV *class, char *path)
1541 CODE: 2217 CODE:
1542 RETVAL = Mix_LoadMUS (path); 2218 RETVAL = Mix_LoadMUS (path);
1543 OUTPUT: 2219 OUTPUT:
1544 RETVAL 2220 RETVAL
1545 2221
1546void 2222void
1547DESTROY (CFClient::MixMusic self) 2223DESTROY (CFPlus::MixMusic self)
1548 CODE: 2224 CODE:
1549 Mix_FreeMusic (self); 2225 Mix_FreeMusic (self);
1550 2226
1551int 2227int
1552play (CFClient::MixMusic self, int loops = -1) 2228play (CFPlus::MixMusic self, int loops = -1)
1553 CODE: 2229 CODE:
1554 RETVAL = Mix_PlayMusic (self, loops); 2230 RETVAL = Mix_PlayMusic (self, loops);
1555 OUTPUT: 2231 OUTPUT:
1556 RETVAL 2232 RETVAL
1557 2233
2234int
2235fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2236 CODE:
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2238 OUTPUT:
2239 RETVAL
2240
1558MODULE = CFClient PACKAGE = CFClient::OpenGL 2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559 2242
1560BOOT: 2243BOOT:
1561{ 2244{
1562 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2245 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563 static const struct { 2246 static const struct {
1564 const char *name; 2247 const char *name;
1565 IV iv; 2248 IV iv;
1566 } *civ, const_iv[] = { 2249 } *civ, const_iv[] = {
1567# define const_iv(name) { # name, (IV)name } 2250# define const_iv(name) { # name, (IV)name }
2251 const_iv (GL_VENDOR),
2252 const_iv (GL_VERSION),
2253 const_iv (GL_EXTENSIONS),
1568 const_iv (GL_COLOR_MATERIAL), 2254 const_iv (GL_COLOR_MATERIAL),
1569 const_iv (GL_SMOOTH), 2255 const_iv (GL_SMOOTH),
1570 const_iv (GL_FLAT), 2256 const_iv (GL_FLAT),
1571 const_iv (GL_DITHER), 2257 const_iv (GL_DITHER),
1572 const_iv (GL_BLEND), 2258 const_iv (GL_BLEND),
1574 const_iv (GL_SCISSOR_TEST), 2260 const_iv (GL_SCISSOR_TEST),
1575 const_iv (GL_DEPTH_TEST), 2261 const_iv (GL_DEPTH_TEST),
1576 const_iv (GL_ALPHA_TEST), 2262 const_iv (GL_ALPHA_TEST),
1577 const_iv (GL_NORMALIZE), 2263 const_iv (GL_NORMALIZE),
1578 const_iv (GL_RESCALE_NORMAL), 2264 const_iv (GL_RESCALE_NORMAL),
2265 const_iv (GL_FRONT),
2266 const_iv (GL_BACK),
1579 const_iv (GL_AND), 2267 const_iv (GL_AND),
1580 const_iv (GL_ONE), 2268 const_iv (GL_ONE),
1581 const_iv (GL_ZERO), 2269 const_iv (GL_ZERO),
1582 const_iv (GL_SRC_ALPHA), 2270 const_iv (GL_SRC_ALPHA),
1583 const_iv (GL_DST_ALPHA), 2271 const_iv (GL_DST_ALPHA),
1584 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2272 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585 const_iv (GL_ONE_MINUS_DST_ALPHA), 2273 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE), 2274 const_iv (GL_SRC_ALPHA_SATURATE),
1587 const_iv (GL_RGB), 2275 const_iv (GL_RGB),
1588 const_iv (GL_RGBA), 2276 const_iv (GL_RGBA),
2277 const_iv (GL_RGBA4),
2278 const_iv (GL_RGBA8),
2279 const_iv (GL_RGB5_A1),
1589 const_iv (GL_UNSIGNED_BYTE), 2280 const_iv (GL_UNSIGNED_BYTE),
1590 const_iv (GL_UNSIGNED_SHORT), 2281 const_iv (GL_UNSIGNED_SHORT),
1591 const_iv (GL_UNSIGNED_INT), 2282 const_iv (GL_UNSIGNED_INT),
1592 const_iv (GL_ALPHA), 2283 const_iv (GL_ALPHA),
1593 const_iv (GL_INTENSITY), 2284 const_iv (GL_INTENSITY),
1594 const_iv (GL_LUMINANCE), 2285 const_iv (GL_LUMINANCE),
1595 const_iv (GL_LUMINANCE_ALPHA), 2286 const_iv (GL_LUMINANCE_ALPHA),
1596 const_iv (GL_FLOAT), 2287 const_iv (GL_FLOAT),
1597 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1598 const_iv (GL_COMPILE), 2289 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D),
1599 const_iv (GL_TEXTURE_1D), 2292 const_iv (GL_TEXTURE_1D),
1600 const_iv (GL_TEXTURE_2D), 2293 const_iv (GL_TEXTURE_2D),
1601 const_iv (GL_TEXTURE_ENV), 2294 const_iv (GL_TEXTURE_ENV),
1602 const_iv (GL_TEXTURE_MAG_FILTER), 2295 const_iv (GL_TEXTURE_MAG_FILTER),
1603 const_iv (GL_TEXTURE_MIN_FILTER), 2296 const_iv (GL_TEXTURE_MIN_FILTER),
1625 const_iv (GL_SEPARABLE_2D), 2318 const_iv (GL_SEPARABLE_2D),
1626 const_iv (GL_CONVOLUTION_2D), 2319 const_iv (GL_CONVOLUTION_2D),
1627 const_iv (GL_CONVOLUTION_BORDER_MODE), 2320 const_iv (GL_CONVOLUTION_BORDER_MODE),
1628 const_iv (GL_CONSTANT_BORDER), 2321 const_iv (GL_CONSTANT_BORDER),
1629 const_iv (GL_LINES), 2322 const_iv (GL_LINES),
2323 const_iv (GL_LINE_STRIP),
1630 const_iv (GL_LINE_LOOP), 2324 const_iv (GL_LINE_LOOP),
1631 const_iv (GL_QUADS), 2325 const_iv (GL_QUADS),
1632 const_iv (GL_QUAD_STRIP), 2326 const_iv (GL_QUAD_STRIP),
1633 const_iv (GL_TRIANGLES), 2327 const_iv (GL_TRIANGLES),
1634 const_iv (GL_TRIANGLE_STRIP), 2328 const_iv (GL_TRIANGLE_STRIP),
1642# undef const_iv 2336# undef const_iv
1643 }; 2337 };
1644 2338
1645 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2339 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1646 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2340 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2341
2342 texture_av = newAV ();
2343 AvREAL_off (texture_av);
1647} 2344}
1648 2345
1649char * 2346char *
1650gl_vendor () 2347gl_vendor ()
1651 CODE: 2348 CODE:
1665 CODE: 2362 CODE:
1666 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2363 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1667 OUTPUT: 2364 OUTPUT:
1668 RETVAL 2365 RETVAL
1669 2366
2367const char *glGetString (GLenum pname)
2368
2369GLint glGetInteger (GLenum pname)
2370 CODE:
2371 glGetIntegerv (pname, &RETVAL);
2372 OUTPUT:
2373 RETVAL
2374
2375GLdouble glGetDouble (GLenum pname)
2376 CODE:
2377 glGetDoublev (pname, &RETVAL);
2378 OUTPUT:
2379 RETVAL
2380
1670int glGetError () 2381int glGetError ()
2382
2383void glFinish ()
1671 2384
1672void glClear (int mask) 2385void glClear (int mask)
1673 2386
1674void glClearColor (float r, float g, float b, float a = 1.0) 2387void glClearColor (float r, float g, float b, float a = 1.0)
1675 PROTOTYPE: @ 2388 PROTOTYPE: @
1699void glPushMatrix () 2412void glPushMatrix ()
1700 2413
1701void glPopMatrix () 2414void glPopMatrix ()
1702 2415
1703void glLoadIdentity () 2416void glLoadIdentity ()
2417
2418void glDrawBuffer (int buffer)
2419
2420void glReadBuffer (int buffer)
1704 2421
1705# near_ and far_ are due to microsofts buggy "c" compiler 2422# near_ and far_ are due to microsofts buggy "c" compiler
1706void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2423void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707 2424
1708# near_ and far_ are due to microsofts buggy "c" compiler 2425# near_ and far_ are due to microsofts buggy "c" compiler
1738 r *= a; 2455 r *= a;
1739 g *= a; 2456 g *= a;
1740 b *= a; 2457 b *= a;
1741 } 2458 }
1742 // microsoft visual "c" rounds instead of truncating... 2459 // microsoft visual "c" rounds instead of truncating...
1743 glColor4ub (MIN ((int)(r * 256.f), 255), 2460 glColor4f (r, g, b, a);
1744 MIN ((int)(g * 256.f), 255),
1745 MIN ((int)(b * 256.f), 255),
1746 MIN ((int)(a * 256.f), 255));
1747 2461
1748void glInterleavedArrays (int format, int stride, char *data) 2462void glInterleavedArrays (int format, int stride, char *data)
1749 2463
1750void glDrawElements (int mode, int count, int type, char *indices) 2464void glDrawElements (int mode, int count, int type, char *indices)
1751 2465
1793 2507
1794void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2508void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1795 2509
1796void glDrawPixels (int width, int height, int format, int type, char *pixels) 2510void glDrawPixels (int width, int height, int format, int type, char *pixels)
1797 2511
2512void glPixelZoom (float x, float y)
2513
1798void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2514void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1799 2515
1800int glGenTexture () 2516int glGenTexture ()
1801 CODE: 2517 CODE:
1802{ 2518 RETVAL = gen_texture ();
1803 GLuint name;
1804 glGenTextures (1, &name);
1805 RETVAL = name;
1806}
1807 OUTPUT: 2519 OUTPUT:
1808 RETVAL 2520 RETVAL
1809 2521
1810void glDeleteTexture (int name) 2522void glDeleteTexture (int name)
1811 CODE: 2523 CODE:
1812{
1813 GLuint name_ = name;
1814 glDeleteTextures (1, &name_); 2524 del_texture (name);
1815} 2525
1816
1817int glGenList () 2526int glGenList ()
1818 CODE: 2527 CODE:
1819 RETVAL = glGenLists (1); 2528 RETVAL = glGenLists (1);
1820 OUTPUT: 2529 OUTPUT:
1821 RETVAL 2530 RETVAL
1828 2537
1829void glEndList () 2538void glEndList ()
1830 2539
1831void glCallList (int list) 2540void glCallList (int list)
1832 2541
1833

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines