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.106 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.125 by root, Tue Jul 4 23:44:23 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>
20#include <SDL_opengl.h> 21#include <SDL_opengl.h>
21 22
23#define PANGO_ENABLE_BACKEND
24#define G_DISABLE_CAST_CHECKS
25
22#include <glib/gmacros.h> 26#include <glib/gmacros.h>
23 27
24#include <pango/pango.h> 28#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 29
29#ifndef _WIN32 30#ifndef _WIN32
30# include <sys/types.h> 31# include <sys/types.h>
31# include <sys/socket.h> 32# include <sys/socket.h>
32# include <netinet/in.h> 33# include <netinet/in.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
55
56#if 1
57# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else
59# define PARACHUTE 0
60#endif
52 61
53static struct 62static struct
54{ 63{
55#define GL_FUNC(ptr,name) ptr name; 64#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 65#include "glfunc.h"
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 74 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 75 else
67 glBlendFunc (sa, da); 76 glBlendFunc (sa, da);
68} 77}
69 78
79#include "texcache.c"
80
81#include "pango-font.c"
82#include "pango-fontmap.c"
83#include "pango-render.c"
84
70typedef Mix_Chunk *CFClient__MixChunk; 85typedef Mix_Chunk *CFClient__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 86typedef Mix_Music *CFClient__MixMusic;
72 87
73typedef PangoFontDescription *CFClient__Font; 88typedef PangoFontDescription *CFClient__Font;
74 89
90static int
91shape_attr_p (PangoLayoutRun *run)
92{
93 GSList *attrs = run->item->analysis.extra_attrs;
94
95 while (attrs)
96 {
97 PangoAttribute *attr = attrs->data;
98
99 if (attr->klass->type == PANGO_ATTR_SHAPE)
100 return 1;
101
102 attrs = attrs->next;
103 }
104
105 return 0;
106}
107
75typedef struct cf_layout { 108typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 109 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 110 float r, g, b, a; // default color for rgba mode
79 int base_height; 111 int base_height;
80 CFClient__Font font; 112 CFClient__Font font;
81} *CFClient__Layout; 113} *CFClient__Layout;
82 114
83static CFClient__Font default_font; 115static CFClient__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 116static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 117static PangoFontMap *opengl_fontmap;
86 118
87static void 119static void
88substitute_func (FcPattern *pattern, gpointer data) 120substitute_func (FcPattern *pattern, gpointer data)
89{ 121{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 122 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef _WIN32 123#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#else 125#endif
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 126 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
96} 127}
97 128
98static void 129static void
99layout_update_font (CFClient__Layout self) 130layout_update_font (CFClient__Layout self)
100{ 131{
296 ev.code = 1; 327 ev.code = 1;
297 ev.data1 = (void *)(long)channel; 328 ev.data1 = (void *)(long)channel;
298 ev.data2 = 0; 329 ev.data2 = 0;
299 330
300 SDL_PushEvent ((SDL_Event *)&ev); 331 SDL_PushEvent ((SDL_Event *)&ev);
332}
333
334static unsigned int
335minpot (unsigned int n)
336{
337 if (!n)
338 return 0;
339
340 --n;
341
342 n |= n >> 1;
343 n |= n >> 2;
344 n |= n >> 4;
345 n |= n >> 8;
346 n |= n >> 16;
347
348 return n + 1;
301} 349}
302 350
303MODULE = CFClient PACKAGE = CFClient 351MODULE = CFClient PACKAGE = CFClient
304 352
305PROTOTYPES: ENABLE 353PROTOTYPES: ENABLE
415 463
416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418} 466}
419 467
468NV floor (NV x)
469
470NV ceil (NV x)
471
420void 472void
421pango_init () 473pango_init ()
422 CODE: 474 CODE:
423 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{ 475{
425 {
426 ft2_fontmap = pango_ft2_font_map_new (); 476 opengl_fontmap = pango_opengl_font_map_new ();
427 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 477 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
428 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 478 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
429 }
430 {
431 cairo_font_options_t *fopt = cairo_font_options_create ();
432 cairo_fontmap = pango_cairo_font_map_get_default ();
433 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434#ifdef _WIN32
435 // cairo looks like shit eaten twice on windows
436 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437#else
438 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439#endif
440 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442 pango_cairo_context_set_font_options (cairo_context, fopt);
443 cairo_font_options_destroy (fopt);
444 }
445} 479}
446 480
447int 481int
448SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
449 483
450void 484void
451SDL_Quit () 485SDL_Quit ()
452 486
453void 487void
460 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
461 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
462 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
463 497
464 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
466 500
467 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
468 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
469 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
591 625
592void 626void
593add_font (char *file) 627add_font (char *file)
594 CODE: 628 CODE:
595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
596#ifdef _WIN32
597 // cairo... sigh... requires win2000
598 AddFontResourceEx (file, FR_PRIVATE, 0);
599#endif
600 630
601void 631void
602load_image_inline (SV *image_) 632load_image_inline (SV *image_)
603 ALIAS: 633 ALIAS:
604 load_image_file = 1 634 load_image_file = 1
700 CODE: 730 CODE:
701 fprintf (stderr, "FATAL: %s\n", message); 731 fprintf (stderr, "FATAL: %s\n", message);
702#ifdef _WIN32 732#ifdef _WIN32
703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
704#endif 734#endif
705 exit (1); 735 _exit (1);
736
737void
738_exit (int retval)
739 CODE:
740 _exit (retval);
706 741
707MODULE = CFClient PACKAGE = CFClient::Font 742MODULE = CFClient PACKAGE = CFClient::Font
708 743
709CFClient::Font 744CFClient::Font
710new_from_file (SV *class, char *path, int id = 0) 745new_from_file (SV *class, char *path, int id = 0)
728 CODE: 763 CODE:
729 default_font = self; 764 default_font = self;
730 765
731MODULE = CFClient PACKAGE = CFClient::Layout 766MODULE = CFClient PACKAGE = CFClient::Layout
732 767
768void
769clear_font_cache ()
770 CODE:
771 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
772 tc_clear ();
773
733CFClient::Layout 774CFClient::Layout
734new (SV *class, int rgba = 0) 775new (SV *class, int type = 0)
735 CODE: 776 CODE:
736 New (0, RETVAL, 1, struct cf_layout); 777 New (0, RETVAL, 1, struct cf_layout);
737 778
738 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 779 RETVAL->pl = pango_layout_new (opengl_context);
739 RETVAL->rgba = rgba;
740 RETVAL->r = 1.; 780 RETVAL->r = 1.;
741 RETVAL->g = 1.; 781 RETVAL->g = 1.;
742 RETVAL->b = 1.; 782 RETVAL->b = 1.;
743 RETVAL->a = 1.; 783 RETVAL->a = 1.;
744 RETVAL->base_height = MIN_FONT_HEIGHT; 784 RETVAL->base_height = MIN_FONT_HEIGHT;
753DESTROY (CFClient::Layout self) 793DESTROY (CFClient::Layout self)
754 CODE: 794 CODE:
755 g_object_unref (self->pl); 795 g_object_unref (self->pl);
756 Safefree (self); 796 Safefree (self);
757 797
758int
759is_rgba (CFClient::Layout self)
760 CODE:
761 RETVAL = self->rgba;
762 OUTPUT:
763 RETVAL
764
765void 798void
766set_text (CFClient::Layout self, SV *text_) 799set_text (CFClient::Layout self, SV *text_)
767 CODE: 800 CODE:
768{ 801{
769 STRLEN textlen; 802 STRLEN textlen;
780 char *text = SvPVutf8 (text_, textlen); 813 char *text = SvPVutf8 (text_, textlen);
781 814
782 pango_layout_set_markup (self->pl, text, textlen); 815 pango_layout_set_markup (self->pl, text, textlen);
783} 816}
784 817
818void
819set_shapes (CFClient::Layout self, ...)
820 CODE:
821{
822 PangoAttrList *attrs = 0;
823 const char *text = pango_layout_get_text (self->pl);
824 const char *pos = text;
825 int arg = 4;
826
827 while (arg < items && (pos = strstr (pos, OBJ_STR)))
828 {
829 PangoRectangle inkrect, rect;
830 PangoAttribute *attr;
831
832 int x = SvIV (ST (arg - 3));
833 int y = SvIV (ST (arg - 2));
834 int w = SvIV (ST (arg - 1));
835 int h = SvIV (ST (arg ));
836
837 inkrect.x = 0;
838 inkrect.y = 0;
839 inkrect.width = 0;
840 inkrect.height = 0;
841
842 rect.x = x * PANGO_SCALE;
843 rect.y = y * PANGO_SCALE;
844 rect.width = w * PANGO_SCALE;
845 rect.height = h * PANGO_SCALE;
846
847 if (!attrs)
848 attrs = pango_layout_get_attributes (self->pl);
849
850 attr = pango_attr_shape_new (&inkrect, &rect);
851 attr->start_index = pos - text;
852 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
853 pango_attr_list_insert (attrs, attr);
854
855 arg += 4;
856 pos += sizeof (OBJ_STR) - 1;
857 }
858
859 if (attrs)
860 pango_layout_set_attributes (self->pl, attrs);
861}
862
863void
864get_shapes (CFClient::Layout self)
865 PPCODE:
866{
867 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
868
869 do
870 {
871 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
872
873 if (run && shape_attr_p (run))
874 {
875 PangoRectangle extents;
876 pango_layout_iter_get_run_extents (iter, 0, &extents);
877
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
879 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
880 }
881 }
882 while (pango_layout_iter_next_run (iter));
883
884 pango_layout_iter_free (iter);
885}
886
887int
888has_wrapped (CFClient::Layout self)
889 CODE:
890{
891 int lines = 1;
892 const char *text = pango_layout_get_text (self->pl);
893
894 while (*text)
895 lines += *text++ == '\n';
896
897 RETVAL = lines < pango_layout_get_line_count (self->pl);
898}
899 OUTPUT:
900 RETVAL
901
785SV * 902SV *
786get_text (CFClient::Layout self) 903get_text (CFClient::Layout self)
787 CODE: 904 CODE:
788 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 905 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
789 SvUTF8_on (RETVAL); 906 sv_utf8_decode (RETVAL);
790 OUTPUT: 907 OUTPUT:
791 RETVAL 908 RETVAL
792 909
793void 910void
794set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 911set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
858 PUSHs (sv_2mortal (newSViv (w))); 975 PUSHs (sv_2mortal (newSViv (w)));
859 PUSHs (sv_2mortal (newSViv (h))); 976 PUSHs (sv_2mortal (newSViv (h)));
860} 977}
861 978
862int 979int
980descent (CFClient::Layout self)
981 CODE:
982{
983 PangoRectangle rect;
984 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
985 pango_layout_line_get_pixel_extents (line, 0, &rect);
986 RETVAL = PANGO_DESCENT (rect);
987}
988 OUTPUT:
989 RETVAL
990
991int
863xy_to_index (CFClient::Layout self, int x, int y) 992xy_to_index (CFClient::Layout self, int x, int y)
864 CODE: 993 CODE:
865{ 994{
866 int index, trailing; 995 int index, trailing;
867 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 996 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
882 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1011 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
883 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1012 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
884} 1013}
885 1014
886void 1015void
887render (CFClient::Layout self) 1016render (CFClient::Layout self, float x, float y)
888 PPCODE: 1017 PPCODE:
889{ 1018 pango_opengl_render_layout_subpixel (
890 SV *retval; 1019 self->pl,
891 int w, h; 1020 x * PANGO_SCALE, y * PANGO_SCALE,
1021 self->r, self->g, self->b, self->a
1022 );
892 1023
893 layout_get_pixel_size (self, &w, &h); 1024MODULE = CFClient PACKAGE = CFClient::Texture
894 1025
895 if (self->rgba) 1026void
1027pad2pot (SV *data_, SV *w_, SV *h_)
1028 CODE:
1029{
1030 int ow = SvIV (w_);
1031 int oh = SvIV (h_);
1032
1033 if (ow && oh)
896 { 1034 {
897 cairo_surface_t *surface; 1035 int nw = minpot (ow);
898 cairo_t *cairo; 1036 int nh = minpot (oh);
899 1037
900 retval = newSV (w * h * 4); 1038 if (nw != ow || nh != oh)
901 SvPOK_only (retval);
902 SvCUR_set (retval, w * h * 4);
903
904 memset (SvPVX (retval), 0, w * h * 4);
905
906 surface = cairo_image_surface_create_for_data (
907 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
908 cairo = cairo_create (surface);
909 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
910
911 pango_cairo_show_layout (cairo, self->pl);
912
913 cairo_destroy (cairo);
914 cairo_surface_destroy (surface);
915
916 // what a mess, and its premultiplied, too :(
917 { 1039 {
918 uint32_t *p = (uint32_t *)SvPVX (retval); 1040 if (SvOK (data_))
919 uint32_t *e = p + w * h;
920
921 while (p < e)
922 { 1041 {
923 uint32_t rgba = *p; 1042 STRLEN datalen;
924 rgba = (rgba >> 24) | (rgba << 8); 1043 char *data = SvPVbyte (data_, datalen);
925#if 0 1044 int bpp = datalen / (ow * oh);
926#ifdef _WIN32 1045 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
927 {//D
928 uint8_t r = rgba >> 24;
929 uint8_t g = rgba >> 16;
930 uint8_t b = rgba >> 8;
931 uint8_t a = rgba >> 0;
932 1046
933 rgba = (rgba & 0xffffff00) | a; 1047 SvPOK_only (result_);
1048 SvCUR_set (result_, nw * nh * bpp);
1049
1050 memset (SvPVX (result_), 0, nw * nh * bpp);
1051 while (oh--)
1052 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1053
1054 sv_setsv (data_, result_);
934 } 1055 }
935#endif 1056
936#endif 1057 sv_setiv (w_, nw);
937 rgba = SDL_SwapBE32 (rgba); 1058 sv_setiv (h_, nh);
938 *p++ = rgba;
939 } 1059 }
940 }
941
942 EXTEND (SP, 5);
943 PUSHs (sv_2mortal (newSViv (w)));
944 PUSHs (sv_2mortal (newSViv (h)));
945 PUSHs (sv_2mortal (retval));
946 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
947 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
948 } 1060 }
949 else
950 {
951 FT_Bitmap bitmap;
952
953 retval = newSV (w * h);
954 SvPOK_only (retval);
955 SvCUR_set (retval, w * h);
956
957 bitmap.rows = h;
958 bitmap.width = w;
959 bitmap.pitch = w;
960 bitmap.buffer = (unsigned char*)SvPVX (retval);
961 bitmap.num_grays = 256;
962 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
963
964 memset (bitmap.buffer, 0, w * h);
965
966 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
967
968 EXTEND (SP, 5);
969 PUSHs (sv_2mortal (newSViv (w)));
970 PUSHs (sv_2mortal (newSViv (h)));
971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
973 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
974 }
975} 1061}
976 1062
977MODULE = CFClient PACKAGE = CFClient::Texture
978
979void 1063void
980draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1064draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
981 PROTOTYPE: $$$;$$ 1065 PROTOTYPE: $$$;$$
982 ALIAS: 1066 ALIAS:
983 draw_quad_alpha = 1 1067 draw_quad_alpha = 1
984 draw_quad_alpha_premultiplied = 2 1068 draw_quad_alpha_premultiplied = 2
985 CODE: 1069 CODE:
1050DESTROY (CFClient::Map self) 1134DESTROY (CFClient::Map self)
1051 CODE: 1135 CODE:
1052{ 1136{
1053 map_clear (self); 1137 map_clear (self);
1054 Safefree (self->face); 1138 Safefree (self->face);
1139 Safefree (self->tex);
1055 Safefree (self); 1140 Safefree (self);
1056} 1141}
1057 1142
1058void 1143void
1059clear (CFClient::Map self) 1144clear (CFClient::Map self)
1165 1250
1166 while (data < data_end) 1251 while (data < data_end)
1167 { 1252 {
1168 flags = (data [0] << 8) + data [1]; data += 2; 1253 flags = (data [0] << 8) + data [1]; data += 2;
1169 1254
1170 x = ((flags >> 10) & 63) + self->x; 1255 x = self->x + ((flags >> 10) & 63);
1171 y = ((flags >> 4) & 63) + self->y; 1256 y = self->y + ((flags >> 4) & 63);
1172 1257
1173 cell = map_get_cell (self, x, y); 1258 cell = map_get_cell (self, x, y);
1174 1259
1175 if (flags & 15) 1260 if (flags & 15)
1176 { 1261 {
1266 OUTPUT: 1351 OUTPUT:
1267 RETVAL 1352 RETVAL
1268 1353
1269void 1354void
1270draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1355draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1271 PPCODE: 1356 CODE:
1272{ 1357{
1273 int vx, vy; 1358 int vx, vy;
1274 int x, y, z; 1359 int x, y, z;
1275 int last_name; 1360 int last_name;
1276 mapface face; 1361 mapface face;
1277 int sw4 = (sw + 3) & ~3;
1278 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1279 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1280 1362
1281 memset (darkness, 255, sw4 * sh);
1282 SvPOK_only (darkness_sv);
1283 SvCUR_set (darkness_sv, sw4 * sh);
1284
1285 vx = self->x + (self->w - sw) / 2 - shift_x; 1363 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1286 vy = self->y + (self->h - sh) / 2 - shift_y; 1364 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1287 1365
1288 /* 1366 /*
1289 int vx = self->vx = self->w >= sw 1367 int vx = self->vx = self->w >= sw
1290 ? self->x + (self->w - sw) / 2 1368 ? self->x + (self->w - sw) / 2
1291 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1369 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1295 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1373 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1296 */ 1374 */
1297 1375
1298 glColor4ub (255, 255, 255, 255); 1376 glColor4ub (255, 255, 255, 255);
1299 1377
1378 glEnable (GL_BLEND);
1300 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1301 glEnable (GL_BLEND);
1302 glEnable (GL_TEXTURE_2D); 1380 glEnable (GL_TEXTURE_2D);
1303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1381 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1304 1382
1305 glBegin (GL_QUADS); 1383 glBegin (GL_QUADS);
1306 1384
1314 1392
1315 for (x = 0; x < sw; x++) 1393 for (x = 0; x < sw; x++)
1316 if (row->c0 <= x + vx && x + vx < row->c1) 1394 if (row->c0 <= x + vx && x + vx < row->c1)
1317 { 1395 {
1318 mapcell *cell = row->col + (x + vx - row->c0); 1396 mapcell *cell = row->col + (x + vx - row->c0);
1319
1320 darkness[y * sw4 + x] = cell->darkness < 0
1321 ? 255 - FOW_DARKNESS
1322 : 255 - cell->darkness;
1323 1397
1324 face = cell->face [z]; 1398 face = cell->face [z];
1325 1399
1326 if (face) 1400 if (face)
1327 { 1401 {
1348 1422
1349 glEnd (); 1423 glEnd ();
1350 1424
1351 glDisable (GL_TEXTURE_2D); 1425 glDisable (GL_TEXTURE_2D);
1352 glDisable (GL_BLEND); 1426 glDisable (GL_BLEND);
1427}
1428
1429void
1430draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1431 CODE:
1432{
1433 static float color[16][3] = {
1434 { 0.00F, 0.00F, 0.00F },
1435 { 1.00F, 1.00F, 1.00F },
1436 { 0.00F, 0.00F, 0.55F },
1437 { 1.00F, 0.00F, 0.00F },
1438
1439 { 1.00F, 0.54F, 0.00F },
1440 { 0.11F, 0.56F, 1.00F },
1441 { 0.93F, 0.46F, 0.00F },
1442 { 0.18F, 0.54F, 0.34F },
1443
1444 { 0.56F, 0.73F, 0.56F },
1445 { 0.80F, 0.80F, 0.80F },
1446 { 0.55F, 0.41F, 0.13F },
1447 { 0.99F, 0.77F, 0.26F },
1448
1449 { 0.74F, 0.65F, 0.41F },
1450
1451 { 0.00F, 1.00F, 1.00F },
1452 { 1.00F, 0.00F, 1.00F },
1453 { 1.00F, 1.00F, 0.00F },
1454 };
1455
1456 int x, y;
1457
1458 glEnable (GL_TEXTURE_2D);
1459 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1460 glEnable (GL_BLEND);
1461 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1462 glBegin (GL_QUADS);
1463
1464 for (y = 0; y < h; y++)
1465 for (x = 0; x < w; x++)
1466 {
1467 unsigned char m = data [x + y * w];
1468
1469 if (m)
1470 {
1471 float *c = color [m & 15];
1472
1473 float tx1 = m & 0x40 ? 0.5 : 0.;
1474 float tx2 = tx1 + 0.5;
1475
1476 glColor4f (c[0], c[1], c[2], 0.75);
1477 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1478 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1479 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1480 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1481 }
1482 }
1483
1484 glEnd ();
1485 glDisable (GL_BLEND);
1486 glDisable (GL_TEXTURE_2D);
1487}
1488
1489void
1490fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1491 PPCODE:
1492{
1493 int vx, vy;
1494 int x, y;
1495 int sw4 = (sw + 3) & ~3;
1496 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1497 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1498
1499 memset (darkness, 255, sw4 * sh);
1500 SvPOK_only (darkness_sv);
1501 SvCUR_set (darkness_sv, sw4 * sh);
1502
1503 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1504 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1505
1506 for (y = 0; y < sh; y++)
1507 if (0 <= y + vy && y + vy < self->rows)
1508 {
1509 maprow *row = self->row + (y + vy);
1510
1511 for (x = 0; x < sw; x++)
1512 if (row->c0 <= x + vx && x + vx < row->c1)
1513 {
1514 mapcell *cell = row->col + (x + vx - row->c0);
1515
1516 darkness[y * sw4 + x] = cell->darkness < 0
1517 ? 255 - FOW_DARKNESS
1518 : 255 - cell->darkness;
1519 }
1520 }
1353 1521
1354 EXTEND (SP, 3); 1522 EXTEND (SP, 3);
1355 PUSHs (sv_2mortal (newSViv (sw4))); 1523 PUSHs (sv_2mortal (newSViv (sw4)));
1356 PUSHs (sv_2mortal (newSViv (sh))); 1524 PUSHs (sv_2mortal (newSViv (sh)));
1357 PUSHs (darkness_sv); 1525 PUSHs (darkness_sv);
1564 const_iv (GL_SCISSOR_TEST), 1732 const_iv (GL_SCISSOR_TEST),
1565 const_iv (GL_DEPTH_TEST), 1733 const_iv (GL_DEPTH_TEST),
1566 const_iv (GL_ALPHA_TEST), 1734 const_iv (GL_ALPHA_TEST),
1567 const_iv (GL_NORMALIZE), 1735 const_iv (GL_NORMALIZE),
1568 const_iv (GL_RESCALE_NORMAL), 1736 const_iv (GL_RESCALE_NORMAL),
1737 const_iv (GL_FRONT),
1738 const_iv (GL_BACK),
1569 const_iv (GL_AND), 1739 const_iv (GL_AND),
1570 const_iv (GL_ONE), 1740 const_iv (GL_ONE),
1571 const_iv (GL_ZERO), 1741 const_iv (GL_ZERO),
1572 const_iv (GL_SRC_ALPHA), 1742 const_iv (GL_SRC_ALPHA),
1573 const_iv (GL_DST_ALPHA), 1743 const_iv (GL_DST_ALPHA),
1574 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1744 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575 const_iv (GL_ONE_MINUS_DST_ALPHA), 1745 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE), 1746 const_iv (GL_SRC_ALPHA_SATURATE),
1577 const_iv (GL_RGB), 1747 const_iv (GL_RGB),
1578 const_iv (GL_RGBA), 1748 const_iv (GL_RGBA),
1749 const_iv (GL_RGBA4),
1750 const_iv (GL_RGBA8),
1751 const_iv (GL_RGB5_A1),
1579 const_iv (GL_UNSIGNED_BYTE), 1752 const_iv (GL_UNSIGNED_BYTE),
1580 const_iv (GL_UNSIGNED_SHORT), 1753 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT), 1754 const_iv (GL_UNSIGNED_INT),
1582 const_iv (GL_ALPHA), 1755 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY), 1756 const_iv (GL_INTENSITY),
1657 OUTPUT: 1830 OUTPUT:
1658 RETVAL 1831 RETVAL
1659 1832
1660int glGetError () 1833int glGetError ()
1661 1834
1835void glFinish ()
1836
1662void glClear (int mask) 1837void glClear (int mask)
1663 1838
1664void glClearColor (float r, float g, float b, float a = 1.0) 1839void glClearColor (float r, float g, float b, float a = 1.0)
1665 PROTOTYPE: @ 1840 PROTOTYPE: @
1666 1841
1689void glPushMatrix () 1864void glPushMatrix ()
1690 1865
1691void glPopMatrix () 1866void glPopMatrix ()
1692 1867
1693void glLoadIdentity () 1868void glLoadIdentity ()
1869
1870void glDrawBuffer (int buffer)
1871
1872void glReadBuffer (int buffer)
1694 1873
1695# near_ and far_ are due to microsofts buggy "c" compiler 1874# near_ and far_ are due to microsofts buggy "c" compiler
1696void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1875void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697 1876
1698# near_ and far_ are due to microsofts buggy "c" compiler 1877# near_ and far_ are due to microsofts buggy "c" compiler

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines