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.132 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC

… …
83 83
84#include "pango-font.c" 84#include "pango-font.c"
85#include "pango-fontmap.c" 85#include "pango-fontmap.c"
86#include "pango-render.c" 86#include "pango-render.c"
87 87
88typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
89typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
90 90
91typedef PangoFontDescription *CFClient__Font; 91typedef PangoFontDescription *CFPlus__Font;
92 92
93static int 93static int
94shape_attr_p (PangoLayoutRun *run) 94shape_attr_p (PangoLayoutRun *run)
95{ 95{
96 GSList *attrs = run->item->analysis.extra_attrs; 96 GSList *attrs = run->item->analysis.extra_attrs;
… …
110 110
111typedef struct cf_layout { 111typedef struct cf_layout {
112 PangoLayout *pl; 112 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
114 int base_height; 114 int base_height;
115 CFClient__Font font; 115 CFPlus__Font font;
116} *CFClient__Layout; 116} *CFPlus__Layout;
117 117
118static CFClient__Font default_font; 118static CFPlus__Font default_font;
119static PangoContext *opengl_context; 119static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap; 120static PangoFontMap *opengl_fontmap;
121 121
122static void 122static void
123substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
… …
128#endif 128#endif
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130} 130}
131 131
132static void 132static void
133layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
134{ 134{
135 /* 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
136 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
137 */ 137 */
138 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
… …
142 142
143 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
144} 144}
145 145
146static void 146static void
147layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
150 153
151 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 156
154 *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;
155} 162}
156 163
157typedef uint16_t mapface; 164typedef uint16_t mapface;
158 165
159typedef struct { 166typedef struct {
… …
162 float s, t; 169 float s, t;
163 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
164} maptex; 171} maptex;
165 172
166typedef struct { 173typedef struct {
167 int16_t darkness; 174 uint16_t darkness;
168 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
169} mapcell; 177} mapcell;
170 178
171typedef struct { 179typedef struct {
172 int32_t c0, c1; 180 int32_t c0, c1;
173 mapcell *col; 181 mapcell *col;
… …
182 int texs; 190 int texs;
183 maptex *tex; 191 maptex *tex;
184 192
185 int32_t rows; 193 int32_t rows;
186 maprow *row; 194 maprow *row;
187} *CFClient__Map; 195} *CFPlus__Map;
188 196
189static char * 197static char *
190prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
191{ 199{
192 char *p; 200 char *p;
… …
210 218
211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
212#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213 221
214static maprow * 222static maprow *
215map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
216{ 224{
217 if (0 > y) 225 if (0 > y)
218 { 226 {
219 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
220 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
… …
258 266
259 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
260} 268}
261 269
262static mapcell * 270static mapcell *
263map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
264{ 272{
265 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
266} 274}
267 275
268static void 276static void
269map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
270{ 278{
271 int r; 279 int r;
272 280
273 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
274 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
… …
282 self->row = 0; 290 self->row = 0;
283 self->rows = 0; 291 self->rows = 0;
284} 292}
285 293
286static void 294static void
287map_blank (CFClient__Map self, int x0, int y0, int w, int h) 295map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 296{
289 int x, y; 297 int x, y;
290 maprow *row; 298 maprow *row;
299 mapcell *cell;
291 300
292 for (y = y0; y < y0 + h; y++) 301 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 302 if (y >= 0)
294 { 303 {
295 if (y >= self->rows) 304 if (y >= self->rows)
… …
301 if (x >= row->c0) 310 if (x >= row->c0)
302 { 311 {
303 if (x >= row->c1) 312 if (x >= row->c1)
304 break; 313 break;
305 314
306 row->col[x - row->c0].darkness = -1; 315 cell = row->col + x - row->c0;
316
317 cell->darkness = 0;
318 cell->stat_hp = 0;
307 } 319 }
308 } 320 }
309} 321}
310 322
311static void 323static void
… …
349 n |= n >> 16; 361 n |= n >> 16;
350 362
351 return n + 1; 363 return n + 1;
352} 364}
353 365
354MODULE = CFClient PACKAGE = CFClient 366MODULE = CFPlus PACKAGE = CFPlus
355 367
356PROTOTYPES: ENABLE 368PROTOTYPES: ENABLE
357 369
358BOOT: 370BOOT:
359{ 371{
360 HV *stash = gv_stashpv ("CFClient", 1); 372 HV *stash = gv_stashpv ("CFPlus", 1);
361 static const struct { 373 static const struct {
362 const char *name; 374 const char *name;
363 IV iv; 375 IV iv;
364 } *civ, const_iv[] = { 376 } *civ, const_iv[] = {
365# define const_iv(name) { # name, (IV)name } 377# define const_iv(name) { # name, (IV)name }
… …
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 527
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 528 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
529#if SDL_VERSION_ATLEAST(1,2,10)
517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 530 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 531 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
532#endif
519 533
520 SDL_EnableUNICODE (1); 534 SDL_EnableUNICODE (1);
521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522 536
523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
610 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 624 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
611 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 625 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
612 break; 626 break;
613 } 627 }
614 628
615 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFClient::UI::Event", 1)))); 629 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
616 } 630 }
617} 631}
618 632
619int 633int
620Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 634Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
749void 763void
750_exit (int retval) 764_exit (int retval)
751 CODE: 765 CODE:
752 _exit (retval); 766 _exit (retval);
753 767
754MODULE = CFClient PACKAGE = CFClient::Font 768MODULE = CFPlus PACKAGE = CFPlus::Font
755 769
756CFClient::Font 770CFPlus::Font
757new_from_file (SV *class, char *path, int id = 0) 771new_from_file (SV *class, char *path, int id = 0)
758 CODE: 772 CODE:
759{ 773{
760 int count; 774 int count;
761 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 775 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
764} 778}
765 OUTPUT: 779 OUTPUT:
766 RETVAL 780 RETVAL
767 781
768void 782void
769DESTROY (CFClient::Font self) 783DESTROY (CFPlus::Font self)
770 CODE: 784 CODE:
771 pango_font_description_free (self); 785 pango_font_description_free (self);
772 786
773void 787void
774make_default (CFClient::Font self) 788make_default (CFPlus::Font self)
775 CODE: 789 CODE:
776 default_font = self; 790 default_font = self;
777 791
778MODULE = CFClient PACKAGE = CFClient::Layout 792MODULE = CFPlus PACKAGE = CFPlus::Layout
779 793
780void 794void
781reset_glyph_cache () 795reset_glyph_cache ()
782 CODE: 796 CODE:
783 tc_clear (); 797 tc_clear ();
784 798
785CFClient::Layout 799CFPlus::Layout
786new (SV *class) 800new (SV *class)
787 CODE: 801 CODE:
788 New (0, RETVAL, 1, struct cf_layout); 802 New (0, RETVAL, 1, struct cf_layout);
789 803
790 RETVAL->pl = pango_layout_new (opengl_context); 804 RETVAL->pl = pango_layout_new (opengl_context);
… …
799 layout_update_font (RETVAL); 813 layout_update_font (RETVAL);
800 OUTPUT: 814 OUTPUT:
801 RETVAL 815 RETVAL
802 816
803void 817void
804DESTROY (CFClient::Layout self) 818DESTROY (CFPlus::Layout self)
805 CODE: 819 CODE:
806 g_object_unref (self->pl); 820 g_object_unref (self->pl);
807 Safefree (self); 821 Safefree (self);
808 822
809void 823void
810set_text (CFClient::Layout self, SV *text_) 824set_text (CFPlus::Layout self, SV *text_)
811 CODE: 825 CODE:
812{ 826{
813 STRLEN textlen; 827 STRLEN textlen;
814 char *text = SvPVutf8 (text_, textlen); 828 char *text = SvPVutf8 (text_, textlen);
815 829
816 pango_layout_set_text (self->pl, text, textlen); 830 pango_layout_set_text (self->pl, text, textlen);
817} 831}
818 832
819void 833void
820set_markup (CFClient::Layout self, SV *text_) 834set_markup (CFPlus::Layout self, SV *text_)
821 CODE: 835 CODE:
822{ 836{
823 STRLEN textlen; 837 STRLEN textlen;
824 char *text = SvPVutf8 (text_, textlen); 838 char *text = SvPVutf8 (text_, textlen);
825 839
826 pango_layout_set_markup (self->pl, text, textlen); 840 pango_layout_set_markup (self->pl, text, textlen);
827} 841}
828 842
829void 843void
830set_shapes (CFClient::Layout self, ...) 844set_shapes (CFPlus::Layout self, ...)
831 CODE: 845 CODE:
832{ 846{
833 PangoAttrList *attrs = 0; 847 PangoAttrList *attrs = 0;
834 const char *text = pango_layout_get_text (self->pl); 848 const char *text = pango_layout_get_text (self->pl);
835 const char *pos = text; 849 const char *pos = text;
… …
870 if (attrs) 884 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs); 885 pango_layout_set_attributes (self->pl, attrs);
872} 886}
873 887
874void 888void
875get_shapes (CFClient::Layout self) 889get_shapes (CFPlus::Layout self)
876 PPCODE: 890 PPCODE:
877{ 891{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 892 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879 893
880 do 894 do
… …
895 909
896 pango_layout_iter_free (iter); 910 pango_layout_iter_free (iter);
897} 911}
898 912
899int 913int
900has_wrapped (CFClient::Layout self) 914has_wrapped (CFPlus::Layout self)
901 CODE: 915 CODE:
902{ 916{
903 int lines = 1; 917 int lines = 1;
904 const char *text = pango_layout_get_text (self->pl); 918 const char *text = pango_layout_get_text (self->pl);
905 919
… …
910} 924}
911 OUTPUT: 925 OUTPUT:
912 RETVAL 926 RETVAL
913 927
914SV * 928SV *
915get_text (CFClient::Layout self) 929get_text (CFPlus::Layout self)
916 CODE: 930 CODE:
917 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 931 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
918 sv_utf8_decode (RETVAL); 932 sv_utf8_decode (RETVAL);
919 OUTPUT: 933 OUTPUT:
920 RETVAL 934 RETVAL
921 935
922void 936void
923set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 937set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
924 CODE: 938 CODE:
925 self->r = r; 939 self->r = r;
926 self->g = g; 940 self->g = g;
927 self->b = b; 941 self->b = b;
928 self->a = a; 942 self->a = a;
929 943
930void 944void
931set_font (CFClient::Layout self, CFClient::Font font = 0) 945set_font (CFPlus::Layout self, CFPlus::Font font = 0)
932 CODE: 946 CODE:
933 if (self->font != font) 947 if (self->font != font)
934 { 948 {
935 self->font = font; 949 self->font = font;
936 layout_update_font (self); 950 layout_update_font (self);
937 } 951 }
938 952
939void 953void
940set_height (CFClient::Layout self, int base_height) 954set_height (CFPlus::Layout self, int base_height)
941 CODE: 955 CODE:
942 if (self->base_height != base_height) 956 if (self->base_height != base_height)
943 { 957 {
944 self->base_height = base_height; 958 self->base_height = base_height;
945 layout_update_font (self); 959 layout_update_font (self);
946 } 960 }
947 961
948void 962void
949set_width (CFClient::Layout self, int max_width = -1) 963set_width (CFPlus::Layout self, int max_width = -1)
950 CODE: 964 CODE:
951 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 965 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
952 966
953void 967void
954set_indent (CFClient::Layout self, int indent) 968set_indent (CFPlus::Layout self, int indent)
955 CODE: 969 CODE:
956 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 970 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
957 971
958void 972void
959set_spacing (CFClient::Layout self, int spacing) 973set_spacing (CFPlus::Layout self, int spacing)
960 CODE: 974 CODE:
961 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 975 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
962 976
963void 977void
964set_ellipsise (CFClient::Layout self, int ellipsise) 978set_ellipsise (CFPlus::Layout self, int ellipsise)
965 CODE: 979 CODE:
966 pango_layout_set_ellipsize (self->pl, 980 pango_layout_set_ellipsize (self->pl,
967 ellipsise == 1 ? PANGO_ELLIPSIZE_START 981 ellipsise == 1 ? PANGO_ELLIPSIZE_START
968 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 982 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
969 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 983 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
970 : PANGO_ELLIPSIZE_NONE 984 : PANGO_ELLIPSIZE_NONE
971 ); 985 );
972 986
973void 987void
974set_single_paragraph_mode (CFClient::Layout self, int spm) 988set_single_paragraph_mode (CFPlus::Layout self, int spm)
975 CODE: 989 CODE:
976 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 990 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
977 991
978void 992void
979size (CFClient::Layout self) 993size (CFPlus::Layout self)
980 PPCODE: 994 PPCODE:
981{ 995{
982 int w, h; 996 int w, h;
983 997
984 layout_get_pixel_size (self, &w, &h); 998 layout_get_pixel_size (self, &w, &h);
… …
987 PUSHs (sv_2mortal (newSViv (w))); 1001 PUSHs (sv_2mortal (newSViv (w)));
988 PUSHs (sv_2mortal (newSViv (h))); 1002 PUSHs (sv_2mortal (newSViv (h)));
989} 1003}
990 1004
991int 1005int
992descent (CFClient::Layout self) 1006descent (CFPlus::Layout self)
993 CODE: 1007 CODE:
994{ 1008{
995 PangoRectangle rect; 1009 PangoRectangle rect;
996 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1010 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997 pango_layout_line_get_pixel_extents (line, 0, &rect); 1011 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
999} 1013}
1000 OUTPUT: 1014 OUTPUT:
1001 RETVAL 1015 RETVAL
1002 1016
1003int 1017int
1004xy_to_index (CFClient::Layout self, int x, int y) 1018xy_to_index (CFPlus::Layout self, int x, int y)
1005 CODE: 1019 CODE:
1006{ 1020{
1007 int index, trailing; 1021 int index, trailing;
1008 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1022 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1009 RETVAL = index; 1023 RETVAL = index;
1010} 1024}
1011 OUTPUT: 1025 OUTPUT:
1012 RETVAL 1026 RETVAL
1013 1027
1014void 1028void
1015cursor_pos (CFClient::Layout self, int index) 1029cursor_pos (CFPlus::Layout self, int index)
1016 PPCODE: 1030 PPCODE:
1017{ 1031{
1018 PangoRectangle strong_pos; 1032 PangoRectangle strong_pos;
1019 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1033 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1020 1034
… …
1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025} 1039}
1026 1040
1027void 1041void
1028render (CFClient::Layout self, float x, float y) 1042render (CFPlus::Layout self, float x, float y, int flags = 0)
1029 PPCODE: 1043 PPCODE:
1030 pango_opengl_render_layout_subpixel ( 1044 pango_opengl_render_layout_subpixel (
1031 self->pl, 1045 self->pl,
1032 x * PANGO_SCALE, y * PANGO_SCALE, 1046 x * PANGO_SCALE, y * PANGO_SCALE,
1033 self->r, self->g, self->b, self->a 1047 self->r, self->g, self->b, self->a,
1048 flags
1034 ); 1049 );
1035 1050
1036MODULE = CFClient PACKAGE = CFClient::Texture 1051MODULE = CFPlus PACKAGE = CFPlus::Texture
1037 1052
1038void 1053void
1039pad2pot (SV *data_, SV *w_, SV *h_) 1054pad2pot (SV *data_, SV *w_, SV *h_)
1040 CODE: 1055 CODE:
1041{ 1056{
… …
1119 glDisable (GL_ALPHA_TEST); 1134 glDisable (GL_ALPHA_TEST);
1120 glDisable (GL_BLEND); 1135 glDisable (GL_BLEND);
1121 } 1136 }
1122} 1137}
1123 1138
1124MODULE = CFClient PACKAGE = CFClient::Map 1139MODULE = CFPlus PACKAGE = CFPlus::Map
1125 1140
1126CFClient::Map 1141CFPlus::Map
1127new (SV *class, int map_width, int map_height) 1142new (SV *class, int map_width, int map_height)
1128 CODE: 1143 CODE:
1129 New (0, RETVAL, 1, struct map); 1144 New (0, RETVAL, 1, struct map);
1130 RETVAL->x = 0; 1145 RETVAL->x = 0;
1131 RETVAL->y = 0; 1146 RETVAL->y = 0;
… …
1141 RETVAL->row = 0; 1156 RETVAL->row = 0;
1142 OUTPUT: 1157 OUTPUT:
1143 RETVAL 1158 RETVAL
1144 1159
1145void 1160void
1146DESTROY (CFClient::Map self) 1161DESTROY (CFPlus::Map self)
1147 CODE: 1162 CODE:
1148{ 1163{
1149 map_clear (self); 1164 map_clear (self);
1150 Safefree (self->face); 1165 Safefree (self->face);
1151 Safefree (self->tex); 1166 Safefree (self->tex);
1152 Safefree (self); 1167 Safefree (self);
1153} 1168}
1154 1169
1155void 1170void
1156clear (CFClient::Map self) 1171clear (CFPlus::Map self)
1157 CODE: 1172 CODE:
1158 map_clear (self); 1173 map_clear (self);
1159 1174
1160void 1175void
1161set_face (CFClient::Map self, int face, int texid) 1176set_face (CFPlus::Map self, int face, int texid)
1162 CODE: 1177 CODE:
1163{ 1178{
1164 while (self->faces <= face) 1179 while (self->faces <= face)
1165 { 1180 {
1166 Append (mapface, self->face, self->faces, self->faces); 1181 Append (mapface, self->face, self->faces, self->faces);
… …
1169 1184
1170 self->face [face] = texid; 1185 self->face [face] = texid;
1171} 1186}
1172 1187
1173void 1188void
1174set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1189set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1175 CODE: 1190 CODE:
1176{ 1191{
1177 while (self->texs <= texid) 1192 while (self->texs <= texid)
1178 { 1193 {
1179 Append (maptex, self->tex, self->texs, self->texs); 1194 Append (maptex, self->tex, self->texs, self->texs);
… …
1203 // from transparent color bleeding and ugly wrapping effects. 1218 // from transparent color bleeding and ugly wrapping effects.
1204 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1219 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1205} 1220}
1206 1221
1207int 1222int
1208ox (CFClient::Map self) 1223ox (CFPlus::Map self)
1209 ALIAS: 1224 ALIAS:
1210 oy = 1 1225 oy = 1
1211 x = 2 1226 x = 2
1212 y = 3 1227 y = 3
1213 w = 4 1228 w = 4
… …
1224 } 1239 }
1225 OUTPUT: 1240 OUTPUT:
1226 RETVAL 1241 RETVAL
1227 1242
1228void 1243void
1229scroll (CFClient::Map self, int dx, int dy) 1244scroll (CFPlus::Map self, int dx, int dy)
1230 CODE: 1245 CODE:
1231{ 1246{
1232 if (dx > 0) 1247 if (dx > 0)
1233 map_blank (self, self->x, self->y, dx - 1, self->h); 1248 map_blank (self, self->x, self->y, dx - 1, self->h);
1234 else if (dx < 0) 1249 else if (dx < 0)
… …
1250 self->y += MAP_EXTEND_Y; 1265 self->y += MAP_EXTEND_Y;
1251 } 1266 }
1252} 1267}
1253 1268
1254void 1269void
1255map1a_update (CFClient::Map self, SV *data_) 1270map1a_update (CFPlus::Map self, SV *data_, int extmap)
1256 CODE: 1271 CODE:
1257{ 1272{
1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1259 uint8_t *data_end = (uint8_t *)SvEND (data_); 1274 uint8_t *data_end = (uint8_t *)SvEND (data_);
1260 mapcell *cell; 1275 mapcell *cell;
… …
1269 1284
1270 cell = map_get_cell (self, x, y); 1285 cell = map_get_cell (self, x, y);
1271 1286
1272 if (flags & 15) 1287 if (flags & 15)
1273 { 1288 {
1274 if (cell->darkness < 0) 1289 if (!cell->darkness)
1275 { 1290 {
1276 cell->darkness = 0; 1291 cell->darkness = 256;
1277 cell->face [0] = 0; 1292 cell->face [0] = 0;
1278 cell->face [1] = 0; 1293 cell->face [1] = 0;
1279 cell->face [2] = 0; 1294 cell->face [2] = 0;
1280 } 1295 }
1281 1296
1282 cell->darkness = flags & 8 ? *data++ : 255;
1283
1284 //TODO: don't trust server data to be in-range(!) 1297 //TODO: don't trust server data to be in-range(!)
1298
1299 if (flags & 8)
1300 {
1301 if (extmap)
1302 {
1303 uint8_t ext, cmd;
1304
1305 do
1306 {
1307 ext = *data++;
1308 cmd = ext & 0x3f;
1309
1310 if (ext < 4)
1311 cell->darkness = 255 - ext * 64 + 1;
1312 else if (ext == 5) // health
1313 cell->stat_hp = *data++;
1314 else if (ext & 0x40) // unknown, multibyte => skip
1315 data += *data + 1;
1316 }
1317 while (cmd & 0x80);
1318 }
1319 else
1320 cell->darkness = *data++ + 1;
1321 }
1285 1322
1286 if (flags & 4) 1323 if (flags & 4)
1287 { 1324 {
1288 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1325 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1289 } 1326 }
… …
1297 { 1334 {
1298 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1335 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1299 } 1336 }
1300 } 1337 }
1301 else 1338 else
1339 {
1302 cell->darkness = -1; 1340 cell->darkness = 0;
1341 cell->stat_hp = 0;
1342 }
1303 } 1343 }
1304} 1344}
1305 1345
1306SV * 1346SV *
1307mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1347mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1308 CODE: 1348 CODE:
1309{ 1349{
1310 int x1, x; 1350 int x1, x;
1311 int y1, y; 1351 int y1, y;
1312 int z; 1352 int z;
… …
1362} 1402}
1363 OUTPUT: 1403 OUTPUT:
1364 RETVAL 1404 RETVAL
1365 1405
1366void 1406void
1367draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1407draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1368 CODE: 1408 CODE:
1369{ 1409{
1370 int vx, vy; 1410 int vx, vy;
1371 int x, y, z; 1411 int x, y, z;
1372 int last_name; 1412 int last_name;
… …
1407 { 1447 {
1408 mapcell *cell = row->col + (x + vx - row->c0); 1448 mapcell *cell = row->col + (x + vx - row->c0);
1409 1449
1410 face = cell->face [z]; 1450 face = cell->face [z];
1411 1451
1412 if (face) 1452 if (face && face < self->texs)
1413 { 1453 {
1414 maptex tex = self->tex [face]; 1454 maptex tex = self->tex [face];
1415 1455
1416 int px = (x + 1) * 32 - tex.w; 1456 int px = (x + 1) * 32 - tex.w;
1417 int py = (y + 1) * 32 - tex.h; 1457 int py = (y + 1) * 32 - tex.h;
… …
1434 1474
1435 glEnd (); 1475 glEnd ();
1436 1476
1437 glDisable (GL_TEXTURE_2D); 1477 glDisable (GL_TEXTURE_2D);
1438 glDisable (GL_BLEND); 1478 glDisable (GL_BLEND);
1439}
1440 1479
1480 // top layer: overlays such as the health bar
1481 for (y = 0; y < sh; y++)
1482 if (0 <= y + vy && y + vy < self->rows)
1483 {
1484 maprow *row = self->row + (y + vy);
1485
1486 for (x = 0; x < sw; x++)
1487 if (row->c0 <= x + vx && x + vx < row->c1)
1488 {
1489 mapcell *cell = row->col + (x + vx - row->c0);
1490
1491 int px = x * 32;
1492 int py = y * 32;
1493
1494 if (cell->stat_hp)
1495 {
1496 int width = sh / 28 + 1;
1497
1498 glColor3ub (0, 0, 0);
1499 glRectf (px + 1, py, px + 31, py + width + 2);
1500
1501 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1502 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
1503 }
1504 }
1505 }
1506}
1507
1441void 1508void
1442draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1509draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE: 1510 CODE:
1444{ 1511{
1445 static float color[16][3] = { 1512 static float color[16][3] = {
1446 { 0.00F, 0.00F, 0.00F }, 1513 { 0.00F, 0.00F, 0.00F },
1447 { 1.00F, 1.00F, 1.00F }, 1514 { 1.00F, 1.00F, 1.00F },
… …
1497 glDisable (GL_BLEND); 1564 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D); 1565 glDisable (GL_TEXTURE_2D);
1499} 1566}
1500 1567
1501void 1568void
1502fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1569fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1503 PPCODE: 1570 PPCODE:
1504{ 1571{
1505 int vx, vy; 1572 int vx, vy;
1506 int x, y; 1573 int x, y;
1507 int sw4 = (sw + 3) & ~3; 1574 int sw4 = (sw + 3) & ~3;
… …
1523 for (x = 0; x < sw; x++) 1590 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1) 1591 if (row->c0 <= x + vx && x + vx < row->c1)
1525 { 1592 {
1526 mapcell *cell = row->col + (x + vx - row->c0); 1593 mapcell *cell = row->col + (x + vx - row->c0);
1527 1594
1528 darkness[y * sw4 + x] = cell->darkness < 0 1595 darkness[y * sw4 + x] = cell->darkness
1596 ? 255 - (cell->darkness - 1)
1529 ? 255 - FOW_DARKNESS 1597 : 255 - FOW_DARKNESS;
1530 : 255 - cell->darkness;
1531 } 1598 }
1532 } 1599 }
1533 1600
1534 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1535 PUSHs (sv_2mortal (newSViv (sw4))); 1602 PUSHs (sv_2mortal (newSViv (sw4)));
1536 PUSHs (sv_2mortal (newSViv (sh))); 1603 PUSHs (sv_2mortal (newSViv (sh)));
1537 PUSHs (darkness_sv); 1604 PUSHs (darkness_sv);
1538} 1605}
1539 1606
1540SV * 1607SV *
1541get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1608get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1542 CODE: 1609 CODE:
1543{ 1610{
1544 int x, y, x1, y1; 1611 int x, y, x1, y1;
1545 SV *data_sv = newSV (w * h * 7 + 5); 1612 SV *data_sv = newSV (w * h * 7 + 5);
1546 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1613 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1608} 1675}
1609 OUTPUT: 1676 OUTPUT:
1610 RETVAL 1677 RETVAL
1611 1678
1612void 1679void
1613set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1680set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1614 PPCODE: 1681 PPCODE:
1615{ 1682{
1616 int x, y, z; 1683 int x, y, z;
1617 int w, h; 1684 int w, h;
1618 int x1, y1; 1685 int x1, y1;
… …
1650 1717
1651 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1718 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1652 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1719 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1653 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1720 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1654 1721
1655 if (cell->darkness <= 0) 1722 if (cell->darkness == 0)
1656 { 1723 {
1657 cell->darkness = -1; 1724 cell->darkness = 0;
1658 1725
1659 for (z = 0; z <= 2; z++) 1726 for (z = 0; z <= 2; z++)
1660 { 1727 {
1661 cell->face[z] = face[z]; 1728 cell->face[z] = face[z];
1662 1729
… …
1667 } 1734 }
1668 } 1735 }
1669 } 1736 }
1670} 1737}
1671 1738
1672MODULE = CFClient PACKAGE = CFClient::MixChunk 1739MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1673 1740
1674CFClient::MixChunk 1741CFPlus::MixChunk
1675new_from_file (SV *class, char *path) 1742new_from_file (SV *class, char *path)
1676 CODE: 1743 CODE:
1677 RETVAL = Mix_LoadWAV (path); 1744 RETVAL = Mix_LoadWAV (path);
1678 OUTPUT: 1745 OUTPUT:
1679 RETVAL 1746 RETVAL
1680 1747
1681void 1748void
1682DESTROY (CFClient::MixChunk self) 1749DESTROY (CFPlus::MixChunk self)
1683 CODE: 1750 CODE:
1684 Mix_FreeChunk (self); 1751 Mix_FreeChunk (self);
1685 1752
1686int 1753int
1687volume (CFClient::MixChunk self, int volume = -1) 1754volume (CFPlus::MixChunk self, int volume = -1)
1688 CODE: 1755 CODE:
1689 RETVAL = Mix_VolumeChunk (self, volume); 1756 RETVAL = Mix_VolumeChunk (self, volume);
1690 OUTPUT: 1757 OUTPUT:
1691 RETVAL 1758 RETVAL
1692 1759
1693int 1760int
1694play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1761play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1695 CODE: 1762 CODE:
1696 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1763 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1697 OUTPUT: 1764 OUTPUT:
1698 RETVAL 1765 RETVAL
1699 1766
1700MODULE = CFClient PACKAGE = CFClient::MixMusic 1767MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1701 1768
1702int 1769int
1703volume (int volume = -1) 1770volume (int volume = -1)
1704 CODE: 1771 CODE:
1705 RETVAL = Mix_VolumeMusic (volume); 1772 RETVAL = Mix_VolumeMusic (volume);
1706 OUTPUT: 1773 OUTPUT:
1707 RETVAL 1774 RETVAL
1708 1775
1709CFClient::MixMusic 1776CFPlus::MixMusic
1710new_from_file (SV *class, char *path) 1777new_from_file (SV *class, char *path)
1711 CODE: 1778 CODE:
1712 RETVAL = Mix_LoadMUS (path); 1779 RETVAL = Mix_LoadMUS (path);
1713 OUTPUT: 1780 OUTPUT:
1714 RETVAL 1781 RETVAL
1715 1782
1716void 1783void
1717DESTROY (CFClient::MixMusic self) 1784DESTROY (CFPlus::MixMusic self)
1718 CODE: 1785 CODE:
1719 Mix_FreeMusic (self); 1786 Mix_FreeMusic (self);
1720 1787
1721int 1788int
1722play (CFClient::MixMusic self, int loops = -1) 1789play (CFPlus::MixMusic self, int loops = -1)
1723 CODE: 1790 CODE:
1724 RETVAL = Mix_PlayMusic (self, loops); 1791 RETVAL = Mix_PlayMusic (self, loops);
1725 OUTPUT: 1792 OUTPUT:
1726 RETVAL 1793 RETVAL
1727 1794
1728MODULE = CFClient PACKAGE = CFClient::OpenGL 1795MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1729 1796
1730BOOT: 1797BOOT:
1731{ 1798{
1732 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1799 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1733 static const struct { 1800 static const struct {
1734 const char *name; 1801 const char *name;
1735 IV iv; 1802 IV iv;
1736 } *civ, const_iv[] = { 1803 } *civ, const_iv[] = {
1737# define const_iv(name) { # name, (IV)name } 1804# define const_iv(name) { # name, (IV)name }
… …
1800 const_iv (GL_SEPARABLE_2D), 1867 const_iv (GL_SEPARABLE_2D),
1801 const_iv (GL_CONVOLUTION_2D), 1868 const_iv (GL_CONVOLUTION_2D),
1802 const_iv (GL_CONVOLUTION_BORDER_MODE), 1869 const_iv (GL_CONVOLUTION_BORDER_MODE),
1803 const_iv (GL_CONSTANT_BORDER), 1870 const_iv (GL_CONSTANT_BORDER),
1804 const_iv (GL_LINES), 1871 const_iv (GL_LINES),
1872 const_iv (GL_LINE_STRIP),
1805 const_iv (GL_LINE_LOOP), 1873 const_iv (GL_LINE_LOOP),
1806 const_iv (GL_QUADS), 1874 const_iv (GL_QUADS),
1807 const_iv (GL_QUAD_STRIP), 1875 const_iv (GL_QUAD_STRIP),
1808 const_iv (GL_TRIANGLES), 1876 const_iv (GL_TRIANGLES),
1809 const_iv (GL_TRIANGLE_STRIP), 1877 const_iv (GL_TRIANGLE_STRIP),
… …
2006 2074
2007void glEndList () 2075void glEndList ()
2008 2076
2009void glCallList (int list) 2077void glCallList (int list)
2010 2078
2011

Diff Legend

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