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.124 by root, Tue Jul 4 23:23:31 2006 UTC

10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
20#include <SDL_opengl.h> 21#include <SDL_opengl.h>
21 22
23#define PANGO_ENABLE_BACKEND
24#define G_DISABLE_CAST_CHECKS
25
22#include <glib/gmacros.h> 26#include <glib/gmacros.h>
23 27
24#include <pango/pango.h> 28#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 29
29#ifndef _WIN32 30#ifndef _WIN32
30# include <sys/types.h> 31# include <sys/types.h>
31# include <sys/socket.h> 32# include <sys/socket.h>
32# include <netinet/in.h> 33# include <netinet/in.h>
41 typedef signed int int32_t; 42 typedef signed int int32_t;
42#endif 43#endif
43 44
44#include "glext.h" 45#include "glext.h"
45 46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48
46#define FOW_DARKNESS 32 49#define FOW_DARKNESS 32
47 50
48#define MAP_EXTEND_X 32 51#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 52#define MAP_EXTEND_Y 512
50 53
51#define MIN_FONT_HEIGHT 10 54#define MIN_FONT_HEIGHT 10
52 55
53#define GL_CALL(type,func,args) \ 56#if 1
54 { \ 57# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 58#else
56 static type fptr_; \ 59# define PARACHUTE 0
57 \ 60#endif
58 if (!init_) \ 61
59 { \ 62static struct
60 init_ = 1; \ 63{
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 64#define GL_FUNC(ptr,name) ptr name;
62 } \ 65#include "glfunc.h"
63 \ 66#undef GL_FUNC
64 if (fptr_) \ 67} gl;
65 fptr_ args; \ 68
66 } 69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{
71 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else
76 glBlendFunc (sa, da);
77}
78
79#include "texcache.c"
80
81#include "pango-font.c"
82#include "pango-fontmap.c"
83#include "pango-render.c"
67 84
68typedef Mix_Chunk *CFClient__MixChunk; 85typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 86typedef Mix_Music *CFClient__MixMusic;
70 87
71typedef PangoFontDescription *CFClient__Font; 88typedef PangoFontDescription *CFClient__Font;
72 89
90static int
91shape_attr_p (PangoLayoutRun *run)
92{
93 GSList *attrs = run->item->analysis.extra_attrs;
94
95 while (attrs)
96 {
97 PangoAttribute *attr = attrs->data;
98
99 if (attr->klass->type == PANGO_ATTR_SHAPE)
100 return 1;
101
102 attrs = attrs->next;
103 }
104
105 return 0;
106}
107
73typedef struct cf_layout { 108typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 109 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 110 float r, g, b, a; // default color for rgba mode
77 int base_height; 111 int base_height;
78 CFClient__Font font; 112 CFClient__Font font;
79} *CFClient__Layout; 113} *CFClient__Layout;
80 114
81static CFClient__Font default_font; 115static CFClient__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 116static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 117static PangoFontMap *opengl_fontmap;
84 118
85static void 119static void
86substitute_func (FcPattern *pattern, gpointer data) 120substitute_func (FcPattern *pattern, gpointer data)
87{ 121{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 122 FcPatternAddBool (pattern, FC_HINTING, 1);
123#ifdef FC_HINT_STYLE
124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif
89#ifdef _WIN32 126#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else 128#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif 130#endif
294 ev.code = 1; 331 ev.code = 1;
295 ev.data1 = (void *)(long)channel; 332 ev.data1 = (void *)(long)channel;
296 ev.data2 = 0; 333 ev.data2 = 0;
297 334
298 SDL_PushEvent ((SDL_Event *)&ev); 335 SDL_PushEvent ((SDL_Event *)&ev);
336}
337
338static unsigned int
339minpot (unsigned int n)
340{
341 if (!n)
342 return 0;
343
344 --n;
345
346 n |= n >> 1;
347 n |= n >> 2;
348 n |= n >> 4;
349 n |= n >> 8;
350 n |= n >> 16;
351
352 return n + 1;
299} 353}
300 354
301MODULE = CFClient PACKAGE = CFClient 355MODULE = CFClient PACKAGE = CFClient
302 356
303PROTOTYPES: ENABLE 357PROTOTYPES: ENABLE
413 467
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 470}
417 471
472NV floor (NV x)
473
474NV ceil (NV x)
475
418void 476void
419pango_init () 477pango_init ()
420 CODE: 478 CODE:
421{ 479{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 480 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 481 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 482 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 483}
430 484
431int 485int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 486SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 487
434void 488void
435SDL_Quit () 489SDL_Quit ()
436 490
437void 491void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 498 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 499 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 500 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 501
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 502 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 503 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 504
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 505 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
479SDL_SetVideoMode (int w, int h, int fullscreen) 533SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 534 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 535 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 536 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 537 );
538 if (RETVAL)
539 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 540 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
541# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
542# include "glfunc.h"
543# undef GL_FUNC
544 }
485 OUTPUT: 545 OUTPUT:
486 RETVAL 546 RETVAL
487 547
488void 548void
489SDL_GL_SwapBuffers () 549SDL_GL_SwapBuffers ()
550
551char *
552SDL_GetKeyName (int sym)
490 553
491void 554void
492SDL_PollEvent () 555SDL_PollEvent ()
493 PPCODE: 556 PPCODE:
494{ 557{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 576 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 577 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 578 break;
516 579
517 case SDL_MOUSEMOTION: 580 case SDL_MOUSEMOTION:
581 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
582
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 583 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 584 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 585 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 586 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 587 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 588 break;
524 589
525 case SDL_MOUSEBUTTONDOWN: 590 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 591 case SDL_MOUSEBUTTONUP:
592 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
593
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 594 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 595 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 596 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 597 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 598 break;
558 CODE: 625 CODE:
559#ifndef _WIN32 626#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 627 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 628#endif
562 629
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 630void
585add_font (char *file) 631add_font (char *file)
586 CODE: 632 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 633 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 634
593void 635void
594load_image_inline (SV *image_) 636load_image_inline (SV *image_)
595 ALIAS: 637 ALIAS:
596 load_image_file = 1 638 load_image_file = 1
692 CODE: 734 CODE:
693 fprintf (stderr, "FATAL: %s\n", message); 735 fprintf (stderr, "FATAL: %s\n", message);
694#ifdef _WIN32 736#ifdef _WIN32
695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
696#endif 738#endif
697 exit (1); 739 _exit (1);
740
741void
742_exit (int retval)
743 CODE:
744 _exit (retval);
698 745
699MODULE = CFClient PACKAGE = CFClient::Font 746MODULE = CFClient PACKAGE = CFClient::Font
700 747
701CFClient::Font 748CFClient::Font
702new_from_file (SV *class, char *path, int id = 0) 749new_from_file (SV *class, char *path, int id = 0)
720 CODE: 767 CODE:
721 default_font = self; 768 default_font = self;
722 769
723MODULE = CFClient PACKAGE = CFClient::Layout 770MODULE = CFClient PACKAGE = CFClient::Layout
724 771
772void
773clear_font_cache ()
774 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear ();
777
725CFClient::Layout 778CFClient::Layout
726new (SV *class, int rgba = 0) 779new (SV *class, int type = 0)
727 CODE: 780 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
731 New (0, RETVAL, 1, struct cf_layout); 781 New (0, RETVAL, 1, struct cf_layout);
732 782
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 783 RETVAL->pl = pango_layout_new (opengl_context);
734 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 784 RETVAL->r = 1.;
736 RETVAL->g = 1.; 785 RETVAL->g = 1.;
737 RETVAL->b = 1.; 786 RETVAL->b = 1.;
738 RETVAL->a = 1.; 787 RETVAL->a = 1.;
739 RETVAL->base_height = MIN_FONT_HEIGHT; 788 RETVAL->base_height = MIN_FONT_HEIGHT;
748DESTROY (CFClient::Layout self) 797DESTROY (CFClient::Layout self)
749 CODE: 798 CODE:
750 g_object_unref (self->pl); 799 g_object_unref (self->pl);
751 Safefree (self); 800 Safefree (self);
752 801
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
760void 802void
761set_text (CFClient::Layout self, SV *text_) 803set_text (CFClient::Layout self, SV *text_)
762 CODE: 804 CODE:
763{ 805{
764 STRLEN textlen; 806 STRLEN textlen;
775 char *text = SvPVutf8 (text_, textlen); 817 char *text = SvPVutf8 (text_, textlen);
776 818
777 pango_layout_set_markup (self->pl, text, textlen); 819 pango_layout_set_markup (self->pl, text, textlen);
778} 820}
779 821
822void
823set_shapes (CFClient::Layout self, ...)
824 CODE:
825{
826 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text;
829 int arg = 4;
830
831 while (arg < items && (pos = strstr (pos, OBJ_STR)))
832 {
833 PangoRectangle inkrect, rect;
834 PangoAttribute *attr;
835
836 int x = SvIV (ST (arg - 3));
837 int y = SvIV (ST (arg - 2));
838 int w = SvIV (ST (arg - 1));
839 int h = SvIV (ST (arg ));
840
841 inkrect.x = 0;
842 inkrect.y = 0;
843 inkrect.width = 0;
844 inkrect.height = 0;
845
846 rect.x = x * PANGO_SCALE;
847 rect.y = y * PANGO_SCALE;
848 rect.width = w * PANGO_SCALE;
849 rect.height = h * PANGO_SCALE;
850
851 if (!attrs)
852 attrs = pango_layout_get_attributes (self->pl);
853
854 attr = pango_attr_shape_new (&inkrect, &rect);
855 attr->start_index = pos - text;
856 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
857 pango_attr_list_insert (attrs, attr);
858
859 arg += 4;
860 pos += sizeof (OBJ_STR) - 1;
861 }
862
863 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs);
865}
866
867void
868get_shapes (CFClient::Layout self)
869 PPCODE:
870{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872
873 do
874 {
875 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
876
877 if (run && shape_attr_p (run))
878 {
879 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents);
881
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 }
885 }
886 while (pango_layout_iter_next_run (iter));
887
888 pango_layout_iter_free (iter);
889}
890
891int
892has_wrapped (CFClient::Layout self)
893 CODE:
894{
895 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl);
897
898 while (*text)
899 lines += *text++ == '\n';
900
901 RETVAL = lines < pango_layout_get_line_count (self->pl);
902}
903 OUTPUT:
904 RETVAL
905
780SV * 906SV *
781get_text (CFClient::Layout self) 907get_text (CFClient::Layout self)
782 CODE: 908 CODE:
783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784 SvUTF8_on (RETVAL); 910 sv_utf8_decode (RETVAL);
785 OUTPUT: 911 OUTPUT:
786 RETVAL 912 RETVAL
787 913
788void 914void
789set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
853 PUSHs (sv_2mortal (newSViv (w))); 979 PUSHs (sv_2mortal (newSViv (w)));
854 PUSHs (sv_2mortal (newSViv (h))); 980 PUSHs (sv_2mortal (newSViv (h)));
855} 981}
856 982
857int 983int
984descent (CFClient::Layout self)
985 CODE:
986{
987 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect);
990 RETVAL = PANGO_DESCENT (rect);
991}
992 OUTPUT:
993 RETVAL
994
995int
858xy_to_index (CFClient::Layout self, int x, int y) 996xy_to_index (CFClient::Layout self, int x, int y)
859 CODE: 997 CODE:
860{ 998{
861 int index, trailing; 999 int index, trailing;
862 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
877 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879} 1017}
880 1018
881void 1019void
882render (CFClient::Layout self) 1020render (CFClient::Layout self, float x, float y)
883 PPCODE: 1021 PPCODE:
884{ 1022 pango_opengl_render_layout_subpixel (
885 SV *retval; 1023 self->pl,
886 int w, h; 1024 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a
1026 );
887 1027
888 layout_get_pixel_size (self, &w, &h); 1028MODULE = CFClient PACKAGE = CFClient::Texture
889 1029
890 if (self->rgba) 1030void
1031pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE:
1033{
1034 int ow = SvIV (w_);
1035 int oh = SvIV (h_);
1036
1037 if (ow && oh)
891 { 1038 {
892 cairo_surface_t *surface; 1039 int nw = minpot (ow);
893 cairo_t *cairo; 1040 int nh = minpot (oh);
894 1041
895 retval = newSV (w * h * 4); 1042 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 { 1043 {
913 uint32_t *p = (uint32_t *)SvPVX (retval); 1044 if (SvOK (data_))
914 uint32_t *e = p + w * h;
915
916 while (p < e)
917 { 1045 {
918 uint32_t rgba = *p; 1046 STRLEN datalen;
919 rgba = (rgba >> 24) | (rgba << 8); 1047 char *data = SvPVbyte (data_, datalen);
920#if 0 1048 int bpp = datalen / (ow * oh);
921#ifdef _WIN32 1049 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 1050
928 rgba = (rgba & 0xffffff00) | a; 1051 SvPOK_only (result_);
1052 SvCUR_set (result_, nw * nh * bpp);
1053
1054 memset (SvPVX (result_), 0, nw * nh * bpp);
1055 while (oh--)
1056 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1057
1058 sv_setsv (data_, result_);
929 } 1059 }
930#endif 1060
931#endif 1061 sv_setiv (w_, nw);
932 rgba = SDL_SwapBE32 (rgba); 1062 sv_setiv (h_, nh);
933 *p++ = rgba;
934 } 1063 }
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 } 1064 }
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} 1065}
971 1066
972MODULE = CFClient PACKAGE = CFClient::Texture
973
974void 1067void
975draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1068draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
976 PROTOTYPE: $$$;$$ 1069 PROTOTYPE: $$$;$$
977 ALIAS: 1070 ALIAS:
978 draw_quad_alpha = 1 1071 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2 1072 draw_quad_alpha_premultiplied = 2
980 CODE: 1073 CODE:
981{ 1074{
982 HV *hv = (HV *)SvRV (self); 1075 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1076 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1077 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1078 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 1079
988 if (items < 5) 1080 if (items < 5)
989 { 1081 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1082 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1083 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 1084 }
993 1085
994 if (ix) 1086 if (ix)
995 { 1087 {
996 glEnable (GL_BLEND); 1088 glEnable (GL_BLEND);
1089
1090 if (ix == 2)
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1091 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1092 else
1093 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1094 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1095
998 glEnable (GL_ALPHA_TEST); 1096 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1097 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1098 }
1001 1099
1002 glBindTexture (GL_TEXTURE_2D, name); 1100 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 1101
1010 glBegin (GL_QUADS); 1102 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1103 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1104 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1105 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1046DESTROY (CFClient::Map self) 1138DESTROY (CFClient::Map self)
1047 CODE: 1139 CODE:
1048{ 1140{
1049 map_clear (self); 1141 map_clear (self);
1050 Safefree (self->face); 1142 Safefree (self->face);
1143 Safefree (self->tex);
1051 Safefree (self); 1144 Safefree (self);
1052} 1145}
1053 1146
1054void 1147void
1055clear (CFClient::Map self) 1148clear (CFClient::Map self)
1090 tex->r = r; 1183 tex->r = r;
1091 tex->g = g; 1184 tex->g = g;
1092 tex->b = b; 1185 tex->b = b;
1093 tex->a = a; 1186 tex->a = a;
1094 } 1187 }
1188
1189 // somewhat hackish, but for textures that require it, it really
1190 // improves the look, and most others don't suffer.
1191 glBindTexture (GL_TEXTURE_2D, name);
1192 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1193 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1194 // use uglier nearest interpolation because linear suffers
1195 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095} 1197}
1096 1198
1097int 1199int
1098ox (CFClient::Map self) 1200ox (CFClient::Map self)
1099 ALIAS: 1201 ALIAS:
1100 oy = 1 1202 oy = 1
1203 x = 2
1204 y = 3
1205 w = 4
1206 h = 5
1101 CODE: 1207 CODE:
1102 switch (ix) 1208 switch (ix)
1103 { 1209 {
1104 case 0: RETVAL = self->ox; break; 1210 case 0: RETVAL = self->ox; break;
1105 case 1: RETVAL = self->oy; break; 1211 case 1: RETVAL = self->oy; break;
1212 case 2: RETVAL = self->x; break;
1213 case 3: RETVAL = self->y; break;
1214 case 4: RETVAL = self->w; break;
1215 case 5: RETVAL = self->h; break;
1106 } 1216 }
1107 OUTPUT: 1217 OUTPUT:
1108 RETVAL 1218 RETVAL
1109 1219
1110void 1220void
1144 1254
1145 while (data < data_end) 1255 while (data < data_end)
1146 { 1256 {
1147 flags = (data [0] << 8) + data [1]; data += 2; 1257 flags = (data [0] << 8) + data [1]; data += 2;
1148 1258
1149 x = ((flags >> 10) & 63) + self->x; 1259 x = self->x + ((flags >> 10) & 63);
1150 y = ((flags >> 4) & 63) + self->y; 1260 y = self->y + ((flags >> 4) & 63);
1151 1261
1152 cell = map_get_cell (self, x, y); 1262 cell = map_get_cell (self, x, y);
1153 1263
1154 if (flags & 15) 1264 if (flags & 15)
1155 { 1265 {
1245 OUTPUT: 1355 OUTPUT:
1246 RETVAL 1356 RETVAL
1247 1357
1248void 1358void
1249draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1250 PPCODE: 1360 CODE:
1251{ 1361{
1252 int vx, vy; 1362 int vx, vy;
1253 int x, y, z; 1363 int x, y, z;
1254 int last_name; 1364 int last_name;
1255 mapface face; 1365 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 1366
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; 1367 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1265 vy = self->y + (self->h - sh) / 2 - shift_y; 1368 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1266 1369
1267 /* 1370 /*
1268 int vx = self->vx = self->w >= sw 1371 int vx = self->vx = self->w >= sw
1269 ? self->x + (self->w - sw) / 2 1372 ? self->x + (self->w - sw) / 2
1270 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1373 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1274 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1377 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275 */ 1378 */
1276 1379
1277 glColor4ub (255, 255, 255, 255); 1380 glColor4ub (255, 255, 255, 255);
1278 1381
1382 glEnable (GL_BLEND);
1279 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280 glEnable (GL_BLEND);
1281 glEnable (GL_TEXTURE_2D); 1384 glEnable (GL_TEXTURE_2D);
1282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1385 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283 1386
1284 glBegin (GL_QUADS); 1387 glBegin (GL_QUADS);
1285 1388
1293 1396
1294 for (x = 0; x < sw; x++) 1397 for (x = 0; x < sw; x++)
1295 if (row->c0 <= x + vx && x + vx < row->c1) 1398 if (row->c0 <= x + vx && x + vx < row->c1)
1296 { 1399 {
1297 mapcell *cell = row->col + (x + vx - row->c0); 1400 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 1401
1303 face = cell->face [z]; 1402 face = cell->face [z];
1304 1403
1305 if (face) 1404 if (face)
1306 { 1405 {
1327 1426
1328 glEnd (); 1427 glEnd ();
1329 1428
1330 glDisable (GL_TEXTURE_2D); 1429 glDisable (GL_TEXTURE_2D);
1331 glDisable (GL_BLEND); 1430 glDisable (GL_BLEND);
1431}
1432
1433void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE:
1436{
1437 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F },
1440 { 0.00F, 0.00F, 0.55F },
1441 { 1.00F, 0.00F, 0.00F },
1442
1443 { 1.00F, 0.54F, 0.00F },
1444 { 0.11F, 0.56F, 1.00F },
1445 { 0.93F, 0.46F, 0.00F },
1446 { 0.18F, 0.54F, 0.34F },
1447
1448 { 0.56F, 0.73F, 0.56F },
1449 { 0.80F, 0.80F, 0.80F },
1450 { 0.55F, 0.41F, 0.13F },
1451 { 0.99F, 0.77F, 0.26F },
1452
1453 { 0.74F, 0.65F, 0.41F },
1454
1455 { 0.00F, 1.00F, 1.00F },
1456 { 1.00F, 0.00F, 1.00F },
1457 { 1.00F, 1.00F, 0.00F },
1458 };
1459
1460 int x, y;
1461
1462 glEnable (GL_TEXTURE_2D);
1463 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1464 glEnable (GL_BLEND);
1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1466 glBegin (GL_QUADS);
1467
1468 for (y = 0; y < h; y++)
1469 for (x = 0; x < w; x++)
1470 {
1471 unsigned char m = data [x + y * w];
1472
1473 if (m)
1474 {
1475 float *c = color [m & 15];
1476
1477 float tx1 = m & 0x40 ? 0.5 : 0.;
1478 float tx2 = tx1 + 0.5;
1479
1480 glColor4f (c[0], c[1], c[2], 0.75);
1481 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1482 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1483 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1484 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1485 }
1486 }
1487
1488 glEnd ();
1489 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D);
1491}
1492
1493void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1495 PPCODE:
1496{
1497 int vx, vy;
1498 int x, y;
1499 int sw4 = (sw + 3) & ~3;
1500 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1501 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1502
1503 memset (darkness, 255, sw4 * sh);
1504 SvPOK_only (darkness_sv);
1505 SvCUR_set (darkness_sv, sw4 * sh);
1506
1507 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1508 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1509
1510 for (y = 0; y < sh; y++)
1511 if (0 <= y + vy && y + vy < self->rows)
1512 {
1513 maprow *row = self->row + (y + vy);
1514
1515 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1)
1517 {
1518 mapcell *cell = row->col + (x + vx - row->c0);
1519
1520 darkness[y * sw4 + x] = cell->darkness < 0
1521 ? 255 - FOW_DARKNESS
1522 : 255 - cell->darkness;
1523 }
1524 }
1332 1525
1333 EXTEND (SP, 3); 1526 EXTEND (SP, 3);
1334 PUSHs (sv_2mortal (newSViv (sw4))); 1527 PUSHs (sv_2mortal (newSViv (sw4)));
1335 PUSHs (sv_2mortal (newSViv (sh))); 1528 PUSHs (sv_2mortal (newSViv (sh)));
1336 PUSHs (darkness_sv); 1529 PUSHs (darkness_sv);
1543 const_iv (GL_SCISSOR_TEST), 1736 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST), 1737 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST), 1738 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE), 1739 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL), 1740 const_iv (GL_RESCALE_NORMAL),
1741 const_iv (GL_FRONT),
1742 const_iv (GL_BACK),
1548 const_iv (GL_AND), 1743 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1744 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1745 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1746 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1747 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1748 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1749 const_iv (GL_ONE_MINUS_DST_ALPHA),
1750 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1751 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1752 const_iv (GL_RGBA),
1753 const_iv (GL_RGBA4),
1754 const_iv (GL_RGBA8),
1755 const_iv (GL_RGB5_A1),
1557 const_iv (GL_UNSIGNED_BYTE), 1756 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1757 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1758 const_iv (GL_UNSIGNED_INT),
1560 const_iv (GL_ALPHA), 1759 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY), 1760 const_iv (GL_INTENSITY),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1769 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1770 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1771 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1772 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1773 const_iv (GL_TEXTURE_WRAP_T),
1774 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1775 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1776 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1777 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1778 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1779 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1780 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1781 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1611 1811
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1812 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1813 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1814}
1615 1815
1816char *
1817gl_vendor ()
1818 CODE:
1819 RETVAL = (char *)glGetString (GL_VENDOR);
1820 OUTPUT:
1821 RETVAL
1822
1823char *
1824gl_version ()
1825 CODE:
1826 RETVAL = (char *)glGetString (GL_VERSION);
1827 OUTPUT:
1828 RETVAL
1829
1830char *
1831gl_extensions ()
1832 CODE:
1833 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1834 OUTPUT:
1835 RETVAL
1836
1616int glGetError () 1837int glGetError ()
1838
1839void glFinish ()
1617 1840
1618void glClear (int mask) 1841void glClear (int mask)
1619 1842
1620void glClearColor (float r, float g, float b, float a = 1.0) 1843void glClearColor (float r, float g, float b, float a = 1.0)
1621 PROTOTYPE: @ 1844 PROTOTYPE: @
1628 1851
1629void glHint (int target, int mode) 1852void glHint (int target, int mode)
1630 1853
1631void glBlendFunc (int sfactor, int dfactor) 1854void glBlendFunc (int sfactor, int dfactor)
1632 1855
1856void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1857 CODE:
1858 gl_BlendFuncSeparate (sa, da, saa, daa);
1859
1633void glDepthMask (int flag) 1860void glDepthMask (int flag)
1634 1861
1635void glLogicOp (int opcode) 1862void glLogicOp (int opcode)
1636 1863
1637void glColorMask (int red, int green, int blue, int alpha) 1864void glColorMask (int red, int green, int blue, int alpha)
1641void glPushMatrix () 1868void glPushMatrix ()
1642 1869
1643void glPopMatrix () 1870void glPopMatrix ()
1644 1871
1645void glLoadIdentity () 1872void glLoadIdentity ()
1873
1874void glDrawBuffer (int buffer)
1875
1876void glReadBuffer (int buffer)
1646 1877
1647# near_ and far_ are due to microsofts buggy "c" compiler 1878# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1879void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649 1880
1650# near_ and far_ are due to microsofts buggy "c" compiler 1881# near_ and far_ are due to microsofts buggy "c" compiler
1670 1901
1671void glEnd () 1902void glEnd ()
1672 1903
1673void glColor (float r, float g, float b, float a = 1.0) 1904void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 1905 PROTOTYPE: @
1906 ALIAS:
1907 glColor_premultiply = 1
1675 CODE: 1908 CODE:
1909 if (ix)
1910 {
1911 r *= a;
1912 g *= a;
1913 b *= a;
1914 }
1676 // microsoft visual "c" rounds instead of truncating... 1915 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 1916 glColor4ub (MIN ((int)(r * 256.f), 255),
1678 MIN ((int)(g * 255.f), 255), 1917 MIN ((int)(g * 256.f), 255),
1679 MIN ((int)(b * 255.f), 255), 1918 MIN ((int)(b * 256.f), 255),
1680 MIN ((int)(a * 255.f), 255)); 1919 MIN ((int)(a * 256.f), 255));
1681 1920
1682void glInterleavedArrays (int format, int stride, char *data) 1921void glInterleavedArrays (int format, int stride, char *data)
1683 1922
1684void glDrawElements (int mode, int count, int type, char *indices) 1923void glDrawElements (int mode, int count, int type, char *indices)
1685 1924
1708 1947
1709void glBindTexture (int target, int name) 1948void glBindTexture (int target, int name)
1710 1949
1711void glConvolutionParameter (int target, int pname, float params) 1950void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 1951 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1952 if (gl.ConvolutionParameterf)
1953 gl.ConvolutionParameterf (target, pname, params);
1714 1954
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1955void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 1956 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1957 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 1958 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 1959
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1960void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 1961 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1962 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 1963 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 1964
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1965void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 1966
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1967void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 1968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines