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.60 by root, Sun Apr 23 04:47:02 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 = (PangoFontDescription *) 98 PangoFontDescription *font = self->font ? self->font : default_font;
72 pango_layout_get_font_description (self->pl);
73 99
74 int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76 if (height < MIN_FONT_HEIGHT)
77 height = MIN_FONT_HEIGHT;
78
79 if (pango_font_description_get_size (font) != height)
80 {
81 font = pango_font_description_copy (font);
82 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
83 pango_layout_set_font_description (self->pl, font); 103 pango_layout_set_font_description (self->pl, font);
84 }
85} 104}
86 105
87static void 106static void
88layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 107layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
89{ 108{
90 layout_update (self);
91
92 pango_layout_get_pixel_size (self->pl, w, h); 109 pango_layout_get_pixel_size (self->pl, w, h);
93 110
94 *w = (*w + 3) & ~3;
95 if (!*w) *w = 1; 111 if (!*w) *w = 1;
96 if (!*h) *h = 1; 112 if (!*h) *h = 1;
113
114 *w = (*w + 3) & ~3;
97} 115}
98 116
99typedef uint16_t mapface; 117typedef uint16_t mapface;
100 118
101typedef struct { 119typedef struct {
249 } 267 }
250 } 268 }
251} 269}
252 270
253static void 271static void
254music_finished () 272music_finished (void)
255{ 273{
256 SDL_UserEvent ev; 274 SDL_UserEvent ev;
257 275
258 ev.type = SDL_USEREVENT; 276 ev.type = SDL_USEREVENT;
259 ev.code = 0; 277 ev.code = 0;
260 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;
261 ev.data2 = 0; 292 ev.data2 = 0;
262 293
263 SDL_PushEvent ((SDL_Event *)&ev); 294 SDL_PushEvent ((SDL_Event *)&ev);
264} 295}
265 296
376# undef const_iv 407# undef const_iv
377 }; 408 };
378 409
379 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; )
380 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 411 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
412}
381 413
414void
415pango_init ()
416 CODE:
417{
418 // delayed, so it can pick up new fonts added by AddFontResourceEx
382 fontmap = pango_ft2_font_map_new (); 419 ft2_fontmap = pango_ft2_font_map_new ();
383 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);
384 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);
385} 425}
386 426
387int 427int
388SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 428SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
389 429
448 488
449 while (SDL_PollEvent (&ev)) 489 while (SDL_PollEvent (&ev))
450 { 490 {
451 HV *hv = newHV (); 491 HV *hv = newHV ();
452 hv_store (hv, "type", 4, newSViv (ev.type), 0); 492 hv_store (hv, "type", 4, newSViv (ev.type), 0);
493
453 switch (ev.type) 494 switch (ev.type)
454 { 495 {
455 case SDL_KEYDOWN: 496 case SDL_KEYDOWN:
456 case SDL_KEYUP: 497 case SDL_KEYUP:
457 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 498 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
477 case SDL_MOUSEBUTTONUP: 518 case SDL_MOUSEBUTTONUP:
478 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 519 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 520 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 521 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481 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;
482 } 530 }
483 531
484 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 532 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
485 } 533 }
486} 534}
487 535
488int 536int
489Mix_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)
490 POSTCALL: 538 POSTCALL:
491 Mix_HookMusicFinished (music_finished); 539 Mix_HookMusicFinished (music_finished);
540 Mix_ChannelFinished (channel_finished);
492 541
493void 542void
494Mix_CloseAudio () 543Mix_CloseAudio ()
495 544
496int 545int
519 568
520void 569void
521add_font (char *file) 570add_font (char *file)
522 CODE: 571 CODE:
523 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 572 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
524 573#ifdef _WIN32
525void 574 // cairo... sigh... requires win2000
526set_font (char *file) 575 AddFontResourceEx (file, FR_PRIVATE, 0);
527 CODE: 576#endif
528{
529 int count;
530 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
531 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532 FcPatternDestroy (pattern);
533 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534 pango_context_set_font_description (context, font);
535}
536 577
537void 578void
538load_image_inline (SV *image_) 579load_image_inline (SV *image_)
539 ALIAS: 580 ALIAS:
540 load_image_file = 1 581 load_image_file = 1
622 PUSHs (sv_2mortal (newSViv (b / y))); 663 PUSHs (sv_2mortal (newSViv (b / y)));
623 PUSHs (sv_2mortal (newSViv (a / y))); 664 PUSHs (sv_2mortal (newSViv (a / y)));
624} 665}
625 666
626void 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
627fatal (char *message) 677fatal (char *message)
628 CODE: 678 CODE:
629#ifdef _WIN32 679#ifdef _WIN32
630 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);
631#else 681#else
632 fprintf (stderr, "FATAL: %s\n", message); 682 fprintf (stderr, "FATAL: %s\n", message);
633#endif 683#endif
634 exit (1); 684 exit (1);
635 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
636MODULE = CFClient PACKAGE = CFClient::Layout 710MODULE = CFClient PACKAGE = CFClient::Layout
637 711
638CFClient::Layout 712CFClient::Layout
639new (SV *class, int base_height = 10) 713new (SV *class, int rgba = 0)
640 CODE: 714 CODE:
641 New (0, RETVAL, 1, struct cf_layout); 715 New (0, RETVAL, 1, struct cf_layout);
642 RETVAL->base_height = base_height; 716
643 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
644 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 726 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645 pango_layout_set_font_description (RETVAL->pl, 727 layout_update_font (RETVAL);
646 pango_font_description_copy (
647 pango_context_get_font_description (context)));
648 OUTPUT: 728 OUTPUT:
649 RETVAL 729 RETVAL
650 730
651void 731void
652DESTROY (CFClient::Layout self) 732DESTROY (CFClient::Layout self)
653 CODE: 733 CODE:
654 g_object_unref (self->pl); 734 g_object_unref (self->pl);
655 Safefree (self); 735 Safefree (self);
656 736
737int
738is_rgba (CFClient::Layout self)
739 CODE:
740 RETVAL = self->rgba;
741 OUTPUT:
742 RETVAL
743
657void 744void
658set_text (CFClient::Layout self, SV *text_) 745set_text (CFClient::Layout self, SV *text_)
659 CODE: 746 CODE:
660{ 747{
661 STRLEN textlen; 748 STRLEN textlen;
681 SvUTF8_on (RETVAL); 768 SvUTF8_on (RETVAL);
682 OUTPUT: 769 OUTPUT:
683 RETVAL 770 RETVAL
684 771
685void 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
686set_height (CFClient::Layout self, int base_height) 790set_height (CFClient::Layout self, int base_height)
687 CODE: 791 CODE:
792 if (self->base_height != base_height)
793 {
688 self->base_height = base_height; 794 self->base_height = base_height;
795 layout_update_font (self);
796 }
689 797
690void 798void
691set_width (CFClient::Layout self, int max_width = -1) 799set_width (CFClient::Layout self, int max_width = -1)
692 CODE: 800 CODE:
693 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);
696size (CFClient::Layout self) 804size (CFClient::Layout self)
697 PPCODE: 805 PPCODE:
698{ 806{
699 int w, h; 807 int w, h;
700 808
701 layout_update (self);
702 layout_get_pixel_size (self, &w, &h); 809 layout_get_pixel_size (self, &w, &h);
703 810
704 EXTEND (SP, 2); 811 EXTEND (SP, 2);
705 PUSHs (sv_2mortal (newSViv (w))); 812 PUSHs (sv_2mortal (newSViv (w)));
706 PUSHs (sv_2mortal (newSViv (h))); 813 PUSHs (sv_2mortal (newSViv (h)));
709int 816int
710xy_to_index (CFClient::Layout self, int x, int y) 817xy_to_index (CFClient::Layout self, int x, int y)
711 CODE: 818 CODE:
712{ 819{
713 int index, trailing; 820 int index, trailing;
714
715 layout_update (self);
716 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);
717
718 RETVAL = index; 822 RETVAL = index;
719} 823}
720 OUTPUT: 824 OUTPUT:
721 RETVAL 825 RETVAL
722 826
723void 827void
724cursor_pos (CFClient::Layout self, int index) 828cursor_pos (CFClient::Layout self, int index)
725 PPCODE: 829 PPCODE:
726{ 830{
727 PangoRectangle strong_pos; 831 PangoRectangle strong_pos;
728 layout_update (self);
729 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 832 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730 833
731 EXTEND (SP, 3); 834 EXTEND (SP, 3);
732 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 835 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 836 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
738render (CFClient::Layout self) 841render (CFClient::Layout self)
739 PPCODE: 842 PPCODE:
740{ 843{
741 SV *retval; 844 SV *retval;
742 int w, h; 845 int w, h;
743 FT_Bitmap bitmap;
744 846
745 layout_update (self);
746 layout_get_pixel_size (self, &w, &h); 847 layout_get_pixel_size (self, &w, &h);
747 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
748 retval = newSV (w * h); 895 retval = newSV (w * h);
749 SvPOK_only (retval); 896 SvPOK_only (retval);
750 SvCUR_set (retval, w * h); 897 SvCUR_set (retval, w * h);
751 898
752 bitmap.rows = h; 899 bitmap.rows = h;
753 bitmap.width = w; 900 bitmap.width = w;
754 bitmap.pitch = w; 901 bitmap.pitch = w;
755 bitmap.buffer = (unsigned char*)SvPVX (retval); 902 bitmap.buffer = (unsigned char*)SvPVX (retval);
756 bitmap.num_grays = 256; 903 bitmap.num_grays = 256;
757 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 904 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
758 905
759 memset (bitmap.buffer, 0, w * h); 906 memset (bitmap.buffer, 0, w * h);
760 907
761 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);
762 909
763 EXTEND (SP, 3); 910 EXTEND (SP, 5);
764 PUSHs (sv_2mortal (newSViv (w))); 911 PUSHs (sv_2mortal (newSViv (w)));
765 PUSHs (sv_2mortal (newSViv (h))); 912 PUSHs (sv_2mortal (newSViv (h)));
766 PUSHs (sv_2mortal (retval)); 913 PUSHs (sv_2mortal (retval));
914 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
916 }
767} 917}
768 918
769MODULE = CFClient PACKAGE = CFClient::Texture 919MODULE = CFClient PACKAGE = CFClient::Texture
770 920
771void 921void
772draw_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)
773 PROTOTYPE: $$$;$$ 923 PROTOTYPE: $$$;$$
924 ALIAS:
925 draw_quad_alpha = 1
926 draw_quad_alpha_premultiplied = 2
774 CODE: 927 CODE:
775{ 928{
776 HV *hv = (HV *)SvRV (self); 929 HV *hv = (HV *)SvRV (self);
777 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 930 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
778 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 931 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
783 { 936 {
784 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 937 w = SvNV (*hv_fetch (hv, "w", 1, 1));
785 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 938 h = SvNV (*hv_fetch (hv, "h", 1, 1));
786 } 939 }
787 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
788 glBindTexture (GL_TEXTURE_2D, name); 947 glBindTexture (GL_TEXTURE_2D, name);
948
789 if (wrap_mode) { 949 if (wrap_mode)
950 {
790 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
791 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 952 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
792 } 953 }
954
793 glBegin (GL_QUADS); 955 glBegin (GL_QUADS);
794 glTexCoord2f (0, 0); glVertex2f (x , y ); 956 glTexCoord2f (0, 0); glVertex2f (x , y );
795 glTexCoord2f (0, t); glVertex2f (x , y + h); 957 glTexCoord2f (0, t); glVertex2f (x , y + h);
796 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 958 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
797 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 959 glTexCoord2f (s, 0); glVertex2f (x + w, y );
798 glEnd (); 960 glEnd ();
961
962 if (ix)
963 glDisable (GL_BLEND);
799} 964}
800 965
801MODULE = CFClient PACKAGE = CFClient::Map 966MODULE = CFClient PACKAGE = CFClient::Map
802 967
803CFClient::Map 968CFClient::Map
1312 } *civ, const_iv[] = { 1477 } *civ, const_iv[] = {
1313# define const_iv(name) { # name, (IV)name } 1478# define const_iv(name) { # name, (IV)name }
1314 const_iv (GL_COLOR_MATERIAL), 1479 const_iv (GL_COLOR_MATERIAL),
1315 const_iv (GL_SMOOTH), 1480 const_iv (GL_SMOOTH),
1316 const_iv (GL_FLAT), 1481 const_iv (GL_FLAT),
1482 const_iv (GL_DITHER),
1317 const_iv (GL_BLEND), 1483 const_iv (GL_BLEND),
1484 const_iv (GL_SCISSOR_TEST),
1318 const_iv (GL_AND), 1485 const_iv (GL_AND),
1486 const_iv (GL_ONE),
1487 const_iv (GL_ZERO),
1319 const_iv (GL_SRC_ALPHA), 1488 const_iv (GL_SRC_ALPHA),
1489 const_iv (GL_SRC_ALPHA_SATURATE),
1320 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1490 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491 const_iv (GL_ONE_MINUS_DST_ALPHA),
1321 const_iv (GL_RGB), 1492 const_iv (GL_RGB),
1322 const_iv (GL_RGBA), 1493 const_iv (GL_RGBA),
1323 const_iv (GL_UNSIGNED_BYTE), 1494 const_iv (GL_UNSIGNED_BYTE),
1324 const_iv (GL_ALPHA4),
1325 const_iv (GL_ALPHA), 1495 const_iv (GL_ALPHA),
1496 const_iv (GL_LUMINANCE),
1326 const_iv (GL_FLOAT), 1497 const_iv (GL_FLOAT),
1327 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1498 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328 const_iv (GL_COMPILE), 1499 const_iv (GL_COMPILE),
1329 const_iv (GL_TEXTURE_1D), 1500 const_iv (GL_TEXTURE_1D),
1330 const_iv (GL_TEXTURE_2D), 1501 const_iv (GL_TEXTURE_2D),
1341 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1512 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1513 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1514 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1515 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345 const_iv (GL_GENERATE_MIPMAP), 1516 const_iv (GL_GENERATE_MIPMAP),
1346 const_iv (GL_LINEAR),
1347 const_iv (GL_MODULATE), 1517 const_iv (GL_MODULATE),
1518 const_iv (GL_DECAL),
1348 const_iv (GL_REPLACE), 1519 const_iv (GL_REPLACE),
1349 const_iv (GL_COLOR_BUFFER_BIT), 1520 const_iv (GL_COLOR_BUFFER_BIT),
1350 const_iv (GL_PROJECTION), 1521 const_iv (GL_PROJECTION),
1351 const_iv (GL_MODELVIEW), 1522 const_iv (GL_MODELVIEW),
1352 const_iv (GL_COLOR_LOGIC_OP), 1523 const_iv (GL_COLOR_LOGIC_OP),
1524 const_iv (GL_SEPARABLE_2D),
1353 const_iv (GL_CONVOLUTION_2D), 1525 const_iv (GL_CONVOLUTION_2D),
1354 const_iv (GL_CONVOLUTION_BORDER_MODE), 1526 const_iv (GL_CONVOLUTION_BORDER_MODE),
1355 const_iv (GL_CONSTANT_BORDER), 1527 const_iv (GL_CONSTANT_BORDER),
1356 const_iv (GL_LINES), 1528 const_iv (GL_LINES),
1357 const_iv (GL_QUADS), 1529 const_iv (GL_QUADS),
1382 1554
1383void glBlendFunc (int sfactor, int dfactor) 1555void glBlendFunc (int sfactor, int dfactor)
1384 1556
1385void glLogicOp (int opcode) 1557void glLogicOp (int opcode)
1386 1558
1559void glColorMask (int red, int green, int blue, int alpha)
1560
1387void glMatrixMode (int mode) 1561void glMatrixMode (int mode)
1388 1562
1389void glPushMatrix () 1563void glPushMatrix ()
1390 1564
1391void glPopMatrix () 1565void glPopMatrix ()
1392 1566
1393void glLoadIdentity () 1567void glLoadIdentity ()
1394 1568
1569# near and far are due to microsofts buggy c compiler
1395void 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_)
1396 1571
1397void 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)
1398 1575
1399void glTranslate (float x, float y, float z = 0.) 1576void glTranslate (float x, float y, float z = 0.)
1400 CODE: 1577 CODE:
1401 glTranslatef (x, y, z); 1578 glTranslatef (x, y, z);
1402 1579
1403void glScale (float x, float y, float z) 1580void glScale (float x, float y, float z = 1.)
1404 CODE: 1581 CODE:
1405 glScalef (x, y, z); 1582 glScalef (x, y, z);
1406 1583
1407void glRotate (float angle, float x, float y, float z) 1584void glRotate (float angle, float x, float y, float z)
1408 CODE: 1585 CODE:
1413void glEnd () 1590void glEnd ()
1414 1591
1415void glColor (float r, float g, float b, float a = 1.0) 1592void glColor (float r, float g, float b, float a = 1.0)
1416 PROTOTYPE: @ 1593 PROTOTYPE: @
1417 CODE: 1594 CODE:
1418 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));
1419 1599
1420void glVertex (float x, float y, float z = 0.) 1600void glVertex (float x, float y, float z = 0.)
1421 CODE: 1601 CODE:
1422 glVertex3f (x, y, z); 1602 glVertex3f (x, y, z);
1423 1603
1435 1615
1436void glBindTexture (int target, int name) 1616void glBindTexture (int target, int name)
1437 1617
1438void glConvolutionParameter (int target, int pname, float params) 1618void glConvolutionParameter (int target, int pname, float params)
1439 CODE: 1619 CODE:
1440 glConvolutionParameterf (target, pname, params); 1620 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1441 1621
1442void 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));
1443 1631
1444void 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)
1445 1633
1446void 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)
1447 1641
1448int glGenTexture () 1642int glGenTexture ()
1449 CODE: 1643 CODE:
1450{ 1644{
1451 GLuint name; 1645 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines