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.105 by root, Mon Jun 5 03:33:09 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
126#ifdef _WIN32
91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
128#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130#endif
93} 131}
94 132
95static void 133static void
96layout_update_font (CFClient__Layout self) 134layout_update_font (CFClient__Layout self)
97{ 135{
293 ev.code = 1; 331 ev.code = 1;
294 ev.data1 = (void *)(long)channel; 332 ev.data1 = (void *)(long)channel;
295 ev.data2 = 0; 333 ev.data2 = 0;
296 334
297 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;
298} 353}
299 354
300MODULE = CFClient PACKAGE = CFClient 355MODULE = CFClient PACKAGE = CFClient
301 356
302PROTOTYPES: ENABLE 357PROTOTYPES: ENABLE
412 467
413 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; )
414 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415} 470}
416 471
472NV floor (NV x)
473
474NV ceil (NV x)
475
417void 476void
418pango_init () 477pango_init ()
419 CODE: 478 CODE:
420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{ 479{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 480 opengl_fontmap = pango_opengl_font_map_new ();
424 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);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 482 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426 }
427
428 {
429 cairo_font_options_t *fopt = cairo_font_options_create ();
430 cairo_fontmap = pango_cairo_font_map_get_default ();
431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt);
437 }
438} 483}
439 484
440int 485int
441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 486SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442 487
443void 488void
444SDL_Quit () 489SDL_Quit ()
445 490
446void 491void
453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 498 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 499 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 500 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456 501
457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 502 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 503 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459 504
460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 505 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 629
585void 630void
586add_font (char *file) 631add_font (char *file)
587 CODE: 632 CODE:
588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
589#ifdef _WIN32
590 // cairo... sigh... requires win2000
591 AddFontResourceEx (file, FR_PRIVATE, 0);
592#endif
593 634
594void 635void
595load_image_inline (SV *image_) 636load_image_inline (SV *image_)
596 ALIAS: 637 ALIAS:
597 load_image_file = 1 638 load_image_file = 1
693 CODE: 734 CODE:
694 fprintf (stderr, "FATAL: %s\n", message); 735 fprintf (stderr, "FATAL: %s\n", message);
695#ifdef _WIN32 736#ifdef _WIN32
696 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697#endif 738#endif
698 exit (1); 739 _exit (1);
740
741void
742_exit (int retval)
743 CODE:
744 _exit (retval);
699 745
700MODULE = CFClient PACKAGE = CFClient::Font 746MODULE = CFClient PACKAGE = CFClient::Font
701 747
702CFClient::Font 748CFClient::Font
703new_from_file (SV *class, char *path, int id = 0) 749new_from_file (SV *class, char *path, int id = 0)
721 CODE: 767 CODE:
722 default_font = self; 768 default_font = self;
723 769
724MODULE = CFClient PACKAGE = CFClient::Layout 770MODULE = CFClient PACKAGE = CFClient::Layout
725 771
772void
773clear_font_cache ()
774 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear ();
777
726CFClient::Layout 778CFClient::Layout
727new (SV *class, int rgba = 0) 779new (SV *class, int type = 0)
728 CODE: 780 CODE:
729#if _WIN32
730 //rgba = 0;//D makes text nicer, breaks TextView
731#endif
732 rgba=1;//D
733 New (0, RETVAL, 1, struct cf_layout); 781 New (0, RETVAL, 1, struct cf_layout);
734 782
735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 783 RETVAL->pl = pango_layout_new (opengl_context);
736 RETVAL->rgba = rgba;
737 RETVAL->r = 1.; 784 RETVAL->r = 1.;
738 RETVAL->g = 1.; 785 RETVAL->g = 1.;
739 RETVAL->b = 1.; 786 RETVAL->b = 1.;
740 RETVAL->a = 1.; 787 RETVAL->a = 1.;
741 RETVAL->base_height = MIN_FONT_HEIGHT; 788 RETVAL->base_height = MIN_FONT_HEIGHT;
750DESTROY (CFClient::Layout self) 797DESTROY (CFClient::Layout self)
751 CODE: 798 CODE:
752 g_object_unref (self->pl); 799 g_object_unref (self->pl);
753 Safefree (self); 800 Safefree (self);
754 801
755int
756is_rgba (CFClient::Layout self)
757 CODE:
758 RETVAL = self->rgba;
759 OUTPUT:
760 RETVAL
761
762void 802void
763set_text (CFClient::Layout self, SV *text_) 803set_text (CFClient::Layout self, SV *text_)
764 CODE: 804 CODE:
765{ 805{
766 STRLEN textlen; 806 STRLEN textlen;
777 char *text = SvPVutf8 (text_, textlen); 817 char *text = SvPVutf8 (text_, textlen);
778 818
779 pango_layout_set_markup (self->pl, text, textlen); 819 pango_layout_set_markup (self->pl, text, textlen);
780} 820}
781 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
782SV * 906SV *
783get_text (CFClient::Layout self) 907get_text (CFClient::Layout self)
784 CODE: 908 CODE:
785 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786 SvUTF8_on (RETVAL); 910 sv_utf8_decode (RETVAL);
787 OUTPUT: 911 OUTPUT:
788 RETVAL 912 RETVAL
789 913
790void 914void
791set_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.)
855 PUSHs (sv_2mortal (newSViv (w))); 979 PUSHs (sv_2mortal (newSViv (w)));
856 PUSHs (sv_2mortal (newSViv (h))); 980 PUSHs (sv_2mortal (newSViv (h)));
857} 981}
858 982
859int 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
860xy_to_index (CFClient::Layout self, int x, int y) 996xy_to_index (CFClient::Layout self, int x, int y)
861 CODE: 997 CODE:
862{ 998{
863 int index, trailing; 999 int index, trailing;
864 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);
879 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881} 1017}
882 1018
883void 1019void
884render (CFClient::Layout self) 1020render (CFClient::Layout self, float x, float y)
885 PPCODE: 1021 PPCODE:
886{ 1022 pango_opengl_render_layout_subpixel (
887 SV *retval; 1023 self->pl,
888 int w, h; 1024 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a
1026 );
889 1027
890 layout_get_pixel_size (self, &w, &h); 1028MODULE = CFClient PACKAGE = CFClient::Texture
891 1029
892 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)
893 { 1038 {
894 cairo_surface_t *surface; 1039 int nw = minpot (ow);
895 cairo_t *cairo; 1040 int nh = minpot (oh);
896 1041
897 retval = newSV (w * h * 4); 1042 if (nw != ow || nh != oh)
898 SvPOK_only (retval);
899 SvCUR_set (retval, w * h * 4);
900
901 memset (SvPVX (retval), 0, w * h * 4);
902
903 surface = cairo_image_surface_create_for_data (
904 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
905 cairo = cairo_create (surface);
906 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908 pango_cairo_show_layout (cairo, self->pl);
909
910 cairo_destroy (cairo);
911 cairo_surface_destroy (surface);
912
913 // what a mess, and its premultiplied, too :(
914 { 1043 {
915 uint32_t *p = (uint32_t *)SvPVX (retval); 1044 if (SvOK (data_))
916 uint32_t *e = p + w * h;
917
918 while (p < e)
919 { 1045 {
920 uint32_t rgba = *p; 1046 STRLEN datalen;
921 rgba = (rgba >> 24) | (rgba << 8); 1047 char *data = SvPVbyte (data_, datalen);
922#if 0 1048 int bpp = datalen / (ow * oh);
923#ifdef _WIN32 1049 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
924 {//D
925 uint8_t r = rgba >> 24;
926 uint8_t g = rgba >> 16;
927 uint8_t b = rgba >> 8;
928 uint8_t a = rgba >> 0;
929 1050
930 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_);
931 } 1059 }
932#endif 1060
933#endif 1061 sv_setiv (w_, nw);
934 rgba = SDL_SwapBE32 (rgba); 1062 sv_setiv (h_, nh);
935 *p++ = rgba;
936 } 1063 }
937 }
938
939 EXTEND (SP, 5);
940 PUSHs (sv_2mortal (newSViv (w)));
941 PUSHs (sv_2mortal (newSViv (h)));
942 PUSHs (sv_2mortal (retval));
943 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945 } 1064 }
946 else
947 {
948 FT_Bitmap bitmap;
949
950 retval = newSV (w * h);
951 SvPOK_only (retval);
952 SvCUR_set (retval, w * h);
953
954 bitmap.rows = h;
955 bitmap.width = w;
956 bitmap.pitch = w;
957 bitmap.buffer = (unsigned char*)SvPVX (retval);
958 bitmap.num_grays = 256;
959 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
960
961 memset (bitmap.buffer, 0, w * h);
962
963 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
964
965 EXTEND (SP, 5);
966 PUSHs (sv_2mortal (newSViv (w)));
967 PUSHs (sv_2mortal (newSViv (h)));
968 PUSHs (sv_2mortal (retval));
969 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971 }
972} 1065}
973 1066
974MODULE = CFClient PACKAGE = CFClient::Texture
975
976void 1067void
977draw_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.)
978 PROTOTYPE: $$$;$$ 1069 PROTOTYPE: $$$;$$
979 ALIAS: 1070 ALIAS:
980 draw_quad_alpha = 1 1071 draw_quad_alpha = 1
981 draw_quad_alpha_premultiplied = 2 1072 draw_quad_alpha_premultiplied = 2
982 CODE: 1073 CODE:
1047DESTROY (CFClient::Map self) 1138DESTROY (CFClient::Map self)
1048 CODE: 1139 CODE:
1049{ 1140{
1050 map_clear (self); 1141 map_clear (self);
1051 Safefree (self->face); 1142 Safefree (self->face);
1143 Safefree (self->tex);
1052 Safefree (self); 1144 Safefree (self);
1053} 1145}
1054 1146
1055void 1147void
1056clear (CFClient::Map self) 1148clear (CFClient::Map self)
1162 1254
1163 while (data < data_end) 1255 while (data < data_end)
1164 { 1256 {
1165 flags = (data [0] << 8) + data [1]; data += 2; 1257 flags = (data [0] << 8) + data [1]; data += 2;
1166 1258
1167 x = ((flags >> 10) & 63) + self->x; 1259 x = self->x + ((flags >> 10) & 63);
1168 y = ((flags >> 4) & 63) + self->y; 1260 y = self->y + ((flags >> 4) & 63);
1169 1261
1170 cell = map_get_cell (self, x, y); 1262 cell = map_get_cell (self, x, y);
1171 1263
1172 if (flags & 15) 1264 if (flags & 15)
1173 { 1265 {
1263 OUTPUT: 1355 OUTPUT:
1264 RETVAL 1356 RETVAL
1265 1357
1266void 1358void
1267draw (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)
1268 PPCODE: 1360 CODE:
1269{ 1361{
1270 int vx, vy; 1362 int vx, vy;
1271 int x, y, z; 1363 int x, y, z;
1272 int last_name; 1364 int last_name;
1273 mapface face; 1365 mapface face;
1274 int sw4 = (sw + 3) & ~3;
1275 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1276 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1277 1366
1278 memset (darkness, 255, sw4 * sh);
1279 SvPOK_only (darkness_sv);
1280 SvCUR_set (darkness_sv, sw4 * sh);
1281
1282 vx = self->x + (self->w - sw) / 2 - shift_x; 1367 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1283 vy = self->y + (self->h - sh) / 2 - shift_y; 1368 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1284 1369
1285 /* 1370 /*
1286 int vx = self->vx = self->w >= sw 1371 int vx = self->vx = self->w >= sw
1287 ? self->x + (self->w - sw) / 2 1372 ? self->x + (self->w - sw) / 2
1288 : 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));
1292 : 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));
1293 */ 1378 */
1294 1379
1295 glColor4ub (255, 255, 255, 255); 1380 glColor4ub (255, 255, 255, 255);
1296 1381
1382 glEnable (GL_BLEND);
1297 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298 glEnable (GL_BLEND);
1299 glEnable (GL_TEXTURE_2D); 1384 glEnable (GL_TEXTURE_2D);
1300 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1385 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301 1386
1302 glBegin (GL_QUADS); 1387 glBegin (GL_QUADS);
1303 1388
1311 1396
1312 for (x = 0; x < sw; x++) 1397 for (x = 0; x < sw; x++)
1313 if (row->c0 <= x + vx && x + vx < row->c1) 1398 if (row->c0 <= x + vx && x + vx < row->c1)
1314 { 1399 {
1315 mapcell *cell = row->col + (x + vx - row->c0); 1400 mapcell *cell = row->col + (x + vx - row->c0);
1316
1317 darkness[y * sw4 + x] = cell->darkness < 0
1318 ? 255 - FOW_DARKNESS
1319 : 255 - cell->darkness;
1320 1401
1321 face = cell->face [z]; 1402 face = cell->face [z];
1322 1403
1323 if (face) 1404 if (face)
1324 { 1405 {
1345 1426
1346 glEnd (); 1427 glEnd ();
1347 1428
1348 glDisable (GL_TEXTURE_2D); 1429 glDisable (GL_TEXTURE_2D);
1349 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 }
1350 1525
1351 EXTEND (SP, 3); 1526 EXTEND (SP, 3);
1352 PUSHs (sv_2mortal (newSViv (sw4))); 1527 PUSHs (sv_2mortal (newSViv (sw4)));
1353 PUSHs (sv_2mortal (newSViv (sh))); 1528 PUSHs (sv_2mortal (newSViv (sh)));
1354 PUSHs (darkness_sv); 1529 PUSHs (darkness_sv);
1561 const_iv (GL_SCISSOR_TEST), 1736 const_iv (GL_SCISSOR_TEST),
1562 const_iv (GL_DEPTH_TEST), 1737 const_iv (GL_DEPTH_TEST),
1563 const_iv (GL_ALPHA_TEST), 1738 const_iv (GL_ALPHA_TEST),
1564 const_iv (GL_NORMALIZE), 1739 const_iv (GL_NORMALIZE),
1565 const_iv (GL_RESCALE_NORMAL), 1740 const_iv (GL_RESCALE_NORMAL),
1741 const_iv (GL_FRONT),
1742 const_iv (GL_BACK),
1566 const_iv (GL_AND), 1743 const_iv (GL_AND),
1567 const_iv (GL_ONE), 1744 const_iv (GL_ONE),
1568 const_iv (GL_ZERO), 1745 const_iv (GL_ZERO),
1569 const_iv (GL_SRC_ALPHA), 1746 const_iv (GL_SRC_ALPHA),
1570 const_iv (GL_DST_ALPHA), 1747 const_iv (GL_DST_ALPHA),
1571 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1748 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572 const_iv (GL_ONE_MINUS_DST_ALPHA), 1749 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE), 1750 const_iv (GL_SRC_ALPHA_SATURATE),
1574 const_iv (GL_RGB), 1751 const_iv (GL_RGB),
1575 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),
1576 const_iv (GL_UNSIGNED_BYTE), 1756 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT), 1757 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT), 1758 const_iv (GL_UNSIGNED_INT),
1579 const_iv (GL_ALPHA), 1759 const_iv (GL_ALPHA),
1580 const_iv (GL_INTENSITY), 1760 const_iv (GL_INTENSITY),
1654 OUTPUT: 1834 OUTPUT:
1655 RETVAL 1835 RETVAL
1656 1836
1657int glGetError () 1837int glGetError ()
1658 1838
1839void glFinish ()
1840
1659void glClear (int mask) 1841void glClear (int mask)
1660 1842
1661void glClearColor (float r, float g, float b, float a = 1.0) 1843void glClearColor (float r, float g, float b, float a = 1.0)
1662 PROTOTYPE: @ 1844 PROTOTYPE: @
1663 1845
1686void glPushMatrix () 1868void glPushMatrix ()
1687 1869
1688void glPopMatrix () 1870void glPopMatrix ()
1689 1871
1690void glLoadIdentity () 1872void glLoadIdentity ()
1873
1874void glDrawBuffer (int buffer)
1875
1876void glReadBuffer (int buffer)
1691 1877
1692# near_ and far_ are due to microsofts buggy "c" compiler 1878# near_ and far_ are due to microsofts buggy "c" compiler
1693void 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_)
1694 1880
1695# 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