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.95 by root, Wed May 24 01:46:53 2006 UTC vs.
Revision 1.126 by root, Tue Jul 4 23:56:34 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);
89#ifdef _WIN32 123#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 125#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 126 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 127}
95 128
96static void 129static void
97layout_update_font (CFClient__Layout self) 130layout_update_font (CFClient__Layout self)
98{ 131{
294 ev.code = 1; 327 ev.code = 1;
295 ev.data1 = (void *)(long)channel; 328 ev.data1 = (void *)(long)channel;
296 ev.data2 = 0; 329 ev.data2 = 0;
297 330
298 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;
299} 349}
300 350
301MODULE = CFClient PACKAGE = CFClient 351MODULE = CFClient PACKAGE = CFClient
302 352
303PROTOTYPES: ENABLE 353PROTOTYPES: ENABLE
413 463
414 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; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 466}
417 467
468NV floor (NV x)
469
470NV ceil (NV x)
471
418void 472void
419pango_init () 473pango_init ()
420 CODE: 474 CODE:
421{ 475{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
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 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 479}
430 480
431int 481int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 483
434void 484void
435SDL_Quit () 485SDL_Quit ()
436 486
437void 487void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 497
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 500
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
479SDL_SetVideoMode (int w, int h, int fullscreen) 529SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 530 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 531 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 533 );
534 if (RETVAL)
535 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h"
539# undef GL_FUNC
540 }
485 OUTPUT: 541 OUTPUT:
486 RETVAL 542 RETVAL
487 543
488void 544void
489SDL_GL_SwapBuffers () 545SDL_GL_SwapBuffers ()
565 CODE: 621 CODE:
566#ifndef _WIN32 622#ifndef _WIN32
567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568#endif 624#endif
569 625
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_version ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_VERSION);
581 OUTPUT:
582 RETVAL
583
584char *
585gl_extensions ()
586 CODE:
587 RETVAL = (char *)glGetString (GL_EXTENSIONS);
588 OUTPUT:
589 RETVAL
590
591void 626void
592add_font (char *file) 627add_font (char *file)
593 CODE: 628 CODE:
594 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
595#ifdef _WIN32
596 // cairo... sigh... requires win2000
597 AddFontResourceEx (file, FR_PRIVATE, 0);
598#endif
599 630
600void 631void
601load_image_inline (SV *image_) 632load_image_inline (SV *image_)
602 ALIAS: 633 ALIAS:
603 load_image_file = 1 634 load_image_file = 1
699 CODE: 730 CODE:
700 fprintf (stderr, "FATAL: %s\n", message); 731 fprintf (stderr, "FATAL: %s\n", message);
701#ifdef _WIN32 732#ifdef _WIN32
702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
703#endif 734#endif
704 exit (1); 735 _exit (1);
736
737void
738_exit (int retval)
739 CODE:
740 _exit (retval);
705 741
706MODULE = CFClient PACKAGE = CFClient::Font 742MODULE = CFClient PACKAGE = CFClient::Font
707 743
708CFClient::Font 744CFClient::Font
709new_from_file (SV *class, char *path, int id = 0) 745new_from_file (SV *class, char *path, int id = 0)
727 CODE: 763 CODE:
728 default_font = self; 764 default_font = self;
729 765
730MODULE = CFClient PACKAGE = CFClient::Layout 766MODULE = CFClient PACKAGE = CFClient::Layout
731 767
768void
769clear_font_cache ()
770 CODE:
771 tc_clear ();
772
732CFClient::Layout 773CFClient::Layout
733new (SV *class, int rgba = 0) 774new (SV *class, int type = 0)
734 CODE: 775 CODE:
735#if _WIN32
736 rgba = 0;//D
737#endif
738 New (0, RETVAL, 1, struct cf_layout); 776 New (0, RETVAL, 1, struct cf_layout);
739 777
740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 778 RETVAL->pl = pango_layout_new (opengl_context);
741 RETVAL->rgba = rgba;
742 RETVAL->r = 1.; 779 RETVAL->r = 1.;
743 RETVAL->g = 1.; 780 RETVAL->g = 1.;
744 RETVAL->b = 1.; 781 RETVAL->b = 1.;
745 RETVAL->a = 1.; 782 RETVAL->a = 1.;
746 RETVAL->base_height = MIN_FONT_HEIGHT; 783 RETVAL->base_height = MIN_FONT_HEIGHT;
755DESTROY (CFClient::Layout self) 792DESTROY (CFClient::Layout self)
756 CODE: 793 CODE:
757 g_object_unref (self->pl); 794 g_object_unref (self->pl);
758 Safefree (self); 795 Safefree (self);
759 796
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
767void 797void
768set_text (CFClient::Layout self, SV *text_) 798set_text (CFClient::Layout self, SV *text_)
769 CODE: 799 CODE:
770{ 800{
771 STRLEN textlen; 801 STRLEN textlen;
782 char *text = SvPVutf8 (text_, textlen); 812 char *text = SvPVutf8 (text_, textlen);
783 813
784 pango_layout_set_markup (self->pl, text, textlen); 814 pango_layout_set_markup (self->pl, text, textlen);
785} 815}
786 816
817void
818set_shapes (CFClient::Layout self, ...)
819 CODE:
820{
821 PangoAttrList *attrs = 0;
822 const char *text = pango_layout_get_text (self->pl);
823 const char *pos = text;
824 int arg = 4;
825
826 while (arg < items && (pos = strstr (pos, OBJ_STR)))
827 {
828 PangoRectangle inkrect, rect;
829 PangoAttribute *attr;
830
831 int x = SvIV (ST (arg - 3));
832 int y = SvIV (ST (arg - 2));
833 int w = SvIV (ST (arg - 1));
834 int h = SvIV (ST (arg ));
835
836 inkrect.x = 0;
837 inkrect.y = 0;
838 inkrect.width = 0;
839 inkrect.height = 0;
840
841 rect.x = x * PANGO_SCALE;
842 rect.y = y * PANGO_SCALE;
843 rect.width = w * PANGO_SCALE;
844 rect.height = h * PANGO_SCALE;
845
846 if (!attrs)
847 attrs = pango_layout_get_attributes (self->pl);
848
849 attr = pango_attr_shape_new (&inkrect, &rect);
850 attr->start_index = pos - text;
851 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
852 pango_attr_list_insert (attrs, attr);
853
854 arg += 4;
855 pos += sizeof (OBJ_STR) - 1;
856 }
857
858 if (attrs)
859 pango_layout_set_attributes (self->pl, attrs);
860}
861
862void
863get_shapes (CFClient::Layout self)
864 PPCODE:
865{
866 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867
868 do
869 {
870 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
871
872 if (run && shape_attr_p (run))
873 {
874 PangoRectangle extents;
875 pango_layout_iter_get_run_extents (iter, 0, &extents);
876
877 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879 }
880 }
881 while (pango_layout_iter_next_run (iter));
882
883 pango_layout_iter_free (iter);
884}
885
886int
887has_wrapped (CFClient::Layout self)
888 CODE:
889{
890 int lines = 1;
891 const char *text = pango_layout_get_text (self->pl);
892
893 while (*text)
894 lines += *text++ == '\n';
895
896 RETVAL = lines < pango_layout_get_line_count (self->pl);
897}
898 OUTPUT:
899 RETVAL
900
787SV * 901SV *
788get_text (CFClient::Layout self) 902get_text (CFClient::Layout self)
789 CODE: 903 CODE:
790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 904 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791 SvUTF8_on (RETVAL); 905 sv_utf8_decode (RETVAL);
792 OUTPUT: 906 OUTPUT:
793 RETVAL 907 RETVAL
794 908
795void 909void
796set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 910set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
860 PUSHs (sv_2mortal (newSViv (w))); 974 PUSHs (sv_2mortal (newSViv (w)));
861 PUSHs (sv_2mortal (newSViv (h))); 975 PUSHs (sv_2mortal (newSViv (h)));
862} 976}
863 977
864int 978int
979descent (CFClient::Layout self)
980 CODE:
981{
982 PangoRectangle rect;
983 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
984 pango_layout_line_get_pixel_extents (line, 0, &rect);
985 RETVAL = PANGO_DESCENT (rect);
986}
987 OUTPUT:
988 RETVAL
989
990int
865xy_to_index (CFClient::Layout self, int x, int y) 991xy_to_index (CFClient::Layout self, int x, int y)
866 CODE: 992 CODE:
867{ 993{
868 int index, trailing; 994 int index, trailing;
869 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
884 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886} 1012}
887 1013
888void 1014void
889render (CFClient::Layout self) 1015render (CFClient::Layout self, float x, float y)
890 PPCODE: 1016 PPCODE:
891{ 1017 pango_opengl_render_layout_subpixel (
892 SV *retval; 1018 self->pl,
893 int w, h; 1019 x * PANGO_SCALE, y * PANGO_SCALE,
1020 self->r, self->g, self->b, self->a
1021 );
894 1022
895 layout_get_pixel_size (self, &w, &h); 1023MODULE = CFClient PACKAGE = CFClient::Texture
896 1024
897 if (self->rgba) 1025void
1026pad2pot (SV *data_, SV *w_, SV *h_)
1027 CODE:
1028{
1029 int ow = SvIV (w_);
1030 int oh = SvIV (h_);
1031
1032 if (ow && oh)
898 { 1033 {
899 cairo_surface_t *surface; 1034 int nw = minpot (ow);
900 cairo_t *cairo; 1035 int nh = minpot (oh);
901 1036
902 retval = newSV (w * h * 4); 1037 if (nw != ow || nh != oh)
903 SvPOK_only (retval);
904 SvCUR_set (retval, w * h * 4);
905
906 memset (SvPVX (retval), 0, w * h * 4);
907
908 surface = cairo_image_surface_create_for_data (
909 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
910 cairo = cairo_create (surface);
911 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913 pango_cairo_show_layout (cairo, self->pl);
914
915 cairo_destroy (cairo);
916 cairo_surface_destroy (surface);
917
918 // what a mess, and its premultiplied, too :(
919 { 1038 {
920 uint32_t *p = (uint32_t *)SvPVX (retval); 1039 if (SvOK (data_))
921 uint32_t *e = p + w * h;
922
923 while (p < e)
924 { 1040 {
925 uint32_t rgba = *p; 1041 STRLEN datalen;
926 rgba = (rgba >> 24) | (rgba << 8); 1042 char *data = SvPVbyte (data_, datalen);
927#if 0 1043 int bpp = datalen / (ow * oh);
928#ifdef _WIN32 1044 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934 1045
935 rgba = (rgba & 0xffffff00) | a; 1046 SvPOK_only (result_);
1047 SvCUR_set (result_, nw * nh * bpp);
1048
1049 memset (SvPVX (result_), 0, nw * nh * bpp);
1050 while (oh--)
1051 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1052
1053 sv_setsv (data_, result_);
936 } 1054 }
937#endif 1055
938#endif 1056 sv_setiv (w_, nw);
939 rgba = SDL_SwapBE32 (rgba); 1057 sv_setiv (h_, nh);
940 *p++ = rgba;
941 } 1058 }
942 }
943
944 EXTEND (SP, 5);
945 PUSHs (sv_2mortal (newSViv (w)));
946 PUSHs (sv_2mortal (newSViv (h)));
947 PUSHs (sv_2mortal (retval));
948 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 } 1059 }
951 else
952 {
953 FT_Bitmap bitmap;
954
955 retval = newSV (w * h);
956 SvPOK_only (retval);
957 SvCUR_set (retval, w * h);
958
959 bitmap.rows = h;
960 bitmap.width = w;
961 bitmap.pitch = w;
962 bitmap.buffer = (unsigned char*)SvPVX (retval);
963 bitmap.num_grays = 256;
964 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966 memset (bitmap.buffer, 0, w * h);
967
968 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970 EXTEND (SP, 5);
971 PUSHs (sv_2mortal (newSViv (w)));
972 PUSHs (sv_2mortal (newSViv (h)));
973 PUSHs (sv_2mortal (retval));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 }
977} 1060}
978 1061
979MODULE = CFClient PACKAGE = CFClient::Texture
980
981void 1062void
982draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1063draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983 PROTOTYPE: $$$;$$ 1064 PROTOTYPE: $$$;$$
984 ALIAS: 1065 ALIAS:
985 draw_quad_alpha = 1 1066 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2 1067 draw_quad_alpha_premultiplied = 2
987 CODE: 1068 CODE:
988{ 1069{
989 HV *hv = (HV *)SvRV (self); 1070 HV *hv = (HV *)SvRV (self);
990 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1071 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1072 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1073 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994 1074
995 if (items < 5) 1075 if (items < 5)
996 { 1076 {
997 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1077 w = SvNV (*hv_fetch (hv, "w", 1, 1));
998 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1078 h = SvNV (*hv_fetch (hv, "h", 1, 1));
999 } 1079 }
1000 1080
1001 if (ix) 1081 if (ix)
1002 { 1082 {
1003 glEnable (GL_BLEND); 1083 glEnable (GL_BLEND);
1084
1085 if (ix == 2)
1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1086 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1087 else
1088 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1089 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1090
1005 glEnable (GL_ALPHA_TEST); 1091 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f); 1092 glAlphaFunc (GL_GREATER, 0.01f);
1007 } 1093 }
1008 1094
1009 glBindTexture (GL_TEXTURE_2D, name); 1095 glBindTexture (GL_TEXTURE_2D, name);
1010
1011 if (wrap_mode)
1012 {
1013 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015 }
1016 1096
1017 glBegin (GL_QUADS); 1097 glBegin (GL_QUADS);
1018 glTexCoord2f (0, 0); glVertex2f (x , y ); 1098 glTexCoord2f (0, 0); glVertex2f (x , y );
1019 glTexCoord2f (0, t); glVertex2f (x , y + h); 1099 glTexCoord2f (0, t); glVertex2f (x , y + h);
1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1100 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1053DESTROY (CFClient::Map self) 1133DESTROY (CFClient::Map self)
1054 CODE: 1134 CODE:
1055{ 1135{
1056 map_clear (self); 1136 map_clear (self);
1057 Safefree (self->face); 1137 Safefree (self->face);
1138 Safefree (self->tex);
1058 Safefree (self); 1139 Safefree (self);
1059} 1140}
1060 1141
1061void 1142void
1062clear (CFClient::Map self) 1143clear (CFClient::Map self)
1101 } 1182 }
1102 1183
1103 // somewhat hackish, but for textures that require it, it really 1184 // somewhat hackish, but for textures that require it, it really
1104 // improves the look, and most others don't suffer. 1185 // improves the look, and most others don't suffer.
1105 glBindTexture (GL_TEXTURE_2D, name); 1186 glBindTexture (GL_TEXTURE_2D, name);
1106 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1187 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1188 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1189 // use uglier nearest interpolation because linear suffers
1190 // from transparent color bleeding and ugly wrapping effects.
1191 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108} 1192}
1109 1193
1110int 1194int
1111ox (CFClient::Map self) 1195ox (CFClient::Map self)
1112 ALIAS: 1196 ALIAS:
1113 oy = 1 1197 oy = 1
1198 x = 2
1199 y = 3
1200 w = 4
1201 h = 5
1114 CODE: 1202 CODE:
1115 switch (ix) 1203 switch (ix)
1116 { 1204 {
1117 case 0: RETVAL = self->ox; break; 1205 case 0: RETVAL = self->ox; break;
1118 case 1: RETVAL = self->oy; break; 1206 case 1: RETVAL = self->oy; break;
1207 case 2: RETVAL = self->x; break;
1208 case 3: RETVAL = self->y; break;
1209 case 4: RETVAL = self->w; break;
1210 case 5: RETVAL = self->h; break;
1119 } 1211 }
1120 OUTPUT: 1212 OUTPUT:
1121 RETVAL 1213 RETVAL
1122 1214
1123void 1215void
1157 1249
1158 while (data < data_end) 1250 while (data < data_end)
1159 { 1251 {
1160 flags = (data [0] << 8) + data [1]; data += 2; 1252 flags = (data [0] << 8) + data [1]; data += 2;
1161 1253
1162 x = ((flags >> 10) & 63) + self->x; 1254 x = self->x + ((flags >> 10) & 63);
1163 y = ((flags >> 4) & 63) + self->y; 1255 y = self->y + ((flags >> 4) & 63);
1164 1256
1165 cell = map_get_cell (self, x, y); 1257 cell = map_get_cell (self, x, y);
1166 1258
1167 if (flags & 15) 1259 if (flags & 15)
1168 { 1260 {
1258 OUTPUT: 1350 OUTPUT:
1259 RETVAL 1351 RETVAL
1260 1352
1261void 1353void
1262draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1354draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1263 PPCODE: 1355 CODE:
1264{ 1356{
1265 int vx, vy; 1357 int vx, vy;
1266 int x, y, z; 1358 int x, y, z;
1267 int last_name; 1359 int last_name;
1268 mapface face; 1360 mapface face;
1269 int sw4 = (sw + 3) & ~3;
1270 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1271 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1272 1361
1273 memset (darkness, 255, sw4 * sh);
1274 SvPOK_only (darkness_sv);
1275 SvCUR_set (darkness_sv, sw4 * sh);
1276
1277 vx = self->x + (self->w - sw) / 2 - shift_x; 1362 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1278 vy = self->y + (self->h - sh) / 2 - shift_y; 1363 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1279 1364
1280 /* 1365 /*
1281 int vx = self->vx = self->w >= sw 1366 int vx = self->vx = self->w >= sw
1282 ? self->x + (self->w - sw) / 2 1367 ? self->x + (self->w - sw) / 2
1283 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1368 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1287 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1372 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1288 */ 1373 */
1289 1374
1290 glColor4ub (255, 255, 255, 255); 1375 glColor4ub (255, 255, 255, 255);
1291 1376
1377 glEnable (GL_BLEND);
1292 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1378 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1293 glEnable (GL_BLEND);
1294 glEnable (GL_TEXTURE_2D); 1379 glEnable (GL_TEXTURE_2D);
1295 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1380 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1296 1381
1297 glBegin (GL_QUADS); 1382 glBegin (GL_QUADS);
1298 1383
1306 1391
1307 for (x = 0; x < sw; x++) 1392 for (x = 0; x < sw; x++)
1308 if (row->c0 <= x + vx && x + vx < row->c1) 1393 if (row->c0 <= x + vx && x + vx < row->c1)
1309 { 1394 {
1310 mapcell *cell = row->col + (x + vx - row->c0); 1395 mapcell *cell = row->col + (x + vx - row->c0);
1311
1312 darkness[y * sw4 + x] = cell->darkness < 0
1313 ? 255 - FOW_DARKNESS
1314 : 255 - cell->darkness;
1315 1396
1316 face = cell->face [z]; 1397 face = cell->face [z];
1317 1398
1318 if (face) 1399 if (face)
1319 { 1400 {
1340 1421
1341 glEnd (); 1422 glEnd ();
1342 1423
1343 glDisable (GL_TEXTURE_2D); 1424 glDisable (GL_TEXTURE_2D);
1344 glDisable (GL_BLEND); 1425 glDisable (GL_BLEND);
1426}
1427
1428void
1429draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430 CODE:
1431{
1432 static float color[16][3] = {
1433 { 0.00F, 0.00F, 0.00F },
1434 { 1.00F, 1.00F, 1.00F },
1435 { 0.00F, 0.00F, 0.55F },
1436 { 1.00F, 0.00F, 0.00F },
1437
1438 { 1.00F, 0.54F, 0.00F },
1439 { 0.11F, 0.56F, 1.00F },
1440 { 0.93F, 0.46F, 0.00F },
1441 { 0.18F, 0.54F, 0.34F },
1442
1443 { 0.56F, 0.73F, 0.56F },
1444 { 0.80F, 0.80F, 0.80F },
1445 { 0.55F, 0.41F, 0.13F },
1446 { 0.99F, 0.77F, 0.26F },
1447
1448 { 0.74F, 0.65F, 0.41F },
1449
1450 { 0.00F, 1.00F, 1.00F },
1451 { 1.00F, 0.00F, 1.00F },
1452 { 1.00F, 1.00F, 0.00F },
1453 };
1454
1455 int x, y;
1456
1457 glEnable (GL_TEXTURE_2D);
1458 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1459 glEnable (GL_BLEND);
1460 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1461 glBegin (GL_QUADS);
1462
1463 for (y = 0; y < h; y++)
1464 for (x = 0; x < w; x++)
1465 {
1466 unsigned char m = data [x + y * w];
1467
1468 if (m)
1469 {
1470 float *c = color [m & 15];
1471
1472 float tx1 = m & 0x40 ? 0.5 : 0.;
1473 float tx2 = tx1 + 0.5;
1474
1475 glColor4f (c[0], c[1], c[2], 0.75);
1476 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1477 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1478 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1479 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1480 }
1481 }
1482
1483 glEnd ();
1484 glDisable (GL_BLEND);
1485 glDisable (GL_TEXTURE_2D);
1486}
1487
1488void
1489fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1490 PPCODE:
1491{
1492 int vx, vy;
1493 int x, y;
1494 int sw4 = (sw + 3) & ~3;
1495 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1496 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1497
1498 memset (darkness, 255, sw4 * sh);
1499 SvPOK_only (darkness_sv);
1500 SvCUR_set (darkness_sv, sw4 * sh);
1501
1502 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1503 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1504
1505 for (y = 0; y < sh; y++)
1506 if (0 <= y + vy && y + vy < self->rows)
1507 {
1508 maprow *row = self->row + (y + vy);
1509
1510 for (x = 0; x < sw; x++)
1511 if (row->c0 <= x + vx && x + vx < row->c1)
1512 {
1513 mapcell *cell = row->col + (x + vx - row->c0);
1514
1515 darkness[y * sw4 + x] = cell->darkness < 0
1516 ? 255 - FOW_DARKNESS
1517 : 255 - cell->darkness;
1518 }
1519 }
1345 1520
1346 EXTEND (SP, 3); 1521 EXTEND (SP, 3);
1347 PUSHs (sv_2mortal (newSViv (sw4))); 1522 PUSHs (sv_2mortal (newSViv (sw4)));
1348 PUSHs (sv_2mortal (newSViv (sh))); 1523 PUSHs (sv_2mortal (newSViv (sh)));
1349 PUSHs (darkness_sv); 1524 PUSHs (darkness_sv);
1556 const_iv (GL_SCISSOR_TEST), 1731 const_iv (GL_SCISSOR_TEST),
1557 const_iv (GL_DEPTH_TEST), 1732 const_iv (GL_DEPTH_TEST),
1558 const_iv (GL_ALPHA_TEST), 1733 const_iv (GL_ALPHA_TEST),
1559 const_iv (GL_NORMALIZE), 1734 const_iv (GL_NORMALIZE),
1560 const_iv (GL_RESCALE_NORMAL), 1735 const_iv (GL_RESCALE_NORMAL),
1736 const_iv (GL_FRONT),
1737 const_iv (GL_BACK),
1561 const_iv (GL_AND), 1738 const_iv (GL_AND),
1562 const_iv (GL_ONE), 1739 const_iv (GL_ONE),
1563 const_iv (GL_ZERO), 1740 const_iv (GL_ZERO),
1564 const_iv (GL_SRC_ALPHA), 1741 const_iv (GL_SRC_ALPHA),
1565 const_iv (GL_SRC_ALPHA_SATURATE), 1742 const_iv (GL_DST_ALPHA),
1566 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1743 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1567 const_iv (GL_ONE_MINUS_DST_ALPHA), 1744 const_iv (GL_ONE_MINUS_DST_ALPHA),
1745 const_iv (GL_SRC_ALPHA_SATURATE),
1568 const_iv (GL_RGB), 1746 const_iv (GL_RGB),
1569 const_iv (GL_RGBA), 1747 const_iv (GL_RGBA),
1748 const_iv (GL_RGBA4),
1749 const_iv (GL_RGBA8),
1750 const_iv (GL_RGB5_A1),
1570 const_iv (GL_UNSIGNED_BYTE), 1751 const_iv (GL_UNSIGNED_BYTE),
1571 const_iv (GL_UNSIGNED_SHORT), 1752 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT), 1753 const_iv (GL_UNSIGNED_INT),
1573 const_iv (GL_ALPHA), 1754 const_iv (GL_ALPHA),
1574 const_iv (GL_INTENSITY), 1755 const_iv (GL_INTENSITY),
1583 const_iv (GL_TEXTURE_MAG_FILTER), 1764 const_iv (GL_TEXTURE_MAG_FILTER),
1584 const_iv (GL_TEXTURE_MIN_FILTER), 1765 const_iv (GL_TEXTURE_MIN_FILTER),
1585 const_iv (GL_TEXTURE_ENV_MODE), 1766 const_iv (GL_TEXTURE_ENV_MODE),
1586 const_iv (GL_TEXTURE_WRAP_S), 1767 const_iv (GL_TEXTURE_WRAP_S),
1587 const_iv (GL_TEXTURE_WRAP_T), 1768 const_iv (GL_TEXTURE_WRAP_T),
1769 const_iv (GL_REPEAT),
1588 const_iv (GL_CLAMP), 1770 const_iv (GL_CLAMP),
1589 const_iv (GL_REPEAT), 1771 const_iv (GL_CLAMP_TO_EDGE),
1590 const_iv (GL_NEAREST), 1772 const_iv (GL_NEAREST),
1591 const_iv (GL_LINEAR), 1773 const_iv (GL_LINEAR),
1592 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1774 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1593 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1775 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1594 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1776 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1624 1806
1625 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1807 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1808 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1627} 1809}
1628 1810
1811char *
1812gl_vendor ()
1813 CODE:
1814 RETVAL = (char *)glGetString (GL_VENDOR);
1815 OUTPUT:
1816 RETVAL
1817
1818char *
1819gl_version ()
1820 CODE:
1821 RETVAL = (char *)glGetString (GL_VERSION);
1822 OUTPUT:
1823 RETVAL
1824
1825char *
1826gl_extensions ()
1827 CODE:
1828 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1829 OUTPUT:
1830 RETVAL
1831
1629int glGetError () 1832int glGetError ()
1833
1834void glFinish ()
1630 1835
1631void glClear (int mask) 1836void glClear (int mask)
1632 1837
1633void glClearColor (float r, float g, float b, float a = 1.0) 1838void glClearColor (float r, float g, float b, float a = 1.0)
1634 PROTOTYPE: @ 1839 PROTOTYPE: @
1641 1846
1642void glHint (int target, int mode) 1847void glHint (int target, int mode)
1643 1848
1644void glBlendFunc (int sfactor, int dfactor) 1849void glBlendFunc (int sfactor, int dfactor)
1645 1850
1851void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1852 CODE:
1853 gl_BlendFuncSeparate (sa, da, saa, daa);
1854
1646void glDepthMask (int flag) 1855void glDepthMask (int flag)
1647 1856
1648void glLogicOp (int opcode) 1857void glLogicOp (int opcode)
1649 1858
1650void glColorMask (int red, int green, int blue, int alpha) 1859void glColorMask (int red, int green, int blue, int alpha)
1654void glPushMatrix () 1863void glPushMatrix ()
1655 1864
1656void glPopMatrix () 1865void glPopMatrix ()
1657 1866
1658void glLoadIdentity () 1867void glLoadIdentity ()
1868
1869void glDrawBuffer (int buffer)
1870
1871void glReadBuffer (int buffer)
1659 1872
1660# near_ and far_ are due to microsofts buggy "c" compiler 1873# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1874void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662 1875
1663# near_ and far_ are due to microsofts buggy "c" compiler 1876# near_ and far_ are due to microsofts buggy "c" compiler
1683 1896
1684void glEnd () 1897void glEnd ()
1685 1898
1686void glColor (float r, float g, float b, float a = 1.0) 1899void glColor (float r, float g, float b, float a = 1.0)
1687 PROTOTYPE: @ 1900 PROTOTYPE: @
1901 ALIAS:
1902 glColor_premultiply = 1
1688 CODE: 1903 CODE:
1904 if (ix)
1905 {
1906 r *= a;
1907 g *= a;
1908 b *= a;
1909 }
1689 // microsoft visual "c" rounds instead of truncating... 1910 // microsoft visual "c" rounds instead of truncating...
1690 glColor4ub (MIN ((int)(r * 255.f), 255), 1911 glColor4ub (MIN ((int)(r * 256.f), 255),
1691 MIN ((int)(g * 255.f), 255), 1912 MIN ((int)(g * 256.f), 255),
1692 MIN ((int)(b * 255.f), 255), 1913 MIN ((int)(b * 256.f), 255),
1693 MIN ((int)(a * 255.f), 255)); 1914 MIN ((int)(a * 256.f), 255));
1694 1915
1695void glInterleavedArrays (int format, int stride, char *data) 1916void glInterleavedArrays (int format, int stride, char *data)
1696 1917
1697void glDrawElements (int mode, int count, int type, char *indices) 1918void glDrawElements (int mode, int count, int type, char *indices)
1698 1919
1721 1942
1722void glBindTexture (int target, int name) 1943void glBindTexture (int target, int name)
1723 1944
1724void glConvolutionParameter (int target, int pname, float params) 1945void glConvolutionParameter (int target, int pname, float params)
1725 CODE: 1946 CODE:
1726 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1947 if (gl.ConvolutionParameterf)
1948 gl.ConvolutionParameterf (target, pname, params);
1727 1949
1728void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1950void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729 CODE: 1951 CODE:
1730 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1952 if (gl.ConvolutionFilter2D)
1731 (target, internalformat, width, height, format, type, data)); 1953 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732 1954
1733void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1955void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1734 CODE: 1956 CODE:
1735 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1957 if (gl.SeparableFilter2D)
1736 (target, internalformat, width, height, format, type, row, column)); 1958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737 1959
1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1960void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739 1961
1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741 1963

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines