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.152 by root, Sat Aug 19 18:18:36 2006 UTC vs.
Revision 1.200 by root, Tue Jul 17 16:02:13 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# 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>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
36# include <sys/types.h> 44# include <sys/types.h>
37# include <sys/socket.h> 45# include <sys/socket.h>
38# include <netinet/in.h> 46# include <netinet/in.h>
39# include <netinet/tcp.h> 47# include <netinet/tcp.h>
40# include <inttypes.h> 48# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 49#endif
49 50
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 52
52#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
53 54
54#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 62#else
62# define PARACHUTE 0 63# define PARACHUTE 0
63#endif 64#endif
64 65
66static AV *texture_av;
67
65static struct 68static struct
66{ 69{
67#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 71#include "glfunc.h"
69#undef GL_FUNC 72#undef GL_FUNC
70} gl; 73} gl;
71 74
75static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 77{
74 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 82 else
79 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
80} 84}
81 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
82#include "texcache.c" 110#include "texcache.c"
83 111
84#include "pango-font.c" 112#include "pango-font.c"
85#include "pango-fontmap.c" 113#include "pango-fontmap.c"
86#include "pango-render.c" 114#include "pango-render.c"
159 187
160 *w = rect.width; 188 *w = rect.width;
161 *h = rect.height; 189 *h = rect.height;
162} 190}
163 191
192typedef uint16_t tileid;
164typedef uint16_t mapface; 193typedef uint16_t faceid;
165 194
166typedef struct { 195typedef struct {
167 GLint name; 196 int name;
168 int w, h; 197 int w, h;
169 float s, t; 198 float s, t;
170 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
171} maptex; 202} maptex;
172 203
173typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
174 uint16_t darkness; 207 uint16_t darkness;
175 mapface face[3];
176 uint8_t stat_width, stat_hp; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
177} mapcell; 209} mapcell;
178 210
179typedef struct { 211typedef struct {
180 int32_t c0, c1; 212 int32_t c0, c1;
181 mapcell *col; 213 mapcell *col;
182} maprow; 214} maprow;
183 215
184typedef struct map { 216typedef struct map {
185 int x, y, w, h; 217 int x, y, w, h;
186 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
187 int faces; 219 int faces; tileid *face2tile; // [faceid]
188 mapface *face; 220 int texs; maptex *tex; // [tileid]
189
190 int texs;
191 maptex *tex;
192 221
193 int32_t rows; 222 int32_t rows;
194 maprow *row; 223 maprow *row;
195} *CFPlus__Map; 224} *CFPlus__Map;
196 225
216 return ptr; 245 return ptr;
217} 246}
218 247
219#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))
220#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))
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}
221 270
222static maprow * 271static maprow *
223map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
224{ 273{
225 if (0 > y) 274 if (0 > y)
314 363
315 cell = row->col + x - row->c0; 364 cell = row->col + x - row->c0;
316 365
317 cell->darkness = 0; 366 cell->darkness = 0;
318 cell->stat_hp = 0; 367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
319 } 370 }
320 } 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);
321} 388}
322 389
323static void 390static void
324music_finished (void) 391music_finished (void)
325{ 392{
360 n |= n >> 8; 427 n |= n >> 8;
361 n |= n >> 16; 428 n |= n >> 16;
362 429
363 return n + 1; 430 return n + 1;
364} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
365 436
366MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
367 438
368PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
369 440
373 static const struct { 444 static const struct {
374 const char *name; 445 const char *name;
375 IV iv; 446 IV iv;
376 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
377# 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
378 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
379 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
380 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
381 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
382 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
391 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
392 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
393 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
394 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
395 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
396 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
397 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
398 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
399 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
400 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
455 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
456 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
457 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
458 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
459 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
460 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
461 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
462 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
463 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
464 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
465 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
466 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
467 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
468 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
469 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
470 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
471 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
472 const_iv (KMOD_CTRL),
473 const_iv (KMOD_SHIFT),
474 const_iv (KMOD_ALT),
475 const_iv (KMOD_META)
476# undef const_iv 556# undef const_iv
477 }; 557 };
478 558
479 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; )
480 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);
481} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
482 571
483int 572int
484in_destruct () 573in_destruct ()
485 CODE: 574 CODE:
486 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
498 opengl_fontmap = pango_opengl_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
499 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
500 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
501} 590}
502 591
592char *
593SDL_GetError ()
594
503int 595int
504SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
505 597
506void 598void
507SDL_Quit () 599SDL_Quit ()
508 600
509void 601void
510SDL_ListModes () 602SDL_ListModes (int rgb, int alpha)
511 PPCODE: 603 PPCODE:
512{ 604{
513 SDL_Rect **m; 605 SDL_Rect **m;
514 606
515 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 607 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
516 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
517 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
518 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 610 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
519 611
520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 612 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
521 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
522 614
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
527 619
528 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
529#if SDL_VERSION_ATLEAST(1,2,10) 621#if SDL_VERSION_ATLEAST(1,2,10)
530 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
531 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
532#endif 624#endif
533 625
534 SDL_EnableUNICODE (1);
535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
536
537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
538 627
539 if (m && m != (SDL_Rect **)-1) 628 if (m && m != (SDL_Rect **)-1)
540 while (*m) 629 while (*m)
541 { 630 {
631 if ((*m)->w >= 640 && (*m)->h >= 480)
632 {
542 AV *av = newAV (); 633 AV *av = newAV ();
543 av_push (av, newSViv ((*m)->w)); 634 av_push (av, newSViv ((*m)->w));
544 av_push (av, newSViv ((*m)->h)); 635 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb));
637 av_push (av, newSViv (alpha));
545 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 638 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
639 }
546 640
547 ++m; 641 ++m;
548 } 642 }
549} 643}
550 644
551char *
552SDL_GetError ()
553
554int 645int
555SDL_SetVideoMode (int w, int h, int fullscreen) 646SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
556 CODE: 647 CODE:
648{
649 SDL_EnableUNICODE (1);
650 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
651
652 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
653 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
654 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
655 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
656
557 RETVAL = !!SDL_SetVideoMode ( 657 RETVAL = !!SDL_SetVideoMode (
558 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 658 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
559 ); 659 );
660
560 if (RETVAL) 661 if (RETVAL)
561 { 662 {
663 av_clear (texture_av);
664
562 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
563# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 666#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
564# include "glfunc.h" 667#include "glfunc.h"
565# undef GL_FUNC 668#undef GL_FUNC
566 } 669 }
670}
567 OUTPUT: 671 OUTPUT:
568 RETVAL 672 RETVAL
569 673
570void 674void
571SDL_GL_SwapBuffers () 675SDL_GL_SwapBuffers ()
572 676
573char * 677char *
574SDL_GetKeyName (int sym) 678SDL_GetKeyName (int sym)
575 679
680int
681SDL_GetAppState ()
682
576void 683void
577SDL_PollEvent () 684poll_events ()
578 PPCODE: 685 PPCODE:
579{ 686{
580 SDL_Event ev; 687 SDL_Event ev;
581 688
582 while (SDL_PollEvent (&ev)) 689 SDL_PumpEvents ();
690 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
583 { 691 {
584 HV *hv = newHV (); 692 HV *hv = newHV ();
585 hv_store (hv, "type", 4, newSViv (ev.type), 0); 693 hv_store (hv, "type", 4, newSViv (ev.type), 0);
586 694
587 switch (ev.type) 695 switch (ev.type)
589 case SDL_KEYDOWN: 697 case SDL_KEYDOWN:
590 case SDL_KEYUP: 698 case SDL_KEYUP:
591 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
592 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
593 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 701 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
702 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
594 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
595 break; 704 break;
596 705
597 case SDL_ACTIVEEVENT: 706 case SDL_ACTIVEEVENT:
598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
599 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 708 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
600 break; 709 break;
601 710
602 case SDL_MOUSEMOTION: 711 case SDL_MOUSEMOTION:
712 {
713 int state = ev.motion.state;
714 int x = ev.motion.x;
715 int y = ev.motion.y;
716 int xrel = ev.motion.xrel;
717 int yrel = ev.motion.yrel;
718
719 /* do simplistic event compression */
720 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
721 && state == ev.motion.state)
722 {
723 xrel += ev.motion.xrel;
724 yrel += ev.motion.yrel;
725 x = ev.motion.x;
726 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 }
729
603 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
604
605 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 731 hv_store (hv, "state", 5, newSViv (state), 0);
606 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 732 hv_store (hv, "x", 1, newSViv (x), 0);
607 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 733 hv_store (hv, "y", 1, newSViv (y), 0);
608 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 734 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
609 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 735 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 }
610 break; 737 break;
611 738
612 case SDL_MOUSEBUTTONDOWN: 739 case SDL_MOUSEBUTTONDOWN:
613 case SDL_MOUSEBUTTONUP: 740 case SDL_MOUSEBUTTONUP:
614 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
643Mix_AllocateChannels (int numchans = -1) 770Mix_AllocateChannels (int numchans = -1)
644 771
645void 772void
646lowdelay (int fd, int val = 1) 773lowdelay (int fd, int val = 1)
647 CODE: 774 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
776
777void
778win32_proxy_info ()
779 PPCODE:
780{
648#ifndef _WIN32 781#ifdef _WIN32
649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 782 char buffer[2048];
783 DWORD buflen;
784
785 EXTEND (SP, 3);
786
787 buflen = sizeof (buffer);
788 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
789 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
790 {
791 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
792
793 buflen = sizeof (buffer);
794 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
795 {
796 PUSHs (newSVpv (buffer, 0));
797
798 buflen = sizeof (buffer);
799 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
800 PUSHs (newSVpv (buffer, 0));
801 }
802 }
650#endif 803#endif
804}
651 805
652void 806void
653add_font (char *file) 807add_font (char *file)
654 CODE: 808 CODE:
655 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 809 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
760#endif 914#endif
761 _exit (1); 915 _exit (1);
762 916
763void 917void
764_exit (int retval) 918_exit (int retval = 0)
765 CODE: 919 CODE:
920#ifdef WIN32
921 ExitThread (retval); // unclean, please beam me up
922#else
766 _exit (retval); 923 _exit (retval);
924#endif
925
926void
927debug ()
928 CODE:
929{
930#if DEBUG
931 VALGRIND_DO_LEAK_CHECK;
932#endif
933}
767 934
768MODULE = CFPlus PACKAGE = CFPlus::Font 935MODULE = CFPlus PACKAGE = CFPlus::Font
769 936
770CFPlus::Font 937CFPlus::Font
771new_from_file (SV *class, char *path, int id = 0) 938new_from_file (SV *class, char *path, int id = 0)
1018xy_to_index (CFPlus::Layout self, int x, int y) 1185xy_to_index (CFPlus::Layout self, int x, int y)
1019 CODE: 1186 CODE:
1020{ 1187{
1021 int index, trailing; 1188 int index, trailing;
1022 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1189 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1023 RETVAL = index; 1190 RETVAL = index + trailing;
1024} 1191}
1025 OUTPUT: 1192 OUTPUT:
1026 RETVAL 1193 RETVAL
1027 1194
1028void 1195void
1034 1201
1035 EXTEND (SP, 3); 1202 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1203 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1206}
1207
1208void
1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1210 PPCODE:
1211{
1212 int line, x;
1213
1214 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1216
1217 EXTEND (SP, 2);
1218 PUSHs (sv_2mortal (newSViv (line - 1)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220}
1221
1222void
1223line_x_to_index (CFPlus::Layout self, int line, int x)
1224 PPCODE:
1225{
1226 PangoLayoutLine *lp;
1227 int index, trailing;
1228
1229 if (line < 0)
1230 XSRETURN_EMPTY;
1231
1232 if (!(lp = pango_layout_get_line (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */
1234
1235 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1236
1237 EXTEND (SP, 2);
1238 if (GIMME_V == G_SCALAR)
1239 PUSHs (sv_2mortal (newSViv (index + trailing)));
1240 else
1241 {
1242 PUSHs (sv_2mortal (newSViv (index)));
1243 PUSHs (sv_2mortal (newSViv (trailing)));
1244 }
1039} 1245}
1040 1246
1041void 1247void
1042render (CFPlus::Layout self, float x, float y, int flags = 0) 1248render (CFPlus::Layout self, float x, float y, int flags = 0)
1043 PPCODE: 1249 PPCODE:
1048 flags 1254 flags
1049 ); 1255 );
1050 1256
1051MODULE = CFPlus PACKAGE = CFPlus::Texture 1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1052 1258
1259int minpot (int n)
1260
1053void 1261void
1054pad2pot (SV *data_, SV *w_, SV *h_) 1262pad2pot (SV *data_, SV *w_, SV *h_)
1055 CODE: 1263 CODE:
1056{ 1264{
1057 int ow = SvIV (w_); 1265 int ow = SvIV (w_);
1134 glDisable (GL_ALPHA_TEST); 1342 glDisable (GL_ALPHA_TEST);
1135 glDisable (GL_BLEND); 1343 glDisable (GL_BLEND);
1136 } 1344 }
1137} 1345}
1138 1346
1347IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1348 CODE:
1349{
1350 GLint width;
1351 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1352 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1353 RETVAL = width > 0;
1354}
1355 OUTPUT:
1356 RETVAL
1357
1139MODULE = CFPlus PACKAGE = CFPlus::Map 1358MODULE = CFPlus PACKAGE = CFPlus::Map
1140 1359
1141CFPlus::Map 1360CFPlus::Map
1142new (SV *class, int map_width, int map_height) 1361new (SV *class)
1143 CODE: 1362 CODE:
1144 New (0, RETVAL, 1, struct map); 1363 New (0, RETVAL, 1, struct map);
1145 RETVAL->x = 0; 1364 RETVAL->x = 0;
1146 RETVAL->y = 0; 1365 RETVAL->y = 0;
1147 RETVAL->w = map_width; 1366 RETVAL->w = 0;
1148 RETVAL->h = map_height; 1367 RETVAL->h = 0;
1149 RETVAL->ox = 0; 1368 RETVAL->ox = 0;
1150 RETVAL->oy = 0; 1369 RETVAL->oy = 0;
1151 RETVAL->faces = 8192; 1370 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1152 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1371 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1153 RETVAL->texs = 8192;
1154 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1155 RETVAL->rows = 0; 1372 RETVAL->rows = 0;
1156 RETVAL->row = 0; 1373 RETVAL->row = 0;
1157 OUTPUT: 1374 OUTPUT:
1158 RETVAL 1375 RETVAL
1159 1376
1160void 1377void
1161DESTROY (CFPlus::Map self) 1378DESTROY (CFPlus::Map self)
1162 CODE: 1379 CODE:
1163{ 1380{
1164 map_clear (self); 1381 map_clear (self);
1165 Safefree (self->face); 1382 Safefree (self->face2tile);
1166 Safefree (self->tex); 1383 Safefree (self->tex);
1167 Safefree (self); 1384 Safefree (self);
1168} 1385}
1169 1386
1170void 1387void
1388resize (CFPlus::Map self, int map_width, int map_height)
1389 CODE:
1390 self->w = map_width;
1391 self->h = map_height;
1392
1393void
1171clear (CFPlus::Map self) 1394clear (CFPlus::Map self)
1172 CODE: 1395 CODE:
1173 map_clear (self); 1396 map_clear (self);
1174 1397
1175void 1398void
1176set_face (CFPlus::Map self, int face, int texid) 1399set_tileid (CFPlus::Map self, int face, int tile)
1177 CODE: 1400 CODE:
1178{ 1401{
1179 while (self->faces <= face) 1402 need_facenum (self, face); self->face2tile [face] = tile;
1180 { 1403 need_texid (self, tile);
1181 Append (mapface, self->face, self->faces, self->faces); 1404}
1182 self->faces *= 2;
1183 }
1184 1405
1185 self->face [face] = texid; 1406void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level)
1408 CODE:
1409{
1410 tileid texid;
1411 maptex *tex;
1412
1413 if (face < 0 || face >= self->faces)
1414 return;
1415
1416 if (smooth < 0 || smooth >= self->faces)
1417 return;
1418
1419 texid = self->face2tile [face];
1420
1421 if (!texid)
1422 return;
1423
1424 tex = self->tex + texid;
1425 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level;
1186} 1427}
1187 1428
1188void 1429void
1189set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1430set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1190 CODE: 1431 CODE:
1191{ 1432{
1192 while (self->texs <= texid) 1433 need_texid (self, texid);
1193 {
1194 Append (maptex, self->tex, self->texs, self->texs);
1195 self->texs *= 2;
1196 }
1197 1434
1198 { 1435 {
1199 maptex *tex = self->tex + texid; 1436 maptex *tex = self->tex + texid;
1200 1437
1201 tex->name = name; 1438 tex->name = name;
1243void 1480void
1244scroll (CFPlus::Map self, int dx, int dy) 1481scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1482 CODE:
1246{ 1483{
1247 if (dx > 0) 1484 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1485 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1486 else if (dx < 0)
1250 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1487 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1251 1488
1252 if (dy > 0) 1489 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1490 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1491 else if (dy < 0)
1255 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1492 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1256 1493
1257 self->ox += dx; self->x += dx; 1494 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1495 self->oy += dy; self->y += dy;
1259 1496
1260 while (self->y < 0) 1497 while (self->y < 0)
1286 1523
1287 if (flags & 15) 1524 if (flags & 15)
1288 { 1525 {
1289 if (!cell->darkness) 1526 if (!cell->darkness)
1290 { 1527 {
1528 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1529 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1530 }
1296 1531
1297 //TODO: don't trust server data to be in-range(!) 1532 //TODO: don't trust server data to be in-range(!)
1298 1533
1299 if (flags & 8) 1534 if (flags & 8)
1314 cell->stat_width = 1; 1549 cell->stat_width = 1;
1315 cell->stat_hp = *data++; 1550 cell->stat_hp = *data++;
1316 } 1551 }
1317 else if (cmd == 6) // monster width 1552 else if (cmd == 6) // monster width
1318 cell->stat_width = *data++ + 1; 1553 cell->stat_width = *data++ + 1;
1554 else if (cmd == 0x47)
1555 {
1556 if (*data == 4)
1557 ; // decode player count
1558
1559 data += *data + 1;
1560 }
1561 else if (cmd == 8) // cell flags
1562 cell->flags = *data++;
1319 else if (ext & 0x40) // unknown, multibyte => skip 1563 else if (ext & 0x40) // unknown, multibyte => skip
1320 data += *data + 1; 1564 data += *data + 1;
1321 else 1565 else
1322 data++; 1566 data++;
1323 } 1567 }
1327 cell->darkness = *data++ + 1; 1571 cell->darkness = *data++ + 1;
1328 } 1572 }
1329 1573
1330 if (flags & 4) 1574 if (flags & 4)
1331 { 1575 {
1332 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [0] = self->face2tile [face];
1333 } 1579 }
1334 1580
1335 if (flags & 2) 1581 if (flags & 2)
1336 { 1582 {
1337 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1338 } 1586 }
1339 1587
1340 if (flags & 1) 1588 if (flags & 1)
1341 { 1589 {
1342 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1343 } 1593 }
1344 } 1594 }
1345 else 1595 else
1346 {
1347 cell->darkness = 0; 1596 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1350 } 1597 }
1351} 1598}
1352 1599
1353SV * 1600SV *
1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1601mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1380 { 1627 {
1381 mapcell *cell = row->col + (x - row->c0); 1628 mapcell *cell = row->col + (x - row->c0);
1382 1629
1383 for (z = 0; z <= 0; z++) 1630 for (z = 0; z <= 0; z++)
1384 { 1631 {
1385 mapface face = cell->face [z];
1386
1387 if (face)
1388 {
1389 maptex tex = self->tex [face]; 1632 maptex tex = self->tex [cell->tile [z]];
1390 int a0 = 255 - tex.a; 1633 int a0 = 255 - tex.a;
1391 int a1 = tex.a; 1634 int a1 = tex.a;
1392 1635
1393 r = (r * a0 + tex.r * a1) / 255; 1636 r = (r * a0 + tex.r * a1) / 255;
1394 g = (g * a0 + tex.g * a1) / 255; 1637 g = (g * a0 + tex.g * a1) / 255;
1395 b = (b * a0 + tex.b * a1) / 255; 1638 b = (b * a0 + tex.b * a1) / 255;
1396 a = (a * a0 + tex.a * a1) / 255; 1639 a = (a * a0 + tex.a * a1) / 255;
1397 }
1398 } 1640 }
1399 } 1641 }
1400 1642
1401 *map++ = (r ) 1643 *map++ = (r )
1402 | (g << 8) 1644 | (g << 8)
1409} 1651}
1410 OUTPUT: 1652 OUTPUT:
1411 RETVAL 1653 RETVAL
1412 1654
1413void 1655void
1414draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1656draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1415 CODE: 1657 CODE:
1416{ 1658{
1417 int vx, vy; 1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1661 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1662 smooth_key skey;
1418 int x, y, z; 1663 int x, y, z;
1419 int last_name; 1664 int last_name;
1420 mapface face;
1421 1665
1422 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1666 // thats current max. sorry.
1423 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1667 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255;
1424 1669
1425 /* 1670 // clear key, in case of extra padding
1426 int vx = self->vx = self->w >= sw 1671 memset (&skey, 0, sizeof (skey));
1427 ? self->x + (self->w - sw) / 2
1428 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1429
1430 int vy = self->vy = self->h >= sh
1431 ? self->y + (self->h - sh) / 2
1432 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1433 */
1434 1672
1435 glColor4ub (255, 255, 255, 255); 1673 glColor4ub (255, 255, 255, 255);
1436 1674
1437 glEnable (GL_BLEND); 1675 glEnable (GL_BLEND);
1438 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1441 1679
1442 glBegin (GL_QUADS); 1680 glBegin (GL_QUADS);
1443 1681
1444 last_name = 0; 1682 last_name = 0;
1445 1683
1684 mx += self->x;
1685 my += self->y;
1686
1687 // first pass: determine smooth_max
1688 // rather ugly, if you ask me
1689 // could also be stored inside mapcell and updated on change
1690 memset (smooth_max, 0, sizeof (smooth_max));
1691
1692 for (y = 0; y < sh; y++)
1693 if (0 <= y + my && y + my < self->rows)
1694 {
1695 maprow *row = self->row + (y + my);
1696
1697 for (x = 0; x < sw; x++)
1698 if (row->c0 <= x + mx && x + mx < row->c1)
1699 {
1700 mapcell *cell = row->col + (x + mx - row->c0);
1701
1702 smooth_max[x + 1][y + 1] =
1703 MAX (self->tex [cell->tile [0]].smoothlevel,
1704 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel));
1706 }
1707 }
1708
1446 for (z = 0; z < 3; z++) 1709 for (z = 0; z <= 2; z++)
1710 {
1711 memset (smooth_level, 0, sizeof (smooth_level));
1712
1447 for (y = 0; y < sh; y++) 1713 for (y = 0; y < sh; y++)
1448 if (0 <= y + vy && y + vy < self->rows) 1714 if (0 <= y + my && y + my < self->rows)
1449 { 1715 {
1450 maprow *row = self->row + (y + vy); 1716 maprow *row = self->row + (y + my);
1451 1717
1452 for (x = 0; x < sw; x++) 1718 for (x = 0; x < sw; x++)
1453 if (row->c0 <= x + vx && x + vx < row->c1) 1719 if (row->c0 <= x + mx && x + mx < row->c1)
1454 { 1720 {
1455 mapcell *cell = row->col + (x + vx - row->c0); 1721 mapcell *cell = row->col + (x + mx - row->c0);
1456
1457 face = cell->face [z]; 1722 tileid tile = cell->tile [z];
1723
1724 if (tile)
1725 {
1726 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w;
1728 int py = (y + 1) * T - tex.h;
1458 1729
1459 if (face && face < self->texs) 1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name)
1733 {
1734 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */
1736
1737 glEnd ();
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1739 glBegin (GL_QUADS);
1740 }
1741
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746
1747 if (cell->flags && z == 2)
1748 {
1749 if (cell->flags & 1)
1750 {
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 }
1765
1766 // update smooth hash
1767 if (tex.smoothtile)
1768 {
1769 skey.tile = tex.smoothtile;
1770 skey.level = tex.smoothlevel;
1771
1772 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1773
1774 // add bits to current tile and all neighbours. skey.x|y is
1775 // shifted +1|+1 so we always stay positive.
1776
1777 // bits is ___n cccc CCCC bbbb
1778 // n do not draw borders&corners
1779 // c draw these corners, but...
1780 // C ... not these
1781 // b draw these borders
1782
1783 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1784 // ┃· ·· ·┃ ━━
1785
1786 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1787 // ·· ·· ·┏ ┓·
1788
1789 // full tile
1790 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1791
1792 // borders
1793 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1794 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1795 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1796 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1797
1798 // corners
1799 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1800 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1801 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1803 }
1804 }
1805 }
1806 }
1807
1808 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort
1810 {
1811 int w, b;
1812
1813 for (w = 0; w < 256 / 32; ++w)
1814 {
1815 uint32_t smask = smooth_level [w];
1816 if (smask)
1817 for (b = 0; b < 32; ++b)
1818 if (smask & (((uint32_t)1) << b))
1460 { 1819 {
1461 maptex tex = self->tex [face]; 1820 int level = (w << 5) | b;
1821 HE *he;
1462 1822
1463 int px = (x + 1) * 32 - tex.w; 1823 hv_iterinit (smooth);
1464 int py = (y + 1) * 32 - tex.h; 1824 while ((he = hv_iternext (smooth)))
1465
1466 if (last_name != tex.name)
1467 { 1825 {
1826 smooth_key *skey = (smooth_key *)HeKEY (he);
1827 IV bits = SvIVX (HeVAL (he));
1828
1829 if (!(bits & 0x1000)
1830 && skey->level == level
1831 && level > smooth_max [skey->x][skey->y])
1832 {
1833 maptex tex = self->tex [skey->tile];
1834 int px = (((int)skey->x) - 1) * T;
1835 int py = (((int)skey->y) - 1) * T;
1836 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column
1840
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name)
1844 {
1845 if (!tex.name)
1846 continue; // smoothing not yet available
1847
1468 glEnd (); 1848 glEnd ();
1469 last_name = tex.name;
1470 glBindTexture (GL_TEXTURE_2D, last_name); 1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1471 glBegin (GL_QUADS); 1850 glBegin (GL_QUADS);
1851 }
1852
1853 if (border)
1854 {
1855 float ox = border * dx;
1856
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1861 }
1862
1863 if (corner)
1864 {
1865 float ox = corner * dx;
1866
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1871 }
1872 }
1472 } 1873 }
1473
1474 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1475 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1476 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1477 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1478 } 1874 }
1479 }
1480 } 1875 }
1876 }
1877
1878 hv_clear (smooth);
1879 }
1481 1880
1482 glEnd (); 1881 glEnd ();
1483 1882
1484 glDisable (GL_TEXTURE_2D); 1883 glDisable (GL_TEXTURE_2D);
1485 glDisable (GL_BLEND); 1884 glDisable (GL_BLEND);
1486 1885
1487 // top layer: overlays such as the health bar 1886 // top layer: overlays such as the health bar
1488 for (y = 0; y < sh; y++) 1887 for (y = 0; y < sh; y++)
1489 if (0 <= y + vy && y + vy < self->rows) 1888 if (0 <= y + my && y + my < self->rows)
1490 { 1889 {
1491 maprow *row = self->row + (y + vy); 1890 maprow *row = self->row + (y + my);
1492 1891
1493 for (x = 0; x < sw; x++) 1892 for (x = 0; x < sw; x++)
1494 if (row->c0 <= x + vx && x + vx < row->c1) 1893 if (row->c0 <= x + mx && x + mx < row->c1)
1495 { 1894 {
1496 mapcell *cell = row->col + (x + vx - row->c0); 1895 mapcell *cell = row->col + (x + mx - row->c0);
1497 1896
1498 int px = x * 32; 1897 int px = x * T;
1499 int py = y * 32; 1898 int py = y * T;
1500 1899
1501 if (cell->stat_hp) 1900 if (cell->stat_hp)
1502 { 1901 {
1503 int width = cell->stat_width * 32; 1902 int width = cell->stat_width * T;
1504 int thick = sh / 28 + 1 + cell->stat_width; 1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1505 1904
1506 glColor3ub (0, 0, 0); 1905 glColor3ub (0, 0, 0);
1507 glRectf (px + 1, py - thick - 2, 1906 glRectf (px + 1, py - thick - 2,
1508 px + width - 1, py); 1907 px + width - 1, py);
1509 1908
1575 glDisable (GL_BLEND); 1974 glDisable (GL_BLEND);
1576 glDisable (GL_TEXTURE_2D); 1975 glDisable (GL_TEXTURE_2D);
1577} 1976}
1578 1977
1579void 1978void
1580fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1581 PPCODE: 1980 PPCODE:
1582{ 1981{
1583 int vx, vy;
1584 int x, y; 1982 int x, y;
1585 int sw4 = (sw + 3) & ~3; 1983 int sw4 = (sw + 3) & ~3;
1586 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1587 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1588 1986
1589 memset (darkness, 255, sw4 * sh); 1987 memset (darkness, 255, sw4 * sh);
1590 SvPOK_only (darkness_sv); 1988 SvPOK_only (darkness_sv);
1591 SvCUR_set (darkness_sv, sw4 * sh); 1989 SvCUR_set (darkness_sv, sw4 * sh);
1592 1990
1593 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1991 mx += self->x;
1594 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1992 my += self->y;
1595 1993
1596 for (y = 0; y < sh; y++) 1994 for (y = 0; y < sh; y++)
1597 if (0 <= y + vy && y + vy < self->rows) 1995 if (0 <= y + my && y + my < self->rows)
1598 { 1996 {
1599 maprow *row = self->row + (y + vy); 1997 maprow *row = self->row + (y + my);
1600 1998
1601 for (x = 0; x < sw; x++) 1999 for (x = 0; x < sw; x++)
1602 if (row->c0 <= x + vx && x + vx < row->c1) 2000 if (row->c0 <= x + mx && x + mx < row->c1)
1603 { 2001 {
1604 mapcell *cell = row->col + (x + vx - row->c0); 2002 mapcell *cell = row->col + (x + mx - row->c0);
1605 2003
1606 darkness[y * sw4 + x] = cell->darkness 2004 darkness[y * sw4 + x] = cell->darkness
1607 ? 255 - (cell->darkness - 1) 2005 ? 255 - (cell->darkness - 1)
1608 : 255 - FOW_DARKNESS; 2006 : 255 - FOW_DARKNESS;
1609 } 2007 }
1649 if (row && row->c0 <= x && x < row->c1) 2047 if (row && row->c0 <= x && x < row->c1)
1650 { 2048 {
1651 mapcell *cell = row->col + (x - row->c0); 2049 mapcell *cell = row->col + (x - row->c0);
1652 uint8_t flags = 0; 2050 uint8_t flags = 0;
1653 2051
1654 if (cell->face [0]) flags |= 1; 2052 if (cell->tile [0]) flags |= 1;
1655 if (cell->face [1]) flags |= 2; 2053 if (cell->tile [1]) flags |= 2;
1656 if (cell->face [2]) flags |= 4; 2054 if (cell->tile [2]) flags |= 4;
1657 2055
1658 *data++ = flags; 2056 *data++ = flags;
1659 2057
1660 if (flags & 1) 2058 if (flags & 1)
1661 { 2059 {
2060 tileid tile = cell->tile [0];
1662 *data++ = cell->face [0] >> 8; 2061 *data++ = tile >> 8;
1663 *data++ = cell->face [0]; 2062 *data++ = tile;
1664 } 2063 }
1665 2064
1666 if (flags & 2) 2065 if (flags & 2)
1667 { 2066 {
2067 tileid tile = cell->tile [1];
1668 *data++ = cell->face [1] >> 8; 2068 *data++ = tile >> 8;
1669 *data++ = cell->face [1]; 2069 *data++ = tile;
1670 } 2070 }
1671 2071
1672 if (flags & 4) 2072 if (flags & 4)
1673 { 2073 {
2074 tileid tile = cell->tile [2];
1674 *data++ = cell->face [2] >> 8; 2075 *data++ = tile >> 8;
1675 *data++ = cell->face [2]; 2076 *data++ = tile;
1676 } 2077 }
1677 } 2078 }
1678 else 2079 else
1679 *data++ = 0; 2080 *data++ = 0;
1680 } 2081 }
1720 { 2121 {
1721 uint8_t flags = *data++; 2122 uint8_t flags = *data++;
1722 2123
1723 if (flags) 2124 if (flags)
1724 { 2125 {
1725 mapface face[3] = { 0, 0, 0 };
1726
1727 mapcell *cell = row_get_cell (row, x); 2126 mapcell *cell = row_get_cell (row, x);
2127 tileid tile[3] = { 0, 0, 0 };
1728 2128
1729 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2129 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1730 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2130 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1731 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2131 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1732 2132
1733 if (cell->darkness == 0) 2133 if (cell->darkness == 0)
1734 { 2134 {
1735 cell->darkness = 0; 2135 cell->darkness = 0;
1736 2136
1737 for (z = 0; z <= 2; z++) 2137 for (z = 0; z <= 2; z++)
1738 { 2138 {
1739 cell->face[z] = face[z]; 2139 tileid t = tile [z];
1740 2140
1741 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2141 if (t >= self->texs || (t && !self->tex [t].name))
2142 {
1742 XPUSHs (sv_2mortal (newSViv (face[z]))); 2143 XPUSHs (sv_2mortal (newSViv (t)));
2144 need_texid (self, t);
2145 }
2146
2147 cell->tile [z] = t;
1743 } 2148 }
1744 } 2149 }
1745 } 2150 }
1746 } 2151 }
1747 } 2152 }
1782 CODE: 2187 CODE:
1783 RETVAL = Mix_VolumeMusic (volume); 2188 RETVAL = Mix_VolumeMusic (volume);
1784 OUTPUT: 2189 OUTPUT:
1785 RETVAL 2190 RETVAL
1786 2191
2192int
2193fade_out (int ms)
2194 CODE:
2195 RETVAL = Mix_FadeOutMusic (ms);
2196 OUTPUT:
2197 RETVAL
2198
1787CFPlus::MixMusic 2199CFPlus::MixMusic
1788new_from_file (SV *class, char *path) 2200new_from_file (SV *class, char *path)
1789 CODE: 2201 CODE:
1790 RETVAL = Mix_LoadMUS (path); 2202 RETVAL = Mix_LoadMUS (path);
1791 OUTPUT: 2203 OUTPUT:
1798 2210
1799int 2211int
1800play (CFPlus::MixMusic self, int loops = -1) 2212play (CFPlus::MixMusic self, int loops = -1)
1801 CODE: 2213 CODE:
1802 RETVAL = Mix_PlayMusic (self, loops); 2214 RETVAL = Mix_PlayMusic (self, loops);
2215 OUTPUT:
2216 RETVAL
2217
2218int
2219fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2220 CODE:
2221 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1803 OUTPUT: 2222 OUTPUT:
1804 RETVAL 2223 RETVAL
1805 2224
1806MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2225MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1807 2226
1811 static const struct { 2230 static const struct {
1812 const char *name; 2231 const char *name;
1813 IV iv; 2232 IV iv;
1814 } *civ, const_iv[] = { 2233 } *civ, const_iv[] = {
1815# define const_iv(name) { # name, (IV)name } 2234# define const_iv(name) { # name, (IV)name }
2235 const_iv (GL_VENDOR),
2236 const_iv (GL_VERSION),
2237 const_iv (GL_EXTENSIONS),
1816 const_iv (GL_COLOR_MATERIAL), 2238 const_iv (GL_COLOR_MATERIAL),
1817 const_iv (GL_SMOOTH), 2239 const_iv (GL_SMOOTH),
1818 const_iv (GL_FLAT), 2240 const_iv (GL_FLAT),
1819 const_iv (GL_DITHER), 2241 const_iv (GL_DITHER),
1820 const_iv (GL_BLEND), 2242 const_iv (GL_BLEND),
1847 const_iv (GL_LUMINANCE), 2269 const_iv (GL_LUMINANCE),
1848 const_iv (GL_LUMINANCE_ALPHA), 2270 const_iv (GL_LUMINANCE_ALPHA),
1849 const_iv (GL_FLOAT), 2271 const_iv (GL_FLOAT),
1850 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2272 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1851 const_iv (GL_COMPILE), 2273 const_iv (GL_COMPILE),
2274 const_iv (GL_PROXY_TEXTURE_1D),
2275 const_iv (GL_PROXY_TEXTURE_2D),
1852 const_iv (GL_TEXTURE_1D), 2276 const_iv (GL_TEXTURE_1D),
1853 const_iv (GL_TEXTURE_2D), 2277 const_iv (GL_TEXTURE_2D),
1854 const_iv (GL_TEXTURE_ENV), 2278 const_iv (GL_TEXTURE_ENV),
1855 const_iv (GL_TEXTURE_MAG_FILTER), 2279 const_iv (GL_TEXTURE_MAG_FILTER),
1856 const_iv (GL_TEXTURE_MIN_FILTER), 2280 const_iv (GL_TEXTURE_MIN_FILTER),
1896# undef const_iv 2320# undef const_iv
1897 }; 2321 };
1898 2322
1899 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2323 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1900 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2324 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2325
2326 texture_av = newAV ();
2327 AvREAL_off (texture_av);
1901} 2328}
1902 2329
1903char * 2330char *
1904gl_vendor () 2331gl_vendor ()
1905 CODE: 2332 CODE:
1916 2343
1917char * 2344char *
1918gl_extensions () 2345gl_extensions ()
1919 CODE: 2346 CODE:
1920 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2347 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2348 OUTPUT:
2349 RETVAL
2350
2351char *glGetString (GLenum pname)
2352
2353GLint glGetInteger (GLenum pname)
2354 CODE:
2355 glGetIntegerv (pname, &RETVAL);
2356 OUTPUT:
2357 RETVAL
2358
2359GLdouble glGetDouble (GLenum pname)
2360 CODE:
2361 glGetDoublev (pname, &RETVAL);
1921 OUTPUT: 2362 OUTPUT:
1922 RETVAL 2363 RETVAL
1923 2364
1924int glGetError () 2365int glGetError ()
1925 2366
2050 2491
2051void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2492void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2052 2493
2053void glDrawPixels (int width, int height, int format, int type, char *pixels) 2494void glDrawPixels (int width, int height, int format, int type, char *pixels)
2054 2495
2496void glPixelZoom (float x, float y)
2497
2055void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2498void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2056 2499
2057int glGenTexture () 2500int glGenTexture ()
2058 CODE: 2501 CODE:
2059{ 2502 RETVAL = gen_texture ();
2060 GLuint name;
2061 glGenTextures (1, &name);
2062 RETVAL = name;
2063}
2064 OUTPUT: 2503 OUTPUT:
2065 RETVAL 2504 RETVAL
2066 2505
2067void glDeleteTexture (int name) 2506void glDeleteTexture (int name)
2068 CODE: 2507 CODE:
2069{
2070 GLuint name_ = name;
2071 glDeleteTextures (1, &name_); 2508 del_texture (name);
2072} 2509
2073
2074int glGenList () 2510int glGenList ()
2075 CODE: 2511 CODE:
2076 RETVAL = glGenLists (1); 2512 RETVAL = glGenLists (1);
2077 OUTPUT: 2513 OUTPUT:
2078 RETVAL 2514 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines