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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.204 by root, Thu Jul 19 14:54:50 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines