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.74 by root, Sat May 6 20:14:57 2006 UTC vs.
Revision 1.94 by root, Tue May 23 18:57:35 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>
63typedef Mix_Music *CFClient__MixMusic; 69typedef Mix_Music *CFClient__MixMusic;
64 70
65typedef PangoFontDescription *CFClient__Font; 71typedef PangoFontDescription *CFClient__Font;
66 72
67typedef struct cf_layout { 73typedef struct cf_layout {
68 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
69 int base_height; 77 int base_height;
70 CFClient__Font font; 78 CFClient__Font font;
71} *CFClient__Layout; 79} *CFClient__Layout;
72 80
73static CFClient__Font default_font; 81static CFClient__Font default_font;
74static PangoContext *context; 82static PangoContext *ft2_context, *cairo_context;
75static PangoFontMap *fontmap; 83static PangoFontMap *ft2_fontmap, *cairo_fontmap;
76 84
77static void 85static void
78substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
79{ 87{
80 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
81 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
82} 94}
83 95
84static void 96static void
85layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
86{ 98{
98static void 110static void
99layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 111layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
100{ 112{
101 pango_layout_get_pixel_size (self->pl, w, h); 113 pango_layout_get_pixel_size (self->pl, w, h);
102 114
103 *w = (*w + 3) & ~3;
104 if (!*w) *w = 1; 115 if (!*w) *w = 1;
105 if (!*h) *h = 1; 116 if (!*h) *h = 1;
117
118 *w = (*w + 3) & ~3;
106} 119}
107 120
108typedef uint16_t mapface; 121typedef uint16_t mapface;
109 122
110typedef struct { 123typedef struct {
258 } 271 }
259 } 272 }
260} 273}
261 274
262static void 275static void
263music_finished () 276music_finished (void)
264{ 277{
265 SDL_UserEvent ev; 278 SDL_UserEvent ev;
266 279
267 ev.type = SDL_USEREVENT; 280 ev.type = SDL_USEREVENT;
268 ev.code = 0; 281 ev.code = 0;
398# undef const_iv 411# undef const_iv
399 }; 412 };
400 413
401 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; )
402 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
403 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
404 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
405 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);
406 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);
407} 429}
408 430
409int 431int
410SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
411 433
421 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
422 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
423 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
424 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
425 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
426 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
427 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
428 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
429 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
430 455
431 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
432 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
433 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
434 457
435 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
436 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
437 460
438 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
447 470
448 ++m; 471 ++m;
449 } 472 }
450} 473}
451 474
475char *
476SDL_GetError ()
477
452int 478int
453SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
454 CODE: 480 CODE:
455 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
456 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
459 OUTPUT: 485 OUTPUT:
460 RETVAL 486 RETVAL
461 487
462void 488void
463SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
464 493
465void 494void
466SDL_PollEvent () 495SDL_PollEvent ()
467 PPCODE: 496 PPCODE:
468{ 497{
487 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
488 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
489 break; 518 break;
490 519
491 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
492 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
493 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
494 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
495 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
496 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
497 break; 528 break;
498 529
499 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
500 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
501 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
502 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
503 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
504 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
505 break; 538 break;
533#ifndef _WIN32 566#ifndef _WIN32
534 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
535#endif 568#endif
536 569
537char * 570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
576
577char *
538gl_version () 578gl_version ()
539 CODE: 579 CODE:
540 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
541 OUTPUT: 581 OUTPUT:
542 RETVAL 582 RETVAL
550 590
551void 591void
552add_font (char *file) 592add_font (char *file)
553 CODE: 593 CODE:
554 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 594 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
595#ifdef _WIN32
596 // cairo... sigh... requires win2000
597 AddFontResourceEx (file, FR_PRIVATE, 0);
598#endif
555 599
556void 600void
557load_image_inline (SV *image_) 601load_image_inline (SV *image_)
558 ALIAS: 602 ALIAS:
559 load_image_file = 1 603 load_image_file = 1
643} 687}
644 688
645void 689void
646error (char *message) 690error (char *message)
647 CODE: 691 CODE:
692 fprintf (stderr, "ERROR: %s\n", message);
648#ifdef _WIN32 693#ifdef _WIN32
649 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 694 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
650#else
651 fprintf (stderr, "ERROR: %s\n", message);
652#endif 695#endif
653 696
654void 697void
655fatal (char *message) 698fatal (char *message)
656 CODE: 699 CODE:
700 fprintf (stderr, "FATAL: %s\n", message);
657#ifdef _WIN32 701#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "FATAL: %s\n", message);
661#endif 703#endif
662 exit (1); 704 exit (1);
663 705
664MODULE = CFClient PACKAGE = CFClient::Font 706MODULE = CFClient PACKAGE = CFClient::Font
665 707
686 default_font = self; 728 default_font = self;
687 729
688MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
689 731
690CFClient::Layout 732CFClient::Layout
691new (SV *class, int base_height = MIN_FONT_HEIGHT) 733new (SV *class, int rgba = 0)
692 CODE: 734 CODE:
735#if _WIN32
736 rgba = 0;//D
737#endif
693 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
694 RETVAL->pl = pango_layout_new (context); 739
695 RETVAL->base_height = base_height; 740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
741 RETVAL->rgba = rgba;
742 RETVAL->r = 1.;
743 RETVAL->g = 1.;
744 RETVAL->b = 1.;
745 RETVAL->a = 1.;
746 RETVAL->base_height = MIN_FONT_HEIGHT;
696 RETVAL->font = 0; 747 RETVAL->font = 0;
748
697 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 749 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
698 pango_layout_set_font_description (RETVAL->pl, default_font); 750 layout_update_font (RETVAL);
699 OUTPUT: 751 OUTPUT:
700 RETVAL 752 RETVAL
701 753
702void 754void
703DESTROY (CFClient::Layout self) 755DESTROY (CFClient::Layout self)
704 CODE: 756 CODE:
705 g_object_unref (self->pl); 757 g_object_unref (self->pl);
706 Safefree (self); 758 Safefree (self);
707 759
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
708void 767void
709set_text (CFClient::Layout self, SV *text_) 768set_text (CFClient::Layout self, SV *text_)
710 CODE: 769 CODE:
711{ 770{
712 STRLEN textlen; 771 STRLEN textlen;
730 CODE: 789 CODE:
731 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
732 SvUTF8_on (RETVAL); 791 SvUTF8_on (RETVAL);
733 OUTPUT: 792 OUTPUT:
734 RETVAL 793 RETVAL
794
795void
796set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
797 CODE:
798 self->r = r;
799 self->g = g;
800 self->b = b;
801 self->a = a;
735 802
736void 803void
737set_font (CFClient::Layout self, CFClient::Font font = 0) 804set_font (CFClient::Layout self, CFClient::Font font = 0)
738 CODE: 805 CODE:
739 if (self->font != font) 806 if (self->font != font)
755set_width (CFClient::Layout self, int max_width = -1) 822set_width (CFClient::Layout self, int max_width = -1)
756 CODE: 823 CODE:
757 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 824 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
758 825
759void 826void
827set_indent (CFClient::Layout self, int indent)
828 CODE:
829 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830
831void
832set_spacing (CFClient::Layout self, int spacing)
833 CODE:
834 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835
836void
837set_ellipsise (CFClient::Layout self, int ellipsise)
838 CODE:
839 pango_layout_set_ellipsize (self->pl,
840 ellipsise == 1 ? PANGO_ELLIPSIZE_START
841 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
843 : PANGO_ELLIPSIZE_NONE
844 );
845
846void
847set_single_paragraph_mode (CFClient::Layout self, int spm)
848 CODE:
849 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850
851void
760size (CFClient::Layout self) 852size (CFClient::Layout self)
761 PPCODE: 853 PPCODE:
762{ 854{
763 int w, h; 855 int w, h;
764 856
797render (CFClient::Layout self) 889render (CFClient::Layout self)
798 PPCODE: 890 PPCODE:
799{ 891{
800 SV *retval; 892 SV *retval;
801 int w, h; 893 int w, h;
802 FT_Bitmap bitmap;
803 894
804 layout_get_pixel_size (self, &w, &h); 895 layout_get_pixel_size (self, &w, &h);
805 896
897 if (self->rgba)
898 {
899 cairo_surface_t *surface;
900 cairo_t *cairo;
901
902 retval = newSV (w * h * 4);
903 SvPOK_only (retval);
904 SvCUR_set (retval, w * h * 4);
905
906 memset (SvPVX (retval), 0, w * h * 4);
907
908 surface = cairo_image_surface_create_for_data (
909 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
910 cairo = cairo_create (surface);
911 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913 pango_cairo_show_layout (cairo, self->pl);
914
915 cairo_destroy (cairo);
916 cairo_surface_destroy (surface);
917
918 // what a mess, and its premultiplied, too :(
919 {
920 uint32_t *p = (uint32_t *)SvPVX (retval);
921 uint32_t *e = p + w * h;
922
923 while (p < e)
924 {
925 uint32_t rgba = *p;
926 rgba = (rgba >> 24) | (rgba << 8);
927#if 0
928#ifdef _WIN32
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934
935 rgba = (rgba & 0xffffff00) | a;
936 }
937#endif
938#endif
939 rgba = SDL_SwapBE32 (rgba);
940 *p++ = rgba;
941 }
942 }
943
944 EXTEND (SP, 5);
945 PUSHs (sv_2mortal (newSViv (w)));
946 PUSHs (sv_2mortal (newSViv (h)));
947 PUSHs (sv_2mortal (retval));
948 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 }
951 else
952 {
953 FT_Bitmap bitmap;
954
806 retval = newSV (w * h); 955 retval = newSV (w * h);
807 SvPOK_only (retval); 956 SvPOK_only (retval);
808 SvCUR_set (retval, w * h); 957 SvCUR_set (retval, w * h);
809 958
810 bitmap.rows = h; 959 bitmap.rows = h;
811 bitmap.width = w; 960 bitmap.width = w;
812 bitmap.pitch = w; 961 bitmap.pitch = w;
813 bitmap.buffer = (unsigned char*)SvPVX (retval); 962 bitmap.buffer = (unsigned char*)SvPVX (retval);
814 bitmap.num_grays = 256; 963 bitmap.num_grays = 256;
815 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 964 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
816 965
817 memset (bitmap.buffer, 0, w * h); 966 memset (bitmap.buffer, 0, w * h);
818 967
819 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 968 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
820 969
821 EXTEND (SP, 3); 970 EXTEND (SP, 5);
822 PUSHs (sv_2mortal (newSViv (w))); 971 PUSHs (sv_2mortal (newSViv (w)));
823 PUSHs (sv_2mortal (newSViv (h))); 972 PUSHs (sv_2mortal (newSViv (h)));
824 PUSHs (sv_2mortal (retval)); 973 PUSHs (sv_2mortal (retval));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 }
825} 977}
826 978
827MODULE = CFClient PACKAGE = CFClient::Texture 979MODULE = CFClient PACKAGE = CFClient::Texture
828 980
829void 981void
830draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 982draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
831 PROTOTYPE: $$$;$$ 983 PROTOTYPE: $$$;$$
984 ALIAS:
985 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2
832 CODE: 987 CODE:
833{ 988{
834 HV *hv = (HV *)SvRV (self); 989 HV *hv = (HV *)SvRV (self);
835 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 990 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
836 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 991 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
841 { 996 {
842 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 997 w = SvNV (*hv_fetch (hv, "w", 1, 1));
843 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 998 h = SvNV (*hv_fetch (hv, "h", 1, 1));
844 } 999 }
845 1000
1001 if (ix)
1002 {
1003 glEnable (GL_BLEND);
1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1005 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f);
1007 }
1008
846 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
1010
847 if (wrap_mode) { 1011 if (wrap_mode)
1012 {
848 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1013 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
849 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1014 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
850 } 1015 }
1016
851 glBegin (GL_QUADS); 1017 glBegin (GL_QUADS);
852 glTexCoord2f (0, 0); glVertex2f (x , y ); 1018 glTexCoord2f (0, 0); glVertex2f (x , y );
853 glTexCoord2f (0, t); glVertex2f (x , y + h); 1019 glTexCoord2f (0, t); glVertex2f (x , y + h);
854 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
855 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
856 glEnd (); 1022 glEnd ();
1023
1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND);
1028 }
857} 1029}
858 1030
859MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
860 1032
861CFClient::Map 1033CFClient::Map
1372 const_iv (GL_COLOR_MATERIAL), 1544 const_iv (GL_COLOR_MATERIAL),
1373 const_iv (GL_SMOOTH), 1545 const_iv (GL_SMOOTH),
1374 const_iv (GL_FLAT), 1546 const_iv (GL_FLAT),
1375 const_iv (GL_DITHER), 1547 const_iv (GL_DITHER),
1376 const_iv (GL_BLEND), 1548 const_iv (GL_BLEND),
1549 const_iv (GL_CULL_FACE),
1377 const_iv (GL_SCISSOR_TEST), 1550 const_iv (GL_SCISSOR_TEST),
1551 const_iv (GL_DEPTH_TEST),
1552 const_iv (GL_ALPHA_TEST),
1553 const_iv (GL_NORMALIZE),
1554 const_iv (GL_RESCALE_NORMAL),
1378 const_iv (GL_AND), 1555 const_iv (GL_AND),
1379 const_iv (GL_ONE), 1556 const_iv (GL_ONE),
1380 const_iv (GL_ZERO), 1557 const_iv (GL_ZERO),
1381 const_iv (GL_SRC_ALPHA), 1558 const_iv (GL_SRC_ALPHA),
1382 const_iv (GL_SRC_ALPHA_SATURATE), 1559 const_iv (GL_SRC_ALPHA_SATURATE),
1383 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1560 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1384 const_iv (GL_ONE_MINUS_DST_ALPHA), 1561 const_iv (GL_ONE_MINUS_DST_ALPHA),
1385 const_iv (GL_RGB), 1562 const_iv (GL_RGB),
1386 const_iv (GL_RGBA), 1563 const_iv (GL_RGBA),
1387 const_iv (GL_UNSIGNED_BYTE), 1564 const_iv (GL_UNSIGNED_BYTE),
1565 const_iv (GL_UNSIGNED_SHORT),
1566 const_iv (GL_UNSIGNED_INT),
1388 const_iv (GL_ALPHA), 1567 const_iv (GL_ALPHA),
1568 const_iv (GL_INTENSITY),
1569 const_iv (GL_LUMINANCE),
1570 const_iv (GL_LUMINANCE_ALPHA),
1389 const_iv (GL_FLOAT), 1571 const_iv (GL_FLOAT),
1390 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1572 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1391 const_iv (GL_COMPILE), 1573 const_iv (GL_COMPILE),
1392 const_iv (GL_TEXTURE_1D), 1574 const_iv (GL_TEXTURE_1D),
1393 const_iv (GL_TEXTURE_2D), 1575 const_iv (GL_TEXTURE_2D),
1407 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1589 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1408 const_iv (GL_GENERATE_MIPMAP), 1590 const_iv (GL_GENERATE_MIPMAP),
1409 const_iv (GL_MODULATE), 1591 const_iv (GL_MODULATE),
1410 const_iv (GL_DECAL), 1592 const_iv (GL_DECAL),
1411 const_iv (GL_REPLACE), 1593 const_iv (GL_REPLACE),
1594 const_iv (GL_DEPTH_BUFFER_BIT),
1412 const_iv (GL_COLOR_BUFFER_BIT), 1595 const_iv (GL_COLOR_BUFFER_BIT),
1413 const_iv (GL_PROJECTION), 1596 const_iv (GL_PROJECTION),
1414 const_iv (GL_MODELVIEW), 1597 const_iv (GL_MODELVIEW),
1415 const_iv (GL_COLOR_LOGIC_OP), 1598 const_iv (GL_COLOR_LOGIC_OP),
1416 const_iv (GL_SEPARABLE_2D), 1599 const_iv (GL_SEPARABLE_2D),
1417 const_iv (GL_CONVOLUTION_2D), 1600 const_iv (GL_CONVOLUTION_2D),
1418 const_iv (GL_CONVOLUTION_BORDER_MODE), 1601 const_iv (GL_CONVOLUTION_BORDER_MODE),
1419 const_iv (GL_CONSTANT_BORDER), 1602 const_iv (GL_CONSTANT_BORDER),
1420 const_iv (GL_LINES), 1603 const_iv (GL_LINES),
1604 const_iv (GL_LINE_LOOP),
1421 const_iv (GL_QUADS), 1605 const_iv (GL_QUADS),
1422 const_iv (GL_LINE_LOOP), 1606 const_iv (GL_QUAD_STRIP),
1607 const_iv (GL_TRIANGLES),
1608 const_iv (GL_TRIANGLE_STRIP),
1609 const_iv (GL_TRIANGLE_FAN),
1423 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1610 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1424 const_iv (GL_FASTEST), 1611 const_iv (GL_FASTEST),
1612 const_iv (GL_V2F),
1613 const_iv (GL_V3F),
1614 const_iv (GL_T2F_V3F),
1615 const_iv (GL_T2F_N3F_V3F),
1425# undef const_iv 1616# undef const_iv
1426 }; 1617 };
1427 1618
1428 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1619 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1429 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1444 1635
1445void glHint (int target, int mode) 1636void glHint (int target, int mode)
1446 1637
1447void glBlendFunc (int sfactor, int dfactor) 1638void glBlendFunc (int sfactor, int dfactor)
1448 1639
1640void glDepthMask (int flag)
1641
1449void glLogicOp (int opcode) 1642void glLogicOp (int opcode)
1450 1643
1451void glColorMask (int red, int green, int blue, int alpha) 1644void glColorMask (int red, int green, int blue, int alpha)
1452 1645
1453void glMatrixMode (int mode) 1646void glMatrixMode (int mode)
1456 1649
1457void glPopMatrix () 1650void glPopMatrix ()
1458 1651
1459void glLoadIdentity () 1652void glLoadIdentity ()
1460 1653
1461# near and far are due to microsofts buggy c compiler 1654# near_ and far_ are due to microsofts buggy "c" compiler
1655void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656
1657# near_ and far_ are due to microsofts buggy "c" compiler
1462void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1658void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1463 1659
1464void glViewport (int x, int y, int width, int height) 1660void glViewport (int x, int y, int width, int height)
1465 1661
1466void glScissor (int x, int y, int width, int height) 1662void glScissor (int x, int y, int width, int height)
1482void glEnd () 1678void glEnd ()
1483 1679
1484void glColor (float r, float g, float b, float a = 1.0) 1680void glColor (float r, float g, float b, float a = 1.0)
1485 PROTOTYPE: @ 1681 PROTOTYPE: @
1486 CODE: 1682 CODE:
1487 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1683 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255),
1685 MIN ((int)(g * 255.f), 255),
1686 MIN ((int)(b * 255.f), 255),
1687 MIN ((int)(a * 255.f), 255));
1688
1689void glInterleavedArrays (int format, int stride, char *data)
1690
1691void glDrawElements (int mode, int count, int type, char *indices)
1692
1693# 1.2 void glDrawRangeElements (int mode, int start, int end
1694
1695void glRasterPos (float x, float y, float z = 0.)
1696 CODE:
1697 glRasterPos3f (0, 0, z);
1698 glBitmap (0, 0, 0, 0, x, y, 0);
1488 1699
1489void glVertex (float x, float y, float z = 0.) 1700void glVertex (float x, float y, float z = 0.)
1490 CODE: 1701 CODE:
1491 glVertex3f (x, y, z); 1702 glVertex3f (x, y, z);
1492 1703
1520 1731
1521void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1732void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1522 1733
1523void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1734void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1524 1735
1525void glRasterPos (int x, int y) 1736void glDrawPixels (int width, int height, int format, int type, char *pixels)
1526 CODE:
1527 glRasterPos2i (x, y);
1528 1737
1529void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1738void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1530 1739
1531int glGenTexture () 1740int glGenTexture ()
1532 CODE: 1741 CODE:
1559 1768
1560void glEndList () 1769void glEndList ()
1561 1770
1562void glCallList (int list) 1771void glCallList (int list)
1563 1772
1773

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines