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.65 by root, Mon Apr 24 08:22:21 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 3# include <malloc.h>
4# include <windows.h>
5# pragma warning(disable:4244)
3#endif 6#endif
4 7
5#include "EXTERN.h" 8#include "EXTERN.h"
6#include "perl.h" 9#include "perl.h"
7#include "XSUB.h" 10#include "XSUB.h"
8 11
12#include <math.h>
9#include <string.h> 13#include <string.h>
10#include <stdio.h> 14#include <stdio.h>
11 15
12#include <SDL.h> 16#include <SDL.h>
17#include <SDL_endian.h>
13#include <SDL_image.h> 18#include <SDL_image.h>
14#include <SDL_mixer.h> 19#include <SDL_mixer.h>
15#include <SDL_opengl.h> 20#include <SDL_opengl.h>
16 21
17#include <glib/gmacros.h> 22#include <glib/gmacros.h>
18 23
19#include <pango/pango.h> 24#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h> 25#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h> 26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
22 28
23#ifndef _WIN32 29#ifndef _WIN32
24# include <sys/types.h> 30# include <sys/types.h>
25# include <sys/socket.h> 31# include <sys/socket.h>
26# include <netinet/in.h> 32# include <netinet/in.h>
63typedef Mix_Music *CFClient__MixMusic; 69typedef Mix_Music *CFClient__MixMusic;
64 70
65typedef PangoFontDescription *CFClient__Font; 71typedef PangoFontDescription *CFClient__Font;
66 72
67typedef struct cf_layout { 73typedef struct cf_layout {
68 PangoLayout *pl; 74 PangoLayout *pl; // either derived from a cairo or ft2 context
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode
69 int base_height; 77 int base_height;
70 CFClient__Font font; 78 CFClient__Font font;
71} *CFClient__Layout; 79} *CFClient__Layout;
72 80
73static CFClient__Font default_font; 81static CFClient__Font default_font;
74static PangoContext *context; 82static PangoContext *ft2_context, *cairo_context;
75static PangoFontMap *fontmap; 83static PangoFontMap *ft2_fontmap, *cairo_fontmap;
76 84
77static void 85static void
78substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
79{ 87{
80 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
81 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
82} 94}
83 95
84static void 96static void
85layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
86{ 98{
98static void 110static void
99layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 111layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
100{ 112{
101 pango_layout_get_pixel_size (self->pl, w, h); 113 pango_layout_get_pixel_size (self->pl, w, h);
102 114
103 *w = (*w + 3) & ~3;
104 if (!*w) *w = 1; 115 if (!*w) *w = 1;
105 if (!*h) *h = 1; 116 if (!*h) *h = 1;
117
118 *w = (*w + 3) & ~3;
106} 119}
107 120
108typedef uint16_t mapface; 121typedef uint16_t mapface;
109 122
110typedef struct { 123typedef struct {
258 } 271 }
259 } 272 }
260} 273}
261 274
262static void 275static void
263music_finished () 276music_finished (void)
264{ 277{
265 SDL_UserEvent ev; 278 SDL_UserEvent ev;
266 279
267 ev.type = SDL_USEREVENT; 280 ev.type = SDL_USEREVENT;
268 ev.code = 0; 281 ev.code = 0;
269 ev.data1 = 0; 282 ev.data1 = 0;
283 ev.data2 = 0;
284
285 SDL_PushEvent ((SDL_Event *)&ev);
286}
287
288static void
289channel_finished (int channel)
290{
291 SDL_UserEvent ev;
292
293 ev.type = SDL_USEREVENT;
294 ev.code = 1;
295 ev.data1 = (void *)(long)channel;
270 ev.data2 = 0; 296 ev.data2 = 0;
271 297
272 SDL_PushEvent ((SDL_Event *)&ev); 298 SDL_PushEvent ((SDL_Event *)&ev);
273} 299}
274 300
385# undef const_iv 411# undef const_iv
386 }; 412 };
387 413
388 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
390 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
391 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
392 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); 425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
394} 429}
395 430
396int 431int
397SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
398 433
406 SDL_Rect **m; 441 SDL_Rect **m;
407 442
408 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
412 450
413 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417 455
418 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
419 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
420 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
421 457
422 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
423 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424 460
425 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
457 493
458 while (SDL_PollEvent (&ev)) 494 while (SDL_PollEvent (&ev))
459 { 495 {
460 HV *hv = newHV (); 496 HV *hv = newHV ();
461 hv_store (hv, "type", 4, newSViv (ev.type), 0); 497 hv_store (hv, "type", 4, newSViv (ev.type), 0);
498
462 switch (ev.type) 499 switch (ev.type)
463 { 500 {
464 case SDL_KEYDOWN: 501 case SDL_KEYDOWN:
465 case SDL_KEYUP: 502 case SDL_KEYUP:
466 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 503 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
486 case SDL_MOUSEBUTTONUP: 523 case SDL_MOUSEBUTTONUP:
487 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break;
529
530 case SDL_USEREVENT:
531 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break;
491 } 535 }
492 536
493 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494 } 538 }
495} 539}
496 540
497int 541int
498Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 542Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499 POSTCALL: 543 POSTCALL:
500 Mix_HookMusicFinished (music_finished); 544 Mix_HookMusicFinished (music_finished);
545 Mix_ChannelFinished (channel_finished);
501 546
502void 547void
503Mix_CloseAudio () 548Mix_CloseAudio ()
504 549
505int 550int
528 573
529void 574void
530add_font (char *file) 575add_font (char *file)
531 CODE: 576 CODE:
532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
533 582
534void 583void
535load_image_inline (SV *image_) 584load_image_inline (SV *image_)
536 ALIAS: 585 ALIAS:
537 load_image_file = 1 586 load_image_file = 1
619 PUSHs (sv_2mortal (newSViv (b / y))); 668 PUSHs (sv_2mortal (newSViv (b / y)));
620 PUSHs (sv_2mortal (newSViv (a / y))); 669 PUSHs (sv_2mortal (newSViv (a / y)));
621} 670}
622 671
623void 672void
673error (char *message)
674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
676#ifdef _WIN32
677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
678#endif
679
680void
624fatal (char *message) 681fatal (char *message)
625 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
626#ifdef _WIN32 684#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
628#else
629 fprintf (stderr, "FATAL: %s\n", message);
630#endif 686#endif
631 exit (1); 687 exit (1);
632 688
633MODULE = CFClient PACKAGE = CFClient::Font 689MODULE = CFClient PACKAGE = CFClient::Font
634 690
635CFClient::Font 691CFClient::Font
636new_from_file (SV *class, char *path) 692new_from_file (SV *class, char *path, int id = 0)
637 CODE: 693 CODE:
638{ 694{
639 int count; 695 int count;
640 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 696 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
641 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 697 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642 FcPatternDestroy (pattern); 698 FcPatternDestroy (pattern);
643} 699}
644 OUTPUT: 700 OUTPUT:
645 RETVAL 701 RETVAL
655 default_font = self; 711 default_font = self;
656 712
657MODULE = CFClient PACKAGE = CFClient::Layout 713MODULE = CFClient PACKAGE = CFClient::Layout
658 714
659CFClient::Layout 715CFClient::Layout
660new (SV *class, int base_height = MIN_FONT_HEIGHT) 716new (SV *class, int rgba = 0)
661 CODE: 717 CODE:
718#if _WIN32
719 rgba = 0;//D
720#endif
662 New (0, RETVAL, 1, struct cf_layout); 721 New (0, RETVAL, 1, struct cf_layout);
663 RETVAL->pl = pango_layout_new (context); 722
664 RETVAL->base_height = base_height; 723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
724 RETVAL->rgba = rgba;
725 RETVAL->r = 1.;
726 RETVAL->g = 1.;
727 RETVAL->b = 1.;
728 RETVAL->a = 1.;
729 RETVAL->base_height = MIN_FONT_HEIGHT;
665 RETVAL->font = 0; 730 RETVAL->font = 0;
731
666 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 732 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
667 pango_layout_set_font_description (RETVAL->pl, default_font); 733 layout_update_font (RETVAL);
668 OUTPUT: 734 OUTPUT:
669 RETVAL 735 RETVAL
670 736
671void 737void
672DESTROY (CFClient::Layout self) 738DESTROY (CFClient::Layout self)
673 CODE: 739 CODE:
674 g_object_unref (self->pl); 740 g_object_unref (self->pl);
675 Safefree (self); 741 Safefree (self);
676 742
743int
744is_rgba (CFClient::Layout self)
745 CODE:
746 RETVAL = self->rgba;
747 OUTPUT:
748 RETVAL
749
677void 750void
678set_text (CFClient::Layout self, SV *text_) 751set_text (CFClient::Layout self, SV *text_)
679 CODE: 752 CODE:
680{ 753{
681 STRLEN textlen; 754 STRLEN textlen;
699 CODE: 772 CODE:
700 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 773 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
701 SvUTF8_on (RETVAL); 774 SvUTF8_on (RETVAL);
702 OUTPUT: 775 OUTPUT:
703 RETVAL 776 RETVAL
777
778void
779set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
780 CODE:
781 self->r = r;
782 self->g = g;
783 self->b = b;
784 self->a = a;
704 785
705void 786void
706set_font (CFClient::Layout self, CFClient::Font font = 0) 787set_font (CFClient::Layout self, CFClient::Font font = 0)
707 CODE: 788 CODE:
708 if (self->font != font) 789 if (self->font != font)
724set_width (CFClient::Layout self, int max_width = -1) 805set_width (CFClient::Layout self, int max_width = -1)
725 CODE: 806 CODE:
726 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 807 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
727 808
728void 809void
810set_indent (CFClient::Layout self, int indent)
811 CODE:
812 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813
814void
815set_spacing (CFClient::Layout self, int spacing)
816 CODE:
817 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818
819void
820set_ellipsise (CFClient::Layout self, int ellipsise)
821 CODE:
822 pango_layout_set_ellipsize (self->pl,
823 ellipsise == 1 ? PANGO_ELLIPSIZE_START
824 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
826 : PANGO_ELLIPSIZE_NONE
827 );
828
829void
830set_single_paragraph_mode (CFClient::Layout self, int spm)
831 CODE:
832 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
833
834void
729size (CFClient::Layout self) 835size (CFClient::Layout self)
730 PPCODE: 836 PPCODE:
731{ 837{
732 int w, h; 838 int w, h;
733 839
766render (CFClient::Layout self) 872render (CFClient::Layout self)
767 PPCODE: 873 PPCODE:
768{ 874{
769 SV *retval; 875 SV *retval;
770 int w, h; 876 int w, h;
771 FT_Bitmap bitmap;
772 877
773 layout_get_pixel_size (self, &w, &h); 878 layout_get_pixel_size (self, &w, &h);
774 879
880 if (self->rgba)
881 {
882 cairo_surface_t *surface;
883 cairo_t *cairo;
884
885 retval = newSV (w * h * 4);
886 SvPOK_only (retval);
887 SvCUR_set (retval, w * h * 4);
888
889 memset (SvPVX (retval), 0, w * h * 4);
890
891 surface = cairo_image_surface_create_for_data (
892 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
893 cairo = cairo_create (surface);
894 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
895
896 pango_cairo_show_layout (cairo, self->pl);
897
898 cairo_destroy (cairo);
899 cairo_surface_destroy (surface);
900
901 // what a mess, and its premultiplied, too :(
902 {
903 uint32_t *p = (uint32_t *)SvPVX (retval);
904 uint32_t *e = p + w * h;
905
906 while (p < e)
907 {
908 uint32_t rgba = *p;
909 rgba = (rgba >> 24) | (rgba << 8);
910#if 0
911#ifdef _WIN32
912 {//D
913 uint8_t r = rgba >> 24;
914 uint8_t g = rgba >> 16;
915 uint8_t b = rgba >> 8;
916 uint8_t a = rgba >> 0;
917
918 rgba = (rgba & 0xffffff00) | a;
919 }
920#endif
921#endif
922 rgba = SDL_SwapBE32 (rgba);
923 *p++ = rgba;
924 }
925 }
926
927 EXTEND (SP, 5);
928 PUSHs (sv_2mortal (newSViv (w)));
929 PUSHs (sv_2mortal (newSViv (h)));
930 PUSHs (sv_2mortal (retval));
931 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
932 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
933 }
934 else
935 {
936 FT_Bitmap bitmap;
937
775 retval = newSV (w * h); 938 retval = newSV (w * h);
776 SvPOK_only (retval); 939 SvPOK_only (retval);
777 SvCUR_set (retval, w * h); 940 SvCUR_set (retval, w * h);
778 941
779 bitmap.rows = h; 942 bitmap.rows = h;
780 bitmap.width = w; 943 bitmap.width = w;
781 bitmap.pitch = w; 944 bitmap.pitch = w;
782 bitmap.buffer = (unsigned char*)SvPVX (retval); 945 bitmap.buffer = (unsigned char*)SvPVX (retval);
783 bitmap.num_grays = 256; 946 bitmap.num_grays = 256;
784 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 947 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
785 948
786 memset (bitmap.buffer, 0, w * h); 949 memset (bitmap.buffer, 0, w * h);
787 950
788 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 951 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
789 952
790 EXTEND (SP, 3); 953 EXTEND (SP, 5);
791 PUSHs (sv_2mortal (newSViv (w))); 954 PUSHs (sv_2mortal (newSViv (w)));
792 PUSHs (sv_2mortal (newSViv (h))); 955 PUSHs (sv_2mortal (newSViv (h)));
793 PUSHs (sv_2mortal (retval)); 956 PUSHs (sv_2mortal (retval));
957 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
958 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
959 }
794} 960}
795 961
796MODULE = CFClient PACKAGE = CFClient::Texture 962MODULE = CFClient PACKAGE = CFClient::Texture
797 963
798void 964void
799draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 965draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
800 PROTOTYPE: $$$;$$ 966 PROTOTYPE: $$$;$$
967 ALIAS:
968 draw_quad_alpha = 1
969 draw_quad_alpha_premultiplied = 2
801 CODE: 970 CODE:
802{ 971{
803 HV *hv = (HV *)SvRV (self); 972 HV *hv = (HV *)SvRV (self);
804 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 973 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
805 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 974 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
810 { 979 {
811 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 980 w = SvNV (*hv_fetch (hv, "w", 1, 1));
812 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 981 h = SvNV (*hv_fetch (hv, "h", 1, 1));
813 } 982 }
814 983
984 if (ix)
985 {
986 glEnable (GL_BLEND);
987 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
988 glEnable (GL_ALPHA_TEST);
989 glAlphaFunc (GL_GREATER, 0.01f);
990 }
991
815 glBindTexture (GL_TEXTURE_2D, name); 992 glBindTexture (GL_TEXTURE_2D, name);
993
816 if (wrap_mode) { 994 if (wrap_mode)
995 {
817 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 996 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
818 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 997 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
819 } 998 }
999
820 glBegin (GL_QUADS); 1000 glBegin (GL_QUADS);
821 glTexCoord2f (0, 0); glVertex2f (x , y ); 1001 glTexCoord2f (0, 0); glVertex2f (x , y );
822 glTexCoord2f (0, t); glVertex2f (x , y + h); 1002 glTexCoord2f (0, t); glVertex2f (x , y + h);
823 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
824 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1004 glTexCoord2f (s, 0); glVertex2f (x + w, y );
825 glEnd (); 1005 glEnd ();
1006
1007 if (ix)
1008 {
1009 glDisable (GL_ALPHA_TEST);
1010 glDisable (GL_BLEND);
1011 }
826} 1012}
827 1013
828MODULE = CFClient PACKAGE = CFClient::Map 1014MODULE = CFClient PACKAGE = CFClient::Map
829 1015
830CFClient::Map 1016CFClient::Map
1339 } *civ, const_iv[] = { 1525 } *civ, const_iv[] = {
1340# define const_iv(name) { # name, (IV)name } 1526# define const_iv(name) { # name, (IV)name }
1341 const_iv (GL_COLOR_MATERIAL), 1527 const_iv (GL_COLOR_MATERIAL),
1342 const_iv (GL_SMOOTH), 1528 const_iv (GL_SMOOTH),
1343 const_iv (GL_FLAT), 1529 const_iv (GL_FLAT),
1530 const_iv (GL_DITHER),
1344 const_iv (GL_BLEND), 1531 const_iv (GL_BLEND),
1532 const_iv (GL_SCISSOR_TEST),
1345 const_iv (GL_AND), 1533 const_iv (GL_AND),
1534 const_iv (GL_ONE),
1535 const_iv (GL_ZERO),
1346 const_iv (GL_SRC_ALPHA), 1536 const_iv (GL_SRC_ALPHA),
1537 const_iv (GL_SRC_ALPHA_SATURATE),
1347 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1538 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539 const_iv (GL_ONE_MINUS_DST_ALPHA),
1348 const_iv (GL_RGB), 1540 const_iv (GL_RGB),
1349 const_iv (GL_RGBA), 1541 const_iv (GL_RGBA),
1350 const_iv (GL_UNSIGNED_BYTE), 1542 const_iv (GL_UNSIGNED_BYTE),
1351 const_iv (GL_ALPHA), 1543 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY),
1545 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA),
1352 const_iv (GL_FLOAT), 1547 const_iv (GL_FLOAT),
1353 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1548 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1354 const_iv (GL_COMPILE), 1549 const_iv (GL_COMPILE),
1355 const_iv (GL_TEXTURE_1D), 1550 const_iv (GL_TEXTURE_1D),
1356 const_iv (GL_TEXTURE_2D), 1551 const_iv (GL_TEXTURE_2D),
1367 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1562 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1368 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1563 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1369 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1564 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1370 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1565 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1371 const_iv (GL_GENERATE_MIPMAP), 1566 const_iv (GL_GENERATE_MIPMAP),
1372 const_iv (GL_LINEAR),
1373 const_iv (GL_MODULATE), 1567 const_iv (GL_MODULATE),
1568 const_iv (GL_DECAL),
1374 const_iv (GL_REPLACE), 1569 const_iv (GL_REPLACE),
1375 const_iv (GL_COLOR_BUFFER_BIT), 1570 const_iv (GL_COLOR_BUFFER_BIT),
1376 const_iv (GL_PROJECTION), 1571 const_iv (GL_PROJECTION),
1377 const_iv (GL_MODELVIEW), 1572 const_iv (GL_MODELVIEW),
1378 const_iv (GL_COLOR_LOGIC_OP), 1573 const_iv (GL_COLOR_LOGIC_OP),
1574 const_iv (GL_SEPARABLE_2D),
1379 const_iv (GL_CONVOLUTION_2D), 1575 const_iv (GL_CONVOLUTION_2D),
1380 const_iv (GL_CONVOLUTION_BORDER_MODE), 1576 const_iv (GL_CONVOLUTION_BORDER_MODE),
1381 const_iv (GL_CONSTANT_BORDER), 1577 const_iv (GL_CONSTANT_BORDER),
1382 const_iv (GL_LINES), 1578 const_iv (GL_LINES),
1383 const_iv (GL_QUADS), 1579 const_iv (GL_QUADS),
1408 1604
1409void glBlendFunc (int sfactor, int dfactor) 1605void glBlendFunc (int sfactor, int dfactor)
1410 1606
1411void glLogicOp (int opcode) 1607void glLogicOp (int opcode)
1412 1608
1609void glColorMask (int red, int green, int blue, int alpha)
1610
1413void glMatrixMode (int mode) 1611void glMatrixMode (int mode)
1414 1612
1415void glPushMatrix () 1613void glPushMatrix ()
1416 1614
1417void glPopMatrix () 1615void glPopMatrix ()
1420 1618
1421# near and far are due to microsofts buggy c compiler 1619# near and far are due to microsofts buggy c compiler
1422void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1620void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1423 1621
1424void glViewport (int x, int y, int width, int height) 1622void glViewport (int x, int y, int width, int height)
1623
1624void glScissor (int x, int y, int width, int height)
1425 1625
1426void glTranslate (float x, float y, float z = 0.) 1626void glTranslate (float x, float y, float z = 0.)
1427 CODE: 1627 CODE:
1428 glTranslatef (x, y, z); 1628 glTranslatef (x, y, z);
1429 1629
1440void glEnd () 1640void glEnd ()
1441 1641
1442void glColor (float r, float g, float b, float a = 1.0) 1642void glColor (float r, float g, float b, float a = 1.0)
1443 PROTOTYPE: @ 1643 PROTOTYPE: @
1444 CODE: 1644 CODE:
1445 glColor4f (r, g, b, a); 1645 glColor4ub (MIN ((int)(r * 255.f), 255),
1646 MIN ((int)(g * 255.f), 255),
1647 MIN ((int)(b * 255.f), 255),
1648 MIN ((int)(a * 255.f), 255));
1446 1649
1447void glVertex (float x, float y, float z = 0.) 1650void glVertex (float x, float y, float z = 0.)
1448 CODE: 1651 CODE:
1449 glVertex3f (x, y, z); 1652 glVertex3f (x, y, z);
1450 1653
1469void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1672void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1470 CODE: 1673 CODE:
1471 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1674 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1472 (target, internalformat, width, height, format, type, data)); 1675 (target, internalformat, width, height, format, type, data));
1473 1676
1677void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1678 CODE:
1679 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1680 (target, internalformat, width, height, format, type, row, column));
1681
1474void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1682void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1475 1683
1476void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1684void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1685
1686void glRasterPos (int x, int y)
1687 CODE:
1688 glRasterPos2i (x, y);
1689
1690void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1477 1691
1478int glGenTexture () 1692int glGenTexture ()
1479 CODE: 1693 CODE:
1480{ 1694{
1481 GLuint name; 1695 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines