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.88 by root, Fri May 19 23:18:40 2006 UTC vs.
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC

10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
41 typedef signed int int32_t; 42 typedef signed int int32_t;
42#endif 43#endif
43 44
44#include "glext.h" 45#include "glext.h"
45 46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48
46#define FOW_DARKNESS 32 49#define FOW_DARKNESS 32
47 50
48#define MAP_EXTEND_X 32 51#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 52#define MAP_EXTEND_Y 512
50 53
51#define MIN_FONT_HEIGHT 10 54#define MIN_FONT_HEIGHT 10
52 55
53#define GL_CALL(type,func,args) \ 56static struct
54 { \ 57{
55 static int init_; \ 58#define GL_FUNC(ptr,name) ptr name;
56 static type fptr_; \ 59#include "glfunc.h"
57 \ 60#undef GL_FUNC
58 if (!init_) \ 61} gl;
59 { \ 62
60 init_ = 1; \ 63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 64{
62 } \ 65 if (gl.BlendFuncSeparate)
63 \ 66 gl.BlendFuncSeparate (sa, da, saa, daa);
64 if (fptr_) \ 67 else if (gl.BlendFuncSeparateEXT)
65 fptr_ args; \ 68 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 } 69 else
70 glBlendFunc (sa, da);
71}
67 72
68typedef Mix_Chunk *CFClient__MixChunk; 73typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 74typedef Mix_Music *CFClient__MixMusic;
70 75
71typedef PangoFontDescription *CFClient__Font; 76typedef PangoFontDescription *CFClient__Font;
77
78static int
79shape_attr_p (PangoLayoutRun *run)
80{
81 GSList *attrs = run->item->analysis.extra_attrs;
82
83 while (attrs)
84 {
85 PangoAttribute *attr = attrs->data;
86
87 if (attr->klass->type == PANGO_ATTR_SHAPE)
88 return 1;
89
90 attrs = attrs->next;
91 }
92
93 return 0;
94}
72 95
73typedef struct cf_layout { 96typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 97 PangoLayout *pl; // either derived from a cairo or ft2 context
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2) 98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 99 float r, g, b, a; // default color for rgba mode
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 106static PangoFontMap *ft2_fontmap, *cairo_fontmap;
84 107
85static void 108static void
86substitute_func (FcPattern *pattern, gpointer data) 109substitute_func (FcPattern *pattern, gpointer data)
87{ 110{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 111 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif
89#ifdef _WIN32 115#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else 117#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 118 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif 119#endif
294 ev.code = 1; 320 ev.code = 1;
295 ev.data1 = (void *)(long)channel; 321 ev.data1 = (void *)(long)channel;
296 ev.data2 = 0; 322 ev.data2 = 0;
297 323
298 SDL_PushEvent ((SDL_Event *)&ev); 324 SDL_PushEvent ((SDL_Event *)&ev);
325}
326
327static unsigned int
328minpot (unsigned int n)
329{
330 if (!n)
331 return 0;
332
333 --n;
334
335 n |= n >> 1;
336 n |= n >> 2;
337 n |= n >> 4;
338 n |= n >> 8;
339 n |= n >> 16;
340
341 return n + 1;
299} 342}
300 343
301MODULE = CFClient PACKAGE = CFClient 344MODULE = CFClient PACKAGE = CFClient
302 345
303PROTOTYPES: ENABLE 346PROTOTYPES: ENABLE
413 456
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 457 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 459}
417 460
461NV floor (NV x)
462
463NV ceil (NV x)
464
418void 465void
419pango_init () 466pango_init ()
420 CODE: 467 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{
470 {
423 ft2_fontmap = pango_ft2_font_map_new (); 471 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 472 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 477 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
429} 490}
430 491
431int 492int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 494
479SDL_SetVideoMode (int w, int h, int fullscreen) 540SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 541 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 542 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 544 );
545 if (RETVAL)
546 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 547 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
549# include "glfunc.h"
550# undef GL_FUNC
551 }
485 OUTPUT: 552 OUTPUT:
486 RETVAL 553 RETVAL
487 554
488void 555void
489SDL_GL_SwapBuffers () 556SDL_GL_SwapBuffers ()
557
558char *
559SDL_GetKeyName (int sym)
490 560
491void 561void
492SDL_PollEvent () 562SDL_PollEvent ()
493 PPCODE: 563 PPCODE:
494{ 564{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 584 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 585 break;
516 586
517 case SDL_MOUSEMOTION: 587 case SDL_MOUSEMOTION:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 590 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 591 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 592 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 593 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 594 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 595 break;
524 596
525 case SDL_MOUSEBUTTONDOWN: 597 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 598 case SDL_MOUSEBUTTONUP:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
600
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 601 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 603 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 604 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 605 break;
557lowdelay (int fd, int val = 1) 631lowdelay (int fd, int val = 1)
558 CODE: 632 CODE:
559#ifndef _WIN32 633#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 635#endif
562
563char *
564gl_version ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VERSION);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_extensions ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_EXTENSIONS);
574 OUTPUT:
575 RETVAL
576 636
577void 637void
578add_font (char *file) 638add_font (char *file)
579 CODE: 639 CODE:
580 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
685 CODE: 745 CODE:
686 fprintf (stderr, "FATAL: %s\n", message); 746 fprintf (stderr, "FATAL: %s\n", message);
687#ifdef _WIN32 747#ifdef _WIN32
688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
689#endif 749#endif
690 exit (1); 750 _exit (1);
751
752void
753_exit (int retval)
754 CODE:
755 _exit (retval);
691 756
692MODULE = CFClient PACKAGE = CFClient::Font 757MODULE = CFClient PACKAGE = CFClient::Font
693 758
694CFClient::Font 759CFClient::Font
695new_from_file (SV *class, char *path, int id = 0) 760new_from_file (SV *class, char *path, int id = 0)
716MODULE = CFClient PACKAGE = CFClient::Layout 781MODULE = CFClient PACKAGE = CFClient::Layout
717 782
718CFClient::Layout 783CFClient::Layout
719new (SV *class, int rgba = 0) 784new (SV *class, int rgba = 0)
720 CODE: 785 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
724 New (0, RETVAL, 1, struct cf_layout); 786 New (0, RETVAL, 1, struct cf_layout);
725 787
726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 788 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727 RETVAL->rgba = rgba; 789 RETVAL->rgba = rgba;
728 RETVAL->r = 1.; 790 RETVAL->r = 1.;
768 char *text = SvPVutf8 (text_, textlen); 830 char *text = SvPVutf8 (text_, textlen);
769 831
770 pango_layout_set_markup (self->pl, text, textlen); 832 pango_layout_set_markup (self->pl, text, textlen);
771} 833}
772 834
835void
836set_shapes (CFClient::Layout self, ...)
837 CODE:
838{
839 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text;
842 int arg = 4;
843
844 while (arg < items && (pos = strstr (pos, OBJ_STR)))
845 {
846 PangoRectangle inkrect, rect;
847 PangoAttribute *attr;
848
849 int x = SvIV (ST (arg - 3));
850 int y = SvIV (ST (arg - 2));
851 int w = SvIV (ST (arg - 1));
852 int h = SvIV (ST (arg ));
853
854 inkrect.x = 0;
855 inkrect.y = 0;
856 inkrect.width = 0;
857 inkrect.height = 0;
858
859 rect.x = x * PANGO_SCALE;
860 rect.y = y * PANGO_SCALE;
861 rect.width = w * PANGO_SCALE;
862 rect.height = h * PANGO_SCALE;
863
864 if (!attrs)
865 attrs = pango_layout_get_attributes (self->pl);
866
867 attr = pango_attr_shape_new (&inkrect, &rect);
868 attr->start_index = pos - text;
869 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
870 pango_attr_list_insert (attrs, attr);
871
872 arg += 4;
873 pos += sizeof (OBJ_STR) - 1;
874 }
875
876 if (attrs)
877 pango_layout_set_attributes (self->pl, attrs);
878}
879
880void
881get_shapes (CFClient::Layout self)
882 PPCODE:
883{
884 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885
886 do
887 {
888 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
889
890 if (run && shape_attr_p (run))
891 {
892 PangoRectangle extents;
893 pango_layout_iter_get_run_extents (iter, 0, &extents);
894
895 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897 }
898 }
899 while (pango_layout_iter_next_run (iter));
900
901 pango_layout_iter_free (iter);
902}
903
904int
905has_wrapped (CFClient::Layout self)
906 CODE:
907{
908 int lines = 1;
909 const char *text = pango_layout_get_text (self->pl);
910
911 while (*text)
912 lines += *text++ == '\n';
913
914 RETVAL = lines < pango_layout_get_line_count (self->pl);
915}
916 OUTPUT:
917 RETVAL
918
773SV * 919SV *
774get_text (CFClient::Layout self) 920get_text (CFClient::Layout self)
775 CODE: 921 CODE:
776 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 922 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777 SvUTF8_on (RETVAL); 923 sv_utf8_decode (RETVAL);
778 OUTPUT: 924 OUTPUT:
779 RETVAL 925 RETVAL
780 926
781void 927void
782set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 928set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
844 990
845 EXTEND (SP, 2); 991 EXTEND (SP, 2);
846 PUSHs (sv_2mortal (newSViv (w))); 992 PUSHs (sv_2mortal (newSViv (w)));
847 PUSHs (sv_2mortal (newSViv (h))); 993 PUSHs (sv_2mortal (newSViv (h)));
848} 994}
995
996int
997descent (CFClient::Layout self)
998 CODE:
999{
1000 PangoRectangle rect;
1001 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002 pango_layout_line_get_pixel_extents (line, 0, &rect);
1003 RETVAL = PANGO_DESCENT (rect);
1004}
1005 OUTPUT:
1006 RETVAL
849 1007
850int 1008int
851xy_to_index (CFClient::Layout self, int x, int y) 1009xy_to_index (CFClient::Layout self, int x, int y)
852 CODE: 1010 CODE:
853{ 1011{
963} 1121}
964 1122
965MODULE = CFClient PACKAGE = CFClient::Texture 1123MODULE = CFClient PACKAGE = CFClient::Texture
966 1124
967void 1125void
1126pad2pot (SV *data_, SV *w_, SV *h_)
1127 CODE:
1128{
1129 int ow = SvIV (w_);
1130 int oh = SvIV (h_);
1131
1132 if (ow && oh)
1133 {
1134 int nw = minpot (ow);
1135 int nh = minpot (oh);
1136
1137 if (nw != ow || nh != oh)
1138 {
1139 if (SvOK (data_))
1140 {
1141 STRLEN datalen;
1142 char *data = SvPVbyte (data_, datalen);
1143 int bpp = datalen / (ow * oh);
1144 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1145
1146 SvPOK_only (result_);
1147 SvCUR_set (result_, nw * nh * bpp);
1148
1149 memset (SvPVX (result_), 0, nw * nh * bpp);
1150 while (oh--)
1151 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1152
1153 sv_setsv (data_, result_);
1154 }
1155
1156 sv_setiv (w_, nw);
1157 sv_setiv (h_, nh);
1158 }
1159 }
1160}
1161
1162void
968draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1163draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
969 PROTOTYPE: $$$;$$ 1164 PROTOTYPE: $$$;$$
970 ALIAS: 1165 ALIAS:
971 draw_quad_alpha = 1 1166 draw_quad_alpha = 1
972 draw_quad_alpha_premultiplied = 2 1167 draw_quad_alpha_premultiplied = 2
973 CODE: 1168 CODE:
974{ 1169{
975 HV *hv = (HV *)SvRV (self); 1170 HV *hv = (HV *)SvRV (self);
976 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1171 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1172 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1173 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980 1174
981 if (items < 5) 1175 if (items < 5)
982 { 1176 {
983 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1177 w = SvNV (*hv_fetch (hv, "w", 1, 1));
984 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1178 h = SvNV (*hv_fetch (hv, "h", 1, 1));
985 } 1179 }
986 1180
987 if (ix) 1181 if (ix)
988 { 1182 {
989 glEnable (GL_BLEND); 1183 glEnable (GL_BLEND);
1184
1185 if (ix == 2)
990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1186 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1187 else
1188 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1189 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1190
991 glEnable (GL_ALPHA_TEST); 1191 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f); 1192 glAlphaFunc (GL_GREATER, 0.01f);
993 } 1193 }
994 1194
995 glBindTexture (GL_TEXTURE_2D, name); 1195 glBindTexture (GL_TEXTURE_2D, name);
996
997 if (wrap_mode)
998 {
999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001 }
1002 1196
1003 glBegin (GL_QUADS); 1197 glBegin (GL_QUADS);
1004 glTexCoord2f (0, 0); glVertex2f (x , y ); 1198 glTexCoord2f (0, 0); glVertex2f (x , y );
1005 glTexCoord2f (0, t); glVertex2f (x , y + h); 1199 glTexCoord2f (0, t); glVertex2f (x , y + h);
1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1200 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1039DESTROY (CFClient::Map self) 1233DESTROY (CFClient::Map self)
1040 CODE: 1234 CODE:
1041{ 1235{
1042 map_clear (self); 1236 map_clear (self);
1043 Safefree (self->face); 1237 Safefree (self->face);
1238 Safefree (self->tex);
1044 Safefree (self); 1239 Safefree (self);
1045} 1240}
1046 1241
1047void 1242void
1048clear (CFClient::Map self) 1243clear (CFClient::Map self)
1083 tex->r = r; 1278 tex->r = r;
1084 tex->g = g; 1279 tex->g = g;
1085 tex->b = b; 1280 tex->b = b;
1086 tex->a = a; 1281 tex->a = a;
1087 } 1282 }
1283
1284 // somewhat hackish, but for textures that require it, it really
1285 // improves the look, and most others don't suffer.
1286 glBindTexture (GL_TEXTURE_2D, name);
1287 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1288 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1289 // use uglier nearest interpolation because linear suffers
1290 // from transparent color bleeding and ugly wrapping effects.
1291 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088} 1292}
1089 1293
1090int 1294int
1091ox (CFClient::Map self) 1295ox (CFClient::Map self)
1092 ALIAS: 1296 ALIAS:
1093 oy = 1 1297 oy = 1
1298 x = 2
1299 y = 3
1300 w = 4
1301 h = 5
1094 CODE: 1302 CODE:
1095 switch (ix) 1303 switch (ix)
1096 { 1304 {
1097 case 0: RETVAL = self->ox; break; 1305 case 0: RETVAL = self->ox; break;
1098 case 1: RETVAL = self->oy; break; 1306 case 1: RETVAL = self->oy; break;
1307 case 2: RETVAL = self->x; break;
1308 case 3: RETVAL = self->y; break;
1309 case 4: RETVAL = self->w; break;
1310 case 5: RETVAL = self->h; break;
1099 } 1311 }
1100 OUTPUT: 1312 OUTPUT:
1101 RETVAL 1313 RETVAL
1102 1314
1103void 1315void
1137 1349
1138 while (data < data_end) 1350 while (data < data_end)
1139 { 1351 {
1140 flags = (data [0] << 8) + data [1]; data += 2; 1352 flags = (data [0] << 8) + data [1]; data += 2;
1141 1353
1142 x = ((flags >> 10) & 63) + self->x; 1354 x = self->x + ((flags >> 10) & 63);
1143 y = ((flags >> 4) & 63) + self->y; 1355 y = self->y + ((flags >> 4) & 63);
1144 1356
1145 cell = map_get_cell (self, x, y); 1357 cell = map_get_cell (self, x, y);
1146 1358
1147 if (flags & 15) 1359 if (flags & 15)
1148 { 1360 {
1238 OUTPUT: 1450 OUTPUT:
1239 RETVAL 1451 RETVAL
1240 1452
1241void 1453void
1242draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1454draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1243 PPCODE: 1455 CODE:
1244{ 1456{
1245 int vx, vy; 1457 int vx, vy;
1246 int x, y, z; 1458 int x, y, z;
1247 int last_name; 1459 int last_name;
1248 mapface face; 1460 mapface face;
1249 int sw4 = (sw + 3) & ~3;
1250 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1251 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1252 1461
1253 memset (darkness, 255, sw4 * sh);
1254 SvPOK_only (darkness_sv);
1255 SvCUR_set (darkness_sv, sw4 * sh);
1256
1257 vx = self->x + (self->w - sw) / 2 - shift_x; 1462 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1258 vy = self->y + (self->h - sh) / 2 - shift_y; 1463 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1259 1464
1260 /* 1465 /*
1261 int vx = self->vx = self->w >= sw 1466 int vx = self->vx = self->w >= sw
1262 ? self->x + (self->w - sw) / 2 1467 ? self->x + (self->w - sw) / 2
1263 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1468 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1267 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1472 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1268 */ 1473 */
1269 1474
1270 glColor4ub (255, 255, 255, 255); 1475 glColor4ub (255, 255, 255, 255);
1271 1476
1477 glEnable (GL_BLEND);
1272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1478 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1273 glEnable (GL_BLEND);
1274 glEnable (GL_TEXTURE_2D); 1479 glEnable (GL_TEXTURE_2D);
1275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1480 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1276 1481
1277 glBegin (GL_QUADS); 1482 glBegin (GL_QUADS);
1278 1483
1286 1491
1287 for (x = 0; x < sw; x++) 1492 for (x = 0; x < sw; x++)
1288 if (row->c0 <= x + vx && x + vx < row->c1) 1493 if (row->c0 <= x + vx && x + vx < row->c1)
1289 { 1494 {
1290 mapcell *cell = row->col + (x + vx - row->c0); 1495 mapcell *cell = row->col + (x + vx - row->c0);
1291
1292 darkness[y * sw4 + x] = cell->darkness < 0
1293 ? 255 - FOW_DARKNESS
1294 : 255 - cell->darkness;
1295 1496
1296 face = cell->face [z]; 1497 face = cell->face [z];
1297 1498
1298 if (face) 1499 if (face)
1299 { 1500 {
1320 1521
1321 glEnd (); 1522 glEnd ();
1322 1523
1323 glDisable (GL_TEXTURE_2D); 1524 glDisable (GL_TEXTURE_2D);
1324 glDisable (GL_BLEND); 1525 glDisable (GL_BLEND);
1526}
1527
1528void
1529draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530 CODE:
1531{
1532 static float color[16][3] = {
1533 { 0.00F, 0.00F, 0.00F },
1534 { 1.00F, 1.00F, 1.00F },
1535 { 0.00F, 0.00F, 0.55F },
1536 { 1.00F, 0.00F, 0.00F },
1537
1538 { 1.00F, 0.54F, 0.00F },
1539 { 0.11F, 0.56F, 1.00F },
1540 { 0.93F, 0.46F, 0.00F },
1541 { 0.18F, 0.54F, 0.34F },
1542
1543 { 0.56F, 0.73F, 0.56F },
1544 { 0.80F, 0.80F, 0.80F },
1545 { 0.55F, 0.41F, 0.13F },
1546 { 0.99F, 0.77F, 0.26F },
1547
1548 { 0.74F, 0.65F, 0.41F },
1549
1550 { 0.00F, 1.00F, 1.00F },
1551 { 1.00F, 0.00F, 1.00F },
1552 { 1.00F, 1.00F, 0.00F },
1553 };
1554
1555 int x, y;
1556
1557 glEnable (GL_TEXTURE_2D);
1558 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1559 glEnable (GL_BLEND);
1560 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1561 glBegin (GL_QUADS);
1562
1563 for (y = 0; y < h; y++)
1564 for (x = 0; x < w; x++)
1565 {
1566 unsigned char m = data [x + y * w];
1567
1568 if (m)
1569 {
1570 float *c = color [m & 15];
1571
1572 float tx1 = m & 0x40 ? 0.5 : 0.;
1573 float tx2 = tx1 + 0.5;
1574
1575 glColor4f (c[0], c[1], c[2], 0.75);
1576 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1577 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1578 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1579 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1580 }
1581 }
1582
1583 glEnd ();
1584 glDisable (GL_BLEND);
1585 glDisable (GL_TEXTURE_2D);
1586}
1587
1588void
1589fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1590 PPCODE:
1591{
1592 int vx, vy;
1593 int x, y;
1594 int sw4 = (sw + 3) & ~3;
1595 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1596 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1597
1598 memset (darkness, 255, sw4 * sh);
1599 SvPOK_only (darkness_sv);
1600 SvCUR_set (darkness_sv, sw4 * sh);
1601
1602 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1603 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1604
1605 for (y = 0; y < sh; y++)
1606 if (0 <= y + vy && y + vy < self->rows)
1607 {
1608 maprow *row = self->row + (y + vy);
1609
1610 for (x = 0; x < sw; x++)
1611 if (row->c0 <= x + vx && x + vx < row->c1)
1612 {
1613 mapcell *cell = row->col + (x + vx - row->c0);
1614
1615 darkness[y * sw4 + x] = cell->darkness < 0
1616 ? 255 - FOW_DARKNESS
1617 : 255 - cell->darkness;
1618 }
1619 }
1325 1620
1326 EXTEND (SP, 3); 1621 EXTEND (SP, 3);
1327 PUSHs (sv_2mortal (newSViv (sw4))); 1622 PUSHs (sv_2mortal (newSViv (sw4)));
1328 PUSHs (sv_2mortal (newSViv (sh))); 1623 PUSHs (sv_2mortal (newSViv (sh)));
1329 PUSHs (darkness_sv); 1624 PUSHs (darkness_sv);
1530 const_iv (GL_COLOR_MATERIAL), 1825 const_iv (GL_COLOR_MATERIAL),
1531 const_iv (GL_SMOOTH), 1826 const_iv (GL_SMOOTH),
1532 const_iv (GL_FLAT), 1827 const_iv (GL_FLAT),
1533 const_iv (GL_DITHER), 1828 const_iv (GL_DITHER),
1534 const_iv (GL_BLEND), 1829 const_iv (GL_BLEND),
1830 const_iv (GL_CULL_FACE),
1535 const_iv (GL_SCISSOR_TEST), 1831 const_iv (GL_SCISSOR_TEST),
1832 const_iv (GL_DEPTH_TEST),
1833 const_iv (GL_ALPHA_TEST),
1834 const_iv (GL_NORMALIZE),
1835 const_iv (GL_RESCALE_NORMAL),
1836 const_iv (GL_FRONT),
1837 const_iv (GL_BACK),
1536 const_iv (GL_AND), 1838 const_iv (GL_AND),
1537 const_iv (GL_ONE), 1839 const_iv (GL_ONE),
1538 const_iv (GL_ZERO), 1840 const_iv (GL_ZERO),
1539 const_iv (GL_SRC_ALPHA), 1841 const_iv (GL_SRC_ALPHA),
1540 const_iv (GL_SRC_ALPHA_SATURATE), 1842 const_iv (GL_DST_ALPHA),
1541 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1843 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542 const_iv (GL_ONE_MINUS_DST_ALPHA), 1844 const_iv (GL_ONE_MINUS_DST_ALPHA),
1845 const_iv (GL_SRC_ALPHA_SATURATE),
1543 const_iv (GL_RGB), 1846 const_iv (GL_RGB),
1544 const_iv (GL_RGBA), 1847 const_iv (GL_RGBA),
1848 const_iv (GL_RGBA4),
1849 const_iv (GL_RGBA8),
1850 const_iv (GL_RGB5_A1),
1545 const_iv (GL_UNSIGNED_BYTE), 1851 const_iv (GL_UNSIGNED_BYTE),
1852 const_iv (GL_UNSIGNED_SHORT),
1853 const_iv (GL_UNSIGNED_INT),
1546 const_iv (GL_ALPHA), 1854 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY), 1855 const_iv (GL_INTENSITY),
1548 const_iv (GL_LUMINANCE), 1856 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA), 1857 const_iv (GL_LUMINANCE_ALPHA),
1550 const_iv (GL_FLOAT), 1858 const_iv (GL_FLOAT),
1556 const_iv (GL_TEXTURE_MAG_FILTER), 1864 const_iv (GL_TEXTURE_MAG_FILTER),
1557 const_iv (GL_TEXTURE_MIN_FILTER), 1865 const_iv (GL_TEXTURE_MIN_FILTER),
1558 const_iv (GL_TEXTURE_ENV_MODE), 1866 const_iv (GL_TEXTURE_ENV_MODE),
1559 const_iv (GL_TEXTURE_WRAP_S), 1867 const_iv (GL_TEXTURE_WRAP_S),
1560 const_iv (GL_TEXTURE_WRAP_T), 1868 const_iv (GL_TEXTURE_WRAP_T),
1869 const_iv (GL_REPEAT),
1561 const_iv (GL_CLAMP), 1870 const_iv (GL_CLAMP),
1562 const_iv (GL_REPEAT), 1871 const_iv (GL_CLAMP_TO_EDGE),
1563 const_iv (GL_NEAREST), 1872 const_iv (GL_NEAREST),
1564 const_iv (GL_LINEAR), 1873 const_iv (GL_LINEAR),
1565 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1874 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1566 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1875 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1567 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1876 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1568 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1877 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1569 const_iv (GL_GENERATE_MIPMAP), 1878 const_iv (GL_GENERATE_MIPMAP),
1570 const_iv (GL_MODULATE), 1879 const_iv (GL_MODULATE),
1571 const_iv (GL_DECAL), 1880 const_iv (GL_DECAL),
1572 const_iv (GL_REPLACE), 1881 const_iv (GL_REPLACE),
1882 const_iv (GL_DEPTH_BUFFER_BIT),
1573 const_iv (GL_COLOR_BUFFER_BIT), 1883 const_iv (GL_COLOR_BUFFER_BIT),
1574 const_iv (GL_PROJECTION), 1884 const_iv (GL_PROJECTION),
1575 const_iv (GL_MODELVIEW), 1885 const_iv (GL_MODELVIEW),
1576 const_iv (GL_COLOR_LOGIC_OP), 1886 const_iv (GL_COLOR_LOGIC_OP),
1577 const_iv (GL_SEPARABLE_2D), 1887 const_iv (GL_SEPARABLE_2D),
1578 const_iv (GL_CONVOLUTION_2D), 1888 const_iv (GL_CONVOLUTION_2D),
1579 const_iv (GL_CONVOLUTION_BORDER_MODE), 1889 const_iv (GL_CONVOLUTION_BORDER_MODE),
1580 const_iv (GL_CONSTANT_BORDER), 1890 const_iv (GL_CONSTANT_BORDER),
1581 const_iv (GL_LINES), 1891 const_iv (GL_LINES),
1892 const_iv (GL_LINE_LOOP),
1582 const_iv (GL_QUADS), 1893 const_iv (GL_QUADS),
1583 const_iv (GL_LINE_LOOP), 1894 const_iv (GL_QUAD_STRIP),
1895 const_iv (GL_TRIANGLES),
1896 const_iv (GL_TRIANGLE_STRIP),
1897 const_iv (GL_TRIANGLE_FAN),
1584 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1898 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1585 const_iv (GL_FASTEST), 1899 const_iv (GL_FASTEST),
1900 const_iv (GL_V2F),
1901 const_iv (GL_V3F),
1902 const_iv (GL_T2F_V3F),
1903 const_iv (GL_T2F_N3F_V3F),
1586# undef const_iv 1904# undef const_iv
1587 }; 1905 };
1588 1906
1589 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1907 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1590 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1908 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1591} 1909}
1592 1910
1911char *
1912gl_vendor ()
1913 CODE:
1914 RETVAL = (char *)glGetString (GL_VENDOR);
1915 OUTPUT:
1916 RETVAL
1917
1918char *
1919gl_version ()
1920 CODE:
1921 RETVAL = (char *)glGetString (GL_VERSION);
1922 OUTPUT:
1923 RETVAL
1924
1925char *
1926gl_extensions ()
1927 CODE:
1928 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1929 OUTPUT:
1930 RETVAL
1931
1593int glGetError () 1932int glGetError ()
1933
1934void glFinish ()
1594 1935
1595void glClear (int mask) 1936void glClear (int mask)
1596 1937
1597void glClearColor (float r, float g, float b, float a = 1.0) 1938void glClearColor (float r, float g, float b, float a = 1.0)
1598 PROTOTYPE: @ 1939 PROTOTYPE: @
1605 1946
1606void glHint (int target, int mode) 1947void glHint (int target, int mode)
1607 1948
1608void glBlendFunc (int sfactor, int dfactor) 1949void glBlendFunc (int sfactor, int dfactor)
1609 1950
1951void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1952 CODE:
1953 gl_BlendFuncSeparate (sa, da, saa, daa);
1954
1955void glDepthMask (int flag)
1956
1610void glLogicOp (int opcode) 1957void glLogicOp (int opcode)
1611 1958
1612void glColorMask (int red, int green, int blue, int alpha) 1959void glColorMask (int red, int green, int blue, int alpha)
1613 1960
1614void glMatrixMode (int mode) 1961void glMatrixMode (int mode)
1617 1964
1618void glPopMatrix () 1965void glPopMatrix ()
1619 1966
1620void glLoadIdentity () 1967void glLoadIdentity ()
1621 1968
1969void glDrawBuffer (int buffer)
1970
1971void glReadBuffer (int buffer)
1972
1622# near and far are due to microsofts buggy c compiler 1973# near_ and far_ are due to microsofts buggy "c" compiler
1974void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1975
1976# near_ and far_ are due to microsofts buggy "c" compiler
1623void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1977void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1624 1978
1625void glViewport (int x, int y, int width, int height) 1979void glViewport (int x, int y, int width, int height)
1626 1980
1627void glScissor (int x, int y, int width, int height) 1981void glScissor (int x, int y, int width, int height)
1642 1996
1643void glEnd () 1997void glEnd ()
1644 1998
1645void glColor (float r, float g, float b, float a = 1.0) 1999void glColor (float r, float g, float b, float a = 1.0)
1646 PROTOTYPE: @ 2000 PROTOTYPE: @
2001 ALIAS:
2002 glColor_premultiply = 1
1647 CODE: 2003 CODE:
2004 if (ix)
2005 {
2006 r *= a;
2007 g *= a;
2008 b *= a;
2009 }
2010 // microsoft visual "c" rounds instead of truncating...
1648 glColor4ub (MIN ((int)(r * 255.f), 255), 2011 glColor4ub (MIN ((int)(r * 256.f), 255),
1649 MIN ((int)(g * 255.f), 255), 2012 MIN ((int)(g * 256.f), 255),
1650 MIN ((int)(b * 255.f), 255), 2013 MIN ((int)(b * 256.f), 255),
1651 MIN ((int)(a * 255.f), 255)); 2014 MIN ((int)(a * 256.f), 255));
2015
2016void glInterleavedArrays (int format, int stride, char *data)
2017
2018void glDrawElements (int mode, int count, int type, char *indices)
2019
2020# 1.2 void glDrawRangeElements (int mode, int start, int end
2021
2022void glRasterPos (float x, float y, float z = 0.)
2023 CODE:
2024 glRasterPos3f (0, 0, z);
2025 glBitmap (0, 0, 0, 0, x, y, 0);
1652 2026
1653void glVertex (float x, float y, float z = 0.) 2027void glVertex (float x, float y, float z = 0.)
1654 CODE: 2028 CODE:
1655 glVertex3f (x, y, z); 2029 glVertex3f (x, y, z);
1656 2030
1668 2042
1669void glBindTexture (int target, int name) 2043void glBindTexture (int target, int name)
1670 2044
1671void glConvolutionParameter (int target, int pname, float params) 2045void glConvolutionParameter (int target, int pname, float params)
1672 CODE: 2046 CODE:
1673 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2047 if (gl.ConvolutionParameterf)
2048 gl.ConvolutionParameterf (target, pname, params);
1674 2049
1675void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2050void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1676 CODE: 2051 CODE:
1677 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2052 if (gl.ConvolutionFilter2D)
1678 (target, internalformat, width, height, format, type, data)); 2053 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1679 2054
1680void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2055void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1681 CODE: 2056 CODE:
1682 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2057 if (gl.SeparableFilter2D)
1683 (target, internalformat, width, height, format, type, row, column)); 2058 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1684 2059
1685void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2060void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1686 2061
1687void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2062void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1688 2063
1689void glRasterPos (int x, int y) 2064void glDrawPixels (int width, int height, int format, int type, char *pixels)
1690 CODE:
1691 glRasterPos2i (x, y);
1692 2065
1693void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2066void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1694 2067
1695int glGenTexture () 2068int glGenTexture ()
1696 CODE: 2069 CODE:
1723 2096
1724void glEndList () 2097void glEndList ()
1725 2098
1726void glCallList (int list) 2099void glCallList (int list)
1727 2100
2101

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines