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.102 by root, Sat Jun 3 23:47:46 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
52 55
53#define GL_CALL(type,func,args) \ 56#if 1
54 { \ 57# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 58#else
56 static type fptr_; \ 59# define PARACHUTE 0
57 \ 60#endif
58 if (!init_) \ 61
59 { \ 62static struct
60 init_ = 1; \ 63{
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 64#define GL_FUNC(ptr,name) ptr name;
62 } \ 65#include "glfunc.h"
63 \ 66#undef GL_FUNC
64 if (fptr_) \ 67} gl;
65 fptr_ args; \ 68
66 } 69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{
71 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else
76 glBlendFunc (sa, da);
77}
78
79#include "texcache.c"
80
81#include "pango-font.c"
82#include "pango-fontmap.c"
83#include "pango-render.c"
67 84
68typedef Mix_Chunk *CFClient__MixChunk; 85typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 86typedef Mix_Music *CFClient__MixMusic;
70 87
71typedef PangoFontDescription *CFClient__Font; 88typedef PangoFontDescription *CFClient__Font;
72 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
73typedef struct cf_layout { 108typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 109 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 110 float r, g, b, a; // default color for rgba mode
77 int base_height; 111 int base_height;
78 CFClient__Font font; 112 CFClient__Font font;
79} *CFClient__Layout; 113} *CFClient__Layout;
80 114
81static CFClient__Font default_font; 115static CFClient__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 116static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 117static PangoFontMap *opengl_fontmap;
84 118
85static void 119static void
86substitute_func (FcPattern *pattern, gpointer data) 120substitute_func (FcPattern *pattern, gpointer data)
87{ 121{
88 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
89#ifdef _WIN32 126#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else 128#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif 130#endif
294 ev.code = 1; 331 ev.code = 1;
295 ev.data1 = (void *)(long)channel; 332 ev.data1 = (void *)(long)channel;
296 ev.data2 = 0; 333 ev.data2 = 0;
297 334
298 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;
299} 353}
300 354
301MODULE = CFClient PACKAGE = CFClient 355MODULE = CFClient PACKAGE = CFClient
302 356
303PROTOTYPES: ENABLE 357PROTOTYPES: ENABLE
413 467
414 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; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 470}
417 471
472NV floor (NV x)
473
474NV ceil (NV x)
475
418void 476void
419pango_init () 477pango_init ()
420 CODE: 478 CODE:
421{ 479{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
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 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 483}
430 484
431int 485int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 486SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 487
434void 488void
435SDL_Quit () 489SDL_Quit ()
436 490
437void 491void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 498 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 499 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 500 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 501
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 502 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 503 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 504
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 505 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
479SDL_SetVideoMode (int w, int h, int fullscreen) 533SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 534 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 535 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 536 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 537 );
538 if (RETVAL)
539 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 540 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
541# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
542# include "glfunc.h"
543# undef GL_FUNC
544 }
485 OUTPUT: 545 OUTPUT:
486 RETVAL 546 RETVAL
487 547
488void 548void
489SDL_GL_SwapBuffers () 549SDL_GL_SwapBuffers ()
569 629
570void 630void
571add_font (char *file) 631add_font (char *file)
572 CODE: 632 CODE:
573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
574#ifdef _WIN32
575 // cairo... sigh... requires win2000
576 AddFontResourceEx (file, FR_PRIVATE, 0);
577#endif
578 634
579void 635void
580load_image_inline (SV *image_) 636load_image_inline (SV *image_)
581 ALIAS: 637 ALIAS:
582 load_image_file = 1 638 load_image_file = 1
678 CODE: 734 CODE:
679 fprintf (stderr, "FATAL: %s\n", message); 735 fprintf (stderr, "FATAL: %s\n", message);
680#ifdef _WIN32 736#ifdef _WIN32
681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
682#endif 738#endif
683 exit (1); 739 _exit (1);
740
741void
742_exit (int retval)
743 CODE:
744 _exit (retval);
684 745
685MODULE = CFClient PACKAGE = CFClient::Font 746MODULE = CFClient PACKAGE = CFClient::Font
686 747
687CFClient::Font 748CFClient::Font
688new_from_file (SV *class, char *path, int id = 0) 749new_from_file (SV *class, char *path, int id = 0)
706 CODE: 767 CODE:
707 default_font = self; 768 default_font = self;
708 769
709MODULE = CFClient PACKAGE = CFClient::Layout 770MODULE = CFClient PACKAGE = CFClient::Layout
710 771
772void
773clear_font_cache ()
774 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear ();
777
711CFClient::Layout 778CFClient::Layout
712new (SV *class, int rgba = 0) 779new (SV *class, int type = 0)
713 CODE: 780 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
717 New (0, RETVAL, 1, struct cf_layout); 781 New (0, RETVAL, 1, struct cf_layout);
718 782
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 783 RETVAL->pl = pango_layout_new (opengl_context);
720 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 784 RETVAL->r = 1.;
722 RETVAL->g = 1.; 785 RETVAL->g = 1.;
723 RETVAL->b = 1.; 786 RETVAL->b = 1.;
724 RETVAL->a = 1.; 787 RETVAL->a = 1.;
725 RETVAL->base_height = MIN_FONT_HEIGHT; 788 RETVAL->base_height = MIN_FONT_HEIGHT;
734DESTROY (CFClient::Layout self) 797DESTROY (CFClient::Layout self)
735 CODE: 798 CODE:
736 g_object_unref (self->pl); 799 g_object_unref (self->pl);
737 Safefree (self); 800 Safefree (self);
738 801
739int
740is_rgba (CFClient::Layout self)
741 CODE:
742 RETVAL = self->rgba;
743 OUTPUT:
744 RETVAL
745
746void 802void
747set_text (CFClient::Layout self, SV *text_) 803set_text (CFClient::Layout self, SV *text_)
748 CODE: 804 CODE:
749{ 805{
750 STRLEN textlen; 806 STRLEN textlen;
761 char *text = SvPVutf8 (text_, textlen); 817 char *text = SvPVutf8 (text_, textlen);
762 818
763 pango_layout_set_markup (self->pl, text, textlen); 819 pango_layout_set_markup (self->pl, text, textlen);
764} 820}
765 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
766SV * 906SV *
767get_text (CFClient::Layout self) 907get_text (CFClient::Layout self)
768 CODE: 908 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 910 sv_utf8_decode (RETVAL);
771 OUTPUT: 911 OUTPUT:
772 RETVAL 912 RETVAL
773 913
774void 914void
775set_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.)
839 PUSHs (sv_2mortal (newSViv (w))); 979 PUSHs (sv_2mortal (newSViv (w)));
840 PUSHs (sv_2mortal (newSViv (h))); 980 PUSHs (sv_2mortal (newSViv (h)));
841} 981}
842 982
843int 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
844xy_to_index (CFClient::Layout self, int x, int y) 996xy_to_index (CFClient::Layout self, int x, int y)
845 CODE: 997 CODE:
846{ 998{
847 int index, trailing; 999 int index, trailing;
848 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);
863 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865} 1017}
866 1018
867void 1019void
868render (CFClient::Layout self) 1020render (CFClient::Layout self, float x, float y)
869 PPCODE: 1021 PPCODE:
870{ 1022 pango_opengl_render_layout_subpixel (
871 SV *retval; 1023 self->pl,
872 int w, h; 1024 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a
1026 );
873 1027
874 layout_get_pixel_size (self, &w, &h); 1028MODULE = CFClient PACKAGE = CFClient::Texture
875 1029
876 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)
877 { 1038 {
878 cairo_surface_t *surface; 1039 int nw = minpot (ow);
879 cairo_t *cairo; 1040 int nh = minpot (oh);
880 1041
881 retval = newSV (w * h * 4); 1042 if (nw != ow || nh != oh)
882 SvPOK_only (retval);
883 SvCUR_set (retval, w * h * 4);
884
885 memset (SvPVX (retval), 0, w * h * 4);
886
887 surface = cairo_image_surface_create_for_data (
888 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
889 cairo = cairo_create (surface);
890 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
891
892 pango_cairo_show_layout (cairo, self->pl);
893
894 cairo_destroy (cairo);
895 cairo_surface_destroy (surface);
896
897 // what a mess, and its premultiplied, too :(
898 { 1043 {
899 uint32_t *p = (uint32_t *)SvPVX (retval); 1044 if (SvOK (data_))
900 uint32_t *e = p + w * h;
901
902 while (p < e)
903 { 1045 {
904 uint32_t rgba = *p; 1046 STRLEN datalen;
905 rgba = (rgba >> 24) | (rgba << 8); 1047 char *data = SvPVbyte (data_, datalen);
906#if 0 1048 int bpp = datalen / (ow * oh);
907#ifdef _WIN32 1049 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
908 {//D
909 uint8_t r = rgba >> 24;
910 uint8_t g = rgba >> 16;
911 uint8_t b = rgba >> 8;
912 uint8_t a = rgba >> 0;
913 1050
914 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_);
915 } 1059 }
916#endif 1060
917#endif 1061 sv_setiv (w_, nw);
918 rgba = SDL_SwapBE32 (rgba); 1062 sv_setiv (h_, nh);
919 *p++ = rgba;
920 } 1063 }
921 }
922
923 EXTEND (SP, 5);
924 PUSHs (sv_2mortal (newSViv (w)));
925 PUSHs (sv_2mortal (newSViv (h)));
926 PUSHs (sv_2mortal (retval));
927 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
928 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
929 } 1064 }
930 else
931 {
932 FT_Bitmap bitmap;
933
934 retval = newSV (w * h);
935 SvPOK_only (retval);
936 SvCUR_set (retval, w * h);
937
938 bitmap.rows = h;
939 bitmap.width = w;
940 bitmap.pitch = w;
941 bitmap.buffer = (unsigned char*)SvPVX (retval);
942 bitmap.num_grays = 256;
943 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945 memset (bitmap.buffer, 0, w * h);
946
947 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949 EXTEND (SP, 5);
950 PUSHs (sv_2mortal (newSViv (w)));
951 PUSHs (sv_2mortal (newSViv (h)));
952 PUSHs (sv_2mortal (retval));
953 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955 }
956} 1065}
957 1066
958MODULE = CFClient PACKAGE = CFClient::Texture
959
960void 1067void
961draw_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.)
962 PROTOTYPE: $$$;$$ 1069 PROTOTYPE: $$$;$$
963 ALIAS: 1070 ALIAS:
964 draw_quad_alpha = 1 1071 draw_quad_alpha = 1
965 draw_quad_alpha_premultiplied = 2 1072 draw_quad_alpha_premultiplied = 2
966 CODE: 1073 CODE:
977 } 1084 }
978 1085
979 if (ix) 1086 if (ix)
980 { 1087 {
981 glEnable (GL_BLEND); 1088 glEnable (GL_BLEND);
1089
1090 if (ix == 2)
982 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1091 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1092 else
1093 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1094 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1095
983 glEnable (GL_ALPHA_TEST); 1096 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1097 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1098 }
986 1099
987 glBindTexture (GL_TEXTURE_2D, name); 1100 glBindTexture (GL_TEXTURE_2D, name);
1025DESTROY (CFClient::Map self) 1138DESTROY (CFClient::Map self)
1026 CODE: 1139 CODE:
1027{ 1140{
1028 map_clear (self); 1141 map_clear (self);
1029 Safefree (self->face); 1142 Safefree (self->face);
1143 Safefree (self->tex);
1030 Safefree (self); 1144 Safefree (self);
1031} 1145}
1032 1146
1033void 1147void
1034clear (CFClient::Map self) 1148clear (CFClient::Map self)
1140 1254
1141 while (data < data_end) 1255 while (data < data_end)
1142 { 1256 {
1143 flags = (data [0] << 8) + data [1]; data += 2; 1257 flags = (data [0] << 8) + data [1]; data += 2;
1144 1258
1145 x = ((flags >> 10) & 63) + self->x; 1259 x = self->x + ((flags >> 10) & 63);
1146 y = ((flags >> 4) & 63) + self->y; 1260 y = self->y + ((flags >> 4) & 63);
1147 1261
1148 cell = map_get_cell (self, x, y); 1262 cell = map_get_cell (self, x, y);
1149 1263
1150 if (flags & 15) 1264 if (flags & 15)
1151 { 1265 {
1241 OUTPUT: 1355 OUTPUT:
1242 RETVAL 1356 RETVAL
1243 1357
1244void 1358void
1245draw (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)
1246 PPCODE: 1360 CODE:
1247{ 1361{
1248 int vx, vy; 1362 int vx, vy;
1249 int x, y, z; 1363 int x, y, z;
1250 int last_name; 1364 int last_name;
1251 mapface face; 1365 mapface face;
1252 int sw4 = (sw + 3) & ~3;
1253 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1254 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1255 1366
1256 memset (darkness, 255, sw4 * sh);
1257 SvPOK_only (darkness_sv);
1258 SvCUR_set (darkness_sv, sw4 * sh);
1259
1260 vx = self->x + (self->w - sw) / 2 - shift_x; 1367 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1261 vy = self->y + (self->h - sh) / 2 - shift_y; 1368 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1262 1369
1263 /* 1370 /*
1264 int vx = self->vx = self->w >= sw 1371 int vx = self->vx = self->w >= sw
1265 ? self->x + (self->w - sw) / 2 1372 ? self->x + (self->w - sw) / 2
1266 : 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));
1270 : 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));
1271 */ 1378 */
1272 1379
1273 glColor4ub (255, 255, 255, 255); 1380 glColor4ub (255, 255, 255, 255);
1274 1381
1382 glEnable (GL_BLEND);
1275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1276 glEnable (GL_BLEND);
1277 glEnable (GL_TEXTURE_2D); 1384 glEnable (GL_TEXTURE_2D);
1278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1385 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1279 1386
1280 glBegin (GL_QUADS); 1387 glBegin (GL_QUADS);
1281 1388
1289 1396
1290 for (x = 0; x < sw; x++) 1397 for (x = 0; x < sw; x++)
1291 if (row->c0 <= x + vx && x + vx < row->c1) 1398 if (row->c0 <= x + vx && x + vx < row->c1)
1292 { 1399 {
1293 mapcell *cell = row->col + (x + vx - row->c0); 1400 mapcell *cell = row->col + (x + vx - row->c0);
1294
1295 darkness[y * sw4 + x] = cell->darkness < 0
1296 ? 255 - FOW_DARKNESS
1297 : 255 - cell->darkness;
1298 1401
1299 face = cell->face [z]; 1402 face = cell->face [z];
1300 1403
1301 if (face) 1404 if (face)
1302 { 1405 {
1323 1426
1324 glEnd (); 1427 glEnd ();
1325 1428
1326 glDisable (GL_TEXTURE_2D); 1429 glDisable (GL_TEXTURE_2D);
1327 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 }
1328 1525
1329 EXTEND (SP, 3); 1526 EXTEND (SP, 3);
1330 PUSHs (sv_2mortal (newSViv (sw4))); 1527 PUSHs (sv_2mortal (newSViv (sw4)));
1331 PUSHs (sv_2mortal (newSViv (sh))); 1528 PUSHs (sv_2mortal (newSViv (sh)));
1332 PUSHs (darkness_sv); 1529 PUSHs (darkness_sv);
1539 const_iv (GL_SCISSOR_TEST), 1736 const_iv (GL_SCISSOR_TEST),
1540 const_iv (GL_DEPTH_TEST), 1737 const_iv (GL_DEPTH_TEST),
1541 const_iv (GL_ALPHA_TEST), 1738 const_iv (GL_ALPHA_TEST),
1542 const_iv (GL_NORMALIZE), 1739 const_iv (GL_NORMALIZE),
1543 const_iv (GL_RESCALE_NORMAL), 1740 const_iv (GL_RESCALE_NORMAL),
1741 const_iv (GL_FRONT),
1742 const_iv (GL_BACK),
1544 const_iv (GL_AND), 1743 const_iv (GL_AND),
1545 const_iv (GL_ONE), 1744 const_iv (GL_ONE),
1546 const_iv (GL_ZERO), 1745 const_iv (GL_ZERO),
1547 const_iv (GL_SRC_ALPHA), 1746 const_iv (GL_SRC_ALPHA),
1548 const_iv (GL_SRC_ALPHA_SATURATE), 1747 const_iv (GL_DST_ALPHA),
1549 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1748 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1550 const_iv (GL_ONE_MINUS_DST_ALPHA), 1749 const_iv (GL_ONE_MINUS_DST_ALPHA),
1750 const_iv (GL_SRC_ALPHA_SATURATE),
1551 const_iv (GL_RGB), 1751 const_iv (GL_RGB),
1552 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),
1553 const_iv (GL_UNSIGNED_BYTE), 1756 const_iv (GL_UNSIGNED_BYTE),
1554 const_iv (GL_UNSIGNED_SHORT), 1757 const_iv (GL_UNSIGNED_SHORT),
1555 const_iv (GL_UNSIGNED_INT), 1758 const_iv (GL_UNSIGNED_INT),
1556 const_iv (GL_ALPHA), 1759 const_iv (GL_ALPHA),
1557 const_iv (GL_INTENSITY), 1760 const_iv (GL_INTENSITY),
1631 OUTPUT: 1834 OUTPUT:
1632 RETVAL 1835 RETVAL
1633 1836
1634int glGetError () 1837int glGetError ()
1635 1838
1839void glFinish ()
1840
1636void glClear (int mask) 1841void glClear (int mask)
1637 1842
1638void glClearColor (float r, float g, float b, float a = 1.0) 1843void glClearColor (float r, float g, float b, float a = 1.0)
1639 PROTOTYPE: @ 1844 PROTOTYPE: @
1640 1845
1646 1851
1647void glHint (int target, int mode) 1852void glHint (int target, int mode)
1648 1853
1649void glBlendFunc (int sfactor, int dfactor) 1854void glBlendFunc (int sfactor, int dfactor)
1650 1855
1856void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1857 CODE:
1858 gl_BlendFuncSeparate (sa, da, saa, daa);
1859
1651void glDepthMask (int flag) 1860void glDepthMask (int flag)
1652 1861
1653void glLogicOp (int opcode) 1862void glLogicOp (int opcode)
1654 1863
1655void glColorMask (int red, int green, int blue, int alpha) 1864void glColorMask (int red, int green, int blue, int alpha)
1659void glPushMatrix () 1868void glPushMatrix ()
1660 1869
1661void glPopMatrix () 1870void glPopMatrix ()
1662 1871
1663void glLoadIdentity () 1872void glLoadIdentity ()
1873
1874void glDrawBuffer (int buffer)
1875
1876void glReadBuffer (int buffer)
1664 1877
1665# near_ and far_ are due to microsofts buggy "c" compiler 1878# near_ and far_ are due to microsofts buggy "c" compiler
1666void 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_)
1667 1880
1668# near_ and far_ are due to microsofts buggy "c" compiler 1881# near_ and far_ are due to microsofts buggy "c" compiler
1688 1901
1689void glEnd () 1902void glEnd ()
1690 1903
1691void glColor (float r, float g, float b, float a = 1.0) 1904void glColor (float r, float g, float b, float a = 1.0)
1692 PROTOTYPE: @ 1905 PROTOTYPE: @
1906 ALIAS:
1907 glColor_premultiply = 1
1693 CODE: 1908 CODE:
1909 if (ix)
1910 {
1911 r *= a;
1912 g *= a;
1913 b *= a;
1914 }
1694 // microsoft visual "c" rounds instead of truncating... 1915 // microsoft visual "c" rounds instead of truncating...
1695 glColor4ub (MIN ((int)(r * 256.f), 255), 1916 glColor4ub (MIN ((int)(r * 256.f), 255),
1696 MIN ((int)(g * 256.f), 255), 1917 MIN ((int)(g * 256.f), 255),
1697 MIN ((int)(b * 256.f), 255), 1918 MIN ((int)(b * 256.f), 255),
1698 MIN ((int)(a * 256.f), 255)); 1919 MIN ((int)(a * 256.f), 255));
1726 1947
1727void glBindTexture (int target, int name) 1948void glBindTexture (int target, int name)
1728 1949
1729void glConvolutionParameter (int target, int pname, float params) 1950void glConvolutionParameter (int target, int pname, float params)
1730 CODE: 1951 CODE:
1731 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1952 if (gl.ConvolutionParameterf)
1953 gl.ConvolutionParameterf (target, pname, params);
1732 1954
1733void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1955void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1734 CODE: 1956 CODE:
1735 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1957 if (gl.ConvolutionFilter2D)
1736 (target, internalformat, width, height, format, type, data)); 1958 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1737 1959
1738void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1960void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1739 CODE: 1961 CODE:
1740 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1962 if (gl.SeparableFilter2D)
1741 (target, internalformat, width, height, format, type, row, column)); 1963 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1742 1964
1743void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1965void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1744 1966
1745void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1967void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1746 1968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines