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.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

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