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.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.85 by root, Fri May 19 03:49:47 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>
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 10 51#define MIN_FONT_HEIGHT 10
46 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 }
67
47typedef Mix_Chunk *CFClient__MixChunk; 68typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 69typedef Mix_Music *CFClient__MixMusic;
49 70
50typedef PangoFontDescription *CFClient__Font; 71typedef PangoFontDescription *CFClient__Font;
51 72
52typedef struct cf_layout { 73typedef struct cf_layout {
53 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
54 int base_height; 77 int base_height;
55 CFClient__Font font; 78 CFClient__Font font;
56} *CFClient__Layout; 79} *CFClient__Layout;
57 80
58static CFClient__Font default_font; 81static CFClient__Font default_font;
59static PangoContext *context; 82static PangoContext *ft2_context, *cairo_context;
60static PangoFontMap *fontmap; 83static PangoFontMap *ft2_fontmap, *cairo_fontmap;
61 84
62static void 85static void
63substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
64{ 87{
65 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
66 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
67} 94}
68 95
69static void 96static void
70layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
71{ 98{
83static void 110static void
84layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 111layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
85{ 112{
86 pango_layout_get_pixel_size (self->pl, w, h); 113 pango_layout_get_pixel_size (self->pl, w, h);
87 114
88 *w = (*w + 3) & ~3;
89 if (!*w) *w = 1; 115 if (!*w) *w = 1;
90 if (!*h) *h = 1; 116 if (!*h) *h = 1;
117
118 *w = (*w + 3) & ~3;
91} 119}
92 120
93typedef uint16_t mapface; 121typedef uint16_t mapface;
94 122
95typedef struct { 123typedef struct {
243 } 271 }
244 } 272 }
245} 273}
246 274
247static void 275static void
248music_finished () 276music_finished (void)
249{ 277{
250 SDL_UserEvent ev; 278 SDL_UserEvent ev;
251 279
252 ev.type = SDL_USEREVENT; 280 ev.type = SDL_USEREVENT;
253 ev.code = 0; 281 ev.code = 0;
254 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;
255 ev.data2 = 0; 296 ev.data2 = 0;
256 297
257 SDL_PushEvent ((SDL_Event *)&ev); 298 SDL_PushEvent ((SDL_Event *)&ev);
258} 299}
259 300
370# undef const_iv 411# undef const_iv
371 }; 412 };
372 413
373 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; )
374 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
375 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
376 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
377 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);
378 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);
379} 429}
380 430
381int 431int
382SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
383 433
393 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
394 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
395 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
396 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
397 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450
398 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
399 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
400 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
401 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
402 455
403 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
404 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
405 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
406 457
407 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
408 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409 460
410 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
442 493
443 while (SDL_PollEvent (&ev)) 494 while (SDL_PollEvent (&ev))
444 { 495 {
445 HV *hv = newHV (); 496 HV *hv = newHV ();
446 hv_store (hv, "type", 4, newSViv (ev.type), 0); 497 hv_store (hv, "type", 4, newSViv (ev.type), 0);
498
447 switch (ev.type) 499 switch (ev.type)
448 { 500 {
449 case SDL_KEYDOWN: 501 case SDL_KEYDOWN:
450 case SDL_KEYUP: 502 case SDL_KEYUP:
451 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 503 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
471 case SDL_MOUSEBUTTONUP: 523 case SDL_MOUSEBUTTONUP:
472 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break;
529
530 case SDL_USEREVENT:
531 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break;
476 } 535 }
477 536
478 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479 } 538 }
480} 539}
481 540
482int 541int
483Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 542Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
484 POSTCALL: 543 POSTCALL:
485 Mix_HookMusicFinished (music_finished); 544 Mix_HookMusicFinished (music_finished);
545 Mix_ChannelFinished (channel_finished);
486 546
487void 547void
488Mix_CloseAudio () 548Mix_CloseAudio ()
489 549
490int 550int
513 573
514void 574void
515add_font (char *file) 575add_font (char *file)
516 CODE: 576 CODE:
517 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
518 582
519void 583void
520load_image_inline (SV *image_) 584load_image_inline (SV *image_)
521 ALIAS: 585 ALIAS:
522 load_image_file = 1 586 load_image_file = 1
604 PUSHs (sv_2mortal (newSViv (b / y))); 668 PUSHs (sv_2mortal (newSViv (b / y)));
605 PUSHs (sv_2mortal (newSViv (a / y))); 669 PUSHs (sv_2mortal (newSViv (a / y)));
606} 670}
607 671
608void 672void
673error (char *message)
674 CODE:
675#ifdef _WIN32
676 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
677#else
678 fprintf (stderr, "ERROR: %s\n", message);
679#endif
680
681void
609fatal (char *message) 682fatal (char *message)
610 CODE: 683 CODE:
611#ifdef _WIN32 684#ifdef _WIN32
612 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
613#else 686#else
616 exit (1); 689 exit (1);
617 690
618MODULE = CFClient PACKAGE = CFClient::Font 691MODULE = CFClient PACKAGE = CFClient::Font
619 692
620CFClient::Font 693CFClient::Font
621new_from_file (SV *class, char *path) 694new_from_file (SV *class, char *path, int id = 0)
622 CODE: 695 CODE:
623{ 696{
624 int count; 697 int count;
625 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 698 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
626 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 699 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627 FcPatternDestroy (pattern); 700 FcPatternDestroy (pattern);
628} 701}
629 OUTPUT: 702 OUTPUT:
630 RETVAL 703 RETVAL
640 default_font = self; 713 default_font = self;
641 714
642MODULE = CFClient PACKAGE = CFClient::Layout 715MODULE = CFClient PACKAGE = CFClient::Layout
643 716
644CFClient::Layout 717CFClient::Layout
645new (SV *class, int base_height = MIN_FONT_HEIGHT) 718new (SV *class, int rgba = 0)
646 CODE: 719 CODE:
647 New (0, RETVAL, 1, struct cf_layout); 720 New (0, RETVAL, 1, struct cf_layout);
648 RETVAL->pl = pango_layout_new (context); 721
649 RETVAL->base_height = base_height; 722 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
723 RETVAL->rgba = rgba;
724 RETVAL->r = 1.;
725 RETVAL->g = 1.;
726 RETVAL->b = 1.;
727 RETVAL->a = 1.;
728 RETVAL->base_height = MIN_FONT_HEIGHT;
650 RETVAL->font = 0; 729 RETVAL->font = 0;
730
651 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 731 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652 pango_layout_set_font_description (RETVAL->pl, default_font); 732 layout_update_font (RETVAL);
653 OUTPUT: 733 OUTPUT:
654 RETVAL 734 RETVAL
655 735
656void 736void
657DESTROY (CFClient::Layout self) 737DESTROY (CFClient::Layout self)
658 CODE: 738 CODE:
659 g_object_unref (self->pl); 739 g_object_unref (self->pl);
660 Safefree (self); 740 Safefree (self);
661 741
742int
743is_rgba (CFClient::Layout self)
744 CODE:
745 RETVAL = self->rgba;
746 OUTPUT:
747 RETVAL
748
662void 749void
663set_text (CFClient::Layout self, SV *text_) 750set_text (CFClient::Layout self, SV *text_)
664 CODE: 751 CODE:
665{ 752{
666 STRLEN textlen; 753 STRLEN textlen;
684 CODE: 771 CODE:
685 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 772 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686 SvUTF8_on (RETVAL); 773 SvUTF8_on (RETVAL);
687 OUTPUT: 774 OUTPUT:
688 RETVAL 775 RETVAL
776
777void
778set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
779 CODE:
780 self->r = r;
781 self->g = g;
782 self->b = b;
783 self->a = a;
689 784
690void 785void
691set_font (CFClient::Layout self, CFClient::Font font = 0) 786set_font (CFClient::Layout self, CFClient::Font font = 0)
692 CODE: 787 CODE:
693 if (self->font != font) 788 if (self->font != font)
709set_width (CFClient::Layout self, int max_width = -1) 804set_width (CFClient::Layout self, int max_width = -1)
710 CODE: 805 CODE:
711 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 806 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
712 807
713void 808void
809set_indent (CFClient::Layout self, int indent)
810 CODE:
811 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
812
813void
814set_spacing (CFClient::Layout self, int spacing)
815 CODE:
816 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
817
818void
819set_ellipsise (CFClient::Layout self, int ellipsise)
820 CODE:
821 pango_layout_set_ellipsize (self->pl,
822 ellipsise == 1 ? PANGO_ELLIPSIZE_START
823 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
824 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
825 : PANGO_ELLIPSIZE_NONE
826 );
827
828void
829set_single_paragraph_mode (CFClient::Layout self, int spm)
830 CODE:
831 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
832
833void
714size (CFClient::Layout self) 834size (CFClient::Layout self)
715 PPCODE: 835 PPCODE:
716{ 836{
717 int w, h; 837 int w, h;
718 838
751render (CFClient::Layout self) 871render (CFClient::Layout self)
752 PPCODE: 872 PPCODE:
753{ 873{
754 SV *retval; 874 SV *retval;
755 int w, h; 875 int w, h;
756 FT_Bitmap bitmap;
757 876
758 layout_get_pixel_size (self, &w, &h); 877 layout_get_pixel_size (self, &w, &h);
759 878
879 if (self->rgba)
880 {
881 cairo_surface_t *surface;
882 cairo_t *cairo;
883
884 retval = newSV (w * h * 4);
885 SvPOK_only (retval);
886 SvCUR_set (retval, w * h * 4);
887
888 memset (SvPVX (retval), 0, w * h * 4);
889
890 surface = cairo_image_surface_create_for_data (
891 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
892 cairo = cairo_create (surface);
893 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
894
895 pango_cairo_show_layout (cairo, self->pl);
896
897 cairo_destroy (cairo);
898 cairo_surface_destroy (surface);
899
900 // what a mess, and its premultiplied, too :(
901 {
902 uint32_t *p = (uint32_t *)SvPVX (retval);
903 uint32_t *e = p + w * h;
904
905 while (p < e)
906 {
907 uint32_t rgba = *p;
908 rgba = (rgba >> 24) | (rgba << 8);
909 rgba = SDL_SwapBE32 (rgba);
910 *p++ = rgba;
911 }
912 }
913
914 EXTEND (SP, 5);
915 PUSHs (sv_2mortal (newSViv (w)));
916 PUSHs (sv_2mortal (newSViv (h)));
917 PUSHs (sv_2mortal (retval));
918 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
919 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
920 }
921 else
922 {
923 FT_Bitmap bitmap;
924
760 retval = newSV (w * h); 925 retval = newSV (w * h);
761 SvPOK_only (retval); 926 SvPOK_only (retval);
762 SvCUR_set (retval, w * h); 927 SvCUR_set (retval, w * h);
763 928
764 bitmap.rows = h; 929 bitmap.rows = h;
765 bitmap.width = w; 930 bitmap.width = w;
766 bitmap.pitch = w; 931 bitmap.pitch = w;
767 bitmap.buffer = (unsigned char*)SvPVX (retval); 932 bitmap.buffer = (unsigned char*)SvPVX (retval);
768 bitmap.num_grays = 256; 933 bitmap.num_grays = 256;
769 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 934 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770 935
771 memset (bitmap.buffer, 0, w * h); 936 memset (bitmap.buffer, 0, w * h);
772 937
773 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 938 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
774 939
775 EXTEND (SP, 3); 940 EXTEND (SP, 5);
776 PUSHs (sv_2mortal (newSViv (w))); 941 PUSHs (sv_2mortal (newSViv (w)));
777 PUSHs (sv_2mortal (newSViv (h))); 942 PUSHs (sv_2mortal (newSViv (h)));
778 PUSHs (sv_2mortal (retval)); 943 PUSHs (sv_2mortal (retval));
944 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
946 }
779} 947}
780 948
781MODULE = CFClient PACKAGE = CFClient::Texture 949MODULE = CFClient PACKAGE = CFClient::Texture
782 950
783void 951void
784draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 952draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
785 PROTOTYPE: $$$;$$ 953 PROTOTYPE: $$$;$$
954 ALIAS:
955 draw_quad_alpha = 1
956 draw_quad_alpha_premultiplied = 2
786 CODE: 957 CODE:
787{ 958{
788 HV *hv = (HV *)SvRV (self); 959 HV *hv = (HV *)SvRV (self);
789 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 960 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 961 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
795 { 966 {
796 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 967 w = SvNV (*hv_fetch (hv, "w", 1, 1));
797 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 968 h = SvNV (*hv_fetch (hv, "h", 1, 1));
798 } 969 }
799 970
971 if (ix)
972 {
973 glEnable (GL_BLEND);
974 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
975 }
976
800 glBindTexture (GL_TEXTURE_2D, name); 977 glBindTexture (GL_TEXTURE_2D, name);
978
801 if (wrap_mode) { 979 if (wrap_mode)
980 {
802 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804 } 983 }
984
805 glBegin (GL_QUADS); 985 glBegin (GL_QUADS);
806 glTexCoord2f (0, 0); glVertex2f (x , y ); 986 glTexCoord2f (0, 0); glVertex2f (x , y );
807 glTexCoord2f (0, t); glVertex2f (x , y + h); 987 glTexCoord2f (0, t); glVertex2f (x , y + h);
808 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 988 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 989 glTexCoord2f (s, 0); glVertex2f (x + w, y );
810 glEnd (); 990 glEnd ();
991
992 if (ix)
993 glDisable (GL_BLEND);
811} 994}
812 995
813MODULE = CFClient PACKAGE = CFClient::Map 996MODULE = CFClient PACKAGE = CFClient::Map
814 997
815CFClient::Map 998CFClient::Map
1324 } *civ, const_iv[] = { 1507 } *civ, const_iv[] = {
1325# define const_iv(name) { # name, (IV)name } 1508# define const_iv(name) { # name, (IV)name }
1326 const_iv (GL_COLOR_MATERIAL), 1509 const_iv (GL_COLOR_MATERIAL),
1327 const_iv (GL_SMOOTH), 1510 const_iv (GL_SMOOTH),
1328 const_iv (GL_FLAT), 1511 const_iv (GL_FLAT),
1512 const_iv (GL_DITHER),
1329 const_iv (GL_BLEND), 1513 const_iv (GL_BLEND),
1514 const_iv (GL_SCISSOR_TEST),
1330 const_iv (GL_AND), 1515 const_iv (GL_AND),
1516 const_iv (GL_ONE),
1517 const_iv (GL_ZERO),
1331 const_iv (GL_SRC_ALPHA), 1518 const_iv (GL_SRC_ALPHA),
1519 const_iv (GL_SRC_ALPHA_SATURATE),
1332 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1520 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521 const_iv (GL_ONE_MINUS_DST_ALPHA),
1333 const_iv (GL_RGB), 1522 const_iv (GL_RGB),
1334 const_iv (GL_RGBA), 1523 const_iv (GL_RGBA),
1335 const_iv (GL_UNSIGNED_BYTE), 1524 const_iv (GL_UNSIGNED_BYTE),
1336 const_iv (GL_ALPHA4),
1337 const_iv (GL_ALPHA), 1525 const_iv (GL_ALPHA),
1526 const_iv (GL_LUMINANCE),
1338 const_iv (GL_FLOAT), 1527 const_iv (GL_FLOAT),
1339 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1528 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340 const_iv (GL_COMPILE), 1529 const_iv (GL_COMPILE),
1341 const_iv (GL_TEXTURE_1D), 1530 const_iv (GL_TEXTURE_1D),
1342 const_iv (GL_TEXTURE_2D), 1531 const_iv (GL_TEXTURE_2D),
1353 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1542 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1543 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1544 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1545 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357 const_iv (GL_GENERATE_MIPMAP), 1546 const_iv (GL_GENERATE_MIPMAP),
1358 const_iv (GL_LINEAR),
1359 const_iv (GL_MODULATE), 1547 const_iv (GL_MODULATE),
1548 const_iv (GL_DECAL),
1360 const_iv (GL_REPLACE), 1549 const_iv (GL_REPLACE),
1361 const_iv (GL_COLOR_BUFFER_BIT), 1550 const_iv (GL_COLOR_BUFFER_BIT),
1362 const_iv (GL_PROJECTION), 1551 const_iv (GL_PROJECTION),
1363 const_iv (GL_MODELVIEW), 1552 const_iv (GL_MODELVIEW),
1364 const_iv (GL_COLOR_LOGIC_OP), 1553 const_iv (GL_COLOR_LOGIC_OP),
1554 const_iv (GL_SEPARABLE_2D),
1365 const_iv (GL_CONVOLUTION_2D), 1555 const_iv (GL_CONVOLUTION_2D),
1366 const_iv (GL_CONVOLUTION_BORDER_MODE), 1556 const_iv (GL_CONVOLUTION_BORDER_MODE),
1367 const_iv (GL_CONSTANT_BORDER), 1557 const_iv (GL_CONSTANT_BORDER),
1368 const_iv (GL_LINES), 1558 const_iv (GL_LINES),
1369 const_iv (GL_QUADS), 1559 const_iv (GL_QUADS),
1394 1584
1395void glBlendFunc (int sfactor, int dfactor) 1585void glBlendFunc (int sfactor, int dfactor)
1396 1586
1397void glLogicOp (int opcode) 1587void glLogicOp (int opcode)
1398 1588
1589void glColorMask (int red, int green, int blue, int alpha)
1590
1399void glMatrixMode (int mode) 1591void glMatrixMode (int mode)
1400 1592
1401void glPushMatrix () 1593void glPushMatrix ()
1402 1594
1403void glPopMatrix () 1595void glPopMatrix ()
1404 1596
1405void glLoadIdentity () 1597void glLoadIdentity ()
1406 1598
1599# near and far are due to microsofts buggy c compiler
1407void glOrtho (double left, double right, double bottom, double top, double near, double far) 1600void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408 1601
1409void glViewport (int x, int y, int width, int height) 1602void glViewport (int x, int y, int width, int height)
1603
1604void glScissor (int x, int y, int width, int height)
1410 1605
1411void glTranslate (float x, float y, float z = 0.) 1606void glTranslate (float x, float y, float z = 0.)
1412 CODE: 1607 CODE:
1413 glTranslatef (x, y, z); 1608 glTranslatef (x, y, z);
1414 1609
1425void glEnd () 1620void glEnd ()
1426 1621
1427void glColor (float r, float g, float b, float a = 1.0) 1622void glColor (float r, float g, float b, float a = 1.0)
1428 PROTOTYPE: @ 1623 PROTOTYPE: @
1429 CODE: 1624 CODE:
1430 glColor4f (r, g, b, a); 1625 glColor4ub (MIN ((int)(r * 255.f), 255),
1626 MIN ((int)(g * 255.f), 255),
1627 MIN ((int)(b * 255.f), 255),
1628 MIN ((int)(a * 255.f), 255));
1431 1629
1432void glVertex (float x, float y, float z = 0.) 1630void glVertex (float x, float y, float z = 0.)
1433 CODE: 1631 CODE:
1434 glVertex3f (x, y, z); 1632 glVertex3f (x, y, z);
1435 1633
1447 1645
1448void glBindTexture (int target, int name) 1646void glBindTexture (int target, int name)
1449 1647
1450void glConvolutionParameter (int target, int pname, float params) 1648void glConvolutionParameter (int target, int pname, float params)
1451 CODE: 1649 CODE:
1452 glConvolutionParameterf (target, pname, params); 1650 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453 1651
1454void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1652void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1653 CODE:
1654 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1655 (target, internalformat, width, height, format, type, data));
1656
1657void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1658 CODE:
1659 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1660 (target, internalformat, width, height, format, type, row, column));
1455 1661
1456void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1662void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457 1663
1458void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1664void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1665
1666void glRasterPos (int x, int y)
1667 CODE:
1668 glRasterPos2i (x, y);
1669
1670void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459 1671
1460int glGenTexture () 1672int glGenTexture ()
1461 CODE: 1673 CODE:
1462{ 1674{
1463 GLuint name; 1675 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines