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.69 by root, Sun Apr 30 08:09:44 2006 UTC vs.
Revision 1.88 by root, Fri May 19 23:18:40 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
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, 1);
412 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
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);
434 470
435 ++m; 471 ++m;
436 } 472 }
437} 473}
438 474
475char *
476SDL_GetError ()
477
439int 478int
440SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
441 CODE: 480 CODE:
442 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
443 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
457 496
458 while (SDL_PollEvent (&ev)) 497 while (SDL_PollEvent (&ev))
459 { 498 {
460 HV *hv = newHV (); 499 HV *hv = newHV ();
461 hv_store (hv, "type", 4, newSViv (ev.type), 0); 500 hv_store (hv, "type", 4, newSViv (ev.type), 0);
501
462 switch (ev.type) 502 switch (ev.type)
463 { 503 {
464 case SDL_KEYDOWN: 504 case SDL_KEYDOWN:
465 case SDL_KEYUP: 505 case SDL_KEYUP:
466 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 506 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
486 case SDL_MOUSEBUTTONUP: 526 case SDL_MOUSEBUTTONUP:
487 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break;
532
533 case SDL_USEREVENT:
534 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
535 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537 break;
491 } 538 }
492 539
493 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494 } 541 }
495} 542}
496 543
497int 544int
498Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 545Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499 POSTCALL: 546 POSTCALL:
500 Mix_HookMusicFinished (music_finished); 547 Mix_HookMusicFinished (music_finished);
548 Mix_ChannelFinished (channel_finished);
501 549
502void 550void
503Mix_CloseAudio () 551Mix_CloseAudio ()
504 552
505int 553int
528 576
529void 577void
530add_font (char *file) 578add_font (char *file)
531 CODE: 579 CODE:
532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 580 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
581#ifdef _WIN32
582 // cairo... sigh... requires win2000
583 AddFontResourceEx (file, FR_PRIVATE, 0);
584#endif
533 585
534void 586void
535load_image_inline (SV *image_) 587load_image_inline (SV *image_)
536 ALIAS: 588 ALIAS:
537 load_image_file = 1 589 load_image_file = 1
621} 673}
622 674
623void 675void
624error (char *message) 676error (char *message)
625 CODE: 677 CODE:
678 fprintf (stderr, "ERROR: %s\n", message);
626#ifdef _WIN32 679#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 680 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
628#else
629 fprintf (stderr, "ERROR: %s\n", message);
630#endif 681#endif
631 682
632void 683void
633fatal (char *message) 684fatal (char *message)
634 CODE: 685 CODE:
686 fprintf (stderr, "FATAL: %s\n", message);
635#ifdef _WIN32 687#ifdef _WIN32
636 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
637#else
638 fprintf (stderr, "FATAL: %s\n", message);
639#endif 689#endif
640 exit (1); 690 exit (1);
641 691
642MODULE = CFClient PACKAGE = CFClient::Font 692MODULE = CFClient PACKAGE = CFClient::Font
643 693
644CFClient::Font 694CFClient::Font
645new_from_file (SV *class, char *path) 695new_from_file (SV *class, char *path, int id = 0)
646 CODE: 696 CODE:
647{ 697{
648 int count; 698 int count;
649 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 699 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
650 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 700 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651 FcPatternDestroy (pattern); 701 FcPatternDestroy (pattern);
652} 702}
653 OUTPUT: 703 OUTPUT:
654 RETVAL 704 RETVAL
664 default_font = self; 714 default_font = self;
665 715
666MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
667 717
668CFClient::Layout 718CFClient::Layout
669new (SV *class, int base_height = MIN_FONT_HEIGHT) 719new (SV *class, int rgba = 0)
670 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
671 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
672 RETVAL->pl = pango_layout_new (context); 725
673 RETVAL->base_height = base_height; 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727 RETVAL->rgba = rgba;
728 RETVAL->r = 1.;
729 RETVAL->g = 1.;
730 RETVAL->b = 1.;
731 RETVAL->a = 1.;
732 RETVAL->base_height = MIN_FONT_HEIGHT;
674 RETVAL->font = 0; 733 RETVAL->font = 0;
734
675 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 735 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676 pango_layout_set_font_description (RETVAL->pl, default_font); 736 layout_update_font (RETVAL);
677 OUTPUT: 737 OUTPUT:
678 RETVAL 738 RETVAL
679 739
680void 740void
681DESTROY (CFClient::Layout self) 741DESTROY (CFClient::Layout self)
682 CODE: 742 CODE:
683 g_object_unref (self->pl); 743 g_object_unref (self->pl);
684 Safefree (self); 744 Safefree (self);
685 745
746int
747is_rgba (CFClient::Layout self)
748 CODE:
749 RETVAL = self->rgba;
750 OUTPUT:
751 RETVAL
752
686void 753void
687set_text (CFClient::Layout self, SV *text_) 754set_text (CFClient::Layout self, SV *text_)
688 CODE: 755 CODE:
689{ 756{
690 STRLEN textlen; 757 STRLEN textlen;
708 CODE: 775 CODE:
709 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 776 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710 SvUTF8_on (RETVAL); 777 SvUTF8_on (RETVAL);
711 OUTPUT: 778 OUTPUT:
712 RETVAL 779 RETVAL
780
781void
782set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
783 CODE:
784 self->r = r;
785 self->g = g;
786 self->b = b;
787 self->a = a;
713 788
714void 789void
715set_font (CFClient::Layout self, CFClient::Font font = 0) 790set_font (CFClient::Layout self, CFClient::Font font = 0)
716 CODE: 791 CODE:
717 if (self->font != font) 792 if (self->font != font)
733set_width (CFClient::Layout self, int max_width = -1) 808set_width (CFClient::Layout self, int max_width = -1)
734 CODE: 809 CODE:
735 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 810 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
736 811
737void 812void
813set_indent (CFClient::Layout self, int indent)
814 CODE:
815 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816
817void
818set_spacing (CFClient::Layout self, int spacing)
819 CODE:
820 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821
822void
823set_ellipsise (CFClient::Layout self, int ellipsise)
824 CODE:
825 pango_layout_set_ellipsize (self->pl,
826 ellipsise == 1 ? PANGO_ELLIPSIZE_START
827 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
829 : PANGO_ELLIPSIZE_NONE
830 );
831
832void
833set_single_paragraph_mode (CFClient::Layout self, int spm)
834 CODE:
835 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836
837void
738size (CFClient::Layout self) 838size (CFClient::Layout self)
739 PPCODE: 839 PPCODE:
740{ 840{
741 int w, h; 841 int w, h;
742 842
775render (CFClient::Layout self) 875render (CFClient::Layout self)
776 PPCODE: 876 PPCODE:
777{ 877{
778 SV *retval; 878 SV *retval;
779 int w, h; 879 int w, h;
780 FT_Bitmap bitmap;
781 880
782 layout_get_pixel_size (self, &w, &h); 881 layout_get_pixel_size (self, &w, &h);
783 882
883 if (self->rgba)
884 {
885 cairo_surface_t *surface;
886 cairo_t *cairo;
887
888 retval = newSV (w * h * 4);
889 SvPOK_only (retval);
890 SvCUR_set (retval, w * h * 4);
891
892 memset (SvPVX (retval), 0, w * h * 4);
893
894 surface = cairo_image_surface_create_for_data (
895 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
896 cairo = cairo_create (surface);
897 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
898
899 pango_cairo_show_layout (cairo, self->pl);
900
901 cairo_destroy (cairo);
902 cairo_surface_destroy (surface);
903
904 // what a mess, and its premultiplied, too :(
905 {
906 uint32_t *p = (uint32_t *)SvPVX (retval);
907 uint32_t *e = p + w * h;
908
909 while (p < e)
910 {
911 uint32_t rgba = *p;
912 rgba = (rgba >> 24) | (rgba << 8);
913#if 0
914#ifdef _WIN32
915 {//D
916 uint8_t r = rgba >> 24;
917 uint8_t g = rgba >> 16;
918 uint8_t b = rgba >> 8;
919 uint8_t a = rgba >> 0;
920
921 rgba = (rgba & 0xffffff00) | a;
922 }
923#endif
924#endif
925 rgba = SDL_SwapBE32 (rgba);
926 *p++ = rgba;
927 }
928 }
929
930 EXTEND (SP, 5);
931 PUSHs (sv_2mortal (newSViv (w)));
932 PUSHs (sv_2mortal (newSViv (h)));
933 PUSHs (sv_2mortal (retval));
934 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
935 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936 }
937 else
938 {
939 FT_Bitmap bitmap;
940
784 retval = newSV (w * h); 941 retval = newSV (w * h);
785 SvPOK_only (retval); 942 SvPOK_only (retval);
786 SvCUR_set (retval, w * h); 943 SvCUR_set (retval, w * h);
787 944
788 bitmap.rows = h; 945 bitmap.rows = h;
789 bitmap.width = w; 946 bitmap.width = w;
790 bitmap.pitch = w; 947 bitmap.pitch = w;
791 bitmap.buffer = (unsigned char*)SvPVX (retval); 948 bitmap.buffer = (unsigned char*)SvPVX (retval);
792 bitmap.num_grays = 256; 949 bitmap.num_grays = 256;
793 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 950 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794 951
795 memset (bitmap.buffer, 0, w * h); 952 memset (bitmap.buffer, 0, w * h);
796 953
797 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 954 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
798 955
799 EXTEND (SP, 3); 956 EXTEND (SP, 5);
800 PUSHs (sv_2mortal (newSViv (w))); 957 PUSHs (sv_2mortal (newSViv (w)));
801 PUSHs (sv_2mortal (newSViv (h))); 958 PUSHs (sv_2mortal (newSViv (h)));
802 PUSHs (sv_2mortal (retval)); 959 PUSHs (sv_2mortal (retval));
960 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
961 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962 }
803} 963}
804 964
805MODULE = CFClient PACKAGE = CFClient::Texture 965MODULE = CFClient PACKAGE = CFClient::Texture
806 966
807void 967void
808draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 968draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
809 PROTOTYPE: $$$;$$ 969 PROTOTYPE: $$$;$$
970 ALIAS:
971 draw_quad_alpha = 1
972 draw_quad_alpha_premultiplied = 2
810 CODE: 973 CODE:
811{ 974{
812 HV *hv = (HV *)SvRV (self); 975 HV *hv = (HV *)SvRV (self);
813 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 976 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 977 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
819 { 982 {
820 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 983 w = SvNV (*hv_fetch (hv, "w", 1, 1));
821 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 984 h = SvNV (*hv_fetch (hv, "h", 1, 1));
822 } 985 }
823 986
987 if (ix)
988 {
989 glEnable (GL_BLEND);
990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
991 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f);
993 }
994
824 glBindTexture (GL_TEXTURE_2D, name); 995 glBindTexture (GL_TEXTURE_2D, name);
996
825 if (wrap_mode) { 997 if (wrap_mode)
998 {
826 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828 } 1001 }
1002
829 glBegin (GL_QUADS); 1003 glBegin (GL_QUADS);
830 glTexCoord2f (0, 0); glVertex2f (x , y ); 1004 glTexCoord2f (0, 0); glVertex2f (x , y );
831 glTexCoord2f (0, t); glVertex2f (x , y + h); 1005 glTexCoord2f (0, t); glVertex2f (x , y + h);
832 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
834 glEnd (); 1008 glEnd ();
1009
1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND);
1014 }
835} 1015}
836 1016
837MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
838 1018
839CFClient::Map 1019CFClient::Map
1362 const_iv (GL_ONE_MINUS_DST_ALPHA), 1542 const_iv (GL_ONE_MINUS_DST_ALPHA),
1363 const_iv (GL_RGB), 1543 const_iv (GL_RGB),
1364 const_iv (GL_RGBA), 1544 const_iv (GL_RGBA),
1365 const_iv (GL_UNSIGNED_BYTE), 1545 const_iv (GL_UNSIGNED_BYTE),
1366 const_iv (GL_ALPHA), 1546 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY),
1548 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA),
1367 const_iv (GL_FLOAT), 1550 const_iv (GL_FLOAT),
1368 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1551 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1369 const_iv (GL_COMPILE), 1552 const_iv (GL_COMPILE),
1370 const_iv (GL_TEXTURE_1D), 1553 const_iv (GL_TEXTURE_1D),
1371 const_iv (GL_TEXTURE_2D), 1554 const_iv (GL_TEXTURE_2D),
1460void glEnd () 1643void glEnd ()
1461 1644
1462void glColor (float r, float g, float b, float a = 1.0) 1645void glColor (float r, float g, float b, float a = 1.0)
1463 PROTOTYPE: @ 1646 PROTOTYPE: @
1464 CODE: 1647 CODE:
1465 glColor4f (r, g, b, a); 1648 glColor4ub (MIN ((int)(r * 255.f), 255),
1649 MIN ((int)(g * 255.f), 255),
1650 MIN ((int)(b * 255.f), 255),
1651 MIN ((int)(a * 255.f), 255));
1466 1652
1467void glVertex (float x, float y, float z = 0.) 1653void glVertex (float x, float y, float z = 0.)
1468 CODE: 1654 CODE:
1469 glVertex3f (x, y, z); 1655 glVertex3f (x, y, z);
1470 1656

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines