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.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.105 by root, Mon Jun 5 03:33:09 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>
3# pragma warning(disable:4244) 5# pragma warning(disable:4244)
4#endif 6#endif
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9 11
12#include <math.h>
10#include <string.h> 13#include <string.h>
11#include <stdio.h> 14#include <stdio.h>
12 15
13#include <SDL.h> 16#include <SDL.h>
17#include <SDL_endian.h>
14#include <SDL_image.h> 18#include <SDL_image.h>
15#include <SDL_mixer.h> 19#include <SDL_mixer.h>
16#include <SDL_opengl.h> 20#include <SDL_opengl.h>
17 21
18#include <glib/gmacros.h> 22#include <glib/gmacros.h>
19 23
20#include <pango/pango.h> 24#include <pango/pango.h>
21#include <pango/pangofc-fontmap.h> 25#include <pango/pangofc-fontmap.h>
22#include <pango/pangoft2.h> 26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
23 28
24#ifndef _WIN32 29#ifndef _WIN32
25# include <sys/types.h> 30# include <sys/types.h>
26# include <sys/socket.h> 31# include <sys/socket.h>
27# include <netinet/in.h> 32# include <netinet/in.h>
43#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
44#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
45 50
46#define MIN_FONT_HEIGHT 10 51#define MIN_FONT_HEIGHT 10
47 52
48#define GL_CALL(type,func,args) \ 53static struct
49 { \ 54{
50 static int init_; \ 55#define GL_FUNC(ptr,name) ptr name;
51 static type fptr_; \ 56#include "glfunc.h"
52 \ 57#undef GL_FUNC
53 if (!init_) \ 58} gl;
54 { \ 59
55 init_ = 1; \ 60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
56 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 61{
57 } \ 62 if (gl.BlendFuncSeparate)
58 \ 63 gl.BlendFuncSeparate (sa, da, saa, daa);
59 if (fptr_) \ 64 else if (gl.BlendFuncSeparateEXT)
60 fptr_ args; \ 65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
61 } 66 else
67 glBlendFunc (sa, da);
68}
62 69
63typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
64typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
65 72
66typedef PangoFontDescription *CFClient__Font; 73typedef PangoFontDescription *CFClient__Font;
67 74
68typedef struct cf_layout { 75typedef struct cf_layout {
69 PangoLayout *pl; 76 PangoLayout *pl; // either derived from a cairo or ft2 context
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode
70 int base_height; 79 int base_height;
71 CFClient__Font font; 80 CFClient__Font font;
72} *CFClient__Layout; 81} *CFClient__Layout;
73 82
74static CFClient__Font default_font; 83static CFClient__Font default_font;
75static PangoContext *context; 84static PangoContext *ft2_context, *cairo_context;
76static PangoFontMap *fontmap; 85static PangoFontMap *ft2_fontmap, *cairo_fontmap;
77 86
78static void 87static void
79substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
80{ 89{
81 FcPatternAddBool (pattern, FC_HINTING , 1); 90 FcPatternAddBool (pattern, FC_HINTING , 1);
91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1);
82 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
83} 93}
84 94
85static void 95static void
86layout_update_font (CFClient__Layout self) 96layout_update_font (CFClient__Layout self)
99static void 109static void
100layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 110layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
101{ 111{
102 pango_layout_get_pixel_size (self->pl, w, h); 112 pango_layout_get_pixel_size (self->pl, w, h);
103 113
104 *w = (*w + 3) & ~3;
105 if (!*w) *w = 1; 114 if (!*w) *w = 1;
106 if (!*h) *h = 1; 115 if (!*h) *h = 1;
116
117 *w = (*w + 3) & ~3;
107} 118}
108 119
109typedef uint16_t mapface; 120typedef uint16_t mapface;
110 121
111typedef struct { 122typedef struct {
399# undef const_iv 410# undef const_iv
400 }; 411 };
401 412
402 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 413 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 414 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415}
404 416
417void
418pango_init ()
419 CODE:
420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{
422 {
405 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
406 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);
407 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); 425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 }
427
428 {
429 cairo_font_options_t *fopt = cairo_font_options_create ();
430 cairo_fontmap = pango_cairo_font_map_get_default ();
431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt);
437 }
408} 438}
409 439
410int 440int
411SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
412 442
422 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 452 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426 456
457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
459
427 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431 464
432 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 465 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
433 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
434 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
435 466
436 SDL_EnableUNICODE (1); 467 SDL_EnableUNICODE (1);
437 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 468 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438 469
439 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 470 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
448 479
449 ++m; 480 ++m;
450 } 481 }
451} 482}
452 483
484char *
485SDL_GetError ()
486
453int 487int
454SDL_SetVideoMode (int w, int h, int fullscreen) 488SDL_SetVideoMode (int w, int h, int fullscreen)
455 CODE: 489 CODE:
456 RETVAL = !!SDL_SetVideoMode ( 490 RETVAL = !!SDL_SetVideoMode (
457 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 491 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
458 ); 492 );
493 if (RETVAL)
494 {
459 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 495 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
496# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
497# include "glfunc.h"
498# undef GL_FUNC
499 }
460 OUTPUT: 500 OUTPUT:
461 RETVAL 501 RETVAL
462 502
463void 503void
464SDL_GL_SwapBuffers () 504SDL_GL_SwapBuffers ()
505
506char *
507SDL_GetKeyName (int sym)
465 508
466void 509void
467SDL_PollEvent () 510SDL_PollEvent ()
468 PPCODE: 511 PPCODE:
469{ 512{
488 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 531 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 532 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490 break; 533 break;
491 534
492 case SDL_MOUSEMOTION: 535 case SDL_MOUSEMOTION:
536 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
537
493 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 538 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 539 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 540 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 541 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 542 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498 break; 543 break;
499 544
500 case SDL_MOUSEBUTTONDOWN: 545 case SDL_MOUSEBUTTONDOWN:
501 case SDL_MOUSEBUTTONUP: 546 case SDL_MOUSEBUTTONUP:
547 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
548
502 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 549 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 550 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 551 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 552 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506 break; 553 break;
533 CODE: 580 CODE:
534#ifndef _WIN32 581#ifndef _WIN32
535 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 582 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536#endif 583#endif
537 584
538char *
539gl_version ()
540 CODE:
541 RETVAL = (char *)glGetString (GL_VERSION);
542 OUTPUT:
543 RETVAL
544
545char *
546gl_extensions ()
547 CODE:
548 RETVAL = (char *)glGetString (GL_EXTENSIONS);
549 OUTPUT:
550 RETVAL
551
552void 585void
553add_font (char *file) 586add_font (char *file)
554 CODE: 587 CODE:
555 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
589#ifdef _WIN32
590 // cairo... sigh... requires win2000
591 AddFontResourceEx (file, FR_PRIVATE, 0);
592#endif
556 593
557void 594void
558load_image_inline (SV *image_) 595load_image_inline (SV *image_)
559 ALIAS: 596 ALIAS:
560 load_image_file = 1 597 load_image_file = 1
644} 681}
645 682
646void 683void
647error (char *message) 684error (char *message)
648 CODE: 685 CODE:
686 fprintf (stderr, "ERROR: %s\n", message);
649#ifdef _WIN32 687#ifdef _WIN32
650 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
651#else
652 fprintf (stderr, "ERROR: %s\n", message);
653#endif 689#endif
654 690
655void 691void
656fatal (char *message) 692fatal (char *message)
657 CODE: 693 CODE:
694 fprintf (stderr, "FATAL: %s\n", message);
658#ifdef _WIN32 695#ifdef _WIN32
659 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 696 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
660#else
661 fprintf (stderr, "FATAL: %s\n", message);
662#endif 697#endif
663 exit (1); 698 exit (1);
664 699
665MODULE = CFClient PACKAGE = CFClient::Font 700MODULE = CFClient PACKAGE = CFClient::Font
666 701
687 default_font = self; 722 default_font = self;
688 723
689MODULE = CFClient PACKAGE = CFClient::Layout 724MODULE = CFClient PACKAGE = CFClient::Layout
690 725
691CFClient::Layout 726CFClient::Layout
692new (SV *class, int base_height = MIN_FONT_HEIGHT) 727new (SV *class, int rgba = 0)
693 CODE: 728 CODE:
729#if _WIN32
730 //rgba = 0;//D makes text nicer, breaks TextView
731#endif
732 rgba=1;//D
694 New (0, RETVAL, 1, struct cf_layout); 733 New (0, RETVAL, 1, struct cf_layout);
695 RETVAL->pl = pango_layout_new (context); 734
696 RETVAL->base_height = base_height; 735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
736 RETVAL->rgba = rgba;
737 RETVAL->r = 1.;
738 RETVAL->g = 1.;
739 RETVAL->b = 1.;
740 RETVAL->a = 1.;
741 RETVAL->base_height = MIN_FONT_HEIGHT;
697 RETVAL->font = 0; 742 RETVAL->font = 0;
743
698 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 744 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699 pango_layout_set_font_description (RETVAL->pl, default_font); 745 layout_update_font (RETVAL);
700 OUTPUT: 746 OUTPUT:
701 RETVAL 747 RETVAL
702 748
703void 749void
704DESTROY (CFClient::Layout self) 750DESTROY (CFClient::Layout self)
705 CODE: 751 CODE:
706 g_object_unref (self->pl); 752 g_object_unref (self->pl);
707 Safefree (self); 753 Safefree (self);
708 754
755int
756is_rgba (CFClient::Layout self)
757 CODE:
758 RETVAL = self->rgba;
759 OUTPUT:
760 RETVAL
761
709void 762void
710set_text (CFClient::Layout self, SV *text_) 763set_text (CFClient::Layout self, SV *text_)
711 CODE: 764 CODE:
712{ 765{
713 STRLEN textlen; 766 STRLEN textlen;
731 CODE: 784 CODE:
732 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 785 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733 SvUTF8_on (RETVAL); 786 SvUTF8_on (RETVAL);
734 OUTPUT: 787 OUTPUT:
735 RETVAL 788 RETVAL
789
790void
791set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
792 CODE:
793 self->r = r;
794 self->g = g;
795 self->b = b;
796 self->a = a;
736 797
737void 798void
738set_font (CFClient::Layout self, CFClient::Font font = 0) 799set_font (CFClient::Layout self, CFClient::Font font = 0)
739 CODE: 800 CODE:
740 if (self->font != font) 801 if (self->font != font)
756set_width (CFClient::Layout self, int max_width = -1) 817set_width (CFClient::Layout self, int max_width = -1)
757 CODE: 818 CODE:
758 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 819 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
759 820
760void 821void
822set_indent (CFClient::Layout self, int indent)
823 CODE:
824 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825
826void
827set_spacing (CFClient::Layout self, int spacing)
828 CODE:
829 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830
831void
832set_ellipsise (CFClient::Layout self, int ellipsise)
833 CODE:
834 pango_layout_set_ellipsize (self->pl,
835 ellipsise == 1 ? PANGO_ELLIPSIZE_START
836 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
838 : PANGO_ELLIPSIZE_NONE
839 );
840
841void
842set_single_paragraph_mode (CFClient::Layout self, int spm)
843 CODE:
844 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845
846void
761size (CFClient::Layout self) 847size (CFClient::Layout self)
762 PPCODE: 848 PPCODE:
763{ 849{
764 int w, h; 850 int w, h;
765 851
798render (CFClient::Layout self) 884render (CFClient::Layout self)
799 PPCODE: 885 PPCODE:
800{ 886{
801 SV *retval; 887 SV *retval;
802 int w, h; 888 int w, h;
803 FT_Bitmap bitmap;
804 889
805 layout_get_pixel_size (self, &w, &h); 890 layout_get_pixel_size (self, &w, &h);
806 891
892 if (self->rgba)
893 {
894 cairo_surface_t *surface;
895 cairo_t *cairo;
896
897 retval = newSV (w * h * 4);
898 SvPOK_only (retval);
899 SvCUR_set (retval, w * h * 4);
900
901 memset (SvPVX (retval), 0, w * h * 4);
902
903 surface = cairo_image_surface_create_for_data (
904 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
905 cairo = cairo_create (surface);
906 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908 pango_cairo_show_layout (cairo, self->pl);
909
910 cairo_destroy (cairo);
911 cairo_surface_destroy (surface);
912
913 // what a mess, and its premultiplied, too :(
914 {
915 uint32_t *p = (uint32_t *)SvPVX (retval);
916 uint32_t *e = p + w * h;
917
918 while (p < e)
919 {
920 uint32_t rgba = *p;
921 rgba = (rgba >> 24) | (rgba << 8);
922#if 0
923#ifdef _WIN32
924 {//D
925 uint8_t r = rgba >> 24;
926 uint8_t g = rgba >> 16;
927 uint8_t b = rgba >> 8;
928 uint8_t a = rgba >> 0;
929
930 rgba = (rgba & 0xffffff00) | a;
931 }
932#endif
933#endif
934 rgba = SDL_SwapBE32 (rgba);
935 *p++ = rgba;
936 }
937 }
938
939 EXTEND (SP, 5);
940 PUSHs (sv_2mortal (newSViv (w)));
941 PUSHs (sv_2mortal (newSViv (h)));
942 PUSHs (sv_2mortal (retval));
943 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945 }
946 else
947 {
948 FT_Bitmap bitmap;
949
807 retval = newSV (w * h); 950 retval = newSV (w * h);
808 SvPOK_only (retval); 951 SvPOK_only (retval);
809 SvCUR_set (retval, w * h); 952 SvCUR_set (retval, w * h);
810 953
811 bitmap.rows = h; 954 bitmap.rows = h;
812 bitmap.width = w; 955 bitmap.width = w;
813 bitmap.pitch = w; 956 bitmap.pitch = w;
814 bitmap.buffer = (unsigned char*)SvPVX (retval); 957 bitmap.buffer = (unsigned char*)SvPVX (retval);
815 bitmap.num_grays = 256; 958 bitmap.num_grays = 256;
816 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 959 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817 960
818 memset (bitmap.buffer, 0, w * h); 961 memset (bitmap.buffer, 0, w * h);
819 962
820 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 963 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
821 964
822 EXTEND (SP, 3); 965 EXTEND (SP, 5);
823 PUSHs (sv_2mortal (newSViv (w))); 966 PUSHs (sv_2mortal (newSViv (w)));
824 PUSHs (sv_2mortal (newSViv (h))); 967 PUSHs (sv_2mortal (newSViv (h)));
825 PUSHs (sv_2mortal (retval)); 968 PUSHs (sv_2mortal (retval));
969 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971 }
826} 972}
827 973
828MODULE = CFClient PACKAGE = CFClient::Texture 974MODULE = CFClient PACKAGE = CFClient::Texture
829 975
830void 976void
831draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 977draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
832 PROTOTYPE: $$$;$$ 978 PROTOTYPE: $$$;$$
979 ALIAS:
980 draw_quad_alpha = 1
981 draw_quad_alpha_premultiplied = 2
833 CODE: 982 CODE:
834{ 983{
835 HV *hv = (HV *)SvRV (self); 984 HV *hv = (HV *)SvRV (self);
836 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 985 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 986 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 987 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840 988
841 if (items < 5) 989 if (items < 5)
842 { 990 {
843 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 991 w = SvNV (*hv_fetch (hv, "w", 1, 1));
844 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 992 h = SvNV (*hv_fetch (hv, "h", 1, 1));
845 } 993 }
846 994
995 if (ix)
996 {
997 glEnable (GL_BLEND);
998
999 if (ix == 2)
1000 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1001 else
1002 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1003 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1004
1005 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f);
1007 }
1008
847 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
848 if (wrap_mode) { 1010
849 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851 }
852 glBegin (GL_QUADS); 1011 glBegin (GL_QUADS);
853 glTexCoord2f (0, 0); glVertex2f (x , y ); 1012 glTexCoord2f (0, 0); glVertex2f (x , y );
854 glTexCoord2f (0, t); glVertex2f (x , y + h); 1013 glTexCoord2f (0, t); glVertex2f (x , y + h);
855 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1014 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1015 glTexCoord2f (s, 0); glVertex2f (x + w, y );
857 glEnd (); 1016 glEnd ();
1017
1018 if (ix)
1019 {
1020 glDisable (GL_ALPHA_TEST);
1021 glDisable (GL_BLEND);
1022 }
858} 1023}
859 1024
860MODULE = CFClient PACKAGE = CFClient::Map 1025MODULE = CFClient PACKAGE = CFClient::Map
861 1026
862CFClient::Map 1027CFClient::Map
926 tex->r = r; 1091 tex->r = r;
927 tex->g = g; 1092 tex->g = g;
928 tex->b = b; 1093 tex->b = b;
929 tex->a = a; 1094 tex->a = a;
930 } 1095 }
1096
1097 // somewhat hackish, but for textures that require it, it really
1098 // improves the look, and most others don't suffer.
1099 glBindTexture (GL_TEXTURE_2D, name);
1100 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1101 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1102 // use uglier nearest interpolation because linear suffers
1103 // from transparent color bleeding and ugly wrapping effects.
1104 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
931} 1105}
932 1106
933int 1107int
934ox (CFClient::Map self) 1108ox (CFClient::Map self)
935 ALIAS: 1109 ALIAS:
936 oy = 1 1110 oy = 1
1111 x = 2
1112 y = 3
1113 w = 4
1114 h = 5
937 CODE: 1115 CODE:
938 switch (ix) 1116 switch (ix)
939 { 1117 {
940 case 0: RETVAL = self->ox; break; 1118 case 0: RETVAL = self->ox; break;
941 case 1: RETVAL = self->oy; break; 1119 case 1: RETVAL = self->oy; break;
1120 case 2: RETVAL = self->x; break;
1121 case 3: RETVAL = self->y; break;
1122 case 4: RETVAL = self->w; break;
1123 case 5: RETVAL = self->h; break;
942 } 1124 }
943 OUTPUT: 1125 OUTPUT:
944 RETVAL 1126 RETVAL
945 1127
946void 1128void
1373 const_iv (GL_COLOR_MATERIAL), 1555 const_iv (GL_COLOR_MATERIAL),
1374 const_iv (GL_SMOOTH), 1556 const_iv (GL_SMOOTH),
1375 const_iv (GL_FLAT), 1557 const_iv (GL_FLAT),
1376 const_iv (GL_DITHER), 1558 const_iv (GL_DITHER),
1377 const_iv (GL_BLEND), 1559 const_iv (GL_BLEND),
1560 const_iv (GL_CULL_FACE),
1378 const_iv (GL_SCISSOR_TEST), 1561 const_iv (GL_SCISSOR_TEST),
1562 const_iv (GL_DEPTH_TEST),
1563 const_iv (GL_ALPHA_TEST),
1564 const_iv (GL_NORMALIZE),
1565 const_iv (GL_RESCALE_NORMAL),
1379 const_iv (GL_AND), 1566 const_iv (GL_AND),
1380 const_iv (GL_ONE), 1567 const_iv (GL_ONE),
1381 const_iv (GL_ZERO), 1568 const_iv (GL_ZERO),
1382 const_iv (GL_SRC_ALPHA), 1569 const_iv (GL_SRC_ALPHA),
1383 const_iv (GL_SRC_ALPHA_SATURATE), 1570 const_iv (GL_DST_ALPHA),
1384 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1571 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385 const_iv (GL_ONE_MINUS_DST_ALPHA), 1572 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE),
1386 const_iv (GL_RGB), 1574 const_iv (GL_RGB),
1387 const_iv (GL_RGBA), 1575 const_iv (GL_RGBA),
1388 const_iv (GL_UNSIGNED_BYTE), 1576 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT),
1389 const_iv (GL_ALPHA), 1579 const_iv (GL_ALPHA),
1580 const_iv (GL_INTENSITY),
1581 const_iv (GL_LUMINANCE),
1582 const_iv (GL_LUMINANCE_ALPHA),
1390 const_iv (GL_FLOAT), 1583 const_iv (GL_FLOAT),
1391 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1584 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392 const_iv (GL_COMPILE), 1585 const_iv (GL_COMPILE),
1393 const_iv (GL_TEXTURE_1D), 1586 const_iv (GL_TEXTURE_1D),
1394 const_iv (GL_TEXTURE_2D), 1587 const_iv (GL_TEXTURE_2D),
1396 const_iv (GL_TEXTURE_MAG_FILTER), 1589 const_iv (GL_TEXTURE_MAG_FILTER),
1397 const_iv (GL_TEXTURE_MIN_FILTER), 1590 const_iv (GL_TEXTURE_MIN_FILTER),
1398 const_iv (GL_TEXTURE_ENV_MODE), 1591 const_iv (GL_TEXTURE_ENV_MODE),
1399 const_iv (GL_TEXTURE_WRAP_S), 1592 const_iv (GL_TEXTURE_WRAP_S),
1400 const_iv (GL_TEXTURE_WRAP_T), 1593 const_iv (GL_TEXTURE_WRAP_T),
1594 const_iv (GL_REPEAT),
1401 const_iv (GL_CLAMP), 1595 const_iv (GL_CLAMP),
1402 const_iv (GL_REPEAT), 1596 const_iv (GL_CLAMP_TO_EDGE),
1403 const_iv (GL_NEAREST), 1597 const_iv (GL_NEAREST),
1404 const_iv (GL_LINEAR), 1598 const_iv (GL_LINEAR),
1405 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1599 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1600 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1601 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1602 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409 const_iv (GL_GENERATE_MIPMAP), 1603 const_iv (GL_GENERATE_MIPMAP),
1410 const_iv (GL_MODULATE), 1604 const_iv (GL_MODULATE),
1411 const_iv (GL_DECAL), 1605 const_iv (GL_DECAL),
1412 const_iv (GL_REPLACE), 1606 const_iv (GL_REPLACE),
1607 const_iv (GL_DEPTH_BUFFER_BIT),
1413 const_iv (GL_COLOR_BUFFER_BIT), 1608 const_iv (GL_COLOR_BUFFER_BIT),
1414 const_iv (GL_PROJECTION), 1609 const_iv (GL_PROJECTION),
1415 const_iv (GL_MODELVIEW), 1610 const_iv (GL_MODELVIEW),
1416 const_iv (GL_COLOR_LOGIC_OP), 1611 const_iv (GL_COLOR_LOGIC_OP),
1417 const_iv (GL_SEPARABLE_2D), 1612 const_iv (GL_SEPARABLE_2D),
1418 const_iv (GL_CONVOLUTION_2D), 1613 const_iv (GL_CONVOLUTION_2D),
1419 const_iv (GL_CONVOLUTION_BORDER_MODE), 1614 const_iv (GL_CONVOLUTION_BORDER_MODE),
1420 const_iv (GL_CONSTANT_BORDER), 1615 const_iv (GL_CONSTANT_BORDER),
1421 const_iv (GL_LINES), 1616 const_iv (GL_LINES),
1617 const_iv (GL_LINE_LOOP),
1422 const_iv (GL_QUADS), 1618 const_iv (GL_QUADS),
1423 const_iv (GL_LINE_LOOP), 1619 const_iv (GL_QUAD_STRIP),
1620 const_iv (GL_TRIANGLES),
1621 const_iv (GL_TRIANGLE_STRIP),
1622 const_iv (GL_TRIANGLE_FAN),
1424 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1623 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425 const_iv (GL_FASTEST), 1624 const_iv (GL_FASTEST),
1625 const_iv (GL_V2F),
1626 const_iv (GL_V3F),
1627 const_iv (GL_T2F_V3F),
1628 const_iv (GL_T2F_N3F_V3F),
1426# undef const_iv 1629# undef const_iv
1427 }; 1630 };
1428 1631
1429 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1632 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1430 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1633 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431} 1634}
1432 1635
1636char *
1637gl_vendor ()
1638 CODE:
1639 RETVAL = (char *)glGetString (GL_VENDOR);
1640 OUTPUT:
1641 RETVAL
1642
1643char *
1644gl_version ()
1645 CODE:
1646 RETVAL = (char *)glGetString (GL_VERSION);
1647 OUTPUT:
1648 RETVAL
1649
1650char *
1651gl_extensions ()
1652 CODE:
1653 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1654 OUTPUT:
1655 RETVAL
1656
1433int glGetError () 1657int glGetError ()
1434 1658
1435void glClear (int mask) 1659void glClear (int mask)
1436 1660
1437void glClearColor (float r, float g, float b, float a = 1.0) 1661void glClearColor (float r, float g, float b, float a = 1.0)
1445 1669
1446void glHint (int target, int mode) 1670void glHint (int target, int mode)
1447 1671
1448void glBlendFunc (int sfactor, int dfactor) 1672void glBlendFunc (int sfactor, int dfactor)
1449 1673
1674void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1675 CODE:
1676 gl_BlendFuncSeparate (sa, da, saa, daa);
1677
1678void glDepthMask (int flag)
1679
1450void glLogicOp (int opcode) 1680void glLogicOp (int opcode)
1451 1681
1452void glColorMask (int red, int green, int blue, int alpha) 1682void glColorMask (int red, int green, int blue, int alpha)
1453 1683
1454void glMatrixMode (int mode) 1684void glMatrixMode (int mode)
1457 1687
1458void glPopMatrix () 1688void glPopMatrix ()
1459 1689
1460void glLoadIdentity () 1690void glLoadIdentity ()
1461 1691
1462# near and far are due to microsofts buggy c compiler 1692# near_ and far_ are due to microsofts buggy "c" compiler
1693void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694
1695# near_ and far_ are due to microsofts buggy "c" compiler
1463void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1696void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464 1697
1465void glViewport (int x, int y, int width, int height) 1698void glViewport (int x, int y, int width, int height)
1466 1699
1467void glScissor (int x, int y, int width, int height) 1700void glScissor (int x, int y, int width, int height)
1482 1715
1483void glEnd () 1716void glEnd ()
1484 1717
1485void glColor (float r, float g, float b, float a = 1.0) 1718void glColor (float r, float g, float b, float a = 1.0)
1486 PROTOTYPE: @ 1719 PROTOTYPE: @
1720 ALIAS:
1721 glColor_premultiply = 1
1487 CODE: 1722 CODE:
1488 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1723 if (ix)
1724 {
1725 r *= a;
1726 g *= a;
1727 b *= a;
1728 }
1729 // microsoft visual "c" rounds instead of truncating...
1730 glColor4ub (MIN ((int)(r * 256.f), 255),
1731 MIN ((int)(g * 256.f), 255),
1732 MIN ((int)(b * 256.f), 255),
1733 MIN ((int)(a * 256.f), 255));
1734
1735void glInterleavedArrays (int format, int stride, char *data)
1736
1737void glDrawElements (int mode, int count, int type, char *indices)
1738
1739# 1.2 void glDrawRangeElements (int mode, int start, int end
1740
1741void glRasterPos (float x, float y, float z = 0.)
1742 CODE:
1743 glRasterPos3f (0, 0, z);
1744 glBitmap (0, 0, 0, 0, x, y, 0);
1489 1745
1490void glVertex (float x, float y, float z = 0.) 1746void glVertex (float x, float y, float z = 0.)
1491 CODE: 1747 CODE:
1492 glVertex3f (x, y, z); 1748 glVertex3f (x, y, z);
1493 1749
1505 1761
1506void glBindTexture (int target, int name) 1762void glBindTexture (int target, int name)
1507 1763
1508void glConvolutionParameter (int target, int pname, float params) 1764void glConvolutionParameter (int target, int pname, float params)
1509 CODE: 1765 CODE:
1510 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1766 if (gl.ConvolutionParameterf)
1767 gl.ConvolutionParameterf (target, pname, params);
1511 1768
1512void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1769void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1513 CODE: 1770 CODE:
1514 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1771 if (gl.ConvolutionFilter2D)
1515 (target, internalformat, width, height, format, type, data)); 1772 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1516 1773
1517void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1774void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1518 CODE: 1775 CODE:
1519 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1776 if (gl.SeparableFilter2D)
1520 (target, internalformat, width, height, format, type, row, column)); 1777 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1521 1778
1522void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1779void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1523 1780
1524void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1781void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525 1782
1526void glRasterPos (int x, int y) 1783void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527 CODE:
1528 glRasterPos2i (x, y);
1529 1784
1530void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1785void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1531 1786
1532int glGenTexture () 1787int glGenTexture ()
1533 CODE: 1788 CODE:
1560 1815
1561void glEndList () 1816void glEndList ()
1562 1817
1563void glCallList (int list) 1818void glCallList (int list)
1564 1819
1820

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines