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.96 by root, Wed May 24 22:28:43 2006 UTC vs.
Revision 1.202 by root, Tue Jul 17 18:34:24 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
491char * 678char *
492SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
493 680
681int
682SDL_GetAppState ()
683
494void 684void
495SDL_PollEvent () 685poll_events ()
496 PPCODE: 686 PPCODE:
497{ 687{
498 SDL_Event ev; 688 SDL_Event ev;
499 689
500 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
501 { 692 {
502 HV *hv = newHV (); 693 HV *hv = newHV ();
503 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
504 695
505 switch (ev.type) 696 switch (ev.type)
507 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
508 case SDL_KEYUP: 699 case SDL_KEYUP:
509 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
510 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
511 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 */
512 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
513 break; 705 break;
514 706
515 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
518 break; 710 break;
519 711
520 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
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
528 break; 738 break;
529 739
530 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
531 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544 break; 754 break;
545 } 755 }
546 756
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548 } 758 }
549} 759}
550 760
551int 761int
552Mix_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)
561Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
562 772
563void 773void
564lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
565 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
566#ifndef _WIN32 782#ifdef _WIN32
567 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 }
568#endif 804#endif
569 805}
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_version ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_VERSION);
581 OUTPUT:
582 RETVAL
583
584char *
585gl_extensions ()
586 CODE:
587 RETVAL = (char *)glGetString (GL_EXTENSIONS);
588 OUTPUT:
589 RETVAL
590 806
591void 807void
592add_font (char *file) 808add_font (char *file)
593 CODE: 809 CODE:
594 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595#ifdef _WIN32
596 // cairo... sigh... requires win2000
597 AddFontResourceEx (file, FR_PRIVATE, 0);
598#endif
599 811
600void 812void
601load_image_inline (SV *image_) 813load_image_inline (SV *image_)
602 ALIAS: 814 ALIAS:
603 load_image_file = 1 815 load_image_file = 1
645 857
646 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 858 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647 859
648 assert (surface2->pitch == surface2->w * 4); 860 assert (surface2->pitch == surface2->w * 4);
649 861
862 SDL_LockSurface (surface2);
650 EXTEND (SP, 5); 863 EXTEND (SP, 6);
651 PUSHs (sv_2mortal (newSViv (surface2->w))); 864 PUSHs (sv_2mortal (newSViv (surface2->w)));
652 PUSHs (sv_2mortal (newSViv (surface2->h))); 865 PUSHs (sv_2mortal (newSViv (surface2->h)));
653 SDL_LockSurface (surface2);
654 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 866 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655 SDL_UnlockSurface (surface2);
656 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)));
657 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 868 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 869 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
870 SDL_UnlockSurface (surface2);
659 871
660 SDL_FreeSurface (surface); 872 SDL_FreeSurface (surface);
661 SDL_FreeSurface (surface2); 873 SDL_FreeSurface (surface2);
662} 874}
663 875
699 CODE: 911 CODE:
700 fprintf (stderr, "FATAL: %s\n", message); 912 fprintf (stderr, "FATAL: %s\n", message);
701#ifdef _WIN32 913#ifdef _WIN32
702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
703#endif 915#endif
704 exit (1); 916 _exit (1);
705 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
706MODULE = CFClient PACKAGE = CFClient::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
707 937
708CFClient::Font 938CFPlus::Font
709new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
710 CODE: 940 CODE:
711{ 941{
712 int count; 942 int count;
713 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
716} 946}
717 OUTPUT: 947 OUTPUT:
718 RETVAL 948 RETVAL
719 949
720void 950void
721DESTROY (CFClient::Font self) 951DESTROY (CFPlus::Font self)
722 CODE: 952 CODE:
723 pango_font_description_free (self); 953 pango_font_description_free (self);
724 954
725void 955void
726make_default (CFClient::Font self) 956make_default (CFPlus::Font self)
727 CODE: 957 CODE:
728 default_font = self; 958 default_font = self;
729 959
730MODULE = CFClient PACKAGE = CFClient::Layout 960MODULE = CFPlus PACKAGE = CFPlus::Layout
731 961
732CFClient::Layout 962void
733new (SV *class, int rgba = 0) 963reset_glyph_cache ()
734 CODE: 964 CODE:
735#if _WIN32 965 tc_clear ();
736 //rgba = 0;//D make stext nicer, breaks TextView 966
737#endif 967CFPlus::Layout
968new (SV *class)
969 CODE:
738 New (0, RETVAL, 1, struct cf_layout); 970 New (0, RETVAL, 1, struct cf_layout);
739 971
740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 972 RETVAL->pl = pango_layout_new (opengl_context);
741 RETVAL->rgba = rgba;
742 RETVAL->r = 1.; 973 RETVAL->r = 1.;
743 RETVAL->g = 1.; 974 RETVAL->g = 1.;
744 RETVAL->b = 1.; 975 RETVAL->b = 1.;
745 RETVAL->a = 1.; 976 RETVAL->a = 1.;
746 RETVAL->base_height = MIN_FONT_HEIGHT; 977 RETVAL->base_height = MIN_FONT_HEIGHT;
750 layout_update_font (RETVAL); 981 layout_update_font (RETVAL);
751 OUTPUT: 982 OUTPUT:
752 RETVAL 983 RETVAL
753 984
754void 985void
755DESTROY (CFClient::Layout self) 986DESTROY (CFPlus::Layout self)
756 CODE: 987 CODE:
757 g_object_unref (self->pl); 988 g_object_unref (self->pl);
758 Safefree (self); 989 Safefree (self);
759 990
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
767void 991void
768set_text (CFClient::Layout self, SV *text_) 992set_text (CFPlus::Layout self, SV *text_)
769 CODE: 993 CODE:
770{ 994{
771 STRLEN textlen; 995 STRLEN textlen;
772 char *text = SvPVutf8 (text_, textlen); 996 char *text = SvPVutf8 (text_, textlen);
773 997
774 pango_layout_set_text (self->pl, text, textlen); 998 pango_layout_set_text (self->pl, text, textlen);
775} 999}
776 1000
777void 1001void
778set_markup (CFClient::Layout self, SV *text_) 1002set_markup (CFPlus::Layout self, SV *text_)
779 CODE: 1003 CODE:
780{ 1004{
781 STRLEN textlen; 1005 STRLEN textlen;
782 char *text = SvPVutf8 (text_, textlen); 1006 char *text = SvPVutf8 (text_, textlen);
783 1007
784 pango_layout_set_markup (self->pl, text, textlen); 1008 pango_layout_set_markup (self->pl, text, textlen);
785} 1009}
786 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
787SV * 1096SV *
788get_text (CFClient::Layout self) 1097get_text (CFPlus::Layout self)
789 CODE: 1098 CODE:
790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791 SvUTF8_on (RETVAL); 1100 sv_utf8_decode (RETVAL);
792 OUTPUT: 1101 OUTPUT:
793 RETVAL 1102 RETVAL
794 1103
795void 1104void
796set_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.)
797 CODE: 1106 CODE:
798 self->r = r; 1107 self->r = r;
799 self->g = g; 1108 self->g = g;
800 self->b = b; 1109 self->b = b;
801 self->a = a; 1110 self->a = a;
802 1111
803void 1112void
804set_font (CFClient::Layout self, CFClient::Font font = 0) 1113set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805 CODE: 1114 CODE:
806 if (self->font != font) 1115 if (self->font != font)
807 { 1116 {
808 self->font = font; 1117 self->font = font;
809 layout_update_font (self); 1118 layout_update_font (self);
810 } 1119 }
811 1120
812void 1121void
813set_height (CFClient::Layout self, int base_height) 1122set_height (CFPlus::Layout self, int base_height)
814 CODE: 1123 CODE:
815 if (self->base_height != base_height) 1124 if (self->base_height != base_height)
816 { 1125 {
817 self->base_height = base_height; 1126 self->base_height = base_height;
818 layout_update_font (self); 1127 layout_update_font (self);
819 } 1128 }
820 1129
821void 1130void
822set_width (CFClient::Layout self, int max_width = -1) 1131set_width (CFPlus::Layout self, int max_width = -1)
823 CODE: 1132 CODE:
824 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);
825 1134
826void 1135void
827set_indent (CFClient::Layout self, int indent) 1136set_indent (CFPlus::Layout self, int indent)
828 CODE: 1137 CODE:
829 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830 1139
831void 1140void
832set_spacing (CFClient::Layout self, int spacing) 1141set_spacing (CFPlus::Layout self, int spacing)
833 CODE: 1142 CODE:
834 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835 1144
836void 1145void
837set_ellipsise (CFClient::Layout self, int ellipsise) 1146set_ellipsise (CFPlus::Layout self, int ellipsise)
838 CODE: 1147 CODE:
839 pango_layout_set_ellipsize (self->pl, 1148 pango_layout_set_ellipsize (self->pl,
840 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START
841 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
843 : PANGO_ELLIPSIZE_NONE 1152 : PANGO_ELLIPSIZE_NONE
844 ); 1153 );
845 1154
846void 1155void
847set_single_paragraph_mode (CFClient::Layout self, int spm) 1156set_single_paragraph_mode (CFPlus::Layout self, int spm)
848 CODE: 1157 CODE:
849 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850 1159
851void 1160void
852size (CFClient::Layout self) 1161size (CFPlus::Layout self)
853 PPCODE: 1162 PPCODE:
854{ 1163{
855 int w, h; 1164 int w, h;
856 1165
857 layout_get_pixel_size (self, &w, &h); 1166 layout_get_pixel_size (self, &w, &h);
860 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (w)));
861 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (h)));
862} 1171}
863 1172
864int 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
865xy_to_index (CFClient::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
866 CODE: 1187 CODE:
867{ 1188{
868 int index, trailing; 1189 int index, trailing;
869 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);
870 RETVAL = index; 1191 RETVAL = index + trailing;
871} 1192}
872 OUTPUT: 1193 OUTPUT:
873 RETVAL 1194 RETVAL
874 1195
875void 1196void
876cursor_pos (CFClient::Layout self, int index) 1197cursor_pos (CFPlus::Layout self, int index)
877 PPCODE: 1198 PPCODE:
878{ 1199{
879 PangoRectangle strong_pos; 1200 PangoRectangle strong_pos;
880 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881 1202
884 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886} 1207}
887 1208
888void 1209void
889render (CFClient::Layout self) 1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
890 PPCODE: 1211 PPCODE:
891{ 1212{
892 SV *retval; 1213 int line, x;
893 int w, h;
894 1214
895 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 */
896 1217
897 if (self->rgba)
898 {
899 cairo_surface_t *surface;
900 cairo_t *cairo;
901
902 retval = newSV (w * h * 4);
903 SvPOK_only (retval);
904 SvCUR_set (retval, w * h * 4);
905
906 memset (SvPVX (retval), 0, w * h * 4);
907
908 surface = cairo_image_surface_create_for_data (
909 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
910 cairo = cairo_create (surface);
911 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913 pango_cairo_show_layout (cairo, self->pl);
914
915 cairo_destroy (cairo);
916 cairo_surface_destroy (surface);
917
918 // what a mess, and its premultiplied, too :(
919 {
920 uint32_t *p = (uint32_t *)SvPVX (retval);
921 uint32_t *e = p + w * h;
922
923 while (p < e)
924 {
925 uint32_t rgba = *p;
926 rgba = (rgba >> 24) | (rgba << 8);
927#if 0
928#ifdef _WIN32
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934
935 rgba = (rgba & 0xffffff00) | a;
936 }
937#endif
938#endif
939 rgba = SDL_SwapBE32 (rgba);
940 *p++ = rgba;
941 }
942 }
943
944 EXTEND (SP, 5); 1218 EXTEND (SP, 2);
945 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)
946 PUSHs (sv_2mortal (newSViv (h))); 1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
947 PUSHs (sv_2mortal (retval));
948 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 }
951 else 1241 else
952 { 1242 {
953 FT_Bitmap bitmap;
954
955 retval = newSV (w * h);
956 SvPOK_only (retval);
957 SvCUR_set (retval, w * h);
958
959 bitmap.rows = h;
960 bitmap.width = w;
961 bitmap.pitch = w;
962 bitmap.buffer = (unsigned char*)SvPVX (retval);
963 bitmap.num_grays = 256;
964 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966 memset (bitmap.buffer, 0, w * h);
967
968 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970 EXTEND (SP, 5);
971 PUSHs (sv_2mortal (newSViv (w))); 1243 PUSHs (sv_2mortal (newSViv (index)));
972 PUSHs (sv_2mortal (newSViv (h))); 1244 PUSHs (sv_2mortal (newSViv (trailing)));
973 PUSHs (sv_2mortal (retval));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 } 1245 }
977} 1246}
978 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
979MODULE = CFClient PACKAGE = CFClient::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
980 1259
1260int minpot (int n)
1261
981void 1262void
1263pad2pot (SV *data_, SV *w_, SV *h_)
1264 CODE:
1265{
1266 int ow = SvIV (w_);
1267 int oh = SvIV (h_);
1268
1269 if (ow && oh)
1270 {
1271 int nw = minpot (ow);
1272 int nh = minpot (oh);
1273
1274 if (nw != ow || nh != oh)
1275 {
1276 if (SvOK (data_))
1277 {
1278 STRLEN datalen;
1279 char *data = SvPVbyte (data_, datalen);
1280 int bpp = datalen / (ow * oh);
1281 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1282
1283 SvPOK_only (result_);
1284 SvCUR_set (result_, nw * nh * bpp);
1285
1286 memset (SvPVX (result_), 0, nw * nh * bpp);
1287 while (oh--)
1288 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1289
1290 sv_setsv (data_, result_);
1291 }
1292
1293 sv_setiv (w_, nw);
1294 sv_setiv (h_, nh);
1295 }
1296 }
1297}
1298
1299void
982draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1300draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983 PROTOTYPE: $$$;$$ 1301 PROTOTYPE: $$$;$$
984 ALIAS: 1302 ALIAS:
985 draw_quad_alpha = 1 1303 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2 1304 draw_quad_alpha_premultiplied = 2
987 CODE: 1305 CODE:
988{ 1306{
989 HV *hv = (HV *)SvRV (self); 1307 HV *hv = (HV *)SvRV (self);
990 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1308 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1309 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1310 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994 1311
995 if (items < 5) 1312 if (items < 5)
996 { 1313 {
997 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1314 w = SvNV (*hv_fetch (hv, "w", 1, 1));
998 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1315 h = SvNV (*hv_fetch (hv, "h", 1, 1));
999 } 1316 }
1000 1317
1001 if (ix) 1318 if (ix)
1002 { 1319 {
1003 glEnable (GL_BLEND); 1320 glEnable (GL_BLEND);
1321
1322 if (ix == 2)
1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1323 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1324 else
1325 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1326 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1327
1005 glEnable (GL_ALPHA_TEST); 1328 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f); 1329 glAlphaFunc (GL_GREATER, 0.01f);
1007 } 1330 }
1008 1331
1009 glBindTexture (GL_TEXTURE_2D, name); 1332 glBindTexture (GL_TEXTURE_2D, name);
1010
1011 if (wrap_mode)
1012 {
1013 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015 }
1016 1333
1017 glBegin (GL_QUADS); 1334 glBegin (GL_QUADS);
1018 glTexCoord2f (0, 0); glVertex2f (x , y ); 1335 glTexCoord2f (0, 0); glVertex2f (x , y );
1019 glTexCoord2f (0, t); glVertex2f (x , y + h); 1336 glTexCoord2f (0, t); glVertex2f (x , y + h);
1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1337 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1026 glDisable (GL_ALPHA_TEST); 1343 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1344 glDisable (GL_BLEND);
1028 } 1345 }
1029} 1346}
1030 1347
1348IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1349 CODE:
1350{
1351 GLint width;
1352 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1353 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1354 RETVAL = width > 0;
1355}
1356 OUTPUT:
1357 RETVAL
1358
1031MODULE = CFClient PACKAGE = CFClient::Map 1359MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1360
1033CFClient::Map 1361CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1362new (SV *class)
1035 CODE: 1363 CODE:
1036 New (0, RETVAL, 1, struct map); 1364 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1365 RETVAL->x = 0;
1038 RETVAL->y = 0; 1366 RETVAL->y = 0;
1039 RETVAL->w = map_width; 1367 RETVAL->w = 0;
1040 RETVAL->h = map_height; 1368 RETVAL->h = 0;
1041 RETVAL->ox = 0; 1369 RETVAL->ox = 0;
1042 RETVAL->oy = 0; 1370 RETVAL->oy = 0;
1043 RETVAL->faces = 8192; 1371 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1044 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1372 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1045 RETVAL->texs = 8192;
1046 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1047 RETVAL->rows = 0; 1373 RETVAL->rows = 0;
1048 RETVAL->row = 0; 1374 RETVAL->row = 0;
1049 OUTPUT: 1375 OUTPUT:
1050 RETVAL 1376 RETVAL
1051 1377
1052void 1378void
1053DESTROY (CFClient::Map self) 1379DESTROY (CFPlus::Map self)
1054 CODE: 1380 CODE:
1055{ 1381{
1056 map_clear (self); 1382 map_clear (self);
1057 Safefree (self->face); 1383 Safefree (self->face2tile);
1384 Safefree (self->tex);
1058 Safefree (self); 1385 Safefree (self);
1059} 1386}
1060 1387
1061void 1388void
1389resize (CFPlus::Map self, int map_width, int map_height)
1390 CODE:
1391 self->w = map_width;
1392 self->h = map_height;
1393
1394void
1062clear (CFClient::Map self) 1395clear (CFPlus::Map self)
1063 CODE: 1396 CODE:
1064 map_clear (self); 1397 map_clear (self);
1065 1398
1066void 1399void
1067set_face (CFClient::Map self, int face, int texid) 1400set_tileid (CFPlus::Map self, int face, int tile)
1068 CODE: 1401 CODE:
1069{ 1402{
1070 while (self->faces <= face) 1403 need_facenum (self, face); self->face2tile [face] = tile;
1071 { 1404 need_texid (self, tile);
1072 Append (mapface, self->face, self->faces, self->faces);
1073 self->faces *= 2;
1074 }
1075
1076 self->face [face] = texid;
1077} 1405}
1078 1406
1079void 1407void
1408set_smooth (CFPlus::Map self, int face, int smooth, int level)
1409 CODE:
1410{
1411 tileid texid;
1412 maptex *tex;
1413
1414 if (face < 0 || face >= self->faces)
1415 return;
1416
1417 if (smooth < 0 || smooth >= self->faces)
1418 return;
1419
1420 texid = self->face2tile [face];
1421
1422 if (!texid)
1423 return;
1424
1425 tex = self->tex + texid;
1426 tex->smoothtile = self->face2tile [smooth];
1427 tex->smoothlevel = level;
1428}
1429
1430void
1080set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1431set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081 CODE: 1432 CODE:
1082{ 1433{
1083 while (self->texs <= texid) 1434 need_texid (self, texid);
1084 {
1085 Append (maptex, self->tex, self->texs, self->texs);
1086 self->texs *= 2;
1087 }
1088 1435
1089 { 1436 {
1090 maptex *tex = self->tex + texid; 1437 maptex *tex = self->tex + texid;
1091 1438
1092 tex->name = name; 1439 tex->name = name;
1101 } 1448 }
1102 1449
1103 // somewhat hackish, but for textures that require it, it really 1450 // somewhat hackish, but for textures that require it, it really
1104 // improves the look, and most others don't suffer. 1451 // improves the look, and most others don't suffer.
1105 glBindTexture (GL_TEXTURE_2D, name); 1452 glBindTexture (GL_TEXTURE_2D, name);
1106 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1453 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1454 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1455 // use uglier nearest interpolation because linear suffers
1456 // from transparent color bleeding and ugly wrapping effects.
1457 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108} 1458}
1109 1459
1110int 1460int
1111ox (CFClient::Map self) 1461ox (CFPlus::Map self)
1112 ALIAS: 1462 ALIAS:
1113 oy = 1 1463 oy = 1
1464 x = 2
1465 y = 3
1466 w = 4
1467 h = 5
1114 CODE: 1468 CODE:
1115 switch (ix) 1469 switch (ix)
1116 { 1470 {
1117 case 0: RETVAL = self->ox; break; 1471 case 0: RETVAL = self->ox; break;
1118 case 1: RETVAL = self->oy; break; 1472 case 1: RETVAL = self->oy; break;
1473 case 2: RETVAL = self->x; break;
1474 case 3: RETVAL = self->y; break;
1475 case 4: RETVAL = self->w; break;
1476 case 5: RETVAL = self->h; break;
1119 } 1477 }
1120 OUTPUT: 1478 OUTPUT:
1121 RETVAL 1479 RETVAL
1122 1480
1123void 1481void
1124scroll (CFClient::Map self, int dx, int dy) 1482scroll (CFPlus::Map self, int dx, int dy)
1125 CODE: 1483 CODE:
1126{ 1484{
1127 if (dx > 0) 1485 if (dx > 0)
1128 map_blank (self, self->x, self->y, dx - 1, self->h); 1486 map_blank (self, self->x, self->y, dx, self->h);
1129 else if (dx < 0) 1487 else if (dx < 0)
1130 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1488 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1131 1489
1132 if (dy > 0) 1490 if (dy > 0)
1133 map_blank (self, self->x, self->y, self->w, dy - 1); 1491 map_blank (self, self->x, self->y, self->w, dy);
1134 else if (dy < 0) 1492 else if (dy < 0)
1135 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1493 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1136 1494
1137 self->ox += dx; self->x += dx; 1495 self->ox += dx; self->x += dx;
1138 self->oy += dy; self->y += dy; 1496 self->oy += dy; self->y += dy;
1139 1497
1140 while (self->y < 0) 1498 while (self->y < 0)
1145 self->y += MAP_EXTEND_Y; 1503 self->y += MAP_EXTEND_Y;
1146 } 1504 }
1147} 1505}
1148 1506
1149void 1507void
1150map1a_update (CFClient::Map self, SV *data_) 1508map1a_update (CFPlus::Map self, SV *data_, int extmap)
1151 CODE: 1509 CODE:
1152{ 1510{
1153 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1511 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1154 uint8_t *data_end = (uint8_t *)SvEND (data_); 1512 uint8_t *data_end = (uint8_t *)SvEND (data_);
1155 mapcell *cell; 1513 mapcell *cell;
1156 int x, y, flags; 1514 int x, y, flags;
1157 1515
1158 while (data < data_end) 1516 while (data < data_end - 1)
1159 { 1517 {
1160 flags = (data [0] << 8) + data [1]; data += 2; 1518 flags = (data [0] << 8) + data [1]; data += 2;
1161 1519
1162 x = ((flags >> 10) & 63) + self->x; 1520 x = self->x + ((flags >> 10) & 63);
1163 y = ((flags >> 4) & 63) + self->y; 1521 y = self->y + ((flags >> 4) & 63);
1164 1522
1165 cell = map_get_cell (self, x, y); 1523 cell = map_get_cell (self, x, y);
1166 1524
1167 if (flags & 15) 1525 if (flags & 15)
1168 { 1526 {
1169 if (cell->darkness < 0) 1527 if (!cell->darkness)
1170 { 1528 {
1529 memset (cell, 0, sizeof (*cell));
1171 cell->darkness = 0; 1530 cell->darkness = 256;
1172 cell->face [0] = 0;
1173 cell->face [1] = 0;
1174 cell->face [2] = 0;
1175 } 1531 }
1176 1532
1177 cell->darkness = flags & 8 ? *data++ : 255;
1178
1179 //TODO: don't trust server data to be in-range(!) 1533 //TODO: don't trust server data to be in-range(!)
1534
1535 if (flags & 8)
1536 {
1537 if (extmap)
1538 {
1539 uint8_t ext, cmd;
1540
1541 do
1542 {
1543 ext = *data++;
1544 cmd = ext & 0x3f;
1545
1546 if (cmd < 4)
1547 cell->darkness = 255 - ext * 64 + 1;
1548 else if (cmd == 5) // health
1549 {
1550 cell->stat_width = 1;
1551 cell->stat_hp = *data++;
1552 }
1553 else if (cmd == 6) // monster width
1554 cell->stat_width = *data++ + 1;
1555 else if (cmd == 0x47)
1556 {
1557 if (*data == 4)
1558 ; // decode player count
1559
1560 data += *data + 1;
1561 }
1562 else if (cmd == 8) // cell flags
1563 cell->flags = *data++;
1564 else if (ext & 0x40) // unknown, multibyte => skip
1565 data += *data + 1;
1566 else
1567 data++;
1568 }
1569 while (ext & 0x80);
1570 }
1571 else
1572 cell->darkness = *data++ + 1;
1573 }
1180 1574
1181 if (flags & 4) 1575 if (flags & 4)
1182 { 1576 {
1183 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1577 faceid face = (data [0] << 8) + data [1]; data += 2;
1578 need_facenum (self, face);
1579 cell->tile [0] = self->face2tile [face];
1184 } 1580 }
1185 1581
1186 if (flags & 2) 1582 if (flags & 2)
1187 { 1583 {
1188 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1584 faceid face = (data [0] << 8) + data [1]; data += 2;
1585 need_facenum (self, face);
1586 cell->tile [1] = self->face2tile [face];
1189 } 1587 }
1190 1588
1191 if (flags & 1) 1589 if (flags & 1)
1192 { 1590 {
1193 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1591 faceid face = (data [0] << 8) + data [1]; data += 2;
1592 need_facenum (self, face);
1593 cell->tile [2] = self->face2tile [face];
1194 } 1594 }
1195 } 1595 }
1196 else 1596 else
1197 cell->darkness = -1; 1597 cell->darkness = 0;
1198 } 1598 }
1199} 1599}
1200 1600
1201SV * 1601SV *
1202mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1602mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1203 CODE: 1603 CODE:
1204{ 1604{
1205 int x1, x; 1605 int x1, x;
1206 int y1, y; 1606 int y1, y;
1207 int z; 1607 int z;
1228 { 1628 {
1229 mapcell *cell = row->col + (x - row->c0); 1629 mapcell *cell = row->col + (x - row->c0);
1230 1630
1231 for (z = 0; z <= 0; z++) 1631 for (z = 0; z <= 0; z++)
1232 { 1632 {
1233 mapface face = cell->face [z];
1234
1235 if (face)
1236 {
1237 maptex tex = self->tex [face]; 1633 maptex tex = self->tex [cell->tile [z]];
1238 int a0 = 255 - tex.a; 1634 int a0 = 255 - tex.a;
1239 int a1 = tex.a; 1635 int a1 = tex.a;
1240 1636
1241 r = (r * a0 + tex.r * a1) / 255; 1637 r = (r * a0 + tex.r * a1) / 255;
1242 g = (g * a0 + tex.g * a1) / 255; 1638 g = (g * a0 + tex.g * a1) / 255;
1243 b = (b * a0 + tex.b * a1) / 255; 1639 b = (b * a0 + tex.b * a1) / 255;
1244 a = (a * a0 + tex.a * a1) / 255; 1640 a = (a * a0 + tex.a * a1) / 255;
1245 }
1246 } 1641 }
1247 } 1642 }
1248 1643
1249 *map++ = (r ) 1644 *map++ = (r )
1250 | (g << 8) 1645 | (g << 8)
1257} 1652}
1258 OUTPUT: 1653 OUTPUT:
1259 RETVAL 1654 RETVAL
1260 1655
1261void 1656void
1262draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1657draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1263 PPCODE: 1658 CODE:
1264{ 1659{
1265 int vx, vy; 1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1663 smooth_key skey;
1266 int x, y, z; 1664 int x, y, z;
1267 int last_name; 1665 int last_name;
1268 mapface face; 1666
1667 // thats current max. sorry.
1668 if (sw > 255) sw = 255;
1669 if (sh > 255) sh = 255;
1670
1671 // clear key, in case of extra padding
1672 memset (&skey, 0, sizeof (skey));
1673
1674 glColor4ub (255, 255, 255, 255);
1675
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1678 glEnable (GL_TEXTURE_2D);
1679 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1680
1681 glBegin (GL_QUADS);
1682
1683 last_name = 0;
1684
1685 mx += self->x;
1686 my += self->y;
1687
1688 // first pass: determine smooth_max
1689 // rather ugly, if you ask me
1690 // could also be stored inside mapcell and updated on change
1691 memset (smooth_max, 0, sizeof (smooth_max));
1692
1693 for (y = 0; y < sh; y++)
1694 if (0 <= y + my && y + my < self->rows)
1695 {
1696 maprow *row = self->row + (y + my);
1697
1698 for (x = 0; x < sw; x++)
1699 if (row->c0 <= x + mx && x + mx < row->c1)
1700 {
1701 mapcell *cell = row->col + (x + mx - row->c0);
1702
1703 smooth_max[x + 1][y + 1] =
1704 MAX (self->tex [cell->tile [0]].smoothlevel,
1705 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel));
1707 }
1708 }
1709
1710 for (z = 0; z <= 2; z++)
1711 {
1712 memset (smooth_level, 0, sizeof (smooth_level));
1713
1714 for (y = 0; y < sh; y++)
1715 if (0 <= y + my && y + my < self->rows)
1716 {
1717 maprow *row = self->row + (y + my);
1718
1719 for (x = 0; x < sw; x++)
1720 if (row->c0 <= x + mx && x + mx < row->c1)
1721 {
1722 mapcell *cell = row->col + (x + mx - row->c0);
1723 tileid tile = cell->tile [z];
1724
1725 if (tile)
1726 {
1727 maptex tex = self->tex [tile];
1728 int px = (x + 1) * T - tex.w;
1729 int py = (y + 1) * T - tex.h;
1730
1731 // suppressing texture state switches here
1732 // is only moderately effective, but worth the extra effort
1733 if (last_name != tex.name)
1734 {
1735 if (!tex.name)
1736 tex = self->tex [2]; /* missing, replace by noface */
1737
1738 glEnd ();
1739 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1740 glBegin (GL_QUADS);
1741 }
1742
1743 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1744 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1745 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1746 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1747
1748 if (cell->flags && z == 2)
1749 {
1750 if (cell->flags & 1)
1751 {
1752 maptex tex = self->tex [1];
1753 int px = x * T + T * 2 / 32;
1754 int py = y * T - T * 6 / 32;
1755
1756 glEnd ();
1757 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1758 glBegin (GL_QUADS);
1759
1760 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1761 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1762 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1763 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1764 }
1765 }
1766
1767 // update smooth hash
1768 if (tex.smoothtile)
1769 {
1770 skey.tile = tex.smoothtile;
1771 skey.level = tex.smoothlevel;
1772
1773 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1774
1775 // add bits to current tile and all neighbours. skey.x|y is
1776 // shifted +1|+1 so we always stay positive.
1777
1778 // bits is ___n cccc CCCC bbbb
1779 // n do not draw borders&corners
1780 // c draw these corners, but...
1781 // C ... not these
1782 // b draw these borders
1783
1784 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1785 // ┃· ·· ·┃ ━━
1786
1787 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1788 // ·· ·· ·┏ ┓·
1789
1790 // full tile
1791 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1792
1793 // borders
1794 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1795 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1796 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1797 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1798
1799 // corners
1800 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1801 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1802 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1803 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1804 }
1805 }
1806 }
1807 }
1808
1809 // go through all smoothlevels, lowest to highest, then draw.
1810 // this is basically counting sort
1811 {
1812 int w, b;
1813
1814 for (w = 0; w < 256 / 32; ++w)
1815 {
1816 uint32_t smask = smooth_level [w];
1817 if (smask)
1818 for (b = 0; b < 32; ++b)
1819 if (smask & (((uint32_t)1) << b))
1820 {
1821 int level = (w << 5) | b;
1822 HE *he;
1823
1824 hv_iterinit (smooth);
1825 while ((he = hv_iternext (smooth)))
1826 {
1827 smooth_key *skey = (smooth_key *)HeKEY (he);
1828 IV bits = SvIVX (HeVAL (he));
1829
1830 if (!(bits & 0x1000)
1831 && skey->level == level
1832 && level > smooth_max [skey->x][skey->y])
1833 {
1834 maptex tex = self->tex [skey->tile];
1835 int px = (((int)skey->x) - 1) * T;
1836 int py = (((int)skey->y) - 1) * T;
1837 int border = bits & 15;
1838 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1839 float dx = tex.s * .0625f; // 16 images/row
1840 float dy = tex.t * .5f ; // 2 images/column
1841
1842 // this time naively avoiding texture state changes
1843 // save gobs of state changes.
1844 if (last_name != tex.name)
1845 {
1846 if (!tex.name)
1847 continue; // smoothing not yet available
1848
1849 glEnd ();
1850 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1851 glBegin (GL_QUADS);
1852 }
1853
1854 if (border)
1855 {
1856 float ox = border * dx;
1857
1858 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1859 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1860 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1861 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1862 }
1863
1864 if (corner)
1865 {
1866 float ox = corner * dx;
1867
1868 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1869 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1870 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1871 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1872 }
1873 }
1874 }
1875 }
1876 }
1877 }
1878
1879 hv_clear (smooth);
1880 }
1881
1882 glEnd ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886
1887 // top layer: overlays such as the health bar
1888 for (y = 0; y < sh; y++)
1889 if (0 <= y + my && y + my < self->rows)
1890 {
1891 maprow *row = self->row + (y + my);
1892
1893 for (x = 0; x < sw; x++)
1894 if (row->c0 <= x + mx && x + mx < row->c1)
1895 {
1896 mapcell *cell = row->col + (x + mx - row->c0);
1897
1898 int px = x * T;
1899 int py = y * T;
1900
1901 if (cell->stat_hp)
1902 {
1903 int width = cell->stat_width * T;
1904 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1905
1906 glColor3ub (0, 0, 0);
1907 glRectf (px + 1, py - thick - 2,
1908 px + width - 1, py);
1909
1910 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1911 glRectf (px + 2,
1912 py - thick - 1,
1913 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1914 }
1915 }
1916 }
1917}
1918
1919void
1920draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1921 CODE:
1922{
1923 static float color[16][3] = {
1924 { 0.00F, 0.00F, 0.00F },
1925 { 1.00F, 1.00F, 1.00F },
1926 { 0.00F, 0.00F, 0.55F },
1927 { 1.00F, 0.00F, 0.00F },
1928
1929 { 1.00F, 0.54F, 0.00F },
1930 { 0.11F, 0.56F, 1.00F },
1931 { 0.93F, 0.46F, 0.00F },
1932 { 0.18F, 0.54F, 0.34F },
1933
1934 { 0.56F, 0.73F, 0.56F },
1935 { 0.80F, 0.80F, 0.80F },
1936 { 0.55F, 0.41F, 0.13F },
1937 { 0.99F, 0.77F, 0.26F },
1938
1939 { 0.74F, 0.65F, 0.41F },
1940
1941 { 0.00F, 1.00F, 1.00F },
1942 { 1.00F, 0.00F, 1.00F },
1943 { 1.00F, 1.00F, 0.00F },
1944 };
1945
1946 int x, y;
1947
1948 glEnable (GL_TEXTURE_2D);
1949 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1950 glEnable (GL_BLEND);
1951 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1952 glBegin (GL_QUADS);
1953
1954 for (y = 0; y < h; y++)
1955 for (x = 0; x < w; x++)
1956 {
1957 unsigned char m = data [x + y * w];
1958
1959 if (m)
1960 {
1961 float *c = color [m & 15];
1962
1963 float tx1 = m & 0x40 ? 0.5 : 0.;
1964 float tx2 = tx1 + 0.5;
1965
1966 glColor4f (c[0], c[1], c[2], 0.75);
1967 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1968 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1969 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1970 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1971 }
1972 }
1973
1974 glEnd ();
1975 glDisable (GL_BLEND);
1976 glDisable (GL_TEXTURE_2D);
1977}
1978
1979void
1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1981 PPCODE:
1982{
1983 int x, y;
1269 int sw4 = (sw + 3) & ~3; 1984 int sw4 = (sw + 3) & ~3;
1270 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1271 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1272 1987
1273 memset (darkness, 255, sw4 * sh); 1988 memset (darkness, 255, sw4 * sh);
1274 SvPOK_only (darkness_sv); 1989 SvPOK_only (darkness_sv);
1275 SvCUR_set (darkness_sv, sw4 * sh); 1990 SvCUR_set (darkness_sv, sw4 * sh);
1276 1991
1277 vx = self->x + (self->w - sw) / 2 - shift_x; 1992 mx += self->x;
1278 vy = self->y + (self->h - sh) / 2 - shift_y; 1993 my += self->y;
1279 1994
1280 /*
1281 int vx = self->vx = self->w >= sw
1282 ? self->x + (self->w - sw) / 2
1283 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1284
1285 int vy = self->vy = self->h >= sh
1286 ? self->y + (self->h - sh) / 2
1287 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1288 */
1289
1290 glColor4ub (255, 255, 255, 255);
1291
1292 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1293 glEnable (GL_BLEND);
1294 glEnable (GL_TEXTURE_2D);
1295 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1296
1297 glBegin (GL_QUADS);
1298
1299 last_name = 0;
1300
1301 for (z = 0; z < 3; z++)
1302 for (y = 0; y < sh; y++) 1995 for (y = 0; y < sh; y++)
1303 if (0 <= y + vy && y + vy < self->rows) 1996 if (0 <= y + my && y + my < self->rows)
1304 { 1997 {
1305 maprow *row = self->row + (y + vy); 1998 maprow *row = self->row + (y + my);
1306 1999
1307 for (x = 0; x < sw; x++) 2000 for (x = 0; x < sw; x++)
1308 if (row->c0 <= x + vx && x + vx < row->c1) 2001 if (row->c0 <= x + mx && x + mx < row->c1)
1309 { 2002 {
1310 mapcell *cell = row->col + (x + vx - row->c0); 2003 mapcell *cell = row->col + (x + mx - row->c0);
1311 2004
1312 darkness[y * sw4 + x] = cell->darkness < 0 2005 darkness[y * sw4 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1)
1313 ? 255 - FOW_DARKNESS 2007 : 255 - FOW_DARKNESS;
1314 : 255 - cell->darkness; 2008 }
2009 }
1315 2010
1316 face = cell->face [z]; 2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
1317 2015
1318 if (face) 2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x)
2021 {
2022 float *f = (float *)matrix;
2023 int dx, dy;
2024 float sum = 0.f;
2025
2026 for (dy = -1; dy <= 1; ++dy)
2027 for (dx = -1; dx <= 1; ++dx)
1319 { 2028 {
1320 maptex tex = self->tex [face]; 2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
1321 2031
1322 int px = (x + 1) * 32 - tex.w; 2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
1323 int py = (y + 1) * 32 - tex.h;
1324
1325 if (last_name != tex.name)
1326 {
1327 glEnd ();
1328 last_name = tex.name;
1329 glBindTexture (GL_TEXTURE_2D, last_name);
1330 glBegin (GL_QUADS);
1331 }
1332
1333 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1334 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1335 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1336 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1337 } 2033 }
1338 } 2034
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
1339 } 2036 }
1340 2037
1341 glEnd (); 2038 darkness_sv = darkness2_sv;
1342 2039 }
1343 glDisable (GL_TEXTURE_2D);
1344 glDisable (GL_BLEND);
1345 2040
1346 EXTEND (SP, 3); 2041 EXTEND (SP, 3);
1347 PUSHs (sv_2mortal (newSViv (sw4))); 2042 PUSHs (sv_2mortal (newSViv (sw4)));
1348 PUSHs (sv_2mortal (newSViv (sh))); 2043 PUSHs (sv_2mortal (newSViv (sh)));
1349 PUSHs (darkness_sv); 2044 PUSHs (darkness_sv);
1350} 2045}
1351 2046
1352SV * 2047SV *
1353get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2048get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1354 CODE: 2049 CODE:
1355{ 2050{
1356 int x, y, x1, y1; 2051 int x, y, x1, y1;
1357 SV *data_sv = newSV (w * h * 7 + 5); 2052 SV *data_sv = newSV (w * h * 7 + 5);
1358 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2053 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1383 if (row && row->c0 <= x && x < row->c1) 2078 if (row && row->c0 <= x && x < row->c1)
1384 { 2079 {
1385 mapcell *cell = row->col + (x - row->c0); 2080 mapcell *cell = row->col + (x - row->c0);
1386 uint8_t flags = 0; 2081 uint8_t flags = 0;
1387 2082
1388 if (cell->face [0]) flags |= 1; 2083 if (cell->tile [0]) flags |= 1;
1389 if (cell->face [1]) flags |= 2; 2084 if (cell->tile [1]) flags |= 2;
1390 if (cell->face [2]) flags |= 4; 2085 if (cell->tile [2]) flags |= 4;
1391 2086
1392 *data++ = flags; 2087 *data++ = flags;
1393 2088
1394 if (flags & 1) 2089 if (flags & 1)
1395 { 2090 {
2091 tileid tile = cell->tile [0];
1396 *data++ = cell->face [0] >> 8; 2092 *data++ = tile >> 8;
1397 *data++ = cell->face [0]; 2093 *data++ = tile;
1398 } 2094 }
1399 2095
1400 if (flags & 2) 2096 if (flags & 2)
1401 { 2097 {
2098 tileid tile = cell->tile [1];
1402 *data++ = cell->face [1] >> 8; 2099 *data++ = tile >> 8;
1403 *data++ = cell->face [1]; 2100 *data++ = tile;
1404 } 2101 }
1405 2102
1406 if (flags & 4) 2103 if (flags & 4)
1407 { 2104 {
2105 tileid tile = cell->tile [2];
1408 *data++ = cell->face [2] >> 8; 2106 *data++ = tile >> 8;
1409 *data++ = cell->face [2]; 2107 *data++ = tile;
1410 } 2108 }
1411 } 2109 }
1412 else 2110 else
1413 *data++ = 0; 2111 *data++ = 0;
1414 } 2112 }
1420} 2118}
1421 OUTPUT: 2119 OUTPUT:
1422 RETVAL 2120 RETVAL
1423 2121
1424void 2122void
1425set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2123set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1426 PPCODE: 2124 PPCODE:
1427{ 2125{
1428 int x, y, z; 2126 int x, y, z;
1429 int w, h; 2127 int w, h;
1430 int x1, y1; 2128 int x1, y1;
1454 { 2152 {
1455 uint8_t flags = *data++; 2153 uint8_t flags = *data++;
1456 2154
1457 if (flags) 2155 if (flags)
1458 { 2156 {
1459 mapface face[3] = { 0, 0, 0 };
1460
1461 mapcell *cell = row_get_cell (row, x); 2157 mapcell *cell = row_get_cell (row, x);
2158 tileid tile[3] = { 0, 0, 0 };
1462 2159
1463 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2160 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1464 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2161 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1465 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2162 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1466 2163
1467 if (cell->darkness <= 0) 2164 if (cell->darkness == 0)
1468 { 2165 {
1469 cell->darkness = -1; 2166 cell->darkness = 0;
1470 2167
1471 for (z = 0; z <= 2; z++) 2168 for (z = 0; z <= 2; z++)
1472 { 2169 {
1473 cell->face[z] = face[z]; 2170 tileid t = tile [z];
1474 2171
1475 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2172 if (t >= self->texs || (t && !self->tex [t].name))
2173 {
1476 XPUSHs (sv_2mortal (newSViv (face[z]))); 2174 XPUSHs (sv_2mortal (newSViv (t)));
2175 need_texid (self, t);
2176 }
2177
2178 cell->tile [z] = t;
1477 } 2179 }
1478 } 2180 }
1479 } 2181 }
1480 } 2182 }
1481 } 2183 }
1482} 2184}
1483 2185
1484MODULE = CFClient PACKAGE = CFClient::MixChunk 2186MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1485 2187
1486CFClient::MixChunk 2188CFPlus::MixChunk
1487new_from_file (SV *class, char *path) 2189new_from_file (SV *class, char *path)
1488 CODE: 2190 CODE:
1489 RETVAL = Mix_LoadWAV (path); 2191 RETVAL = Mix_LoadWAV (path);
1490 OUTPUT: 2192 OUTPUT:
1491 RETVAL 2193 RETVAL
1492 2194
1493void 2195void
1494DESTROY (CFClient::MixChunk self) 2196DESTROY (CFPlus::MixChunk self)
1495 CODE: 2197 CODE:
1496 Mix_FreeChunk (self); 2198 Mix_FreeChunk (self);
1497 2199
1498int 2200int
1499volume (CFClient::MixChunk self, int volume = -1) 2201volume (CFPlus::MixChunk self, int volume = -1)
1500 CODE: 2202 CODE:
1501 RETVAL = Mix_VolumeChunk (self, volume); 2203 RETVAL = Mix_VolumeChunk (self, volume);
1502 OUTPUT: 2204 OUTPUT:
1503 RETVAL 2205 RETVAL
1504 2206
1505int 2207int
1506play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2208play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1507 CODE: 2209 CODE:
1508 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2210 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1509 OUTPUT: 2211 OUTPUT:
1510 RETVAL 2212 RETVAL
1511 2213
1512MODULE = CFClient PACKAGE = CFClient::MixMusic 2214MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1513 2215
1514int 2216int
1515volume (int volume = -1) 2217volume (int volume = -1)
1516 CODE: 2218 CODE:
1517 RETVAL = Mix_VolumeMusic (volume); 2219 RETVAL = Mix_VolumeMusic (volume);
1518 OUTPUT: 2220 OUTPUT:
1519 RETVAL 2221 RETVAL
1520 2222
2223int
2224fade_out (int ms)
2225 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms);
2227 OUTPUT:
2228 RETVAL
2229
1521CFClient::MixMusic 2230CFPlus::MixMusic
1522new_from_file (SV *class, char *path) 2231new_from_file (SV *class, char *path)
1523 CODE: 2232 CODE:
1524 RETVAL = Mix_LoadMUS (path); 2233 RETVAL = Mix_LoadMUS (path);
1525 OUTPUT: 2234 OUTPUT:
1526 RETVAL 2235 RETVAL
1527 2236
1528void 2237void
1529DESTROY (CFClient::MixMusic self) 2238DESTROY (CFPlus::MixMusic self)
1530 CODE: 2239 CODE:
1531 Mix_FreeMusic (self); 2240 Mix_FreeMusic (self);
1532 2241
1533int 2242int
1534play (CFClient::MixMusic self, int loops = -1) 2243play (CFPlus::MixMusic self, int loops = -1)
1535 CODE: 2244 CODE:
1536 RETVAL = Mix_PlayMusic (self, loops); 2245 RETVAL = Mix_PlayMusic (self, loops);
1537 OUTPUT: 2246 OUTPUT:
1538 RETVAL 2247 RETVAL
1539 2248
2249int
2250fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2251 CODE:
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2253 OUTPUT:
2254 RETVAL
2255
1540MODULE = CFClient PACKAGE = CFClient::OpenGL 2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1541 2257
1542BOOT: 2258BOOT:
1543{ 2259{
1544 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2260 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1545 static const struct { 2261 static const struct {
1546 const char *name; 2262 const char *name;
1547 IV iv; 2263 IV iv;
1548 } *civ, const_iv[] = { 2264 } *civ, const_iv[] = {
1549# define const_iv(name) { # name, (IV)name } 2265# define const_iv(name) { # name, (IV)name }
2266 const_iv (GL_VENDOR),
2267 const_iv (GL_VERSION),
2268 const_iv (GL_EXTENSIONS),
1550 const_iv (GL_COLOR_MATERIAL), 2269 const_iv (GL_COLOR_MATERIAL),
1551 const_iv (GL_SMOOTH), 2270 const_iv (GL_SMOOTH),
1552 const_iv (GL_FLAT), 2271 const_iv (GL_FLAT),
1553 const_iv (GL_DITHER), 2272 const_iv (GL_DITHER),
1554 const_iv (GL_BLEND), 2273 const_iv (GL_BLEND),
1556 const_iv (GL_SCISSOR_TEST), 2275 const_iv (GL_SCISSOR_TEST),
1557 const_iv (GL_DEPTH_TEST), 2276 const_iv (GL_DEPTH_TEST),
1558 const_iv (GL_ALPHA_TEST), 2277 const_iv (GL_ALPHA_TEST),
1559 const_iv (GL_NORMALIZE), 2278 const_iv (GL_NORMALIZE),
1560 const_iv (GL_RESCALE_NORMAL), 2279 const_iv (GL_RESCALE_NORMAL),
2280 const_iv (GL_FRONT),
2281 const_iv (GL_BACK),
1561 const_iv (GL_AND), 2282 const_iv (GL_AND),
1562 const_iv (GL_ONE), 2283 const_iv (GL_ONE),
1563 const_iv (GL_ZERO), 2284 const_iv (GL_ZERO),
1564 const_iv (GL_SRC_ALPHA), 2285 const_iv (GL_SRC_ALPHA),
1565 const_iv (GL_SRC_ALPHA_SATURATE), 2286 const_iv (GL_DST_ALPHA),
1566 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2287 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1567 const_iv (GL_ONE_MINUS_DST_ALPHA), 2288 const_iv (GL_ONE_MINUS_DST_ALPHA),
2289 const_iv (GL_SRC_ALPHA_SATURATE),
1568 const_iv (GL_RGB), 2290 const_iv (GL_RGB),
1569 const_iv (GL_RGBA), 2291 const_iv (GL_RGBA),
2292 const_iv (GL_RGBA4),
2293 const_iv (GL_RGBA8),
2294 const_iv (GL_RGB5_A1),
1570 const_iv (GL_UNSIGNED_BYTE), 2295 const_iv (GL_UNSIGNED_BYTE),
1571 const_iv (GL_UNSIGNED_SHORT), 2296 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT), 2297 const_iv (GL_UNSIGNED_INT),
1573 const_iv (GL_ALPHA), 2298 const_iv (GL_ALPHA),
1574 const_iv (GL_INTENSITY), 2299 const_iv (GL_INTENSITY),
1575 const_iv (GL_LUMINANCE), 2300 const_iv (GL_LUMINANCE),
1576 const_iv (GL_LUMINANCE_ALPHA), 2301 const_iv (GL_LUMINANCE_ALPHA),
1577 const_iv (GL_FLOAT), 2302 const_iv (GL_FLOAT),
1578 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2303 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1579 const_iv (GL_COMPILE), 2304 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D),
1580 const_iv (GL_TEXTURE_1D), 2307 const_iv (GL_TEXTURE_1D),
1581 const_iv (GL_TEXTURE_2D), 2308 const_iv (GL_TEXTURE_2D),
1582 const_iv (GL_TEXTURE_ENV), 2309 const_iv (GL_TEXTURE_ENV),
1583 const_iv (GL_TEXTURE_MAG_FILTER), 2310 const_iv (GL_TEXTURE_MAG_FILTER),
1584 const_iv (GL_TEXTURE_MIN_FILTER), 2311 const_iv (GL_TEXTURE_MIN_FILTER),
1585 const_iv (GL_TEXTURE_ENV_MODE), 2312 const_iv (GL_TEXTURE_ENV_MODE),
1586 const_iv (GL_TEXTURE_WRAP_S), 2313 const_iv (GL_TEXTURE_WRAP_S),
1587 const_iv (GL_TEXTURE_WRAP_T), 2314 const_iv (GL_TEXTURE_WRAP_T),
2315 const_iv (GL_REPEAT),
1588 const_iv (GL_CLAMP), 2316 const_iv (GL_CLAMP),
1589 const_iv (GL_REPEAT), 2317 const_iv (GL_CLAMP_TO_EDGE),
1590 const_iv (GL_NEAREST), 2318 const_iv (GL_NEAREST),
1591 const_iv (GL_LINEAR), 2319 const_iv (GL_LINEAR),
1592 const_iv (GL_NEAREST_MIPMAP_NEAREST), 2320 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1593 const_iv (GL_LINEAR_MIPMAP_NEAREST), 2321 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1594 const_iv (GL_NEAREST_MIPMAP_LINEAR), 2322 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1605 const_iv (GL_SEPARABLE_2D), 2333 const_iv (GL_SEPARABLE_2D),
1606 const_iv (GL_CONVOLUTION_2D), 2334 const_iv (GL_CONVOLUTION_2D),
1607 const_iv (GL_CONVOLUTION_BORDER_MODE), 2335 const_iv (GL_CONVOLUTION_BORDER_MODE),
1608 const_iv (GL_CONSTANT_BORDER), 2336 const_iv (GL_CONSTANT_BORDER),
1609 const_iv (GL_LINES), 2337 const_iv (GL_LINES),
2338 const_iv (GL_LINE_STRIP),
1610 const_iv (GL_LINE_LOOP), 2339 const_iv (GL_LINE_LOOP),
1611 const_iv (GL_QUADS), 2340 const_iv (GL_QUADS),
1612 const_iv (GL_QUAD_STRIP), 2341 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES), 2342 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP), 2343 const_iv (GL_TRIANGLE_STRIP),
1622# undef const_iv 2351# undef const_iv
1623 }; 2352 };
1624 2353
1625 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2354 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2355 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2356
2357 texture_av = newAV ();
2358 AvREAL_off (texture_av);
1627} 2359}
2360
2361char *
2362gl_vendor ()
2363 CODE:
2364 RETVAL = (char *)glGetString (GL_VENDOR);
2365 OUTPUT:
2366 RETVAL
2367
2368char *
2369gl_version ()
2370 CODE:
2371 RETVAL = (char *)glGetString (GL_VERSION);
2372 OUTPUT:
2373 RETVAL
2374
2375char *
2376gl_extensions ()
2377 CODE:
2378 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2379 OUTPUT:
2380 RETVAL
2381
2382const char *glGetString (GLenum pname)
2383
2384GLint glGetInteger (GLenum pname)
2385 CODE:
2386 glGetIntegerv (pname, &RETVAL);
2387 OUTPUT:
2388 RETVAL
2389
2390GLdouble glGetDouble (GLenum pname)
2391 CODE:
2392 glGetDoublev (pname, &RETVAL);
2393 OUTPUT:
2394 RETVAL
1628 2395
1629int glGetError () 2396int glGetError ()
2397
2398void glFinish ()
1630 2399
1631void glClear (int mask) 2400void glClear (int mask)
1632 2401
1633void glClearColor (float r, float g, float b, float a = 1.0) 2402void glClearColor (float r, float g, float b, float a = 1.0)
1634 PROTOTYPE: @ 2403 PROTOTYPE: @
1641 2410
1642void glHint (int target, int mode) 2411void glHint (int target, int mode)
1643 2412
1644void glBlendFunc (int sfactor, int dfactor) 2413void glBlendFunc (int sfactor, int dfactor)
1645 2414
2415void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2416 CODE:
2417 gl_BlendFuncSeparate (sa, da, saa, daa);
2418
1646void glDepthMask (int flag) 2419void glDepthMask (int flag)
1647 2420
1648void glLogicOp (int opcode) 2421void glLogicOp (int opcode)
1649 2422
1650void glColorMask (int red, int green, int blue, int alpha) 2423void glColorMask (int red, int green, int blue, int alpha)
1654void glPushMatrix () 2427void glPushMatrix ()
1655 2428
1656void glPopMatrix () 2429void glPopMatrix ()
1657 2430
1658void glLoadIdentity () 2431void glLoadIdentity ()
2432
2433void glDrawBuffer (int buffer)
2434
2435void glReadBuffer (int buffer)
1659 2436
1660# near_ and far_ are due to microsofts buggy "c" compiler 2437# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2438void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662 2439
1663# near_ and far_ are due to microsofts buggy "c" compiler 2440# near_ and far_ are due to microsofts buggy "c" compiler
1683 2460
1684void glEnd () 2461void glEnd ()
1685 2462
1686void glColor (float r, float g, float b, float a = 1.0) 2463void glColor (float r, float g, float b, float a = 1.0)
1687 PROTOTYPE: @ 2464 PROTOTYPE: @
2465 ALIAS:
2466 glColor_premultiply = 1
1688 CODE: 2467 CODE:
2468 if (ix)
2469 {
2470 r *= a;
2471 g *= a;
2472 b *= a;
2473 }
1689 // microsoft visual "c" rounds instead of truncating... 2474 // microsoft visual "c" rounds instead of truncating...
1690 glColor4ub (MIN ((int)(r * 255.f), 255), 2475 glColor4f (r, g, b, a);
1691 MIN ((int)(g * 255.f), 255),
1692 MIN ((int)(b * 255.f), 255),
1693 MIN ((int)(a * 255.f), 255));
1694 2476
1695void glInterleavedArrays (int format, int stride, char *data) 2477void glInterleavedArrays (int format, int stride, char *data)
1696 2478
1697void glDrawElements (int mode, int count, int type, char *indices) 2479void glDrawElements (int mode, int count, int type, char *indices)
1698 2480
1721 2503
1722void glBindTexture (int target, int name) 2504void glBindTexture (int target, int name)
1723 2505
1724void glConvolutionParameter (int target, int pname, float params) 2506void glConvolutionParameter (int target, int pname, float params)
1725 CODE: 2507 CODE:
1726 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2508 if (gl.ConvolutionParameterf)
2509 gl.ConvolutionParameterf (target, pname, params);
1727 2510
1728void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2511void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729 CODE: 2512 CODE:
1730 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2513 if (gl.ConvolutionFilter2D)
1731 (target, internalformat, width, height, format, type, data)); 2514 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732 2515
1733void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2516void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1734 CODE: 2517 CODE:
1735 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2518 if (gl.SeparableFilter2D)
1736 (target, internalformat, width, height, format, type, row, column)); 2519 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737 2520
1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2521void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739 2522
1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2523void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741 2524
1742void glDrawPixels (int width, int height, int format, int type, char *pixels) 2525void glDrawPixels (int width, int height, int format, int type, char *pixels)
2526
2527void glPixelZoom (float x, float y)
1743 2528
1744void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2529void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1745 2530
1746int glGenTexture () 2531int glGenTexture ()
1747 CODE: 2532 CODE:
1748{ 2533 RETVAL = gen_texture ();
1749 GLuint name;
1750 glGenTextures (1, &name);
1751 RETVAL = name;
1752}
1753 OUTPUT: 2534 OUTPUT:
1754 RETVAL 2535 RETVAL
1755 2536
1756void glDeleteTexture (int name) 2537void glDeleteTexture (int name)
1757 CODE: 2538 CODE:
1758{
1759 GLuint name_ = name;
1760 glDeleteTextures (1, &name_); 2539 del_texture (name);
1761} 2540
1762
1763int glGenList () 2541int glGenList ()
1764 CODE: 2542 CODE:
1765 RETVAL = glGenLists (1); 2543 RETVAL = glGenLists (1);
1766 OUTPUT: 2544 OUTPUT:
1767 RETVAL 2545 RETVAL
1774 2552
1775void glEndList () 2553void glEndList ()
1776 2554
1777void glCallList (int list) 2555void glCallList (int list)
1778 2556
1779

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines