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.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.84 by root, Wed May 17 15:18:57 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 = pango_context_get_font_description (context); 102 PangoFontDescription *font = self->font ? self->font : default_font;
72 103
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 pango_font_description_set_absolute_size (font, height); 104 pango_font_description_set_absolute_size (font,
81 pango_layout_context_changed (self->pl); 105 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
82 } 106
107 pango_layout_set_font_description (self->pl, font);
83} 108}
84 109
85static void 110static void
86layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 111layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
87{ 112{
88 layout_update (self);
89
90 pango_layout_get_pixel_size (self->pl, w, h); 113 pango_layout_get_pixel_size (self->pl, w, h);
91 114
92 *w = (*w + 3) & ~3;
93 if (!*w) *w = 1; 115 if (!*w) *w = 1;
94 if (!*h) *h = 1; 116 if (!*h) *h = 1;
117
118 *w = (*w + 3) & ~3;
95} 119}
96 120
97typedef uint16_t mapface; 121typedef uint16_t mapface;
98 122
99typedef struct { 123typedef struct {
247 } 271 }
248 } 272 }
249} 273}
250 274
251static void 275static void
252music_finished () 276music_finished (void)
253{ 277{
254 SDL_UserEvent ev; 278 SDL_UserEvent ev;
255 279
256 ev.type = SDL_USEREVENT; 280 ev.type = SDL_USEREVENT;
257 ev.code = 0; 281 ev.code = 0;
258 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;
259 ev.data2 = 0; 296 ev.data2 = 0;
260 297
261 SDL_PushEvent ((SDL_Event *)&ev); 298 SDL_PushEvent ((SDL_Event *)&ev);
262} 299}
263 300
374# undef const_iv 411# undef const_iv
375 }; 412 };
376 413
377 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; )
378 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
379 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
380 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
381 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);
382 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);
383} 429}
384 430
385int 431int
386SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
387 433
446 492
447 while (SDL_PollEvent (&ev)) 493 while (SDL_PollEvent (&ev))
448 { 494 {
449 HV *hv = newHV (); 495 HV *hv = newHV ();
450 hv_store (hv, "type", 4, newSViv (ev.type), 0); 496 hv_store (hv, "type", 4, newSViv (ev.type), 0);
497
451 switch (ev.type) 498 switch (ev.type)
452 { 499 {
453 case SDL_KEYDOWN: 500 case SDL_KEYDOWN:
454 case SDL_KEYUP: 501 case SDL_KEYUP:
455 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 502 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
475 case SDL_MOUSEBUTTONUP: 522 case SDL_MOUSEBUTTONUP:
476 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 523 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
477 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 524 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
478 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 525 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
479 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;
480 } 534 }
481 535
482 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 536 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
483 } 537 }
484} 538}
485 539
486int 540int
487Mix_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)
488 POSTCALL: 542 POSTCALL:
489 Mix_HookMusicFinished (music_finished); 543 Mix_HookMusicFinished (music_finished);
544 Mix_ChannelFinished (channel_finished);
490 545
491void 546void
492Mix_CloseAudio () 547Mix_CloseAudio ()
493 548
494int 549int
517 572
518void 573void
519add_font (char *file) 574add_font (char *file)
520 CODE: 575 CODE:
521 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 576 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
522 577#ifdef _WIN32
523void 578 // cairo... sigh... requires win2000
524set_font (char *file) 579 AddFontResourceEx (file, FR_PRIVATE, 0);
525 CODE: 580#endif
526{
527 int count;
528 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
529 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
530 FcPatternDestroy (pattern);
531 pango_context_set_font_description (context, font);
532}
533 581
534void 582void
535load_image_inline (SV *image_) 583load_image_inline (SV *image_)
536 ALIAS: 584 ALIAS:
537 load_image_file = 1 585 load_image_file = 1
619 PUSHs (sv_2mortal (newSViv (b / y))); 667 PUSHs (sv_2mortal (newSViv (b / y)));
620 PUSHs (sv_2mortal (newSViv (a / y))); 668 PUSHs (sv_2mortal (newSViv (a / y)));
621} 669}
622 670
623void 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
624fatal (char *message) 681fatal (char *message)
625 CODE: 682 CODE:
626#ifdef _WIN32 683#ifdef _WIN32
627 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);
628#else 685#else
629 fprintf (stderr, "FATAL: %s\n", message); 686 fprintf (stderr, "FATAL: %s\n", message);
630#endif 687#endif
631 exit (1); 688 exit (1);
632 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
633MODULE = CFClient PACKAGE = CFClient::Layout 714MODULE = CFClient PACKAGE = CFClient::Layout
634 715
635CFClient::Layout 716CFClient::Layout
636new (SV *class, int base_height = 10) 717new (SV *class, int rgba = 0)
637 CODE: 718 CODE:
638 New (0, RETVAL, 1, struct cf_layout); 719 New (0, RETVAL, 1, struct cf_layout);
639 RETVAL->base_height = base_height; 720
640 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
641 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 730 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
731 layout_update_font (RETVAL);
642 OUTPUT: 732 OUTPUT:
643 RETVAL 733 RETVAL
644 734
645void 735void
646DESTROY (CFClient::Layout self) 736DESTROY (CFClient::Layout self)
647 CODE: 737 CODE:
648 g_object_unref (self->pl); 738 g_object_unref (self->pl);
649 Safefree (self); 739 Safefree (self);
650 740
741int
742is_rgba (CFClient::Layout self)
743 CODE:
744 RETVAL = self->rgba;
745 OUTPUT:
746 RETVAL
747
651void 748void
652set_text (CFClient::Layout self, SV *text_) 749set_text (CFClient::Layout self, SV *text_)
653 CODE: 750 CODE:
654{ 751{
655 STRLEN textlen; 752 STRLEN textlen;
675 SvUTF8_on (RETVAL); 772 SvUTF8_on (RETVAL);
676 OUTPUT: 773 OUTPUT:
677 RETVAL 774 RETVAL
678 775
679void 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
680set_height (CFClient::Layout self, int base_height) 794set_height (CFClient::Layout self, int base_height)
681 CODE: 795 CODE:
796 if (self->base_height != base_height)
797 {
682 self->base_height = base_height; 798 self->base_height = base_height;
799 layout_update_font (self);
800 }
683 801
684void 802void
685set_width (CFClient::Layout self, int max_width = -1) 803set_width (CFClient::Layout self, int max_width = -1)
686 CODE: 804 CODE:
687 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);
806
807void
808set_indent (CFClient::Layout self, int indent)
809 CODE:
810 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
811
812void
813set_spacing (CFClient::Layout self, int spacing)
814 CODE:
815 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
816
817void
818set_ellipsise (CFClient::Layout self, int ellipsise)
819 CODE:
820 pango_layout_set_ellipsize (self->pl,
821 ellipsise == 1 ? PANGO_ELLIPSIZE_START
822 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
823 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
824 : PANGO_ELLIPSIZE_NONE
825 );
826
827void
828set_single_paragraph_mode (CFClient::Layout self, int spm)
829 CODE:
830 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
688 831
689void 832void
690size (CFClient::Layout self) 833size (CFClient::Layout self)
691 PPCODE: 834 PPCODE:
692{ 835{
693 int w, h; 836 int w, h;
694 837
695 layout_update (self);
696 layout_get_pixel_size (self, &w, &h); 838 layout_get_pixel_size (self, &w, &h);
697 839
698 EXTEND (SP, 2); 840 EXTEND (SP, 2);
699 PUSHs (sv_2mortal (newSViv (w))); 841 PUSHs (sv_2mortal (newSViv (w)));
700 PUSHs (sv_2mortal (newSViv (h))); 842 PUSHs (sv_2mortal (newSViv (h)));
703int 845int
704xy_to_index (CFClient::Layout self, int x, int y) 846xy_to_index (CFClient::Layout self, int x, int y)
705 CODE: 847 CODE:
706{ 848{
707 int index, trailing; 849 int index, trailing;
708
709 layout_update (self);
710 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 850 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
711
712 RETVAL = index; 851 RETVAL = index;
713} 852}
714 OUTPUT: 853 OUTPUT:
715 RETVAL 854 RETVAL
716 855
717void 856void
718cursor_pos (CFClient::Layout self, int index) 857cursor_pos (CFClient::Layout self, int index)
719 PPCODE: 858 PPCODE:
720{ 859{
721 PangoRectangle strong_pos; 860 PangoRectangle strong_pos;
722 layout_update (self);
723 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 861 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
724 862
725 EXTEND (SP, 3); 863 EXTEND (SP, 3);
726 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 864 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
727 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 865 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
732render (CFClient::Layout self) 870render (CFClient::Layout self)
733 PPCODE: 871 PPCODE:
734{ 872{
735 SV *retval; 873 SV *retval;
736 int w, h; 874 int w, h;
737 FT_Bitmap bitmap;
738 875
739 layout_update (self);
740 layout_get_pixel_size (self, &w, &h); 876 layout_get_pixel_size (self, &w, &h);
741 877
878 if (self->rgba)
879 {
880 cairo_surface_t *surface;
881 cairo_t *cairo;
882
883 retval = newSV (w * h * 4);
884 SvPOK_only (retval);
885 SvCUR_set (retval, w * h * 4);
886
887 memset (SvPVX (retval), 0, w * h * 4);
888
889 surface = cairo_image_surface_create_for_data (
890 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
891 cairo = cairo_create (surface);
892 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
893
894 pango_cairo_show_layout (cairo, self->pl);
895
896 cairo_destroy (cairo);
897 cairo_surface_destroy (surface);
898
899 // what a mess, and its premultiplied, too :(
900 {
901 uint32_t *p = (uint32_t *)SvPVX (retval);
902 uint32_t *e = p + w * h;
903
904 while (p < e)
905 {
906 uint32_t rgba = *p;
907 rgba = (rgba >> 24) | (rgba << 8);
908 rgba = SDL_SwapBE32 (rgba);
909 *p++ = rgba;
910 }
911 }
912
913 EXTEND (SP, 5);
914 PUSHs (sv_2mortal (newSViv (w)));
915 PUSHs (sv_2mortal (newSViv (h)));
916 PUSHs (sv_2mortal (retval));
917 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
919 }
920 else
921 {
922 FT_Bitmap bitmap;
923
742 retval = newSV (w * h); 924 retval = newSV (w * h);
743 SvPOK_only (retval); 925 SvPOK_only (retval);
744 SvCUR_set (retval, w * h); 926 SvCUR_set (retval, w * h);
745 927
746 bitmap.rows = h; 928 bitmap.rows = h;
747 bitmap.width = w; 929 bitmap.width = w;
748 bitmap.pitch = w; 930 bitmap.pitch = w;
749 bitmap.buffer = (unsigned char*)SvPVX (retval); 931 bitmap.buffer = (unsigned char*)SvPVX (retval);
750 bitmap.num_grays = 256; 932 bitmap.num_grays = 256;
751 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 933 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
752 934
753 memset (bitmap.buffer, 0, w * h); 935 memset (bitmap.buffer, 0, w * h);
754 936
755 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 937 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
756 938
757 EXTEND (SP, 3); 939 EXTEND (SP, 5);
758 PUSHs (sv_2mortal (newSViv (w))); 940 PUSHs (sv_2mortal (newSViv (w)));
759 PUSHs (sv_2mortal (newSViv (h))); 941 PUSHs (sv_2mortal (newSViv (h)));
760 PUSHs (sv_2mortal (retval)); 942 PUSHs (sv_2mortal (retval));
943 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945 }
761} 946}
762 947
763MODULE = CFClient PACKAGE = CFClient::Texture 948MODULE = CFClient PACKAGE = CFClient::Texture
764 949
765void 950void
766draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 951draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
767 PROTOTYPE: $$$;$$ 952 PROTOTYPE: $$$;$$
953 ALIAS:
954 draw_quad_alpha = 1
955 draw_quad_alpha_premultiplied = 2
768 CODE: 956 CODE:
769{ 957{
770 HV *hv = (HV *)SvRV (self); 958 HV *hv = (HV *)SvRV (self);
771 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 959 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
772 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 960 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
777 { 965 {
778 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 966 w = SvNV (*hv_fetch (hv, "w", 1, 1));
779 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 967 h = SvNV (*hv_fetch (hv, "h", 1, 1));
780 } 968 }
781 969
970 if (ix)
971 {
972 glEnable (GL_BLEND);
973 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
974 }
975
782 glBindTexture (GL_TEXTURE_2D, name); 976 glBindTexture (GL_TEXTURE_2D, name);
977
783 if (wrap_mode) { 978 if (wrap_mode)
979 {
784 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 980 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
785 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
786 } 982 }
983
787 glBegin (GL_QUADS); 984 glBegin (GL_QUADS);
788 glTexCoord2f (0, 0); glVertex2f (x , y ); 985 glTexCoord2f (0, 0); glVertex2f (x , y );
789 glTexCoord2f (0, t); glVertex2f (x , y + h); 986 glTexCoord2f (0, t); glVertex2f (x , y + h);
790 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 987 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
791 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 988 glTexCoord2f (s, 0); glVertex2f (x + w, y );
792 glEnd (); 989 glEnd ();
990
991 if (ix)
992 glDisable (GL_BLEND);
793} 993}
794 994
795MODULE = CFClient PACKAGE = CFClient::Map 995MODULE = CFClient PACKAGE = CFClient::Map
796 996
797CFClient::Map 997CFClient::Map
1306 } *civ, const_iv[] = { 1506 } *civ, const_iv[] = {
1307# define const_iv(name) { # name, (IV)name } 1507# define const_iv(name) { # name, (IV)name }
1308 const_iv (GL_COLOR_MATERIAL), 1508 const_iv (GL_COLOR_MATERIAL),
1309 const_iv (GL_SMOOTH), 1509 const_iv (GL_SMOOTH),
1310 const_iv (GL_FLAT), 1510 const_iv (GL_FLAT),
1511 const_iv (GL_DITHER),
1311 const_iv (GL_BLEND), 1512 const_iv (GL_BLEND),
1513 const_iv (GL_SCISSOR_TEST),
1312 const_iv (GL_AND), 1514 const_iv (GL_AND),
1515 const_iv (GL_ONE),
1516 const_iv (GL_ZERO),
1313 const_iv (GL_SRC_ALPHA), 1517 const_iv (GL_SRC_ALPHA),
1518 const_iv (GL_SRC_ALPHA_SATURATE),
1314 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1519 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520 const_iv (GL_ONE_MINUS_DST_ALPHA),
1315 const_iv (GL_RGB), 1521 const_iv (GL_RGB),
1316 const_iv (GL_RGBA), 1522 const_iv (GL_RGBA),
1317 const_iv (GL_UNSIGNED_BYTE), 1523 const_iv (GL_UNSIGNED_BYTE),
1318 const_iv (GL_ALPHA4),
1319 const_iv (GL_ALPHA), 1524 const_iv (GL_ALPHA),
1525 const_iv (GL_LUMINANCE),
1320 const_iv (GL_FLOAT), 1526 const_iv (GL_FLOAT),
1321 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1322 const_iv (GL_COMPILE), 1528 const_iv (GL_COMPILE),
1323 const_iv (GL_TEXTURE_1D), 1529 const_iv (GL_TEXTURE_1D),
1324 const_iv (GL_TEXTURE_2D), 1530 const_iv (GL_TEXTURE_2D),
1335 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1541 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1336 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1542 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1337 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1543 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1338 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1544 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1339 const_iv (GL_GENERATE_MIPMAP), 1545 const_iv (GL_GENERATE_MIPMAP),
1340 const_iv (GL_LINEAR),
1341 const_iv (GL_MODULATE), 1546 const_iv (GL_MODULATE),
1547 const_iv (GL_DECAL),
1342 const_iv (GL_REPLACE), 1548 const_iv (GL_REPLACE),
1343 const_iv (GL_COLOR_BUFFER_BIT), 1549 const_iv (GL_COLOR_BUFFER_BIT),
1344 const_iv (GL_PROJECTION), 1550 const_iv (GL_PROJECTION),
1345 const_iv (GL_MODELVIEW), 1551 const_iv (GL_MODELVIEW),
1346 const_iv (GL_COLOR_LOGIC_OP), 1552 const_iv (GL_COLOR_LOGIC_OP),
1553 const_iv (GL_SEPARABLE_2D),
1347 const_iv (GL_CONVOLUTION_2D), 1554 const_iv (GL_CONVOLUTION_2D),
1348 const_iv (GL_CONVOLUTION_BORDER_MODE), 1555 const_iv (GL_CONVOLUTION_BORDER_MODE),
1349 const_iv (GL_CONSTANT_BORDER), 1556 const_iv (GL_CONSTANT_BORDER),
1350 const_iv (GL_LINES), 1557 const_iv (GL_LINES),
1351 const_iv (GL_QUADS), 1558 const_iv (GL_QUADS),
1376 1583
1377void glBlendFunc (int sfactor, int dfactor) 1584void glBlendFunc (int sfactor, int dfactor)
1378 1585
1379void glLogicOp (int opcode) 1586void glLogicOp (int opcode)
1380 1587
1588void glColorMask (int red, int green, int blue, int alpha)
1589
1381void glMatrixMode (int mode) 1590void glMatrixMode (int mode)
1382 1591
1383void glPushMatrix () 1592void glPushMatrix ()
1384 1593
1385void glPopMatrix () 1594void glPopMatrix ()
1386 1595
1387void glLoadIdentity () 1596void glLoadIdentity ()
1388 1597
1598# near and far are due to microsofts buggy c compiler
1389void glOrtho (double left, double right, double bottom, double top, double near, double far) 1599void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1390 1600
1391void glViewport (int x, int y, int width, int height) 1601void glViewport (int x, int y, int width, int height)
1602
1603void glScissor (int x, int y, int width, int height)
1392 1604
1393void glTranslate (float x, float y, float z = 0.) 1605void glTranslate (float x, float y, float z = 0.)
1394 CODE: 1606 CODE:
1395 glTranslatef (x, y, z); 1607 glTranslatef (x, y, z);
1396 1608
1397void glScale (float x, float y, float z) 1609void glScale (float x, float y, float z = 1.)
1398 CODE: 1610 CODE:
1399 glScalef (x, y, z); 1611 glScalef (x, y, z);
1400 1612
1401void glRotate (float angle, float x, float y, float z) 1613void glRotate (float angle, float x, float y, float z)
1402 CODE: 1614 CODE:
1407void glEnd () 1619void glEnd ()
1408 1620
1409void glColor (float r, float g, float b, float a = 1.0) 1621void glColor (float r, float g, float b, float a = 1.0)
1410 PROTOTYPE: @ 1622 PROTOTYPE: @
1411 CODE: 1623 CODE:
1412 glColor4f (r, g, b, a); 1624 glColor4ub (MIN ((int)(r * 255.f), 255),
1625 MIN ((int)(g * 255.f), 255),
1626 MIN ((int)(b * 255.f), 255),
1627 MIN ((int)(a * 255.f), 255));
1413 1628
1414void glVertex (float x, float y, float z = 0.) 1629void glVertex (float x, float y, float z = 0.)
1415 CODE: 1630 CODE:
1416 glVertex3f (x, y, z); 1631 glVertex3f (x, y, z);
1417 1632
1429 1644
1430void glBindTexture (int target, int name) 1645void glBindTexture (int target, int name)
1431 1646
1432void glConvolutionParameter (int target, int pname, float params) 1647void glConvolutionParameter (int target, int pname, float params)
1433 CODE: 1648 CODE:
1434 glConvolutionParameterf (target, pname, params); 1649 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1435 1650
1436void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1651void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1652 CODE:
1653 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1654 (target, internalformat, width, height, format, type, data));
1655
1656void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1657 CODE:
1658 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1659 (target, internalformat, width, height, format, type, row, column));
1437 1660
1438void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1661void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1439 1662
1440void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1663void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1664
1665void glRasterPos (int x, int y)
1666 CODE:
1667 glRasterPos2i (x, y);
1668
1669void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1441 1670
1442int glGenTexture () 1671int glGenTexture ()
1443 CODE: 1672 CODE:
1444{ 1673{
1445 GLuint name; 1674 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines