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.59 by root, Sun Apr 23 04:41:33 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 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
9#include <string.h> 12#include <string.h>
10#include <stdio.h> 13#include <stdio.h>
11 14
12#include <SDL.h> 15#include <SDL.h>
16#include <SDL_endian.h>
13#include <SDL_image.h> 17#include <SDL_image.h>
14#include <SDL_mixer.h> 18#include <SDL_mixer.h>
15#include <SDL_opengl.h> 19#include <SDL_opengl.h>
16 20
17#include <glib/gmacros.h> 21#include <glib/gmacros.h>
18 22
19#include <pango/pango.h> 23#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h> 24#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h> 25#include <pango/pangoft2.h>
26#include <pango/pangocairo.h>
22 27
23#ifndef _WIN32 28#ifndef _WIN32
24# include <sys/types.h> 29# include <sys/types.h>
25# include <sys/socket.h> 30# include <sys/socket.h>
26# include <netinet/in.h> 31# include <netinet/in.h>
40#define FOW_DARKNESS 32 45#define FOW_DARKNESS 32
41 46
42#define MAP_EXTEND_X 32 47#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 48#define MAP_EXTEND_Y 512
44 49
45#define MIN_FONT_HEIGHT 8 * PANGO_SCALE 50#define MIN_FONT_HEIGHT 10
51
52#define GL_CALL(type,func,args) \
53 { \
54 static int init_; \
55 static type fptr_; \
56 \
57 if (!init_) \
58 { \
59 init_ = 1; \
60 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
61 } \
62 \
63 if (fptr_) \
64 fptr_ args; \
65 }
46 66
47typedef Mix_Chunk *CFClient__MixChunk; 67typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 68typedef Mix_Music *CFClient__MixMusic;
49 69
50static PangoContext *context; 70typedef PangoFontDescription *CFClient__Font;
51static PangoFontMap *fontmap;
52 71
53typedef struct cf_layout { 72typedef struct cf_layout {
54 PangoLayout *pl; 73 PangoLayout *pl; // either derived from a cairo or ft2 context
74 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
75 float r, g, b, a; // default color for rgba mode
55 int base_height; 76 int base_height;
77 CFClient__Font font;
56} *CFClient__Layout; 78} *CFClient__Layout;
79
80static CFClient__Font default_font;
81static PangoContext *ft2_context, *cairo_context;
82static PangoFontMap *ft2_fontmap, *cairo_fontmap;
57 83
58static void 84static void
59substitute_func (FcPattern *pattern, gpointer data) 85substitute_func (FcPattern *pattern, gpointer data)
60{ 86{
61 FcPatternAddBool (pattern, FC_HINTING , 1); 87 FcPatternAddBool (pattern, FC_HINTING , 1);
62 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 88 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
63} 89}
64 90
65static void 91static void
66layout_update (CFClient__Layout self) 92layout_update_font (CFClient__Layout self)
67{ 93{
68 /* use a random scale factor to account for unknown descenders, 0.8 works 94 /* use a random scale factor to account for unknown descenders, 0.8 works
69 * reasonably well with bitstream vera 95 * reasonably well with bitstream vera
70 */ 96 */
71 PangoFontDescription *font = pango_layout_get_font_description (self->pl); 97 PangoFontDescription *font = self->font ? self->font : default_font;
72 98
73 int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75 if (height < MIN_FONT_HEIGHT)
76 height = MIN_FONT_HEIGHT;
77
78 if (pango_font_description_get_size (font) != height)
79 {
80 font = pango_font_description_copy (font);
81 pango_font_description_set_absolute_size (font, height); 99 pango_font_description_set_absolute_size (font,
100 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
101
82 pango_layout_set_font_description (self->pl, font); 102 pango_layout_set_font_description (self->pl, font);
83 }
84} 103}
85 104
86static void 105static void
87layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 106layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
88{ 107{
89 layout_update (self);
90
91 pango_layout_get_pixel_size (self->pl, w, h); 108 pango_layout_get_pixel_size (self->pl, w, h);
92 109
93 *w = (*w + 3) & ~3;
94 if (!*w) *w = 1; 110 if (!*w) *w = 1;
95 if (!*h) *h = 1; 111 if (!*h) *h = 1;
112
113 *w = (*w + 3) & ~3;
96} 114}
97 115
98typedef uint16_t mapface; 116typedef uint16_t mapface;
99 117
100typedef struct { 118typedef struct {
248 } 266 }
249 } 267 }
250} 268}
251 269
252static void 270static void
253music_finished () 271music_finished (void)
254{ 272{
255 SDL_UserEvent ev; 273 SDL_UserEvent ev;
256 274
257 ev.type = SDL_USEREVENT; 275 ev.type = SDL_USEREVENT;
258 ev.code = 0; 276 ev.code = 0;
259 ev.data1 = 0; 277 ev.data1 = 0;
278 ev.data2 = 0;
279
280 SDL_PushEvent ((SDL_Event *)&ev);
281}
282
283static void
284channel_finished (int channel)
285{
286 SDL_UserEvent ev;
287
288 ev.type = SDL_USEREVENT;
289 ev.code = 1;
290 ev.data1 = (void *)(long)channel;
260 ev.data2 = 0; 291 ev.data2 = 0;
261 292
262 SDL_PushEvent ((SDL_Event *)&ev); 293 SDL_PushEvent ((SDL_Event *)&ev);
263} 294}
264 295
375# undef const_iv 406# undef const_iv
376 }; 407 };
377 408
378 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 409 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
379 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 410 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
411}
380 412
413void
414pango_init ()
415 CODE:
416{
417 // delayed, so it can pick up new fonts added by AddFontResourceEx
381 fontmap = pango_ft2_font_map_new (); 418 ft2_fontmap = pango_ft2_font_map_new ();
382 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 419 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
383 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); 420 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
421
422 cairo_fontmap = pango_cairo_font_map_get_default ();
423 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
384} 424}
385 425
386int 426int
387SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 427SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
388 428
447 487
448 while (SDL_PollEvent (&ev)) 488 while (SDL_PollEvent (&ev))
449 { 489 {
450 HV *hv = newHV (); 490 HV *hv = newHV ();
451 hv_store (hv, "type", 4, newSViv (ev.type), 0); 491 hv_store (hv, "type", 4, newSViv (ev.type), 0);
492
452 switch (ev.type) 493 switch (ev.type)
453 { 494 {
454 case SDL_KEYDOWN: 495 case SDL_KEYDOWN:
455 case SDL_KEYUP: 496 case SDL_KEYUP:
456 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 497 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
476 case SDL_MOUSEBUTTONUP: 517 case SDL_MOUSEBUTTONUP:
477 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 518 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
478 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 519 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
479 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 520 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
480 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 521 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522 break;
523
524 case SDL_USEREVENT:
525 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
526 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
527 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
528 break;
481 } 529 }
482 530
483 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 531 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
484 } 532 }
485} 533}
486 534
487int 535int
488Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 536Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
489 POSTCALL: 537 POSTCALL:
490 Mix_HookMusicFinished (music_finished); 538 Mix_HookMusicFinished (music_finished);
539 Mix_ChannelFinished (channel_finished);
491 540
492void 541void
493Mix_CloseAudio () 542Mix_CloseAudio ()
494 543
495int 544int
518 567
519void 568void
520add_font (char *file) 569add_font (char *file)
521 CODE: 570 CODE:
522 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 571 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
523 572#ifdef _WIN32
524void 573 // cairo... sigh... requires win2000
525set_font (char *file) 574 AddFontResourceEx (file, FR_PRIVATE, 0);
526 CODE: 575#endif
527{
528 int count;
529 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
530 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
531 FcPatternDestroy (pattern);
532 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
533 pango_context_set_font_description (context, font);
534}
535 576
536void 577void
537load_image_inline (SV *image_) 578load_image_inline (SV *image_)
538 ALIAS: 579 ALIAS:
539 load_image_file = 1 580 load_image_file = 1
621 PUSHs (sv_2mortal (newSViv (b / y))); 662 PUSHs (sv_2mortal (newSViv (b / y)));
622 PUSHs (sv_2mortal (newSViv (a / y))); 663 PUSHs (sv_2mortal (newSViv (a / y)));
623} 664}
624 665
625void 666void
667error (char *message)
668 CODE:
669#ifdef _WIN32
670 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
671#else
672 fprintf (stderr, "ERROR: %s\n", message);
673#endif
674
675void
626fatal (char *message) 676fatal (char *message)
627 CODE: 677 CODE:
628#ifdef _WIN32 678#ifdef _WIN32
629 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
630#else 680#else
631 fprintf (stderr, "FATAL: %s\n", message); 681 fprintf (stderr, "FATAL: %s\n", message);
632#endif 682#endif
633 exit (1); 683 exit (1);
634 684
685MODULE = CFClient PACKAGE = CFClient::Font
686
687CFClient::Font
688new_from_file (SV *class, char *path, int id = 0)
689 CODE:
690{
691 int count;
692 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
693 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
694 FcPatternDestroy (pattern);
695}
696 OUTPUT:
697 RETVAL
698
699void
700DESTROY (CFClient::Font self)
701 CODE:
702 pango_font_description_free (self);
703
704void
705make_default (CFClient::Font self)
706 CODE:
707 default_font = self;
708
635MODULE = CFClient PACKAGE = CFClient::Layout 709MODULE = CFClient PACKAGE = CFClient::Layout
636 710
637CFClient::Layout 711CFClient::Layout
638new (SV *class, int base_height = 10) 712new (SV *class, int rgba = 0)
639 CODE: 713 CODE:
640 New (0, RETVAL, 1, struct cf_layout); 714 New (0, RETVAL, 1, struct cf_layout);
641 RETVAL->base_height = base_height; 715
642 RETVAL->pl = pango_layout_new (context); 716 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
717 RETVAL->rgba = rgba;
718 RETVAL->r = 1.;
719 RETVAL->g = 1.;
720 RETVAL->b = 1.;
721 RETVAL->a = 1.;
722 RETVAL->base_height = MIN_FONT_HEIGHT;
723 RETVAL->font = 0;
724
643 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 725 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
644 pango_layout_set_font_description (RETVAL->pl, 726 layout_update_font (RETVAL);
645 pango_font_description_copy (
646 pango_context_get_font_description (context)));
647 OUTPUT: 727 OUTPUT:
648 RETVAL 728 RETVAL
649 729
650void 730void
651DESTROY (CFClient::Layout self) 731DESTROY (CFClient::Layout self)
652 CODE: 732 CODE:
653 g_object_unref (self->pl); 733 g_object_unref (self->pl);
654 Safefree (self); 734 Safefree (self);
655 735
736int
737is_rgba (CFClient::Layout self)
738 CODE:
739 RETVAL = self->rgba;
740 OUTPUT:
741 RETVAL
742
656void 743void
657set_text (CFClient::Layout self, SV *text_) 744set_text (CFClient::Layout self, SV *text_)
658 CODE: 745 CODE:
659{ 746{
660 STRLEN textlen; 747 STRLEN textlen;
680 SvUTF8_on (RETVAL); 767 SvUTF8_on (RETVAL);
681 OUTPUT: 768 OUTPUT:
682 RETVAL 769 RETVAL
683 770
684void 771void
772set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
773 CODE:
774 self->r = r;
775 self->g = g;
776 self->b = b;
777 self->a = a;
778
779void
780set_font (CFClient::Layout self, CFClient::Font font = 0)
781 CODE:
782 if (self->font != font)
783 {
784 self->font = font;
785 layout_update_font (self);
786 }
787
788void
685set_height (CFClient::Layout self, int base_height) 789set_height (CFClient::Layout self, int base_height)
686 CODE: 790 CODE:
791 if (self->base_height != base_height)
792 {
687 self->base_height = base_height; 793 self->base_height = base_height;
794 layout_update_font (self);
795 }
688 796
689void 797void
690set_width (CFClient::Layout self, int max_width = -1) 798set_width (CFClient::Layout self, int max_width = -1)
691 CODE: 799 CODE:
692 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 800 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
695size (CFClient::Layout self) 803size (CFClient::Layout self)
696 PPCODE: 804 PPCODE:
697{ 805{
698 int w, h; 806 int w, h;
699 807
700 layout_update (self);
701 layout_get_pixel_size (self, &w, &h); 808 layout_get_pixel_size (self, &w, &h);
702 809
703 EXTEND (SP, 2); 810 EXTEND (SP, 2);
704 PUSHs (sv_2mortal (newSViv (w))); 811 PUSHs (sv_2mortal (newSViv (w)));
705 PUSHs (sv_2mortal (newSViv (h))); 812 PUSHs (sv_2mortal (newSViv (h)));
708int 815int
709xy_to_index (CFClient::Layout self, int x, int y) 816xy_to_index (CFClient::Layout self, int x, int y)
710 CODE: 817 CODE:
711{ 818{
712 int index, trailing; 819 int index, trailing;
713
714 layout_update (self);
715 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 820 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
716
717 RETVAL = index; 821 RETVAL = index;
718} 822}
719 OUTPUT: 823 OUTPUT:
720 RETVAL 824 RETVAL
721 825
722void 826void
723cursor_pos (CFClient::Layout self, int index) 827cursor_pos (CFClient::Layout self, int index)
724 PPCODE: 828 PPCODE:
725{ 829{
726 PangoRectangle strong_pos; 830 PangoRectangle strong_pos;
727 layout_update (self);
728 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 831 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
729 832
730 EXTEND (SP, 3); 833 EXTEND (SP, 3);
731 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 834 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
732 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 835 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
737render (CFClient::Layout self) 840render (CFClient::Layout self)
738 PPCODE: 841 PPCODE:
739{ 842{
740 SV *retval; 843 SV *retval;
741 int w, h; 844 int w, h;
742 FT_Bitmap bitmap;
743 845
744 layout_update (self);
745 layout_get_pixel_size (self, &w, &h); 846 layout_get_pixel_size (self, &w, &h);
746 847
848 if (self->rgba)
849 {
850 cairo_surface_t *surface;
851 cairo_t *cairo;
852
853 retval = newSV (w * h * 4);
854 SvPOK_only (retval);
855 SvCUR_set (retval, w * h * 4);
856
857 memset (SvPVX (retval), 0, w * h * 4);
858
859 surface = cairo_image_surface_create_for_data (
860 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
861 cairo = cairo_create (surface);
862 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
863
864 pango_cairo_show_layout (cairo, self->pl);
865
866 cairo_destroy (cairo);
867 cairo_surface_destroy (surface);
868
869 // what a mess, and its premultiplied, too :(
870 {
871 uint32_t *p = (uint32_t *)SvPVX (retval);
872 uint32_t *e = p + w * h;
873
874 while (p < e)
875 {
876 uint32_t rgba = *p;
877 rgba = (rgba >> 24) | (rgba << 8);
878 rgba = SDL_SwapBE32 (rgba);
879 *p++ = rgba;
880 }
881 }
882
883 EXTEND (SP, 5);
884 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h)));
886 PUSHs (sv_2mortal (retval));
887 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
888 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889 }
890 else
891 {
892 FT_Bitmap bitmap;
893
747 retval = newSV (w * h); 894 retval = newSV (w * h);
748 SvPOK_only (retval); 895 SvPOK_only (retval);
749 SvCUR_set (retval, w * h); 896 SvCUR_set (retval, w * h);
750 897
751 bitmap.rows = h; 898 bitmap.rows = h;
752 bitmap.width = w; 899 bitmap.width = w;
753 bitmap.pitch = w; 900 bitmap.pitch = w;
754 bitmap.buffer = (unsigned char*)SvPVX (retval); 901 bitmap.buffer = (unsigned char*)SvPVX (retval);
755 bitmap.num_grays = 256; 902 bitmap.num_grays = 256;
756 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 903 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
757 904
758 memset (bitmap.buffer, 0, w * h); 905 memset (bitmap.buffer, 0, w * h);
759 906
760 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 907 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
761 908
762 EXTEND (SP, 3); 909 EXTEND (SP, 5);
763 PUSHs (sv_2mortal (newSViv (w))); 910 PUSHs (sv_2mortal (newSViv (w)));
764 PUSHs (sv_2mortal (newSViv (h))); 911 PUSHs (sv_2mortal (newSViv (h)));
765 PUSHs (sv_2mortal (retval)); 912 PUSHs (sv_2mortal (retval));
913 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
914 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915 }
766} 916}
767 917
768MODULE = CFClient PACKAGE = CFClient::Texture 918MODULE = CFClient PACKAGE = CFClient::Texture
769 919
770void 920void
771draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 921draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
772 PROTOTYPE: $$$;$$ 922 PROTOTYPE: $$$;$$
923 ALIAS:
924 draw_quad_alpha = 1
925 draw_quad_alpha_premultiplied = 2
773 CODE: 926 CODE:
774{ 927{
775 HV *hv = (HV *)SvRV (self); 928 HV *hv = (HV *)SvRV (self);
776 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 929 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
777 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 930 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
782 { 935 {
783 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 936 w = SvNV (*hv_fetch (hv, "w", 1, 1));
784 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 937 h = SvNV (*hv_fetch (hv, "h", 1, 1));
785 } 938 }
786 939
940 if (ix)
941 {
942 glEnable (GL_BLEND);
943 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
944 }
945
787 glBindTexture (GL_TEXTURE_2D, name); 946 glBindTexture (GL_TEXTURE_2D, name);
947
788 if (wrap_mode) { 948 if (wrap_mode)
949 {
789 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 950 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
790 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
791 } 952 }
953
792 glBegin (GL_QUADS); 954 glBegin (GL_QUADS);
793 glTexCoord2f (0, 0); glVertex2f (x , y ); 955 glTexCoord2f (0, 0); glVertex2f (x , y );
794 glTexCoord2f (0, t); glVertex2f (x , y + h); 956 glTexCoord2f (0, t); glVertex2f (x , y + h);
795 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 957 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
796 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 958 glTexCoord2f (s, 0); glVertex2f (x + w, y );
797 glEnd (); 959 glEnd ();
960
961 if (ix)
962 glDisable (GL_BLEND);
798} 963}
799 964
800MODULE = CFClient PACKAGE = CFClient::Map 965MODULE = CFClient PACKAGE = CFClient::Map
801 966
802CFClient::Map 967CFClient::Map
1311 } *civ, const_iv[] = { 1476 } *civ, const_iv[] = {
1312# define const_iv(name) { # name, (IV)name } 1477# define const_iv(name) { # name, (IV)name }
1313 const_iv (GL_COLOR_MATERIAL), 1478 const_iv (GL_COLOR_MATERIAL),
1314 const_iv (GL_SMOOTH), 1479 const_iv (GL_SMOOTH),
1315 const_iv (GL_FLAT), 1480 const_iv (GL_FLAT),
1481 const_iv (GL_DITHER),
1316 const_iv (GL_BLEND), 1482 const_iv (GL_BLEND),
1483 const_iv (GL_SCISSOR_TEST),
1317 const_iv (GL_AND), 1484 const_iv (GL_AND),
1485 const_iv (GL_ONE),
1486 const_iv (GL_ZERO),
1318 const_iv (GL_SRC_ALPHA), 1487 const_iv (GL_SRC_ALPHA),
1488 const_iv (GL_SRC_ALPHA_SATURATE),
1319 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1489 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490 const_iv (GL_ONE_MINUS_DST_ALPHA),
1320 const_iv (GL_RGB), 1491 const_iv (GL_RGB),
1321 const_iv (GL_RGBA), 1492 const_iv (GL_RGBA),
1322 const_iv (GL_UNSIGNED_BYTE), 1493 const_iv (GL_UNSIGNED_BYTE),
1323 const_iv (GL_ALPHA4),
1324 const_iv (GL_ALPHA), 1494 const_iv (GL_ALPHA),
1495 const_iv (GL_LUMINANCE),
1325 const_iv (GL_FLOAT), 1496 const_iv (GL_FLOAT),
1326 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1327 const_iv (GL_COMPILE), 1498 const_iv (GL_COMPILE),
1328 const_iv (GL_TEXTURE_1D), 1499 const_iv (GL_TEXTURE_1D),
1329 const_iv (GL_TEXTURE_2D), 1500 const_iv (GL_TEXTURE_2D),
1340 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1511 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1341 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1512 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1342 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1513 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1343 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1514 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1344 const_iv (GL_GENERATE_MIPMAP), 1515 const_iv (GL_GENERATE_MIPMAP),
1345 const_iv (GL_LINEAR),
1346 const_iv (GL_MODULATE), 1516 const_iv (GL_MODULATE),
1517 const_iv (GL_DECAL),
1347 const_iv (GL_REPLACE), 1518 const_iv (GL_REPLACE),
1348 const_iv (GL_COLOR_BUFFER_BIT), 1519 const_iv (GL_COLOR_BUFFER_BIT),
1349 const_iv (GL_PROJECTION), 1520 const_iv (GL_PROJECTION),
1350 const_iv (GL_MODELVIEW), 1521 const_iv (GL_MODELVIEW),
1351 const_iv (GL_COLOR_LOGIC_OP), 1522 const_iv (GL_COLOR_LOGIC_OP),
1523 const_iv (GL_SEPARABLE_2D),
1352 const_iv (GL_CONVOLUTION_2D), 1524 const_iv (GL_CONVOLUTION_2D),
1353 const_iv (GL_CONVOLUTION_BORDER_MODE), 1525 const_iv (GL_CONVOLUTION_BORDER_MODE),
1354 const_iv (GL_CONSTANT_BORDER), 1526 const_iv (GL_CONSTANT_BORDER),
1355 const_iv (GL_LINES), 1527 const_iv (GL_LINES),
1356 const_iv (GL_QUADS), 1528 const_iv (GL_QUADS),
1381 1553
1382void glBlendFunc (int sfactor, int dfactor) 1554void glBlendFunc (int sfactor, int dfactor)
1383 1555
1384void glLogicOp (int opcode) 1556void glLogicOp (int opcode)
1385 1557
1558void glColorMask (int red, int green, int blue, int alpha)
1559
1386void glMatrixMode (int mode) 1560void glMatrixMode (int mode)
1387 1561
1388void glPushMatrix () 1562void glPushMatrix ()
1389 1563
1390void glPopMatrix () 1564void glPopMatrix ()
1391 1565
1392void glLoadIdentity () 1566void glLoadIdentity ()
1393 1567
1568# near and far are due to microsofts buggy c compiler
1394void glOrtho (double left, double right, double bottom, double top, double near, double far) 1569void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1395 1570
1396void glViewport (int x, int y, int width, int height) 1571void glViewport (int x, int y, int width, int height)
1572
1573void glScissor (int x, int y, int width, int height)
1397 1574
1398void glTranslate (float x, float y, float z = 0.) 1575void glTranslate (float x, float y, float z = 0.)
1399 CODE: 1576 CODE:
1400 glTranslatef (x, y, z); 1577 glTranslatef (x, y, z);
1401 1578
1402void glScale (float x, float y, float z) 1579void glScale (float x, float y, float z = 1.)
1403 CODE: 1580 CODE:
1404 glScalef (x, y, z); 1581 glScalef (x, y, z);
1405 1582
1406void glRotate (float angle, float x, float y, float z) 1583void glRotate (float angle, float x, float y, float z)
1407 CODE: 1584 CODE:
1412void glEnd () 1589void glEnd ()
1413 1590
1414void glColor (float r, float g, float b, float a = 1.0) 1591void glColor (float r, float g, float b, float a = 1.0)
1415 PROTOTYPE: @ 1592 PROTOTYPE: @
1416 CODE: 1593 CODE:
1417 glColor4f (r, g, b, a); 1594 // 255.999 is close enough to correctness (256 and clamp)
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);
1418 1596
1419void glVertex (float x, float y, float z = 0.) 1597void glVertex (float x, float y, float z = 0.)
1420 CODE: 1598 CODE:
1421 glVertex3f (x, y, z); 1599 glVertex3f (x, y, z);
1422 1600
1434 1612
1435void glBindTexture (int target, int name) 1613void glBindTexture (int target, int name)
1436 1614
1437void glConvolutionParameter (int target, int pname, float params) 1615void glConvolutionParameter (int target, int pname, float params)
1438 CODE: 1616 CODE:
1439 glConvolutionParameterf (target, pname, params); 1617 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1440 1618
1441void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1619void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1620 CODE:
1621 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1622 (target, internalformat, width, height, format, type, data));
1623
1624void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1625 CODE:
1626 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1627 (target, internalformat, width, height, format, type, row, column));
1442 1628
1443void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1629void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1444 1630
1445void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1631void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1632
1633void glRasterPos (int x, int y)
1634 CODE:
1635 glRasterPos2i (x, y);
1636
1637void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1446 1638
1447int glGenTexture () 1639int glGenTexture ()
1448 CODE: 1640 CODE:
1449{ 1641{
1450 GLuint name; 1642 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines