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.96 by root, Wed May 24 22:28:43 2006 UTC vs.
Revision 1.129 by root, Wed Jul 12 17:20:04 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 0
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
468int
469in_destruct ()
470 CODE:
471 RETVAL = PL_main_cv == Nullcv;
472 OUTPUT:
473 RETVAL
474
475NV floor (NV x)
476
477NV ceil (NV x)
478
418void 479void
419pango_init () 480pango_init ()
420 CODE: 481 CODE:
421{ 482{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 483 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 484 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); 485 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} 486}
430 487
431int 488int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 489SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 490
434void 491void
435SDL_Quit () 492SDL_Quit ()
436 493
437void 494void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 501 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 502 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 503 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 504
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 505 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 506 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 507
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 508 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 509 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 510 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 511 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
479SDL_SetVideoMode (int w, int h, int fullscreen) 536SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 537 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 538 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 539 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 540 );
541 if (RETVAL)
542 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 543 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
544# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
545# include "glfunc.h"
546# undef GL_FUNC
547 }
485 OUTPUT: 548 OUTPUT:
486 RETVAL 549 RETVAL
487 550
488void 551void
489SDL_GL_SwapBuffers () 552SDL_GL_SwapBuffers ()
565 CODE: 628 CODE:
566#ifndef _WIN32 629#ifndef _WIN32
567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 630 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568#endif 631#endif
569 632
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 633void
592add_font (char *file) 634add_font (char *file)
593 CODE: 635 CODE:
594 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 636 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595#ifdef _WIN32
596 // cairo... sigh... requires win2000
597 AddFontResourceEx (file, FR_PRIVATE, 0);
598#endif
599 637
600void 638void
601load_image_inline (SV *image_) 639load_image_inline (SV *image_)
602 ALIAS: 640 ALIAS:
603 load_image_file = 1 641 load_image_file = 1
645 683
646 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 684 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647 685
648 assert (surface2->pitch == surface2->w * 4); 686 assert (surface2->pitch == surface2->w * 4);
649 687
688 SDL_LockSurface (surface2);
650 EXTEND (SP, 5); 689 EXTEND (SP, 6);
651 PUSHs (sv_2mortal (newSViv (surface2->w))); 690 PUSHs (sv_2mortal (newSViv (surface2->w)));
652 PUSHs (sv_2mortal (newSViv (surface2->h))); 691 PUSHs (sv_2mortal (newSViv (surface2->h)));
653 SDL_LockSurface (surface2);
654 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 692 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655 SDL_UnlockSurface (surface2);
656 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 693 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 694 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 695 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
696 SDL_UnlockSurface (surface2);
659 697
660 SDL_FreeSurface (surface); 698 SDL_FreeSurface (surface);
661 SDL_FreeSurface (surface2); 699 SDL_FreeSurface (surface2);
662} 700}
663 701
699 CODE: 737 CODE:
700 fprintf (stderr, "FATAL: %s\n", message); 738 fprintf (stderr, "FATAL: %s\n", message);
701#ifdef _WIN32 739#ifdef _WIN32
702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 740 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
703#endif 741#endif
704 exit (1); 742 _exit (1);
743
744void
745_exit (int retval)
746 CODE:
747 _exit (retval);
705 748
706MODULE = CFClient PACKAGE = CFClient::Font 749MODULE = CFClient PACKAGE = CFClient::Font
707 750
708CFClient::Font 751CFClient::Font
709new_from_file (SV *class, char *path, int id = 0) 752new_from_file (SV *class, char *path, int id = 0)
727 CODE: 770 CODE:
728 default_font = self; 771 default_font = self;
729 772
730MODULE = CFClient PACKAGE = CFClient::Layout 773MODULE = CFClient PACKAGE = CFClient::Layout
731 774
775void
776reset_glyph_cache ()
777 CODE:
778 tc_clear ();
779
732CFClient::Layout 780CFClient::Layout
733new (SV *class, int rgba = 0) 781new (SV *class)
734 CODE: 782 CODE:
735#if _WIN32
736 //rgba = 0;//D make stext nicer, breaks TextView
737#endif
738 New (0, RETVAL, 1, struct cf_layout); 783 New (0, RETVAL, 1, struct cf_layout);
739 784
740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 785 RETVAL->pl = pango_layout_new (opengl_context);
741 RETVAL->rgba = rgba;
742 RETVAL->r = 1.; 786 RETVAL->r = 1.;
743 RETVAL->g = 1.; 787 RETVAL->g = 1.;
744 RETVAL->b = 1.; 788 RETVAL->b = 1.;
745 RETVAL->a = 1.; 789 RETVAL->a = 1.;
746 RETVAL->base_height = MIN_FONT_HEIGHT; 790 RETVAL->base_height = MIN_FONT_HEIGHT;
755DESTROY (CFClient::Layout self) 799DESTROY (CFClient::Layout self)
756 CODE: 800 CODE:
757 g_object_unref (self->pl); 801 g_object_unref (self->pl);
758 Safefree (self); 802 Safefree (self);
759 803
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
767void 804void
768set_text (CFClient::Layout self, SV *text_) 805set_text (CFClient::Layout self, SV *text_)
769 CODE: 806 CODE:
770{ 807{
771 STRLEN textlen; 808 STRLEN textlen;
782 char *text = SvPVutf8 (text_, textlen); 819 char *text = SvPVutf8 (text_, textlen);
783 820
784 pango_layout_set_markup (self->pl, text, textlen); 821 pango_layout_set_markup (self->pl, text, textlen);
785} 822}
786 823
824void
825set_shapes (CFClient::Layout self, ...)
826 CODE:
827{
828 PangoAttrList *attrs = 0;
829 const char *text = pango_layout_get_text (self->pl);
830 const char *pos = text;
831 int arg = 4;
832
833 while (arg < items && (pos = strstr (pos, OBJ_STR)))
834 {
835 PangoRectangle inkrect, rect;
836 PangoAttribute *attr;
837
838 int x = SvIV (ST (arg - 3));
839 int y = SvIV (ST (arg - 2));
840 int w = SvIV (ST (arg - 1));
841 int h = SvIV (ST (arg ));
842
843 inkrect.x = 0;
844 inkrect.y = 0;
845 inkrect.width = 0;
846 inkrect.height = 0;
847
848 rect.x = x * PANGO_SCALE;
849 rect.y = y * PANGO_SCALE;
850 rect.width = w * PANGO_SCALE;
851 rect.height = h * PANGO_SCALE;
852
853 if (!attrs)
854 attrs = pango_layout_get_attributes (self->pl);
855
856 attr = pango_attr_shape_new (&inkrect, &rect);
857 attr->start_index = pos - text;
858 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
859 pango_attr_list_insert (attrs, attr);
860
861 arg += 4;
862 pos += sizeof (OBJ_STR) - 1;
863 }
864
865 if (attrs)
866 pango_layout_set_attributes (self->pl, attrs);
867}
868
869void
870get_shapes (CFClient::Layout self)
871 PPCODE:
872{
873 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
874
875 do
876 {
877 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
878
879 if (run && shape_attr_p (run))
880 {
881 PangoRectangle extents;
882 pango_layout_iter_get_run_extents (iter, 0, &extents);
883
884 EXTEND (SP, 2);
885 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
886 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
887 }
888 }
889 while (pango_layout_iter_next_run (iter));
890
891 pango_layout_iter_free (iter);
892}
893
894int
895has_wrapped (CFClient::Layout self)
896 CODE:
897{
898 int lines = 1;
899 const char *text = pango_layout_get_text (self->pl);
900
901 while (*text)
902 lines += *text++ == '\n';
903
904 RETVAL = lines < pango_layout_get_line_count (self->pl);
905}
906 OUTPUT:
907 RETVAL
908
787SV * 909SV *
788get_text (CFClient::Layout self) 910get_text (CFClient::Layout self)
789 CODE: 911 CODE:
790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 912 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791 SvUTF8_on (RETVAL); 913 sv_utf8_decode (RETVAL);
792 OUTPUT: 914 OUTPUT:
793 RETVAL 915 RETVAL
794 916
795void 917void
796set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 918set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
860 PUSHs (sv_2mortal (newSViv (w))); 982 PUSHs (sv_2mortal (newSViv (w)));
861 PUSHs (sv_2mortal (newSViv (h))); 983 PUSHs (sv_2mortal (newSViv (h)));
862} 984}
863 985
864int 986int
987descent (CFClient::Layout self)
988 CODE:
989{
990 PangoRectangle rect;
991 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
992 pango_layout_line_get_pixel_extents (line, 0, &rect);
993 RETVAL = PANGO_DESCENT (rect);
994}
995 OUTPUT:
996 RETVAL
997
998int
865xy_to_index (CFClient::Layout self, int x, int y) 999xy_to_index (CFClient::Layout self, int x, int y)
866 CODE: 1000 CODE:
867{ 1001{
868 int index, trailing; 1002 int index, trailing;
869 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1003 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))); 1018 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1019 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886} 1020}
887 1021
888void 1022void
889render (CFClient::Layout self) 1023render (CFClient::Layout self, float x, float y)
890 PPCODE: 1024 PPCODE:
891{ 1025 pango_opengl_render_layout_subpixel (
892 SV *retval; 1026 self->pl,
893 int w, h; 1027 x * PANGO_SCALE, y * PANGO_SCALE,
1028 self->r, self->g, self->b, self->a
1029 );
894 1030
895 layout_get_pixel_size (self, &w, &h); 1031MODULE = CFClient PACKAGE = CFClient::Texture
896 1032
897 if (self->rgba) 1033void
1034pad2pot (SV *data_, SV *w_, SV *h_)
1035 CODE:
1036{
1037 int ow = SvIV (w_);
1038 int oh = SvIV (h_);
1039
1040 if (ow && oh)
898 { 1041 {
899 cairo_surface_t *surface; 1042 int nw = minpot (ow);
900 cairo_t *cairo; 1043 int nh = minpot (oh);
901 1044
902 retval = newSV (w * h * 4); 1045 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 { 1046 {
920 uint32_t *p = (uint32_t *)SvPVX (retval); 1047 if (SvOK (data_))
921 uint32_t *e = p + w * h;
922
923 while (p < e)
924 { 1048 {
925 uint32_t rgba = *p; 1049 STRLEN datalen;
926 rgba = (rgba >> 24) | (rgba << 8); 1050 char *data = SvPVbyte (data_, datalen);
927#if 0 1051 int bpp = datalen / (ow * oh);
928#ifdef _WIN32 1052 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 1053
935 rgba = (rgba & 0xffffff00) | a; 1054 SvPOK_only (result_);
1055 SvCUR_set (result_, nw * nh * bpp);
1056
1057 memset (SvPVX (result_), 0, nw * nh * bpp);
1058 while (oh--)
1059 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1060
1061 sv_setsv (data_, result_);
936 } 1062 }
937#endif 1063
938#endif 1064 sv_setiv (w_, nw);
939 rgba = SDL_SwapBE32 (rgba); 1065 sv_setiv (h_, nh);
940 *p++ = rgba;
941 } 1066 }
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 } 1067 }
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} 1068}
978 1069
979MODULE = CFClient PACKAGE = CFClient::Texture
980
981void 1070void
982draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1071draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983 PROTOTYPE: $$$;$$ 1072 PROTOTYPE: $$$;$$
984 ALIAS: 1073 ALIAS:
985 draw_quad_alpha = 1 1074 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2 1075 draw_quad_alpha_premultiplied = 2
987 CODE: 1076 CODE:
988{ 1077{
989 HV *hv = (HV *)SvRV (self); 1078 HV *hv = (HV *)SvRV (self);
990 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1079 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1080 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1081 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994 1082
995 if (items < 5) 1083 if (items < 5)
996 { 1084 {
997 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1085 w = SvNV (*hv_fetch (hv, "w", 1, 1));
998 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1086 h = SvNV (*hv_fetch (hv, "h", 1, 1));
999 } 1087 }
1000 1088
1001 if (ix) 1089 if (ix)
1002 { 1090 {
1003 glEnable (GL_BLEND); 1091 glEnable (GL_BLEND);
1092
1093 if (ix == 2)
1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1094 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1095 else
1096 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1097 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1098
1005 glEnable (GL_ALPHA_TEST); 1099 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f); 1100 glAlphaFunc (GL_GREATER, 0.01f);
1007 } 1101 }
1008 1102
1009 glBindTexture (GL_TEXTURE_2D, name); 1103 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 1104
1017 glBegin (GL_QUADS); 1105 glBegin (GL_QUADS);
1018 glTexCoord2f (0, 0); glVertex2f (x , y ); 1106 glTexCoord2f (0, 0); glVertex2f (x , y );
1019 glTexCoord2f (0, t); glVertex2f (x , y + h); 1107 glTexCoord2f (0, t); glVertex2f (x , y + h);
1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1108 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1053DESTROY (CFClient::Map self) 1141DESTROY (CFClient::Map self)
1054 CODE: 1142 CODE:
1055{ 1143{
1056 map_clear (self); 1144 map_clear (self);
1057 Safefree (self->face); 1145 Safefree (self->face);
1146 Safefree (self->tex);
1058 Safefree (self); 1147 Safefree (self);
1059} 1148}
1060 1149
1061void 1150void
1062clear (CFClient::Map self) 1151clear (CFClient::Map self)
1101 } 1190 }
1102 1191
1103 // somewhat hackish, but for textures that require it, it really 1192 // somewhat hackish, but for textures that require it, it really
1104 // improves the look, and most others don't suffer. 1193 // improves the look, and most others don't suffer.
1105 glBindTexture (GL_TEXTURE_2D, name); 1194 glBindTexture (GL_TEXTURE_2D, name);
1106 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1195 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1196 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1197 // use uglier nearest interpolation because linear suffers
1198 // from transparent color bleeding and ugly wrapping effects.
1199 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108} 1200}
1109 1201
1110int 1202int
1111ox (CFClient::Map self) 1203ox (CFClient::Map self)
1112 ALIAS: 1204 ALIAS:
1113 oy = 1 1205 oy = 1
1206 x = 2
1207 y = 3
1208 w = 4
1209 h = 5
1114 CODE: 1210 CODE:
1115 switch (ix) 1211 switch (ix)
1116 { 1212 {
1117 case 0: RETVAL = self->ox; break; 1213 case 0: RETVAL = self->ox; break;
1118 case 1: RETVAL = self->oy; break; 1214 case 1: RETVAL = self->oy; break;
1215 case 2: RETVAL = self->x; break;
1216 case 3: RETVAL = self->y; break;
1217 case 4: RETVAL = self->w; break;
1218 case 5: RETVAL = self->h; break;
1119 } 1219 }
1120 OUTPUT: 1220 OUTPUT:
1121 RETVAL 1221 RETVAL
1122 1222
1123void 1223void
1157 1257
1158 while (data < data_end) 1258 while (data < data_end)
1159 { 1259 {
1160 flags = (data [0] << 8) + data [1]; data += 2; 1260 flags = (data [0] << 8) + data [1]; data += 2;
1161 1261
1162 x = ((flags >> 10) & 63) + self->x; 1262 x = self->x + ((flags >> 10) & 63);
1163 y = ((flags >> 4) & 63) + self->y; 1263 y = self->y + ((flags >> 4) & 63);
1164 1264
1165 cell = map_get_cell (self, x, y); 1265 cell = map_get_cell (self, x, y);
1166 1266
1167 if (flags & 15) 1267 if (flags & 15)
1168 { 1268 {
1258 OUTPUT: 1358 OUTPUT:
1259 RETVAL 1359 RETVAL
1260 1360
1261void 1361void
1262draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1362draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1263 PPCODE: 1363 CODE:
1264{ 1364{
1265 int vx, vy; 1365 int vx, vy;
1266 int x, y, z; 1366 int x, y, z;
1267 int last_name; 1367 int last_name;
1268 mapface face; 1368 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 1369
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; 1370 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1278 vy = self->y + (self->h - sh) / 2 - shift_y; 1371 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1279 1372
1280 /* 1373 /*
1281 int vx = self->vx = self->w >= sw 1374 int vx = self->vx = self->w >= sw
1282 ? self->x + (self->w - sw) / 2 1375 ? self->x + (self->w - sw) / 2
1283 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1376 : 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)); 1380 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1288 */ 1381 */
1289 1382
1290 glColor4ub (255, 255, 255, 255); 1383 glColor4ub (255, 255, 255, 255);
1291 1384
1385 glEnable (GL_BLEND);
1292 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1386 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1293 glEnable (GL_BLEND);
1294 glEnable (GL_TEXTURE_2D); 1387 glEnable (GL_TEXTURE_2D);
1295 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1388 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1296 1389
1297 glBegin (GL_QUADS); 1390 glBegin (GL_QUADS);
1298 1391
1306 1399
1307 for (x = 0; x < sw; x++) 1400 for (x = 0; x < sw; x++)
1308 if (row->c0 <= x + vx && x + vx < row->c1) 1401 if (row->c0 <= x + vx && x + vx < row->c1)
1309 { 1402 {
1310 mapcell *cell = row->col + (x + vx - row->c0); 1403 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 1404
1316 face = cell->face [z]; 1405 face = cell->face [z];
1317 1406
1318 if (face) 1407 if (face)
1319 { 1408 {
1340 1429
1341 glEnd (); 1430 glEnd ();
1342 1431
1343 glDisable (GL_TEXTURE_2D); 1432 glDisable (GL_TEXTURE_2D);
1344 glDisable (GL_BLEND); 1433 glDisable (GL_BLEND);
1434}
1435
1436void
1437draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1438 CODE:
1439{
1440 static float color[16][3] = {
1441 { 0.00F, 0.00F, 0.00F },
1442 { 1.00F, 1.00F, 1.00F },
1443 { 0.00F, 0.00F, 0.55F },
1444 { 1.00F, 0.00F, 0.00F },
1445
1446 { 1.00F, 0.54F, 0.00F },
1447 { 0.11F, 0.56F, 1.00F },
1448 { 0.93F, 0.46F, 0.00F },
1449 { 0.18F, 0.54F, 0.34F },
1450
1451 { 0.56F, 0.73F, 0.56F },
1452 { 0.80F, 0.80F, 0.80F },
1453 { 0.55F, 0.41F, 0.13F },
1454 { 0.99F, 0.77F, 0.26F },
1455
1456 { 0.74F, 0.65F, 0.41F },
1457
1458 { 0.00F, 1.00F, 1.00F },
1459 { 1.00F, 0.00F, 1.00F },
1460 { 1.00F, 1.00F, 0.00F },
1461 };
1462
1463 int x, y;
1464
1465 glEnable (GL_TEXTURE_2D);
1466 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1467 glEnable (GL_BLEND);
1468 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1469 glBegin (GL_QUADS);
1470
1471 for (y = 0; y < h; y++)
1472 for (x = 0; x < w; x++)
1473 {
1474 unsigned char m = data [x + y * w];
1475
1476 if (m)
1477 {
1478 float *c = color [m & 15];
1479
1480 float tx1 = m & 0x40 ? 0.5 : 0.;
1481 float tx2 = tx1 + 0.5;
1482
1483 glColor4f (c[0], c[1], c[2], 0.75);
1484 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1485 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1486 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1487 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1488 }
1489 }
1490
1491 glEnd ();
1492 glDisable (GL_BLEND);
1493 glDisable (GL_TEXTURE_2D);
1494}
1495
1496void
1497fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1498 PPCODE:
1499{
1500 int vx, vy;
1501 int x, y;
1502 int sw4 = (sw + 3) & ~3;
1503 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1504 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1505
1506 memset (darkness, 255, sw4 * sh);
1507 SvPOK_only (darkness_sv);
1508 SvCUR_set (darkness_sv, sw4 * sh);
1509
1510 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1511 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1512
1513 for (y = 0; y < sh; y++)
1514 if (0 <= y + vy && y + vy < self->rows)
1515 {
1516 maprow *row = self->row + (y + vy);
1517
1518 for (x = 0; x < sw; x++)
1519 if (row->c0 <= x + vx && x + vx < row->c1)
1520 {
1521 mapcell *cell = row->col + (x + vx - row->c0);
1522
1523 darkness[y * sw4 + x] = cell->darkness < 0
1524 ? 255 - FOW_DARKNESS
1525 : 255 - cell->darkness;
1526 }
1527 }
1345 1528
1346 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1347 PUSHs (sv_2mortal (newSViv (sw4))); 1530 PUSHs (sv_2mortal (newSViv (sw4)));
1348 PUSHs (sv_2mortal (newSViv (sh))); 1531 PUSHs (sv_2mortal (newSViv (sh)));
1349 PUSHs (darkness_sv); 1532 PUSHs (darkness_sv);
1556 const_iv (GL_SCISSOR_TEST), 1739 const_iv (GL_SCISSOR_TEST),
1557 const_iv (GL_DEPTH_TEST), 1740 const_iv (GL_DEPTH_TEST),
1558 const_iv (GL_ALPHA_TEST), 1741 const_iv (GL_ALPHA_TEST),
1559 const_iv (GL_NORMALIZE), 1742 const_iv (GL_NORMALIZE),
1560 const_iv (GL_RESCALE_NORMAL), 1743 const_iv (GL_RESCALE_NORMAL),
1744 const_iv (GL_FRONT),
1745 const_iv (GL_BACK),
1561 const_iv (GL_AND), 1746 const_iv (GL_AND),
1562 const_iv (GL_ONE), 1747 const_iv (GL_ONE),
1563 const_iv (GL_ZERO), 1748 const_iv (GL_ZERO),
1564 const_iv (GL_SRC_ALPHA), 1749 const_iv (GL_SRC_ALPHA),
1565 const_iv (GL_SRC_ALPHA_SATURATE), 1750 const_iv (GL_DST_ALPHA),
1566 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1751 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1567 const_iv (GL_ONE_MINUS_DST_ALPHA), 1752 const_iv (GL_ONE_MINUS_DST_ALPHA),
1753 const_iv (GL_SRC_ALPHA_SATURATE),
1568 const_iv (GL_RGB), 1754 const_iv (GL_RGB),
1569 const_iv (GL_RGBA), 1755 const_iv (GL_RGBA),
1756 const_iv (GL_RGBA4),
1757 const_iv (GL_RGBA8),
1758 const_iv (GL_RGB5_A1),
1570 const_iv (GL_UNSIGNED_BYTE), 1759 const_iv (GL_UNSIGNED_BYTE),
1571 const_iv (GL_UNSIGNED_SHORT), 1760 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT), 1761 const_iv (GL_UNSIGNED_INT),
1573 const_iv (GL_ALPHA), 1762 const_iv (GL_ALPHA),
1574 const_iv (GL_INTENSITY), 1763 const_iv (GL_INTENSITY),
1583 const_iv (GL_TEXTURE_MAG_FILTER), 1772 const_iv (GL_TEXTURE_MAG_FILTER),
1584 const_iv (GL_TEXTURE_MIN_FILTER), 1773 const_iv (GL_TEXTURE_MIN_FILTER),
1585 const_iv (GL_TEXTURE_ENV_MODE), 1774 const_iv (GL_TEXTURE_ENV_MODE),
1586 const_iv (GL_TEXTURE_WRAP_S), 1775 const_iv (GL_TEXTURE_WRAP_S),
1587 const_iv (GL_TEXTURE_WRAP_T), 1776 const_iv (GL_TEXTURE_WRAP_T),
1777 const_iv (GL_REPEAT),
1588 const_iv (GL_CLAMP), 1778 const_iv (GL_CLAMP),
1589 const_iv (GL_REPEAT), 1779 const_iv (GL_CLAMP_TO_EDGE),
1590 const_iv (GL_NEAREST), 1780 const_iv (GL_NEAREST),
1591 const_iv (GL_LINEAR), 1781 const_iv (GL_LINEAR),
1592 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1782 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1593 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1783 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1594 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1784 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1624 1814
1625 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1815 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1816 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1627} 1817}
1628 1818
1819char *
1820gl_vendor ()
1821 CODE:
1822 RETVAL = (char *)glGetString (GL_VENDOR);
1823 OUTPUT:
1824 RETVAL
1825
1826char *
1827gl_version ()
1828 CODE:
1829 RETVAL = (char *)glGetString (GL_VERSION);
1830 OUTPUT:
1831 RETVAL
1832
1833char *
1834gl_extensions ()
1835 CODE:
1836 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1837 OUTPUT:
1838 RETVAL
1839
1629int glGetError () 1840int glGetError ()
1841
1842void glFinish ()
1630 1843
1631void glClear (int mask) 1844void glClear (int mask)
1632 1845
1633void glClearColor (float r, float g, float b, float a = 1.0) 1846void glClearColor (float r, float g, float b, float a = 1.0)
1634 PROTOTYPE: @ 1847 PROTOTYPE: @
1641 1854
1642void glHint (int target, int mode) 1855void glHint (int target, int mode)
1643 1856
1644void glBlendFunc (int sfactor, int dfactor) 1857void glBlendFunc (int sfactor, int dfactor)
1645 1858
1859void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1860 CODE:
1861 gl_BlendFuncSeparate (sa, da, saa, daa);
1862
1646void glDepthMask (int flag) 1863void glDepthMask (int flag)
1647 1864
1648void glLogicOp (int opcode) 1865void glLogicOp (int opcode)
1649 1866
1650void glColorMask (int red, int green, int blue, int alpha) 1867void glColorMask (int red, int green, int blue, int alpha)
1654void glPushMatrix () 1871void glPushMatrix ()
1655 1872
1656void glPopMatrix () 1873void glPopMatrix ()
1657 1874
1658void glLoadIdentity () 1875void glLoadIdentity ()
1876
1877void glDrawBuffer (int buffer)
1878
1879void glReadBuffer (int buffer)
1659 1880
1660# near_ and far_ are due to microsofts buggy "c" compiler 1881# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1882void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662 1883
1663# near_ and far_ are due to microsofts buggy "c" compiler 1884# near_ and far_ are due to microsofts buggy "c" compiler
1683 1904
1684void glEnd () 1905void glEnd ()
1685 1906
1686void glColor (float r, float g, float b, float a = 1.0) 1907void glColor (float r, float g, float b, float a = 1.0)
1687 PROTOTYPE: @ 1908 PROTOTYPE: @
1909 ALIAS:
1910 glColor_premultiply = 1
1688 CODE: 1911 CODE:
1912 if (ix)
1913 {
1914 r *= a;
1915 g *= a;
1916 b *= a;
1917 }
1689 // microsoft visual "c" rounds instead of truncating... 1918 // microsoft visual "c" rounds instead of truncating...
1690 glColor4ub (MIN ((int)(r * 255.f), 255), 1919 glColor4ub (MIN ((int)(r * 256.f), 255),
1691 MIN ((int)(g * 255.f), 255), 1920 MIN ((int)(g * 256.f), 255),
1692 MIN ((int)(b * 255.f), 255), 1921 MIN ((int)(b * 256.f), 255),
1693 MIN ((int)(a * 255.f), 255)); 1922 MIN ((int)(a * 256.f), 255));
1694 1923
1695void glInterleavedArrays (int format, int stride, char *data) 1924void glInterleavedArrays (int format, int stride, char *data)
1696 1925
1697void glDrawElements (int mode, int count, int type, char *indices) 1926void glDrawElements (int mode, int count, int type, char *indices)
1698 1927
1721 1950
1722void glBindTexture (int target, int name) 1951void glBindTexture (int target, int name)
1723 1952
1724void glConvolutionParameter (int target, int pname, float params) 1953void glConvolutionParameter (int target, int pname, float params)
1725 CODE: 1954 CODE:
1726 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1955 if (gl.ConvolutionParameterf)
1956 gl.ConvolutionParameterf (target, pname, params);
1727 1957
1728void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1958void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729 CODE: 1959 CODE:
1730 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1960 if (gl.ConvolutionFilter2D)
1731 (target, internalformat, width, height, format, type, data)); 1961 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732 1962
1733void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1734 CODE: 1964 CODE:
1735 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1965 if (gl.SeparableFilter2D)
1736 (target, internalformat, width, height, format, type, row, column)); 1966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737 1967
1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739 1969
1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741 1971

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines