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.155 by root, Thu Sep 21 00:16:42 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>
5# pragma warning(disable:4244) 6# pragma warning(disable:4244)
6#endif 7#endif
7 8
8#include "EXTERN.h" 9#include "EXTERN.h"
9#include "perl.h" 10#include "perl.h"
10#include "XSUB.h" 11#include "XSUB.h"
12
13#ifdef _WIN32
14# undef pipe
15#endif
11 16
12#include <math.h> 17#include <math.h>
13#include <string.h> 18#include <string.h>
14#include <stdio.h> 19#include <stdio.h>
15#include <stdlib.h> 20#include <stdlib.h>
… …
40 typedef signed char int8_t; 45 typedef signed char int8_t;
41 typedef signed short int16_t; 46 typedef signed short int16_t;
42 typedef signed int int32_t; 47 typedef signed int int32_t;
43#endif 48#endif
44 49
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48 51
49#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
50 53
51#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
53 56
54#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
55 58
56#if 1 59#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 60# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 61#else
59# define PARACHUTE 0 62# define PARACHUTE 0
60#endif 63#endif
61 64
… …
80 83
81#include "pango-font.c" 84#include "pango-font.c"
82#include "pango-fontmap.c" 85#include "pango-fontmap.c"
83#include "pango-render.c" 86#include "pango-render.c"
84 87
85typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
87 90
88typedef PangoFontDescription *CFClient__Font; 91typedef PangoFontDescription *CFPlus__Font;
89 92
90static int 93static int
91shape_attr_p (PangoLayoutRun *run) 94shape_attr_p (PangoLayoutRun *run)
92{ 95{
93 GSList *attrs = run->item->analysis.extra_attrs; 96 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 110
108typedef struct cf_layout { 111typedef struct cf_layout {
109 PangoLayout *pl; 112 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
111 int base_height; 114 int base_height;
112 CFClient__Font font; 115 CFPlus__Font font;
113} *CFClient__Layout; 116} *CFPlus__Layout;
114 117
115static CFClient__Font default_font; 118static CFPlus__Font default_font;
116static PangoContext *opengl_context; 119static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 120static PangoFontMap *opengl_fontmap;
118 121
119static void 122static void
120substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
121{ 124{
122 FcPatternAddBool (pattern, FC_HINTING, 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
123#ifdef FC_HINT_STYLE 126#ifdef FC_HINT_STYLE
124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif 128#endif
126#ifdef _WIN32
127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
128#else
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130#endif
131} 130}
132 131
133static void 132static void
134layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
135{ 134{
136 /* use a random scale factor to account for unknown descenders, 0.8 works 135 /* use a random scale factor to account for unknown descenders, 0.8 works
137 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
138 */ 137 */
139 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
… …
143 142
144 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
145} 144}
146 145
147static void 146static void
148layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
149{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
150 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
151 153
152 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
153 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
154 156
155 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
156} 162}
157 163
158typedef uint16_t mapface; 164typedef uint16_t mapface;
159 165
160typedef struct { 166typedef struct {
… …
163 float s, t; 169 float s, t;
164 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
165} maptex; 171} maptex;
166 172
167typedef struct { 173typedef struct {
168 int16_t darkness; 174 uint32_t player;
169 mapface face[3]; 175 mapface face[3];
176 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags;
170} mapcell; 178} mapcell;
171 179
172typedef struct { 180typedef struct {
173 int32_t c0, c1; 181 int32_t c0, c1;
174 mapcell *col; 182 mapcell *col;
… …
183 int texs; 191 int texs;
184 maptex *tex; 192 maptex *tex;
185 193
186 int32_t rows; 194 int32_t rows;
187 maprow *row; 195 maprow *row;
188} *CFClient__Map; 196} *CFPlus__Map;
189 197
190static char * 198static char *
191prepend (char *ptr, int sze, int inc) 199prepend (char *ptr, int sze, int inc)
192{ 200{
193 char *p; 201 char *p;
… …
211 219
212#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 220#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)) 221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
214 222
215static maprow * 223static maprow *
216map_get_row (CFClient__Map self, int y) 224map_get_row (CFPlus__Map self, int y)
217{ 225{
218 if (0 > y) 226 if (0 > y)
219 { 227 {
220 int extend = - y + MAP_EXTEND_Y; 228 int extend = - y + MAP_EXTEND_Y;
221 Prepend (maprow, self->row, self->rows, extend); 229 Prepend (maprow, self->row, self->rows, extend);
… …
259 267
260 return row->col + (x - row->c0); 268 return row->col + (x - row->c0);
261} 269}
262 270
263static mapcell * 271static mapcell *
264map_get_cell (CFClient__Map self, int x, int y) 272map_get_cell (CFPlus__Map self, int x, int y)
265{ 273{
266 return row_get_cell (map_get_row (self, y), x); 274 return row_get_cell (map_get_row (self, y), x);
267} 275}
268 276
269static void 277static void
270map_clear (CFClient__Map self) 278map_clear (CFPlus__Map self)
271{ 279{
272 int r; 280 int r;
273 281
274 for (r = 0; r < self->rows; r++) 282 for (r = 0; r < self->rows; r++)
275 Safefree (self->row[r].col); 283 Safefree (self->row[r].col);
… …
283 self->row = 0; 291 self->row = 0;
284 self->rows = 0; 292 self->rows = 0;
285} 293}
286 294
287static void 295static void
288map_blank (CFClient__Map self, int x0, int y0, int w, int h) 296map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
289{ 297{
290 int x, y; 298 int x, y;
291 maprow *row; 299 maprow *row;
300 mapcell *cell;
292 301
293 for (y = y0; y < y0 + h; y++) 302 for (y = y0; y < y0 + h; y++)
294 if (y >= 0) 303 if (y >= 0)
295 { 304 {
296 if (y >= self->rows) 305 if (y >= self->rows)
… …
302 if (x >= row->c0) 311 if (x >= row->c0)
303 { 312 {
304 if (x >= row->c1) 313 if (x >= row->c1)
305 break; 314 break;
306 315
307 row->col[x - row->c0].darkness = -1; 316 cell = row->col + x - row->c0;
317
318 cell->darkness = 0;
319 cell->stat_hp = 0;
320 cell->flags = 0;
321 cell->player = 0;
308 } 322 }
309 } 323 }
310} 324}
311 325
312static void 326static void
… …
350 n |= n >> 16; 364 n |= n >> 16;
351 365
352 return n + 1; 366 return n + 1;
353} 367}
354 368
355MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
356 370
357PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
358 372
359BOOT: 373BOOT:
360{ 374{
361 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
362 static const struct { 376 static const struct {
363 const char *name; 377 const char *name;
364 IV iv; 378 IV iv;
365 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
366# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
… …
467 481
468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 482 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 483 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
470} 484}
471 485
486int
487in_destruct ()
488 CODE:
489 RETVAL = PL_main_cv == Nullcv;
490 OUTPUT:
491 RETVAL
492
472NV floor (NV x) 493NV floor (NV x)
473 494
474NV ceil (NV x) 495NV ceil (NV x)
475 496
476void 497void
… …
506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
509 530
510 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 531 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
532#if SDL_VERSION_ATLEAST(1,2,10)
533 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
534 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
535#endif
511 536
512 SDL_EnableUNICODE (1); 537 SDL_EnableUNICODE (1);
513 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 538 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
514 539
515 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 540 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
602 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 627 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
603 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 628 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
604 break; 629 break;
605 } 630 }
606 631
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 632 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
608 } 633 }
609} 634}
610 635
611int 636int
612Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 637Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
628#endif 653#endif
629 654
630void 655void
631add_font (char *file) 656add_font (char *file)
632 CODE: 657 CODE:
633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 658 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
634 659
635void 660void
636load_image_inline (SV *image_) 661load_image_inline (SV *image_)
637 ALIAS: 662 ALIAS:
638 load_image_file = 1 663 load_image_file = 1
… …
680 705
681 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 706 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
682 707
683 assert (surface2->pitch == surface2->w * 4); 708 assert (surface2->pitch == surface2->w * 4);
684 709
710 SDL_LockSurface (surface2);
685 EXTEND (SP, 5); 711 EXTEND (SP, 6);
686 PUSHs (sv_2mortal (newSViv (surface2->w))); 712 PUSHs (sv_2mortal (newSViv (surface2->w)));
687 PUSHs (sv_2mortal (newSViv (surface2->h))); 713 PUSHs (sv_2mortal (newSViv (surface2->h)));
688 SDL_LockSurface (surface2);
689 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 714 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))); 715 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
692 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 716 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
693 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 717 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
718 SDL_UnlockSurface (surface2);
694 719
695 SDL_FreeSurface (surface); 720 SDL_FreeSurface (surface);
696 SDL_FreeSurface (surface2); 721 SDL_FreeSurface (surface2);
697} 722}
698 723
… …
741void 766void
742_exit (int retval) 767_exit (int retval)
743 CODE: 768 CODE:
744 _exit (retval); 769 _exit (retval);
745 770
746MODULE = CFClient PACKAGE = CFClient::Font 771MODULE = CFPlus PACKAGE = CFPlus::Font
747 772
748CFClient::Font 773CFPlus::Font
749new_from_file (SV *class, char *path, int id = 0) 774new_from_file (SV *class, char *path, int id = 0)
750 CODE: 775 CODE:
751{ 776{
752 int count; 777 int count;
753 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 778 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
756} 781}
757 OUTPUT: 782 OUTPUT:
758 RETVAL 783 RETVAL
759 784
760void 785void
761DESTROY (CFClient::Font self) 786DESTROY (CFPlus::Font self)
762 CODE: 787 CODE:
763 pango_font_description_free (self); 788 pango_font_description_free (self);
764 789
765void 790void
766make_default (CFClient::Font self) 791make_default (CFPlus::Font self)
767 CODE: 792 CODE:
768 default_font = self; 793 default_font = self;
769 794
770MODULE = CFClient PACKAGE = CFClient::Layout 795MODULE = CFPlus PACKAGE = CFPlus::Layout
771 796
772void 797void
773clear_font_cache () 798reset_glyph_cache ()
774 CODE: 799 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear (); 800 tc_clear ();
777 801
778CFClient::Layout 802CFPlus::Layout
779new (SV *class, int type = 0) 803new (SV *class)
780 CODE: 804 CODE:
781 New (0, RETVAL, 1, struct cf_layout); 805 New (0, RETVAL, 1, struct cf_layout);
782 806
783 RETVAL->pl = pango_layout_new (opengl_context); 807 RETVAL->pl = pango_layout_new (opengl_context);
784 RETVAL->r = 1.; 808 RETVAL->r = 1.;
… …
792 layout_update_font (RETVAL); 816 layout_update_font (RETVAL);
793 OUTPUT: 817 OUTPUT:
794 RETVAL 818 RETVAL
795 819
796void 820void
797DESTROY (CFClient::Layout self) 821DESTROY (CFPlus::Layout self)
798 CODE: 822 CODE:
799 g_object_unref (self->pl); 823 g_object_unref (self->pl);
800 Safefree (self); 824 Safefree (self);
801 825
802void 826void
803set_text (CFClient::Layout self, SV *text_) 827set_text (CFPlus::Layout self, SV *text_)
804 CODE: 828 CODE:
805{ 829{
806 STRLEN textlen; 830 STRLEN textlen;
807 char *text = SvPVutf8 (text_, textlen); 831 char *text = SvPVutf8 (text_, textlen);
808 832
809 pango_layout_set_text (self->pl, text, textlen); 833 pango_layout_set_text (self->pl, text, textlen);
810} 834}
811 835
812void 836void
813set_markup (CFClient::Layout self, SV *text_) 837set_markup (CFPlus::Layout self, SV *text_)
814 CODE: 838 CODE:
815{ 839{
816 STRLEN textlen; 840 STRLEN textlen;
817 char *text = SvPVutf8 (text_, textlen); 841 char *text = SvPVutf8 (text_, textlen);
818 842
819 pango_layout_set_markup (self->pl, text, textlen); 843 pango_layout_set_markup (self->pl, text, textlen);
820} 844}
821 845
822void 846void
823set_shapes (CFClient::Layout self, ...) 847set_shapes (CFPlus::Layout self, ...)
824 CODE: 848 CODE:
825{ 849{
826 PangoAttrList *attrs = 0; 850 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl); 851 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text; 852 const char *pos = text;
… …
863 if (attrs) 887 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs); 888 pango_layout_set_attributes (self->pl, attrs);
865} 889}
866 890
867void 891void
868get_shapes (CFClient::Layout self) 892get_shapes (CFPlus::Layout self)
869 PPCODE: 893 PPCODE:
870{ 894{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 895 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872 896
873 do 897 do
… …
877 if (run && shape_attr_p (run)) 901 if (run && shape_attr_p (run))
878 { 902 {
879 PangoRectangle extents; 903 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents); 904 pango_layout_iter_get_run_extents (iter, 0, &extents);
881 905
906 EXTEND (SP, 2);
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 907 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 908 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 } 909 }
885 } 910 }
886 while (pango_layout_iter_next_run (iter)); 911 while (pango_layout_iter_next_run (iter));
887 912
888 pango_layout_iter_free (iter); 913 pango_layout_iter_free (iter);
889} 914}
890 915
891int 916int
892has_wrapped (CFClient::Layout self) 917has_wrapped (CFPlus::Layout self)
893 CODE: 918 CODE:
894{ 919{
895 int lines = 1; 920 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl); 921 const char *text = pango_layout_get_text (self->pl);
897 922
… …
902} 927}
903 OUTPUT: 928 OUTPUT:
904 RETVAL 929 RETVAL
905 930
906SV * 931SV *
907get_text (CFClient::Layout self) 932get_text (CFPlus::Layout self)
908 CODE: 933 CODE:
909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 934 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
910 sv_utf8_decode (RETVAL); 935 sv_utf8_decode (RETVAL);
911 OUTPUT: 936 OUTPUT:
912 RETVAL 937 RETVAL
913 938
914void 939void
915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 940set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
916 CODE: 941 CODE:
917 self->r = r; 942 self->r = r;
918 self->g = g; 943 self->g = g;
919 self->b = b; 944 self->b = b;
920 self->a = a; 945 self->a = a;
921 946
922void 947void
923set_font (CFClient::Layout self, CFClient::Font font = 0) 948set_font (CFPlus::Layout self, CFPlus::Font font = 0)
924 CODE: 949 CODE:
925 if (self->font != font) 950 if (self->font != font)
926 { 951 {
927 self->font = font; 952 self->font = font;
928 layout_update_font (self); 953 layout_update_font (self);
929 } 954 }
930 955
931void 956void
932set_height (CFClient::Layout self, int base_height) 957set_height (CFPlus::Layout self, int base_height)
933 CODE: 958 CODE:
934 if (self->base_height != base_height) 959 if (self->base_height != base_height)
935 { 960 {
936 self->base_height = base_height; 961 self->base_height = base_height;
937 layout_update_font (self); 962 layout_update_font (self);
938 } 963 }
939 964
940void 965void
941set_width (CFClient::Layout self, int max_width = -1) 966set_width (CFPlus::Layout self, int max_width = -1)
942 CODE: 967 CODE:
943 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 968 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
944 969
945void 970void
946set_indent (CFClient::Layout self, int indent) 971set_indent (CFPlus::Layout self, int indent)
947 CODE: 972 CODE:
948 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 973 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
949 974
950void 975void
951set_spacing (CFClient::Layout self, int spacing) 976set_spacing (CFPlus::Layout self, int spacing)
952 CODE: 977 CODE:
953 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 978 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
954 979
955void 980void
956set_ellipsise (CFClient::Layout self, int ellipsise) 981set_ellipsise (CFPlus::Layout self, int ellipsise)
957 CODE: 982 CODE:
958 pango_layout_set_ellipsize (self->pl, 983 pango_layout_set_ellipsize (self->pl,
959 ellipsise == 1 ? PANGO_ELLIPSIZE_START 984 ellipsise == 1 ? PANGO_ELLIPSIZE_START
960 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 985 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
961 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 986 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
962 : PANGO_ELLIPSIZE_NONE 987 : PANGO_ELLIPSIZE_NONE
963 ); 988 );
964 989
965void 990void
966set_single_paragraph_mode (CFClient::Layout self, int spm) 991set_single_paragraph_mode (CFPlus::Layout self, int spm)
967 CODE: 992 CODE:
968 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 993 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
969 994
970void 995void
971size (CFClient::Layout self) 996size (CFPlus::Layout self)
972 PPCODE: 997 PPCODE:
973{ 998{
974 int w, h; 999 int w, h;
975 1000
976 layout_get_pixel_size (self, &w, &h); 1001 layout_get_pixel_size (self, &w, &h);
… …
979 PUSHs (sv_2mortal (newSViv (w))); 1004 PUSHs (sv_2mortal (newSViv (w)));
980 PUSHs (sv_2mortal (newSViv (h))); 1005 PUSHs (sv_2mortal (newSViv (h)));
981} 1006}
982 1007
983int 1008int
984descent (CFClient::Layout self) 1009descent (CFPlus::Layout self)
985 CODE: 1010 CODE:
986{ 1011{
987 PangoRectangle rect; 1012 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1013 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect); 1014 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
991} 1016}
992 OUTPUT: 1017 OUTPUT:
993 RETVAL 1018 RETVAL
994 1019
995int 1020int
996xy_to_index (CFClient::Layout self, int x, int y) 1021xy_to_index (CFPlus::Layout self, int x, int y)
997 CODE: 1022 CODE:
998{ 1023{
999 int index, trailing; 1024 int index, trailing;
1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1025 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1001 RETVAL = index; 1026 RETVAL = index;
1002} 1027}
1003 OUTPUT: 1028 OUTPUT:
1004 RETVAL 1029 RETVAL
1005 1030
1006void 1031void
1007cursor_pos (CFClient::Layout self, int index) 1032cursor_pos (CFPlus::Layout self, int index)
1008 PPCODE: 1033 PPCODE:
1009{ 1034{
1010 PangoRectangle strong_pos; 1035 PangoRectangle strong_pos;
1011 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1036 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1012 1037
… …
1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1017} 1042}
1018 1043
1019void 1044void
1020render (CFClient::Layout self, float x, float y) 1045render (CFPlus::Layout self, float x, float y, int flags = 0)
1021 PPCODE: 1046 PPCODE:
1022 pango_opengl_render_layout_subpixel ( 1047 pango_opengl_render_layout_subpixel (
1023 self->pl, 1048 self->pl,
1024 x * PANGO_SCALE, y * PANGO_SCALE, 1049 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a 1050 self->r, self->g, self->b, self->a,
1051 flags
1026 ); 1052 );
1027 1053
1028MODULE = CFClient PACKAGE = CFClient::Texture 1054MODULE = CFPlus PACKAGE = CFPlus::Texture
1029 1055
1030void 1056void
1031pad2pot (SV *data_, SV *w_, SV *h_) 1057pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE: 1058 CODE:
1033{ 1059{
… …
1111 glDisable (GL_ALPHA_TEST); 1137 glDisable (GL_ALPHA_TEST);
1112 glDisable (GL_BLEND); 1138 glDisable (GL_BLEND);
1113 } 1139 }
1114} 1140}
1115 1141
1116MODULE = CFClient PACKAGE = CFClient::Map 1142MODULE = CFPlus PACKAGE = CFPlus::Map
1117 1143
1118CFClient::Map 1144CFPlus::Map
1119new (SV *class, int map_width, int map_height) 1145new (SV *class, int map_width, int map_height)
1120 CODE: 1146 CODE:
1121 New (0, RETVAL, 1, struct map); 1147 New (0, RETVAL, 1, struct map);
1122 RETVAL->x = 0; 1148 RETVAL->x = 0;
1123 RETVAL->y = 0; 1149 RETVAL->y = 0;
… …
1133 RETVAL->row = 0; 1159 RETVAL->row = 0;
1134 OUTPUT: 1160 OUTPUT:
1135 RETVAL 1161 RETVAL
1136 1162
1137void 1163void
1138DESTROY (CFClient::Map self) 1164DESTROY (CFPlus::Map self)
1139 CODE: 1165 CODE:
1140{ 1166{
1141 map_clear (self); 1167 map_clear (self);
1142 Safefree (self->face); 1168 Safefree (self->face);
1143 Safefree (self->tex); 1169 Safefree (self->tex);
1144 Safefree (self); 1170 Safefree (self);
1145} 1171}
1146 1172
1147void 1173void
1148clear (CFClient::Map self) 1174clear (CFPlus::Map self)
1149 CODE: 1175 CODE:
1150 map_clear (self); 1176 map_clear (self);
1151 1177
1152void 1178void
1153set_face (CFClient::Map self, int face, int texid) 1179set_face (CFPlus::Map self, int face, int texid)
1154 CODE: 1180 CODE:
1155{ 1181{
1156 while (self->faces <= face) 1182 while (self->faces <= face)
1157 { 1183 {
1158 Append (mapface, self->face, self->faces, self->faces); 1184 Append (mapface, self->face, self->faces, self->faces);
… …
1161 1187
1162 self->face [face] = texid; 1188 self->face [face] = texid;
1163} 1189}
1164 1190
1165void 1191void
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) 1192set_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: 1193 CODE:
1168{ 1194{
1169 while (self->texs <= texid) 1195 while (self->texs <= texid)
1170 { 1196 {
1171 Append (maptex, self->tex, self->texs, self->texs); 1197 Append (maptex, self->tex, self->texs, self->texs);
… …
1195 // from transparent color bleeding and ugly wrapping effects. 1221 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1222 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1197} 1223}
1198 1224
1199int 1225int
1200ox (CFClient::Map self) 1226ox (CFPlus::Map self)
1201 ALIAS: 1227 ALIAS:
1202 oy = 1 1228 oy = 1
1203 x = 2 1229 x = 2
1204 y = 3 1230 y = 3
1205 w = 4 1231 w = 4
… …
1216 } 1242 }
1217 OUTPUT: 1243 OUTPUT:
1218 RETVAL 1244 RETVAL
1219 1245
1220void 1246void
1221scroll (CFClient::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1222 CODE: 1248 CODE:
1223{ 1249{
1224 if (dx > 0) 1250 if (dx > 0)
1225 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1226 else if (dx < 0) 1252 else if (dx < 0)
1227 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1253 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1228 1254
1229 if (dy > 0) 1255 if (dy > 0)
1230 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1231 else if (dy < 0) 1257 else if (dy < 0)
1232 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1258 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1233 1259
1234 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1235 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1236 1262
1237 while (self->y < 0) 1263 while (self->y < 0)
… …
1242 self->y += MAP_EXTEND_Y; 1268 self->y += MAP_EXTEND_Y;
1243 } 1269 }
1244} 1270}
1245 1271
1246void 1272void
1247map1a_update (CFClient::Map self, SV *data_) 1273map1a_update (CFPlus::Map self, SV *data_, int extmap)
1248 CODE: 1274 CODE:
1249{ 1275{
1250 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1251 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
1252 mapcell *cell; 1278 mapcell *cell;
1253 int x, y, flags; 1279 int x, y, flags;
1254 1280
1255 while (data < data_end) 1281 while (data < data_end - 1)
1256 { 1282 {
1257 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
1258 1284
1259 x = self->x + ((flags >> 10) & 63); 1285 x = self->x + ((flags >> 10) & 63);
1260 y = self->y + ((flags >> 4) & 63); 1286 y = self->y + ((flags >> 4) & 63);
1261 1287
1262 cell = map_get_cell (self, x, y); 1288 cell = map_get_cell (self, x, y);
1263 1289
1264 if (flags & 15) 1290 if (flags & 15)
1265 { 1291 {
1266 if (cell->darkness < 0) 1292 if (!cell->darkness)
1267 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1268 cell->darkness = 0; 1295 cell->darkness = 256;
1269 cell->face [0] = 0;
1270 cell->face [1] = 0;
1271 cell->face [2] = 0;
1272 } 1296 }
1273 1297
1274 cell->darkness = flags & 8 ? *data++ : 255;
1275
1276 //TODO: don't trust server data to be in-range(!) 1298 //TODO: don't trust server data to be in-range(!)
1299
1300 if (flags & 8)
1301 {
1302 if (extmap)
1303 {
1304 uint8_t ext, cmd;
1305
1306 do
1307 {
1308 ext = *data++;
1309 cmd = ext & 0x3f;
1310
1311 if (cmd < 4)
1312 cell->darkness = 255 - ext * 64 + 1;
1313 else if (cmd == 5) // health
1314 {
1315 cell->stat_width = 1;
1316 cell->stat_hp = *data++;
1317 }
1318 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width
1321 {
1322 if (*data == 4)
1323 ; // decode player tag
1324
1325 data += *data + 1;
1326 }
1327 else if (cmd == 8) // cell flags
1328 cell->flags = *data++;
1329 else if (ext & 0x40) // unknown, multibyte => skip
1330 data += *data + 1;
1331 else
1332 data++;
1333 }
1334 while (ext & 0x80);
1335 }
1336 else
1337 cell->darkness = *data++ + 1;
1338
1339 }
1277 1340
1278 if (flags & 4) 1341 if (flags & 4)
1279 { 1342 {
1280 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1343 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1281 } 1344 }
… …
1289 { 1352 {
1290 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1353 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1291 } 1354 }
1292 } 1355 }
1293 else 1356 else
1294 cell->darkness = -1; 1357 cell->darkness = 0;
1295 } 1358 }
1296} 1359}
1297 1360
1298SV * 1361SV *
1299mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1362mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1300 CODE: 1363 CODE:
1301{ 1364{
1302 int x1, x; 1365 int x1, x;
1303 int y1, y; 1366 int y1, y;
1304 int z; 1367 int z;
… …
1354} 1417}
1355 OUTPUT: 1418 OUTPUT:
1356 RETVAL 1419 RETVAL
1357 1420
1358void 1421void
1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1422draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1360 CODE: 1423 CODE:
1361{ 1424{
1362 int vx, vy; 1425 int vx, vy;
1363 int x, y, z; 1426 int x, y, z;
1364 int last_name; 1427 int last_name;
… …
1399 { 1462 {
1400 mapcell *cell = row->col + (x + vx - row->c0); 1463 mapcell *cell = row->col + (x + vx - row->c0);
1401 1464
1402 face = cell->face [z]; 1465 face = cell->face [z];
1403 1466
1404 if (face) 1467 if (face && face < self->texs)
1405 { 1468 {
1406 maptex tex = self->tex [face]; 1469 maptex tex = self->tex [face];
1407
1408 int px = (x + 1) * 32 - tex.w; 1470 int px = (x + 1) * 32 - tex.w;
1409 int py = (y + 1) * 32 - tex.h; 1471 int py = (y + 1) * 32 - tex.h;
1410 1472
1411 if (last_name != tex.name) 1473 if (last_name != tex.name)
1412 { 1474 {
1413 glEnd (); 1475 glEnd ();
1414 last_name = tex.name;
1415 glBindTexture (GL_TEXTURE_2D, last_name); 1476 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1416 glBegin (GL_QUADS); 1477 glBegin (GL_QUADS);
1417 } 1478 }
1418 1479
1419 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1480 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1420 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1481 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1421 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1482 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1422 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1483 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1423 } 1484 }
1485
1486 if (cell->flags && z == 2)
1487 {
1488 if (cell->flags & 1)
1489 {
1490 maptex tex = self->tex [1];
1491 int px = (x + 1) * 32 - tex.w + 2;
1492 int py = (y + 1) * 32 - tex.h - 6;
1493
1494 glEnd ();
1495 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1496 glBegin (GL_QUADS);
1497
1498 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1499 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1500 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1501 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1502 }
1503 }
1424 } 1504 }
1425 } 1505 }
1426 1506
1427 glEnd (); 1507 glEnd ();
1428 1508
1429 glDisable (GL_TEXTURE_2D); 1509 glDisable (GL_TEXTURE_2D);
1430 glDisable (GL_BLEND); 1510 glDisable (GL_BLEND);
1431}
1432 1511
1512 // top layer: overlays such as the health bar
1513 for (y = 0; y < sh; y++)
1514 if (0 <= y + vy && y + vy < self->rows)
1515 {
1516 maprow *row = self->row + (y + vy);
1517
1518 for (x = 0; x < sw; x++)
1519 if (row->c0 <= x + vx && x + vx < row->c1)
1520 {
1521 mapcell *cell = row->col + (x + vx - row->c0);
1522
1523 int px = x * 32;
1524 int py = y * 32;
1525
1526 if (cell->stat_hp)
1527 {
1528 int width = cell->stat_width * 32;
1529 int thick = sh / 28 + 1 + cell->stat_width;
1530
1531 glColor3ub (0, 0, 0);
1532 glRectf (px + 1, py - thick - 2,
1533 px + width - 1, py);
1534
1535 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1536 glRectf (px + 2,
1537 py - thick - 1,
1538 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1539 }
1540 }
1541 }
1542}
1543
1433void 1544void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1545draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE: 1546 CODE:
1436{ 1547{
1437 static float color[16][3] = { 1548 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F }, 1549 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F }, 1550 { 1.00F, 1.00F, 1.00F },
… …
1489 glDisable (GL_BLEND); 1600 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D); 1601 glDisable (GL_TEXTURE_2D);
1491} 1602}
1492 1603
1493void 1604void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1605fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1495 PPCODE: 1606 PPCODE:
1496{ 1607{
1497 int vx, vy; 1608 int vx, vy;
1498 int x, y; 1609 int x, y;
1499 int sw4 = (sw + 3) & ~3; 1610 int sw4 = (sw + 3) & ~3;
… …
1515 for (x = 0; x < sw; x++) 1626 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1) 1627 if (row->c0 <= x + vx && x + vx < row->c1)
1517 { 1628 {
1518 mapcell *cell = row->col + (x + vx - row->c0); 1629 mapcell *cell = row->col + (x + vx - row->c0);
1519 1630
1520 darkness[y * sw4 + x] = cell->darkness < 0 1631 darkness[y * sw4 + x] = cell->darkness
1632 ? 255 - (cell->darkness - 1)
1521 ? 255 - FOW_DARKNESS 1633 : 255 - FOW_DARKNESS;
1522 : 255 - cell->darkness;
1523 } 1634 }
1524 } 1635 }
1525 1636
1526 EXTEND (SP, 3); 1637 EXTEND (SP, 3);
1527 PUSHs (sv_2mortal (newSViv (sw4))); 1638 PUSHs (sv_2mortal (newSViv (sw4)));
1528 PUSHs (sv_2mortal (newSViv (sh))); 1639 PUSHs (sv_2mortal (newSViv (sh)));
1529 PUSHs (darkness_sv); 1640 PUSHs (darkness_sv);
1530} 1641}
1531 1642
1532SV * 1643SV *
1533get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1644get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1534 CODE: 1645 CODE:
1535{ 1646{
1536 int x, y, x1, y1; 1647 int x, y, x1, y1;
1537 SV *data_sv = newSV (w * h * 7 + 5); 1648 SV *data_sv = newSV (w * h * 7 + 5);
1538 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1649 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1600} 1711}
1601 OUTPUT: 1712 OUTPUT:
1602 RETVAL 1713 RETVAL
1603 1714
1604void 1715void
1605set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1716set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1606 PPCODE: 1717 PPCODE:
1607{ 1718{
1608 int x, y, z; 1719 int x, y, z;
1609 int w, h; 1720 int w, h;
1610 int x1, y1; 1721 int x1, y1;
… …
1642 1753
1643 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1754 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1644 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1755 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1645 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1756 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1646 1757
1647 if (cell->darkness <= 0) 1758 if (cell->darkness == 0)
1648 { 1759 {
1649 cell->darkness = -1; 1760 cell->darkness = 0;
1650 1761
1651 for (z = 0; z <= 2; z++) 1762 for (z = 0; z <= 2; z++)
1652 { 1763 {
1653 cell->face[z] = face[z]; 1764 cell->face[z] = face[z];
1654 1765
… …
1659 } 1770 }
1660 } 1771 }
1661 } 1772 }
1662} 1773}
1663 1774
1664MODULE = CFClient PACKAGE = CFClient::MixChunk 1775MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1665 1776
1666CFClient::MixChunk 1777CFPlus::MixChunk
1667new_from_file (SV *class, char *path) 1778new_from_file (SV *class, char *path)
1668 CODE: 1779 CODE:
1669 RETVAL = Mix_LoadWAV (path); 1780 RETVAL = Mix_LoadWAV (path);
1670 OUTPUT: 1781 OUTPUT:
1671 RETVAL 1782 RETVAL
1672 1783
1673void 1784void
1674DESTROY (CFClient::MixChunk self) 1785DESTROY (CFPlus::MixChunk self)
1675 CODE: 1786 CODE:
1676 Mix_FreeChunk (self); 1787 Mix_FreeChunk (self);
1677 1788
1678int 1789int
1679volume (CFClient::MixChunk self, int volume = -1) 1790volume (CFPlus::MixChunk self, int volume = -1)
1680 CODE: 1791 CODE:
1681 RETVAL = Mix_VolumeChunk (self, volume); 1792 RETVAL = Mix_VolumeChunk (self, volume);
1682 OUTPUT: 1793 OUTPUT:
1683 RETVAL 1794 RETVAL
1684 1795
1685int 1796int
1686play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1797play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1687 CODE: 1798 CODE:
1688 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1799 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1689 OUTPUT: 1800 OUTPUT:
1690 RETVAL 1801 RETVAL
1691 1802
1692MODULE = CFClient PACKAGE = CFClient::MixMusic 1803MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1693 1804
1694int 1805int
1695volume (int volume = -1) 1806volume (int volume = -1)
1696 CODE: 1807 CODE:
1697 RETVAL = Mix_VolumeMusic (volume); 1808 RETVAL = Mix_VolumeMusic (volume);
1698 OUTPUT: 1809 OUTPUT:
1699 RETVAL 1810 RETVAL
1700 1811
1701CFClient::MixMusic 1812CFPlus::MixMusic
1702new_from_file (SV *class, char *path) 1813new_from_file (SV *class, char *path)
1703 CODE: 1814 CODE:
1704 RETVAL = Mix_LoadMUS (path); 1815 RETVAL = Mix_LoadMUS (path);
1705 OUTPUT: 1816 OUTPUT:
1706 RETVAL 1817 RETVAL
1707 1818
1708void 1819void
1709DESTROY (CFClient::MixMusic self) 1820DESTROY (CFPlus::MixMusic self)
1710 CODE: 1821 CODE:
1711 Mix_FreeMusic (self); 1822 Mix_FreeMusic (self);
1712 1823
1713int 1824int
1714play (CFClient::MixMusic self, int loops = -1) 1825play (CFPlus::MixMusic self, int loops = -1)
1715 CODE: 1826 CODE:
1716 RETVAL = Mix_PlayMusic (self, loops); 1827 RETVAL = Mix_PlayMusic (self, loops);
1717 OUTPUT: 1828 OUTPUT:
1718 RETVAL 1829 RETVAL
1719 1830
1720MODULE = CFClient PACKAGE = CFClient::OpenGL 1831MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1721 1832
1722BOOT: 1833BOOT:
1723{ 1834{
1724 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1835 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1725 static const struct { 1836 static const struct {
1726 const char *name; 1837 const char *name;
1727 IV iv; 1838 IV iv;
1728 } *civ, const_iv[] = { 1839 } *civ, const_iv[] = {
1729# define const_iv(name) { # name, (IV)name } 1840# define const_iv(name) { # name, (IV)name }
… …
1792 const_iv (GL_SEPARABLE_2D), 1903 const_iv (GL_SEPARABLE_2D),
1793 const_iv (GL_CONVOLUTION_2D), 1904 const_iv (GL_CONVOLUTION_2D),
1794 const_iv (GL_CONVOLUTION_BORDER_MODE), 1905 const_iv (GL_CONVOLUTION_BORDER_MODE),
1795 const_iv (GL_CONSTANT_BORDER), 1906 const_iv (GL_CONSTANT_BORDER),
1796 const_iv (GL_LINES), 1907 const_iv (GL_LINES),
1908 const_iv (GL_LINE_STRIP),
1797 const_iv (GL_LINE_LOOP), 1909 const_iv (GL_LINE_LOOP),
1798 const_iv (GL_QUADS), 1910 const_iv (GL_QUADS),
1799 const_iv (GL_QUAD_STRIP), 1911 const_iv (GL_QUAD_STRIP),
1800 const_iv (GL_TRIANGLES), 1912 const_iv (GL_TRIANGLES),
1801 const_iv (GL_TRIANGLE_STRIP), 1913 const_iv (GL_TRIANGLE_STRIP),
… …
1911 r *= a; 2023 r *= a;
1912 g *= a; 2024 g *= a;
1913 b *= a; 2025 b *= a;
1914 } 2026 }
1915 // microsoft visual "c" rounds instead of truncating... 2027 // microsoft visual "c" rounds instead of truncating...
1916 glColor4ub (MIN ((int)(r * 256.f), 255), 2028 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 2029
1921void glInterleavedArrays (int format, int stride, char *data) 2030void glInterleavedArrays (int format, int stride, char *data)
1922 2031
1923void glDrawElements (int mode, int count, int type, char *indices) 2032void glDrawElements (int mode, int count, int type, char *indices)
1924 2033
… …
2001 2110
2002void glEndList () 2111void glEndList ()
2003 2112
2004void glCallList (int list) 2113void glCallList (int list)
2005 2114
2006

Diff Legend

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