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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines