ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.206 by root, Thu Jul 19 23:29:16 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines