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.124 by root, Tue Jul 4 23:23:31 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

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