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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines