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.121 by root, Fri Jun 23 20:28:19 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"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 53
49#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
50 55
51#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
53 58
54#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;
55 68
56static struct 69static struct
57{ 70{
58#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
59#include "glfunc.h" 72#include "glfunc.h"
60#undef GL_FUNC 73#undef GL_FUNC
61} gl; 74} gl;
62 75
76static void
63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
64{ 78{
65 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
66 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
67 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
68 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69 else 83 else
70 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
71} 85}
72 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
73typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
74typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
75 119
76typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
77 121
78static int 122static int
79shape_attr_p (PangoLayoutRun *run) 123shape_attr_p (PangoLayoutRun *run)
80{ 124{
81 GSList *attrs = run->item->analysis.extra_attrs; 125 GSList *attrs = run->item->analysis.extra_attrs;
92 136
93 return 0; 137 return 0;
94} 138}
95 139
96typedef struct cf_layout { 140typedef struct cf_layout {
97 PangoLayout *pl; // either derived from a cairo or ft2 context 141 PangoLayout *pl;
98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
100 int base_height; 143 int base_height;
101 CFClient__Font font; 144 CFPlus__Font font;
102} *CFClient__Layout; 145} *CFPlus__Layout;
103 146
104static CFClient__Font default_font; 147static CFPlus__Font default_font;
105static PangoContext *ft2_context, *cairo_context; 148static PangoContext *opengl_context;
106static PangoFontMap *ft2_fontmap, *cairo_fontmap; 149static PangoFontMap *opengl_fontmap;
107 150
108static void 151static void
109substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
110{ 153{
111 FcPatternAddBool (pattern, FC_HINTING, 1); 154 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE 155#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif 157#endif
115#ifdef _WIN32
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
118 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
120} 159}
121 160
122static void 161static void
123layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
124{ 163{
125 /* 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
126 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
127 */ 166 */
128 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
132 171
133 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
134} 173}
135 174
136static void 175static void
137layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
139 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
140 182
141 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143 185
144 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
145} 187 if (!rect.height) rect.height = 1;
146 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
147typedef uint16_t mapface; 194typedef uint16_t faceid;
148 195
149typedef struct { 196typedef struct {
150 GLint name; 197 int name;
151 int w, h; 198 int w, h;
152 float s, t; 199 float s, t;
153 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
154} maptex; 203} maptex;
155 204
156typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
157 int16_t darkness; 208 uint16_t darkness;
158 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
159} mapcell; 210} mapcell;
160 211
161typedef struct { 212typedef struct {
162 int32_t c0, c1; 213 int32_t c0, c1;
163 mapcell *col; 214 mapcell *col;
164} maprow; 215} maprow;
165 216
166typedef struct map { 217typedef struct map {
167 int x, y, w, h; 218 int x, y, w, h;
168 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
169 int faces; 220 int faces; tileid *face2tile; // [faceid]
170 mapface *face; 221 int texs; maptex *tex; // [tileid]
171
172 int texs;
173 maptex *tex;
174 222
175 int32_t rows; 223 int32_t rows;
176 maprow *row; 224 maprow *row;
177} *CFClient__Map; 225} *CFPlus__Map;
178 226
179static char * 227static char *
180prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
181{ 229{
182 char *p; 230 char *p;
199} 247}
200 248
201#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))
202#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))
203 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
204static maprow * 272static maprow *
205map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
206{ 274{
207 if (0 > y) 275 if (0 > y)
208 { 276 {
209 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
210 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
248 316
249 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
250} 318}
251 319
252static mapcell * 320static mapcell *
253map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
254{ 322{
255 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
256} 324}
257 325
258static void 326static void
259map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
260{ 328{
261 int r; 329 int r;
262 330
263 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
264 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
272 self->row = 0; 340 self->row = 0;
273 self->rows = 0; 341 self->rows = 0;
274} 342}
275 343
276static void 344static void
277map_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)
278{ 346{
279 int x, y; 347 int x, y;
280 maprow *row; 348 maprow *row;
349 mapcell *cell;
281 350
282 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
283 if (y >= 0) 352 if (y >= 0)
284 { 353 {
285 if (y >= self->rows) 354 if (y >= self->rows)
291 if (x >= row->c0) 360 if (x >= row->c0)
292 { 361 {
293 if (x >= row->c1) 362 if (x >= row->c1)
294 break; 363 break;
295 364
296 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;
297 } 371 }
298 } 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);
299} 389}
300 390
301static void 391static void
302music_finished (void) 392music_finished (void)
303{ 393{
339 n |= n >> 16; 429 n |= n >> 16;
340 430
341 return n + 1; 431 return n + 1;
342} 432}
343 433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
437
344MODULE = CFClient PACKAGE = CFClient 438MODULE = CFPlus PACKAGE = CFPlus
345 439
346PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
347 441
348BOOT: 442BOOT:
349{ 443{
350 HV *stash = gv_stashpv ("CFClient", 1); 444 HV *stash = gv_stashpv ("CFPlus", 1);
351 static const struct { 445 static const struct {
352 const char *name; 446 const char *name;
353 IV iv; 447 IV iv;
354 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
355# 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
356 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
357 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
358 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
359 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
360 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
369 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
370 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
371 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
372 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
373 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
374 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
375 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
376 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
377 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
378 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
433 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
434 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
435 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
436 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
437 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
438 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
439 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
440 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
441 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
442 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
443 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
444 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
445 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
446 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
447 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
448 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
449 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
450 const_iv (KMOD_CTRL),
451 const_iv (KMOD_SHIFT),
452 const_iv (KMOD_ALT),
453 const_iv (KMOD_META)
454# undef const_iv 557# undef const_iv
455 }; 558 };
456 559
457 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; )
458 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);
459} 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
460 579
461NV floor (NV x) 580NV floor (NV x)
462 581
463NV ceil (NV x) 582NV ceil (NV x)
464 583
465void 584void
466pango_init () 585pango_init ()
467 CODE: 586 CODE:
468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{ 587{
470 {
471 ft2_fontmap = pango_ft2_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
472 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);
473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
477 cairo_fontmap = pango_cairo_font_map_get_default ();
478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
490} 591}
592
593char *
594SDL_GetError ()
491 595
492int 596int
493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494 598
495void 599void
496SDL_Quit () 600SDL_Quit ()
497 601
498void 602void
499SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
500 PPCODE: 604 PPCODE:
501{ 605{
502 SDL_Rect **m; 606 SDL_Rect **m;
503 607
504 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
505 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
506 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
507 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
508 612
509 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
510 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
511 615
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516 620
517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
518 622#if SDL_VERSION_ATLEAST(1,2,10)
519 SDL_EnableUNICODE (1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
521 626
522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
523 628
524 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
525 while (*m) 630 while (*m)
526 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
527 AV *av = newAV (); 634 AV *av = newAV ();
528 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
529 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));
530 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
531 641
532 ++m; 642 ++m;
533 } 643 }
534} 644}
535 645
536char *
537SDL_GetError ()
538
539int 646int
540SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
541 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
542 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
544 ); 660 );
661
545 if (RETVAL) 662 if (RETVAL)
546 { 663 {
664 av_clear (texture_av);
665
547 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548# 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);
549# include "glfunc.h" 668#include "glfunc.h"
550# undef GL_FUNC 669#undef GL_FUNC
551 } 670 }
671}
552 OUTPUT: 672 OUTPUT:
553 RETVAL 673 RETVAL
554 674
555void 675void
556SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
557 677
558char * 678char *
559SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
560 680
681int
682SDL_GetAppState ()
683
561void 684void
562SDL_PollEvent () 685poll_events ()
563 PPCODE: 686 PPCODE:
564{ 687{
565 SDL_Event ev; 688 SDL_Event ev;
566 689
567 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
568 { 692 {
569 HV *hv = newHV (); 693 HV *hv = newHV ();
570 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
571 695
572 switch (ev.type) 696 switch (ev.type)
574 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
575 case SDL_KEYUP: 699 case SDL_KEYUP:
576 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578 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 */
579 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580 break; 705 break;
581 706
582 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
584 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
585 break; 710 break;
586 711
587 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
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
590 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
591 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
592 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
593 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
594 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
595 break; 738 break;
596 739
597 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
598 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
609 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611 break; 754 break;
612 } 755 }
613 756
614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615 } 758 }
616} 759}
617 760
618int 761int
619Mix_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)
628Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
629 772
630void 773void
631lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
632 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
633#ifndef _WIN32 782#ifdef _WIN32
634 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 }
635#endif 804#endif
805}
636 806
637void 807void
638add_font (char *file) 808add_font (char *file)
639 CODE: 809 CODE:
640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641#ifdef _WIN32
642 // cairo... sigh... requires win2000
643 AddFontResourceEx (file, FR_PRIVATE, 0);
644#endif
645 811
646void 812void
647load_image_inline (SV *image_) 813load_image_inline (SV *image_)
648 ALIAS: 814 ALIAS:
649 load_image_file = 1 815 load_image_file = 1
691 857
692 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 858 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693 859
694 assert (surface2->pitch == surface2->w * 4); 860 assert (surface2->pitch == surface2->w * 4);
695 861
862 SDL_LockSurface (surface2);
696 EXTEND (SP, 5); 863 EXTEND (SP, 6);
697 PUSHs (sv_2mortal (newSViv (surface2->w))); 864 PUSHs (sv_2mortal (newSViv (surface2->w)));
698 PUSHs (sv_2mortal (newSViv (surface2->h))); 865 PUSHs (sv_2mortal (newSViv (surface2->h)));
699 SDL_LockSurface (surface2);
700 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 866 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701 SDL_UnlockSurface (surface2);
702 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)));
703 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 868 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 869 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
870 SDL_UnlockSurface (surface2);
705 871
706 SDL_FreeSurface (surface); 872 SDL_FreeSurface (surface);
707 SDL_FreeSurface (surface2); 873 SDL_FreeSurface (surface2);
708} 874}
709 875
748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749#endif 915#endif
750 _exit (1); 916 _exit (1);
751 917
752void 918void
753_exit (int retval) 919_exit (int retval = 0)
754 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
755 _exit (retval); 924 _exit (retval);
925#endif
756 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
757MODULE = CFClient PACKAGE = CFClient::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
758 937
759CFClient::Font 938CFPlus::Font
760new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
761 CODE: 940 CODE:
762{ 941{
763 int count; 942 int count;
764 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
767} 946}
768 OUTPUT: 947 OUTPUT:
769 RETVAL 948 RETVAL
770 949
771void 950void
772DESTROY (CFClient::Font self) 951DESTROY (CFPlus::Font self)
773 CODE: 952 CODE:
774 pango_font_description_free (self); 953 pango_font_description_free (self);
775 954
776void 955void
777make_default (CFClient::Font self) 956make_default (CFPlus::Font self)
778 CODE: 957 CODE:
779 default_font = self; 958 default_font = self;
780 959
781MODULE = CFClient PACKAGE = CFClient::Layout 960MODULE = CFPlus PACKAGE = CFPlus::Layout
782 961
783CFClient::Layout 962void
784new (SV *class, int rgba = 0) 963reset_glyph_cache ()
964 CODE:
965 tc_clear ();
966
967CFPlus::Layout
968new (SV *class)
785 CODE: 969 CODE:
786 New (0, RETVAL, 1, struct cf_layout); 970 New (0, RETVAL, 1, struct cf_layout);
787 971
788 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 972 RETVAL->pl = pango_layout_new (opengl_context);
789 RETVAL->rgba = rgba;
790 RETVAL->r = 1.; 973 RETVAL->r = 1.;
791 RETVAL->g = 1.; 974 RETVAL->g = 1.;
792 RETVAL->b = 1.; 975 RETVAL->b = 1.;
793 RETVAL->a = 1.; 976 RETVAL->a = 1.;
794 RETVAL->base_height = MIN_FONT_HEIGHT; 977 RETVAL->base_height = MIN_FONT_HEIGHT;
798 layout_update_font (RETVAL); 981 layout_update_font (RETVAL);
799 OUTPUT: 982 OUTPUT:
800 RETVAL 983 RETVAL
801 984
802void 985void
803DESTROY (CFClient::Layout self) 986DESTROY (CFPlus::Layout self)
804 CODE: 987 CODE:
805 g_object_unref (self->pl); 988 g_object_unref (self->pl);
806 Safefree (self); 989 Safefree (self);
807 990
808int
809is_rgba (CFClient::Layout self)
810 CODE:
811 RETVAL = self->rgba;
812 OUTPUT:
813 RETVAL
814
815void 991void
816set_text (CFClient::Layout self, SV *text_) 992set_text (CFPlus::Layout self, SV *text_)
817 CODE: 993 CODE:
818{ 994{
819 STRLEN textlen; 995 STRLEN textlen;
820 char *text = SvPVutf8 (text_, textlen); 996 char *text = SvPVutf8 (text_, textlen);
821 997
822 pango_layout_set_text (self->pl, text, textlen); 998 pango_layout_set_text (self->pl, text, textlen);
823} 999}
824 1000
825void 1001void
826set_markup (CFClient::Layout self, SV *text_) 1002set_markup (CFPlus::Layout self, SV *text_)
827 CODE: 1003 CODE:
828{ 1004{
829 STRLEN textlen; 1005 STRLEN textlen;
830 char *text = SvPVutf8 (text_, textlen); 1006 char *text = SvPVutf8 (text_, textlen);
831 1007
832 pango_layout_set_markup (self->pl, text, textlen); 1008 pango_layout_set_markup (self->pl, text, textlen);
833} 1009}
834 1010
835void 1011void
836set_shapes (CFClient::Layout self, ...) 1012set_shapes (CFPlus::Layout self, ...)
837 CODE: 1013 CODE:
838{ 1014{
839 PangoAttrList *attrs = 0; 1015 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl); 1016 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text; 1017 const char *pos = text;
842 int arg = 2; 1018 int arg = 4;
843 1019
844 while (arg < items && (pos = strstr (pos, OBJ_STR))) 1020 while (arg < items && (pos = strstr (pos, OBJ_STR)))
845 { 1021 {
846 PangoRectangle rect; 1022 PangoRectangle inkrect, rect;
847 PangoAttribute *attr; 1023 PangoAttribute *attr;
848 1024
1025 int x = SvIV (ST (arg - 3));
1026 int y = SvIV (ST (arg - 2));
849 int w = SvIV (ST (arg - 1)); 1027 int w = SvIV (ST (arg - 1));
850 int h = SvIV (ST (arg)); 1028 int h = SvIV (ST (arg ));
851 1029
852 arg += 2;
853
854 rect.x = 0; 1030 inkrect.x = 0;
1031 inkrect.y = 0;
1032 inkrect.width = 0;
1033 inkrect.height = 0;
1034
1035 rect.x = x * PANGO_SCALE;
855 rect.y = -h * PANGO_SCALE; 1036 rect.y = y * PANGO_SCALE;
856 rect.width = w * PANGO_SCALE; 1037 rect.width = w * PANGO_SCALE;
857 rect.height = h * PANGO_SCALE; 1038 rect.height = h * PANGO_SCALE;
858 1039
859 if (!attrs) 1040 if (!attrs)
860 attrs = pango_layout_get_attributes (self->pl); 1041 attrs = pango_layout_get_attributes (self->pl);
861 1042
862 attr = pango_attr_shape_new (&rect, &rect); 1043 attr = pango_attr_shape_new (&inkrect, &rect);
863 attr->start_index = pos - text; 1044 attr->start_index = pos - text;
864 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1; 1045 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865 pango_attr_list_insert (attrs, attr); 1046 pango_attr_list_insert (attrs, attr);
866 1047
1048 arg += 4;
867 pos += sizeof (OBJ_STR) - 1; 1049 pos += sizeof (OBJ_STR) - 1;
868 } 1050 }
869 1051
870 if (attrs) 1052 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs); 1053 pango_layout_set_attributes (self->pl, attrs);
872} 1054}
873 1055
874void 1056void
875get_shapes (CFClient::Layout self) 1057get_shapes (CFPlus::Layout self)
876 PPCODE: 1058 PPCODE:
877{ 1059{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879 1061
880 do 1062 do
884 if (run && shape_attr_p (run)) 1066 if (run && shape_attr_p (run))
885 { 1067 {
886 PangoRectangle extents; 1068 PangoRectangle extents;
887 pango_layout_iter_get_run_extents (iter, 0, &extents); 1069 pango_layout_iter_get_run_extents (iter, 0, &extents);
888 1070
1071 EXTEND (SP, 2);
889 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1072 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1073 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891 } 1074 }
892 } 1075 }
893 while (pango_layout_iter_next_run (iter)); 1076 while (pango_layout_iter_next_run (iter));
894 1077
895 pango_layout_iter_free (iter); 1078 pango_layout_iter_free (iter);
896} 1079}
897 1080
898int 1081int
899has_wrapped (CFClient::Layout self) 1082has_wrapped (CFPlus::Layout self)
900 CODE: 1083 CODE:
901{ 1084{
902 int lines = 1; 1085 int lines = 1;
903 const char *text = pango_layout_get_text (self->pl); 1086 const char *text = pango_layout_get_text (self->pl);
904 1087
909} 1092}
910 OUTPUT: 1093 OUTPUT:
911 RETVAL 1094 RETVAL
912 1095
913SV * 1096SV *
914get_text (CFClient::Layout self) 1097get_text (CFPlus::Layout self)
915 CODE: 1098 CODE:
916 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917 sv_utf8_decode (RETVAL); 1100 sv_utf8_decode (RETVAL);
918 OUTPUT: 1101 OUTPUT:
919 RETVAL 1102 RETVAL
920 1103
921void 1104void
922set_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.)
923 CODE: 1106 CODE:
924 self->r = r; 1107 self->r = r;
925 self->g = g; 1108 self->g = g;
926 self->b = b; 1109 self->b = b;
927 self->a = a; 1110 self->a = a;
928 1111
929void 1112void
930set_font (CFClient::Layout self, CFClient::Font font = 0) 1113set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931 CODE: 1114 CODE:
932 if (self->font != font) 1115 if (self->font != font)
933 { 1116 {
934 self->font = font; 1117 self->font = font;
935 layout_update_font (self); 1118 layout_update_font (self);
936 } 1119 }
937 1120
938void 1121void
939set_height (CFClient::Layout self, int base_height) 1122set_height (CFPlus::Layout self, int base_height)
940 CODE: 1123 CODE:
941 if (self->base_height != base_height) 1124 if (self->base_height != base_height)
942 { 1125 {
943 self->base_height = base_height; 1126 self->base_height = base_height;
944 layout_update_font (self); 1127 layout_update_font (self);
945 } 1128 }
946 1129
947void 1130void
948set_width (CFClient::Layout self, int max_width = -1) 1131set_width (CFPlus::Layout self, int max_width = -1)
949 CODE: 1132 CODE:
950 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);
951 1134
952void 1135void
953set_indent (CFClient::Layout self, int indent) 1136set_indent (CFPlus::Layout self, int indent)
954 CODE: 1137 CODE:
955 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956 1139
957void 1140void
958set_spacing (CFClient::Layout self, int spacing) 1141set_spacing (CFPlus::Layout self, int spacing)
959 CODE: 1142 CODE:
960 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961 1144
962void 1145void
963set_ellipsise (CFClient::Layout self, int ellipsise) 1146set_ellipsise (CFPlus::Layout self, int ellipsise)
964 CODE: 1147 CODE:
965 pango_layout_set_ellipsize (self->pl, 1148 pango_layout_set_ellipsize (self->pl,
966 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START
967 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
969 : PANGO_ELLIPSIZE_NONE 1152 : PANGO_ELLIPSIZE_NONE
970 ); 1153 );
971 1154
972void 1155void
973set_single_paragraph_mode (CFClient::Layout self, int spm) 1156set_single_paragraph_mode (CFPlus::Layout self, int spm)
974 CODE: 1157 CODE:
975 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976 1159
977void 1160void
978size (CFClient::Layout self) 1161size (CFPlus::Layout self)
979 PPCODE: 1162 PPCODE:
980{ 1163{
981 int w, h; 1164 int w, h;
982 1165
983 layout_get_pixel_size (self, &w, &h); 1166 layout_get_pixel_size (self, &w, &h);
986 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (w)));
987 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (h)));
988} 1171}
989 1172
990int 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
991xy_to_index (CFClient::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1187 CODE:
993{ 1188{
994 int index, trailing; 1189 int index, trailing;
995 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);
996 RETVAL = index; 1191 RETVAL = index + trailing;
997} 1192}
998 OUTPUT: 1193 OUTPUT:
999 RETVAL 1194 RETVAL
1000 1195
1001void 1196void
1002cursor_pos (CFClient::Layout self, int index) 1197cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1198 PPCODE:
1004{ 1199{
1005 PangoRectangle strong_pos; 1200 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1202
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1207}
1013 1208
1014void 1209void
1015render (CFClient::Layout self) 1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1016 PPCODE: 1211 PPCODE:
1017{ 1212{
1018 SV *retval; 1213 int line, x;
1019 int w, h;
1020 1214
1021 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 */
1022 1217
1023 if (self->rgba)
1024 {
1025 cairo_surface_t *surface;
1026 cairo_t *cairo;
1027
1028 retval = newSV (w * h * 4);
1029 SvPOK_only (retval);
1030 SvCUR_set (retval, w * h * 4);
1031
1032 memset (SvPVX (retval), 0, w * h * 4);
1033
1034 surface = cairo_image_surface_create_for_data (
1035 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1036 cairo = cairo_create (surface);
1037 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039 pango_cairo_show_layout (cairo, self->pl);
1040
1041 cairo_destroy (cairo);
1042 cairo_surface_destroy (surface);
1043
1044 // what a mess, and its premultiplied, too :(
1045 {
1046 uint32_t *p = (uint32_t *)SvPVX (retval);
1047 uint32_t *e = p + w * h;
1048
1049 while (p < e)
1050 {
1051 uint32_t rgba = *p;
1052 rgba = (rgba >> 24) | (rgba << 8);
1053#if 0
1054#ifdef _WIN32
1055 {//D
1056 uint8_t r = rgba >> 24;
1057 uint8_t g = rgba >> 16;
1058 uint8_t b = rgba >> 8;
1059 uint8_t a = rgba >> 0;
1060
1061 rgba = (rgba & 0xffffff00) | a;
1062 }
1063#endif
1064#endif
1065 rgba = SDL_SwapBE32 (rgba);
1066 *p++ = rgba;
1067 }
1068 }
1069
1070 EXTEND (SP, 5); 1218 EXTEND (SP, 2);
1071 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)
1072 PUSHs (sv_2mortal (newSViv (h))); 1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1073 PUSHs (sv_2mortal (retval));
1074 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 }
1077 else 1241 else
1078 { 1242 {
1079 FT_Bitmap bitmap;
1080
1081 retval = newSV (w * h);
1082 SvPOK_only (retval);
1083 SvCUR_set (retval, w * h);
1084
1085 bitmap.rows = h;
1086 bitmap.width = w;
1087 bitmap.pitch = w;
1088 bitmap.buffer = (unsigned char*)SvPVX (retval);
1089 bitmap.num_grays = 256;
1090 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092 memset (bitmap.buffer, 0, w * h);
1093
1094 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096 EXTEND (SP, 5);
1097 PUSHs (sv_2mortal (newSViv (w))); 1243 PUSHs (sv_2mortal (newSViv (index)));
1098 PUSHs (sv_2mortal (newSViv (h))); 1244 PUSHs (sv_2mortal (newSViv (trailing)));
1099 PUSHs (sv_2mortal (retval));
1100 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102 } 1245 }
1103} 1246}
1104 1247
1105MODULE = CFClient PACKAGE = CFClient::Texture
1106
1107void 1248void
1108pad2pot (SV *data_, SV *w_, SV *h_) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1109 CODE: 1250 PPCODE:
1110{ 1251 pango_opengl_render_layout_subpixel (
1111 int ow = SvIV (w_); 1252 self->pl,
1112 int oh = SvIV (h_); 1253 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a,
1255 flags
1256 );
1113 1257
1114 if (ow && oh) 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1259
1260int minpot (int n)
1261
1262void
1263pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE:
1265{
1266 if ((nw != ow || nh != oh) && SvOK (data_))
1115 { 1267 {
1116 int nw = minpot (ow);
1117 int nh = minpot (oh);
1118
1119 if (nw != ow || nh != oh)
1120 {
1121 if (SvOK (data_))
1122 {
1123 STRLEN datalen; 1268 STRLEN datalen;
1124 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1125 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1126 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1127 1272
1128 SvPOK_only (result_); 1273 SvPOK_only (result_);
1129 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1130 1275
1131 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1132 while (oh--) 1277 while (oh--)
1133 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1278 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1134 1279
1135 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1136 }
1137
1138 sv_setiv (w_, nw);
1139 sv_setiv (h_, nh);
1140 }
1141 } 1281 }
1142} 1282}
1143 1283
1144void 1284void
1145draw_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.)
1188 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1189 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1190 } 1330 }
1191} 1331}
1192 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
1193MODULE = CFClient PACKAGE = CFClient::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1194 1345
1195CFClient::Map 1346CFPlus::Map
1196new (SV *class, int map_width, int map_height) 1347new (SV *class)
1197 CODE: 1348 CODE:
1198 New (0, RETVAL, 1, struct map); 1349 New (0, RETVAL, 1, struct map);
1199 RETVAL->x = 0; 1350 RETVAL->x = 0;
1200 RETVAL->y = 0; 1351 RETVAL->y = 0;
1201 RETVAL->w = map_width; 1352 RETVAL->w = 0;
1202 RETVAL->h = map_height; 1353 RETVAL->h = 0;
1203 RETVAL->ox = 0; 1354 RETVAL->ox = 0;
1204 RETVAL->oy = 0; 1355 RETVAL->oy = 0;
1205 RETVAL->faces = 8192; 1356 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1206 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1357 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1207 RETVAL->texs = 8192;
1208 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1209 RETVAL->rows = 0; 1358 RETVAL->rows = 0;
1210 RETVAL->row = 0; 1359 RETVAL->row = 0;
1211 OUTPUT: 1360 OUTPUT:
1212 RETVAL 1361 RETVAL
1213 1362
1214void 1363void
1215DESTROY (CFClient::Map self) 1364DESTROY (CFPlus::Map self)
1216 CODE: 1365 CODE:
1217{ 1366{
1218 map_clear (self); 1367 map_clear (self);
1219 Safefree (self->face); 1368 Safefree (self->face2tile);
1220 Safefree (self->tex); 1369 Safefree (self->tex);
1221 Safefree (self); 1370 Safefree (self);
1222} 1371}
1223 1372
1224void 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
1225clear (CFClient::Map self) 1380clear (CFPlus::Map self)
1226 CODE: 1381 CODE:
1227 map_clear (self); 1382 map_clear (self);
1228 1383
1229void 1384void
1230set_face (CFClient::Map self, int face, int texid) 1385set_tileid (CFPlus::Map self, int face, int tile)
1231 CODE: 1386 CODE:
1232{ 1387{
1233 while (self->faces <= face) 1388 need_facenum (self, face); self->face2tile [face] = tile;
1234 { 1389 need_texid (self, tile);
1235 Append (mapface, self->face, self->faces, self->faces);
1236 self->faces *= 2;
1237 }
1238
1239 self->face [face] = texid;
1240} 1390}
1241 1391
1242void 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
1243set_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)
1244 CODE: 1417 CODE:
1245{ 1418{
1246 while (self->texs <= texid) 1419 need_texid (self, texid);
1247 {
1248 Append (maptex, self->tex, self->texs, self->texs);
1249 self->texs *= 2;
1250 }
1251 1420
1252 { 1421 {
1253 maptex *tex = self->tex + texid; 1422 maptex *tex = self->tex + texid;
1254 1423
1255 tex->name = name; 1424 tex->name = name;
1272 // from transparent color bleeding and ugly wrapping effects. 1441 // from transparent color bleeding and ugly wrapping effects.
1273 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274} 1443}
1275 1444
1276int 1445int
1277ox (CFClient::Map self) 1446ox (CFPlus::Map self)
1278 ALIAS: 1447 ALIAS:
1279 oy = 1 1448 oy = 1
1280 x = 2 1449 x = 2
1281 y = 3 1450 y = 3
1282 w = 4 1451 w = 4
1293 } 1462 }
1294 OUTPUT: 1463 OUTPUT:
1295 RETVAL 1464 RETVAL
1296 1465
1297void 1466void
1298scroll (CFClient::Map self, int dx, int dy) 1467scroll (CFPlus::Map self, int dx, int dy)
1299 CODE: 1468 CODE:
1300{ 1469{
1301 if (dx > 0) 1470 if (dx > 0)
1302 map_blank (self, self->x, self->y, dx - 1, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1303 else if (dx < 0) 1472 else if (dx < 0)
1304 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);
1305 1474
1306 if (dy > 0) 1475 if (dy > 0)
1307 map_blank (self, self->x, self->y, self->w, dy - 1); 1476 map_blank (self, self->x, self->y, self->w, dy);
1308 else if (dy < 0) 1477 else if (dy < 0)
1309 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);
1310 1479
1311 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1312 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1313 1482
1314 while (self->y < 0) 1483 while (self->y < 0)
1319 self->y += MAP_EXTEND_Y; 1488 self->y += MAP_EXTEND_Y;
1320 } 1489 }
1321} 1490}
1322 1491
1323void 1492void
1324map1a_update (CFClient::Map self, SV *data_) 1493map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325 CODE: 1494 CODE:
1326{ 1495{
1327 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1328 uint8_t *data_end = (uint8_t *)SvEND (data_); 1497 uint8_t *data_end = (uint8_t *)SvEND (data_);
1329 mapcell *cell; 1498 mapcell *cell;
1330 int x, y, flags; 1499 int x, y, flags;
1331 1500
1332 while (data < data_end) 1501 while (data < data_end - 1)
1333 { 1502 {
1334 flags = (data [0] << 8) + data [1]; data += 2; 1503 flags = (data [0] << 8) + data [1]; data += 2;
1335 1504
1336 x = self->x + ((flags >> 10) & 63); 1505 x = self->x + ((flags >> 10) & 63);
1337 y = self->y + ((flags >> 4) & 63); 1506 y = self->y + ((flags >> 4) & 63);
1338 1507
1339 cell = map_get_cell (self, x, y); 1508 cell = map_get_cell (self, x, y);
1340 1509
1341 if (flags & 15) 1510 if (flags & 15)
1342 { 1511 {
1343 if (cell->darkness < 0) 1512 if (!cell->darkness)
1344 { 1513 {
1514 memset (cell, 0, sizeof (*cell));
1345 cell->darkness = 0; 1515 cell->darkness = 256;
1346 cell->face [0] = 0;
1347 cell->face [1] = 0;
1348 cell->face [2] = 0;
1349 } 1516 }
1350 1517
1351 cell->darkness = flags & 8 ? *data++ : 255;
1352
1353 //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 }
1354 1559
1355 if (flags & 4) 1560 if (flags & 4)
1356 { 1561 {
1357 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];
1358 } 1565 }
1359 1566
1360 if (flags & 2) 1567 if (flags & 2)
1361 { 1568 {
1362 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];
1363 } 1572 }
1364 1573
1365 if (flags & 1) 1574 if (flags & 1)
1366 { 1575 {
1367 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];
1368 } 1579 }
1369 } 1580 }
1370 else 1581 else
1371 cell->darkness = -1; 1582 cell->darkness = 0;
1372 } 1583 }
1373} 1584}
1374 1585
1375SV * 1586SV *
1376mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377 CODE: 1588 CODE:
1378{ 1589{
1379 int x1, x; 1590 int x1, x;
1380 int y1, y; 1591 int y1, y;
1381 int z; 1592 int z;
1402 { 1613 {
1403 mapcell *cell = row->col + (x - row->c0); 1614 mapcell *cell = row->col + (x - row->c0);
1404 1615
1405 for (z = 0; z <= 0; z++) 1616 for (z = 0; z <= 0; z++)
1406 { 1617 {
1407 mapface face = cell->face [z];
1408
1409 if (face)
1410 {
1411 maptex tex = self->tex [face]; 1618 maptex tex = self->tex [cell->tile [z]];
1412 int a0 = 255 - tex.a; 1619 int a0 = 255 - tex.a;
1413 int a1 = tex.a; 1620 int a1 = tex.a;
1414 1621
1415 r = (r * a0 + tex.r * a1) / 255; 1622 r = (r * a0 + tex.r * a1) / 255;
1416 g = (g * a0 + tex.g * a1) / 255; 1623 g = (g * a0 + tex.g * a1) / 255;
1417 b = (b * a0 + tex.b * a1) / 255; 1624 b = (b * a0 + tex.b * a1) / 255;
1418 a = (a * a0 + tex.a * a1) / 255; 1625 a = (a * a0 + tex.a * a1) / 255;
1419 }
1420 } 1626 }
1421 } 1627 }
1422 1628
1423 *map++ = (r ) 1629 *map++ = (r )
1424 | (g << 8) 1630 | (g << 8)
1431} 1637}
1432 OUTPUT: 1638 OUTPUT:
1433 RETVAL 1639 RETVAL
1434 1640
1435void 1641void
1436draw (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)
1437 CODE: 1643 CODE:
1438{ 1644{
1439 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;
1440 int x, y, z; 1649 int x, y, z;
1441 int last_name; 1650 int last_name;
1442 mapface face;
1443 1651
1444 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1652 // thats current max. sorry.
1445 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1653 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255;
1446 1655
1447 /* 1656 // clear key, in case of extra padding
1448 int vx = self->vx = self->w >= sw 1657 memset (&skey, 0, sizeof (skey));
1449 ? self->x + (self->w - sw) / 2
1450 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1451
1452 int vy = self->vy = self->h >= sh
1453 ? self->y + (self->h - sh) / 2
1454 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1455 */
1456 1658
1457 glColor4ub (255, 255, 255, 255); 1659 glColor4ub (255, 255, 255, 255);
1458 1660
1459 glEnable (GL_BLEND); 1661 glEnable (GL_BLEND);
1460 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1463 1665
1464 glBegin (GL_QUADS); 1666 glBegin (GL_QUADS);
1465 1667
1466 last_name = 0; 1668 last_name = 0;
1467 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
1468 for (z = 0; z < 3; z++) 1695 for (z = 0; z <= 2; z++)
1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1469 for (y = 0; y < sh; y++) 1699 for (y = 0; y < sh; y++)
1470 if (0 <= y + vy && y + vy < self->rows) 1700 if (0 <= y + my && y + my < self->rows)
1471 { 1701 {
1472 maprow *row = self->row + (y + vy); 1702 maprow *row = self->row + (y + my);
1473 1703
1474 for (x = 0; x < sw; x++) 1704 for (x = 0; x < sw; x++)
1475 if (row->c0 <= x + vx && x + vx < row->c1) 1705 if (row->c0 <= x + mx && x + mx < row->c1)
1476 { 1706 {
1477 mapcell *cell = row->col + (x + vx - row->c0); 1707 mapcell *cell = row->col + (x + mx - row->c0);
1478
1479 face = cell->face [z]; 1708 tileid tile = cell->tile [z];
1480 1709
1481 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))
1482 { 1805 {
1483 maptex tex = self->tex [face]; 1806 int level = (w << 5) | b;
1807 HE *he;
1484 1808
1485 int px = (x + 1) * 32 - tex.w; 1809 hv_iterinit (smooth);
1486 int py = (y + 1) * 32 - tex.h; 1810 while ((he = hv_iternext (smooth)))
1487
1488 if (last_name != tex.name)
1489 { 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
1490 glEnd (); 1834 glEnd ();
1491 last_name = tex.name;
1492 glBindTexture (GL_TEXTURE_2D, last_name); 1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493 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 }
1494 } 1859 }
1495
1496 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1497 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1498 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1499 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1500 } 1860 }
1501 }
1502 } 1861 }
1862 }
1863
1864 hv_clear (smooth);
1865 }
1503 1866
1504 glEnd (); 1867 glEnd ();
1505 1868
1506 glDisable (GL_TEXTURE_2D); 1869 glDisable (GL_TEXTURE_2D);
1507 glDisable (GL_BLEND); 1870 glDisable (GL_BLEND);
1508}
1509 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
1510void 1904void
1511draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512 CODE: 1906 CODE:
1513{ 1907{
1514 static float color[16][3] = { 1908 static float color[16][3] = {
1515 { 0.00, 0.00, 0.00 }, 1909 { 0.00F, 0.00F, 0.00F },
1516 { 1.00, 1.00, 1.00 }, 1910 { 1.00F, 1.00F, 1.00F },
1517 { 0.00, 0.00, 0.55 }, 1911 { 0.00F, 0.00F, 0.55F },
1518 { 1.00, 0.00, 0.00 }, 1912 { 1.00F, 0.00F, 0.00F },
1519 1913
1520 { 1.00, 0.54, 0.00 }, 1914 { 1.00F, 0.54F, 0.00F },
1521 { 0.11, 0.56, 1.00 }, 1915 { 0.11F, 0.56F, 1.00F },
1522 { 0.93, 0.46, 0.00 }, 1916 { 0.93F, 0.46F, 0.00F },
1523 { 0.18, 0.54, 0.34 }, 1917 { 0.18F, 0.54F, 0.34F },
1524 1918
1525 { 0.56, 0.73, 0.56 }, 1919 { 0.56F, 0.73F, 0.56F },
1526 { 0.80, 0.80, 0.80 }, 1920 { 0.80F, 0.80F, 0.80F },
1527 { 0.55, 0.41, 0.13 }, 1921 { 0.55F, 0.41F, 0.13F },
1528 { 0.99, 0.77, 0.26 }, 1922 { 0.99F, 0.77F, 0.26F },
1529 1923
1530 { 0.74, 0.65, 0.41 }, 1924 { 0.74F, 0.65F, 0.41F },
1531 1925
1532 { 0.00, 1.00, 1.00 }, 1926 { 0.00F, 1.00F, 1.00F },
1533 { 1.00, 0.00, 1.00 }, 1927 { 1.00F, 0.00F, 1.00F },
1534 { 1.00, 1.00, 0.00 }, 1928 { 1.00F, 1.00F, 0.00F },
1535 }; 1929 };
1536 1930
1537 int x, y; 1931 int x, y;
1538 1932
1539 glEnable (GL_TEXTURE_2D); 1933 glEnable (GL_TEXTURE_2D);
1566 glDisable (GL_BLEND); 1960 glDisable (GL_BLEND);
1567 glDisable (GL_TEXTURE_2D); 1961 glDisable (GL_TEXTURE_2D);
1568} 1962}
1569 1963
1570void 1964void
1571fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1572 PPCODE: 1966 PPCODE:
1573{ 1967{
1574 int vx, vy;
1575 int x, y; 1968 int x, y;
1576 int sw4 = (sw + 3) & ~3; 1969 int sw4 = (sw + 3) & ~3;
1577 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1578 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1579 1972
1580 memset (darkness, 255, sw4 * sh); 1973 memset (darkness, 255, sw4 * sh);
1581 SvPOK_only (darkness_sv); 1974 SvPOK_only (darkness_sv);
1582 SvCUR_set (darkness_sv, sw4 * sh); 1975 SvCUR_set (darkness_sv, sw4 * sh);
1583 1976
1584 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1977 mx += self->x;
1585 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1978 my += self->y;
1586 1979
1587 for (y = 0; y < sh; y++) 1980 for (y = 0; y < sh; y++)
1588 if (0 <= y + vy && y + vy < self->rows) 1981 if (0 <= y + my && y + my < self->rows)
1589 { 1982 {
1590 maprow *row = self->row + (y + vy); 1983 maprow *row = self->row + (y + my);
1591 1984
1592 for (x = 0; x < sw; x++) 1985 for (x = 0; x < sw; x++)
1593 if (row->c0 <= x + vx && x + vx < row->c1) 1986 if (row->c0 <= x + mx && x + mx < row->c1)
1594 { 1987 {
1595 mapcell *cell = row->col + (x + vx - row->c0); 1988 mapcell *cell = row->col + (x + mx - row->c0);
1596 1989
1597 darkness[y * sw4 + x] = cell->darkness < 0 1990 darkness[y * sw4 + x] = cell->darkness
1991 ? 255 - (cell->darkness - 1)
1598 ? 255 - FOW_DARKNESS 1992 : 255 - FOW_DARKNESS;
1599 : 255 - cell->darkness;
1600 } 1993 }
1601 } 1994 }
1995
1996 if (smoothing)
1997 {
1998 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
1999 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2000
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)
2013 {
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2018 }
2019
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2021 }
2022
2023 darkness_sv = darkness2_sv;
2024 }
1602 2025
1603 EXTEND (SP, 3); 2026 EXTEND (SP, 3);
1604 PUSHs (sv_2mortal (newSViv (sw4))); 2027 PUSHs (sv_2mortal (newSViv (sw4)));
1605 PUSHs (sv_2mortal (newSViv (sh))); 2028 PUSHs (sv_2mortal (newSViv (sh)));
1606 PUSHs (darkness_sv); 2029 PUSHs (darkness_sv);
1607} 2030}
1608 2031
1609SV * 2032SV *
1610get_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)
1611 CODE: 2034 CODE:
1612{ 2035{
1613 int x, y, x1, y1; 2036 int x, y, x1, y1;
1614 SV *data_sv = newSV (w * h * 7 + 5); 2037 SV *data_sv = newSV (w * h * 7 + 5);
1615 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2038 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1640 if (row && row->c0 <= x && x < row->c1) 2063 if (row && row->c0 <= x && x < row->c1)
1641 { 2064 {
1642 mapcell *cell = row->col + (x - row->c0); 2065 mapcell *cell = row->col + (x - row->c0);
1643 uint8_t flags = 0; 2066 uint8_t flags = 0;
1644 2067
1645 if (cell->face [0]) flags |= 1; 2068 if (cell->tile [0]) flags |= 1;
1646 if (cell->face [1]) flags |= 2; 2069 if (cell->tile [1]) flags |= 2;
1647 if (cell->face [2]) flags |= 4; 2070 if (cell->tile [2]) flags |= 4;
1648 2071
1649 *data++ = flags; 2072 *data++ = flags;
1650 2073
1651 if (flags & 1) 2074 if (flags & 1)
1652 { 2075 {
2076 tileid tile = cell->tile [0];
1653 *data++ = cell->face [0] >> 8; 2077 *data++ = tile >> 8;
1654 *data++ = cell->face [0]; 2078 *data++ = tile;
1655 } 2079 }
1656 2080
1657 if (flags & 2) 2081 if (flags & 2)
1658 { 2082 {
2083 tileid tile = cell->tile [1];
1659 *data++ = cell->face [1] >> 8; 2084 *data++ = tile >> 8;
1660 *data++ = cell->face [1]; 2085 *data++ = tile;
1661 } 2086 }
1662 2087
1663 if (flags & 4) 2088 if (flags & 4)
1664 { 2089 {
2090 tileid tile = cell->tile [2];
1665 *data++ = cell->face [2] >> 8; 2091 *data++ = tile >> 8;
1666 *data++ = cell->face [2]; 2092 *data++ = tile;
1667 } 2093 }
1668 } 2094 }
1669 else 2095 else
1670 *data++ = 0; 2096 *data++ = 0;
1671 } 2097 }
1677} 2103}
1678 OUTPUT: 2104 OUTPUT:
1679 RETVAL 2105 RETVAL
1680 2106
1681void 2107void
1682set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2108set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683 PPCODE: 2109 PPCODE:
1684{ 2110{
1685 int x, y, z; 2111 int x, y, z;
1686 int w, h; 2112 int w, h;
1687 int x1, y1; 2113 int x1, y1;
1711 { 2137 {
1712 uint8_t flags = *data++; 2138 uint8_t flags = *data++;
1713 2139
1714 if (flags) 2140 if (flags)
1715 { 2141 {
1716 mapface face[3] = { 0, 0, 0 };
1717
1718 mapcell *cell = row_get_cell (row, x); 2142 mapcell *cell = row_get_cell (row, x);
2143 tileid tile[3] = { 0, 0, 0 };
1719 2144
1720 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2145 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1721 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2146 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1722 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2147 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1723 2148
1724 if (cell->darkness <= 0) 2149 if (cell->darkness == 0)
1725 { 2150 {
1726 cell->darkness = -1; 2151 cell->darkness = 0;
1727 2152
1728 for (z = 0; z <= 2; z++) 2153 for (z = 0; z <= 2; z++)
1729 { 2154 {
1730 cell->face[z] = face[z]; 2155 tileid t = tile [z];
1731 2156
1732 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2157 if (t >= self->texs || (t && !self->tex [t].name))
2158 {
1733 XPUSHs (sv_2mortal (newSViv (face[z]))); 2159 XPUSHs (sv_2mortal (newSViv (t)));
2160 need_texid (self, t);
2161 }
2162
2163 cell->tile [z] = t;
1734 } 2164 }
1735 } 2165 }
1736 } 2166 }
1737 } 2167 }
1738 } 2168 }
1739} 2169}
1740 2170
1741MODULE = CFClient PACKAGE = CFClient::MixChunk 2171MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742 2172
1743CFClient::MixChunk 2173CFPlus::MixChunk
1744new_from_file (SV *class, char *path) 2174new_from_file (SV *class, char *path)
1745 CODE: 2175 CODE:
1746 RETVAL = Mix_LoadWAV (path); 2176 RETVAL = Mix_LoadWAV (path);
1747 OUTPUT: 2177 OUTPUT:
1748 RETVAL 2178 RETVAL
1749 2179
1750void 2180void
1751DESTROY (CFClient::MixChunk self) 2181DESTROY (CFPlus::MixChunk self)
1752 CODE: 2182 CODE:
1753 Mix_FreeChunk (self); 2183 Mix_FreeChunk (self);
1754 2184
1755int 2185int
1756volume (CFClient::MixChunk self, int volume = -1) 2186volume (CFPlus::MixChunk self, int volume = -1)
1757 CODE: 2187 CODE:
1758 RETVAL = Mix_VolumeChunk (self, volume); 2188 RETVAL = Mix_VolumeChunk (self, volume);
1759 OUTPUT: 2189 OUTPUT:
1760 RETVAL 2190 RETVAL
1761 2191
1762int 2192int
1763play (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)
1764 CODE: 2194 CODE:
1765 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2195 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766 OUTPUT: 2196 OUTPUT:
1767 RETVAL 2197 RETVAL
1768 2198
1769MODULE = CFClient PACKAGE = CFClient::MixMusic 2199MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770 2200
1771int 2201int
1772volume (int volume = -1) 2202volume (int volume = -1)
1773 CODE: 2203 CODE:
1774 RETVAL = Mix_VolumeMusic (volume); 2204 RETVAL = Mix_VolumeMusic (volume);
1775 OUTPUT: 2205 OUTPUT:
1776 RETVAL 2206 RETVAL
1777 2207
2208int
2209fade_out (int ms)
2210 CODE:
2211 RETVAL = Mix_FadeOutMusic (ms);
2212 OUTPUT:
2213 RETVAL
2214
1778CFClient::MixMusic 2215CFPlus::MixMusic
1779new_from_file (SV *class, char *path) 2216new_from_file (SV *class, char *path)
1780 CODE: 2217 CODE:
1781 RETVAL = Mix_LoadMUS (path); 2218 RETVAL = Mix_LoadMUS (path);
1782 OUTPUT: 2219 OUTPUT:
1783 RETVAL 2220 RETVAL
1784 2221
1785void 2222void
1786DESTROY (CFClient::MixMusic self) 2223DESTROY (CFPlus::MixMusic self)
1787 CODE: 2224 CODE:
1788 Mix_FreeMusic (self); 2225 Mix_FreeMusic (self);
1789 2226
1790int 2227int
1791play (CFClient::MixMusic self, int loops = -1) 2228play (CFPlus::MixMusic self, int loops = -1)
1792 CODE: 2229 CODE:
1793 RETVAL = Mix_PlayMusic (self, loops); 2230 RETVAL = Mix_PlayMusic (self, loops);
1794 OUTPUT: 2231 OUTPUT:
1795 RETVAL 2232 RETVAL
1796 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
1797MODULE = CFClient PACKAGE = CFClient::OpenGL 2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798 2242
1799BOOT: 2243BOOT:
1800{ 2244{
1801 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2245 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802 static const struct { 2246 static const struct {
1803 const char *name; 2247 const char *name;
1804 IV iv; 2248 IV iv;
1805 } *civ, const_iv[] = { 2249 } *civ, const_iv[] = {
1806# 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),
1807 const_iv (GL_COLOR_MATERIAL), 2254 const_iv (GL_COLOR_MATERIAL),
1808 const_iv (GL_SMOOTH), 2255 const_iv (GL_SMOOTH),
1809 const_iv (GL_FLAT), 2256 const_iv (GL_FLAT),
1810 const_iv (GL_DITHER), 2257 const_iv (GL_DITHER),
1811 const_iv (GL_BLEND), 2258 const_iv (GL_BLEND),
1838 const_iv (GL_LUMINANCE), 2285 const_iv (GL_LUMINANCE),
1839 const_iv (GL_LUMINANCE_ALPHA), 2286 const_iv (GL_LUMINANCE_ALPHA),
1840 const_iv (GL_FLOAT), 2287 const_iv (GL_FLOAT),
1841 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1842 const_iv (GL_COMPILE), 2289 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D),
1843 const_iv (GL_TEXTURE_1D), 2292 const_iv (GL_TEXTURE_1D),
1844 const_iv (GL_TEXTURE_2D), 2293 const_iv (GL_TEXTURE_2D),
1845 const_iv (GL_TEXTURE_ENV), 2294 const_iv (GL_TEXTURE_ENV),
1846 const_iv (GL_TEXTURE_MAG_FILTER), 2295 const_iv (GL_TEXTURE_MAG_FILTER),
1847 const_iv (GL_TEXTURE_MIN_FILTER), 2296 const_iv (GL_TEXTURE_MIN_FILTER),
1869 const_iv (GL_SEPARABLE_2D), 2318 const_iv (GL_SEPARABLE_2D),
1870 const_iv (GL_CONVOLUTION_2D), 2319 const_iv (GL_CONVOLUTION_2D),
1871 const_iv (GL_CONVOLUTION_BORDER_MODE), 2320 const_iv (GL_CONVOLUTION_BORDER_MODE),
1872 const_iv (GL_CONSTANT_BORDER), 2321 const_iv (GL_CONSTANT_BORDER),
1873 const_iv (GL_LINES), 2322 const_iv (GL_LINES),
2323 const_iv (GL_LINE_STRIP),
1874 const_iv (GL_LINE_LOOP), 2324 const_iv (GL_LINE_LOOP),
1875 const_iv (GL_QUADS), 2325 const_iv (GL_QUADS),
1876 const_iv (GL_QUAD_STRIP), 2326 const_iv (GL_QUAD_STRIP),
1877 const_iv (GL_TRIANGLES), 2327 const_iv (GL_TRIANGLES),
1878 const_iv (GL_TRIANGLE_STRIP), 2328 const_iv (GL_TRIANGLE_STRIP),
1886# undef const_iv 2336# undef const_iv
1887 }; 2337 };
1888 2338
1889 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; )
1890 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);
1891} 2344}
1892 2345
1893char * 2346char *
1894gl_vendor () 2347gl_vendor ()
1895 CODE: 2348 CODE:
1906 2359
1907char * 2360char *
1908gl_extensions () 2361gl_extensions ()
1909 CODE: 2362 CODE:
1910 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2363 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2364 OUTPUT:
2365 RETVAL
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);
1911 OUTPUT: 2378 OUTPUT:
1912 RETVAL 2379 RETVAL
1913 2380
1914int glGetError () 2381int glGetError ()
1915 2382
1988 r *= a; 2455 r *= a;
1989 g *= a; 2456 g *= a;
1990 b *= a; 2457 b *= a;
1991 } 2458 }
1992 // microsoft visual "c" rounds instead of truncating... 2459 // microsoft visual "c" rounds instead of truncating...
1993 glColor4ub (MIN ((int)(r * 256.f), 255), 2460 glColor4f (r, g, b, a);
1994 MIN ((int)(g * 256.f), 255),
1995 MIN ((int)(b * 256.f), 255),
1996 MIN ((int)(a * 256.f), 255));
1997 2461
1998void glInterleavedArrays (int format, int stride, char *data) 2462void glInterleavedArrays (int format, int stride, char *data)
1999 2463
2000void glDrawElements (int mode, int count, int type, char *indices) 2464void glDrawElements (int mode, int count, int type, char *indices)
2001 2465
2043 2507
2044void 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)
2045 2509
2046void glDrawPixels (int width, int height, int format, int type, char *pixels) 2510void glDrawPixels (int width, int height, int format, int type, char *pixels)
2047 2511
2512void glPixelZoom (float x, float y)
2513
2048void 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)
2049 2515
2050int glGenTexture () 2516int glGenTexture ()
2051 CODE: 2517 CODE:
2052{ 2518 RETVAL = gen_texture ();
2053 GLuint name;
2054 glGenTextures (1, &name);
2055 RETVAL = name;
2056}
2057 OUTPUT: 2519 OUTPUT:
2058 RETVAL 2520 RETVAL
2059 2521
2060void glDeleteTexture (int name) 2522void glDeleteTexture (int name)
2061 CODE: 2523 CODE:
2062{
2063 GLuint name_ = name;
2064 glDeleteTextures (1, &name_); 2524 del_texture (name);
2065} 2525
2066
2067int glGenList () 2526int glGenList ()
2068 CODE: 2527 CODE:
2069 RETVAL = glGenLists (1); 2528 RETVAL = glGenLists (1);
2070 OUTPUT: 2529 OUTPUT:
2071 RETVAL 2530 RETVAL
2078 2537
2079void glEndList () 2538void glEndList ()
2080 2539
2081void glCallList (int list) 2540void glCallList (int list)
2082 2541
2083

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines