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.97 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.131 by root, Thu Jul 13 01:54:18 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
5# pragma warning(disable:4244) 6# pragma warning(disable:4244)
6#endif 7#endif
7 8
8#include "EXTERN.h" 9#include "EXTERN.h"
9#include "perl.h" 10#include "perl.h"
10#include "XSUB.h" 11#include "XSUB.h"
11 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
12#include <math.h> 17#include <math.h>
13#include <string.h> 18#include <string.h>
14#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
15 21
16#include <SDL.h> 22#include <SDL.h>
17#include <SDL_endian.h> 23#include <SDL_endian.h>
18#include <SDL_image.h> 24#include <SDL_image.h>
19#include <SDL_mixer.h> 25#include <SDL_mixer.h>
20#include <SDL_opengl.h> 26#include <SDL_opengl.h>
21 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
22#include <glib/gmacros.h> 31#include <glib/gmacros.h>
23 32
24#include <pango/pango.h> 33#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 34
29#ifndef _WIN32 35#ifndef _WIN32
30# include <sys/types.h> 36# include <sys/types.h>
31# include <sys/socket.h> 37# include <sys/socket.h>
32# include <netinet/in.h> 38# include <netinet/in.h>
39 typedef signed char int8_t; 45 typedef signed char int8_t;
40 typedef signed short int16_t; 46 typedef signed short int16_t;
41 typedef signed int int32_t; 47 typedef signed int int32_t;
42#endif 48#endif
43 49
44#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45 51
46#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
47 53
48#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
50 56
51#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
52 58
53#define GL_CALL(type,func,args) \ 59#if 0
54 { \ 60# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 61#else
56 static type fptr_; \ 62# define PARACHUTE 0
57 \ 63#endif
58 if (!init_) \ 64
59 { \ 65static struct
60 init_ = 1; \ 66{
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 67#define GL_FUNC(ptr,name) ptr name;
62 } \ 68#include "glfunc.h"
63 \ 69#undef GL_FUNC
64 if (fptr_) \ 70} gl;
65 fptr_ args; \ 71
66 } 72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{
74 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else
79 glBlendFunc (sa, da);
80}
81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
67 87
68typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFClient__MixMusic;
70 90
71typedef PangoFontDescription *CFClient__Font; 91typedef PangoFontDescription *CFClient__Font;
72 92
93static int
94shape_attr_p (PangoLayoutRun *run)
95{
96 GSList *attrs = run->item->analysis.extra_attrs;
97
98 while (attrs)
99 {
100 PangoAttribute *attr = attrs->data;
101
102 if (attr->klass->type == PANGO_ATTR_SHAPE)
103 return 1;
104
105 attrs = attrs->next;
106 }
107
108 return 0;
109}
110
73typedef struct cf_layout { 111typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
77 int base_height; 114 int base_height;
78 CFClient__Font font; 115 CFClient__Font font;
79} *CFClient__Layout; 116} *CFClient__Layout;
80 117
81static CFClient__Font default_font; 118static CFClient__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
84 121
85static void 122static void
86substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
87{ 124{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 126#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 128#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 130}
95 131
96static void 132static void
97layout_update_font (CFClient__Layout self) 133layout_update_font (CFClient__Layout self)
98{ 134{
294 ev.code = 1; 330 ev.code = 1;
295 ev.data1 = (void *)(long)channel; 331 ev.data1 = (void *)(long)channel;
296 ev.data2 = 0; 332 ev.data2 = 0;
297 333
298 SDL_PushEvent ((SDL_Event *)&ev); 334 SDL_PushEvent ((SDL_Event *)&ev);
335}
336
337static unsigned int
338minpot (unsigned int n)
339{
340 if (!n)
341 return 0;
342
343 --n;
344
345 n |= n >> 1;
346 n |= n >> 2;
347 n |= n >> 4;
348 n |= n >> 8;
349 n |= n >> 16;
350
351 return n + 1;
299} 352}
300 353
301MODULE = CFClient PACKAGE = CFClient 354MODULE = CFClient PACKAGE = CFClient
302 355
303PROTOTYPES: ENABLE 356PROTOTYPES: ENABLE
413 466
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 467 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 469}
417 470
471int
472in_destruct ()
473 CODE:
474 RETVAL = PL_main_cv == Nullcv;
475 OUTPUT:
476 RETVAL
477
478NV floor (NV x)
479
480NV ceil (NV x)
481
418void 482void
419pango_init () 483pango_init ()
420 CODE: 484 CODE:
421{ 485{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 486 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 487 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); 488 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} 489}
430 490
431int 491int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 493
434void 494void
435SDL_Quit () 495SDL_Quit ()
436 496
437void 497void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 507
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 510
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 515
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
457 519
458 SDL_EnableUNICODE (1); 520 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 522
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 541SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 542 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 543 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 544 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 545 );
546 if (RETVAL)
547 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 548 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
549# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
550# include "glfunc.h"
551# undef GL_FUNC
552 }
485 OUTPUT: 553 OUTPUT:
486 RETVAL 554 RETVAL
487 555
488void 556void
489SDL_GL_SwapBuffers () 557SDL_GL_SwapBuffers ()
568#endif 636#endif
569 637
570void 638void
571add_font (char *file) 639add_font (char *file)
572 CODE: 640 CODE:
573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 641 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574#ifdef _WIN32
575 // cairo... sigh... requires win2000
576 AddFontResourceEx (file, FR_PRIVATE, 0);
577#endif
578 642
579void 643void
580load_image_inline (SV *image_) 644load_image_inline (SV *image_)
581 ALIAS: 645 ALIAS:
582 load_image_file = 1 646 load_image_file = 1
624 688
625 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 689 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626 690
627 assert (surface2->pitch == surface2->w * 4); 691 assert (surface2->pitch == surface2->w * 4);
628 692
693 SDL_LockSurface (surface2);
629 EXTEND (SP, 5); 694 EXTEND (SP, 6);
630 PUSHs (sv_2mortal (newSViv (surface2->w))); 695 PUSHs (sv_2mortal (newSViv (surface2->w)));
631 PUSHs (sv_2mortal (newSViv (surface2->h))); 696 PUSHs (sv_2mortal (newSViv (surface2->h)));
632 SDL_LockSurface (surface2);
633 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 697 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634 SDL_UnlockSurface (surface2);
635 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 698 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 699 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 700 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
701 SDL_UnlockSurface (surface2);
638 702
639 SDL_FreeSurface (surface); 703 SDL_FreeSurface (surface);
640 SDL_FreeSurface (surface2); 704 SDL_FreeSurface (surface2);
641} 705}
642 706
678 CODE: 742 CODE:
679 fprintf (stderr, "FATAL: %s\n", message); 743 fprintf (stderr, "FATAL: %s\n", message);
680#ifdef _WIN32 744#ifdef _WIN32
681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 745 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
682#endif 746#endif
683 exit (1); 747 _exit (1);
748
749void
750_exit (int retval)
751 CODE:
752 _exit (retval);
684 753
685MODULE = CFClient PACKAGE = CFClient::Font 754MODULE = CFClient PACKAGE = CFClient::Font
686 755
687CFClient::Font 756CFClient::Font
688new_from_file (SV *class, char *path, int id = 0) 757new_from_file (SV *class, char *path, int id = 0)
706 CODE: 775 CODE:
707 default_font = self; 776 default_font = self;
708 777
709MODULE = CFClient PACKAGE = CFClient::Layout 778MODULE = CFClient PACKAGE = CFClient::Layout
710 779
780void
781reset_glyph_cache ()
782 CODE:
783 tc_clear ();
784
711CFClient::Layout 785CFClient::Layout
712new (SV *class, int rgba = 0) 786new (SV *class)
713 CODE: 787 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
717 New (0, RETVAL, 1, struct cf_layout); 788 New (0, RETVAL, 1, struct cf_layout);
718 789
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 790 RETVAL->pl = pango_layout_new (opengl_context);
720 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 791 RETVAL->r = 1.;
722 RETVAL->g = 1.; 792 RETVAL->g = 1.;
723 RETVAL->b = 1.; 793 RETVAL->b = 1.;
724 RETVAL->a = 1.; 794 RETVAL->a = 1.;
725 RETVAL->base_height = MIN_FONT_HEIGHT; 795 RETVAL->base_height = MIN_FONT_HEIGHT;
734DESTROY (CFClient::Layout self) 804DESTROY (CFClient::Layout self)
735 CODE: 805 CODE:
736 g_object_unref (self->pl); 806 g_object_unref (self->pl);
737 Safefree (self); 807 Safefree (self);
738 808
739int
740is_rgba (CFClient::Layout self)
741 CODE:
742 RETVAL = self->rgba;
743 OUTPUT:
744 RETVAL
745
746void 809void
747set_text (CFClient::Layout self, SV *text_) 810set_text (CFClient::Layout self, SV *text_)
748 CODE: 811 CODE:
749{ 812{
750 STRLEN textlen; 813 STRLEN textlen;
761 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
762 825
763 pango_layout_set_markup (self->pl, text, textlen); 826 pango_layout_set_markup (self->pl, text, textlen);
764} 827}
765 828
829void
830set_shapes (CFClient::Layout self, ...)
831 CODE:
832{
833 PangoAttrList *attrs = 0;
834 const char *text = pango_layout_get_text (self->pl);
835 const char *pos = text;
836 int arg = 4;
837
838 while (arg < items && (pos = strstr (pos, OBJ_STR)))
839 {
840 PangoRectangle inkrect, rect;
841 PangoAttribute *attr;
842
843 int x = SvIV (ST (arg - 3));
844 int y = SvIV (ST (arg - 2));
845 int w = SvIV (ST (arg - 1));
846 int h = SvIV (ST (arg ));
847
848 inkrect.x = 0;
849 inkrect.y = 0;
850 inkrect.width = 0;
851 inkrect.height = 0;
852
853 rect.x = x * PANGO_SCALE;
854 rect.y = y * PANGO_SCALE;
855 rect.width = w * PANGO_SCALE;
856 rect.height = h * PANGO_SCALE;
857
858 if (!attrs)
859 attrs = pango_layout_get_attributes (self->pl);
860
861 attr = pango_attr_shape_new (&inkrect, &rect);
862 attr->start_index = pos - text;
863 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
864 pango_attr_list_insert (attrs, attr);
865
866 arg += 4;
867 pos += sizeof (OBJ_STR) - 1;
868 }
869
870 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs);
872}
873
874void
875get_shapes (CFClient::Layout self)
876 PPCODE:
877{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879
880 do
881 {
882 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
883
884 if (run && shape_attr_p (run))
885 {
886 PangoRectangle extents;
887 pango_layout_iter_get_run_extents (iter, 0, &extents);
888
889 EXTEND (SP, 2);
890 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
891 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
892 }
893 }
894 while (pango_layout_iter_next_run (iter));
895
896 pango_layout_iter_free (iter);
897}
898
899int
900has_wrapped (CFClient::Layout self)
901 CODE:
902{
903 int lines = 1;
904 const char *text = pango_layout_get_text (self->pl);
905
906 while (*text)
907 lines += *text++ == '\n';
908
909 RETVAL = lines < pango_layout_get_line_count (self->pl);
910}
911 OUTPUT:
912 RETVAL
913
766SV * 914SV *
767get_text (CFClient::Layout self) 915get_text (CFClient::Layout self)
768 CODE: 916 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 917 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 918 sv_utf8_decode (RETVAL);
771 OUTPUT: 919 OUTPUT:
772 RETVAL 920 RETVAL
773 921
774void 922void
775set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 923set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
839 PUSHs (sv_2mortal (newSViv (w))); 987 PUSHs (sv_2mortal (newSViv (w)));
840 PUSHs (sv_2mortal (newSViv (h))); 988 PUSHs (sv_2mortal (newSViv (h)));
841} 989}
842 990
843int 991int
992descent (CFClient::Layout self)
993 CODE:
994{
995 PangoRectangle rect;
996 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997 pango_layout_line_get_pixel_extents (line, 0, &rect);
998 RETVAL = PANGO_DESCENT (rect);
999}
1000 OUTPUT:
1001 RETVAL
1002
1003int
844xy_to_index (CFClient::Layout self, int x, int y) 1004xy_to_index (CFClient::Layout self, int x, int y)
845 CODE: 1005 CODE:
846{ 1006{
847 int index, trailing; 1007 int index, trailing;
848 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1008 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))); 1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865} 1025}
866 1026
867void 1027void
868render (CFClient::Layout self) 1028render (CFClient::Layout self, float x, float y)
869 PPCODE: 1029 PPCODE:
870{ 1030 pango_opengl_render_layout_subpixel (
871 SV *retval; 1031 self->pl,
872 int w, h; 1032 x * PANGO_SCALE, y * PANGO_SCALE,
1033 self->r, self->g, self->b, self->a
1034 );
873 1035
874 layout_get_pixel_size (self, &w, &h); 1036MODULE = CFClient PACKAGE = CFClient::Texture
875 1037
876 if (self->rgba) 1038void
1039pad2pot (SV *data_, SV *w_, SV *h_)
1040 CODE:
1041{
1042 int ow = SvIV (w_);
1043 int oh = SvIV (h_);
1044
1045 if (ow && oh)
877 { 1046 {
878 cairo_surface_t *surface; 1047 int nw = minpot (ow);
879 cairo_t *cairo; 1048 int nh = minpot (oh);
880 1049
881 retval = newSV (w * h * 4); 1050 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 { 1051 {
899 uint32_t *p = (uint32_t *)SvPVX (retval); 1052 if (SvOK (data_))
900 uint32_t *e = p + w * h;
901
902 while (p < e)
903 { 1053 {
904 uint32_t rgba = *p; 1054 STRLEN datalen;
905 rgba = (rgba >> 24) | (rgba << 8); 1055 char *data = SvPVbyte (data_, datalen);
906#if 0 1056 int bpp = datalen / (ow * oh);
907#ifdef _WIN32 1057 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 1058
914 rgba = (rgba & 0xffffff00) | a; 1059 SvPOK_only (result_);
1060 SvCUR_set (result_, nw * nh * bpp);
1061
1062 memset (SvPVX (result_), 0, nw * nh * bpp);
1063 while (oh--)
1064 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1065
1066 sv_setsv (data_, result_);
915 } 1067 }
916#endif 1068
917#endif 1069 sv_setiv (w_, nw);
918 rgba = SDL_SwapBE32 (rgba); 1070 sv_setiv (h_, nh);
919 *p++ = rgba;
920 } 1071 }
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 } 1072 }
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} 1073}
957 1074
958MODULE = CFClient PACKAGE = CFClient::Texture
959
960void 1075void
961draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1076draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962 PROTOTYPE: $$$;$$ 1077 PROTOTYPE: $$$;$$
963 ALIAS: 1078 ALIAS:
964 draw_quad_alpha = 1 1079 draw_quad_alpha = 1
965 draw_quad_alpha_premultiplied = 2 1080 draw_quad_alpha_premultiplied = 2
966 CODE: 1081 CODE:
967{ 1082{
968 HV *hv = (HV *)SvRV (self); 1083 HV *hv = (HV *)SvRV (self);
969 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1084 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
970 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1085 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
971 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1086 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
972 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
973 1087
974 if (items < 5) 1088 if (items < 5)
975 { 1089 {
976 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1090 w = SvNV (*hv_fetch (hv, "w", 1, 1));
977 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1091 h = SvNV (*hv_fetch (hv, "h", 1, 1));
978 } 1092 }
979 1093
980 if (ix) 1094 if (ix)
981 { 1095 {
982 glEnable (GL_BLEND); 1096 glEnable (GL_BLEND);
1097
1098 if (ix == 2)
983 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1099 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1100 else
1101 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1102 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1103
984 glEnable (GL_ALPHA_TEST); 1104 glEnable (GL_ALPHA_TEST);
985 glAlphaFunc (GL_GREATER, 0.01f); 1105 glAlphaFunc (GL_GREATER, 0.01f);
986 } 1106 }
987 1107
988 glBindTexture (GL_TEXTURE_2D, name); 1108 glBindTexture (GL_TEXTURE_2D, name);
989
990 if (wrap_mode)
991 {
992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
993 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
994 }
995 1109
996 glBegin (GL_QUADS); 1110 glBegin (GL_QUADS);
997 glTexCoord2f (0, 0); glVertex2f (x , y ); 1111 glTexCoord2f (0, 0); glVertex2f (x , y );
998 glTexCoord2f (0, t); glVertex2f (x , y + h); 1112 glTexCoord2f (0, t); glVertex2f (x , y + h);
999 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1113 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1032DESTROY (CFClient::Map self) 1146DESTROY (CFClient::Map self)
1033 CODE: 1147 CODE:
1034{ 1148{
1035 map_clear (self); 1149 map_clear (self);
1036 Safefree (self->face); 1150 Safefree (self->face);
1151 Safefree (self->tex);
1037 Safefree (self); 1152 Safefree (self);
1038} 1153}
1039 1154
1040void 1155void
1041clear (CFClient::Map self) 1156clear (CFClient::Map self)
1080 } 1195 }
1081 1196
1082 // somewhat hackish, but for textures that require it, it really 1197 // somewhat hackish, but for textures that require it, it really
1083 // improves the look, and most others don't suffer. 1198 // improves the look, and most others don't suffer.
1084 glBindTexture (GL_TEXTURE_2D, name); 1199 glBindTexture (GL_TEXTURE_2D, name);
1085 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1200 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1086 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1201 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1202 // use uglier nearest interpolation because linear suffers
1203 // from transparent color bleeding and ugly wrapping effects.
1204 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1087} 1205}
1088 1206
1089int 1207int
1090ox (CFClient::Map self) 1208ox (CFClient::Map self)
1091 ALIAS: 1209 ALIAS:
1092 oy = 1 1210 oy = 1
1211 x = 2
1212 y = 3
1213 w = 4
1214 h = 5
1093 CODE: 1215 CODE:
1094 switch (ix) 1216 switch (ix)
1095 { 1217 {
1096 case 0: RETVAL = self->ox; break; 1218 case 0: RETVAL = self->ox; break;
1097 case 1: RETVAL = self->oy; break; 1219 case 1: RETVAL = self->oy; break;
1220 case 2: RETVAL = self->x; break;
1221 case 3: RETVAL = self->y; break;
1222 case 4: RETVAL = self->w; break;
1223 case 5: RETVAL = self->h; break;
1098 } 1224 }
1099 OUTPUT: 1225 OUTPUT:
1100 RETVAL 1226 RETVAL
1101 1227
1102void 1228void
1136 1262
1137 while (data < data_end) 1263 while (data < data_end)
1138 { 1264 {
1139 flags = (data [0] << 8) + data [1]; data += 2; 1265 flags = (data [0] << 8) + data [1]; data += 2;
1140 1266
1141 x = ((flags >> 10) & 63) + self->x; 1267 x = self->x + ((flags >> 10) & 63);
1142 y = ((flags >> 4) & 63) + self->y; 1268 y = self->y + ((flags >> 4) & 63);
1143 1269
1144 cell = map_get_cell (self, x, y); 1270 cell = map_get_cell (self, x, y);
1145 1271
1146 if (flags & 15) 1272 if (flags & 15)
1147 { 1273 {
1237 OUTPUT: 1363 OUTPUT:
1238 RETVAL 1364 RETVAL
1239 1365
1240void 1366void
1241draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1367draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1242 PPCODE: 1368 CODE:
1243{ 1369{
1244 int vx, vy; 1370 int vx, vy;
1245 int x, y, z; 1371 int x, y, z;
1246 int last_name; 1372 int last_name;
1247 mapface face; 1373 mapface face;
1248 int sw4 = (sw + 3) & ~3;
1249 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1250 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1251 1374
1252 memset (darkness, 255, sw4 * sh);
1253 SvPOK_only (darkness_sv);
1254 SvCUR_set (darkness_sv, sw4 * sh);
1255
1256 vx = self->x + (self->w - sw) / 2 - shift_x; 1375 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1257 vy = self->y + (self->h - sh) / 2 - shift_y; 1376 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1258 1377
1259 /* 1378 /*
1260 int vx = self->vx = self->w >= sw 1379 int vx = self->vx = self->w >= sw
1261 ? self->x + (self->w - sw) / 2 1380 ? self->x + (self->w - sw) / 2
1262 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1381 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1266 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1385 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1267 */ 1386 */
1268 1387
1269 glColor4ub (255, 255, 255, 255); 1388 glColor4ub (255, 255, 255, 255);
1270 1389
1390 glEnable (GL_BLEND);
1271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1391 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1272 glEnable (GL_BLEND);
1273 glEnable (GL_TEXTURE_2D); 1392 glEnable (GL_TEXTURE_2D);
1274 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1393 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1275 1394
1276 glBegin (GL_QUADS); 1395 glBegin (GL_QUADS);
1277 1396
1285 1404
1286 for (x = 0; x < sw; x++) 1405 for (x = 0; x < sw; x++)
1287 if (row->c0 <= x + vx && x + vx < row->c1) 1406 if (row->c0 <= x + vx && x + vx < row->c1)
1288 { 1407 {
1289 mapcell *cell = row->col + (x + vx - row->c0); 1408 mapcell *cell = row->col + (x + vx - row->c0);
1290
1291 darkness[y * sw4 + x] = cell->darkness < 0
1292 ? 255 - FOW_DARKNESS
1293 : 255 - cell->darkness;
1294 1409
1295 face = cell->face [z]; 1410 face = cell->face [z];
1296 1411
1297 if (face) 1412 if (face)
1298 { 1413 {
1319 1434
1320 glEnd (); 1435 glEnd ();
1321 1436
1322 glDisable (GL_TEXTURE_2D); 1437 glDisable (GL_TEXTURE_2D);
1323 glDisable (GL_BLEND); 1438 glDisable (GL_BLEND);
1439}
1440
1441void
1442draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE:
1444{
1445 static float color[16][3] = {
1446 { 0.00F, 0.00F, 0.00F },
1447 { 1.00F, 1.00F, 1.00F },
1448 { 0.00F, 0.00F, 0.55F },
1449 { 1.00F, 0.00F, 0.00F },
1450
1451 { 1.00F, 0.54F, 0.00F },
1452 { 0.11F, 0.56F, 1.00F },
1453 { 0.93F, 0.46F, 0.00F },
1454 { 0.18F, 0.54F, 0.34F },
1455
1456 { 0.56F, 0.73F, 0.56F },
1457 { 0.80F, 0.80F, 0.80F },
1458 { 0.55F, 0.41F, 0.13F },
1459 { 0.99F, 0.77F, 0.26F },
1460
1461 { 0.74F, 0.65F, 0.41F },
1462
1463 { 0.00F, 1.00F, 1.00F },
1464 { 1.00F, 0.00F, 1.00F },
1465 { 1.00F, 1.00F, 0.00F },
1466 };
1467
1468 int x, y;
1469
1470 glEnable (GL_TEXTURE_2D);
1471 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1472 glEnable (GL_BLEND);
1473 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1474 glBegin (GL_QUADS);
1475
1476 for (y = 0; y < h; y++)
1477 for (x = 0; x < w; x++)
1478 {
1479 unsigned char m = data [x + y * w];
1480
1481 if (m)
1482 {
1483 float *c = color [m & 15];
1484
1485 float tx1 = m & 0x40 ? 0.5 : 0.;
1486 float tx2 = tx1 + 0.5;
1487
1488 glColor4f (c[0], c[1], c[2], 0.75);
1489 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1490 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1491 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1492 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1493 }
1494 }
1495
1496 glEnd ();
1497 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D);
1499}
1500
1501void
1502fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1503 PPCODE:
1504{
1505 int vx, vy;
1506 int x, y;
1507 int sw4 = (sw + 3) & ~3;
1508 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1509 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1510
1511 memset (darkness, 255, sw4 * sh);
1512 SvPOK_only (darkness_sv);
1513 SvCUR_set (darkness_sv, sw4 * sh);
1514
1515 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1516 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1517
1518 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows)
1520 {
1521 maprow *row = self->row + (y + vy);
1522
1523 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1)
1525 {
1526 mapcell *cell = row->col + (x + vx - row->c0);
1527
1528 darkness[y * sw4 + x] = cell->darkness < 0
1529 ? 255 - FOW_DARKNESS
1530 : 255 - cell->darkness;
1531 }
1532 }
1324 1533
1325 EXTEND (SP, 3); 1534 EXTEND (SP, 3);
1326 PUSHs (sv_2mortal (newSViv (sw4))); 1535 PUSHs (sv_2mortal (newSViv (sw4)));
1327 PUSHs (sv_2mortal (newSViv (sh))); 1536 PUSHs (sv_2mortal (newSViv (sh)));
1328 PUSHs (darkness_sv); 1537 PUSHs (darkness_sv);
1535 const_iv (GL_SCISSOR_TEST), 1744 const_iv (GL_SCISSOR_TEST),
1536 const_iv (GL_DEPTH_TEST), 1745 const_iv (GL_DEPTH_TEST),
1537 const_iv (GL_ALPHA_TEST), 1746 const_iv (GL_ALPHA_TEST),
1538 const_iv (GL_NORMALIZE), 1747 const_iv (GL_NORMALIZE),
1539 const_iv (GL_RESCALE_NORMAL), 1748 const_iv (GL_RESCALE_NORMAL),
1749 const_iv (GL_FRONT),
1750 const_iv (GL_BACK),
1540 const_iv (GL_AND), 1751 const_iv (GL_AND),
1541 const_iv (GL_ONE), 1752 const_iv (GL_ONE),
1542 const_iv (GL_ZERO), 1753 const_iv (GL_ZERO),
1543 const_iv (GL_SRC_ALPHA), 1754 const_iv (GL_SRC_ALPHA),
1544 const_iv (GL_SRC_ALPHA_SATURATE), 1755 const_iv (GL_DST_ALPHA),
1545 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1756 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1546 const_iv (GL_ONE_MINUS_DST_ALPHA), 1757 const_iv (GL_ONE_MINUS_DST_ALPHA),
1758 const_iv (GL_SRC_ALPHA_SATURATE),
1547 const_iv (GL_RGB), 1759 const_iv (GL_RGB),
1548 const_iv (GL_RGBA), 1760 const_iv (GL_RGBA),
1761 const_iv (GL_RGBA4),
1762 const_iv (GL_RGBA8),
1763 const_iv (GL_RGB5_A1),
1549 const_iv (GL_UNSIGNED_BYTE), 1764 const_iv (GL_UNSIGNED_BYTE),
1550 const_iv (GL_UNSIGNED_SHORT), 1765 const_iv (GL_UNSIGNED_SHORT),
1551 const_iv (GL_UNSIGNED_INT), 1766 const_iv (GL_UNSIGNED_INT),
1552 const_iv (GL_ALPHA), 1767 const_iv (GL_ALPHA),
1553 const_iv (GL_INTENSITY), 1768 const_iv (GL_INTENSITY),
1562 const_iv (GL_TEXTURE_MAG_FILTER), 1777 const_iv (GL_TEXTURE_MAG_FILTER),
1563 const_iv (GL_TEXTURE_MIN_FILTER), 1778 const_iv (GL_TEXTURE_MIN_FILTER),
1564 const_iv (GL_TEXTURE_ENV_MODE), 1779 const_iv (GL_TEXTURE_ENV_MODE),
1565 const_iv (GL_TEXTURE_WRAP_S), 1780 const_iv (GL_TEXTURE_WRAP_S),
1566 const_iv (GL_TEXTURE_WRAP_T), 1781 const_iv (GL_TEXTURE_WRAP_T),
1782 const_iv (GL_REPEAT),
1567 const_iv (GL_CLAMP), 1783 const_iv (GL_CLAMP),
1568 const_iv (GL_REPEAT), 1784 const_iv (GL_CLAMP_TO_EDGE),
1569 const_iv (GL_NEAREST), 1785 const_iv (GL_NEAREST),
1570 const_iv (GL_LINEAR), 1786 const_iv (GL_LINEAR),
1571 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1787 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1572 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1788 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1573 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1789 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1626 OUTPUT: 1842 OUTPUT:
1627 RETVAL 1843 RETVAL
1628 1844
1629int glGetError () 1845int glGetError ()
1630 1846
1847void glFinish ()
1848
1631void glClear (int mask) 1849void glClear (int mask)
1632 1850
1633void glClearColor (float r, float g, float b, float a = 1.0) 1851void glClearColor (float r, float g, float b, float a = 1.0)
1634 PROTOTYPE: @ 1852 PROTOTYPE: @
1635 1853
1641 1859
1642void glHint (int target, int mode) 1860void glHint (int target, int mode)
1643 1861
1644void glBlendFunc (int sfactor, int dfactor) 1862void glBlendFunc (int sfactor, int dfactor)
1645 1863
1864void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1865 CODE:
1866 gl_BlendFuncSeparate (sa, da, saa, daa);
1867
1646void glDepthMask (int flag) 1868void glDepthMask (int flag)
1647 1869
1648void glLogicOp (int opcode) 1870void glLogicOp (int opcode)
1649 1871
1650void glColorMask (int red, int green, int blue, int alpha) 1872void glColorMask (int red, int green, int blue, int alpha)
1654void glPushMatrix () 1876void glPushMatrix ()
1655 1877
1656void glPopMatrix () 1878void glPopMatrix ()
1657 1879
1658void glLoadIdentity () 1880void glLoadIdentity ()
1881
1882void glDrawBuffer (int buffer)
1883
1884void glReadBuffer (int buffer)
1659 1885
1660# near_ and far_ are due to microsofts buggy "c" compiler 1886# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1887void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662 1888
1663# near_ and far_ are due to microsofts buggy "c" compiler 1889# near_ and far_ are due to microsofts buggy "c" compiler
1683 1909
1684void glEnd () 1910void glEnd ()
1685 1911
1686void glColor (float r, float g, float b, float a = 1.0) 1912void glColor (float r, float g, float b, float a = 1.0)
1687 PROTOTYPE: @ 1913 PROTOTYPE: @
1914 ALIAS:
1915 glColor_premultiply = 1
1688 CODE: 1916 CODE:
1917 if (ix)
1918 {
1919 r *= a;
1920 g *= a;
1921 b *= a;
1922 }
1689 // microsoft visual "c" rounds instead of truncating... 1923 // microsoft visual "c" rounds instead of truncating...
1690 glColor4ub (MIN ((int)(r * 255.f), 255), 1924 glColor4f (r, g, b, a);
1691 MIN ((int)(g * 255.f), 255),
1692 MIN ((int)(b * 255.f), 255),
1693 MIN ((int)(a * 255.f), 255));
1694 1925
1695void glInterleavedArrays (int format, int stride, char *data) 1926void glInterleavedArrays (int format, int stride, char *data)
1696 1927
1697void glDrawElements (int mode, int count, int type, char *indices) 1928void glDrawElements (int mode, int count, int type, char *indices)
1698 1929
1721 1952
1722void glBindTexture (int target, int name) 1953void glBindTexture (int target, int name)
1723 1954
1724void glConvolutionParameter (int target, int pname, float params) 1955void glConvolutionParameter (int target, int pname, float params)
1725 CODE: 1956 CODE:
1726 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1957 if (gl.ConvolutionParameterf)
1958 gl.ConvolutionParameterf (target, pname, params);
1727 1959
1728void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1960void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729 CODE: 1961 CODE:
1730 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1962 if (gl.ConvolutionFilter2D)
1731 (target, internalformat, width, height, format, type, data)); 1963 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732 1964
1733void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1965void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1734 CODE: 1966 CODE:
1735 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1967 if (gl.SeparableFilter2D)
1736 (target, internalformat, width, height, format, type, row, column)); 1968 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737 1969
1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1970void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739 1971
1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1972void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741 1973

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines