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.134 by root, Fri Aug 4 16:49:58 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 pango_layout_get_pixel_size (self->pl, w, h); 149 pango_layout_get_pixel_size (self->pl, w, h);
150 150
151 if (!*w) *w = 1; 151 if (!*w) *w = 1;
152 if (!*h) *h = 1; 152 if (!*h) *h = 1;
… …
182 int texs; 182 int texs;
183 maptex *tex; 183 maptex *tex;
184 184
185 int32_t rows; 185 int32_t rows;
186 maprow *row; 186 maprow *row;
187} *CFClient__Map; 187} *CFPlus__Map;
188 188
189static char * 189static char *
190prepend (char *ptr, int sze, int inc) 190prepend (char *ptr, int sze, int inc)
191{ 191{
192 char *p; 192 char *p;
… …
210 210
211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 211#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)) 212#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213 213
214static maprow * 214static maprow *
215map_get_row (CFClient__Map self, int y) 215map_get_row (CFPlus__Map self, int y)
216{ 216{
217 if (0 > y) 217 if (0 > y)
218 { 218 {
219 int extend = - y + MAP_EXTEND_Y; 219 int extend = - y + MAP_EXTEND_Y;
220 Prepend (maprow, self->row, self->rows, extend); 220 Prepend (maprow, self->row, self->rows, extend);
… …
258 258
259 return row->col + (x - row->c0); 259 return row->col + (x - row->c0);
260} 260}
261 261
262static mapcell * 262static mapcell *
263map_get_cell (CFClient__Map self, int x, int y) 263map_get_cell (CFPlus__Map self, int x, int y)
264{ 264{
265 return row_get_cell (map_get_row (self, y), x); 265 return row_get_cell (map_get_row (self, y), x);
266} 266}
267 267
268static void 268static void
269map_clear (CFClient__Map self) 269map_clear (CFPlus__Map self)
270{ 270{
271 int r; 271 int r;
272 272
273 for (r = 0; r < self->rows; r++) 273 for (r = 0; r < self->rows; r++)
274 Safefree (self->row[r].col); 274 Safefree (self->row[r].col);
… …
282 self->row = 0; 282 self->row = 0;
283 self->rows = 0; 283 self->rows = 0;
284} 284}
285 285
286static void 286static void
287map_blank (CFClient__Map self, int x0, int y0, int w, int h) 287map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 288{
289 int x, y; 289 int x, y;
290 maprow *row; 290 maprow *row;
291 291
292 for (y = y0; y < y0 + h; y++) 292 for (y = y0; y < y0 + h; y++)
… …
349 n |= n >> 16; 349 n |= n >> 16;
350 350
351 return n + 1; 351 return n + 1;
352} 352}
353 353
354MODULE = CFClient PACKAGE = CFClient 354MODULE = CFPlus PACKAGE = CFPlus
355 355
356PROTOTYPES: ENABLE 356PROTOTYPES: ENABLE
357 357
358BOOT: 358BOOT:
359{ 359{
360 HV *stash = gv_stashpv ("CFClient", 1); 360 HV *stash = gv_stashpv ("CFPlus", 1);
361 static const struct { 361 static const struct {
362 const char *name; 362 const char *name;
363 IV iv; 363 IV iv;
364 } *civ, const_iv[] = { 364 } *civ, const_iv[] = {
365# define const_iv(name) { # name, (IV)name } 365# define const_iv(name) { # name, (IV)name }
… …
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 515
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10)
517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif
519 521
520 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522 524
523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
610 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 612 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
611 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 613 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
612 break; 614 break;
613 } 615 }
614 616
615 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFClient::UI::Event", 1)))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
616 } 618 }
617} 619}
618 620
619int 621int
620Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 622Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
749void 751void
750_exit (int retval) 752_exit (int retval)
751 CODE: 753 CODE:
752 _exit (retval); 754 _exit (retval);
753 755
754MODULE = CFClient PACKAGE = CFClient::Font 756MODULE = CFPlus PACKAGE = CFPlus::Font
755 757
756CFClient::Font 758CFPlus::Font
757new_from_file (SV *class, char *path, int id = 0) 759new_from_file (SV *class, char *path, int id = 0)
758 CODE: 760 CODE:
759{ 761{
760 int count; 762 int count;
761 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
764} 766}
765 OUTPUT: 767 OUTPUT:
766 RETVAL 768 RETVAL
767 769
768void 770void
769DESTROY (CFClient::Font self) 771DESTROY (CFPlus::Font self)
770 CODE: 772 CODE:
771 pango_font_description_free (self); 773 pango_font_description_free (self);
772 774
773void 775void
774make_default (CFClient::Font self) 776make_default (CFPlus::Font self)
775 CODE: 777 CODE:
776 default_font = self; 778 default_font = self;
777 779
778MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
779 781
780void 782void
781reset_glyph_cache () 783reset_glyph_cache ()
782 CODE: 784 CODE:
783 tc_clear (); 785 tc_clear ();
784 786
785CFClient::Layout 787CFPlus::Layout
786new (SV *class) 788new (SV *class)
787 CODE: 789 CODE:
788 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
789 791
790 RETVAL->pl = pango_layout_new (opengl_context); 792 RETVAL->pl = pango_layout_new (opengl_context);
… …
799 layout_update_font (RETVAL); 801 layout_update_font (RETVAL);
800 OUTPUT: 802 OUTPUT:
801 RETVAL 803 RETVAL
802 804
803void 805void
804DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
805 CODE: 807 CODE:
806 g_object_unref (self->pl); 808 g_object_unref (self->pl);
807 Safefree (self); 809 Safefree (self);
808 810
809void 811void
810set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
811 CODE: 813 CODE:
812{ 814{
813 STRLEN textlen; 815 STRLEN textlen;
814 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
815 817
816 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
817} 819}
818 820
819void 821void
820set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
821 CODE: 823 CODE:
822{ 824{
823 STRLEN textlen; 825 STRLEN textlen;
824 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
825 827
826 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
827} 829}
828 830
829void 831void
830set_shapes (CFClient::Layout self, ...) 832set_shapes (CFPlus::Layout self, ...)
831 CODE: 833 CODE:
832{ 834{
833 PangoAttrList *attrs = 0; 835 PangoAttrList *attrs = 0;
834 const char *text = pango_layout_get_text (self->pl); 836 const char *text = pango_layout_get_text (self->pl);
835 const char *pos = text; 837 const char *pos = text;
… …
870 if (attrs) 872 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs); 873 pango_layout_set_attributes (self->pl, attrs);
872} 874}
873 875
874void 876void
875get_shapes (CFClient::Layout self) 877get_shapes (CFPlus::Layout self)
876 PPCODE: 878 PPCODE:
877{ 879{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 880 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879 881
880 do 882 do
… …
895 897
896 pango_layout_iter_free (iter); 898 pango_layout_iter_free (iter);
897} 899}
898 900
899int 901int
900has_wrapped (CFClient::Layout self) 902has_wrapped (CFPlus::Layout self)
901 CODE: 903 CODE:
902{ 904{
903 int lines = 1; 905 int lines = 1;
904 const char *text = pango_layout_get_text (self->pl); 906 const char *text = pango_layout_get_text (self->pl);
905 907
… …
910} 912}
911 OUTPUT: 913 OUTPUT:
912 RETVAL 914 RETVAL
913 915
914SV * 916SV *
915get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
916 CODE: 918 CODE:
917 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
918 sv_utf8_decode (RETVAL); 920 sv_utf8_decode (RETVAL);
919 OUTPUT: 921 OUTPUT:
920 RETVAL 922 RETVAL
921 923
922void 924void
923set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 925set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
924 CODE: 926 CODE:
925 self->r = r; 927 self->r = r;
926 self->g = g; 928 self->g = g;
927 self->b = b; 929 self->b = b;
928 self->a = a; 930 self->a = a;
929 931
930void 932void
931set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
932 CODE: 934 CODE:
933 if (self->font != font) 935 if (self->font != font)
934 { 936 {
935 self->font = font; 937 self->font = font;
936 layout_update_font (self); 938 layout_update_font (self);
937 } 939 }
938 940
939void 941void
940set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
941 CODE: 943 CODE:
942 if (self->base_height != base_height) 944 if (self->base_height != base_height)
943 { 945 {
944 self->base_height = base_height; 946 self->base_height = base_height;
945 layout_update_font (self); 947 layout_update_font (self);
946 } 948 }
947 949
948void 950void
949set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
950 CODE: 952 CODE:
951 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 953 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
952 954
953void 955void
954set_indent (CFClient::Layout self, int indent) 956set_indent (CFPlus::Layout self, int indent)
955 CODE: 957 CODE:
956 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 958 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
957 959
958void 960void
959set_spacing (CFClient::Layout self, int spacing) 961set_spacing (CFPlus::Layout self, int spacing)
960 CODE: 962 CODE:
961 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 963 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
962 964
963void 965void
964set_ellipsise (CFClient::Layout self, int ellipsise) 966set_ellipsise (CFPlus::Layout self, int ellipsise)
965 CODE: 967 CODE:
966 pango_layout_set_ellipsize (self->pl, 968 pango_layout_set_ellipsize (self->pl,
967 ellipsise == 1 ? PANGO_ELLIPSIZE_START 969 ellipsise == 1 ? PANGO_ELLIPSIZE_START
968 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 970 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
969 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 971 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
970 : PANGO_ELLIPSIZE_NONE 972 : PANGO_ELLIPSIZE_NONE
971 ); 973 );
972 974
973void 975void
974set_single_paragraph_mode (CFClient::Layout self, int spm) 976set_single_paragraph_mode (CFPlus::Layout self, int spm)
975 CODE: 977 CODE:
976 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 978 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
977 979
978void 980void
979size (CFClient::Layout self) 981size (CFPlus::Layout self)
980 PPCODE: 982 PPCODE:
981{ 983{
982 int w, h; 984 int w, h;
983 985
984 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
… …
987 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
988 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
989} 991}
990 992
991int 993int
992descent (CFClient::Layout self) 994descent (CFPlus::Layout self)
993 CODE: 995 CODE:
994{ 996{
995 PangoRectangle rect; 997 PangoRectangle rect;
996 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 998 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997 pango_layout_line_get_pixel_extents (line, 0, &rect); 999 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
999} 1001}
1000 OUTPUT: 1002 OUTPUT:
1001 RETVAL 1003 RETVAL
1002 1004
1003int 1005int
1004xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
1005 CODE: 1007 CODE:
1006{ 1008{
1007 int index, trailing; 1009 int index, trailing;
1008 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1009 RETVAL = index; 1011 RETVAL = index;
1010} 1012}
1011 OUTPUT: 1013 OUTPUT:
1012 RETVAL 1014 RETVAL
1013 1015
1014void 1016void
1015cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
1016 PPCODE: 1018 PPCODE:
1017{ 1019{
1018 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
1019 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1020 1022
… …
1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025} 1027}
1026 1028
1027void 1029void
1028render (CFClient::Layout self, float x, float y) 1030render (CFPlus::Layout self, float x, float y)
1029 PPCODE: 1031 PPCODE:
1030 pango_opengl_render_layout_subpixel ( 1032 pango_opengl_render_layout_subpixel (
1031 self->pl, 1033 self->pl,
1032 x * PANGO_SCALE, y * PANGO_SCALE, 1034 x * PANGO_SCALE, y * PANGO_SCALE,
1033 self->r, self->g, self->b, self->a 1035 self->r, self->g, self->b, self->a
1034 ); 1036 );
1035 1037
1036MODULE = CFClient PACKAGE = CFClient::Texture 1038MODULE = CFPlus PACKAGE = CFPlus::Texture
1037 1039
1038void 1040void
1039pad2pot (SV *data_, SV *w_, SV *h_) 1041pad2pot (SV *data_, SV *w_, SV *h_)
1040 CODE: 1042 CODE:
1041{ 1043{
… …
1119 glDisable (GL_ALPHA_TEST); 1121 glDisable (GL_ALPHA_TEST);
1120 glDisable (GL_BLEND); 1122 glDisable (GL_BLEND);
1121 } 1123 }
1122} 1124}
1123 1125
1124MODULE = CFClient PACKAGE = CFClient::Map 1126MODULE = CFPlus PACKAGE = CFPlus::Map
1125 1127
1126CFClient::Map 1128CFPlus::Map
1127new (SV *class, int map_width, int map_height) 1129new (SV *class, int map_width, int map_height)
1128 CODE: 1130 CODE:
1129 New (0, RETVAL, 1, struct map); 1131 New (0, RETVAL, 1, struct map);
1130 RETVAL->x = 0; 1132 RETVAL->x = 0;
1131 RETVAL->y = 0; 1133 RETVAL->y = 0;
… …
1141 RETVAL->row = 0; 1143 RETVAL->row = 0;
1142 OUTPUT: 1144 OUTPUT:
1143 RETVAL 1145 RETVAL
1144 1146
1145void 1147void
1146DESTROY (CFClient::Map self) 1148DESTROY (CFPlus::Map self)
1147 CODE: 1149 CODE:
1148{ 1150{
1149 map_clear (self); 1151 map_clear (self);
1150 Safefree (self->face); 1152 Safefree (self->face);
1151 Safefree (self->tex); 1153 Safefree (self->tex);
1152 Safefree (self); 1154 Safefree (self);
1153} 1155}
1154 1156
1155void 1157void
1156clear (CFClient::Map self) 1158clear (CFPlus::Map self)
1157 CODE: 1159 CODE:
1158 map_clear (self); 1160 map_clear (self);
1159 1161
1160void 1162void
1161set_face (CFClient::Map self, int face, int texid) 1163set_face (CFPlus::Map self, int face, int texid)
1162 CODE: 1164 CODE:
1163{ 1165{
1164 while (self->faces <= face) 1166 while (self->faces <= face)
1165 { 1167 {
1166 Append (mapface, self->face, self->faces, self->faces); 1168 Append (mapface, self->face, self->faces, self->faces);
… …
1169 1171
1170 self->face [face] = texid; 1172 self->face [face] = texid;
1171} 1173}
1172 1174
1173void 1175void
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) 1176set_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: 1177 CODE:
1176{ 1178{
1177 while (self->texs <= texid) 1179 while (self->texs <= texid)
1178 { 1180 {
1179 Append (maptex, self->tex, self->texs, self->texs); 1181 Append (maptex, self->tex, self->texs, self->texs);
… …
1203 // from transparent color bleeding and ugly wrapping effects. 1205 // from transparent color bleeding and ugly wrapping effects.
1204 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1206 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1205} 1207}
1206 1208
1207int 1209int
1208ox (CFClient::Map self) 1210ox (CFPlus::Map self)
1209 ALIAS: 1211 ALIAS:
1210 oy = 1 1212 oy = 1
1211 x = 2 1213 x = 2
1212 y = 3 1214 y = 3
1213 w = 4 1215 w = 4
… …
1224 } 1226 }
1225 OUTPUT: 1227 OUTPUT:
1226 RETVAL 1228 RETVAL
1227 1229
1228void 1230void
1229scroll (CFClient::Map self, int dx, int dy) 1231scroll (CFPlus::Map self, int dx, int dy)
1230 CODE: 1232 CODE:
1231{ 1233{
1232 if (dx > 0) 1234 if (dx > 0)
1233 map_blank (self, self->x, self->y, dx - 1, self->h); 1235 map_blank (self, self->x, self->y, dx - 1, self->h);
1234 else if (dx < 0) 1236 else if (dx < 0)
… …
1250 self->y += MAP_EXTEND_Y; 1252 self->y += MAP_EXTEND_Y;
1251 } 1253 }
1252} 1254}
1253 1255
1254void 1256void
1255map1a_update (CFClient::Map self, SV *data_) 1257map1a_update (CFPlus::Map self, SV *data_)
1256 CODE: 1258 CODE:
1257{ 1259{
1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1260 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1259 uint8_t *data_end = (uint8_t *)SvEND (data_); 1261 uint8_t *data_end = (uint8_t *)SvEND (data_);
1260 mapcell *cell; 1262 mapcell *cell;
… …
1302 cell->darkness = -1; 1304 cell->darkness = -1;
1303 } 1305 }
1304} 1306}
1305 1307
1306SV * 1308SV *
1307mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1309mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1308 CODE: 1310 CODE:
1309{ 1311{
1310 int x1, x; 1312 int x1, x;
1311 int y1, y; 1313 int y1, y;
1312 int z; 1314 int z;
… …
1362} 1364}
1363 OUTPUT: 1365 OUTPUT:
1364 RETVAL 1366 RETVAL
1365 1367
1366void 1368void
1367draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1369draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1368 CODE: 1370 CODE:
1369{ 1371{
1370 int vx, vy; 1372 int vx, vy;
1371 int x, y, z; 1373 int x, y, z;
1372 int last_name; 1374 int last_name;
… …
1437 glDisable (GL_TEXTURE_2D); 1439 glDisable (GL_TEXTURE_2D);
1438 glDisable (GL_BLEND); 1440 glDisable (GL_BLEND);
1439} 1441}
1440 1442
1441void 1443void
1442draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1444draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE: 1445 CODE:
1444{ 1446{
1445 static float color[16][3] = { 1447 static float color[16][3] = {
1446 { 0.00F, 0.00F, 0.00F }, 1448 { 0.00F, 0.00F, 0.00F },
1447 { 1.00F, 1.00F, 1.00F }, 1449 { 1.00F, 1.00F, 1.00F },
… …
1497 glDisable (GL_BLEND); 1499 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D); 1500 glDisable (GL_TEXTURE_2D);
1499} 1501}
1500 1502
1501void 1503void
1502fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1504fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1503 PPCODE: 1505 PPCODE:
1504{ 1506{
1505 int vx, vy; 1507 int vx, vy;
1506 int x, y; 1508 int x, y;
1507 int sw4 = (sw + 3) & ~3; 1509 int sw4 = (sw + 3) & ~3;
… …
1536 PUSHs (sv_2mortal (newSViv (sh))); 1538 PUSHs (sv_2mortal (newSViv (sh)));
1537 PUSHs (darkness_sv); 1539 PUSHs (darkness_sv);
1538} 1540}
1539 1541
1540SV * 1542SV *
1541get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1543get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1542 CODE: 1544 CODE:
1543{ 1545{
1544 int x, y, x1, y1; 1546 int x, y, x1, y1;
1545 SV *data_sv = newSV (w * h * 7 + 5); 1547 SV *data_sv = newSV (w * h * 7 + 5);
1546 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1548 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1608} 1610}
1609 OUTPUT: 1611 OUTPUT:
1610 RETVAL 1612 RETVAL
1611 1613
1612void 1614void
1613set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1615set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1614 PPCODE: 1616 PPCODE:
1615{ 1617{
1616 int x, y, z; 1618 int x, y, z;
1617 int w, h; 1619 int w, h;
1618 int x1, y1; 1620 int x1, y1;
… …
1667 } 1669 }
1668 } 1670 }
1669 } 1671 }
1670} 1672}
1671 1673
1672MODULE = CFClient PACKAGE = CFClient::MixChunk 1674MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1673 1675
1674CFClient::MixChunk 1676CFPlus::MixChunk
1675new_from_file (SV *class, char *path) 1677new_from_file (SV *class, char *path)
1676 CODE: 1678 CODE:
1677 RETVAL = Mix_LoadWAV (path); 1679 RETVAL = Mix_LoadWAV (path);
1678 OUTPUT: 1680 OUTPUT:
1679 RETVAL 1681 RETVAL
1680 1682
1681void 1683void
1682DESTROY (CFClient::MixChunk self) 1684DESTROY (CFPlus::MixChunk self)
1683 CODE: 1685 CODE:
1684 Mix_FreeChunk (self); 1686 Mix_FreeChunk (self);
1685 1687
1686int 1688int
1687volume (CFClient::MixChunk self, int volume = -1) 1689volume (CFPlus::MixChunk self, int volume = -1)
1688 CODE: 1690 CODE:
1689 RETVAL = Mix_VolumeChunk (self, volume); 1691 RETVAL = Mix_VolumeChunk (self, volume);
1690 OUTPUT: 1692 OUTPUT:
1691 RETVAL 1693 RETVAL
1692 1694
1693int 1695int
1694play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1696play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1695 CODE: 1697 CODE:
1696 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1697 OUTPUT: 1699 OUTPUT:
1698 RETVAL 1700 RETVAL
1699 1701
1700MODULE = CFClient PACKAGE = CFClient::MixMusic 1702MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1701 1703
1702int 1704int
1703volume (int volume = -1) 1705volume (int volume = -1)
1704 CODE: 1706 CODE:
1705 RETVAL = Mix_VolumeMusic (volume); 1707 RETVAL = Mix_VolumeMusic (volume);
1706 OUTPUT: 1708 OUTPUT:
1707 RETVAL 1709 RETVAL
1708 1710
1709CFClient::MixMusic 1711CFPlus::MixMusic
1710new_from_file (SV *class, char *path) 1712new_from_file (SV *class, char *path)
1711 CODE: 1713 CODE:
1712 RETVAL = Mix_LoadMUS (path); 1714 RETVAL = Mix_LoadMUS (path);
1713 OUTPUT: 1715 OUTPUT:
1714 RETVAL 1716 RETVAL
1715 1717
1716void 1718void
1717DESTROY (CFClient::MixMusic self) 1719DESTROY (CFPlus::MixMusic self)
1718 CODE: 1720 CODE:
1719 Mix_FreeMusic (self); 1721 Mix_FreeMusic (self);
1720 1722
1721int 1723int
1722play (CFClient::MixMusic self, int loops = -1) 1724play (CFPlus::MixMusic self, int loops = -1)
1723 CODE: 1725 CODE:
1724 RETVAL = Mix_PlayMusic (self, loops); 1726 RETVAL = Mix_PlayMusic (self, loops);
1725 OUTPUT: 1727 OUTPUT:
1726 RETVAL 1728 RETVAL
1727 1729
1728MODULE = CFClient PACKAGE = CFClient::OpenGL 1730MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1729 1731
1730BOOT: 1732BOOT:
1731{ 1733{
1732 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1734 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1733 static const struct { 1735 static const struct {
1734 const char *name; 1736 const char *name;
1735 IV iv; 1737 IV iv;
1736 } *civ, const_iv[] = { 1738 } *civ, const_iv[] = {
1737# define const_iv(name) { # name, (IV)name } 1739# define const_iv(name) { # name, (IV)name }

Diff Legend

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