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.128 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 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
31# include <sys/types.h> 44# include <sys/types.h>
32# include <sys/socket.h> 45# include <sys/socket.h>
33# include <netinet/in.h> 46# include <netinet/in.h>
34# include <netinet/tcp.h> 47# include <netinet/tcp.h>
35# include <inttypes.h> 48# 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 49#endif
44 50
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 52
49#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
50 54
51#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
57# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 62#else
59# define PARACHUTE 0 63# define PARACHUTE 0
60#endif 64#endif
61 65
66static AV *texture_av;
67
62static struct 68static struct
63{ 69{
64#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 71#include "glfunc.h"
66#undef GL_FUNC 72#undef GL_FUNC
67} gl; 73} gl;
68 74
75static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 77{
71 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 82 else
76 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
77} 84}
78 85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
79#include "texcache.c" 110#include "texcache.c"
80 111
81#include "pango-font.c" 112#include "pango-font.c"
82#include "pango-fontmap.c" 113#include "pango-fontmap.c"
83#include "pango-render.c" 114#include "pango-render.c"
84 115
85typedef Mix_Chunk *CFClient__MixChunk; 116typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 117typedef Mix_Music *CFPlus__MixMusic;
87 118
88typedef PangoFontDescription *CFClient__Font; 119typedef PangoFontDescription *CFPlus__Font;
89 120
90static int 121static int
91shape_attr_p (PangoLayoutRun *run) 122shape_attr_p (PangoLayoutRun *run)
92{ 123{
93 GSList *attrs = run->item->analysis.extra_attrs; 124 GSList *attrs = run->item->analysis.extra_attrs;
107 138
108typedef struct cf_layout { 139typedef struct cf_layout {
109 PangoLayout *pl; 140 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 141 float r, g, b, a; // default color for rgba mode
111 int base_height; 142 int base_height;
112 CFClient__Font font; 143 CFPlus__Font font;
113} *CFClient__Layout; 144} *CFPlus__Layout;
114 145
115static CFClient__Font default_font; 146static CFPlus__Font default_font;
116static PangoContext *opengl_context; 147static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 148static PangoFontMap *opengl_fontmap;
118 149
119static void 150static void
120substitute_func (FcPattern *pattern, gpointer data) 151substitute_func (FcPattern *pattern, gpointer data)
125#endif 156#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 158}
128 159
129static void 160static void
130layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
131{ 162{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 163 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
134 */ 165 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
139 170
140 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
141} 172}
142 173
143static void 174static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
147 181
148 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 184
151 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
152} 186 if (!rect.height) rect.height = 1;
153 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
154typedef uint16_t mapface; 193typedef uint16_t faceid;
155 194
156typedef struct { 195typedef struct {
157 GLint name; 196 int name;
158 int w, h; 197 int w, h;
159 float s, t; 198 float s, t;
160 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
161} maptex; 202} maptex;
162 203
163typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
164 int16_t darkness; 207 uint16_t darkness;
165 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 209} mapcell;
167 210
168typedef struct { 211typedef struct {
169 int32_t c0, c1; 212 int32_t c0, c1;
170 mapcell *col; 213 mapcell *col;
171} maprow; 214} maprow;
172 215
173typedef struct map { 216typedef struct map {
174 int x, y, w, h; 217 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 219 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 220 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 221
182 int32_t rows; 222 int32_t rows;
183 maprow *row; 223 maprow *row;
184} *CFClient__Map; 224} *CFPlus__Map;
185 225
186static char * 226static char *
187prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
188{ 228{
189 char *p; 229 char *p;
206} 246}
207 247
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
209#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
270
211static maprow * 271static maprow *
212map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
213{ 273{
214 if (0 > y) 274 if (0 > y)
215 { 275 {
216 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
255 315
256 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
257} 317}
258 318
259static mapcell * 319static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
261{ 321{
262 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
263} 323}
264 324
265static void 325static void
266map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
267{ 327{
268 int r; 328 int r;
269 329
270 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
279 self->row = 0; 339 self->row = 0;
280 self->rows = 0; 340 self->rows = 0;
281} 341}
282 342
283static void 343static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
285{ 345{
286 int x, y; 346 int x, y;
287 maprow *row; 347 maprow *row;
348 mapcell *cell;
288 349
289 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 351 if (y >= 0)
291 { 352 {
292 if (y >= self->rows) 353 if (y >= self->rows)
298 if (x >= row->c0) 359 if (x >= row->c0)
299 { 360 {
300 if (x >= row->c1) 361 if (x >= row->c1)
301 break; 362 break;
302 363
303 row->col[x - row->c0].darkness = -1; 364 cell = row->col + x - row->c0;
365
366 cell->darkness = 0;
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
304 } 370 }
305 } 371 }
372}
373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
306} 388}
307 389
308static void 390static void
309music_finished (void) 391music_finished (void)
310{ 392{
346 n |= n >> 16; 428 n |= n >> 16;
347 429
348 return n + 1; 430 return n + 1;
349} 431}
350 432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
436
351MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
352 438
353PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
354 440
355BOOT: 441BOOT:
356{ 442{
357 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 444 static const struct {
359 const char *name; 445 const char *name;
360 IV iv; 446 IV iv;
361 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
363 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
376 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
380 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
381 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
440 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
445 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL),
458 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_ALT),
460 const_iv (KMOD_META)
461# undef const_iv 556# undef const_iv
462 }; 557 };
463 558
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
571
572int
573in_destruct ()
574 CODE:
575 RETVAL = PL_main_cv == Nullcv;
576 OUTPUT:
577 RETVAL
467 578
468NV floor (NV x) 579NV floor (NV x)
469 580
470NV ceil (NV x) 581NV ceil (NV x)
471 582
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 616
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
507 622
508 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
510 625
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
531 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
533 ); 648 );
534 if (RETVAL) 649 if (RETVAL)
535 { 650 {
651 av_clear (texture_av);
652
536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h" 655# include "glfunc.h"
539# undef GL_FUNC 656# undef GL_FUNC
657
540 } 658 }
541 OUTPUT: 659 OUTPUT:
542 RETVAL 660 RETVAL
543 661
544void 662void
545SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
546 664
547char * 665char *
548SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
549 667
668int
669SDL_GetAppState ()
670
550void 671void
551SDL_PollEvent () 672poll_events ()
552 PPCODE: 673 PPCODE:
553{ 674{
554 SDL_Event ev; 675 SDL_Event ev;
555 676
556 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
557 { 679 {
558 HV *hv = newHV (); 680 HV *hv = newHV ();
559 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
560 682
561 switch (ev.type) 683 switch (ev.type)
563 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
564 case SDL_KEYUP: 686 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 692 break;
570 693
571 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
574 break; 697 break;
575 698
576 case SDL_MOUSEMOTION: 699 case SDL_MOUSEMOTION:
700 {
701 int state = ev.motion.state;
702 int x = ev.motion.x;
703 int y = ev.motion.y;
704 int xrel = ev.motion.xrel;
705 int yrel = ev.motion.yrel;
706
707 /* do simplistic event compression */
708 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
709 && state == ev.motion.state)
710 {
711 xrel += ev.motion.xrel;
712 yrel += ev.motion.yrel;
713 x = ev.motion.x;
714 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 }
717
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
578
579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
584 break; 725 break;
585 726
586 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
587 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 739 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 740 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 741 break;
601 } 742 }
602 743
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 744 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604 } 745 }
605} 746}
606 747
607int 748int
608Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 749Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
617Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
618 759
619void 760void
620lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
621 CODE: 762 CODE:
763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
764
765void
766win32_proxy_info ()
767 PPCODE:
768{
622#ifndef _WIN32 769#ifdef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 770 char buffer[2048];
771 DWORD buflen;
772
773 EXTEND (SP, 3);
774
775 buflen = sizeof (buffer);
776 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
777 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
778 {
779 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
780
781 buflen = sizeof (buffer);
782 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
783 {
784 PUSHs (newSVpv (buffer, 0));
785
786 buflen = sizeof (buffer);
787 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
788 PUSHs (newSVpv (buffer, 0));
789 }
790 }
624#endif 791#endif
792}
625 793
626void 794void
627add_font (char *file) 795add_font (char *file)
628 CODE: 796 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 797 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 798
631void 799void
632load_image_inline (SV *image_) 800load_image_inline (SV *image_)
633 ALIAS: 801 ALIAS:
634 load_image_file = 1 802 load_image_file = 1
676 844
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 845 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 846
679 assert (surface2->pitch == surface2->w * 4); 847 assert (surface2->pitch == surface2->w * 4);
680 848
849 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 850 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 851 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 852 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 853 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 854 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 855 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 856 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
857 SDL_UnlockSurface (surface2);
690 858
691 SDL_FreeSurface (surface); 859 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 860 SDL_FreeSurface (surface2);
693} 861}
694 862
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 901 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 902#endif
735 _exit (1); 903 _exit (1);
736 904
737void 905void
738_exit (int retval) 906_exit (int retval = 0)
739 CODE: 907 CODE:
908#ifdef WIN32
909 ExitThread (retval); // unclean, please beam me up
910#else
740 _exit (retval); 911 _exit (retval);
912#endif
741 913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
922
742MODULE = CFClient PACKAGE = CFClient::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
743 924
744CFClient::Font 925CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
746 CODE: 927 CODE:
747{ 928{
748 int count; 929 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 930 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
752} 933}
753 OUTPUT: 934 OUTPUT:
754 RETVAL 935 RETVAL
755 936
756void 937void
757DESTROY (CFClient::Font self) 938DESTROY (CFPlus::Font self)
758 CODE: 939 CODE:
759 pango_font_description_free (self); 940 pango_font_description_free (self);
760 941
761void 942void
762make_default (CFClient::Font self) 943make_default (CFPlus::Font self)
763 CODE: 944 CODE:
764 default_font = self; 945 default_font = self;
765 946
766MODULE = CFClient PACKAGE = CFClient::Layout 947MODULE = CFPlus PACKAGE = CFPlus::Layout
767 948
768void 949void
769clear_font_cache () 950reset_glyph_cache ()
770 CODE: 951 CODE:
771 tc_clear (); 952 tc_clear ();
772 953
773CFClient::Layout 954CFPlus::Layout
774new (SV *class) 955new (SV *class)
775 CODE: 956 CODE:
776 New (0, RETVAL, 1, struct cf_layout); 957 New (0, RETVAL, 1, struct cf_layout);
777 958
778 RETVAL->pl = pango_layout_new (opengl_context); 959 RETVAL->pl = pango_layout_new (opengl_context);
787 layout_update_font (RETVAL); 968 layout_update_font (RETVAL);
788 OUTPUT: 969 OUTPUT:
789 RETVAL 970 RETVAL
790 971
791void 972void
792DESTROY (CFClient::Layout self) 973DESTROY (CFPlus::Layout self)
793 CODE: 974 CODE:
794 g_object_unref (self->pl); 975 g_object_unref (self->pl);
795 Safefree (self); 976 Safefree (self);
796 977
797void 978void
798set_text (CFClient::Layout self, SV *text_) 979set_text (CFPlus::Layout self, SV *text_)
799 CODE: 980 CODE:
800{ 981{
801 STRLEN textlen; 982 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 983 char *text = SvPVutf8 (text_, textlen);
803 984
804 pango_layout_set_text (self->pl, text, textlen); 985 pango_layout_set_text (self->pl, text, textlen);
805} 986}
806 987
807void 988void
808set_markup (CFClient::Layout self, SV *text_) 989set_markup (CFPlus::Layout self, SV *text_)
809 CODE: 990 CODE:
810{ 991{
811 STRLEN textlen; 992 STRLEN textlen;
812 char *text = SvPVutf8 (text_, textlen); 993 char *text = SvPVutf8 (text_, textlen);
813 994
814 pango_layout_set_markup (self->pl, text, textlen); 995 pango_layout_set_markup (self->pl, text, textlen);
815} 996}
816 997
817void 998void
818set_shapes (CFClient::Layout self, ...) 999set_shapes (CFPlus::Layout self, ...)
819 CODE: 1000 CODE:
820{ 1001{
821 PangoAttrList *attrs = 0; 1002 PangoAttrList *attrs = 0;
822 const char *text = pango_layout_get_text (self->pl); 1003 const char *text = pango_layout_get_text (self->pl);
823 const char *pos = text; 1004 const char *pos = text;
858 if (attrs) 1039 if (attrs)
859 pango_layout_set_attributes (self->pl, attrs); 1040 pango_layout_set_attributes (self->pl, attrs);
860} 1041}
861 1042
862void 1043void
863get_shapes (CFClient::Layout self) 1044get_shapes (CFPlus::Layout self)
864 PPCODE: 1045 PPCODE:
865{ 1046{
866 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1047 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867 1048
868 do 1049 do
872 if (run && shape_attr_p (run)) 1053 if (run && shape_attr_p (run))
873 { 1054 {
874 PangoRectangle extents; 1055 PangoRectangle extents;
875 pango_layout_iter_get_run_extents (iter, 0, &extents); 1056 pango_layout_iter_get_run_extents (iter, 0, &extents);
876 1057
1058 EXTEND (SP, 2);
877 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1059 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1060 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879 } 1061 }
880 } 1062 }
881 while (pango_layout_iter_next_run (iter)); 1063 while (pango_layout_iter_next_run (iter));
882 1064
883 pango_layout_iter_free (iter); 1065 pango_layout_iter_free (iter);
884} 1066}
885 1067
886int 1068int
887has_wrapped (CFClient::Layout self) 1069has_wrapped (CFPlus::Layout self)
888 CODE: 1070 CODE:
889{ 1071{
890 int lines = 1; 1072 int lines = 1;
891 const char *text = pango_layout_get_text (self->pl); 1073 const char *text = pango_layout_get_text (self->pl);
892 1074
897} 1079}
898 OUTPUT: 1080 OUTPUT:
899 RETVAL 1081 RETVAL
900 1082
901SV * 1083SV *
902get_text (CFClient::Layout self) 1084get_text (CFPlus::Layout self)
903 CODE: 1085 CODE:
904 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1086 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
905 sv_utf8_decode (RETVAL); 1087 sv_utf8_decode (RETVAL);
906 OUTPUT: 1088 OUTPUT:
907 RETVAL 1089 RETVAL
908 1090
909void 1091void
910set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1092set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
911 CODE: 1093 CODE:
912 self->r = r; 1094 self->r = r;
913 self->g = g; 1095 self->g = g;
914 self->b = b; 1096 self->b = b;
915 self->a = a; 1097 self->a = a;
916 1098
917void 1099void
918set_font (CFClient::Layout self, CFClient::Font font = 0) 1100set_font (CFPlus::Layout self, CFPlus::Font font = 0)
919 CODE: 1101 CODE:
920 if (self->font != font) 1102 if (self->font != font)
921 { 1103 {
922 self->font = font; 1104 self->font = font;
923 layout_update_font (self); 1105 layout_update_font (self);
924 } 1106 }
925 1107
926void 1108void
927set_height (CFClient::Layout self, int base_height) 1109set_height (CFPlus::Layout self, int base_height)
928 CODE: 1110 CODE:
929 if (self->base_height != base_height) 1111 if (self->base_height != base_height)
930 { 1112 {
931 self->base_height = base_height; 1113 self->base_height = base_height;
932 layout_update_font (self); 1114 layout_update_font (self);
933 } 1115 }
934 1116
935void 1117void
936set_width (CFClient::Layout self, int max_width = -1) 1118set_width (CFPlus::Layout self, int max_width = -1)
937 CODE: 1119 CODE:
938 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1120 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
939 1121
940void 1122void
941set_indent (CFClient::Layout self, int indent) 1123set_indent (CFPlus::Layout self, int indent)
942 CODE: 1124 CODE:
943 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1125 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
944 1126
945void 1127void
946set_spacing (CFClient::Layout self, int spacing) 1128set_spacing (CFPlus::Layout self, int spacing)
947 CODE: 1129 CODE:
948 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1130 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
949 1131
950void 1132void
951set_ellipsise (CFClient::Layout self, int ellipsise) 1133set_ellipsise (CFPlus::Layout self, int ellipsise)
952 CODE: 1134 CODE:
953 pango_layout_set_ellipsize (self->pl, 1135 pango_layout_set_ellipsize (self->pl,
954 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1136 ellipsise == 1 ? PANGO_ELLIPSIZE_START
955 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1137 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
956 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1138 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
957 : PANGO_ELLIPSIZE_NONE 1139 : PANGO_ELLIPSIZE_NONE
958 ); 1140 );
959 1141
960void 1142void
961set_single_paragraph_mode (CFClient::Layout self, int spm) 1143set_single_paragraph_mode (CFPlus::Layout self, int spm)
962 CODE: 1144 CODE:
963 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1145 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
964 1146
965void 1147void
966size (CFClient::Layout self) 1148size (CFPlus::Layout self)
967 PPCODE: 1149 PPCODE:
968{ 1150{
969 int w, h; 1151 int w, h;
970 1152
971 layout_get_pixel_size (self, &w, &h); 1153 layout_get_pixel_size (self, &w, &h);
974 PUSHs (sv_2mortal (newSViv (w))); 1156 PUSHs (sv_2mortal (newSViv (w)));
975 PUSHs (sv_2mortal (newSViv (h))); 1157 PUSHs (sv_2mortal (newSViv (h)));
976} 1158}
977 1159
978int 1160int
979descent (CFClient::Layout self) 1161descent (CFPlus::Layout self)
980 CODE: 1162 CODE:
981{ 1163{
982 PangoRectangle rect; 1164 PangoRectangle rect;
983 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1165 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
984 pango_layout_line_get_pixel_extents (line, 0, &rect); 1166 pango_layout_line_get_pixel_extents (line, 0, &rect);
986} 1168}
987 OUTPUT: 1169 OUTPUT:
988 RETVAL 1170 RETVAL
989 1171
990int 1172int
991xy_to_index (CFClient::Layout self, int x, int y) 1173xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1174 CODE:
993{ 1175{
994 int index, trailing; 1176 int index, trailing;
995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996 RETVAL = index; 1178 RETVAL = index + trailing;
997} 1179}
998 OUTPUT: 1180 OUTPUT:
999 RETVAL 1181 RETVAL
1000 1182
1001void 1183void
1002cursor_pos (CFClient::Layout self, int index) 1184cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1185 PPCODE:
1004{ 1186{
1005 PangoRectangle strong_pos; 1187 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1188 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1189
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1194}
1013 1195
1014void 1196void
1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1198 PPCODE:
1199{
1200 int line, x;
1201
1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1204
1205 EXTEND (SP, 2);
1206 PUSHs (sv_2mortal (newSViv (line - 1)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208}
1209
1210void
1211line_x_to_index (CFPlus::Layout self, int line, int x)
1212 PPCODE:
1213{
1214 PangoLayoutLine *lp;
1215 int index, trailing;
1216
1217 if (line < 0)
1218 XSRETURN_EMPTY;
1219
1220 if (!(lp = pango_layout_get_line (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */
1222
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224
1225 EXTEND (SP, 2);
1226 if (GIMME_V == G_SCALAR)
1227 PUSHs (sv_2mortal (newSViv (index + trailing)));
1228 else
1229 {
1230 PUSHs (sv_2mortal (newSViv (index)));
1231 PUSHs (sv_2mortal (newSViv (trailing)));
1232 }
1233}
1234
1235void
1015render (CFClient::Layout self, float x, float y) 1236render (CFPlus::Layout self, float x, float y, int flags = 0)
1016 PPCODE: 1237 PPCODE:
1017 pango_opengl_render_layout_subpixel ( 1238 pango_opengl_render_layout_subpixel (
1018 self->pl, 1239 self->pl,
1019 x * PANGO_SCALE, y * PANGO_SCALE, 1240 x * PANGO_SCALE, y * PANGO_SCALE,
1020 self->r, self->g, self->b, self->a 1241 self->r, self->g, self->b, self->a,
1242 flags
1021 ); 1243 );
1022 1244
1023MODULE = CFClient PACKAGE = CFClient::Texture 1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1246
1247int minpot (int n)
1024 1248
1025void 1249void
1026pad2pot (SV *data_, SV *w_, SV *h_) 1250pad2pot (SV *data_, SV *w_, SV *h_)
1027 CODE: 1251 CODE:
1028{ 1252{
1106 glDisable (GL_ALPHA_TEST); 1330 glDisable (GL_ALPHA_TEST);
1107 glDisable (GL_BLEND); 1331 glDisable (GL_BLEND);
1108 } 1332 }
1109} 1333}
1110 1334
1335IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1336 CODE:
1337{
1338 GLint width;
1339 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1340 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1341 RETVAL = width > 0;
1342}
1343 OUTPUT:
1344 RETVAL
1345
1111MODULE = CFClient PACKAGE = CFClient::Map 1346MODULE = CFPlus PACKAGE = CFPlus::Map
1112 1347
1113CFClient::Map 1348CFPlus::Map
1114new (SV *class, int map_width, int map_height) 1349new (SV *class)
1115 CODE: 1350 CODE:
1116 New (0, RETVAL, 1, struct map); 1351 New (0, RETVAL, 1, struct map);
1117 RETVAL->x = 0; 1352 RETVAL->x = 0;
1118 RETVAL->y = 0; 1353 RETVAL->y = 0;
1119 RETVAL->w = map_width; 1354 RETVAL->w = 0;
1120 RETVAL->h = map_height; 1355 RETVAL->h = 0;
1121 RETVAL->ox = 0; 1356 RETVAL->ox = 0;
1122 RETVAL->oy = 0; 1357 RETVAL->oy = 0;
1123 RETVAL->faces = 8192; 1358 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1124 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1359 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1125 RETVAL->texs = 8192;
1126 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1127 RETVAL->rows = 0; 1360 RETVAL->rows = 0;
1128 RETVAL->row = 0; 1361 RETVAL->row = 0;
1129 OUTPUT: 1362 OUTPUT:
1130 RETVAL 1363 RETVAL
1131 1364
1132void 1365void
1133DESTROY (CFClient::Map self) 1366DESTROY (CFPlus::Map self)
1134 CODE: 1367 CODE:
1135{ 1368{
1136 map_clear (self); 1369 map_clear (self);
1137 Safefree (self->face); 1370 Safefree (self->face2tile);
1138 Safefree (self->tex); 1371 Safefree (self->tex);
1139 Safefree (self); 1372 Safefree (self);
1140} 1373}
1141 1374
1142void 1375void
1376resize (CFPlus::Map self, int map_width, int map_height)
1377 CODE:
1378 self->w = map_width;
1379 self->h = map_height;
1380
1381void
1143clear (CFClient::Map self) 1382clear (CFPlus::Map self)
1144 CODE: 1383 CODE:
1145 map_clear (self); 1384 map_clear (self);
1146 1385
1147void 1386void
1148set_face (CFClient::Map self, int face, int texid) 1387set_tileid (CFPlus::Map self, int face, int tile)
1149 CODE: 1388 CODE:
1150{ 1389{
1151 while (self->faces <= face) 1390 need_facenum (self, face); self->face2tile [face] = tile;
1152 { 1391 need_texid (self, tile);
1153 Append (mapface, self->face, self->faces, self->faces);
1154 self->faces *= 2;
1155 }
1156
1157 self->face [face] = texid;
1158} 1392}
1159 1393
1160void 1394void
1395set_smooth (CFPlus::Map self, int face, int smooth, int level)
1396 CODE:
1397{
1398 tileid texid;
1399 maptex *tex;
1400
1401 if (face < 0 || face >= self->faces)
1402 return;
1403
1404 if (smooth < 0 || smooth >= self->faces)
1405 return;
1406
1407 texid = self->face2tile [face];
1408
1409 if (!texid)
1410 return;
1411
1412 tex = self->tex + texid;
1413 tex->smoothtile = self->face2tile [smooth];
1414 tex->smoothlevel = level;
1415}
1416
1417void
1161set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1418set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1162 CODE: 1419 CODE:
1163{ 1420{
1164 while (self->texs <= texid) 1421 need_texid (self, texid);
1165 {
1166 Append (maptex, self->tex, self->texs, self->texs);
1167 self->texs *= 2;
1168 }
1169 1422
1170 { 1423 {
1171 maptex *tex = self->tex + texid; 1424 maptex *tex = self->tex + texid;
1172 1425
1173 tex->name = name; 1426 tex->name = name;
1190 // from transparent color bleeding and ugly wrapping effects. 1443 // from transparent color bleeding and ugly wrapping effects.
1191 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1444 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1192} 1445}
1193 1446
1194int 1447int
1195ox (CFClient::Map self) 1448ox (CFPlus::Map self)
1196 ALIAS: 1449 ALIAS:
1197 oy = 1 1450 oy = 1
1198 x = 2 1451 x = 2
1199 y = 3 1452 y = 3
1200 w = 4 1453 w = 4
1211 } 1464 }
1212 OUTPUT: 1465 OUTPUT:
1213 RETVAL 1466 RETVAL
1214 1467
1215void 1468void
1216scroll (CFClient::Map self, int dx, int dy) 1469scroll (CFPlus::Map self, int dx, int dy)
1217 CODE: 1470 CODE:
1218{ 1471{
1219 if (dx > 0) 1472 if (dx > 0)
1220 map_blank (self, self->x, self->y, dx - 1, self->h); 1473 map_blank (self, self->x, self->y, dx, self->h);
1221 else if (dx < 0) 1474 else if (dx < 0)
1222 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1475 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1223 1476
1224 if (dy > 0) 1477 if (dy > 0)
1225 map_blank (self, self->x, self->y, self->w, dy - 1); 1478 map_blank (self, self->x, self->y, self->w, dy);
1226 else if (dy < 0) 1479 else if (dy < 0)
1227 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1480 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1228 1481
1229 self->ox += dx; self->x += dx; 1482 self->ox += dx; self->x += dx;
1230 self->oy += dy; self->y += dy; 1483 self->oy += dy; self->y += dy;
1231 1484
1232 while (self->y < 0) 1485 while (self->y < 0)
1237 self->y += MAP_EXTEND_Y; 1490 self->y += MAP_EXTEND_Y;
1238 } 1491 }
1239} 1492}
1240 1493
1241void 1494void
1242map1a_update (CFClient::Map self, SV *data_) 1495map1a_update (CFPlus::Map self, SV *data_, int extmap)
1243 CODE: 1496 CODE:
1244{ 1497{
1245 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1498 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1246 uint8_t *data_end = (uint8_t *)SvEND (data_); 1499 uint8_t *data_end = (uint8_t *)SvEND (data_);
1247 mapcell *cell; 1500 mapcell *cell;
1248 int x, y, flags; 1501 int x, y, flags;
1249 1502
1250 while (data < data_end) 1503 while (data < data_end - 1)
1251 { 1504 {
1252 flags = (data [0] << 8) + data [1]; data += 2; 1505 flags = (data [0] << 8) + data [1]; data += 2;
1253 1506
1254 x = self->x + ((flags >> 10) & 63); 1507 x = self->x + ((flags >> 10) & 63);
1255 y = self->y + ((flags >> 4) & 63); 1508 y = self->y + ((flags >> 4) & 63);
1256 1509
1257 cell = map_get_cell (self, x, y); 1510 cell = map_get_cell (self, x, y);
1258 1511
1259 if (flags & 15) 1512 if (flags & 15)
1260 { 1513 {
1261 if (cell->darkness < 0) 1514 if (!cell->darkness)
1262 { 1515 {
1516 memset (cell, 0, sizeof (*cell));
1263 cell->darkness = 0; 1517 cell->darkness = 256;
1264 cell->face [0] = 0;
1265 cell->face [1] = 0;
1266 cell->face [2] = 0;
1267 } 1518 }
1268 1519
1269 cell->darkness = flags & 8 ? *data++ : 255;
1270
1271 //TODO: don't trust server data to be in-range(!) 1520 //TODO: don't trust server data to be in-range(!)
1521
1522 if (flags & 8)
1523 {
1524 if (extmap)
1525 {
1526 uint8_t ext, cmd;
1527
1528 do
1529 {
1530 ext = *data++;
1531 cmd = ext & 0x3f;
1532
1533 if (cmd < 4)
1534 cell->darkness = 255 - ext * 64 + 1;
1535 else if (cmd == 5) // health
1536 {
1537 cell->stat_width = 1;
1538 cell->stat_hp = *data++;
1539 }
1540 else if (cmd == 6) // monster width
1541 cell->stat_width = *data++ + 1;
1542 else if (cmd == 0x47)
1543 {
1544 if (*data == 4)
1545 ; // decode player count
1546
1547 data += *data + 1;
1548 }
1549 else if (cmd == 8) // cell flags
1550 cell->flags = *data++;
1551 else if (ext & 0x40) // unknown, multibyte => skip
1552 data += *data + 1;
1553 else
1554 data++;
1555 }
1556 while (ext & 0x80);
1557 }
1558 else
1559 cell->darkness = *data++ + 1;
1560 }
1272 1561
1273 if (flags & 4) 1562 if (flags & 4)
1274 { 1563 {
1275 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1564 faceid face = (data [0] << 8) + data [1]; data += 2;
1565 need_facenum (self, face);
1566 cell->tile [0] = self->face2tile [face];
1276 } 1567 }
1277 1568
1278 if (flags & 2) 1569 if (flags & 2)
1279 { 1570 {
1280 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1571 faceid face = (data [0] << 8) + data [1]; data += 2;
1572 need_facenum (self, face);
1573 cell->tile [1] = self->face2tile [face];
1281 } 1574 }
1282 1575
1283 if (flags & 1) 1576 if (flags & 1)
1284 { 1577 {
1285 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1578 faceid face = (data [0] << 8) + data [1]; data += 2;
1579 need_facenum (self, face);
1580 cell->tile [2] = self->face2tile [face];
1286 } 1581 }
1287 } 1582 }
1288 else 1583 else
1289 cell->darkness = -1; 1584 cell->darkness = 0;
1290 } 1585 }
1291} 1586}
1292 1587
1293SV * 1588SV *
1294mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1589mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1295 CODE: 1590 CODE:
1296{ 1591{
1297 int x1, x; 1592 int x1, x;
1298 int y1, y; 1593 int y1, y;
1299 int z; 1594 int z;
1320 { 1615 {
1321 mapcell *cell = row->col + (x - row->c0); 1616 mapcell *cell = row->col + (x - row->c0);
1322 1617
1323 for (z = 0; z <= 0; z++) 1618 for (z = 0; z <= 0; z++)
1324 { 1619 {
1325 mapface face = cell->face [z];
1326
1327 if (face)
1328 {
1329 maptex tex = self->tex [face]; 1620 maptex tex = self->tex [cell->tile [z]];
1330 int a0 = 255 - tex.a; 1621 int a0 = 255 - tex.a;
1331 int a1 = tex.a; 1622 int a1 = tex.a;
1332 1623
1333 r = (r * a0 + tex.r * a1) / 255; 1624 r = (r * a0 + tex.r * a1) / 255;
1334 g = (g * a0 + tex.g * a1) / 255; 1625 g = (g * a0 + tex.g * a1) / 255;
1335 b = (b * a0 + tex.b * a1) / 255; 1626 b = (b * a0 + tex.b * a1) / 255;
1336 a = (a * a0 + tex.a * a1) / 255; 1627 a = (a * a0 + tex.a * a1) / 255;
1337 }
1338 } 1628 }
1339 } 1629 }
1340 1630
1341 *map++ = (r ) 1631 *map++ = (r )
1342 | (g << 8) 1632 | (g << 8)
1349} 1639}
1350 OUTPUT: 1640 OUTPUT:
1351 RETVAL 1641 RETVAL
1352 1642
1353void 1643void
1354draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1644draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1355 CODE: 1645 CODE:
1356{ 1646{
1357 int vx, vy; 1647 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1648 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1649 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1650 smooth_key skey;
1358 int x, y, z; 1651 int x, y, z;
1359 int last_name; 1652 int last_name;
1360 mapface face;
1361 1653
1362 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1654 // thats current max. sorry.
1363 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1655 if (sw > 255) sw = 255;
1656 if (sh > 255) sh = 255;
1364 1657
1365 /* 1658 // clear key, in case of extra padding
1366 int vx = self->vx = self->w >= sw 1659 memset (&skey, 0, sizeof (skey));
1367 ? self->x + (self->w - sw) / 2
1368 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1369
1370 int vy = self->vy = self->h >= sh
1371 ? self->y + (self->h - sh) / 2
1372 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1373 */
1374 1660
1375 glColor4ub (255, 255, 255, 255); 1661 glColor4ub (255, 255, 255, 255);
1376 1662
1377 glEnable (GL_BLEND); 1663 glEnable (GL_BLEND);
1378 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1664 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1381 1667
1382 glBegin (GL_QUADS); 1668 glBegin (GL_QUADS);
1383 1669
1384 last_name = 0; 1670 last_name = 0;
1385 1671
1672 mx += self->x;
1673 my += self->y;
1674
1675 // first pass: determine smooth_max
1676 // rather ugly, if you ask me
1677 // could also be stored inside mapcell and updated on change
1678 memset (smooth_max, 0, sizeof (smooth_max));
1679
1680 for (y = 0; y < sh; y++)
1681 if (0 <= y + my && y + my < self->rows)
1682 {
1683 maprow *row = self->row + (y + my);
1684
1685 for (x = 0; x < sw; x++)
1686 if (row->c0 <= x + mx && x + mx < row->c1)
1687 {
1688 mapcell *cell = row->col + (x + mx - row->c0);
1689
1690 smooth_max[x + 1][y + 1] =
1691 MAX (self->tex [cell->tile [0]].smoothlevel,
1692 MAX (self->tex [cell->tile [1]].smoothlevel,
1693 self->tex [cell->tile [2]].smoothlevel));
1694 }
1695 }
1696
1386 for (z = 0; z < 3; z++) 1697 for (z = 0; z <= 2; z++)
1698 {
1699 memset (smooth_level, 0, sizeof (smooth_level));
1700
1387 for (y = 0; y < sh; y++) 1701 for (y = 0; y < sh; y++)
1388 if (0 <= y + vy && y + vy < self->rows) 1702 if (0 <= y + my && y + my < self->rows)
1389 { 1703 {
1390 maprow *row = self->row + (y + vy); 1704 maprow *row = self->row + (y + my);
1391 1705
1392 for (x = 0; x < sw; x++) 1706 for (x = 0; x < sw; x++)
1393 if (row->c0 <= x + vx && x + vx < row->c1) 1707 if (row->c0 <= x + mx && x + mx < row->c1)
1394 { 1708 {
1395 mapcell *cell = row->col + (x + vx - row->c0); 1709 mapcell *cell = row->col + (x + mx - row->c0);
1396
1397 face = cell->face [z]; 1710 tileid tile = cell->tile [z];
1398 1711
1399 if (face) 1712 if (tile)
1713 {
1714 maptex tex = self->tex [tile];
1715 int px = (x + 1) * T - tex.w;
1716 int py = (y + 1) * T - tex.h;
1717
1718 // suppressing texture state switches here
1719 // is only moderately effective, but worth the extra effort
1720 if (last_name != tex.name)
1721 {
1722 if (!tex.name)
1723 tex = self->tex [2]; /* missing, replace by noface */
1724
1725 glEnd ();
1726 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1727 glBegin (GL_QUADS);
1728 }
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1734
1735 if (cell->flags && z == 2)
1736 {
1737 if (cell->flags & 1)
1738 {
1739 maptex tex = self->tex [1];
1740 int px = x * T + T * 2 / 32;
1741 int py = y * T - T * 6 / 32;
1742
1743 glEnd ();
1744 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1745 glBegin (GL_QUADS);
1746
1747 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1748 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1749 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1750 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1751 }
1752 }
1753
1754 // update smooth hash
1755 if (tex.smoothtile)
1756 {
1757 skey.tile = tex.smoothtile;
1758 skey.level = tex.smoothlevel;
1759
1760 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1761
1762 // add bits to current tile and all neighbours. skey.x|y is
1763 // shifted +1|+1 so we always stay positive.
1764
1765 // bits is ___n cccc CCCC bbbb
1766 // n do not draw borders&corners
1767 // c draw these corners, but...
1768 // C ... not these
1769 // b draw these borders
1770
1771 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1772 // ┃· ·· ·┃ ━━
1773
1774 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1775 // ·· ·· ·┏ ┓·
1776
1777 // full tile
1778 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1779
1780 // borders
1781 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1782 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1783 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1784 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1785
1786 // corners
1787 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1788 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1789 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1790 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1791 }
1792 }
1793 }
1794 }
1795
1796 // go through all smoothlevels, lowest to highest, then draw.
1797 // this is basically counting sort
1798 {
1799 int w, b;
1800
1801 for (w = 0; w < 256 / 32; ++w)
1802 {
1803 uint32_t smask = smooth_level [w];
1804 if (smask)
1805 for (b = 0; b < 32; ++b)
1806 if (smask & (((uint32_t)1) << b))
1400 { 1807 {
1401 maptex tex = self->tex [face]; 1808 int level = (w << 5) | b;
1809 HE *he;
1402 1810
1403 int px = (x + 1) * 32 - tex.w; 1811 hv_iterinit (smooth);
1404 int py = (y + 1) * 32 - tex.h; 1812 while ((he = hv_iternext (smooth)))
1405
1406 if (last_name != tex.name)
1407 { 1813 {
1814 smooth_key *skey = (smooth_key *)HeKEY (he);
1815 IV bits = SvIVX (HeVAL (he));
1816
1817 if (!(bits & 0x1000)
1818 && skey->level == level
1819 && level > smooth_max [skey->x][skey->y])
1820 {
1821 maptex tex = self->tex [skey->tile];
1822 int px = (((int)skey->x) - 1) * T;
1823 int py = (((int)skey->y) - 1) * T;
1824 int border = bits & 15;
1825 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1826 float dx = tex.s * .0625f; // 16 images/row
1827 float dy = tex.t * .5f ; // 2 images/column
1828
1829 // this time naively avoiding texture state changes
1830 // save gobs of state changes.
1831 if (last_name != tex.name)
1832 {
1833 if (!tex.name)
1834 continue; // smoothing not yet available
1835
1408 glEnd (); 1836 glEnd ();
1409 last_name = tex.name;
1410 glBindTexture (GL_TEXTURE_2D, last_name); 1837 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1411 glBegin (GL_QUADS); 1838 glBegin (GL_QUADS);
1839 }
1840
1841 if (border)
1842 {
1843 float ox = border * dx;
1844
1845 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1846 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1847 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1848 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1849 }
1850
1851 if (corner)
1852 {
1853 float ox = corner * dx;
1854
1855 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1856 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1857 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1858 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1859 }
1860 }
1412 } 1861 }
1413
1414 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1415 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1416 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1417 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1418 } 1862 }
1419 }
1420 } 1863 }
1864 }
1865
1866 hv_clear (smooth);
1867 }
1421 1868
1422 glEnd (); 1869 glEnd ();
1423 1870
1424 glDisable (GL_TEXTURE_2D); 1871 glDisable (GL_TEXTURE_2D);
1425 glDisable (GL_BLEND); 1872 glDisable (GL_BLEND);
1426}
1427 1873
1874 // top layer: overlays such as the health bar
1875 for (y = 0; y < sh; y++)
1876 if (0 <= y + my && y + my < self->rows)
1877 {
1878 maprow *row = self->row + (y + my);
1879
1880 for (x = 0; x < sw; x++)
1881 if (row->c0 <= x + mx && x + mx < row->c1)
1882 {
1883 mapcell *cell = row->col + (x + mx - row->c0);
1884
1885 int px = x * T;
1886 int py = y * T;
1887
1888 if (cell->stat_hp)
1889 {
1890 int width = cell->stat_width * T;
1891 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1892
1893 glColor3ub (0, 0, 0);
1894 glRectf (px + 1, py - thick - 2,
1895 px + width - 1, py);
1896
1897 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1898 glRectf (px + 2,
1899 py - thick - 1,
1900 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1901 }
1902 }
1903 }
1904}
1905
1428void 1906void
1429draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1907draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430 CODE: 1908 CODE:
1431{ 1909{
1432 static float color[16][3] = { 1910 static float color[16][3] = {
1433 { 0.00F, 0.00F, 0.00F }, 1911 { 0.00F, 0.00F, 0.00F },
1434 { 1.00F, 1.00F, 1.00F }, 1912 { 1.00F, 1.00F, 1.00F },
1484 glDisable (GL_BLEND); 1962 glDisable (GL_BLEND);
1485 glDisable (GL_TEXTURE_2D); 1963 glDisable (GL_TEXTURE_2D);
1486} 1964}
1487 1965
1488void 1966void
1489fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1967fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1490 PPCODE: 1968 PPCODE:
1491{ 1969{
1492 int vx, vy;
1493 int x, y; 1970 int x, y;
1494 int sw4 = (sw + 3) & ~3; 1971 int sw4 = (sw + 3) & ~3;
1495 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1972 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1496 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1973 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1497 1974
1498 memset (darkness, 255, sw4 * sh); 1975 memset (darkness, 255, sw4 * sh);
1499 SvPOK_only (darkness_sv); 1976 SvPOK_only (darkness_sv);
1500 SvCUR_set (darkness_sv, sw4 * sh); 1977 SvCUR_set (darkness_sv, sw4 * sh);
1501 1978
1502 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1979 mx += self->x;
1503 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1980 my += self->y;
1504 1981
1505 for (y = 0; y < sh; y++) 1982 for (y = 0; y < sh; y++)
1506 if (0 <= y + vy && y + vy < self->rows) 1983 if (0 <= y + my && y + my < self->rows)
1507 { 1984 {
1508 maprow *row = self->row + (y + vy); 1985 maprow *row = self->row + (y + my);
1509 1986
1510 for (x = 0; x < sw; x++) 1987 for (x = 0; x < sw; x++)
1511 if (row->c0 <= x + vx && x + vx < row->c1) 1988 if (row->c0 <= x + mx && x + mx < row->c1)
1512 { 1989 {
1513 mapcell *cell = row->col + (x + vx - row->c0); 1990 mapcell *cell = row->col + (x + mx - row->c0);
1514 1991
1515 darkness[y * sw4 + x] = cell->darkness < 0 1992 darkness[y * sw4 + x] = cell->darkness
1993 ? 255 - (cell->darkness - 1)
1516 ? 255 - FOW_DARKNESS 1994 : 255 - FOW_DARKNESS;
1517 : 255 - cell->darkness;
1518 } 1995 }
1519 } 1996 }
1520 1997
1521 EXTEND (SP, 3); 1998 EXTEND (SP, 3);
1522 PUSHs (sv_2mortal (newSViv (sw4))); 1999 PUSHs (sv_2mortal (newSViv (sw4)));
1523 PUSHs (sv_2mortal (newSViv (sh))); 2000 PUSHs (sv_2mortal (newSViv (sh)));
1524 PUSHs (darkness_sv); 2001 PUSHs (darkness_sv);
1525} 2002}
1526 2003
1527SV * 2004SV *
1528get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2005get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1529 CODE: 2006 CODE:
1530{ 2007{
1531 int x, y, x1, y1; 2008 int x, y, x1, y1;
1532 SV *data_sv = newSV (w * h * 7 + 5); 2009 SV *data_sv = newSV (w * h * 7 + 5);
1533 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2010 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1558 if (row && row->c0 <= x && x < row->c1) 2035 if (row && row->c0 <= x && x < row->c1)
1559 { 2036 {
1560 mapcell *cell = row->col + (x - row->c0); 2037 mapcell *cell = row->col + (x - row->c0);
1561 uint8_t flags = 0; 2038 uint8_t flags = 0;
1562 2039
1563 if (cell->face [0]) flags |= 1; 2040 if (cell->tile [0]) flags |= 1;
1564 if (cell->face [1]) flags |= 2; 2041 if (cell->tile [1]) flags |= 2;
1565 if (cell->face [2]) flags |= 4; 2042 if (cell->tile [2]) flags |= 4;
1566 2043
1567 *data++ = flags; 2044 *data++ = flags;
1568 2045
1569 if (flags & 1) 2046 if (flags & 1)
1570 { 2047 {
2048 tileid tile = cell->tile [0];
1571 *data++ = cell->face [0] >> 8; 2049 *data++ = tile >> 8;
1572 *data++ = cell->face [0]; 2050 *data++ = tile;
1573 } 2051 }
1574 2052
1575 if (flags & 2) 2053 if (flags & 2)
1576 { 2054 {
2055 tileid tile = cell->tile [1];
1577 *data++ = cell->face [1] >> 8; 2056 *data++ = tile >> 8;
1578 *data++ = cell->face [1]; 2057 *data++ = tile;
1579 } 2058 }
1580 2059
1581 if (flags & 4) 2060 if (flags & 4)
1582 { 2061 {
2062 tileid tile = cell->tile [2];
1583 *data++ = cell->face [2] >> 8; 2063 *data++ = tile >> 8;
1584 *data++ = cell->face [2]; 2064 *data++ = tile;
1585 } 2065 }
1586 } 2066 }
1587 else 2067 else
1588 *data++ = 0; 2068 *data++ = 0;
1589 } 2069 }
1595} 2075}
1596 OUTPUT: 2076 OUTPUT:
1597 RETVAL 2077 RETVAL
1598 2078
1599void 2079void
1600set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2080set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1601 PPCODE: 2081 PPCODE:
1602{ 2082{
1603 int x, y, z; 2083 int x, y, z;
1604 int w, h; 2084 int w, h;
1605 int x1, y1; 2085 int x1, y1;
1629 { 2109 {
1630 uint8_t flags = *data++; 2110 uint8_t flags = *data++;
1631 2111
1632 if (flags) 2112 if (flags)
1633 { 2113 {
1634 mapface face[3] = { 0, 0, 0 };
1635
1636 mapcell *cell = row_get_cell (row, x); 2114 mapcell *cell = row_get_cell (row, x);
2115 tileid tile[3] = { 0, 0, 0 };
1637 2116
1638 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2117 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1639 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2118 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1640 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2119 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1641 2120
1642 if (cell->darkness <= 0) 2121 if (cell->darkness == 0)
1643 { 2122 {
1644 cell->darkness = -1; 2123 cell->darkness = 0;
1645 2124
1646 for (z = 0; z <= 2; z++) 2125 for (z = 0; z <= 2; z++)
1647 { 2126 {
1648 cell->face[z] = face[z]; 2127 tileid t = tile [z];
1649 2128
1650 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2129 if (t >= self->texs || (t && !self->tex [t].name))
2130 {
1651 XPUSHs (sv_2mortal (newSViv (face[z]))); 2131 XPUSHs (sv_2mortal (newSViv (t)));
2132 need_texid (self, t);
2133 }
2134
2135 cell->tile [z] = t;
1652 } 2136 }
1653 } 2137 }
1654 } 2138 }
1655 } 2139 }
1656 } 2140 }
1657} 2141}
1658 2142
1659MODULE = CFClient PACKAGE = CFClient::MixChunk 2143MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1660 2144
1661CFClient::MixChunk 2145CFPlus::MixChunk
1662new_from_file (SV *class, char *path) 2146new_from_file (SV *class, char *path)
1663 CODE: 2147 CODE:
1664 RETVAL = Mix_LoadWAV (path); 2148 RETVAL = Mix_LoadWAV (path);
1665 OUTPUT: 2149 OUTPUT:
1666 RETVAL 2150 RETVAL
1667 2151
1668void 2152void
1669DESTROY (CFClient::MixChunk self) 2153DESTROY (CFPlus::MixChunk self)
1670 CODE: 2154 CODE:
1671 Mix_FreeChunk (self); 2155 Mix_FreeChunk (self);
1672 2156
1673int 2157int
1674volume (CFClient::MixChunk self, int volume = -1) 2158volume (CFPlus::MixChunk self, int volume = -1)
1675 CODE: 2159 CODE:
1676 RETVAL = Mix_VolumeChunk (self, volume); 2160 RETVAL = Mix_VolumeChunk (self, volume);
1677 OUTPUT: 2161 OUTPUT:
1678 RETVAL 2162 RETVAL
1679 2163
1680int 2164int
1681play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2165play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1682 CODE: 2166 CODE:
1683 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2167 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1684 OUTPUT: 2168 OUTPUT:
1685 RETVAL 2169 RETVAL
1686 2170
1687MODULE = CFClient PACKAGE = CFClient::MixMusic 2171MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1688 2172
1689int 2173int
1690volume (int volume = -1) 2174volume (int volume = -1)
1691 CODE: 2175 CODE:
1692 RETVAL = Mix_VolumeMusic (volume); 2176 RETVAL = Mix_VolumeMusic (volume);
1693 OUTPUT: 2177 OUTPUT:
1694 RETVAL 2178 RETVAL
1695 2179
2180int
2181fade_out (int ms)
2182 CODE:
2183 RETVAL = Mix_FadeOutMusic (ms);
2184 OUTPUT:
2185 RETVAL
2186
1696CFClient::MixMusic 2187CFPlus::MixMusic
1697new_from_file (SV *class, char *path) 2188new_from_file (SV *class, char *path)
1698 CODE: 2189 CODE:
1699 RETVAL = Mix_LoadMUS (path); 2190 RETVAL = Mix_LoadMUS (path);
1700 OUTPUT: 2191 OUTPUT:
1701 RETVAL 2192 RETVAL
1702 2193
1703void 2194void
1704DESTROY (CFClient::MixMusic self) 2195DESTROY (CFPlus::MixMusic self)
1705 CODE: 2196 CODE:
1706 Mix_FreeMusic (self); 2197 Mix_FreeMusic (self);
1707 2198
1708int 2199int
1709play (CFClient::MixMusic self, int loops = -1) 2200play (CFPlus::MixMusic self, int loops = -1)
1710 CODE: 2201 CODE:
1711 RETVAL = Mix_PlayMusic (self, loops); 2202 RETVAL = Mix_PlayMusic (self, loops);
1712 OUTPUT: 2203 OUTPUT:
1713 RETVAL 2204 RETVAL
1714 2205
2206int
2207fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2208 CODE:
2209 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2210 OUTPUT:
2211 RETVAL
2212
1715MODULE = CFClient PACKAGE = CFClient::OpenGL 2213MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1716 2214
1717BOOT: 2215BOOT:
1718{ 2216{
1719 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2217 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1720 static const struct { 2218 static const struct {
1721 const char *name; 2219 const char *name;
1722 IV iv; 2220 IV iv;
1723 } *civ, const_iv[] = { 2221 } *civ, const_iv[] = {
1724# define const_iv(name) { # name, (IV)name } 2222# define const_iv(name) { # name, (IV)name }
2223 const_iv (GL_VENDOR),
2224 const_iv (GL_VERSION),
2225 const_iv (GL_EXTENSIONS),
1725 const_iv (GL_COLOR_MATERIAL), 2226 const_iv (GL_COLOR_MATERIAL),
1726 const_iv (GL_SMOOTH), 2227 const_iv (GL_SMOOTH),
1727 const_iv (GL_FLAT), 2228 const_iv (GL_FLAT),
1728 const_iv (GL_DITHER), 2229 const_iv (GL_DITHER),
1729 const_iv (GL_BLEND), 2230 const_iv (GL_BLEND),
1756 const_iv (GL_LUMINANCE), 2257 const_iv (GL_LUMINANCE),
1757 const_iv (GL_LUMINANCE_ALPHA), 2258 const_iv (GL_LUMINANCE_ALPHA),
1758 const_iv (GL_FLOAT), 2259 const_iv (GL_FLOAT),
1759 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2260 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1760 const_iv (GL_COMPILE), 2261 const_iv (GL_COMPILE),
2262 const_iv (GL_PROXY_TEXTURE_1D),
2263 const_iv (GL_PROXY_TEXTURE_2D),
1761 const_iv (GL_TEXTURE_1D), 2264 const_iv (GL_TEXTURE_1D),
1762 const_iv (GL_TEXTURE_2D), 2265 const_iv (GL_TEXTURE_2D),
1763 const_iv (GL_TEXTURE_ENV), 2266 const_iv (GL_TEXTURE_ENV),
1764 const_iv (GL_TEXTURE_MAG_FILTER), 2267 const_iv (GL_TEXTURE_MAG_FILTER),
1765 const_iv (GL_TEXTURE_MIN_FILTER), 2268 const_iv (GL_TEXTURE_MIN_FILTER),
1787 const_iv (GL_SEPARABLE_2D), 2290 const_iv (GL_SEPARABLE_2D),
1788 const_iv (GL_CONVOLUTION_2D), 2291 const_iv (GL_CONVOLUTION_2D),
1789 const_iv (GL_CONVOLUTION_BORDER_MODE), 2292 const_iv (GL_CONVOLUTION_BORDER_MODE),
1790 const_iv (GL_CONSTANT_BORDER), 2293 const_iv (GL_CONSTANT_BORDER),
1791 const_iv (GL_LINES), 2294 const_iv (GL_LINES),
2295 const_iv (GL_LINE_STRIP),
1792 const_iv (GL_LINE_LOOP), 2296 const_iv (GL_LINE_LOOP),
1793 const_iv (GL_QUADS), 2297 const_iv (GL_QUADS),
1794 const_iv (GL_QUAD_STRIP), 2298 const_iv (GL_QUAD_STRIP),
1795 const_iv (GL_TRIANGLES), 2299 const_iv (GL_TRIANGLES),
1796 const_iv (GL_TRIANGLE_STRIP), 2300 const_iv (GL_TRIANGLE_STRIP),
1804# undef const_iv 2308# undef const_iv
1805 }; 2309 };
1806 2310
1807 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2311 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1808 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2312 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2313
2314 texture_av = newAV ();
2315 AvREAL_off (texture_av);
1809} 2316}
1810 2317
1811char * 2318char *
1812gl_vendor () 2319gl_vendor ()
1813 CODE: 2320 CODE:
1824 2331
1825char * 2332char *
1826gl_extensions () 2333gl_extensions ()
1827 CODE: 2334 CODE:
1828 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2335 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2336 OUTPUT:
2337 RETVAL
2338
2339char *glGetString (GLenum pname)
2340
2341GLint glGetInteger (GLenum pname)
2342 CODE:
2343 glGetIntegerv (pname, &RETVAL);
2344 OUTPUT:
2345 RETVAL
2346
2347GLdouble glGetDouble (GLenum pname)
2348 CODE:
2349 glGetDoublev (pname, &RETVAL);
1829 OUTPUT: 2350 OUTPUT:
1830 RETVAL 2351 RETVAL
1831 2352
1832int glGetError () 2353int glGetError ()
1833 2354
1906 r *= a; 2427 r *= a;
1907 g *= a; 2428 g *= a;
1908 b *= a; 2429 b *= a;
1909 } 2430 }
1910 // microsoft visual "c" rounds instead of truncating... 2431 // microsoft visual "c" rounds instead of truncating...
1911 glColor4ub (MIN ((int)(r * 256.f), 255), 2432 glColor4f (r, g, b, a);
1912 MIN ((int)(g * 256.f), 255),
1913 MIN ((int)(b * 256.f), 255),
1914 MIN ((int)(a * 256.f), 255));
1915 2433
1916void glInterleavedArrays (int format, int stride, char *data) 2434void glInterleavedArrays (int format, int stride, char *data)
1917 2435
1918void glDrawElements (int mode, int count, int type, char *indices) 2436void glDrawElements (int mode, int count, int type, char *indices)
1919 2437
1961 2479
1962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2480void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1963 2481
1964void glDrawPixels (int width, int height, int format, int type, char *pixels) 2482void glDrawPixels (int width, int height, int format, int type, char *pixels)
1965 2483
2484void glPixelZoom (float x, float y)
2485
1966void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2486void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1967 2487
1968int glGenTexture () 2488int glGenTexture ()
1969 CODE: 2489 CODE:
1970{ 2490 RETVAL = gen_texture ();
1971 GLuint name;
1972 glGenTextures (1, &name);
1973 RETVAL = name;
1974}
1975 OUTPUT: 2491 OUTPUT:
1976 RETVAL 2492 RETVAL
1977 2493
1978void glDeleteTexture (int name) 2494void glDeleteTexture (int name)
1979 CODE: 2495 CODE:
1980{
1981 GLuint name_ = name;
1982 glDeleteTextures (1, &name_); 2496 del_texture (name);
1983} 2497
1984
1985int glGenList () 2498int glGenList ()
1986 CODE: 2499 CODE:
1987 RETVAL = glGenLists (1); 2500 RETVAL = glGenLists (1);
1988 OUTPUT: 2501 OUTPUT:
1989 RETVAL 2502 RETVAL
1996 2509
1997void glEndList () 2510void glEndList ()
1998 2511
1999void glCallList (int list) 2512void glCallList (int list)
2000 2513
2001

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines