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.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);
123#ifdef FC_HINT_STYLE
91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1); 124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 126 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93} 127}
94 128
95static void 129static void
96layout_update_font (CFClient__Layout self) 130layout_update_font (CFClient__Layout self)
293 ev.code = 1; 327 ev.code = 1;
294 ev.data1 = (void *)(long)channel; 328 ev.data1 = (void *)(long)channel;
295 ev.data2 = 0; 329 ev.data2 = 0;
296 330
297 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;
298} 349}
299 350
300MODULE = CFClient PACKAGE = CFClient 351MODULE = CFClient PACKAGE = CFClient
301 352
302PROTOTYPES: ENABLE 353PROTOTYPES: ENABLE
412 463
413 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; )
414 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415} 466}
416 467
468NV floor (NV x)
469
470NV ceil (NV x)
471
417void 472void
418pango_init () 473pango_init ()
419 CODE: 474 CODE:
420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{ 475{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 476 opengl_fontmap = pango_opengl_font_map_new ();
424 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);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 478 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} 479}
439 480
440int 481int
441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442 483
443void 484void
444SDL_Quit () 485SDL_Quit ()
445 486
446void 487void
453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456 497
457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459 500
460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 625
585void 626void
586add_font (char *file) 627add_font (char *file)
587 CODE: 628 CODE:
588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 629 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 630
594void 631void
595load_image_inline (SV *image_) 632load_image_inline (SV *image_)
596 ALIAS: 633 ALIAS:
597 load_image_file = 1 634 load_image_file = 1
693 CODE: 730 CODE:
694 fprintf (stderr, "FATAL: %s\n", message); 731 fprintf (stderr, "FATAL: %s\n", message);
695#ifdef _WIN32 732#ifdef _WIN32
696 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697#endif 734#endif
698 exit (1); 735 _exit (1);
736
737void
738_exit (int retval)
739 CODE:
740 _exit (retval);
699 741
700MODULE = CFClient PACKAGE = CFClient::Font 742MODULE = CFClient PACKAGE = CFClient::Font
701 743
702CFClient::Font 744CFClient::Font
703new_from_file (SV *class, char *path, int id = 0) 745new_from_file (SV *class, char *path, int id = 0)
721 CODE: 763 CODE:
722 default_font = self; 764 default_font = self;
723 765
724MODULE = CFClient PACKAGE = CFClient::Layout 766MODULE = CFClient PACKAGE = CFClient::Layout
725 767
768void
769clear_font_cache ()
770 CODE:
771 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
772 tc_clear ();
773
726CFClient::Layout 774CFClient::Layout
727new (SV *class, int rgba = 0) 775new (SV *class, int type = 0)
728 CODE: 776 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); 777 New (0, RETVAL, 1, struct cf_layout);
734 778
735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 779 RETVAL->pl = pango_layout_new (opengl_context);
736 RETVAL->rgba = rgba;
737 RETVAL->r = 1.; 780 RETVAL->r = 1.;
738 RETVAL->g = 1.; 781 RETVAL->g = 1.;
739 RETVAL->b = 1.; 782 RETVAL->b = 1.;
740 RETVAL->a = 1.; 783 RETVAL->a = 1.;
741 RETVAL->base_height = MIN_FONT_HEIGHT; 784 RETVAL->base_height = MIN_FONT_HEIGHT;
750DESTROY (CFClient::Layout self) 793DESTROY (CFClient::Layout self)
751 CODE: 794 CODE:
752 g_object_unref (self->pl); 795 g_object_unref (self->pl);
753 Safefree (self); 796 Safefree (self);
754 797
755int
756is_rgba (CFClient::Layout self)
757 CODE:
758 RETVAL = self->rgba;
759 OUTPUT:
760 RETVAL
761
762void 798void
763set_text (CFClient::Layout self, SV *text_) 799set_text (CFClient::Layout self, SV *text_)
764 CODE: 800 CODE:
765{ 801{
766 STRLEN textlen; 802 STRLEN textlen;
777 char *text = SvPVutf8 (text_, textlen); 813 char *text = SvPVutf8 (text_, textlen);
778 814
779 pango_layout_set_markup (self->pl, text, textlen); 815 pango_layout_set_markup (self->pl, text, textlen);
780} 816}
781 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
782SV * 902SV *
783get_text (CFClient::Layout self) 903get_text (CFClient::Layout self)
784 CODE: 904 CODE:
785 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 905 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786 SvUTF8_on (RETVAL); 906 sv_utf8_decode (RETVAL);
787 OUTPUT: 907 OUTPUT:
788 RETVAL 908 RETVAL
789 909
790void 910void
791set_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.)
855 PUSHs (sv_2mortal (newSViv (w))); 975 PUSHs (sv_2mortal (newSViv (w)));
856 PUSHs (sv_2mortal (newSViv (h))); 976 PUSHs (sv_2mortal (newSViv (h)));
857} 977}
858 978
859int 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
860xy_to_index (CFClient::Layout self, int x, int y) 992xy_to_index (CFClient::Layout self, int x, int y)
861 CODE: 993 CODE:
862{ 994{
863 int index, trailing; 995 int index, trailing;
864 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);
879 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1011 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1012 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881} 1013}
882 1014
883void 1015void
884render (CFClient::Layout self) 1016render (CFClient::Layout self, float x, float y)
885 PPCODE: 1017 PPCODE:
886{ 1018 pango_opengl_render_layout_subpixel (
887 SV *retval; 1019 self->pl,
888 int w, h; 1020 x * PANGO_SCALE, y * PANGO_SCALE,
1021 self->r, self->g, self->b, self->a
1022 );
889 1023
890 layout_get_pixel_size (self, &w, &h); 1024MODULE = CFClient PACKAGE = CFClient::Texture
891 1025
892 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)
893 { 1034 {
894 cairo_surface_t *surface; 1035 int nw = minpot (ow);
895 cairo_t *cairo; 1036 int nh = minpot (oh);
896 1037
897 retval = newSV (w * h * 4); 1038 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 { 1039 {
915 uint32_t *p = (uint32_t *)SvPVX (retval); 1040 if (SvOK (data_))
916 uint32_t *e = p + w * h;
917
918 while (p < e)
919 { 1041 {
920 uint32_t rgba = *p; 1042 STRLEN datalen;
921 rgba = (rgba >> 24) | (rgba << 8); 1043 char *data = SvPVbyte (data_, datalen);
922#if 0 1044 int bpp = datalen / (ow * oh);
923#ifdef _WIN32 1045 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 1046
930 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_);
931 } 1055 }
932#endif 1056
933#endif 1057 sv_setiv (w_, nw);
934 rgba = SDL_SwapBE32 (rgba); 1058 sv_setiv (h_, nh);
935 *p++ = rgba;
936 } 1059 }
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 } 1060 }
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} 1061}
973 1062
974MODULE = CFClient PACKAGE = CFClient::Texture
975
976void 1063void
977draw_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.)
978 PROTOTYPE: $$$;$$ 1065 PROTOTYPE: $$$;$$
979 ALIAS: 1066 ALIAS:
980 draw_quad_alpha = 1 1067 draw_quad_alpha = 1
981 draw_quad_alpha_premultiplied = 2 1068 draw_quad_alpha_premultiplied = 2
982 CODE: 1069 CODE:
1047DESTROY (CFClient::Map self) 1134DESTROY (CFClient::Map self)
1048 CODE: 1135 CODE:
1049{ 1136{
1050 map_clear (self); 1137 map_clear (self);
1051 Safefree (self->face); 1138 Safefree (self->face);
1139 Safefree (self->tex);
1052 Safefree (self); 1140 Safefree (self);
1053} 1141}
1054 1142
1055void 1143void
1056clear (CFClient::Map self) 1144clear (CFClient::Map self)
1162 1250
1163 while (data < data_end) 1251 while (data < data_end)
1164 { 1252 {
1165 flags = (data [0] << 8) + data [1]; data += 2; 1253 flags = (data [0] << 8) + data [1]; data += 2;
1166 1254
1167 x = ((flags >> 10) & 63) + self->x; 1255 x = self->x + ((flags >> 10) & 63);
1168 y = ((flags >> 4) & 63) + self->y; 1256 y = self->y + ((flags >> 4) & 63);
1169 1257
1170 cell = map_get_cell (self, x, y); 1258 cell = map_get_cell (self, x, y);
1171 1259
1172 if (flags & 15) 1260 if (flags & 15)
1173 { 1261 {
1263 OUTPUT: 1351 OUTPUT:
1264 RETVAL 1352 RETVAL
1265 1353
1266void 1354void
1267draw (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)
1268 PPCODE: 1356 CODE:
1269{ 1357{
1270 int vx, vy; 1358 int vx, vy;
1271 int x, y, z; 1359 int x, y, z;
1272 int last_name; 1360 int last_name;
1273 mapface face; 1361 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 1362
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; 1363 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1283 vy = self->y + (self->h - sh) / 2 - shift_y; 1364 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1284 1365
1285 /* 1366 /*
1286 int vx = self->vx = self->w >= sw 1367 int vx = self->vx = self->w >= sw
1287 ? self->x + (self->w - sw) / 2 1368 ? self->x + (self->w - sw) / 2
1288 : 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));
1292 : 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));
1293 */ 1374 */
1294 1375
1295 glColor4ub (255, 255, 255, 255); 1376 glColor4ub (255, 255, 255, 255);
1296 1377
1378 glEnable (GL_BLEND);
1297 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298 glEnable (GL_BLEND);
1299 glEnable (GL_TEXTURE_2D); 1380 glEnable (GL_TEXTURE_2D);
1300 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1381 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301 1382
1302 glBegin (GL_QUADS); 1383 glBegin (GL_QUADS);
1303 1384
1311 1392
1312 for (x = 0; x < sw; x++) 1393 for (x = 0; x < sw; x++)
1313 if (row->c0 <= x + vx && x + vx < row->c1) 1394 if (row->c0 <= x + vx && x + vx < row->c1)
1314 { 1395 {
1315 mapcell *cell = row->col + (x + vx - row->c0); 1396 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 1397
1321 face = cell->face [z]; 1398 face = cell->face [z];
1322 1399
1323 if (face) 1400 if (face)
1324 { 1401 {
1345 1422
1346 glEnd (); 1423 glEnd ();
1347 1424
1348 glDisable (GL_TEXTURE_2D); 1425 glDisable (GL_TEXTURE_2D);
1349 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 }
1350 1521
1351 EXTEND (SP, 3); 1522 EXTEND (SP, 3);
1352 PUSHs (sv_2mortal (newSViv (sw4))); 1523 PUSHs (sv_2mortal (newSViv (sw4)));
1353 PUSHs (sv_2mortal (newSViv (sh))); 1524 PUSHs (sv_2mortal (newSViv (sh)));
1354 PUSHs (darkness_sv); 1525 PUSHs (darkness_sv);
1561 const_iv (GL_SCISSOR_TEST), 1732 const_iv (GL_SCISSOR_TEST),
1562 const_iv (GL_DEPTH_TEST), 1733 const_iv (GL_DEPTH_TEST),
1563 const_iv (GL_ALPHA_TEST), 1734 const_iv (GL_ALPHA_TEST),
1564 const_iv (GL_NORMALIZE), 1735 const_iv (GL_NORMALIZE),
1565 const_iv (GL_RESCALE_NORMAL), 1736 const_iv (GL_RESCALE_NORMAL),
1737 const_iv (GL_FRONT),
1738 const_iv (GL_BACK),
1566 const_iv (GL_AND), 1739 const_iv (GL_AND),
1567 const_iv (GL_ONE), 1740 const_iv (GL_ONE),
1568 const_iv (GL_ZERO), 1741 const_iv (GL_ZERO),
1569 const_iv (GL_SRC_ALPHA), 1742 const_iv (GL_SRC_ALPHA),
1570 const_iv (GL_DST_ALPHA), 1743 const_iv (GL_DST_ALPHA),
1571 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1744 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572 const_iv (GL_ONE_MINUS_DST_ALPHA), 1745 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE), 1746 const_iv (GL_SRC_ALPHA_SATURATE),
1574 const_iv (GL_RGB), 1747 const_iv (GL_RGB),
1575 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),
1576 const_iv (GL_UNSIGNED_BYTE), 1752 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT), 1753 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT), 1754 const_iv (GL_UNSIGNED_INT),
1579 const_iv (GL_ALPHA), 1755 const_iv (GL_ALPHA),
1580 const_iv (GL_INTENSITY), 1756 const_iv (GL_INTENSITY),
1654 OUTPUT: 1830 OUTPUT:
1655 RETVAL 1831 RETVAL
1656 1832
1657int glGetError () 1833int glGetError ()
1658 1834
1835void glFinish ()
1836
1659void glClear (int mask) 1837void glClear (int mask)
1660 1838
1661void glClearColor (float r, float g, float b, float a = 1.0) 1839void glClearColor (float r, float g, float b, float a = 1.0)
1662 PROTOTYPE: @ 1840 PROTOTYPE: @
1663 1841
1686void glPushMatrix () 1864void glPushMatrix ()
1687 1865
1688void glPopMatrix () 1866void glPopMatrix ()
1689 1867
1690void glLoadIdentity () 1868void glLoadIdentity ()
1869
1870void glDrawBuffer (int buffer)
1871
1872void glReadBuffer (int buffer)
1691 1873
1692# near_ and far_ are due to microsofts buggy "c" compiler 1874# near_ and far_ are due to microsofts buggy "c" compiler
1693void 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_)
1694 1876
1695# 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