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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.125 by root, Tue Jul 4 23:44:23 2006 UTC

10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
20#include <SDL_opengl.h> 21#include <SDL_opengl.h>
21 22
23#define PANGO_ENABLE_BACKEND
24#define G_DISABLE_CAST_CHECKS
25
22#include <glib/gmacros.h> 26#include <glib/gmacros.h>
23 27
24#include <pango/pango.h> 28#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 29
29#ifndef _WIN32 30#ifndef _WIN32
30# include <sys/types.h> 31# include <sys/types.h>
31# include <sys/socket.h> 32# include <sys/socket.h>
32# include <netinet/in.h> 33# include <netinet/in.h>
41 typedef signed int int32_t; 42 typedef signed int int32_t;
42#endif 43#endif
43 44
44#include "glext.h" 45#include "glext.h"
45 46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48
46#define FOW_DARKNESS 32 49#define FOW_DARKNESS 32
47 50
48#define MAP_EXTEND_X 32 51#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 52#define MAP_EXTEND_Y 512
50 53
51#define MIN_FONT_HEIGHT 10 54#define MIN_FONT_HEIGHT 10
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 ()
546
547char *
548SDL_GetKeyName (int sym)
490 549
491void 550void
492SDL_PollEvent () 551SDL_PollEvent ()
493 PPCODE: 552 PPCODE:
494{ 553{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 574 break;
516 575
517 case SDL_MOUSEMOTION: 576 case SDL_MOUSEMOTION:
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
578
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 584 break;
524 585
525 case SDL_MOUSEBUTTONDOWN: 586 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 587 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 590 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 591 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 592 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 593 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 594 break;
558 CODE: 621 CODE:
559#ifndef _WIN32 622#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 624#endif
562 625
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_version ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VERSION);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_extensions ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_EXTENSIONS);
581 OUTPUT:
582 RETVAL
583
584void 626void
585add_font (char *file) 627add_font (char *file)
586 CODE: 628 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
588#ifdef _WIN32
589 // cairo... sigh... requires win2000
590 AddFontResourceEx (file, FR_PRIVATE, 0);
591#endif
592 630
593void 631void
594load_image_inline (SV *image_) 632load_image_inline (SV *image_)
595 ALIAS: 633 ALIAS:
596 load_image_file = 1 634 load_image_file = 1
692 CODE: 730 CODE:
693 fprintf (stderr, "FATAL: %s\n", message); 731 fprintf (stderr, "FATAL: %s\n", message);
694#ifdef _WIN32 732#ifdef _WIN32
695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
696#endif 734#endif
697 exit (1); 735 _exit (1);
736
737void
738_exit (int retval)
739 CODE:
740 _exit (retval);
698 741
699MODULE = CFClient PACKAGE = CFClient::Font 742MODULE = CFClient PACKAGE = CFClient::Font
700 743
701CFClient::Font 744CFClient::Font
702new_from_file (SV *class, char *path, int id = 0) 745new_from_file (SV *class, char *path, int id = 0)
720 CODE: 763 CODE:
721 default_font = self; 764 default_font = self;
722 765
723MODULE = CFClient PACKAGE = CFClient::Layout 766MODULE = CFClient PACKAGE = CFClient::Layout
724 767
768void
769clear_font_cache ()
770 CODE:
771 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
772 tc_clear ();
773
725CFClient::Layout 774CFClient::Layout
726new (SV *class, int rgba = 0) 775new (SV *class, int type = 0)
727 CODE: 776 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
731 New (0, RETVAL, 1, struct cf_layout); 777 New (0, RETVAL, 1, struct cf_layout);
732 778
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 779 RETVAL->pl = pango_layout_new (opengl_context);
734 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 780 RETVAL->r = 1.;
736 RETVAL->g = 1.; 781 RETVAL->g = 1.;
737 RETVAL->b = 1.; 782 RETVAL->b = 1.;
738 RETVAL->a = 1.; 783 RETVAL->a = 1.;
739 RETVAL->base_height = MIN_FONT_HEIGHT; 784 RETVAL->base_height = MIN_FONT_HEIGHT;
748DESTROY (CFClient::Layout self) 793DESTROY (CFClient::Layout self)
749 CODE: 794 CODE:
750 g_object_unref (self->pl); 795 g_object_unref (self->pl);
751 Safefree (self); 796 Safefree (self);
752 797
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
760void 798void
761set_text (CFClient::Layout self, SV *text_) 799set_text (CFClient::Layout self, SV *text_)
762 CODE: 800 CODE:
763{ 801{
764 STRLEN textlen; 802 STRLEN textlen;
775 char *text = SvPVutf8 (text_, textlen); 813 char *text = SvPVutf8 (text_, textlen);
776 814
777 pango_layout_set_markup (self->pl, text, textlen); 815 pango_layout_set_markup (self->pl, text, textlen);
778} 816}
779 817
818void
819set_shapes (CFClient::Layout self, ...)
820 CODE:
821{
822 PangoAttrList *attrs = 0;
823 const char *text = pango_layout_get_text (self->pl);
824 const char *pos = text;
825 int arg = 4;
826
827 while (arg < items && (pos = strstr (pos, OBJ_STR)))
828 {
829 PangoRectangle inkrect, rect;
830 PangoAttribute *attr;
831
832 int x = SvIV (ST (arg - 3));
833 int y = SvIV (ST (arg - 2));
834 int w = SvIV (ST (arg - 1));
835 int h = SvIV (ST (arg ));
836
837 inkrect.x = 0;
838 inkrect.y = 0;
839 inkrect.width = 0;
840 inkrect.height = 0;
841
842 rect.x = x * PANGO_SCALE;
843 rect.y = y * PANGO_SCALE;
844 rect.width = w * PANGO_SCALE;
845 rect.height = h * PANGO_SCALE;
846
847 if (!attrs)
848 attrs = pango_layout_get_attributes (self->pl);
849
850 attr = pango_attr_shape_new (&inkrect, &rect);
851 attr->start_index = pos - text;
852 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
853 pango_attr_list_insert (attrs, attr);
854
855 arg += 4;
856 pos += sizeof (OBJ_STR) - 1;
857 }
858
859 if (attrs)
860 pango_layout_set_attributes (self->pl, attrs);
861}
862
863void
864get_shapes (CFClient::Layout self)
865 PPCODE:
866{
867 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
868
869 do
870 {
871 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
872
873 if (run && shape_attr_p (run))
874 {
875 PangoRectangle extents;
876 pango_layout_iter_get_run_extents (iter, 0, &extents);
877
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
879 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
880 }
881 }
882 while (pango_layout_iter_next_run (iter));
883
884 pango_layout_iter_free (iter);
885}
886
887int
888has_wrapped (CFClient::Layout self)
889 CODE:
890{
891 int lines = 1;
892 const char *text = pango_layout_get_text (self->pl);
893
894 while (*text)
895 lines += *text++ == '\n';
896
897 RETVAL = lines < pango_layout_get_line_count (self->pl);
898}
899 OUTPUT:
900 RETVAL
901
780SV * 902SV *
781get_text (CFClient::Layout self) 903get_text (CFClient::Layout self)
782 CODE: 904 CODE:
783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 905 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784 SvUTF8_on (RETVAL); 906 sv_utf8_decode (RETVAL);
785 OUTPUT: 907 OUTPUT:
786 RETVAL 908 RETVAL
787 909
788void 910void
789set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 911set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
853 PUSHs (sv_2mortal (newSViv (w))); 975 PUSHs (sv_2mortal (newSViv (w)));
854 PUSHs (sv_2mortal (newSViv (h))); 976 PUSHs (sv_2mortal (newSViv (h)));
855} 977}
856 978
857int 979int
980descent (CFClient::Layout self)
981 CODE:
982{
983 PangoRectangle rect;
984 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
985 pango_layout_line_get_pixel_extents (line, 0, &rect);
986 RETVAL = PANGO_DESCENT (rect);
987}
988 OUTPUT:
989 RETVAL
990
991int
858xy_to_index (CFClient::Layout self, int x, int y) 992xy_to_index (CFClient::Layout self, int x, int y)
859 CODE: 993 CODE:
860{ 994{
861 int index, trailing; 995 int index, trailing;
862 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 996 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
877 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1011 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1012 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879} 1013}
880 1014
881void 1015void
882render (CFClient::Layout self) 1016render (CFClient::Layout self, float x, float y)
883 PPCODE: 1017 PPCODE:
884{ 1018 pango_opengl_render_layout_subpixel (
885 SV *retval; 1019 self->pl,
886 int w, h; 1020 x * PANGO_SCALE, y * PANGO_SCALE,
1021 self->r, self->g, self->b, self->a
1022 );
887 1023
888 layout_get_pixel_size (self, &w, &h); 1024MODULE = CFClient PACKAGE = CFClient::Texture
889 1025
890 if (self->rgba) 1026void
1027pad2pot (SV *data_, SV *w_, SV *h_)
1028 CODE:
1029{
1030 int ow = SvIV (w_);
1031 int oh = SvIV (h_);
1032
1033 if (ow && oh)
891 { 1034 {
892 cairo_surface_t *surface; 1035 int nw = minpot (ow);
893 cairo_t *cairo; 1036 int nh = minpot (oh);
894 1037
895 retval = newSV (w * h * 4); 1038 if (nw != ow || nh != oh)
896 SvPOK_only (retval);
897 SvCUR_set (retval, w * h * 4);
898
899 memset (SvPVX (retval), 0, w * h * 4);
900
901 surface = cairo_image_surface_create_for_data (
902 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
903 cairo = cairo_create (surface);
904 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
905
906 pango_cairo_show_layout (cairo, self->pl);
907
908 cairo_destroy (cairo);
909 cairo_surface_destroy (surface);
910
911 // what a mess, and its premultiplied, too :(
912 { 1039 {
913 uint32_t *p = (uint32_t *)SvPVX (retval); 1040 if (SvOK (data_))
914 uint32_t *e = p + w * h;
915
916 while (p < e)
917 { 1041 {
918 uint32_t rgba = *p; 1042 STRLEN datalen;
919 rgba = (rgba >> 24) | (rgba << 8); 1043 char *data = SvPVbyte (data_, datalen);
920#if 0 1044 int bpp = datalen / (ow * oh);
921#ifdef _WIN32 1045 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
922 {//D
923 uint8_t r = rgba >> 24;
924 uint8_t g = rgba >> 16;
925 uint8_t b = rgba >> 8;
926 uint8_t a = rgba >> 0;
927 1046
928 rgba = (rgba & 0xffffff00) | a; 1047 SvPOK_only (result_);
1048 SvCUR_set (result_, nw * nh * bpp);
1049
1050 memset (SvPVX (result_), 0, nw * nh * bpp);
1051 while (oh--)
1052 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1053
1054 sv_setsv (data_, result_);
929 } 1055 }
930#endif 1056
931#endif 1057 sv_setiv (w_, nw);
932 rgba = SDL_SwapBE32 (rgba); 1058 sv_setiv (h_, nh);
933 *p++ = rgba;
934 } 1059 }
935 }
936
937 EXTEND (SP, 5);
938 PUSHs (sv_2mortal (newSViv (w)));
939 PUSHs (sv_2mortal (newSViv (h)));
940 PUSHs (sv_2mortal (retval));
941 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 } 1060 }
944 else
945 {
946 FT_Bitmap bitmap;
947
948 retval = newSV (w * h);
949 SvPOK_only (retval);
950 SvCUR_set (retval, w * h);
951
952 bitmap.rows = h;
953 bitmap.width = w;
954 bitmap.pitch = w;
955 bitmap.buffer = (unsigned char*)SvPVX (retval);
956 bitmap.num_grays = 256;
957 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
958
959 memset (bitmap.buffer, 0, w * h);
960
961 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
962
963 EXTEND (SP, 5);
964 PUSHs (sv_2mortal (newSViv (w)));
965 PUSHs (sv_2mortal (newSViv (h)));
966 PUSHs (sv_2mortal (retval));
967 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
968 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
969 }
970} 1061}
971 1062
972MODULE = CFClient PACKAGE = CFClient::Texture
973
974void 1063void
975draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1064draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
976 PROTOTYPE: $$$;$$ 1065 PROTOTYPE: $$$;$$
977 ALIAS: 1066 ALIAS:
978 draw_quad_alpha = 1 1067 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2 1068 draw_quad_alpha_premultiplied = 2
980 CODE: 1069 CODE:
981{ 1070{
982 HV *hv = (HV *)SvRV (self); 1071 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1072 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1073 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1074 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 1075
988 if (items < 5) 1076 if (items < 5)
989 { 1077 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1078 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1079 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 1080 }
993 1081
994 if (ix) 1082 if (ix)
995 { 1083 {
996 glEnable (GL_BLEND); 1084 glEnable (GL_BLEND);
1085
1086 if (ix == 2)
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1087 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1088 else
1089 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1090 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1091
998 glEnable (GL_ALPHA_TEST); 1092 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1093 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1094 }
1001 1095
1002 glBindTexture (GL_TEXTURE_2D, name); 1096 glBindTexture (GL_TEXTURE_2D, name);
1003
1004 if (wrap_mode)
1005 {
1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008 }
1009 1097
1010 glBegin (GL_QUADS); 1098 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1099 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1100 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1101 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1046DESTROY (CFClient::Map self) 1134DESTROY (CFClient::Map self)
1047 CODE: 1135 CODE:
1048{ 1136{
1049 map_clear (self); 1137 map_clear (self);
1050 Safefree (self->face); 1138 Safefree (self->face);
1139 Safefree (self->tex);
1051 Safefree (self); 1140 Safefree (self);
1052} 1141}
1053 1142
1054void 1143void
1055clear (CFClient::Map self) 1144clear (CFClient::Map self)
1090 tex->r = r; 1179 tex->r = r;
1091 tex->g = g; 1180 tex->g = g;
1092 tex->b = b; 1181 tex->b = b;
1093 tex->a = a; 1182 tex->a = a;
1094 } 1183 }
1184
1185 // somewhat hackish, but for textures that require it, it really
1186 // improves the look, and most others don't suffer.
1187 glBindTexture (GL_TEXTURE_2D, name);
1188 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1189 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1190 // use uglier nearest interpolation because linear suffers
1191 // from transparent color bleeding and ugly wrapping effects.
1192 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095} 1193}
1096 1194
1097int 1195int
1098ox (CFClient::Map self) 1196ox (CFClient::Map self)
1099 ALIAS: 1197 ALIAS:
1100 oy = 1 1198 oy = 1
1199 x = 2
1200 y = 3
1201 w = 4
1202 h = 5
1101 CODE: 1203 CODE:
1102 switch (ix) 1204 switch (ix)
1103 { 1205 {
1104 case 0: RETVAL = self->ox; break; 1206 case 0: RETVAL = self->ox; break;
1105 case 1: RETVAL = self->oy; break; 1207 case 1: RETVAL = self->oy; break;
1208 case 2: RETVAL = self->x; break;
1209 case 3: RETVAL = self->y; break;
1210 case 4: RETVAL = self->w; break;
1211 case 5: RETVAL = self->h; break;
1106 } 1212 }
1107 OUTPUT: 1213 OUTPUT:
1108 RETVAL 1214 RETVAL
1109 1215
1110void 1216void
1144 1250
1145 while (data < data_end) 1251 while (data < data_end)
1146 { 1252 {
1147 flags = (data [0] << 8) + data [1]; data += 2; 1253 flags = (data [0] << 8) + data [1]; data += 2;
1148 1254
1149 x = ((flags >> 10) & 63) + self->x; 1255 x = self->x + ((flags >> 10) & 63);
1150 y = ((flags >> 4) & 63) + self->y; 1256 y = self->y + ((flags >> 4) & 63);
1151 1257
1152 cell = map_get_cell (self, x, y); 1258 cell = map_get_cell (self, x, y);
1153 1259
1154 if (flags & 15) 1260 if (flags & 15)
1155 { 1261 {
1245 OUTPUT: 1351 OUTPUT:
1246 RETVAL 1352 RETVAL
1247 1353
1248void 1354void
1249draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1355draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1250 PPCODE: 1356 CODE:
1251{ 1357{
1252 int vx, vy; 1358 int vx, vy;
1253 int x, y, z; 1359 int x, y, z;
1254 int last_name; 1360 int last_name;
1255 mapface face; 1361 mapface face;
1256 int sw4 = (sw + 3) & ~3;
1257 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1258 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1259 1362
1260 memset (darkness, 255, sw4 * sh);
1261 SvPOK_only (darkness_sv);
1262 SvCUR_set (darkness_sv, sw4 * sh);
1263
1264 vx = self->x + (self->w - sw) / 2 - shift_x; 1363 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1265 vy = self->y + (self->h - sh) / 2 - shift_y; 1364 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1266 1365
1267 /* 1366 /*
1268 int vx = self->vx = self->w >= sw 1367 int vx = self->vx = self->w >= sw
1269 ? self->x + (self->w - sw) / 2 1368 ? self->x + (self->w - sw) / 2
1270 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1369 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1274 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1373 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275 */ 1374 */
1276 1375
1277 glColor4ub (255, 255, 255, 255); 1376 glColor4ub (255, 255, 255, 255);
1278 1377
1378 glEnable (GL_BLEND);
1279 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280 glEnable (GL_BLEND);
1281 glEnable (GL_TEXTURE_2D); 1380 glEnable (GL_TEXTURE_2D);
1282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1381 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283 1382
1284 glBegin (GL_QUADS); 1383 glBegin (GL_QUADS);
1285 1384
1293 1392
1294 for (x = 0; x < sw; x++) 1393 for (x = 0; x < sw; x++)
1295 if (row->c0 <= x + vx && x + vx < row->c1) 1394 if (row->c0 <= x + vx && x + vx < row->c1)
1296 { 1395 {
1297 mapcell *cell = row->col + (x + vx - row->c0); 1396 mapcell *cell = row->col + (x + vx - row->c0);
1298
1299 darkness[y * sw4 + x] = cell->darkness < 0
1300 ? 255 - FOW_DARKNESS
1301 : 255 - cell->darkness;
1302 1397
1303 face = cell->face [z]; 1398 face = cell->face [z];
1304 1399
1305 if (face) 1400 if (face)
1306 { 1401 {
1327 1422
1328 glEnd (); 1423 glEnd ();
1329 1424
1330 glDisable (GL_TEXTURE_2D); 1425 glDisable (GL_TEXTURE_2D);
1331 glDisable (GL_BLEND); 1426 glDisable (GL_BLEND);
1427}
1428
1429void
1430draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1431 CODE:
1432{
1433 static float color[16][3] = {
1434 { 0.00F, 0.00F, 0.00F },
1435 { 1.00F, 1.00F, 1.00F },
1436 { 0.00F, 0.00F, 0.55F },
1437 { 1.00F, 0.00F, 0.00F },
1438
1439 { 1.00F, 0.54F, 0.00F },
1440 { 0.11F, 0.56F, 1.00F },
1441 { 0.93F, 0.46F, 0.00F },
1442 { 0.18F, 0.54F, 0.34F },
1443
1444 { 0.56F, 0.73F, 0.56F },
1445 { 0.80F, 0.80F, 0.80F },
1446 { 0.55F, 0.41F, 0.13F },
1447 { 0.99F, 0.77F, 0.26F },
1448
1449 { 0.74F, 0.65F, 0.41F },
1450
1451 { 0.00F, 1.00F, 1.00F },
1452 { 1.00F, 0.00F, 1.00F },
1453 { 1.00F, 1.00F, 0.00F },
1454 };
1455
1456 int x, y;
1457
1458 glEnable (GL_TEXTURE_2D);
1459 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1460 glEnable (GL_BLEND);
1461 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1462 glBegin (GL_QUADS);
1463
1464 for (y = 0; y < h; y++)
1465 for (x = 0; x < w; x++)
1466 {
1467 unsigned char m = data [x + y * w];
1468
1469 if (m)
1470 {
1471 float *c = color [m & 15];
1472
1473 float tx1 = m & 0x40 ? 0.5 : 0.;
1474 float tx2 = tx1 + 0.5;
1475
1476 glColor4f (c[0], c[1], c[2], 0.75);
1477 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1478 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1479 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1480 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1481 }
1482 }
1483
1484 glEnd ();
1485 glDisable (GL_BLEND);
1486 glDisable (GL_TEXTURE_2D);
1487}
1488
1489void
1490fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1491 PPCODE:
1492{
1493 int vx, vy;
1494 int x, y;
1495 int sw4 = (sw + 3) & ~3;
1496 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1497 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1498
1499 memset (darkness, 255, sw4 * sh);
1500 SvPOK_only (darkness_sv);
1501 SvCUR_set (darkness_sv, sw4 * sh);
1502
1503 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1504 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1505
1506 for (y = 0; y < sh; y++)
1507 if (0 <= y + vy && y + vy < self->rows)
1508 {
1509 maprow *row = self->row + (y + vy);
1510
1511 for (x = 0; x < sw; x++)
1512 if (row->c0 <= x + vx && x + vx < row->c1)
1513 {
1514 mapcell *cell = row->col + (x + vx - row->c0);
1515
1516 darkness[y * sw4 + x] = cell->darkness < 0
1517 ? 255 - FOW_DARKNESS
1518 : 255 - cell->darkness;
1519 }
1520 }
1332 1521
1333 EXTEND (SP, 3); 1522 EXTEND (SP, 3);
1334 PUSHs (sv_2mortal (newSViv (sw4))); 1523 PUSHs (sv_2mortal (newSViv (sw4)));
1335 PUSHs (sv_2mortal (newSViv (sh))); 1524 PUSHs (sv_2mortal (newSViv (sh)));
1336 PUSHs (darkness_sv); 1525 PUSHs (darkness_sv);
1543 const_iv (GL_SCISSOR_TEST), 1732 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST), 1733 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST), 1734 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE), 1735 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL), 1736 const_iv (GL_RESCALE_NORMAL),
1737 const_iv (GL_FRONT),
1738 const_iv (GL_BACK),
1548 const_iv (GL_AND), 1739 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1740 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1741 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1742 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1743 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1744 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1745 const_iv (GL_ONE_MINUS_DST_ALPHA),
1746 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1747 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1748 const_iv (GL_RGBA),
1749 const_iv (GL_RGBA4),
1750 const_iv (GL_RGBA8),
1751 const_iv (GL_RGB5_A1),
1557 const_iv (GL_UNSIGNED_BYTE), 1752 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1753 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1754 const_iv (GL_UNSIGNED_INT),
1560 const_iv (GL_ALPHA), 1755 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY), 1756 const_iv (GL_INTENSITY),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1765 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1766 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1767 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1768 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1769 const_iv (GL_TEXTURE_WRAP_T),
1770 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1771 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1772 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1773 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1774 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1775 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1776 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1777 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1611 1807
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1808 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1809 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1810}
1615 1811
1812char *
1813gl_vendor ()
1814 CODE:
1815 RETVAL = (char *)glGetString (GL_VENDOR);
1816 OUTPUT:
1817 RETVAL
1818
1819char *
1820gl_version ()
1821 CODE:
1822 RETVAL = (char *)glGetString (GL_VERSION);
1823 OUTPUT:
1824 RETVAL
1825
1826char *
1827gl_extensions ()
1828 CODE:
1829 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1830 OUTPUT:
1831 RETVAL
1832
1616int glGetError () 1833int glGetError ()
1834
1835void glFinish ()
1617 1836
1618void glClear (int mask) 1837void glClear (int mask)
1619 1838
1620void glClearColor (float r, float g, float b, float a = 1.0) 1839void glClearColor (float r, float g, float b, float a = 1.0)
1621 PROTOTYPE: @ 1840 PROTOTYPE: @
1628 1847
1629void glHint (int target, int mode) 1848void glHint (int target, int mode)
1630 1849
1631void glBlendFunc (int sfactor, int dfactor) 1850void glBlendFunc (int sfactor, int dfactor)
1632 1851
1852void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1853 CODE:
1854 gl_BlendFuncSeparate (sa, da, saa, daa);
1855
1633void glDepthMask (int flag) 1856void glDepthMask (int flag)
1634 1857
1635void glLogicOp (int opcode) 1858void glLogicOp (int opcode)
1636 1859
1637void glColorMask (int red, int green, int blue, int alpha) 1860void glColorMask (int red, int green, int blue, int alpha)
1641void glPushMatrix () 1864void glPushMatrix ()
1642 1865
1643void glPopMatrix () 1866void glPopMatrix ()
1644 1867
1645void glLoadIdentity () 1868void glLoadIdentity ()
1869
1870void glDrawBuffer (int buffer)
1871
1872void glReadBuffer (int buffer)
1646 1873
1647# near_ and far_ are due to microsofts buggy "c" compiler 1874# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1875void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649 1876
1650# near_ and far_ are due to microsofts buggy "c" compiler 1877# near_ and far_ are due to microsofts buggy "c" compiler
1670 1897
1671void glEnd () 1898void glEnd ()
1672 1899
1673void glColor (float r, float g, float b, float a = 1.0) 1900void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 1901 PROTOTYPE: @
1902 ALIAS:
1903 glColor_premultiply = 1
1675 CODE: 1904 CODE:
1905 if (ix)
1906 {
1907 r *= a;
1908 g *= a;
1909 b *= a;
1910 }
1676 // microsoft visual "c" rounds instead of truncating... 1911 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 1912 glColor4ub (MIN ((int)(r * 256.f), 255),
1678 MIN ((int)(g * 255.f), 255), 1913 MIN ((int)(g * 256.f), 255),
1679 MIN ((int)(b * 255.f), 255), 1914 MIN ((int)(b * 256.f), 255),
1680 MIN ((int)(a * 255.f), 255)); 1915 MIN ((int)(a * 256.f), 255));
1681 1916
1682void glInterleavedArrays (int format, int stride, char *data) 1917void glInterleavedArrays (int format, int stride, char *data)
1683 1918
1684void glDrawElements (int mode, int count, int type, char *indices) 1919void glDrawElements (int mode, int count, int type, char *indices)
1685 1920
1708 1943
1709void glBindTexture (int target, int name) 1944void glBindTexture (int target, int name)
1710 1945
1711void glConvolutionParameter (int target, int pname, float params) 1946void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 1947 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1948 if (gl.ConvolutionParameterf)
1949 gl.ConvolutionParameterf (target, pname, params);
1714 1950
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1951void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 1952 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1953 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 1954 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 1955
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1956void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 1957 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1958 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 1959 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 1960
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1961void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 1962
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1963void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 1964

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines