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.125 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
14
15#ifdef _WIN32
16# undef pipe
17#endif
11 18
12#include <math.h> 19#include <math.h>
13#include <string.h> 20#include <string.h>
14#include <stdio.h> 21#include <stdio.h>
15#include <stdlib.h> 22#include <stdlib.h>
… …
31# include <sys/types.h> 38# include <sys/types.h>
32# include <sys/socket.h> 39# include <sys/socket.h>
33# include <netinet/in.h> 40# include <netinet/in.h>
34# include <netinet/tcp.h> 41# include <netinet/tcp.h>
35# include <inttypes.h> 42# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 43#endif
44 44
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 46
49#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
50 48
51#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
53 51
54#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
55 53
56#if 1 54#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 55# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 56#else
59# define PARACHUTE 0 57# define PARACHUTE 0
60#endif 58#endif
61 59
… …
80 78
81#include "pango-font.c" 79#include "pango-font.c"
82#include "pango-fontmap.c" 80#include "pango-fontmap.c"
83#include "pango-render.c" 81#include "pango-render.c"
84 82
85typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
87 85
88typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
89 87
90static int 88static int
91shape_attr_p (PangoLayoutRun *run) 89shape_attr_p (PangoLayoutRun *run)
92{ 90{
93 GSList *attrs = run->item->analysis.extra_attrs; 91 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 105
108typedef struct cf_layout { 106typedef struct cf_layout {
109 PangoLayout *pl; 107 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
111 int base_height; 109 int base_height;
112 CFClient__Font font; 110 CFPlus__Font font;
113} *CFClient__Layout; 111} *CFPlus__Layout;
114 112
115static CFClient__Font default_font; 113static CFPlus__Font default_font;
116static PangoContext *opengl_context; 114static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 115static PangoFontMap *opengl_fontmap;
118 116
119static void 117static void
120substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
… …
125#endif 123#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 125}
128 126
129static void 127static void
130layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
131{ 129{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 130 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
134 */ 132 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
… …
139 137
140 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
141} 139}
142 140
143static void 141static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
147 148
148 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 151
151 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
152} 157}
153 158
154typedef uint16_t mapface; 159typedef uint16_t mapface;
155 160
156typedef struct { 161typedef struct {
… …
159 float s, t; 164 float s, t;
160 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
161} maptex; 166} maptex;
162 167
163typedef struct { 168typedef struct {
164 int16_t darkness; 169 uint32_t player;
165 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
166} mapcell; 173} mapcell;
167 174
168typedef struct { 175typedef struct {
169 int32_t c0, c1; 176 int32_t c0, c1;
170 mapcell *col; 177 mapcell *col;
… …
179 int texs; 186 int texs;
180 maptex *tex; 187 maptex *tex;
181 188
182 int32_t rows; 189 int32_t rows;
183 maprow *row; 190 maprow *row;
184} *CFClient__Map; 191} *CFPlus__Map;
185 192
186static char * 193static char *
187prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
188{ 195{
189 char *p; 196 char *p;
… …
207 214
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
209#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 217
211static maprow * 218static maprow *
212map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
213{ 220{
214 if (0 > y) 221 if (0 > y)
215 { 222 {
216 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
… …
255 262
256 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
257} 264}
258 265
259static mapcell * 266static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
261{ 268{
262 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
263} 270}
264 271
265static void 272static void
266map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
267{ 274{
268 int r; 275 int r;
269 276
270 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
… …
279 self->row = 0; 286 self->row = 0;
280 self->rows = 0; 287 self->rows = 0;
281} 288}
282 289
283static void 290static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
285{ 292{
286 int x, y; 293 int x, y;
287 maprow *row; 294 maprow *row;
295 mapcell *cell;
288 296
289 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 298 if (y >= 0)
291 { 299 {
292 if (y >= self->rows) 300 if (y >= self->rows)
… …
298 if (x >= row->c0) 306 if (x >= row->c0)
299 { 307 {
300 if (x >= row->c1) 308 if (x >= row->c1)
301 break; 309 break;
302 310
303 row->col[x - row->c0].darkness = -1; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
304 } 317 }
305 } 318 }
306} 319}
307 320
308static void 321static void
… …
346 n |= n >> 16; 359 n |= n >> 16;
347 360
348 return n + 1; 361 return n + 1;
349} 362}
350 363
351MODULE = CFClient PACKAGE = CFClient 364MODULE = CFPlus PACKAGE = CFPlus
352 365
353PROTOTYPES: ENABLE 366PROTOTYPES: ENABLE
354 367
355BOOT: 368BOOT:
356{ 369{
357 HV *stash = gv_stashpv ("CFClient", 1); 370 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 371 static const struct {
359 const char *name; 372 const char *name;
360 IV iv; 373 IV iv;
361 } *civ, const_iv[] = { 374 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 375# define const_iv(name) { # name, (IV)name }
… …
463 476
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
466} 479}
467 480
481int
482in_destruct ()
483 CODE:
484 RETVAL = PL_main_cv == Nullcv;
485 OUTPUT:
486 RETVAL
487
468NV floor (NV x) 488NV floor (NV x)
469 489
470NV ceil (NV x) 490NV ceil (NV x)
471 491
472void 492void
… …
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 525
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
507 531
508 SDL_EnableUNICODE (1); 532 SDL_EnableUNICODE (1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
510 534
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 624 break;
601 } 625 }
602 626
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604 } 628 }
605} 629}
606 630
607int 631int
608Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 632Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
622#ifndef _WIN32 646#ifndef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
624#endif 648#endif
625 649
626void 650void
651win32_proxy_info ()
652 PPCODE:
653{
654#ifdef _WIN32
655 char buffer[2048];
656 DWORD buflen;
657
658 EXTEND (SP, 3);
659
660 buflen = sizeof (buffer);
661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
668 {
669 PUSHs (newSVpv (buffer, 0));
670
671 buflen = sizeof (buffer);
672 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
673 PUSHs (newSVpv (buffer, 0));
674 }
675 }
676#endif
677}
678
679void
627add_font (char *file) 680add_font (char *file)
628 CODE: 681 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 683
631void 684void
632load_image_inline (SV *image_) 685load_image_inline (SV *image_)
633 ALIAS: 686 ALIAS:
634 load_image_file = 1 687 load_image_file = 1
… …
676 729
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 731
679 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
680 733
734 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 735 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 739 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
690 743
691 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
693} 746}
694 747
… …
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 787#endif
735 _exit (1); 788 _exit (1);
736 789
737void 790void
738_exit (int retval) 791_exit (int retval = 0)
739 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
740 _exit (retval); 796 _exit (retval);
797#endif
741 798
742MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
743 800
744CFClient::Font 801CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
746 CODE: 803 CODE:
747{ 804{
748 int count; 805 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
752} 809}
753 OUTPUT: 810 OUTPUT:
754 RETVAL 811 RETVAL
755 812
756void 813void
757DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
758 CODE: 815 CODE:
759 pango_font_description_free (self); 816 pango_font_description_free (self);
760 817
761void 818void
762make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
763 CODE: 820 CODE:
764 default_font = self; 821 default_font = self;
765 822
766MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
767 824
768void 825void
769clear_font_cache () 826reset_glyph_cache ()
770 CODE: 827 CODE:
771 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
772 tc_clear (); 828 tc_clear ();
773 829
774CFClient::Layout 830CFPlus::Layout
775new (SV *class, int type = 0) 831new (SV *class)
776 CODE: 832 CODE:
777 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
778 834
779 RETVAL->pl = pango_layout_new (opengl_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
780 RETVAL->r = 1.; 836 RETVAL->r = 1.;
… …
788 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
789 OUTPUT: 845 OUTPUT:
790 RETVAL 846 RETVAL
791 847
792void 848void
793DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
794 CODE: 850 CODE:
795 g_object_unref (self->pl); 851 g_object_unref (self->pl);
796 Safefree (self); 852 Safefree (self);
797 853
798void 854void
799set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
800 CODE: 856 CODE:
801{ 857{
802 STRLEN textlen; 858 STRLEN textlen;
803 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
804 860
805 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
806} 862}
807 863
808void 864void
809set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
810 CODE: 866 CODE:
811{ 867{
812 STRLEN textlen; 868 STRLEN textlen;
813 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
814 870
815 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
816} 872}
817 873
818void 874void
819set_shapes (CFClient::Layout self, ...) 875set_shapes (CFPlus::Layout self, ...)
820 CODE: 876 CODE:
821{ 877{
822 PangoAttrList *attrs = 0; 878 PangoAttrList *attrs = 0;
823 const char *text = pango_layout_get_text (self->pl); 879 const char *text = pango_layout_get_text (self->pl);
824 const char *pos = text; 880 const char *pos = text;
… …
859 if (attrs) 915 if (attrs)
860 pango_layout_set_attributes (self->pl, attrs); 916 pango_layout_set_attributes (self->pl, attrs);
861} 917}
862 918
863void 919void
864get_shapes (CFClient::Layout self) 920get_shapes (CFPlus::Layout self)
865 PPCODE: 921 PPCODE:
866{ 922{
867 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
868 924
869 do 925 do
… …
873 if (run && shape_attr_p (run)) 929 if (run && shape_attr_p (run))
874 { 930 {
875 PangoRectangle extents; 931 PangoRectangle extents;
876 pango_layout_iter_get_run_extents (iter, 0, &extents); 932 pango_layout_iter_get_run_extents (iter, 0, &extents);
877 933
934 EXTEND (SP, 2);
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 935 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
879 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 936 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
880 } 937 }
881 } 938 }
882 while (pango_layout_iter_next_run (iter)); 939 while (pango_layout_iter_next_run (iter));
883 940
884 pango_layout_iter_free (iter); 941 pango_layout_iter_free (iter);
885} 942}
886 943
887int 944int
888has_wrapped (CFClient::Layout self) 945has_wrapped (CFPlus::Layout self)
889 CODE: 946 CODE:
890{ 947{
891 int lines = 1; 948 int lines = 1;
892 const char *text = pango_layout_get_text (self->pl); 949 const char *text = pango_layout_get_text (self->pl);
893 950
… …
898} 955}
899 OUTPUT: 956 OUTPUT:
900 RETVAL 957 RETVAL
901 958
902SV * 959SV *
903get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
904 CODE: 961 CODE:
905 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
906 sv_utf8_decode (RETVAL); 963 sv_utf8_decode (RETVAL);
907 OUTPUT: 964 OUTPUT:
908 RETVAL 965 RETVAL
909 966
910void 967void
911set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 968set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
912 CODE: 969 CODE:
913 self->r = r; 970 self->r = r;
914 self->g = g; 971 self->g = g;
915 self->b = b; 972 self->b = b;
916 self->a = a; 973 self->a = a;
917 974
918void 975void
919set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
920 CODE: 977 CODE:
921 if (self->font != font) 978 if (self->font != font)
922 { 979 {
923 self->font = font; 980 self->font = font;
924 layout_update_font (self); 981 layout_update_font (self);
925 } 982 }
926 983
927void 984void
928set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
929 CODE: 986 CODE:
930 if (self->base_height != base_height) 987 if (self->base_height != base_height)
931 { 988 {
932 self->base_height = base_height; 989 self->base_height = base_height;
933 layout_update_font (self); 990 layout_update_font (self);
934 } 991 }
935 992
936void 993void
937set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
938 CODE: 995 CODE:
939 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 996 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
940 997
941void 998void
942set_indent (CFClient::Layout self, int indent) 999set_indent (CFPlus::Layout self, int indent)
943 CODE: 1000 CODE:
944 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
945 1002
946void 1003void
947set_spacing (CFClient::Layout self, int spacing) 1004set_spacing (CFPlus::Layout self, int spacing)
948 CODE: 1005 CODE:
949 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
950 1007
951void 1008void
952set_ellipsise (CFClient::Layout self, int ellipsise) 1009set_ellipsise (CFPlus::Layout self, int ellipsise)
953 CODE: 1010 CODE:
954 pango_layout_set_ellipsize (self->pl, 1011 pango_layout_set_ellipsize (self->pl,
955 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
956 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
957 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
958 : PANGO_ELLIPSIZE_NONE 1015 : PANGO_ELLIPSIZE_NONE
959 ); 1016 );
960 1017
961void 1018void
962set_single_paragraph_mode (CFClient::Layout self, int spm) 1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
963 CODE: 1020 CODE:
964 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
965 1022
966void 1023void
967size (CFClient::Layout self) 1024size (CFPlus::Layout self)
968 PPCODE: 1025 PPCODE:
969{ 1026{
970 int w, h; 1027 int w, h;
971 1028
972 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
… …
975 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
976 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
977} 1034}
978 1035
979int 1036int
980descent (CFClient::Layout self) 1037descent (CFPlus::Layout self)
981 CODE: 1038 CODE:
982{ 1039{
983 PangoRectangle rect; 1040 PangoRectangle rect;
984 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
985 pango_layout_line_get_pixel_extents (line, 0, &rect); 1042 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
987} 1044}
988 OUTPUT: 1045 OUTPUT:
989 RETVAL 1046 RETVAL
990 1047
991int 1048int
992xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
993 CODE: 1050 CODE:
994{ 1051{
995 int index, trailing; 1052 int index, trailing;
996 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
997 RETVAL = index; 1054 RETVAL = index;
998} 1055}
999 OUTPUT: 1056 OUTPUT:
1000 RETVAL 1057 RETVAL
1001 1058
1002void 1059void
1003cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
1004 PPCODE: 1061 PPCODE:
1005{ 1062{
1006 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
1007 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1008 1065
… …
1011 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1012 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1013} 1070}
1014 1071
1015void 1072void
1016render (CFClient::Layout self, float x, float y) 1073render (CFPlus::Layout self, float x, float y, int flags = 0)
1017 PPCODE: 1074 PPCODE:
1018 pango_opengl_render_layout_subpixel ( 1075 pango_opengl_render_layout_subpixel (
1019 self->pl, 1076 self->pl,
1020 x * PANGO_SCALE, y * PANGO_SCALE, 1077 x * PANGO_SCALE, y * PANGO_SCALE,
1021 self->r, self->g, self->b, self->a 1078 self->r, self->g, self->b, self->a,
1079 flags
1022 ); 1080 );
1023 1081
1024MODULE = CFClient PACKAGE = CFClient::Texture 1082MODULE = CFPlus PACKAGE = CFPlus::Texture
1025 1083
1026void 1084void
1027pad2pot (SV *data_, SV *w_, SV *h_) 1085pad2pot (SV *data_, SV *w_, SV *h_)
1028 CODE: 1086 CODE:
1029{ 1087{
… …
1107 glDisable (GL_ALPHA_TEST); 1165 glDisable (GL_ALPHA_TEST);
1108 glDisable (GL_BLEND); 1166 glDisable (GL_BLEND);
1109 } 1167 }
1110} 1168}
1111 1169
1112MODULE = CFClient PACKAGE = CFClient::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1113 1171
1114CFClient::Map 1172CFPlus::Map
1115new (SV *class, int map_width, int map_height) 1173new (SV *class)
1116 CODE: 1174 CODE:
1117 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1118 RETVAL->x = 0; 1176 RETVAL->x = 0;
1119 RETVAL->y = 0; 1177 RETVAL->y = 0;
1120 RETVAL->w = map_width; 1178 RETVAL->w = 0;
1121 RETVAL->h = map_height; 1179 RETVAL->h = 0;
1122 RETVAL->ox = 0; 1180 RETVAL->ox = 0;
1123 RETVAL->oy = 0; 1181 RETVAL->oy = 0;
1124 RETVAL->faces = 8192; 1182 RETVAL->faces = 8192;
1125 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1183 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1126 RETVAL->texs = 8192; 1184 RETVAL->texs = 8192;
… …
1129 RETVAL->row = 0; 1187 RETVAL->row = 0;
1130 OUTPUT: 1188 OUTPUT:
1131 RETVAL 1189 RETVAL
1132 1190
1133void 1191void
1134DESTROY (CFClient::Map self) 1192DESTROY (CFPlus::Map self)
1135 CODE: 1193 CODE:
1136{ 1194{
1137 map_clear (self); 1195 map_clear (self);
1138 Safefree (self->face); 1196 Safefree (self->face);
1139 Safefree (self->tex); 1197 Safefree (self->tex);
1140 Safefree (self); 1198 Safefree (self);
1141} 1199}
1142 1200
1143void 1201void
1202resize (CFPlus::Map self, int map_width, int map_height)
1203 CODE:
1204 self->w = map_width;
1205 self->h = map_height;
1206
1207void
1144clear (CFClient::Map self) 1208clear (CFPlus::Map self)
1145 CODE: 1209 CODE:
1146 map_clear (self); 1210 map_clear (self);
1147 1211
1148void 1212void
1149set_face (CFClient::Map self, int face, int texid) 1213set_face (CFPlus::Map self, int face, int texid)
1150 CODE: 1214 CODE:
1151{ 1215{
1152 while (self->faces <= face) 1216 while (self->faces <= face)
1153 { 1217 {
1154 Append (mapface, self->face, self->faces, self->faces); 1218 Append (mapface, self->face, self->faces, self->faces);
… …
1157 1221
1158 self->face [face] = texid; 1222 self->face [face] = texid;
1159} 1223}
1160 1224
1161void 1225void
1162set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1226set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1163 CODE: 1227 CODE:
1164{ 1228{
1165 while (self->texs <= texid) 1229 while (self->texs <= texid)
1166 { 1230 {
1167 Append (maptex, self->tex, self->texs, self->texs); 1231 Append (maptex, self->tex, self->texs, self->texs);
… …
1191 // from transparent color bleeding and ugly wrapping effects. 1255 // from transparent color bleeding and ugly wrapping effects.
1192 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1256 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1193} 1257}
1194 1258
1195int 1259int
1196ox (CFClient::Map self) 1260ox (CFPlus::Map self)
1197 ALIAS: 1261 ALIAS:
1198 oy = 1 1262 oy = 1
1199 x = 2 1263 x = 2
1200 y = 3 1264 y = 3
1201 w = 4 1265 w = 4
… …
1212 } 1276 }
1213 OUTPUT: 1277 OUTPUT:
1214 RETVAL 1278 RETVAL
1215 1279
1216void 1280void
1217scroll (CFClient::Map self, int dx, int dy) 1281scroll (CFPlus::Map self, int dx, int dy)
1218 CODE: 1282 CODE:
1219{ 1283{
1220 if (dx > 0) 1284 if (dx > 0)
1221 map_blank (self, self->x, self->y, dx - 1, self->h); 1285 map_blank (self, self->x, self->y, dx, self->h);
1222 else if (dx < 0) 1286 else if (dx < 0)
1223 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1287 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1224 1288
1225 if (dy > 0) 1289 if (dy > 0)
1226 map_blank (self, self->x, self->y, self->w, dy - 1); 1290 map_blank (self, self->x, self->y, self->w, dy);
1227 else if (dy < 0) 1291 else if (dy < 0)
1228 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1292 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1229 1293
1230 self->ox += dx; self->x += dx; 1294 self->ox += dx; self->x += dx;
1231 self->oy += dy; self->y += dy; 1295 self->oy += dy; self->y += dy;
1232 1296
1233 while (self->y < 0) 1297 while (self->y < 0)
… …
1238 self->y += MAP_EXTEND_Y; 1302 self->y += MAP_EXTEND_Y;
1239 } 1303 }
1240} 1304}
1241 1305
1242void 1306void
1243map1a_update (CFClient::Map self, SV *data_) 1307map1a_update (CFPlus::Map self, SV *data_, int extmap)
1244 CODE: 1308 CODE:
1245{ 1309{
1246 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1310 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1247 uint8_t *data_end = (uint8_t *)SvEND (data_); 1311 uint8_t *data_end = (uint8_t *)SvEND (data_);
1248 mapcell *cell; 1312 mapcell *cell;
1249 int x, y, flags; 1313 int x, y, flags;
1250 1314
1251 while (data < data_end) 1315 while (data < data_end - 1)
1252 { 1316 {
1253 flags = (data [0] << 8) + data [1]; data += 2; 1317 flags = (data [0] << 8) + data [1]; data += 2;
1254 1318
1255 x = self->x + ((flags >> 10) & 63); 1319 x = self->x + ((flags >> 10) & 63);
1256 y = self->y + ((flags >> 4) & 63); 1320 y = self->y + ((flags >> 4) & 63);
1257 1321
1258 cell = map_get_cell (self, x, y); 1322 cell = map_get_cell (self, x, y);
1259 1323
1260 if (flags & 15) 1324 if (flags & 15)
1261 { 1325 {
1262 if (cell->darkness < 0) 1326 if (!cell->darkness)
1263 { 1327 {
1328 memset (cell, 0, sizeof (*cell));
1264 cell->darkness = 0; 1329 cell->darkness = 256;
1265 cell->face [0] = 0;
1266 cell->face [1] = 0;
1267 cell->face [2] = 0;
1268 } 1330 }
1269 1331
1270 cell->darkness = flags & 8 ? *data++ : 255;
1271
1272 //TODO: don't trust server data to be in-range(!) 1332 //TODO: don't trust server data to be in-range(!)
1333
1334 if (flags & 8)
1335 {
1336 if (extmap)
1337 {
1338 uint8_t ext, cmd;
1339
1340 do
1341 {
1342 ext = *data++;
1343 cmd = ext & 0x3f;
1344
1345 if (cmd < 4)
1346 cell->darkness = 255 - ext * 64 + 1;
1347 else if (cmd == 5) // health
1348 {
1349 cell->stat_width = 1;
1350 cell->stat_hp = *data++;
1351 }
1352 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width
1355 {
1356 if (*data == 4)
1357 ; // decode player tag
1358
1359 data += *data + 1;
1360 }
1361 else if (cmd == 8) // cell flags
1362 cell->flags = *data++;
1363 else if (ext & 0x40) // unknown, multibyte => skip
1364 data += *data + 1;
1365 else
1366 data++;
1367 }
1368 while (ext & 0x80);
1369 }
1370 else
1371 cell->darkness = *data++ + 1;
1372 }
1273 1373
1274 if (flags & 4) 1374 if (flags & 4)
1275 { 1375 {
1276 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1376 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1277 } 1377 }
… …
1285 { 1385 {
1286 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1386 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1287 } 1387 }
1288 } 1388 }
1289 else 1389 else
1290 cell->darkness = -1; 1390 cell->darkness = 0;
1291 } 1391 }
1292} 1392}
1293 1393
1294SV * 1394SV *
1295mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1296 CODE: 1396 CODE:
1297{ 1397{
1298 int x1, x; 1398 int x1, x;
1299 int y1, y; 1399 int y1, y;
1300 int z; 1400 int z;
… …
1350} 1450}
1351 OUTPUT: 1451 OUTPUT:
1352 RETVAL 1452 RETVAL
1353 1453
1354void 1454void
1355draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1455draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1356 CODE: 1456 CODE:
1357{ 1457{
1358 int vx, vy;
1359 int x, y, z; 1458 int x, y, z;
1360 int last_name; 1459 int last_name;
1361 mapface face; 1460 mapface face;
1362
1363 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1364 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1365
1366 /*
1367 int vx = self->vx = self->w >= sw
1368 ? self->x + (self->w - sw) / 2
1369 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1370
1371 int vy = self->vy = self->h >= sh
1372 ? self->y + (self->h - sh) / 2
1373 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1374 */
1375 1461
1376 glColor4ub (255, 255, 255, 255); 1462 glColor4ub (255, 255, 255, 255);
1377 1463
1378 glEnable (GL_BLEND); 1464 glEnable (GL_BLEND);
1379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1382 1468
1383 glBegin (GL_QUADS); 1469 glBegin (GL_QUADS);
1384 1470
1385 last_name = 0; 1471 last_name = 0;
1386 1472
1473 mx += self->x;
1474 my += self->y;
1475
1387 for (z = 0; z < 3; z++) 1476 for (z = 0; z < 3; z++)
1388 for (y = 0; y < sh; y++) 1477 for (y = 0; y < sh; y++)
1389 if (0 <= y + vy && y + vy < self->rows) 1478 if (0 <= y + my && y + my < self->rows)
1390 { 1479 {
1391 maprow *row = self->row + (y + vy); 1480 maprow *row = self->row + (y + my);
1392 1481
1393 for (x = 0; x < sw; x++) 1482 for (x = 0; x < sw; x++)
1394 if (row->c0 <= x + vx && x + vx < row->c1) 1483 if (row->c0 <= x + mx && x + mx < row->c1)
1395 { 1484 {
1396 mapcell *cell = row->col + (x + vx - row->c0); 1485 mapcell *cell = row->col + (x + mx - row->c0);
1397 1486
1398 face = cell->face [z]; 1487 face = cell->face [z];
1399 1488
1400 if (face) 1489 if (face && face < self->texs)
1401 { 1490 {
1402 maptex tex = self->tex [face]; 1491 maptex tex = self->tex [face];
1403
1404 int px = (x + 1) * 32 - tex.w; 1492 int px = (x + 1) * 32 - tex.w;
1405 int py = (y + 1) * 32 - tex.h; 1493 int py = (y + 1) * 32 - tex.h;
1406 1494
1407 if (last_name != tex.name) 1495 if (last_name != tex.name)
1408 { 1496 {
1409 glEnd (); 1497 glEnd ();
1410 last_name = tex.name;
1411 glBindTexture (GL_TEXTURE_2D, last_name); 1498 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1412 glBegin (GL_QUADS); 1499 glBegin (GL_QUADS);
1413 } 1500 }
1414 1501
1415 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1502 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1416 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1503 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1417 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1504 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1418 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1505 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1419 } 1506 }
1507
1508 if (cell->flags && z == 2)
1509 {
1510 if (cell->flags & 1)
1511 {
1512 maptex tex = self->tex [1];
1513 int px = (x + 1) * 32 - tex.w + 2;
1514 int py = (y + 1) * 32 - tex.h - 6;
1515
1516 glEnd ();
1517 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1518 glBegin (GL_QUADS);
1519
1520 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1521 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1522 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1523 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1524 }
1525 }
1420 } 1526 }
1421 } 1527 }
1422 1528
1423 glEnd (); 1529 glEnd ();
1424 1530
1425 glDisable (GL_TEXTURE_2D); 1531 glDisable (GL_TEXTURE_2D);
1426 glDisable (GL_BLEND); 1532 glDisable (GL_BLEND);
1427}
1428 1533
1534 // top layer: overlays such as the health bar
1535 for (y = 0; y < sh; y++)
1536 if (0 <= y + my && y + my < self->rows)
1537 {
1538 maprow *row = self->row + (y + my);
1539
1540 for (x = 0; x < sw; x++)
1541 if (row->c0 <= x + mx && x + mx < row->c1)
1542 {
1543 mapcell *cell = row->col + (x + mx - row->c0);
1544
1545 int px = x * 32;
1546 int py = y * 32;
1547
1548 if (cell->stat_hp)
1549 {
1550 int width = cell->stat_width * 32;
1551 int thick = sh / 28 + 1 + cell->stat_width;
1552
1553 glColor3ub (0, 0, 0);
1554 glRectf (px + 1, py - thick - 2,
1555 px + width - 1, py);
1556
1557 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1558 glRectf (px + 2,
1559 py - thick - 1,
1560 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1561 }
1562 }
1563 }
1564}
1565
1429void 1566void
1430draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1567draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1431 CODE: 1568 CODE:
1432{ 1569{
1433 static float color[16][3] = { 1570 static float color[16][3] = {
1434 { 0.00F, 0.00F, 0.00F }, 1571 { 0.00F, 0.00F, 0.00F },
1435 { 1.00F, 1.00F, 1.00F }, 1572 { 1.00F, 1.00F, 1.00F },
… …
1485 glDisable (GL_BLEND); 1622 glDisable (GL_BLEND);
1486 glDisable (GL_TEXTURE_2D); 1623 glDisable (GL_TEXTURE_2D);
1487} 1624}
1488 1625
1489void 1626void
1490fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1627fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1491 PPCODE: 1628 PPCODE:
1492{ 1629{
1493 int vx, vy;
1494 int x, y; 1630 int x, y;
1495 int sw4 = (sw + 3) & ~3; 1631 int sw4 = (sw + 3) & ~3;
1496 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1632 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1497 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1633 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1498 1634
1499 memset (darkness, 255, sw4 * sh); 1635 memset (darkness, 255, sw4 * sh);
1500 SvPOK_only (darkness_sv); 1636 SvPOK_only (darkness_sv);
1501 SvCUR_set (darkness_sv, sw4 * sh); 1637 SvCUR_set (darkness_sv, sw4 * sh);
1502 1638
1503 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1639 mx += self->x;
1504 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1640 my += self->y;
1505 1641
1506 for (y = 0; y < sh; y++) 1642 for (y = 0; y < sh; y++)
1507 if (0 <= y + vy && y + vy < self->rows) 1643 if (0 <= y + my && y + my < self->rows)
1508 { 1644 {
1509 maprow *row = self->row + (y + vy); 1645 maprow *row = self->row + (y + my);
1510 1646
1511 for (x = 0; x < sw; x++) 1647 for (x = 0; x < sw; x++)
1512 if (row->c0 <= x + vx && x + vx < row->c1) 1648 if (row->c0 <= x + mx && x + mx < row->c1)
1513 { 1649 {
1514 mapcell *cell = row->col + (x + vx - row->c0); 1650 mapcell *cell = row->col + (x + mx - row->c0);
1515 1651
1516 darkness[y * sw4 + x] = cell->darkness < 0 1652 darkness[y * sw4 + x] = cell->darkness
1653 ? 255 - (cell->darkness - 1)
1517 ? 255 - FOW_DARKNESS 1654 : 255 - FOW_DARKNESS;
1518 : 255 - cell->darkness;
1519 } 1655 }
1520 } 1656 }
1521 1657
1522 EXTEND (SP, 3); 1658 EXTEND (SP, 3);
1523 PUSHs (sv_2mortal (newSViv (sw4))); 1659 PUSHs (sv_2mortal (newSViv (sw4)));
1524 PUSHs (sv_2mortal (newSViv (sh))); 1660 PUSHs (sv_2mortal (newSViv (sh)));
1525 PUSHs (darkness_sv); 1661 PUSHs (darkness_sv);
1526} 1662}
1527 1663
1528SV * 1664SV *
1529get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1665get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1530 CODE: 1666 CODE:
1531{ 1667{
1532 int x, y, x1, y1; 1668 int x, y, x1, y1;
1533 SV *data_sv = newSV (w * h * 7 + 5); 1669 SV *data_sv = newSV (w * h * 7 + 5);
1534 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1670 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1596} 1732}
1597 OUTPUT: 1733 OUTPUT:
1598 RETVAL 1734 RETVAL
1599 1735
1600void 1736void
1601set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1737set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1602 PPCODE: 1738 PPCODE:
1603{ 1739{
1604 int x, y, z; 1740 int x, y, z;
1605 int w, h; 1741 int w, h;
1606 int x1, y1; 1742 int x1, y1;
… …
1638 1774
1639 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1775 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1640 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1776 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1641 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1777 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1642 1778
1643 if (cell->darkness <= 0) 1779 if (cell->darkness == 0)
1644 { 1780 {
1645 cell->darkness = -1; 1781 cell->darkness = 0;
1646 1782
1647 for (z = 0; z <= 2; z++) 1783 for (z = 0; z <= 2; z++)
1648 { 1784 {
1649 cell->face[z] = face[z]; 1785 cell->face[z] = face[z];
1650 1786
… …
1655 } 1791 }
1656 } 1792 }
1657 } 1793 }
1658} 1794}
1659 1795
1660MODULE = CFClient PACKAGE = CFClient::MixChunk 1796MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1661 1797
1662CFClient::MixChunk 1798CFPlus::MixChunk
1663new_from_file (SV *class, char *path) 1799new_from_file (SV *class, char *path)
1664 CODE: 1800 CODE:
1665 RETVAL = Mix_LoadWAV (path); 1801 RETVAL = Mix_LoadWAV (path);
1666 OUTPUT: 1802 OUTPUT:
1667 RETVAL 1803 RETVAL
1668 1804
1669void 1805void
1670DESTROY (CFClient::MixChunk self) 1806DESTROY (CFPlus::MixChunk self)
1671 CODE: 1807 CODE:
1672 Mix_FreeChunk (self); 1808 Mix_FreeChunk (self);
1673 1809
1674int 1810int
1675volume (CFClient::MixChunk self, int volume = -1) 1811volume (CFPlus::MixChunk self, int volume = -1)
1676 CODE: 1812 CODE:
1677 RETVAL = Mix_VolumeChunk (self, volume); 1813 RETVAL = Mix_VolumeChunk (self, volume);
1678 OUTPUT: 1814 OUTPUT:
1679 RETVAL 1815 RETVAL
1680 1816
1681int 1817int
1682play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1818play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1683 CODE: 1819 CODE:
1684 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1820 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1685 OUTPUT: 1821 OUTPUT:
1686 RETVAL 1822 RETVAL
1687 1823
1688MODULE = CFClient PACKAGE = CFClient::MixMusic 1824MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1689 1825
1690int 1826int
1691volume (int volume = -1) 1827volume (int volume = -1)
1692 CODE: 1828 CODE:
1693 RETVAL = Mix_VolumeMusic (volume); 1829 RETVAL = Mix_VolumeMusic (volume);
1694 OUTPUT: 1830 OUTPUT:
1695 RETVAL 1831 RETVAL
1696 1832
1697CFClient::MixMusic 1833CFPlus::MixMusic
1698new_from_file (SV *class, char *path) 1834new_from_file (SV *class, char *path)
1699 CODE: 1835 CODE:
1700 RETVAL = Mix_LoadMUS (path); 1836 RETVAL = Mix_LoadMUS (path);
1701 OUTPUT: 1837 OUTPUT:
1702 RETVAL 1838 RETVAL
1703 1839
1704void 1840void
1705DESTROY (CFClient::MixMusic self) 1841DESTROY (CFPlus::MixMusic self)
1706 CODE: 1842 CODE:
1707 Mix_FreeMusic (self); 1843 Mix_FreeMusic (self);
1708 1844
1709int 1845int
1710play (CFClient::MixMusic self, int loops = -1) 1846play (CFPlus::MixMusic self, int loops = -1)
1711 CODE: 1847 CODE:
1712 RETVAL = Mix_PlayMusic (self, loops); 1848 RETVAL = Mix_PlayMusic (self, loops);
1713 OUTPUT: 1849 OUTPUT:
1714 RETVAL 1850 RETVAL
1715 1851
1716MODULE = CFClient PACKAGE = CFClient::OpenGL 1852MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1717 1853
1718BOOT: 1854BOOT:
1719{ 1855{
1720 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1856 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1721 static const struct { 1857 static const struct {
1722 const char *name; 1858 const char *name;
1723 IV iv; 1859 IV iv;
1724 } *civ, const_iv[] = { 1860 } *civ, const_iv[] = {
1725# define const_iv(name) { # name, (IV)name } 1861# define const_iv(name) { # name, (IV)name }
… …
1788 const_iv (GL_SEPARABLE_2D), 1924 const_iv (GL_SEPARABLE_2D),
1789 const_iv (GL_CONVOLUTION_2D), 1925 const_iv (GL_CONVOLUTION_2D),
1790 const_iv (GL_CONVOLUTION_BORDER_MODE), 1926 const_iv (GL_CONVOLUTION_BORDER_MODE),
1791 const_iv (GL_CONSTANT_BORDER), 1927 const_iv (GL_CONSTANT_BORDER),
1792 const_iv (GL_LINES), 1928 const_iv (GL_LINES),
1929 const_iv (GL_LINE_STRIP),
1793 const_iv (GL_LINE_LOOP), 1930 const_iv (GL_LINE_LOOP),
1794 const_iv (GL_QUADS), 1931 const_iv (GL_QUADS),
1795 const_iv (GL_QUAD_STRIP), 1932 const_iv (GL_QUAD_STRIP),
1796 const_iv (GL_TRIANGLES), 1933 const_iv (GL_TRIANGLES),
1797 const_iv (GL_TRIANGLE_STRIP), 1934 const_iv (GL_TRIANGLE_STRIP),
… …
1907 r *= a; 2044 r *= a;
1908 g *= a; 2045 g *= a;
1909 b *= a; 2046 b *= a;
1910 } 2047 }
1911 // microsoft visual "c" rounds instead of truncating... 2048 // microsoft visual "c" rounds instead of truncating...
1912 glColor4ub (MIN ((int)(r * 256.f), 255), 2049 glColor4f (r, g, b, a);
1913 MIN ((int)(g * 256.f), 255),
1914 MIN ((int)(b * 256.f), 255),
1915 MIN ((int)(a * 256.f), 255));
1916 2050
1917void glInterleavedArrays (int format, int stride, char *data) 2051void glInterleavedArrays (int format, int stride, char *data)
1918 2052
1919void glDrawElements (int mode, int count, int type, char *indices) 2053void glDrawElements (int mode, int count, int type, char *indices)
1920 2054
… …
1997 2131
1998void glEndList () 2132void glEndList ()
1999 2133
2000void glCallList (int list) 2134void glCallList (int list)
2001 2135
2002

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines