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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines