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.124 by root, Tue Jul 4 23:23:31 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);
123#ifdef FC_HINT_STYLE
124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif
91#ifdef _WIN32 126#ifdef _WIN32
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93#else 128#else
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif 130#endif
296 ev.code = 1; 331 ev.code = 1;
297 ev.data1 = (void *)(long)channel; 332 ev.data1 = (void *)(long)channel;
298 ev.data2 = 0; 333 ev.data2 = 0;
299 334
300 SDL_PushEvent ((SDL_Event *)&ev); 335 SDL_PushEvent ((SDL_Event *)&ev);
336}
337
338static unsigned int
339minpot (unsigned int n)
340{
341 if (!n)
342 return 0;
343
344 --n;
345
346 n |= n >> 1;
347 n |= n >> 2;
348 n |= n >> 4;
349 n |= n >> 8;
350 n |= n >> 16;
351
352 return n + 1;
301} 353}
302 354
303MODULE = CFClient PACKAGE = CFClient 355MODULE = CFClient PACKAGE = CFClient
304 356
305PROTOTYPES: ENABLE 357PROTOTYPES: ENABLE
415 467
416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418} 470}
419 471
472NV floor (NV x)
473
474NV ceil (NV x)
475
420void 476void
421pango_init () 477pango_init ()
422 CODE: 478 CODE:
423 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{ 479{
425 {
426 ft2_fontmap = pango_ft2_font_map_new (); 480 opengl_fontmap = pango_opengl_font_map_new ();
427 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 481 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); 482 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} 483}
446 484
447int 485int
448SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 486SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
449 487
450void 488void
451SDL_Quit () 489SDL_Quit ()
452 490
453void 491void
460 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 498 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
461 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 499 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
462 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 500 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
463 501
464 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 502 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 503 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
466 504
467 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 505 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
468 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
469 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
591 629
592void 630void
593add_font (char *file) 631add_font (char *file)
594 CODE: 632 CODE:
595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 633 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 634
601void 635void
602load_image_inline (SV *image_) 636load_image_inline (SV *image_)
603 ALIAS: 637 ALIAS:
604 load_image_file = 1 638 load_image_file = 1
700 CODE: 734 CODE:
701 fprintf (stderr, "FATAL: %s\n", message); 735 fprintf (stderr, "FATAL: %s\n", message);
702#ifdef _WIN32 736#ifdef _WIN32
703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
704#endif 738#endif
705 exit (1); 739 _exit (1);
740
741void
742_exit (int retval)
743 CODE:
744 _exit (retval);
706 745
707MODULE = CFClient PACKAGE = CFClient::Font 746MODULE = CFClient PACKAGE = CFClient::Font
708 747
709CFClient::Font 748CFClient::Font
710new_from_file (SV *class, char *path, int id = 0) 749new_from_file (SV *class, char *path, int id = 0)
728 CODE: 767 CODE:
729 default_font = self; 768 default_font = self;
730 769
731MODULE = CFClient PACKAGE = CFClient::Layout 770MODULE = CFClient PACKAGE = CFClient::Layout
732 771
772void
773clear_font_cache ()
774 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear ();
777
733CFClient::Layout 778CFClient::Layout
734new (SV *class, int rgba = 0) 779new (SV *class, int type = 0)
735 CODE: 780 CODE:
736 New (0, RETVAL, 1, struct cf_layout); 781 New (0, RETVAL, 1, struct cf_layout);
737 782
738 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 783 RETVAL->pl = pango_layout_new (opengl_context);
739 RETVAL->rgba = rgba;
740 RETVAL->r = 1.; 784 RETVAL->r = 1.;
741 RETVAL->g = 1.; 785 RETVAL->g = 1.;
742 RETVAL->b = 1.; 786 RETVAL->b = 1.;
743 RETVAL->a = 1.; 787 RETVAL->a = 1.;
744 RETVAL->base_height = MIN_FONT_HEIGHT; 788 RETVAL->base_height = MIN_FONT_HEIGHT;
753DESTROY (CFClient::Layout self) 797DESTROY (CFClient::Layout self)
754 CODE: 798 CODE:
755 g_object_unref (self->pl); 799 g_object_unref (self->pl);
756 Safefree (self); 800 Safefree (self);
757 801
758int
759is_rgba (CFClient::Layout self)
760 CODE:
761 RETVAL = self->rgba;
762 OUTPUT:
763 RETVAL
764
765void 802void
766set_text (CFClient::Layout self, SV *text_) 803set_text (CFClient::Layout self, SV *text_)
767 CODE: 804 CODE:
768{ 805{
769 STRLEN textlen; 806 STRLEN textlen;
780 char *text = SvPVutf8 (text_, textlen); 817 char *text = SvPVutf8 (text_, textlen);
781 818
782 pango_layout_set_markup (self->pl, text, textlen); 819 pango_layout_set_markup (self->pl, text, textlen);
783} 820}
784 821
822void
823set_shapes (CFClient::Layout self, ...)
824 CODE:
825{
826 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text;
829 int arg = 4;
830
831 while (arg < items && (pos = strstr (pos, OBJ_STR)))
832 {
833 PangoRectangle inkrect, rect;
834 PangoAttribute *attr;
835
836 int x = SvIV (ST (arg - 3));
837 int y = SvIV (ST (arg - 2));
838 int w = SvIV (ST (arg - 1));
839 int h = SvIV (ST (arg ));
840
841 inkrect.x = 0;
842 inkrect.y = 0;
843 inkrect.width = 0;
844 inkrect.height = 0;
845
846 rect.x = x * PANGO_SCALE;
847 rect.y = y * PANGO_SCALE;
848 rect.width = w * PANGO_SCALE;
849 rect.height = h * PANGO_SCALE;
850
851 if (!attrs)
852 attrs = pango_layout_get_attributes (self->pl);
853
854 attr = pango_attr_shape_new (&inkrect, &rect);
855 attr->start_index = pos - text;
856 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
857 pango_attr_list_insert (attrs, attr);
858
859 arg += 4;
860 pos += sizeof (OBJ_STR) - 1;
861 }
862
863 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs);
865}
866
867void
868get_shapes (CFClient::Layout self)
869 PPCODE:
870{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872
873 do
874 {
875 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
876
877 if (run && shape_attr_p (run))
878 {
879 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents);
881
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 }
885 }
886 while (pango_layout_iter_next_run (iter));
887
888 pango_layout_iter_free (iter);
889}
890
891int
892has_wrapped (CFClient::Layout self)
893 CODE:
894{
895 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl);
897
898 while (*text)
899 lines += *text++ == '\n';
900
901 RETVAL = lines < pango_layout_get_line_count (self->pl);
902}
903 OUTPUT:
904 RETVAL
905
785SV * 906SV *
786get_text (CFClient::Layout self) 907get_text (CFClient::Layout self)
787 CODE: 908 CODE:
788 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
789 SvUTF8_on (RETVAL); 910 sv_utf8_decode (RETVAL);
790 OUTPUT: 911 OUTPUT:
791 RETVAL 912 RETVAL
792 913
793void 914void
794set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
858 PUSHs (sv_2mortal (newSViv (w))); 979 PUSHs (sv_2mortal (newSViv (w)));
859 PUSHs (sv_2mortal (newSViv (h))); 980 PUSHs (sv_2mortal (newSViv (h)));
860} 981}
861 982
862int 983int
984descent (CFClient::Layout self)
985 CODE:
986{
987 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect);
990 RETVAL = PANGO_DESCENT (rect);
991}
992 OUTPUT:
993 RETVAL
994
995int
863xy_to_index (CFClient::Layout self, int x, int y) 996xy_to_index (CFClient::Layout self, int x, int y)
864 CODE: 997 CODE:
865{ 998{
866 int index, trailing; 999 int index, trailing;
867 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1000 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))); 1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
883 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
884} 1017}
885 1018
886void 1019void
887render (CFClient::Layout self) 1020render (CFClient::Layout self, float x, float y)
888 PPCODE: 1021 PPCODE:
889{ 1022 pango_opengl_render_layout_subpixel (
890 SV *retval; 1023 self->pl,
891 int w, h; 1024 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a
1026 );
892 1027
893 layout_get_pixel_size (self, &w, &h); 1028MODULE = CFClient PACKAGE = CFClient::Texture
894 1029
895 if (self->rgba) 1030void
1031pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE:
1033{
1034 int ow = SvIV (w_);
1035 int oh = SvIV (h_);
1036
1037 if (ow && oh)
896 { 1038 {
897 cairo_surface_t *surface; 1039 int nw = minpot (ow);
898 cairo_t *cairo; 1040 int nh = minpot (oh);
899 1041
900 retval = newSV (w * h * 4); 1042 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 { 1043 {
918 uint32_t *p = (uint32_t *)SvPVX (retval); 1044 if (SvOK (data_))
919 uint32_t *e = p + w * h;
920
921 while (p < e)
922 { 1045 {
923 uint32_t rgba = *p; 1046 STRLEN datalen;
924 rgba = (rgba >> 24) | (rgba << 8); 1047 char *data = SvPVbyte (data_, datalen);
925#if 0 1048 int bpp = datalen / (ow * oh);
926#ifdef _WIN32 1049 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 1050
933 rgba = (rgba & 0xffffff00) | a; 1051 SvPOK_only (result_);
1052 SvCUR_set (result_, nw * nh * bpp);
1053
1054 memset (SvPVX (result_), 0, nw * nh * bpp);
1055 while (oh--)
1056 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1057
1058 sv_setsv (data_, result_);
934 } 1059 }
935#endif 1060
936#endif 1061 sv_setiv (w_, nw);
937 rgba = SDL_SwapBE32 (rgba); 1062 sv_setiv (h_, nh);
938 *p++ = rgba;
939 } 1063 }
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 } 1064 }
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} 1065}
976 1066
977MODULE = CFClient PACKAGE = CFClient::Texture
978
979void 1067void
980draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1068draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
981 PROTOTYPE: $$$;$$ 1069 PROTOTYPE: $$$;$$
982 ALIAS: 1070 ALIAS:
983 draw_quad_alpha = 1 1071 draw_quad_alpha = 1
984 draw_quad_alpha_premultiplied = 2 1072 draw_quad_alpha_premultiplied = 2
985 CODE: 1073 CODE:
1050DESTROY (CFClient::Map self) 1138DESTROY (CFClient::Map self)
1051 CODE: 1139 CODE:
1052{ 1140{
1053 map_clear (self); 1141 map_clear (self);
1054 Safefree (self->face); 1142 Safefree (self->face);
1143 Safefree (self->tex);
1055 Safefree (self); 1144 Safefree (self);
1056} 1145}
1057 1146
1058void 1147void
1059clear (CFClient::Map self) 1148clear (CFClient::Map self)
1165 1254
1166 while (data < data_end) 1255 while (data < data_end)
1167 { 1256 {
1168 flags = (data [0] << 8) + data [1]; data += 2; 1257 flags = (data [0] << 8) + data [1]; data += 2;
1169 1258
1170 x = ((flags >> 10) & 63) + self->x; 1259 x = self->x + ((flags >> 10) & 63);
1171 y = ((flags >> 4) & 63) + self->y; 1260 y = self->y + ((flags >> 4) & 63);
1172 1261
1173 cell = map_get_cell (self, x, y); 1262 cell = map_get_cell (self, x, y);
1174 1263
1175 if (flags & 15) 1264 if (flags & 15)
1176 { 1265 {
1266 OUTPUT: 1355 OUTPUT:
1267 RETVAL 1356 RETVAL
1268 1357
1269void 1358void
1270draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1271 PPCODE: 1360 CODE:
1272{ 1361{
1273 int vx, vy; 1362 int vx, vy;
1274 int x, y, z; 1363 int x, y, z;
1275 int last_name; 1364 int last_name;
1276 mapface face; 1365 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 1366
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; 1367 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1286 vy = self->y + (self->h - sh) / 2 - shift_y; 1368 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1287 1369
1288 /* 1370 /*
1289 int vx = self->vx = self->w >= sw 1371 int vx = self->vx = self->w >= sw
1290 ? self->x + (self->w - sw) / 2 1372 ? self->x + (self->w - sw) / 2
1291 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1373 : 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)); 1377 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1296 */ 1378 */
1297 1379
1298 glColor4ub (255, 255, 255, 255); 1380 glColor4ub (255, 255, 255, 255);
1299 1381
1382 glEnable (GL_BLEND);
1300 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1301 glEnable (GL_BLEND);
1302 glEnable (GL_TEXTURE_2D); 1384 glEnable (GL_TEXTURE_2D);
1303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1385 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1304 1386
1305 glBegin (GL_QUADS); 1387 glBegin (GL_QUADS);
1306 1388
1314 1396
1315 for (x = 0; x < sw; x++) 1397 for (x = 0; x < sw; x++)
1316 if (row->c0 <= x + vx && x + vx < row->c1) 1398 if (row->c0 <= x + vx && x + vx < row->c1)
1317 { 1399 {
1318 mapcell *cell = row->col + (x + vx - row->c0); 1400 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 1401
1324 face = cell->face [z]; 1402 face = cell->face [z];
1325 1403
1326 if (face) 1404 if (face)
1327 { 1405 {
1348 1426
1349 glEnd (); 1427 glEnd ();
1350 1428
1351 glDisable (GL_TEXTURE_2D); 1429 glDisable (GL_TEXTURE_2D);
1352 glDisable (GL_BLEND); 1430 glDisable (GL_BLEND);
1431}
1432
1433void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE:
1436{
1437 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F },
1440 { 0.00F, 0.00F, 0.55F },
1441 { 1.00F, 0.00F, 0.00F },
1442
1443 { 1.00F, 0.54F, 0.00F },
1444 { 0.11F, 0.56F, 1.00F },
1445 { 0.93F, 0.46F, 0.00F },
1446 { 0.18F, 0.54F, 0.34F },
1447
1448 { 0.56F, 0.73F, 0.56F },
1449 { 0.80F, 0.80F, 0.80F },
1450 { 0.55F, 0.41F, 0.13F },
1451 { 0.99F, 0.77F, 0.26F },
1452
1453 { 0.74F, 0.65F, 0.41F },
1454
1455 { 0.00F, 1.00F, 1.00F },
1456 { 1.00F, 0.00F, 1.00F },
1457 { 1.00F, 1.00F, 0.00F },
1458 };
1459
1460 int x, y;
1461
1462 glEnable (GL_TEXTURE_2D);
1463 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1464 glEnable (GL_BLEND);
1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1466 glBegin (GL_QUADS);
1467
1468 for (y = 0; y < h; y++)
1469 for (x = 0; x < w; x++)
1470 {
1471 unsigned char m = data [x + y * w];
1472
1473 if (m)
1474 {
1475 float *c = color [m & 15];
1476
1477 float tx1 = m & 0x40 ? 0.5 : 0.;
1478 float tx2 = tx1 + 0.5;
1479
1480 glColor4f (c[0], c[1], c[2], 0.75);
1481 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1482 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1483 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1484 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1485 }
1486 }
1487
1488 glEnd ();
1489 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D);
1491}
1492
1493void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1495 PPCODE:
1496{
1497 int vx, vy;
1498 int x, y;
1499 int sw4 = (sw + 3) & ~3;
1500 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1501 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1502
1503 memset (darkness, 255, sw4 * sh);
1504 SvPOK_only (darkness_sv);
1505 SvCUR_set (darkness_sv, sw4 * sh);
1506
1507 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1508 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1509
1510 for (y = 0; y < sh; y++)
1511 if (0 <= y + vy && y + vy < self->rows)
1512 {
1513 maprow *row = self->row + (y + vy);
1514
1515 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1)
1517 {
1518 mapcell *cell = row->col + (x + vx - row->c0);
1519
1520 darkness[y * sw4 + x] = cell->darkness < 0
1521 ? 255 - FOW_DARKNESS
1522 : 255 - cell->darkness;
1523 }
1524 }
1353 1525
1354 EXTEND (SP, 3); 1526 EXTEND (SP, 3);
1355 PUSHs (sv_2mortal (newSViv (sw4))); 1527 PUSHs (sv_2mortal (newSViv (sw4)));
1356 PUSHs (sv_2mortal (newSViv (sh))); 1528 PUSHs (sv_2mortal (newSViv (sh)));
1357 PUSHs (darkness_sv); 1529 PUSHs (darkness_sv);
1564 const_iv (GL_SCISSOR_TEST), 1736 const_iv (GL_SCISSOR_TEST),
1565 const_iv (GL_DEPTH_TEST), 1737 const_iv (GL_DEPTH_TEST),
1566 const_iv (GL_ALPHA_TEST), 1738 const_iv (GL_ALPHA_TEST),
1567 const_iv (GL_NORMALIZE), 1739 const_iv (GL_NORMALIZE),
1568 const_iv (GL_RESCALE_NORMAL), 1740 const_iv (GL_RESCALE_NORMAL),
1741 const_iv (GL_FRONT),
1742 const_iv (GL_BACK),
1569 const_iv (GL_AND), 1743 const_iv (GL_AND),
1570 const_iv (GL_ONE), 1744 const_iv (GL_ONE),
1571 const_iv (GL_ZERO), 1745 const_iv (GL_ZERO),
1572 const_iv (GL_SRC_ALPHA), 1746 const_iv (GL_SRC_ALPHA),
1573 const_iv (GL_DST_ALPHA), 1747 const_iv (GL_DST_ALPHA),
1574 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1748 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575 const_iv (GL_ONE_MINUS_DST_ALPHA), 1749 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE), 1750 const_iv (GL_SRC_ALPHA_SATURATE),
1577 const_iv (GL_RGB), 1751 const_iv (GL_RGB),
1578 const_iv (GL_RGBA), 1752 const_iv (GL_RGBA),
1753 const_iv (GL_RGBA4),
1754 const_iv (GL_RGBA8),
1755 const_iv (GL_RGB5_A1),
1579 const_iv (GL_UNSIGNED_BYTE), 1756 const_iv (GL_UNSIGNED_BYTE),
1580 const_iv (GL_UNSIGNED_SHORT), 1757 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT), 1758 const_iv (GL_UNSIGNED_INT),
1582 const_iv (GL_ALPHA), 1759 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY), 1760 const_iv (GL_INTENSITY),
1657 OUTPUT: 1834 OUTPUT:
1658 RETVAL 1835 RETVAL
1659 1836
1660int glGetError () 1837int glGetError ()
1661 1838
1839void glFinish ()
1840
1662void glClear (int mask) 1841void glClear (int mask)
1663 1842
1664void glClearColor (float r, float g, float b, float a = 1.0) 1843void glClearColor (float r, float g, float b, float a = 1.0)
1665 PROTOTYPE: @ 1844 PROTOTYPE: @
1666 1845
1689void glPushMatrix () 1868void glPushMatrix ()
1690 1869
1691void glPopMatrix () 1870void glPopMatrix ()
1692 1871
1693void glLoadIdentity () 1872void glLoadIdentity ()
1873
1874void glDrawBuffer (int buffer)
1875
1876void glReadBuffer (int buffer)
1694 1877
1695# near_ and far_ are due to microsofts buggy "c" compiler 1878# near_ and far_ are due to microsofts buggy "c" compiler
1696void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1879void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697 1880
1698# near_ and far_ are due to microsofts buggy "c" compiler 1881# near_ and far_ are due to microsofts buggy "c" compiler

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines