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.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.208 by root, Sat Jul 21 16:07:53 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
362} 432}
363 433
364/* SDL should provide this, really. */ 434/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300 435#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314 436#define SDLK_MODIFIER_MAX 314
437
438/******************************************************************************/
439
440static int
441within_widget (SV *widget, NV x, NV y)
442{
443 HV *self;
444 SV **svp;
445 NV wx, ww, wy, wh;
446
447 if (!SvROK (widget))
448 return 0;
449
450 self = (HV *)SvRV (widget);
451
452 if (SvTYPE (self) != SVt_PVHV)
453 return 0;
454
455 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
456 if (y < wy)
457 return 0;
458
459 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
460 if (y >= wy + wh)
461 return 0;
462
463 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
464 if (x < wx)
465 return 0;
466
467 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
468 if (x >= wx + ww)
469 return 0;
470
471 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
472 if (!svp || !SvTRUE (*svp))
473 return 0;
474
475 return 1;
476}
367 477
368MODULE = CFPlus PACKAGE = CFPlus 478MODULE = CFPlus PACKAGE = CFPlus
369 479
370PROTOTYPES: ENABLE 480PROTOTYPES: ENABLE
371 481
492 602
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 603 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 604 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
495} 605}
496 606
607void
608weaken (SV *rv)
609 PROTOTYPE: $
610 CODE:
611 sv_rvweaken (rv);
612
497int 613int
498in_destruct () 614in_destruct ()
499 CODE: 615 CODE:
500 RETVAL = PL_main_cv == Nullcv; 616 RETVAL = PL_main_cv == Nullcv;
501 OUTPUT: 617 OUTPUT:
512 opengl_fontmap = pango_opengl_font_map_new (); 628 opengl_fontmap = pango_opengl_font_map_new ();
513 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 629 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
514 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 630 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
515} 631}
516 632
633char *
634SDL_GetError ()
635
517int 636int
518SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 637SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
519 638
520void 639void
521SDL_Quit () 640SDL_Quit ()
522 641
523void 642void
524SDL_ListModes () 643SDL_ListModes (int rgb, int alpha)
525 PPCODE: 644 PPCODE:
526{ 645{
527 SDL_Rect **m; 646 SDL_Rect **m;
528 647
529 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 648 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
530 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 649 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
531 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 650 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
532 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 651 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
533 652
534 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 653 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
535 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 654 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
536 655
537 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 656 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
538 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 657 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
539 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 658 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
540 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 659 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
541 660
542 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 661 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543#if SDL_VERSION_ATLEAST(1,2,10) 662#if SDL_VERSION_ATLEAST(1,2,10)
544 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 663 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
545 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 664 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546#endif 665#endif
547 666
548 SDL_EnableUNICODE (1);
549 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
550
551 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
552 668
553 if (m && m != (SDL_Rect **)-1) 669 if (m && m != (SDL_Rect **)-1)
554 while (*m) 670 while (*m)
555 { 671 {
672 if ((*m)->w >= 640 && (*m)->h >= 480)
673 {
556 AV *av = newAV (); 674 AV *av = newAV ();
557 av_push (av, newSViv ((*m)->w)); 675 av_push (av, newSViv ((*m)->w));
558 av_push (av, newSViv ((*m)->h)); 676 av_push (av, newSViv ((*m)->h));
677 av_push (av, newSViv (rgb));
678 av_push (av, newSViv (alpha));
559 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 679 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
680 }
560 681
561 ++m; 682 ++m;
562 } 683 }
563} 684}
564 685
565char *
566SDL_GetError ()
567
568int 686int
569SDL_SetVideoMode (int w, int h, int fullscreen) 687SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
570 CODE: 688 CODE:
689{
690 SDL_EnableUNICODE (1);
691 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
692
693 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
694 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
695 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
696 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
697
571 RETVAL = !!SDL_SetVideoMode ( 698 RETVAL = !!SDL_SetVideoMode (
572 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 699 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
573 ); 700 );
701
574 if (RETVAL) 702 if (RETVAL)
575 { 703 {
704 av_clear (texture_av);
705
576 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
577# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 707#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
578# include "glfunc.h" 708#include "glfunc.h"
579# undef GL_FUNC 709#undef GL_FUNC
580 } 710 }
711}
581 OUTPUT: 712 OUTPUT:
582 RETVAL 713 RETVAL
583 714
584void 715void
585SDL_GL_SwapBuffers () 716SDL_GL_SwapBuffers ()
586 717
587char * 718char *
588SDL_GetKeyName (int sym) 719SDL_GetKeyName (int sym)
589 720
721int
722SDL_GetAppState ()
723
590void 724void
591SDL_PollEvent () 725poll_events ()
592 PPCODE: 726 PPCODE:
593{ 727{
594 SDL_Event ev; 728 SDL_Event ev;
595 729
596 while (SDL_PollEvent (&ev)) 730 SDL_PumpEvents ();
731 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
597 { 732 {
598 HV *hv = newHV (); 733 HV *hv = newHV ();
599 hv_store (hv, "type", 4, newSViv (ev.type), 0); 734 hv_store (hv, "type", 4, newSViv (ev.type), 0);
600 735
601 switch (ev.type) 736 switch (ev.type)
613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
614 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 749 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
615 break; 750 break;
616 751
617 case SDL_MOUSEMOTION: 752 case SDL_MOUSEMOTION:
753 {
754 int state = ev.motion.state;
755 int x = ev.motion.x;
756 int y = ev.motion.y;
757 int xrel = ev.motion.xrel;
758 int yrel = ev.motion.yrel;
759
760 /* do simplistic event compression */
761 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
762 && state == ev.motion.state)
763 {
764 xrel += ev.motion.xrel;
765 yrel += ev.motion.yrel;
766 x = ev.motion.x;
767 y = ev.motion.y;
768 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
769 }
770
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
619
620 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 772 hv_store (hv, "state", 5, newSViv (state), 0);
621 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 773 hv_store (hv, "x", 1, newSViv (x), 0);
622 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 774 hv_store (hv, "y", 1, newSViv (y), 0);
623 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 775 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
624 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 776 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 }
625 break; 778 break;
626 779
627 case SDL_MOUSEBUTTONDOWN: 780 case SDL_MOUSEBUTTONDOWN:
628 case SDL_MOUSEBUTTONUP: 781 case SDL_MOUSEBUTTONUP:
629 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
658Mix_AllocateChannels (int numchans = -1) 811Mix_AllocateChannels (int numchans = -1)
659 812
660void 813void
661lowdelay (int fd, int val = 1) 814lowdelay (int fd, int val = 1)
662 CODE: 815 CODE:
663#ifndef _WIN32
664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 816 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
665#endif
666 817
667void 818void
668win32_proxy_info () 819win32_proxy_info ()
669 PPCODE: 820 PPCODE:
670{ 821{
811 ExitThread (retval); // unclean, please beam me up 962 ExitThread (retval); // unclean, please beam me up
812#else 963#else
813 _exit (retval); 964 _exit (retval);
814#endif 965#endif
815 966
967void
968debug ()
969 CODE:
970{
971#if DEBUG
972 VALGRIND_DO_LEAK_CHECK;
973#endif
974}
975
816MODULE = CFPlus PACKAGE = CFPlus::Font 976MODULE = CFPlus PACKAGE = CFPlus::Font
977
978PROTOTYPES: DISABLE
817 979
818CFPlus::Font 980CFPlus::Font
819new_from_file (SV *class, char *path, int id = 0) 981new_from_file (SV *class, char *path, int id = 0)
820 CODE: 982 CODE:
821{ 983{
832 CODE: 994 CODE:
833 pango_font_description_free (self); 995 pango_font_description_free (self);
834 996
835void 997void
836make_default (CFPlus::Font self) 998make_default (CFPlus::Font self)
999 PROTOTYPE: $
837 CODE: 1000 CODE:
838 default_font = self; 1001 default_font = self;
839 1002
840MODULE = CFPlus PACKAGE = CFPlus::Layout 1003MODULE = CFPlus PACKAGE = CFPlus::Layout
841 1004
1005PROTOTYPES: DISABLE
1006
842void 1007void
843reset_glyph_cache () 1008reset_glyph_cache ()
1009 PROTOTYPE:
844 CODE: 1010 CODE:
845 tc_clear (); 1011 tc_clear ();
846 1012
847CFPlus::Layout 1013CFPlus::Layout
848new (SV *class) 1014new (SV *class)
1135 flags 1301 flags
1136 ); 1302 );
1137 1303
1138MODULE = CFPlus PACKAGE = CFPlus::Texture 1304MODULE = CFPlus PACKAGE = CFPlus::Texture
1139 1305
1140void 1306PROTOTYPES: ENABLE
1141pad2pot (SV *data_, SV *w_, SV *h_)
1142 CODE:
1143{
1144 int ow = SvIV (w_);
1145 int oh = SvIV (h_);
1146 1307
1147 if (ow && oh) 1308int minpot (int n)
1309
1310void
1311pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE:
1313{
1314 if ((nw != ow || nh != oh) && SvOK (data_))
1148 { 1315 {
1149 int nw = minpot (ow);
1150 int nh = minpot (oh);
1151
1152 if (nw != ow || nh != oh)
1153 {
1154 if (SvOK (data_))
1155 {
1156 STRLEN datalen; 1316 STRLEN datalen;
1157 char *data = SvPVbyte (data_, datalen); 1317 char *data = SvPVbyte (data_, datalen);
1158 int bpp = datalen / (ow * oh); 1318 int bpp = datalen / (ow * oh);
1159 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1319 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1160 1320
1161 SvPOK_only (result_); 1321 SvPOK_only (result_);
1162 SvCUR_set (result_, nw * nh * bpp); 1322 SvCUR_set (result_, nw * nh * bpp);
1163 1323
1164 memset (SvPVX (result_), 0, nw * nh * bpp); 1324 memset (SvPVX (result_), 0, nw * nh * bpp);
1165 while (oh--) 1325 while (oh--)
1166 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1326 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1167 1327
1168 sv_setsv (data_, result_); 1328 sv_setsv (data_, result_);
1169 }
1170
1171 sv_setiv (w_, nw);
1172 sv_setiv (h_, nh);
1173 }
1174 } 1329 }
1175} 1330}
1176 1331
1177void 1332void
1178draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1333draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1221 glDisable (GL_ALPHA_TEST); 1376 glDisable (GL_ALPHA_TEST);
1222 glDisable (GL_BLEND); 1377 glDisable (GL_BLEND);
1223 } 1378 }
1224} 1379}
1225 1380
1381IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1382 CODE:
1383{
1384 GLint width;
1385 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1386 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1387 RETVAL = width > 0;
1388}
1389 OUTPUT:
1390 RETVAL
1391
1226MODULE = CFPlus PACKAGE = CFPlus::Map 1392MODULE = CFPlus PACKAGE = CFPlus::Map
1393
1394PROTOTYPES: DISABLE
1227 1395
1228CFPlus::Map 1396CFPlus::Map
1229new (SV *class) 1397new (SV *class)
1230 CODE: 1398 CODE:
1231 New (0, RETVAL, 1, struct map); 1399 New (0, RETVAL, 1, struct map);
1233 RETVAL->y = 0; 1401 RETVAL->y = 0;
1234 RETVAL->w = 0; 1402 RETVAL->w = 0;
1235 RETVAL->h = 0; 1403 RETVAL->h = 0;
1236 RETVAL->ox = 0; 1404 RETVAL->ox = 0;
1237 RETVAL->oy = 0; 1405 RETVAL->oy = 0;
1238 RETVAL->faces = 8192; 1406 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1407 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1240 RETVAL->texs = 8192;
1241 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1242 RETVAL->rows = 0; 1408 RETVAL->rows = 0;
1243 RETVAL->row = 0; 1409 RETVAL->row = 0;
1244 OUTPUT: 1410 OUTPUT:
1245 RETVAL 1411 RETVAL
1246 1412
1247void 1413void
1248DESTROY (CFPlus::Map self) 1414DESTROY (CFPlus::Map self)
1249 CODE: 1415 CODE:
1250{ 1416{
1251 map_clear (self); 1417 map_clear (self);
1252 Safefree (self->face); 1418 Safefree (self->face2tile);
1253 Safefree (self->tex); 1419 Safefree (self->tex);
1254 Safefree (self); 1420 Safefree (self);
1255} 1421}
1256 1422
1257void 1423void
1264clear (CFPlus::Map self) 1430clear (CFPlus::Map self)
1265 CODE: 1431 CODE:
1266 map_clear (self); 1432 map_clear (self);
1267 1433
1268void 1434void
1269set_face (CFPlus::Map self, int face, int texid) 1435set_tileid (CFPlus::Map self, int face, int tile)
1270 CODE: 1436 CODE:
1271{ 1437{
1272 while (self->faces <= face) 1438 need_facenum (self, face); self->face2tile [face] = tile;
1273 { 1439 need_texid (self, tile);
1274 Append (mapface, self->face, self->faces, self->faces); 1440}
1275 self->faces *= 2;
1276 }
1277 1441
1278 self->face [face] = texid; 1442void
1443set_smooth (CFPlus::Map self, int face, int smooth, int level)
1444 CODE:
1445{
1446 tileid texid;
1447 maptex *tex;
1448
1449 if (face < 0 || face >= self->faces)
1450 return;
1451
1452 if (smooth < 0 || smooth >= self->faces)
1453 return;
1454
1455 texid = self->face2tile [face];
1456
1457 if (!texid)
1458 return;
1459
1460 tex = self->tex + texid;
1461 tex->smoothtile = self->face2tile [smooth];
1462 tex->smoothlevel = level;
1279} 1463}
1280 1464
1281void 1465void
1282set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1466set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1283 CODE: 1467 CODE:
1284{ 1468{
1285 while (self->texs <= texid) 1469 need_texid (self, texid);
1286 {
1287 Append (maptex, self->tex, self->texs, self->texs);
1288 self->texs *= 2;
1289 }
1290 1470
1291 { 1471 {
1292 maptex *tex = self->tex + texid; 1472 maptex *tex = self->tex + texid;
1293 1473
1294 tex->name = name; 1474 tex->name = name;
1338 CODE: 1518 CODE:
1339{ 1519{
1340 if (dx > 0) 1520 if (dx > 0)
1341 map_blank (self, self->x, self->y, dx, self->h); 1521 map_blank (self, self->x, self->y, dx, self->h);
1342 else if (dx < 0) 1522 else if (dx < 0)
1343 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1523 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1344 1524
1345 if (dy > 0) 1525 if (dy > 0)
1346 map_blank (self, self->x, self->y, self->w, dy); 1526 map_blank (self, self->x, self->y, self->w, dy);
1347 else if (dy < 0) 1527 else if (dy < 0)
1348 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1528 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1349 1529
1350 self->ox += dx; self->x += dx; 1530 self->ox += dx; self->x += dx;
1351 self->oy += dy; self->y += dy; 1531 self->oy += dy; self->y += dy;
1352 1532
1353 while (self->y < 0) 1533 while (self->y < 0)
1405 cell->stat_width = 1; 1585 cell->stat_width = 1;
1406 cell->stat_hp = *data++; 1586 cell->stat_hp = *data++;
1407 } 1587 }
1408 else if (cmd == 6) // monster width 1588 else if (cmd == 6) // monster width
1409 cell->stat_width = *data++ + 1; 1589 cell->stat_width = *data++ + 1;
1410 else if (cmd == 0x47) // monster width 1590 else if (cmd == 0x47)
1411 { 1591 {
1412 if (*data == 4) 1592 if (*data == 4)
1413 ; // decode player tag 1593 ; // decode player count
1414 1594
1415 data += *data + 1; 1595 data += *data + 1;
1416 } 1596 }
1417 else if (cmd == 8) // cell flags 1597 else if (cmd == 8) // cell flags
1418 cell->flags = *data++; 1598 cell->flags = *data++;
1427 cell->darkness = *data++ + 1; 1607 cell->darkness = *data++ + 1;
1428 } 1608 }
1429 1609
1430 if (flags & 4) 1610 if (flags & 4)
1431 { 1611 {
1432 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1612 faceid face = (data [0] << 8) + data [1]; data += 2;
1613 need_facenum (self, face);
1614 cell->tile [0] = self->face2tile [face];
1433 } 1615 }
1434 1616
1435 if (flags & 2) 1617 if (flags & 2)
1436 { 1618 {
1437 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1619 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face);
1621 cell->tile [1] = self->face2tile [face];
1438 } 1622 }
1439 1623
1440 if (flags & 1) 1624 if (flags & 1)
1441 { 1625 {
1442 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [2] = self->face2tile [face];
1443 } 1629 }
1444 } 1630 }
1445 else 1631 else
1446 cell->darkness = 0; 1632 cell->darkness = 0;
1447 } 1633 }
1477 { 1663 {
1478 mapcell *cell = row->col + (x - row->c0); 1664 mapcell *cell = row->col + (x - row->c0);
1479 1665
1480 for (z = 0; z <= 0; z++) 1666 for (z = 0; z <= 0; z++)
1481 { 1667 {
1482 mapface face = cell->face [z];
1483
1484 if (face)
1485 {
1486 maptex tex = self->tex [face]; 1668 maptex tex = self->tex [cell->tile [z]];
1487 int a0 = 255 - tex.a; 1669 int a0 = 255 - tex.a;
1488 int a1 = tex.a; 1670 int a1 = tex.a;
1489 1671
1490 r = (r * a0 + tex.r * a1) / 255; 1672 r = (r * a0 + tex.r * a1) / 255;
1491 g = (g * a0 + tex.g * a1) / 255; 1673 g = (g * a0 + tex.g * a1) / 255;
1492 b = (b * a0 + tex.b * a1) / 255; 1674 b = (b * a0 + tex.b * a1) / 255;
1493 a = (a * a0 + tex.a * a1) / 255; 1675 a = (a * a0 + tex.a * a1) / 255;
1494 }
1495 } 1676 }
1496 } 1677 }
1497 1678
1498 *map++ = (r ) 1679 *map++ = (r )
1499 | (g << 8) 1680 | (g << 8)
1506} 1687}
1507 OUTPUT: 1688 OUTPUT:
1508 RETVAL 1689 RETVAL
1509 1690
1510void 1691void
1511draw (CFPlus::Map self, int mx, int my, int sw, int sh) 1692draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1512 CODE: 1693 CODE:
1513{ 1694{
1695 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1696 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1697 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1698 smooth_key skey;
1514 int x, y, z; 1699 int x, y, z;
1515 int last_name; 1700 int last_name;
1516 mapface face; 1701
1702 // thats current max. sorry.
1703 if (sw > 255) sw = 255;
1704 if (sh > 255) sh = 255;
1705
1706 // clear key, in case of extra padding
1707 memset (&skey, 0, sizeof (skey));
1517 1708
1518 glColor4ub (255, 255, 255, 255); 1709 glColor4ub (255, 255, 255, 255);
1519 1710
1520 glEnable (GL_BLEND); 1711 glEnable (GL_BLEND);
1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1712 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1527 last_name = 0; 1718 last_name = 0;
1528 1719
1529 mx += self->x; 1720 mx += self->x;
1530 my += self->y; 1721 my += self->y;
1531 1722
1723 // first pass: determine smooth_max
1724 // rather ugly, if you ask me
1725 // could also be stored inside mapcell and updated on change
1726 memset (smooth_max, 0, sizeof (smooth_max));
1727
1728 for (y = 0; y < sh; y++)
1729 if (0 <= y + my && y + my < self->rows)
1730 {
1731 maprow *row = self->row + (y + my);
1732
1733 for (x = 0; x < sw; x++)
1734 if (row->c0 <= x + mx && x + mx < row->c1)
1735 {
1736 mapcell *cell = row->col + (x + mx - row->c0);
1737
1738 smooth_max[x + 1][y + 1] =
1739 MAX (self->tex [cell->tile [0]].smoothlevel,
1740 MAX (self->tex [cell->tile [1]].smoothlevel,
1741 self->tex [cell->tile [2]].smoothlevel));
1742 }
1743 }
1744
1532 for (z = 0; z < 3; z++) 1745 for (z = 0; z <= 2; z++)
1746 {
1747 memset (smooth_level, 0, sizeof (smooth_level));
1748
1533 for (y = 0; y < sh; y++) 1749 for (y = 0; y < sh; y++)
1534 if (0 <= y + my && y + my < self->rows) 1750 if (0 <= y + my && y + my < self->rows)
1535 { 1751 {
1536 maprow *row = self->row + (y + my); 1752 maprow *row = self->row + (y + my);
1537 1753
1538 for (x = 0; x < sw; x++) 1754 for (x = 0; x < sw; x++)
1539 if (row->c0 <= x + mx && x + mx < row->c1) 1755 if (row->c0 <= x + mx && x + mx < row->c1)
1540 { 1756 {
1541 mapcell *cell = row->col + (x + mx - row->c0); 1757 mapcell *cell = row->col + (x + mx - row->c0);
1542
1543 face = cell->face [z]; 1758 tileid tile = cell->tile [z];
1759
1760 if (tile)
1761 {
1762 maptex tex = self->tex [tile];
1763 int px = (x + 1) * T - tex.w;
1764 int py = (y + 1) * T - tex.h;
1544 1765
1545 if (face && face < self->texs) 1766 // suppressing texture state switches here
1767 // is only moderately effective, but worth the extra effort
1768 if (last_name != tex.name)
1769 {
1770 if (!tex.name)
1771 tex = self->tex [2]; /* missing, replace by noface */
1772
1773 glEnd ();
1774 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1775 glBegin (GL_QUADS);
1776 }
1777
1778 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1779 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1780 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1781 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1782
1783 if (cell->flags && z == 2)
1784 {
1785 if (cell->flags & 1)
1786 {
1787 maptex tex = self->tex [1];
1788 int px = x * T + T * 2 / 32;
1789 int py = y * T - T * 6 / 32;
1790
1791 glEnd ();
1792 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1793 glBegin (GL_QUADS);
1794
1795 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1796 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1797 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1798 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1799 }
1800 }
1801
1802 // update smooth hash
1803 if (tex.smoothtile)
1804 {
1805 skey.tile = tex.smoothtile;
1806 skey.level = tex.smoothlevel;
1807
1808 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1809
1810 // add bits to current tile and all neighbours. skey.x|y is
1811 // shifted +1|+1 so we always stay positive.
1812
1813 // bits is ___n cccc CCCC bbbb
1814 // n do not draw borders&corners
1815 // c draw these corners, but...
1816 // C ... not these
1817 // b draw these borders
1818
1819 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1820 // ┃· ·· ·┃ ━━
1821
1822 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1823 // ·· ·· ·┏ ┓·
1824
1825 // full tile
1826 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1827
1828 // borders
1829 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1830 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1831 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1832 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1833
1834 // corners
1835 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1836 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1837 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1838 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1839 }
1840 }
1841 }
1842 }
1843
1844 // go through all smoothlevels, lowest to highest, then draw.
1845 // this is basically counting sort
1846 {
1847 int w, b;
1848
1849 for (w = 0; w < 256 / 32; ++w)
1850 {
1851 uint32_t smask = smooth_level [w];
1852 if (smask)
1853 for (b = 0; b < 32; ++b)
1854 if (smask & (((uint32_t)1) << b))
1546 { 1855 {
1547 maptex tex = self->tex [face]; 1856 int level = (w << 5) | b;
1548 int px = (x + 1) * 32 - tex.w; 1857 HE *he;
1549 int py = (y + 1) * 32 - tex.h;
1550 1858
1551 if (last_name != tex.name) 1859 hv_iterinit (smooth);
1860 while ((he = hv_iternext (smooth)))
1552 { 1861 {
1862 smooth_key *skey = (smooth_key *)HeKEY (he);
1863 IV bits = SvIVX (HeVAL (he));
1864
1865 if (!(bits & 0x1000)
1866 && skey->level == level
1867 && level > smooth_max [skey->x][skey->y])
1868 {
1869 maptex tex = self->tex [skey->tile];
1870 int px = (((int)skey->x) - 1) * T;
1871 int py = (((int)skey->y) - 1) * T;
1872 int border = bits & 15;
1873 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1874 float dx = tex.s * .0625f; // 16 images/row
1875 float dy = tex.t * .5f ; // 2 images/column
1876
1877 // this time naively avoiding texture state changes
1878 // save gobs of state changes.
1879 if (last_name != tex.name)
1880 {
1881 if (!tex.name)
1882 continue; // smoothing not yet available
1883
1553 glEnd (); 1884 glEnd ();
1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1885 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1555 glBegin (GL_QUADS); 1886 glBegin (GL_QUADS);
1887 }
1888
1889 if (border)
1890 {
1891 float ox = border * dx;
1892
1893 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1894 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1895 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1896 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1897 }
1898
1899 if (corner)
1900 {
1901 float ox = corner * dx;
1902
1903 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1904 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1905 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1906 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1907 }
1556 } 1908 }
1557
1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1560 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1562 }
1563
1564 if (cell->flags && z == 2)
1565 {
1566 if (cell->flags & 1)
1567 {
1568 maptex tex = self->tex [1];
1569 int px = (x + 1) * 32 - tex.w + 2;
1570 int py = (y + 1) * 32 - tex.h - 6;
1571
1572 glEnd ();
1573 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574 glBegin (GL_QUADS);
1575
1576 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580 } 1909 }
1581 } 1910 }
1582 }
1583 } 1911 }
1912 }
1913
1914 hv_clear (smooth);
1915 }
1584 1916
1585 glEnd (); 1917 glEnd ();
1586 1918
1587 glDisable (GL_TEXTURE_2D); 1919 glDisable (GL_TEXTURE_2D);
1588 glDisable (GL_BLEND); 1920 glDisable (GL_BLEND);
1596 for (x = 0; x < sw; x++) 1928 for (x = 0; x < sw; x++)
1597 if (row->c0 <= x + mx && x + mx < row->c1) 1929 if (row->c0 <= x + mx && x + mx < row->c1)
1598 { 1930 {
1599 mapcell *cell = row->col + (x + mx - row->c0); 1931 mapcell *cell = row->col + (x + mx - row->c0);
1600 1932
1601 int px = x * 32; 1933 int px = x * T;
1602 int py = y * 32; 1934 int py = y * T;
1603 1935
1604 if (cell->stat_hp) 1936 if (cell->stat_hp)
1605 { 1937 {
1606 int width = cell->stat_width * 32; 1938 int width = cell->stat_width * T;
1607 int thick = sh / 28 + 1 + cell->stat_width; 1939 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608 1940
1609 glColor3ub (0, 0, 0); 1941 glColor3ub (0, 0, 0);
1610 glRectf (px + 1, py - thick - 2, 1942 glRectf (px + 1, py - thick - 2,
1611 px + width - 1, py); 1943 px + width - 1, py);
1612 1944
1682void 2014void
1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2015fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1684 PPCODE: 2016 PPCODE:
1685{ 2017{
1686 int x, y; 2018 int x, y;
2019 int sw1 = sw + 2;
2020 int sh1 = sh + 2;
2021 int sh3 = sh * 3;
1687 int sw4 = (sw + 3) & ~3; 2022 int sw34 = (sw * 3 + 3) & ~3;
2023 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2024 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2025 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1690 2026
1691 memset (darkness, 255, sw4 * sh);
1692 SvPOK_only (darkness_sv); 2027 SvPOK_only (darkness3_sv);
1693 SvCUR_set (darkness_sv, sw4 * sh); 2028 SvCUR_set (darkness3_sv, sw34 * sh3);
1694 2029
1695 mx += self->x; 2030 mx += self->x - 1;
1696 my += self->y; 2031 my += self->y - 1;
1697 2032
2033 memset (darkness1, 255, sw1 * sh1);
2034
1698 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh1; y++)
1699 if (0 <= y + my && y + my < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1700 { 2037 {
1701 maprow *row = self->row + (y + my); 2038 maprow *row = self->row + (y + my);
1702 2039
1703 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw1; x++)
1704 if (row->c0 <= x + mx && x + mx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
1705 { 2042 {
1706 mapcell *cell = row->col + (x + mx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
1707 2044
1708 darkness[y * sw4 + x] = cell->darkness 2045 darkness1 [y * sw1 + x] = cell->darkness
1709 ? 255 - (cell->darkness - 1) 2046 ? 255 - (cell->darkness - 1)
1710 : 255 - FOW_DARKNESS; 2047 : 255 - FOW_DARKNESS;
1711 } 2048 }
1712 } 2049 }
1713 2050
2051 for (y = 0; y < sh; ++y)
2052 for (x = 0; x < sw; ++x)
2053 {
2054 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2055 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2056 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2057 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2058 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2059 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2060 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2061 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2062 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2063
2064 uint8_t r11 = (d11 + d21 + d12) / 3;
2065 uint8_t r21 = d21;
2066 uint8_t r31 = (d21 + d31 + d32) / 3;
2067
2068 uint8_t r12 = d12;
2069 uint8_t r22 = d22;
2070 uint8_t r32 = d32;
2071
2072 uint8_t r13 = (d13 + d23 + d12) / 3;
2073 uint8_t r23 = d23;
2074 uint8_t r33 = (d23 + d33 + d32) / 3;
2075
2076 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2077 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2078 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2079 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2080 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2081 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2082 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2083 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2084 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2085 }
2086
2087 free (darkness1);
2088
1714 EXTEND (SP, 3); 2089 EXTEND (SP, 3);
1715 PUSHs (sv_2mortal (newSViv (sw4))); 2090 PUSHs (sv_2mortal (newSViv (sw34)));
1716 PUSHs (sv_2mortal (newSViv (sh))); 2091 PUSHs (sv_2mortal (newSViv (sh3)));
1717 PUSHs (darkness_sv); 2092 PUSHs (darkness3_sv);
1718} 2093}
1719 2094
1720SV * 2095SV *
1721get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2096get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1722 CODE: 2097 CODE:
1751 if (row && row->c0 <= x && x < row->c1) 2126 if (row && row->c0 <= x && x < row->c1)
1752 { 2127 {
1753 mapcell *cell = row->col + (x - row->c0); 2128 mapcell *cell = row->col + (x - row->c0);
1754 uint8_t flags = 0; 2129 uint8_t flags = 0;
1755 2130
1756 if (cell->face [0]) flags |= 1; 2131 if (cell->tile [0]) flags |= 1;
1757 if (cell->face [1]) flags |= 2; 2132 if (cell->tile [1]) flags |= 2;
1758 if (cell->face [2]) flags |= 4; 2133 if (cell->tile [2]) flags |= 4;
1759 2134
1760 *data++ = flags; 2135 *data++ = flags;
1761 2136
1762 if (flags & 1) 2137 if (flags & 1)
1763 { 2138 {
2139 tileid tile = cell->tile [0];
1764 *data++ = cell->face [0] >> 8; 2140 *data++ = tile >> 8;
1765 *data++ = cell->face [0]; 2141 *data++ = tile;
1766 } 2142 }
1767 2143
1768 if (flags & 2) 2144 if (flags & 2)
1769 { 2145 {
2146 tileid tile = cell->tile [1];
1770 *data++ = cell->face [1] >> 8; 2147 *data++ = tile >> 8;
1771 *data++ = cell->face [1]; 2148 *data++ = tile;
1772 } 2149 }
1773 2150
1774 if (flags & 4) 2151 if (flags & 4)
1775 { 2152 {
2153 tileid tile = cell->tile [2];
1776 *data++ = cell->face [2] >> 8; 2154 *data++ = tile >> 8;
1777 *data++ = cell->face [2]; 2155 *data++ = tile;
1778 } 2156 }
1779 } 2157 }
1780 else 2158 else
1781 *data++ = 0; 2159 *data++ = 0;
1782 } 2160 }
1822 { 2200 {
1823 uint8_t flags = *data++; 2201 uint8_t flags = *data++;
1824 2202
1825 if (flags) 2203 if (flags)
1826 { 2204 {
1827 mapface face[3] = { 0, 0, 0 };
1828
1829 mapcell *cell = row_get_cell (row, x); 2205 mapcell *cell = row_get_cell (row, x);
2206 tileid tile[3] = { 0, 0, 0 };
1830 2207
1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2208 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2209 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2210 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1834 2211
1835 if (cell->darkness == 0) 2212 if (cell->darkness == 0)
1836 { 2213 {
1837 cell->darkness = 0; 2214 cell->darkness = 0;
1838 2215
1839 for (z = 0; z <= 2; z++) 2216 for (z = 0; z <= 2; z++)
1840 { 2217 {
1841 cell->face[z] = face[z]; 2218 tileid t = tile [z];
1842 2219
1843 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2220 if (t >= self->texs || (t && !self->tex [t].name))
2221 {
1844 XPUSHs (sv_2mortal (newSViv (face[z]))); 2222 XPUSHs (sv_2mortal (newSViv (t)));
2223 need_texid (self, t);
2224 }
2225
2226 cell->tile [z] = t;
1845 } 2227 }
1846 } 2228 }
1847 } 2229 }
1848 } 2230 }
1849 } 2231 }
1850} 2232}
1851 2233
1852MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1853 2235
2236PROTOTYPES: DISABLE
2237
1854CFPlus::MixChunk 2238CFPlus::MixChunk
1855new_from_file (SV *class, char *path) 2239new_from_file (SV *class, char *path)
1856 CODE: 2240 CODE:
1857 RETVAL = Mix_LoadWAV (path); 2241 RETVAL = Mix_LoadWAV (path);
1858 OUTPUT: 2242 OUTPUT:
1879 2263
1880MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1881 2265
1882int 2266int
1883volume (int volume = -1) 2267volume (int volume = -1)
2268 PROTOTYPE: ;$
1884 CODE: 2269 CODE:
1885 RETVAL = Mix_VolumeMusic (volume); 2270 RETVAL = Mix_VolumeMusic (volume);
1886 OUTPUT: 2271 OUTPUT:
1887 RETVAL 2272 RETVAL
1888 2273
2274int
2275fade_out (int ms)
2276 CODE:
2277 RETVAL = Mix_FadeOutMusic (ms);
2278 OUTPUT:
2279 RETVAL
2280
1889CFPlus::MixMusic 2281CFPlus::MixMusic
1890new_from_file (SV *class, char *path) 2282new_from_file (SV *class, char *path)
1891 CODE: 2283 CODE:
1892 RETVAL = Mix_LoadMUS (path); 2284 RETVAL = Mix_LoadMUS (path);
1893 OUTPUT: 2285 OUTPUT:
1903 CODE: 2295 CODE:
1904 RETVAL = Mix_PlayMusic (self, loops); 2296 RETVAL = Mix_PlayMusic (self, loops);
1905 OUTPUT: 2297 OUTPUT:
1906 RETVAL 2298 RETVAL
1907 2299
2300int
2301fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2302 CODE:
2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2304 OUTPUT:
2305 RETVAL
2306
1908MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308
2309PROTOTYPES: ENABLE
1909 2310
1910BOOT: 2311BOOT:
1911{ 2312{
1912 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1913 static const struct { 2314 static const struct {
1914 const char *name; 2315 const char *name;
1915 IV iv; 2316 IV iv;
1916 } *civ, const_iv[] = { 2317 } *civ, const_iv[] = {
1917# define const_iv(name) { # name, (IV)name } 2318# define const_iv(name) { # name, (IV)name }
2319 const_iv (GL_VENDOR),
2320 const_iv (GL_VERSION),
2321 const_iv (GL_EXTENSIONS),
1918 const_iv (GL_COLOR_MATERIAL), 2322 const_iv (GL_COLOR_MATERIAL),
1919 const_iv (GL_SMOOTH), 2323 const_iv (GL_SMOOTH),
1920 const_iv (GL_FLAT), 2324 const_iv (GL_FLAT),
1921 const_iv (GL_DITHER), 2325 const_iv (GL_DITHER),
1922 const_iv (GL_BLEND), 2326 const_iv (GL_BLEND),
1926 const_iv (GL_ALPHA_TEST), 2330 const_iv (GL_ALPHA_TEST),
1927 const_iv (GL_NORMALIZE), 2331 const_iv (GL_NORMALIZE),
1928 const_iv (GL_RESCALE_NORMAL), 2332 const_iv (GL_RESCALE_NORMAL),
1929 const_iv (GL_FRONT), 2333 const_iv (GL_FRONT),
1930 const_iv (GL_BACK), 2334 const_iv (GL_BACK),
2335 const_iv (GL_AUX0),
1931 const_iv (GL_AND), 2336 const_iv (GL_AND),
1932 const_iv (GL_ONE), 2337 const_iv (GL_ONE),
1933 const_iv (GL_ZERO), 2338 const_iv (GL_ZERO),
1934 const_iv (GL_SRC_ALPHA), 2339 const_iv (GL_SRC_ALPHA),
1935 const_iv (GL_DST_ALPHA), 2340 const_iv (GL_DST_ALPHA),
1949 const_iv (GL_LUMINANCE), 2354 const_iv (GL_LUMINANCE),
1950 const_iv (GL_LUMINANCE_ALPHA), 2355 const_iv (GL_LUMINANCE_ALPHA),
1951 const_iv (GL_FLOAT), 2356 const_iv (GL_FLOAT),
1952 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2357 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1953 const_iv (GL_COMPILE), 2358 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D),
1954 const_iv (GL_TEXTURE_1D), 2361 const_iv (GL_TEXTURE_1D),
1955 const_iv (GL_TEXTURE_2D), 2362 const_iv (GL_TEXTURE_2D),
1956 const_iv (GL_TEXTURE_ENV), 2363 const_iv (GL_TEXTURE_ENV),
1957 const_iv (GL_TEXTURE_MAG_FILTER), 2364 const_iv (GL_TEXTURE_MAG_FILTER),
1958 const_iv (GL_TEXTURE_MIN_FILTER), 2365 const_iv (GL_TEXTURE_MIN_FILTER),
1979 const_iv (GL_COLOR_LOGIC_OP), 2386 const_iv (GL_COLOR_LOGIC_OP),
1980 const_iv (GL_SEPARABLE_2D), 2387 const_iv (GL_SEPARABLE_2D),
1981 const_iv (GL_CONVOLUTION_2D), 2388 const_iv (GL_CONVOLUTION_2D),
1982 const_iv (GL_CONVOLUTION_BORDER_MODE), 2389 const_iv (GL_CONVOLUTION_BORDER_MODE),
1983 const_iv (GL_CONSTANT_BORDER), 2390 const_iv (GL_CONSTANT_BORDER),
2391 const_iv (GL_POINTS),
1984 const_iv (GL_LINES), 2392 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP), 2393 const_iv (GL_LINE_STRIP),
1986 const_iv (GL_LINE_LOOP), 2394 const_iv (GL_LINE_LOOP),
1987 const_iv (GL_QUADS), 2395 const_iv (GL_QUADS),
1988 const_iv (GL_QUAD_STRIP), 2396 const_iv (GL_QUAD_STRIP),
1989 const_iv (GL_TRIANGLES), 2397 const_iv (GL_TRIANGLES),
1990 const_iv (GL_TRIANGLE_STRIP), 2398 const_iv (GL_TRIANGLE_STRIP),
1991 const_iv (GL_TRIANGLE_FAN), 2399 const_iv (GL_TRIANGLE_FAN),
2400 const_iv (GL_POLYGON),
1992 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2402 const_iv (GL_POINT_SMOOTH_HINT),
2403 const_iv (GL_LINE_SMOOTH_HINT),
2404 const_iv (GL_POLYGON_SMOOTH_HINT),
2405 const_iv (GL_GENERATE_MIPMAP_HINT),
1993 const_iv (GL_FASTEST), 2406 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST),
1994 const_iv (GL_V2F), 2409 const_iv (GL_V2F),
1995 const_iv (GL_V3F), 2410 const_iv (GL_V3F),
1996 const_iv (GL_T2F_V3F), 2411 const_iv (GL_T2F_V3F),
1997 const_iv (GL_T2F_N3F_V3F), 2412 const_iv (GL_T2F_N3F_V3F),
1998# undef const_iv 2413# undef const_iv
1999 }; 2414 };
2000 2415
2001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2418
2419 texture_av = newAV ();
2420 AvREAL_off (texture_av);
2003} 2421}
2004 2422
2005char * 2423char *
2006gl_vendor () 2424gl_vendor ()
2007 CODE: 2425 CODE:
2021 CODE: 2439 CODE:
2022 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2440 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2023 OUTPUT: 2441 OUTPUT:
2024 RETVAL 2442 RETVAL
2025 2443
2444const char *glGetString (GLenum pname)
2445
2446GLint glGetInteger (GLenum pname)
2447 CODE:
2448 glGetIntegerv (pname, &RETVAL);
2449 OUTPUT:
2450 RETVAL
2451
2452GLdouble glGetDouble (GLenum pname)
2453 CODE:
2454 glGetDoublev (pname, &RETVAL);
2455 OUTPUT:
2456 RETVAL
2457
2026int glGetError () 2458int glGetError ()
2027 2459
2028void glFinish () 2460void glFinish ()
2029 2461
2030void glClear (int mask) 2462void glClear (int mask)
2067# near_ and far_ are due to microsofts buggy "c" compiler 2499# near_ and far_ are due to microsofts buggy "c" compiler
2068void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2500void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2069 2501
2070# near_ and far_ are due to microsofts buggy "c" compiler 2502# near_ and far_ are due to microsofts buggy "c" compiler
2071void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2503void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2504
2505PROTOTYPES: DISABLE
2072 2506
2073void glViewport (int x, int y, int width, int height) 2507void glViewport (int x, int y, int width, int height)
2074 2508
2075void glScissor (int x, int y, int width, int height) 2509void glScissor (int x, int y, int width, int height)
2076 2510
2084 2518
2085void glRotate (float angle, float x, float y, float z) 2519void glRotate (float angle, float x, float y, float z)
2086 CODE: 2520 CODE:
2087 glRotatef (angle, x, y, z); 2521 glRotatef (angle, x, y, z);
2088 2522
2089void glBegin (int mode)
2090
2091void glEnd ()
2092
2093void glColor (float r, float g, float b, float a = 1.0) 2523void glColor (float r, float g, float b, float a = 1.0)
2094 PROTOTYPE: @
2095 ALIAS: 2524 ALIAS:
2096 glColor_premultiply = 1 2525 glColor_premultiply = 1
2097 CODE: 2526 CODE:
2098 if (ix) 2527 if (ix)
2099 { 2528 {
2102 b *= a; 2531 b *= a;
2103 } 2532 }
2104 // microsoft visual "c" rounds instead of truncating... 2533 // microsoft visual "c" rounds instead of truncating...
2105 glColor4f (r, g, b, a); 2534 glColor4f (r, g, b, a);
2106 2535
2107void glInterleavedArrays (int format, int stride, char *data)
2108
2109void glDrawElements (int mode, int count, int type, char *indices)
2110
2111# 1.2 void glDrawRangeElements (int mode, int start, int end
2112
2113void glRasterPos (float x, float y, float z = 0.) 2536void glRasterPos (float x, float y, float z = 0.)
2114 CODE: 2537 CODE:
2115 glRasterPos3f (0, 0, z); 2538 glRasterPos3f (0, 0, z);
2116 glBitmap (0, 0, 0, 0, x, y, 0); 2539 glBitmap (0, 0, 0, 0, x, y, 0);
2117 2540
2121 2544
2122void glTexCoord (float s, float t) 2545void glTexCoord (float s, float t)
2123 CODE: 2546 CODE:
2124 glTexCoord2f (s, t); 2547 glTexCoord2f (s, t);
2125 2548
2549PROTOTYPES: ENABLE
2550
2551void glBegin (int mode)
2552
2553void glEnd ()
2554
2555void glPointSize (GLfloat size)
2556
2557void glLineWidth (GLfloat width)
2558
2559void glInterleavedArrays (int format, int stride, char *data)
2560
2561void glDrawElements (int mode, int count, int type, char *indices)
2562
2563# 1.2 void glDrawRangeElements (int mode, int start, int end
2564
2126void glTexEnv (int target, int pname, float param) 2565void glTexEnv (int target, int pname, float param)
2127 CODE: 2566 CODE:
2128 glTexEnvf (target, pname, param); 2567 glTexEnvf (target, pname, param);
2129 2568
2130void glTexParameter (int target, int pname, float param) 2569void glTexParameter (int target, int pname, float param)
2152 2591
2153void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2592void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2154 2593
2155void glDrawPixels (int width, int height, int format, int type, char *pixels) 2594void glDrawPixels (int width, int height, int format, int type, char *pixels)
2156 2595
2596void glPixelZoom (float x, float y)
2597
2157void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2598void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2158 2599
2159int glGenTexture () 2600int glGenTexture ()
2160 CODE: 2601 CODE:
2161{ 2602 RETVAL = gen_texture ();
2162 GLuint name;
2163 glGenTextures (1, &name);
2164 RETVAL = name;
2165}
2166 OUTPUT: 2603 OUTPUT:
2167 RETVAL 2604 RETVAL
2168 2605
2169void glDeleteTexture (int name) 2606void glDeleteTexture (int name)
2170 CODE: 2607 CODE:
2171{
2172 GLuint name_ = name;
2173 glDeleteTextures (1, &name_); 2608 del_texture (name);
2174} 2609
2175
2176int glGenList () 2610int glGenList ()
2177 CODE: 2611 CODE:
2178 RETVAL = glGenLists (1); 2612 RETVAL = glGenLists (1);
2179 OUTPUT: 2613 OUTPUT:
2180 RETVAL 2614 RETVAL
2187 2621
2188void glEndList () 2622void glEndList ()
2189 2623
2190void glCallList (int list) 2624void glCallList (int list)
2191 2625
2626MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2627
2628PROTOTYPES: DISABLE
2629
2630void
2631find_widget (SV *widget, NV x, NV y)
2632 PPCODE:
2633{
2634 if (within_widget (widget, x, y))
2635 XPUSHs (widget);
2636}
2637

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines