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.163 by root, Wed Oct 18 12:53:45 2006 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 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# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
17#endif 22#endif
18 23
24#include <assert.h>
19#include <math.h> 25#include <math.h>
20#include <string.h> 26#include <string.h>
21#include <stdio.h> 27#include <stdio.h>
22#include <stdlib.h> 28#include <stdlib.h>
23 29
24#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
25#include <SDL_endian.h> 32#include <SDL_endian.h>
26#include <SDL_image.h> 33#include <SDL_image.h>
27#include <SDL_mixer.h> 34#include <SDL_mixer.h>
28#include <SDL_opengl.h> 35#include <SDL_opengl.h>
29 36
55# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
56#else 63#else
57# define PARACHUTE 0 64# define PARACHUTE 0
58#endif 65#endif
59 66
67static AV *texture_av;
68
60static struct 69static struct
61{ 70{
62#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h" 72#include "glfunc.h"
64#undef GL_FUNC 73#undef GL_FUNC
65} gl; 74} gl;
66 75
76static void
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{ 78{
69 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else 83 else
74 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
75} 85}
76 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
77#include "texcache.c" 111#include "texcache.c"
78 112
79#include "pango-font.c" 113#include "pango-font.c"
80#include "pango-fontmap.c" 114#include "pango-fontmap.c"
81#include "pango-render.c" 115#include "pango-render.c"
154 188
155 *w = rect.width; 189 *w = rect.width;
156 *h = rect.height; 190 *h = rect.height;
157} 191}
158 192
193typedef uint16_t tileid;
159typedef uint16_t mapface; 194typedef uint16_t faceid;
160 195
161typedef struct { 196typedef struct {
162 GLint name; 197 int name;
163 int w, h; 198 int w, h;
164 float s, t; 199 float s, t;
165 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
166} maptex; 203} maptex;
167 204
168typedef struct { 205typedef struct {
169 uint32_t player; 206 uint32_t player;
170 mapface face[3]; 207 tileid tile[3];
171 uint16_t darkness; 208 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
173} mapcell; 210} mapcell;
174 211
175typedef struct { 212typedef struct {
176 int32_t c0, c1; 213 int32_t c0, c1;
177 mapcell *col; 214 mapcell *col;
178} maprow; 215} maprow;
179 216
180typedef struct map { 217typedef struct map {
181 int x, y, w, h; 218 int x, y, w, h;
182 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
183 int faces; 220 int faces; tileid *face2tile; // [faceid]
184 mapface *face; 221 int texs; maptex *tex; // [tileid]
185
186 int texs;
187 maptex *tex;
188 222
189 int32_t rows; 223 int32_t rows;
190 maprow *row; 224 maprow *row;
191} *CFPlus__Map; 225} *CFPlus__Map;
192 226
212 return ptr; 246 return ptr;
213} 247}
214 248
215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
217 271
218static maprow * 272static maprow *
219map_get_row (CFPlus__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
220{ 274{
221 if (0 > y) 275 if (0 > y)
316 cell->player = 0; 370 cell->player = 0;
317 } 371 }
318 } 372 }
319} 373}
320 374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
389}
390
321static void 391static void
322music_finished (void) 392music_finished (void)
323{ 393{
324 SDL_UserEvent ev; 394 SDL_UserEvent ev;
325 395
358 n |= n >> 8; 428 n |= n >> 8;
359 n |= n >> 16; 429 n |= n >> 16;
360 430
361 return n + 1; 431 return n + 1;
362} 432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
363 437
364MODULE = CFPlus PACKAGE = CFPlus 438MODULE = CFPlus PACKAGE = CFPlus
365 439
366PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
367 441
371 static const struct { 445 static const struct {
372 const char *name; 446 const char *name;
373 IV iv; 447 IV iv;
374 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
375# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
376 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
377 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
378 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
379 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
380 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
389 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
390 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
391 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
392 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
393 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
394 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
395 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
396 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
397 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
398 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
453 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
454 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
455 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
456 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
457 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
458 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
460 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
461 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
462 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
463 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
464 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
465 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
466 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
467 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
468 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
469 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
470 const_iv (KMOD_CTRL),
471 const_iv (KMOD_SHIFT),
472 const_iv (KMOD_ALT),
473 const_iv (KMOD_META)
474# undef const_iv 557# undef const_iv
475 }; 558 };
476 559
477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
479} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
480 572
481int 573int
482in_destruct () 574in_destruct ()
483 CODE: 575 CODE:
484 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
496 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
497 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
498 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
499} 591}
500 592
593char *
594SDL_GetError ()
595
501int 596int
502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
503 598
504void 599void
505SDL_Quit () 600SDL_Quit ()
506 601
507void 602void
508SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
509 PPCODE: 604 PPCODE:
510{ 605{
511 SDL_Rect **m; 606 SDL_Rect **m;
512 607
513 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
514 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
515 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
516 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
517 612
518 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
519 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
520 615
521 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
525 620
526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10) 622#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif 625#endif
531 626
532 SDL_EnableUNICODE (1);
533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
534
535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
536 628
537 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
538 while (*m) 630 while (*m)
539 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
540 AV *av = newAV (); 634 AV *av = newAV ();
541 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
542 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
543 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
544 641
545 ++m; 642 ++m;
546 } 643 }
547} 644}
548 645
549char *
550SDL_GetError ()
551
552int 646int
553SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
554 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
555 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
557 ); 660 );
661
558 if (RETVAL) 662 if (RETVAL)
559 { 663 {
664 av_clear (texture_av);
665
560 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
562# include "glfunc.h" 668#include "glfunc.h"
563# undef GL_FUNC 669#undef GL_FUNC
564 } 670 }
671}
565 OUTPUT: 672 OUTPUT:
566 RETVAL 673 RETVAL
567 674
568void 675void
569SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
570 677
571char * 678char *
572SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
573 680
681int
682SDL_GetAppState ()
683
574void 684void
575SDL_PollEvent () 685poll_events ()
576 PPCODE: 686 PPCODE:
577{ 687{
578 SDL_Event ev; 688 SDL_Event ev;
579 689
580 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
581 { 692 {
582 HV *hv = newHV (); 693 HV *hv = newHV ();
583 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
584 695
585 switch (ev.type) 696 switch (ev.type)
587 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
588 case SDL_KEYUP: 699 case SDL_KEYUP:
589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
592 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593 break; 705 break;
594 706
595 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
598 break; 710 break;
599 711
600 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602
603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
608 break; 738 break;
609 739
610 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
611 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
641Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
642 772
643void 773void
644lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
645 CODE: 775 CODE:
646#ifndef _WIN32
647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648#endif
649 777
650void 778void
651win32_proxy_info () 779win32_proxy_info ()
652 PPCODE: 780 PPCODE:
653{ 781{
794 ExitThread (retval); // unclean, please beam me up 922 ExitThread (retval); // unclean, please beam me up
795#else 923#else
796 _exit (retval); 924 _exit (retval);
797#endif 925#endif
798 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
799MODULE = CFPlus PACKAGE = CFPlus::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
800 937
801CFPlus::Font 938CFPlus::Font
802new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
803 CODE: 940 CODE:
1049xy_to_index (CFPlus::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
1050 CODE: 1187 CODE:
1051{ 1188{
1052 int index, trailing; 1189 int index, trailing;
1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1054 RETVAL = index; 1191 RETVAL = index + trailing;
1055} 1192}
1056 OUTPUT: 1193 OUTPUT:
1057 RETVAL 1194 RETVAL
1058 1195
1059void 1196void
1065 1202
1066 EXTEND (SP, 3); 1203 EXTEND (SP, 3);
1067 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1207}
1208
1209void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1211 PPCODE:
1212{
1213 int line, x;
1214
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217
1218 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1241 else
1242 {
1243 PUSHs (sv_2mortal (newSViv (index)));
1244 PUSHs (sv_2mortal (newSViv (trailing)));
1245 }
1070} 1246}
1071 1247
1072void 1248void
1073render (CFPlus::Layout self, float x, float y, int flags = 0) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1074 PPCODE: 1250 PPCODE:
1079 flags 1255 flags
1080 ); 1256 );
1081 1257
1082MODULE = CFPlus PACKAGE = CFPlus::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1083 1259
1084void 1260int minpot (int n)
1085pad2pot (SV *data_, SV *w_, SV *h_)
1086 CODE:
1087{
1088 int ow = SvIV (w_);
1089 int oh = SvIV (h_);
1090 1261
1091 if (ow && oh) 1262void
1263pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE:
1265{
1266 if ((nw != ow || nh != oh) && SvOK (data_))
1092 { 1267 {
1093 int nw = minpot (ow);
1094 int nh = minpot (oh);
1095
1096 if (nw != ow || nh != oh)
1097 {
1098 if (SvOK (data_))
1099 {
1100 STRLEN datalen; 1268 STRLEN datalen;
1101 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1102 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1103 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1104 1272
1105 SvPOK_only (result_); 1273 SvPOK_only (result_);
1106 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1107 1275
1108 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1109 while (oh--) 1277 while (oh--)
1110 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1278 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1111 1279
1112 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1113 }
1114
1115 sv_setiv (w_, nw);
1116 sv_setiv (h_, nh);
1117 }
1118 } 1281 }
1119} 1282}
1120 1283
1121void 1284void
1122draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1165 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1166 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1167 } 1330 }
1168} 1331}
1169 1332
1333IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1334 CODE:
1335{
1336 GLint width;
1337 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1338 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1339 RETVAL = width > 0;
1340}
1341 OUTPUT:
1342 RETVAL
1343
1170MODULE = CFPlus PACKAGE = CFPlus::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1171 1345
1172CFPlus::Map 1346CFPlus::Map
1173new (SV *class, int map_width, int map_height) 1347new (SV *class)
1174 CODE: 1348 CODE:
1175 New (0, RETVAL, 1, struct map); 1349 New (0, RETVAL, 1, struct map);
1176 RETVAL->x = 0; 1350 RETVAL->x = 0;
1177 RETVAL->y = 0; 1351 RETVAL->y = 0;
1178 RETVAL->w = map_width; 1352 RETVAL->w = 0;
1179 RETVAL->h = map_height; 1353 RETVAL->h = 0;
1180 RETVAL->ox = 0; 1354 RETVAL->ox = 0;
1181 RETVAL->oy = 0; 1355 RETVAL->oy = 0;
1182 RETVAL->faces = 8192; 1356 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1183 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1357 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1184 RETVAL->texs = 8192;
1185 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1186 RETVAL->rows = 0; 1358 RETVAL->rows = 0;
1187 RETVAL->row = 0; 1359 RETVAL->row = 0;
1188 OUTPUT: 1360 OUTPUT:
1189 RETVAL 1361 RETVAL
1190 1362
1191void 1363void
1192DESTROY (CFPlus::Map self) 1364DESTROY (CFPlus::Map self)
1193 CODE: 1365 CODE:
1194{ 1366{
1195 map_clear (self); 1367 map_clear (self);
1196 Safefree (self->face); 1368 Safefree (self->face2tile);
1197 Safefree (self->tex); 1369 Safefree (self->tex);
1198 Safefree (self); 1370 Safefree (self);
1199} 1371}
1200 1372
1201void 1373void
1374resize (CFPlus::Map self, int map_width, int map_height)
1375 CODE:
1376 self->w = map_width;
1377 self->h = map_height;
1378
1379void
1202clear (CFPlus::Map self) 1380clear (CFPlus::Map self)
1203 CODE: 1381 CODE:
1204 map_clear (self); 1382 map_clear (self);
1205 1383
1206void 1384void
1207set_face (CFPlus::Map self, int face, int texid) 1385set_tileid (CFPlus::Map self, int face, int tile)
1208 CODE: 1386 CODE:
1209{ 1387{
1210 while (self->faces <= face) 1388 need_facenum (self, face); self->face2tile [face] = tile;
1211 { 1389 need_texid (self, tile);
1212 Append (mapface, self->face, self->faces, self->faces); 1390}
1213 self->faces *= 2;
1214 }
1215 1391
1216 self->face [face] = texid; 1392void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level)
1394 CODE:
1395{
1396 tileid texid;
1397 maptex *tex;
1398
1399 if (face < 0 || face >= self->faces)
1400 return;
1401
1402 if (smooth < 0 || smooth >= self->faces)
1403 return;
1404
1405 texid = self->face2tile [face];
1406
1407 if (!texid)
1408 return;
1409
1410 tex = self->tex + texid;
1411 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level;
1217} 1413}
1218 1414
1219void 1415void
1220set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1416set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1221 CODE: 1417 CODE:
1222{ 1418{
1223 while (self->texs <= texid) 1419 need_texid (self, texid);
1224 {
1225 Append (maptex, self->tex, self->texs, self->texs);
1226 self->texs *= 2;
1227 }
1228 1420
1229 { 1421 {
1230 maptex *tex = self->tex + texid; 1422 maptex *tex = self->tex + texid;
1231 1423
1232 tex->name = name; 1424 tex->name = name;
1276 CODE: 1468 CODE:
1277{ 1469{
1278 if (dx > 0) 1470 if (dx > 0)
1279 map_blank (self, self->x, self->y, dx, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1280 else if (dx < 0) 1472 else if (dx < 0)
1281 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1473 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1282 1474
1283 if (dy > 0) 1475 if (dy > 0)
1284 map_blank (self, self->x, self->y, self->w, dy); 1476 map_blank (self, self->x, self->y, self->w, dy);
1285 else if (dy < 0) 1477 else if (dy < 0)
1286 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1478 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1287 1479
1288 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1289 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1290 1482
1291 while (self->y < 0) 1483 while (self->y < 0)
1343 cell->stat_width = 1; 1535 cell->stat_width = 1;
1344 cell->stat_hp = *data++; 1536 cell->stat_hp = *data++;
1345 } 1537 }
1346 else if (cmd == 6) // monster width 1538 else if (cmd == 6) // monster width
1347 cell->stat_width = *data++ + 1; 1539 cell->stat_width = *data++ + 1;
1348 else if (cmd == 0x47) // monster width 1540 else if (cmd == 0x47)
1349 { 1541 {
1350 if (*data == 4) 1542 if (*data == 4)
1351 ; // decode player tag 1543 ; // decode player count
1352 1544
1353 data += *data + 1; 1545 data += *data + 1;
1354 } 1546 }
1355 else if (cmd == 8) // cell flags 1547 else if (cmd == 8) // cell flags
1356 cell->flags = *data++; 1548 cell->flags = *data++;
1365 cell->darkness = *data++ + 1; 1557 cell->darkness = *data++ + 1;
1366 } 1558 }
1367 1559
1368 if (flags & 4) 1560 if (flags & 4)
1369 { 1561 {
1370 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1562 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face];
1371 } 1565 }
1372 1566
1373 if (flags & 2) 1567 if (flags & 2)
1374 { 1568 {
1375 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1569 faceid face = (data [0] << 8) + data [1]; data += 2;
1570 need_facenum (self, face);
1571 cell->tile [1] = self->face2tile [face];
1376 } 1572 }
1377 1573
1378 if (flags & 1) 1574 if (flags & 1)
1379 { 1575 {
1380 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [2] = self->face2tile [face];
1381 } 1579 }
1382 } 1580 }
1383 else 1581 else
1384 cell->darkness = 0; 1582 cell->darkness = 0;
1385 } 1583 }
1415 { 1613 {
1416 mapcell *cell = row->col + (x - row->c0); 1614 mapcell *cell = row->col + (x - row->c0);
1417 1615
1418 for (z = 0; z <= 0; z++) 1616 for (z = 0; z <= 0; z++)
1419 { 1617 {
1420 mapface face = cell->face [z];
1421
1422 if (face)
1423 {
1424 maptex tex = self->tex [face]; 1618 maptex tex = self->tex [cell->tile [z]];
1425 int a0 = 255 - tex.a; 1619 int a0 = 255 - tex.a;
1426 int a1 = tex.a; 1620 int a1 = tex.a;
1427 1621
1428 r = (r * a0 + tex.r * a1) / 255; 1622 r = (r * a0 + tex.r * a1) / 255;
1429 g = (g * a0 + tex.g * a1) / 255; 1623 g = (g * a0 + tex.g * a1) / 255;
1430 b = (b * a0 + tex.b * a1) / 255; 1624 b = (b * a0 + tex.b * a1) / 255;
1431 a = (a * a0 + tex.a * a1) / 255; 1625 a = (a * a0 + tex.a * a1) / 255;
1432 }
1433 } 1626 }
1434 } 1627 }
1435 1628
1436 *map++ = (r ) 1629 *map++ = (r )
1437 | (g << 8) 1630 | (g << 8)
1444} 1637}
1445 OUTPUT: 1638 OUTPUT:
1446 RETVAL 1639 RETVAL
1447 1640
1448void 1641void
1449draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1450 CODE: 1643 CODE:
1451{ 1644{
1452 int vx, vy; 1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1648 smooth_key skey;
1453 int x, y, z; 1649 int x, y, z;
1454 int last_name; 1650 int last_name;
1455 mapface face;
1456 1651
1457 vx = self->x + ((self->w - sw) >> 1) - shift_x; 1652 // thats current max. sorry.
1458 vy = self->y + ((self->h - sh) >> 1) - shift_y; 1653 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255;
1459 1655
1460 /* 1656 // clear key, in case of extra padding
1461 int vx = self->vx = self->w >= sw 1657 memset (&skey, 0, sizeof (skey));
1462 ? self->x + (self->w - sw) / 2
1463 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1464
1465 int vy = self->vy = self->h >= sh
1466 ? self->y + (self->h - sh) / 2
1467 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1468 */
1469 1658
1470 glColor4ub (255, 255, 255, 255); 1659 glColor4ub (255, 255, 255, 255);
1471 1660
1472 glEnable (GL_BLEND); 1661 glEnable (GL_BLEND);
1473 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1476 1665
1477 glBegin (GL_QUADS); 1666 glBegin (GL_QUADS);
1478 1667
1479 last_name = 0; 1668 last_name = 0;
1480 1669
1670 mx += self->x;
1671 my += self->y;
1672
1673 // first pass: determine smooth_max
1674 // rather ugly, if you ask me
1675 // could also be stored inside mapcell and updated on change
1676 memset (smooth_max, 0, sizeof (smooth_max));
1677
1678 for (y = 0; y < sh; y++)
1679 if (0 <= y + my && y + my < self->rows)
1680 {
1681 maprow *row = self->row + (y + my);
1682
1683 for (x = 0; x < sw; x++)
1684 if (row->c0 <= x + mx && x + mx < row->c1)
1685 {
1686 mapcell *cell = row->col + (x + mx - row->c0);
1687
1688 smooth_max[x + 1][y + 1] =
1689 MAX (self->tex [cell->tile [0]].smoothlevel,
1690 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel));
1692 }
1693 }
1694
1481 for (z = 0; z < 3; z++) 1695 for (z = 0; z <= 2; z++)
1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1482 for (y = 0; y < sh; y++) 1699 for (y = 0; y < sh; y++)
1483 if (0 <= y + vy && y + vy < self->rows) 1700 if (0 <= y + my && y + my < self->rows)
1484 { 1701 {
1485 maprow *row = self->row + (y + vy); 1702 maprow *row = self->row + (y + my);
1486 1703
1487 for (x = 0; x < sw; x++) 1704 for (x = 0; x < sw; x++)
1488 if (row->c0 <= x + vx && x + vx < row->c1) 1705 if (row->c0 <= x + mx && x + mx < row->c1)
1489 { 1706 {
1490 mapcell *cell = row->col + (x + vx - row->c0); 1707 mapcell *cell = row->col + (x + mx - row->c0);
1491
1492 face = cell->face [z]; 1708 tileid tile = cell->tile [z];
1709
1710 if (tile)
1711 {
1712 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w;
1714 int py = (y + 1) * T - tex.h;
1493 1715
1494 if (face && face < self->texs) 1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name)
1719 {
1720 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */
1722
1723 glEnd ();
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1725 glBegin (GL_QUADS);
1726 }
1727
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1729 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1730 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1731 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1732
1733 if (cell->flags && z == 2)
1734 {
1735 if (cell->flags & 1)
1736 {
1737 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32;
1740
1741 glEnd ();
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1743 glBegin (GL_QUADS);
1744
1745 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1746 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1747 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1748 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1749 }
1750 }
1751
1752 // update smooth hash
1753 if (tex.smoothtile)
1754 {
1755 skey.tile = tex.smoothtile;
1756 skey.level = tex.smoothlevel;
1757
1758 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1759
1760 // add bits to current tile and all neighbours. skey.x|y is
1761 // shifted +1|+1 so we always stay positive.
1762
1763 // bits is ___n cccc CCCC bbbb
1764 // n do not draw borders&corners
1765 // c draw these corners, but...
1766 // C ... not these
1767 // b draw these borders
1768
1769 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1770 // ┃· ·· ·┃ ━━
1771
1772 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1773 // ·· ·· ·┏ ┓·
1774
1775 // full tile
1776 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1777
1778 // borders
1779 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1780 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1781 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1782 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1783
1784 // corners
1785 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1786 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1787 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1788 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1789 }
1790 }
1791 }
1792 }
1793
1794 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort
1796 {
1797 int w, b;
1798
1799 for (w = 0; w < 256 / 32; ++w)
1800 {
1801 uint32_t smask = smooth_level [w];
1802 if (smask)
1803 for (b = 0; b < 32; ++b)
1804 if (smask & (((uint32_t)1) << b))
1495 { 1805 {
1496 maptex tex = self->tex [face]; 1806 int level = (w << 5) | b;
1497 int px = (x + 1) * 32 - tex.w; 1807 HE *he;
1498 int py = (y + 1) * 32 - tex.h;
1499 1808
1500 if (last_name != tex.name) 1809 hv_iterinit (smooth);
1810 while ((he = hv_iternext (smooth)))
1501 { 1811 {
1812 smooth_key *skey = (smooth_key *)HeKEY (he);
1813 IV bits = SvIVX (HeVAL (he));
1814
1815 if (!(bits & 0x1000)
1816 && skey->level == level
1817 && level > smooth_max [skey->x][skey->y])
1818 {
1819 maptex tex = self->tex [skey->tile];
1820 int px = (((int)skey->x) - 1) * T;
1821 int py = (((int)skey->y) - 1) * T;
1822 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column
1826
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name)
1830 {
1831 if (!tex.name)
1832 continue; // smoothing not yet available
1833
1502 glEnd (); 1834 glEnd ();
1503 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1504 glBegin (GL_QUADS); 1836 glBegin (GL_QUADS);
1837 }
1838
1839 if (border)
1840 {
1841 float ox = border * dx;
1842
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1847 }
1848
1849 if (corner)
1850 {
1851 float ox = corner * dx;
1852
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1857 }
1505 } 1858 }
1506
1507 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1508 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1509 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1510 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1511 }
1512
1513 if (cell->flags && z == 2)
1514 {
1515 if (cell->flags & 1)
1516 {
1517 maptex tex = self->tex [1];
1518 int px = (x + 1) * 32 - tex.w + 2;
1519 int py = (y + 1) * 32 - tex.h - 6;
1520
1521 glEnd ();
1522 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1523 glBegin (GL_QUADS);
1524
1525 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1526 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1527 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1528 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1529 } 1859 }
1530 } 1860 }
1531 }
1532 } 1861 }
1862 }
1863
1864 hv_clear (smooth);
1865 }
1533 1866
1534 glEnd (); 1867 glEnd ();
1535 1868
1536 glDisable (GL_TEXTURE_2D); 1869 glDisable (GL_TEXTURE_2D);
1537 glDisable (GL_BLEND); 1870 glDisable (GL_BLEND);
1538 1871
1539 // top layer: overlays such as the health bar 1872 // top layer: overlays such as the health bar
1540 for (y = 0; y < sh; y++) 1873 for (y = 0; y < sh; y++)
1541 if (0 <= y + vy && y + vy < self->rows) 1874 if (0 <= y + my && y + my < self->rows)
1542 { 1875 {
1543 maprow *row = self->row + (y + vy); 1876 maprow *row = self->row + (y + my);
1544 1877
1545 for (x = 0; x < sw; x++) 1878 for (x = 0; x < sw; x++)
1546 if (row->c0 <= x + vx && x + vx < row->c1) 1879 if (row->c0 <= x + mx && x + mx < row->c1)
1547 { 1880 {
1548 mapcell *cell = row->col + (x + vx - row->c0); 1881 mapcell *cell = row->col + (x + mx - row->c0);
1549 1882
1550 int px = x * 32; 1883 int px = x * T;
1551 int py = y * 32; 1884 int py = y * T;
1552 1885
1553 if (cell->stat_hp) 1886 if (cell->stat_hp)
1554 { 1887 {
1555 int width = cell->stat_width * 32; 1888 int width = cell->stat_width * T;
1556 int thick = sh / 28 + 1 + cell->stat_width; 1889 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1557 1890
1558 glColor3ub (0, 0, 0); 1891 glColor3ub (0, 0, 0);
1559 glRectf (px + 1, py - thick - 2, 1892 glRectf (px + 1, py - thick - 2,
1560 px + width - 1, py); 1893 px + width - 1, py);
1561 1894
1627 glDisable (GL_BLEND); 1960 glDisable (GL_BLEND);
1628 glDisable (GL_TEXTURE_2D); 1961 glDisable (GL_TEXTURE_2D);
1629} 1962}
1630 1963
1631void 1964void
1632fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1633 PPCODE: 1966 PPCODE:
1634{ 1967{
1635 int vx, vy;
1636 int x, y; 1968 int x, y;
1637 int sw4 = (sw + 3) & ~3; 1969 int sw4 = (sw + 3) & ~3;
1638 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1639 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1640 1972
1641 memset (darkness, 255, sw4 * sh); 1973 memset (darkness, 255, sw4 * sh);
1642 SvPOK_only (darkness_sv); 1974 SvPOK_only (darkness_sv);
1643 SvCUR_set (darkness_sv, sw4 * sh); 1975 SvCUR_set (darkness_sv, sw4 * sh);
1644 1976
1645 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1977 mx += self->x;
1646 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1978 my += self->y;
1647 1979
1648 for (y = 0; y < sh; y++) 1980 for (y = 0; y < sh; y++)
1649 if (0 <= y + vy && y + vy < self->rows) 1981 if (0 <= y + my && y + my < self->rows)
1650 { 1982 {
1651 maprow *row = self->row + (y + vy); 1983 maprow *row = self->row + (y + my);
1652 1984
1653 for (x = 0; x < sw; x++) 1985 for (x = 0; x < sw; x++)
1654 if (row->c0 <= x + vx && x + vx < row->c1) 1986 if (row->c0 <= x + mx && x + mx < row->c1)
1655 { 1987 {
1656 mapcell *cell = row->col + (x + vx - row->c0); 1988 mapcell *cell = row->col + (x + mx - row->c0);
1657 1989
1658 darkness[y * sw4 + x] = cell->darkness 1990 darkness[y * sw4 + x] = cell->darkness
1659 ? 255 - (cell->darkness - 1) 1991 ? 255 - (cell->darkness - 1)
1660 : 255 - FOW_DARKNESS; 1992 : 255 - FOW_DARKNESS;
1661 } 1993 }
1662 } 1994 }
1995
1996 if (smoothing)
1997 {
1998 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
1999 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2000
2001 SvPOK_only (darkness2_sv);
2002 SvCUR_set (darkness2_sv, sw4 * sh);
2003
2004 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x)
2006 {
2007 float *f = (float *)matrix;
2008 int dx, dy;
2009 float sum = 0.f;
2010
2011 for (dy = -1; dy <= 1; ++dy)
2012 for (dx = -1; dx <= 1; ++dx)
2013 {
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2018 }
2019
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2021 }
2022
2023 darkness_sv = darkness2_sv;
2024 }
1663 2025
1664 EXTEND (SP, 3); 2026 EXTEND (SP, 3);
1665 PUSHs (sv_2mortal (newSViv (sw4))); 2027 PUSHs (sv_2mortal (newSViv (sw4)));
1666 PUSHs (sv_2mortal (newSViv (sh))); 2028 PUSHs (sv_2mortal (newSViv (sh)));
1667 PUSHs (darkness_sv); 2029 PUSHs (darkness_sv);
1701 if (row && row->c0 <= x && x < row->c1) 2063 if (row && row->c0 <= x && x < row->c1)
1702 { 2064 {
1703 mapcell *cell = row->col + (x - row->c0); 2065 mapcell *cell = row->col + (x - row->c0);
1704 uint8_t flags = 0; 2066 uint8_t flags = 0;
1705 2067
1706 if (cell->face [0]) flags |= 1; 2068 if (cell->tile [0]) flags |= 1;
1707 if (cell->face [1]) flags |= 2; 2069 if (cell->tile [1]) flags |= 2;
1708 if (cell->face [2]) flags |= 4; 2070 if (cell->tile [2]) flags |= 4;
1709 2071
1710 *data++ = flags; 2072 *data++ = flags;
1711 2073
1712 if (flags & 1) 2074 if (flags & 1)
1713 { 2075 {
2076 tileid tile = cell->tile [0];
1714 *data++ = cell->face [0] >> 8; 2077 *data++ = tile >> 8;
1715 *data++ = cell->face [0]; 2078 *data++ = tile;
1716 } 2079 }
1717 2080
1718 if (flags & 2) 2081 if (flags & 2)
1719 { 2082 {
2083 tileid tile = cell->tile [1];
1720 *data++ = cell->face [1] >> 8; 2084 *data++ = tile >> 8;
1721 *data++ = cell->face [1]; 2085 *data++ = tile;
1722 } 2086 }
1723 2087
1724 if (flags & 4) 2088 if (flags & 4)
1725 { 2089 {
2090 tileid tile = cell->tile [2];
1726 *data++ = cell->face [2] >> 8; 2091 *data++ = tile >> 8;
1727 *data++ = cell->face [2]; 2092 *data++ = tile;
1728 } 2093 }
1729 } 2094 }
1730 else 2095 else
1731 *data++ = 0; 2096 *data++ = 0;
1732 } 2097 }
1772 { 2137 {
1773 uint8_t flags = *data++; 2138 uint8_t flags = *data++;
1774 2139
1775 if (flags) 2140 if (flags)
1776 { 2141 {
1777 mapface face[3] = { 0, 0, 0 };
1778
1779 mapcell *cell = row_get_cell (row, x); 2142 mapcell *cell = row_get_cell (row, x);
2143 tileid tile[3] = { 0, 0, 0 };
1780 2144
1781 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2145 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1782 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2146 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1783 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2147 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1784 2148
1785 if (cell->darkness == 0) 2149 if (cell->darkness == 0)
1786 { 2150 {
1787 cell->darkness = 0; 2151 cell->darkness = 0;
1788 2152
1789 for (z = 0; z <= 2; z++) 2153 for (z = 0; z <= 2; z++)
1790 { 2154 {
1791 cell->face[z] = face[z]; 2155 tileid t = tile [z];
1792 2156
1793 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2157 if (t >= self->texs || (t && !self->tex [t].name))
2158 {
1794 XPUSHs (sv_2mortal (newSViv (face[z]))); 2159 XPUSHs (sv_2mortal (newSViv (t)));
2160 need_texid (self, t);
2161 }
2162
2163 cell->tile [z] = t;
1795 } 2164 }
1796 } 2165 }
1797 } 2166 }
1798 } 2167 }
1799 } 2168 }
1834 CODE: 2203 CODE:
1835 RETVAL = Mix_VolumeMusic (volume); 2204 RETVAL = Mix_VolumeMusic (volume);
1836 OUTPUT: 2205 OUTPUT:
1837 RETVAL 2206 RETVAL
1838 2207
2208int
2209fade_out (int ms)
2210 CODE:
2211 RETVAL = Mix_FadeOutMusic (ms);
2212 OUTPUT:
2213 RETVAL
2214
1839CFPlus::MixMusic 2215CFPlus::MixMusic
1840new_from_file (SV *class, char *path) 2216new_from_file (SV *class, char *path)
1841 CODE: 2217 CODE:
1842 RETVAL = Mix_LoadMUS (path); 2218 RETVAL = Mix_LoadMUS (path);
1843 OUTPUT: 2219 OUTPUT:
1850 2226
1851int 2227int
1852play (CFPlus::MixMusic self, int loops = -1) 2228play (CFPlus::MixMusic self, int loops = -1)
1853 CODE: 2229 CODE:
1854 RETVAL = Mix_PlayMusic (self, loops); 2230 RETVAL = Mix_PlayMusic (self, loops);
2231 OUTPUT:
2232 RETVAL
2233
2234int
2235fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2236 CODE:
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1855 OUTPUT: 2238 OUTPUT:
1856 RETVAL 2239 RETVAL
1857 2240
1858MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1859 2242
1863 static const struct { 2246 static const struct {
1864 const char *name; 2247 const char *name;
1865 IV iv; 2248 IV iv;
1866 } *civ, const_iv[] = { 2249 } *civ, const_iv[] = {
1867# define const_iv(name) { # name, (IV)name } 2250# define const_iv(name) { # name, (IV)name }
2251 const_iv (GL_VENDOR),
2252 const_iv (GL_VERSION),
2253 const_iv (GL_EXTENSIONS),
1868 const_iv (GL_COLOR_MATERIAL), 2254 const_iv (GL_COLOR_MATERIAL),
1869 const_iv (GL_SMOOTH), 2255 const_iv (GL_SMOOTH),
1870 const_iv (GL_FLAT), 2256 const_iv (GL_FLAT),
1871 const_iv (GL_DITHER), 2257 const_iv (GL_DITHER),
1872 const_iv (GL_BLEND), 2258 const_iv (GL_BLEND),
1899 const_iv (GL_LUMINANCE), 2285 const_iv (GL_LUMINANCE),
1900 const_iv (GL_LUMINANCE_ALPHA), 2286 const_iv (GL_LUMINANCE_ALPHA),
1901 const_iv (GL_FLOAT), 2287 const_iv (GL_FLOAT),
1902 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1903 const_iv (GL_COMPILE), 2289 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D),
1904 const_iv (GL_TEXTURE_1D), 2292 const_iv (GL_TEXTURE_1D),
1905 const_iv (GL_TEXTURE_2D), 2293 const_iv (GL_TEXTURE_2D),
1906 const_iv (GL_TEXTURE_ENV), 2294 const_iv (GL_TEXTURE_ENV),
1907 const_iv (GL_TEXTURE_MAG_FILTER), 2295 const_iv (GL_TEXTURE_MAG_FILTER),
1908 const_iv (GL_TEXTURE_MIN_FILTER), 2296 const_iv (GL_TEXTURE_MIN_FILTER),
1948# undef const_iv 2336# undef const_iv
1949 }; 2337 };
1950 2338
1951 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2339 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1952 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2340 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2341
2342 texture_av = newAV ();
2343 AvREAL_off (texture_av);
1953} 2344}
1954 2345
1955char * 2346char *
1956gl_vendor () 2347gl_vendor ()
1957 CODE: 2348 CODE:
1968 2359
1969char * 2360char *
1970gl_extensions () 2361gl_extensions ()
1971 CODE: 2362 CODE:
1972 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2363 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2364 OUTPUT:
2365 RETVAL
2366
2367const char *glGetString (GLenum pname)
2368
2369GLint glGetInteger (GLenum pname)
2370 CODE:
2371 glGetIntegerv (pname, &RETVAL);
2372 OUTPUT:
2373 RETVAL
2374
2375GLdouble glGetDouble (GLenum pname)
2376 CODE:
2377 glGetDoublev (pname, &RETVAL);
1973 OUTPUT: 2378 OUTPUT:
1974 RETVAL 2379 RETVAL
1975 2380
1976int glGetError () 2381int glGetError ()
1977 2382
2102 2507
2103void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2508void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2104 2509
2105void glDrawPixels (int width, int height, int format, int type, char *pixels) 2510void glDrawPixels (int width, int height, int format, int type, char *pixels)
2106 2511
2512void glPixelZoom (float x, float y)
2513
2107void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2514void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2108 2515
2109int glGenTexture () 2516int glGenTexture ()
2110 CODE: 2517 CODE:
2111{ 2518 RETVAL = gen_texture ();
2112 GLuint name;
2113 glGenTextures (1, &name);
2114 RETVAL = name;
2115}
2116 OUTPUT: 2519 OUTPUT:
2117 RETVAL 2520 RETVAL
2118 2521
2119void glDeleteTexture (int name) 2522void glDeleteTexture (int name)
2120 CODE: 2523 CODE:
2121{
2122 GLuint name_ = name;
2123 glDeleteTextures (1, &name_); 2524 del_texture (name);
2124} 2525
2125
2126int glGenList () 2526int glGenList ()
2127 CODE: 2527 CODE:
2128 RETVAL = glGenLists (1); 2528 RETVAL = glGenLists (1);
2129 OUTPUT: 2529 OUTPUT:
2130 RETVAL 2530 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines