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.56 by root, Thu Apr 20 09:13:31 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>
33 typedef signed char int8_t; 38 typedef signed char int8_t;
34 typedef signed short int16_t; 39 typedef signed short int16_t;
35 typedef signed int int32_t; 40 typedef signed int int32_t;
36#endif 41#endif
37 42
43#include "glext.h"
44
38#define FOW_DARKNESS 32 45#define FOW_DARKNESS 32
39 46
40#define MAP_EXTEND_X 32 47#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 48#define MAP_EXTEND_Y 512
42 49
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 }
66
43typedef Mix_Chunk *CFClient__MixChunk; 67typedef Mix_Chunk *CFClient__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 68typedef Mix_Music *CFClient__MixMusic;
45 69
46static PangoContext *context; 70typedef PangoFontDescription *CFClient__Font;
47static PangoFontMap *fontmap;
48 71
49typedef struct cf_layout { 72typedef struct cf_layout {
50 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
51 int base_height; 76 int base_height;
77 CFClient__Font font;
52} *CFClient__Layout; 78} *CFClient__Layout;
79
80static CFClient__Font default_font;
81static PangoContext *ft2_context, *cairo_context;
82static PangoFontMap *ft2_fontmap, *cairo_fontmap;
53 83
54static void 84static void
55substitute_func (FcPattern *pattern, gpointer data) 85substitute_func (FcPattern *pattern, gpointer data)
56{ 86{
57 FcPatternAddBool (pattern, FC_HINTING , 1); 87 FcPatternAddBool (pattern, FC_HINTING , 1);
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 88 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
59} 89}
60 90
61static void 91static void
62layout_update (CFClient__Layout self) 92layout_update_font (CFClient__Layout self)
63{ 93{
64 /* 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
65 * reasonably well with bitstream vera 95 * reasonably well with bitstream vera
66 */ 96 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 97 PangoFontDescription *font = self->font ? self->font : default_font;
68 98
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 99 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 100 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 101
102 pango_layout_set_font_description (self->pl, font);
76} 103}
77 104
78static void 105static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 106layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
80{ 107{
81 layout_update (self);
82
83 pango_layout_get_pixel_size (self->pl, w, h); 108 pango_layout_get_pixel_size (self->pl, w, h);
84 109
85 *w = (*w + 3) & ~3;
86 if (!*w) *w = 1; 110 if (!*w) *w = 1;
87 if (!*h) *h = 1; 111 if (!*h) *h = 1;
112
113 *w = (*w + 3) & ~3;
88} 114}
89 115
90typedef uint16_t mapface; 116typedef uint16_t mapface;
91 117
92typedef struct { 118typedef struct {
240 } 266 }
241 } 267 }
242} 268}
243 269
244static void 270static void
245music_finished () 271music_finished (void)
246{ 272{
247 SDL_UserEvent ev; 273 SDL_UserEvent ev;
248 274
249 ev.type = SDL_USEREVENT; 275 ev.type = SDL_USEREVENT;
250 ev.code = 0; 276 ev.code = 0;
251 ev.data1 = 0; 277 ev.data1 = 0;
252 ev.data2 = 0; 278 ev.data2 = 0;
253 279
280 SDL_PushEvent ((SDL_Event *)&ev);
281}
282
283static void
284channel_finished (int channel)
285{
254 SDL_PushEvent (&ev); 286 SDL_UserEvent ev;
287
288 ev.type = SDL_USEREVENT;
289 ev.code = 1;
290 ev.data1 = (void *)(long)channel;
291 ev.data2 = 0;
292
293 SDL_PushEvent ((SDL_Event *)&ev);
255} 294}
256 295
257MODULE = CFClient PACKAGE = CFClient 296MODULE = CFClient PACKAGE = CFClient
258 297
259PROTOTYPES: ENABLE 298PROTOTYPES: ENABLE
367# undef const_iv 406# undef const_iv
368 }; 407 };
369 408
370 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; )
371 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 410 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
411}
372 412
413void
414pango_init ()
415 CODE:
416{
417 // delayed, so it can pick up new fonts added by AddFontResourceEx
373 fontmap = pango_ft2_font_map_new (); 418 ft2_fontmap = pango_ft2_font_map_new ();
374 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);
375 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);
376} 424}
377 425
378int 426int
379SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 427SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
380 428
439 487
440 while (SDL_PollEvent (&ev)) 488 while (SDL_PollEvent (&ev))
441 { 489 {
442 HV *hv = newHV (); 490 HV *hv = newHV ();
443 hv_store (hv, "type", 4, newSViv (ev.type), 0); 491 hv_store (hv, "type", 4, newSViv (ev.type), 0);
492
444 switch (ev.type) 493 switch (ev.type)
445 { 494 {
446 case SDL_KEYDOWN: 495 case SDL_KEYDOWN:
447 case SDL_KEYUP: 496 case SDL_KEYUP:
448 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 497 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
468 case SDL_MOUSEBUTTONUP: 517 case SDL_MOUSEBUTTONUP:
469 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 518 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
470 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 519 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
471 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 520 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
472 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;
473 } 529 }
474 530
475 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 531 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
476 } 532 }
477} 533}
478 534
479int 535int
480Mix_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)
481 POSTCALL: 537 POSTCALL:
482 Mix_HookMusicFinished (music_finished); 538 Mix_HookMusicFinished (music_finished);
539 Mix_ChannelFinished (channel_finished);
483 540
484void 541void
485Mix_CloseAudio () 542Mix_CloseAudio ()
486 543
487int 544int
510 567
511void 568void
512add_font (char *file) 569add_font (char *file)
513 CODE: 570 CODE:
514 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 571 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
515 572#ifdef _WIN32
516void 573 // cairo... sigh... requires win2000
517set_font (char *file) 574 AddFontResourceEx (file, FR_PRIVATE, 0);
518 CODE: 575#endif
519{
520 int count;
521 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
522 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
523 FcPatternDestroy (pattern);
524 pango_context_set_font_description (context, font);
525}
526 576
527void 577void
528load_image_inline (SV *image_) 578load_image_inline (SV *image_)
529 ALIAS: 579 ALIAS:
530 load_image_file = 1 580 load_image_file = 1
612 PUSHs (sv_2mortal (newSViv (b / y))); 662 PUSHs (sv_2mortal (newSViv (b / y)));
613 PUSHs (sv_2mortal (newSViv (a / y))); 663 PUSHs (sv_2mortal (newSViv (a / y)));
614} 664}
615 665
616void 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
617fatal (char *message) 676fatal (char *message)
618 CODE: 677 CODE:
619#ifdef _WIN32 678#ifdef _WIN32
620 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);
621#else 680#else
622 fprintf (stderr, "FATAL: %s\n", message); 681 fprintf (stderr, "FATAL: %s\n", message);
623#endif 682#endif
624 exit (1); 683 exit (1);
625 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
626MODULE = CFClient PACKAGE = CFClient::Layout 709MODULE = CFClient PACKAGE = CFClient::Layout
627 710
628CFClient::Layout 711CFClient::Layout
629new (SV *class, int base_height = 10) 712new (SV *class, int rgba = 0)
630 CODE: 713 CODE:
631 New (0, RETVAL, 1, struct cf_layout); 714 New (0, RETVAL, 1, struct cf_layout);
632 RETVAL->base_height = base_height; 715
633 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
634 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 725 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
726 layout_update_font (RETVAL);
635 OUTPUT: 727 OUTPUT:
636 RETVAL 728 RETVAL
637 729
638void 730void
639DESTROY (CFClient::Layout self) 731DESTROY (CFClient::Layout self)
640 CODE: 732 CODE:
641 g_object_unref (self->pl); 733 g_object_unref (self->pl);
642 Safefree (self); 734 Safefree (self);
643 735
736int
737is_rgba (CFClient::Layout self)
738 CODE:
739 RETVAL = self->rgba;
740 OUTPUT:
741 RETVAL
742
644void 743void
645set_text (CFClient::Layout self, SV *text_) 744set_text (CFClient::Layout self, SV *text_)
646 CODE: 745 CODE:
647{ 746{
648 STRLEN textlen; 747 STRLEN textlen;
668 SvUTF8_on (RETVAL); 767 SvUTF8_on (RETVAL);
669 OUTPUT: 768 OUTPUT:
670 RETVAL 769 RETVAL
671 770
672void 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
673set_height (CFClient::Layout self, int base_height) 789set_height (CFClient::Layout self, int base_height)
674 CODE: 790 CODE:
791 if (self->base_height != base_height)
792 {
675 self->base_height = base_height; 793 self->base_height = base_height;
794 layout_update_font (self);
795 }
676 796
677void 797void
678set_width (CFClient::Layout self, int max_width = -1) 798set_width (CFClient::Layout self, int max_width = -1)
679 CODE: 799 CODE:
680 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);
683size (CFClient::Layout self) 803size (CFClient::Layout self)
684 PPCODE: 804 PPCODE:
685{ 805{
686 int w, h; 806 int w, h;
687 807
688 layout_update (self);
689 layout_get_pixel_size (self, &w, &h); 808 layout_get_pixel_size (self, &w, &h);
690 809
691 EXTEND (SP, 2); 810 EXTEND (SP, 2);
692 PUSHs (sv_2mortal (newSViv (w))); 811 PUSHs (sv_2mortal (newSViv (w)));
693 PUSHs (sv_2mortal (newSViv (h))); 812 PUSHs (sv_2mortal (newSViv (h)));
696int 815int
697xy_to_index (CFClient::Layout self, int x, int y) 816xy_to_index (CFClient::Layout self, int x, int y)
698 CODE: 817 CODE:
699{ 818{
700 int index, trailing; 819 int index, trailing;
701
702 layout_update (self);
703 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);
704
705 RETVAL = index; 821 RETVAL = index;
706} 822}
707 OUTPUT: 823 OUTPUT:
708 RETVAL 824 RETVAL
709 825
710void 826void
711cursor_pos (CFClient::Layout self, int index) 827cursor_pos (CFClient::Layout self, int index)
712 PPCODE: 828 PPCODE:
713{ 829{
714 PangoRectangle strong_pos; 830 PangoRectangle strong_pos;
715 layout_update (self);
716 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 831 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
717 832
718 EXTEND (SP, 3); 833 EXTEND (SP, 3);
719 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 834 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
720 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 835 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
725render (CFClient::Layout self) 840render (CFClient::Layout self)
726 PPCODE: 841 PPCODE:
727{ 842{
728 SV *retval; 843 SV *retval;
729 int w, h; 844 int w, h;
730 FT_Bitmap bitmap;
731 845
732 layout_update (self);
733 layout_get_pixel_size (self, &w, &h); 846 layout_get_pixel_size (self, &w, &h);
734 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
735 retval = newSV (w * h); 894 retval = newSV (w * h);
736 SvPOK_only (retval); 895 SvPOK_only (retval);
737 SvCUR_set (retval, w * h); 896 SvCUR_set (retval, w * h);
738 897
739 bitmap.rows = h; 898 bitmap.rows = h;
740 bitmap.width = w; 899 bitmap.width = w;
741 bitmap.pitch = w; 900 bitmap.pitch = w;
742 bitmap.buffer = (unsigned char*)SvPVX (retval); 901 bitmap.buffer = (unsigned char*)SvPVX (retval);
743 bitmap.num_grays = 256; 902 bitmap.num_grays = 256;
744 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 903 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
745 904
746 memset (bitmap.buffer, 0, w * h); 905 memset (bitmap.buffer, 0, w * h);
747 906
748 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);
749 908
750 EXTEND (SP, 3); 909 EXTEND (SP, 5);
751 PUSHs (sv_2mortal (newSViv (w))); 910 PUSHs (sv_2mortal (newSViv (w)));
752 PUSHs (sv_2mortal (newSViv (h))); 911 PUSHs (sv_2mortal (newSViv (h)));
753 PUSHs (sv_2mortal (retval)); 912 PUSHs (sv_2mortal (retval));
913 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
914 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915 }
754} 916}
755 917
756MODULE = CFClient PACKAGE = CFClient::Texture 918MODULE = CFClient PACKAGE = CFClient::Texture
757 919
758void 920void
759draw_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)
760 PROTOTYPE: $$$;$$ 922 PROTOTYPE: $$$;$$
923 ALIAS:
924 draw_quad_alpha = 1
925 draw_quad_alpha_premultiplied = 2
761 CODE: 926 CODE:
762{ 927{
763 HV *hv = (HV *)SvRV (self); 928 HV *hv = (HV *)SvRV (self);
764 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 929 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
765 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 930 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
770 { 935 {
771 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 936 w = SvNV (*hv_fetch (hv, "w", 1, 1));
772 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 937 h = SvNV (*hv_fetch (hv, "h", 1, 1));
773 } 938 }
774 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
775 glBindTexture (GL_TEXTURE_2D, name); 946 glBindTexture (GL_TEXTURE_2D, name);
947
776 if (wrap_mode) { 948 if (wrap_mode)
949 {
777 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 950 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
778 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
779 } 952 }
953
780 glBegin (GL_QUADS); 954 glBegin (GL_QUADS);
781 glTexCoord2f (0, 0); glVertex2f (x , y ); 955 glTexCoord2f (0, 0); glVertex2f (x , y );
782 glTexCoord2f (0, t); glVertex2f (x , y + h); 956 glTexCoord2f (0, t); glVertex2f (x , y + h);
783 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 957 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
784 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 958 glTexCoord2f (s, 0); glVertex2f (x + w, y );
785 glEnd (); 959 glEnd ();
960
961 if (ix)
962 glDisable (GL_BLEND);
786} 963}
787 964
788MODULE = CFClient PACKAGE = CFClient::Map 965MODULE = CFClient PACKAGE = CFClient::Map
789 966
790CFClient::Map 967CFClient::Map
1299 } *civ, const_iv[] = { 1476 } *civ, const_iv[] = {
1300# define const_iv(name) { # name, (IV)name } 1477# define const_iv(name) { # name, (IV)name }
1301 const_iv (GL_COLOR_MATERIAL), 1478 const_iv (GL_COLOR_MATERIAL),
1302 const_iv (GL_SMOOTH), 1479 const_iv (GL_SMOOTH),
1303 const_iv (GL_FLAT), 1480 const_iv (GL_FLAT),
1481 const_iv (GL_DITHER),
1304 const_iv (GL_BLEND), 1482 const_iv (GL_BLEND),
1483 const_iv (GL_SCISSOR_TEST),
1305 const_iv (GL_AND), 1484 const_iv (GL_AND),
1485 const_iv (GL_ONE),
1486 const_iv (GL_ZERO),
1306 const_iv (GL_SRC_ALPHA), 1487 const_iv (GL_SRC_ALPHA),
1488 const_iv (GL_SRC_ALPHA_SATURATE),
1307 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1489 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490 const_iv (GL_ONE_MINUS_DST_ALPHA),
1308 const_iv (GL_RGB), 1491 const_iv (GL_RGB),
1309 const_iv (GL_RGBA), 1492 const_iv (GL_RGBA),
1310 const_iv (GL_UNSIGNED_BYTE), 1493 const_iv (GL_UNSIGNED_BYTE),
1311 const_iv (GL_ALPHA4),
1312 const_iv (GL_ALPHA), 1494 const_iv (GL_ALPHA),
1495 const_iv (GL_LUMINANCE),
1313 const_iv (GL_FLOAT), 1496 const_iv (GL_FLOAT),
1314 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1315 const_iv (GL_COMPILE), 1498 const_iv (GL_COMPILE),
1316 const_iv (GL_TEXTURE_1D), 1499 const_iv (GL_TEXTURE_1D),
1317 const_iv (GL_TEXTURE_2D), 1500 const_iv (GL_TEXTURE_2D),
1323 const_iv (GL_TEXTURE_WRAP_T), 1506 const_iv (GL_TEXTURE_WRAP_T),
1324 const_iv (GL_CLAMP), 1507 const_iv (GL_CLAMP),
1325 const_iv (GL_REPEAT), 1508 const_iv (GL_REPEAT),
1326 const_iv (GL_NEAREST), 1509 const_iv (GL_NEAREST),
1327 const_iv (GL_LINEAR), 1510 const_iv (GL_LINEAR),
1511 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515 const_iv (GL_GENERATE_MIPMAP),
1328 const_iv (GL_MODULATE), 1516 const_iv (GL_MODULATE),
1517 const_iv (GL_DECAL),
1329 const_iv (GL_REPLACE), 1518 const_iv (GL_REPLACE),
1330 const_iv (GL_COLOR_BUFFER_BIT), 1519 const_iv (GL_COLOR_BUFFER_BIT),
1331 const_iv (GL_PROJECTION), 1520 const_iv (GL_PROJECTION),
1332 const_iv (GL_MODELVIEW), 1521 const_iv (GL_MODELVIEW),
1333 const_iv (GL_COLOR_LOGIC_OP), 1522 const_iv (GL_COLOR_LOGIC_OP),
1523 const_iv (GL_SEPARABLE_2D),
1334 const_iv (GL_CONVOLUTION_2D), 1524 const_iv (GL_CONVOLUTION_2D),
1335 const_iv (GL_CONVOLUTION_BORDER_MODE), 1525 const_iv (GL_CONVOLUTION_BORDER_MODE),
1336 const_iv (GL_CONSTANT_BORDER), 1526 const_iv (GL_CONSTANT_BORDER),
1337 const_iv (GL_LINES), 1527 const_iv (GL_LINES),
1338 const_iv (GL_QUADS), 1528 const_iv (GL_QUADS),
1363 1553
1364void glBlendFunc (int sfactor, int dfactor) 1554void glBlendFunc (int sfactor, int dfactor)
1365 1555
1366void glLogicOp (int opcode) 1556void glLogicOp (int opcode)
1367 1557
1558void glColorMask (int red, int green, int blue, int alpha)
1559
1368void glMatrixMode (int mode) 1560void glMatrixMode (int mode)
1369 1561
1370void glPushMatrix () 1562void glPushMatrix ()
1371 1563
1372void glPopMatrix () 1564void glPopMatrix ()
1373 1565
1374void glLoadIdentity () 1566void glLoadIdentity ()
1375 1567
1568# near and far are due to microsofts buggy c compiler
1376void 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_)
1377 1570
1378void 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)
1379 1574
1380void glTranslate (float x, float y, float z = 0.) 1575void glTranslate (float x, float y, float z = 0.)
1381 CODE: 1576 CODE:
1382 glTranslatef (x, y, z); 1577 glTranslatef (x, y, z);
1383 1578
1384void glScale (float x, float y, float z) 1579void glScale (float x, float y, float z = 1.)
1385 CODE: 1580 CODE:
1386 glScalef (x, y, z); 1581 glScalef (x, y, z);
1387 1582
1388void glRotate (float angle, float x, float y, float z) 1583void glRotate (float angle, float x, float y, float z)
1389 CODE: 1584 CODE:
1394void glEnd () 1589void glEnd ()
1395 1590
1396void glColor (float r, float g, float b, float a = 1.0) 1591void glColor (float r, float g, float b, float a = 1.0)
1397 PROTOTYPE: @ 1592 PROTOTYPE: @
1398 CODE: 1593 CODE:
1399 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);
1400 1596
1401void glVertex (float x, float y, float z = 0.) 1597void glVertex (float x, float y, float z = 0.)
1402 CODE: 1598 CODE:
1403 glVertex3f (x, y, z); 1599 glVertex3f (x, y, z);
1404 1600
1416 1612
1417void glBindTexture (int target, int name) 1613void glBindTexture (int target, int name)
1418 1614
1419void glConvolutionParameter (int target, int pname, float params) 1615void glConvolutionParameter (int target, int pname, float params)
1420 CODE: 1616 CODE:
1421 glConvolutionParameterf (target, pname, params); 1617 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1422 1618
1423void 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));
1424 1628
1425void 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)
1426 1630
1427void 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)
1428 1638
1429int glGenTexture () 1639int glGenTexture ()
1430 CODE: 1640 CODE:
1431{ 1641{
1432 GLuint name; 1642 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines