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.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 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;
269 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;
270 ev.data2 = 0; 296 ev.data2 = 0;
271 297
272 SDL_PushEvent ((SDL_Event *)&ev); 298 SDL_PushEvent ((SDL_Event *)&ev);
273} 299}
274 300
385# undef const_iv 411# undef const_iv
386 }; 412 };
387 413
388 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; )
389 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
390 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
391 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
392 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);
393 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);
394} 429}
395 430
396int 431int
397SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
398 433
408 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
413 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417 455
418 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
419 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
420 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
421 457
422 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
423 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424 460
425 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
433 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
434 470
435 ++m; 471 ++m;
436 } 472 }
437} 473}
474
475char *
476SDL_GetError ()
438 477
439int 478int
440SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
441 CODE: 480 CODE:
442 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
488 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
489 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
490 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
491 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492 break; 531 break;
532
533 case SDL_USEREVENT:
534 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
535 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537 break;
493 } 538 }
494 539
495 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
496 } 541 }
497} 542}
498 543
499int 544int
500Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 545Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
501 POSTCALL: 546 POSTCALL:
502 Mix_HookMusicFinished (music_finished); 547 Mix_HookMusicFinished (music_finished);
548 Mix_ChannelFinished (channel_finished);
503 549
504void 550void
505Mix_CloseAudio () 551Mix_CloseAudio ()
506 552
507int 553int
513#ifndef _WIN32 559#ifndef _WIN32
514 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
515#endif 561#endif
516 562
517char * 563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
518gl_version () 571gl_version ()
519 CODE: 572 CODE:
520 RETVAL = (char *)glGetString (GL_VERSION); 573 RETVAL = (char *)glGetString (GL_VERSION);
521 OUTPUT: 574 OUTPUT:
522 RETVAL 575 RETVAL
530 583
531void 584void
532add_font (char *file) 585add_font (char *file)
533 CODE: 586 CODE:
534 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
588#ifdef _WIN32
589 // cairo... sigh... requires win2000
590 AddFontResourceEx (file, FR_PRIVATE, 0);
591#endif
535 592
536void 593void
537load_image_inline (SV *image_) 594load_image_inline (SV *image_)
538 ALIAS: 595 ALIAS:
539 load_image_file = 1 596 load_image_file = 1
623} 680}
624 681
625void 682void
626error (char *message) 683error (char *message)
627 CODE: 684 CODE:
685 fprintf (stderr, "ERROR: %s\n", message);
628#ifdef _WIN32 686#ifdef _WIN32
629 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 687 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
630#else
631 fprintf (stderr, "ERROR: %s\n", message);
632#endif 688#endif
633 689
634void 690void
635fatal (char *message) 691fatal (char *message)
636 CODE: 692 CODE:
693 fprintf (stderr, "FATAL: %s\n", message);
637#ifdef _WIN32 694#ifdef _WIN32
638 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
639#else
640 fprintf (stderr, "FATAL: %s\n", message);
641#endif 696#endif
642 exit (1); 697 exit (1);
643 698
644MODULE = CFClient PACKAGE = CFClient::Font 699MODULE = CFClient PACKAGE = CFClient::Font
645 700
666 default_font = self; 721 default_font = self;
667 722
668MODULE = CFClient PACKAGE = CFClient::Layout 723MODULE = CFClient PACKAGE = CFClient::Layout
669 724
670CFClient::Layout 725CFClient::Layout
671new (SV *class, int base_height = MIN_FONT_HEIGHT) 726new (SV *class, int rgba = 0)
672 CODE: 727 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
673 New (0, RETVAL, 1, struct cf_layout); 731 New (0, RETVAL, 1, struct cf_layout);
674 RETVAL->pl = pango_layout_new (context); 732
675 RETVAL->base_height = base_height; 733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
734 RETVAL->rgba = rgba;
735 RETVAL->r = 1.;
736 RETVAL->g = 1.;
737 RETVAL->b = 1.;
738 RETVAL->a = 1.;
739 RETVAL->base_height = MIN_FONT_HEIGHT;
676 RETVAL->font = 0; 740 RETVAL->font = 0;
741
677 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 742 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678 pango_layout_set_font_description (RETVAL->pl, default_font); 743 layout_update_font (RETVAL);
679 OUTPUT: 744 OUTPUT:
680 RETVAL 745 RETVAL
681 746
682void 747void
683DESTROY (CFClient::Layout self) 748DESTROY (CFClient::Layout self)
684 CODE: 749 CODE:
685 g_object_unref (self->pl); 750 g_object_unref (self->pl);
686 Safefree (self); 751 Safefree (self);
687 752
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
688void 760void
689set_text (CFClient::Layout self, SV *text_) 761set_text (CFClient::Layout self, SV *text_)
690 CODE: 762 CODE:
691{ 763{
692 STRLEN textlen; 764 STRLEN textlen;
710 CODE: 782 CODE:
711 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712 SvUTF8_on (RETVAL); 784 SvUTF8_on (RETVAL);
713 OUTPUT: 785 OUTPUT:
714 RETVAL 786 RETVAL
787
788void
789set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
790 CODE:
791 self->r = r;
792 self->g = g;
793 self->b = b;
794 self->a = a;
715 795
716void 796void
717set_font (CFClient::Layout self, CFClient::Font font = 0) 797set_font (CFClient::Layout self, CFClient::Font font = 0)
718 CODE: 798 CODE:
719 if (self->font != font) 799 if (self->font != font)
735set_width (CFClient::Layout self, int max_width = -1) 815set_width (CFClient::Layout self, int max_width = -1)
736 CODE: 816 CODE:
737 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 817 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
738 818
739void 819void
820set_indent (CFClient::Layout self, int indent)
821 CODE:
822 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823
824void
825set_spacing (CFClient::Layout self, int spacing)
826 CODE:
827 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828
829void
830set_ellipsise (CFClient::Layout self, int ellipsise)
831 CODE:
832 pango_layout_set_ellipsize (self->pl,
833 ellipsise == 1 ? PANGO_ELLIPSIZE_START
834 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
836 : PANGO_ELLIPSIZE_NONE
837 );
838
839void
840set_single_paragraph_mode (CFClient::Layout self, int spm)
841 CODE:
842 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843
844void
740size (CFClient::Layout self) 845size (CFClient::Layout self)
741 PPCODE: 846 PPCODE:
742{ 847{
743 int w, h; 848 int w, h;
744 849
777render (CFClient::Layout self) 882render (CFClient::Layout self)
778 PPCODE: 883 PPCODE:
779{ 884{
780 SV *retval; 885 SV *retval;
781 int w, h; 886 int w, h;
782 FT_Bitmap bitmap;
783 887
784 layout_get_pixel_size (self, &w, &h); 888 layout_get_pixel_size (self, &w, &h);
785 889
890 if (self->rgba)
891 {
892 cairo_surface_t *surface;
893 cairo_t *cairo;
894
895 retval = newSV (w * h * 4);
896 SvPOK_only (retval);
897 SvCUR_set (retval, w * h * 4);
898
899 memset (SvPVX (retval), 0, w * h * 4);
900
901 surface = cairo_image_surface_create_for_data (
902 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
903 cairo = cairo_create (surface);
904 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
905
906 pango_cairo_show_layout (cairo, self->pl);
907
908 cairo_destroy (cairo);
909 cairo_surface_destroy (surface);
910
911 // what a mess, and its premultiplied, too :(
912 {
913 uint32_t *p = (uint32_t *)SvPVX (retval);
914 uint32_t *e = p + w * h;
915
916 while (p < e)
917 {
918 uint32_t rgba = *p;
919 rgba = (rgba >> 24) | (rgba << 8);
920#if 0
921#ifdef _WIN32
922 {//D
923 uint8_t r = rgba >> 24;
924 uint8_t g = rgba >> 16;
925 uint8_t b = rgba >> 8;
926 uint8_t a = rgba >> 0;
927
928 rgba = (rgba & 0xffffff00) | a;
929 }
930#endif
931#endif
932 rgba = SDL_SwapBE32 (rgba);
933 *p++ = rgba;
934 }
935 }
936
937 EXTEND (SP, 5);
938 PUSHs (sv_2mortal (newSViv (w)));
939 PUSHs (sv_2mortal (newSViv (h)));
940 PUSHs (sv_2mortal (retval));
941 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 }
944 else
945 {
946 FT_Bitmap bitmap;
947
786 retval = newSV (w * h); 948 retval = newSV (w * h);
787 SvPOK_only (retval); 949 SvPOK_only (retval);
788 SvCUR_set (retval, w * h); 950 SvCUR_set (retval, w * h);
789 951
790 bitmap.rows = h; 952 bitmap.rows = h;
791 bitmap.width = w; 953 bitmap.width = w;
792 bitmap.pitch = w; 954 bitmap.pitch = w;
793 bitmap.buffer = (unsigned char*)SvPVX (retval); 955 bitmap.buffer = (unsigned char*)SvPVX (retval);
794 bitmap.num_grays = 256; 956 bitmap.num_grays = 256;
795 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 957 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796 958
797 memset (bitmap.buffer, 0, w * h); 959 memset (bitmap.buffer, 0, w * h);
798 960
799 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 961 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
800 962
801 EXTEND (SP, 3); 963 EXTEND (SP, 5);
802 PUSHs (sv_2mortal (newSViv (w))); 964 PUSHs (sv_2mortal (newSViv (w)));
803 PUSHs (sv_2mortal (newSViv (h))); 965 PUSHs (sv_2mortal (newSViv (h)));
804 PUSHs (sv_2mortal (retval)); 966 PUSHs (sv_2mortal (retval));
967 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
968 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
969 }
805} 970}
806 971
807MODULE = CFClient PACKAGE = CFClient::Texture 972MODULE = CFClient PACKAGE = CFClient::Texture
808 973
809void 974void
810draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 975draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
811 PROTOTYPE: $$$;$$ 976 PROTOTYPE: $$$;$$
977 ALIAS:
978 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2
812 CODE: 980 CODE:
813{ 981{
814 HV *hv = (HV *)SvRV (self); 982 HV *hv = (HV *)SvRV (self);
815 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 983 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 984 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
821 { 989 {
822 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 990 w = SvNV (*hv_fetch (hv, "w", 1, 1));
823 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 991 h = SvNV (*hv_fetch (hv, "h", 1, 1));
824 } 992 }
825 993
994 if (ix)
995 {
996 glEnable (GL_BLEND);
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
998 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f);
1000 }
1001
826 glBindTexture (GL_TEXTURE_2D, name); 1002 glBindTexture (GL_TEXTURE_2D, name);
1003
827 if (wrap_mode) { 1004 if (wrap_mode)
1005 {
828 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830 } 1008 }
1009
831 glBegin (GL_QUADS); 1010 glBegin (GL_QUADS);
832 glTexCoord2f (0, 0); glVertex2f (x , y ); 1011 glTexCoord2f (0, 0); glVertex2f (x , y );
833 glTexCoord2f (0, t); glVertex2f (x , y + h); 1012 glTexCoord2f (0, t); glVertex2f (x , y + h);
834 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1014 glTexCoord2f (s, 0); glVertex2f (x + w, y );
836 glEnd (); 1015 glEnd ();
1016
1017 if (ix)
1018 {
1019 glDisable (GL_ALPHA_TEST);
1020 glDisable (GL_BLEND);
1021 }
837} 1022}
838 1023
839MODULE = CFClient PACKAGE = CFClient::Map 1024MODULE = CFClient PACKAGE = CFClient::Map
840 1025
841CFClient::Map 1026CFClient::Map
1352 const_iv (GL_COLOR_MATERIAL), 1537 const_iv (GL_COLOR_MATERIAL),
1353 const_iv (GL_SMOOTH), 1538 const_iv (GL_SMOOTH),
1354 const_iv (GL_FLAT), 1539 const_iv (GL_FLAT),
1355 const_iv (GL_DITHER), 1540 const_iv (GL_DITHER),
1356 const_iv (GL_BLEND), 1541 const_iv (GL_BLEND),
1542 const_iv (GL_CULL_FACE),
1357 const_iv (GL_SCISSOR_TEST), 1543 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL),
1358 const_iv (GL_AND), 1548 const_iv (GL_AND),
1359 const_iv (GL_ONE), 1549 const_iv (GL_ONE),
1360 const_iv (GL_ZERO), 1550 const_iv (GL_ZERO),
1361 const_iv (GL_SRC_ALPHA), 1551 const_iv (GL_SRC_ALPHA),
1362 const_iv (GL_SRC_ALPHA_SATURATE), 1552 const_iv (GL_SRC_ALPHA_SATURATE),
1363 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1553 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364 const_iv (GL_ONE_MINUS_DST_ALPHA), 1554 const_iv (GL_ONE_MINUS_DST_ALPHA),
1365 const_iv (GL_RGB), 1555 const_iv (GL_RGB),
1366 const_iv (GL_RGBA), 1556 const_iv (GL_RGBA),
1367 const_iv (GL_UNSIGNED_BYTE), 1557 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT),
1368 const_iv (GL_ALPHA), 1560 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY),
1562 const_iv (GL_LUMINANCE),
1563 const_iv (GL_LUMINANCE_ALPHA),
1369 const_iv (GL_FLOAT), 1564 const_iv (GL_FLOAT),
1370 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1565 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371 const_iv (GL_COMPILE), 1566 const_iv (GL_COMPILE),
1372 const_iv (GL_TEXTURE_1D), 1567 const_iv (GL_TEXTURE_1D),
1373 const_iv (GL_TEXTURE_2D), 1568 const_iv (GL_TEXTURE_2D),
1387 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1582 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388 const_iv (GL_GENERATE_MIPMAP), 1583 const_iv (GL_GENERATE_MIPMAP),
1389 const_iv (GL_MODULATE), 1584 const_iv (GL_MODULATE),
1390 const_iv (GL_DECAL), 1585 const_iv (GL_DECAL),
1391 const_iv (GL_REPLACE), 1586 const_iv (GL_REPLACE),
1587 const_iv (GL_DEPTH_BUFFER_BIT),
1392 const_iv (GL_COLOR_BUFFER_BIT), 1588 const_iv (GL_COLOR_BUFFER_BIT),
1393 const_iv (GL_PROJECTION), 1589 const_iv (GL_PROJECTION),
1394 const_iv (GL_MODELVIEW), 1590 const_iv (GL_MODELVIEW),
1395 const_iv (GL_COLOR_LOGIC_OP), 1591 const_iv (GL_COLOR_LOGIC_OP),
1396 const_iv (GL_SEPARABLE_2D), 1592 const_iv (GL_SEPARABLE_2D),
1397 const_iv (GL_CONVOLUTION_2D), 1593 const_iv (GL_CONVOLUTION_2D),
1398 const_iv (GL_CONVOLUTION_BORDER_MODE), 1594 const_iv (GL_CONVOLUTION_BORDER_MODE),
1399 const_iv (GL_CONSTANT_BORDER), 1595 const_iv (GL_CONSTANT_BORDER),
1400 const_iv (GL_LINES), 1596 const_iv (GL_LINES),
1597 const_iv (GL_LINE_LOOP),
1401 const_iv (GL_QUADS), 1598 const_iv (GL_QUADS),
1402 const_iv (GL_LINE_LOOP), 1599 const_iv (GL_QUAD_STRIP),
1600 const_iv (GL_TRIANGLES),
1601 const_iv (GL_TRIANGLE_STRIP),
1602 const_iv (GL_TRIANGLE_FAN),
1403 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1603 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404 const_iv (GL_FASTEST), 1604 const_iv (GL_FASTEST),
1605 const_iv (GL_V2F),
1606 const_iv (GL_V3F),
1607 const_iv (GL_T2F_V3F),
1608 const_iv (GL_T2F_N3F_V3F),
1405# undef const_iv 1609# undef const_iv
1406 }; 1610 };
1407 1611
1408 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1409 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1424 1628
1425void glHint (int target, int mode) 1629void glHint (int target, int mode)
1426 1630
1427void glBlendFunc (int sfactor, int dfactor) 1631void glBlendFunc (int sfactor, int dfactor)
1428 1632
1633void glDepthMask (int flag)
1634
1429void glLogicOp (int opcode) 1635void glLogicOp (int opcode)
1430 1636
1431void glColorMask (int red, int green, int blue, int alpha) 1637void glColorMask (int red, int green, int blue, int alpha)
1432 1638
1433void glMatrixMode (int mode) 1639void glMatrixMode (int mode)
1436 1642
1437void glPopMatrix () 1643void glPopMatrix ()
1438 1644
1439void glLoadIdentity () 1645void glLoadIdentity ()
1440 1646
1441# near and far are due to microsofts buggy c compiler 1647# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649
1650# near_ and far_ are due to microsofts buggy "c" compiler
1442void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1651void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1443 1652
1444void glViewport (int x, int y, int width, int height) 1653void glViewport (int x, int y, int width, int height)
1445 1654
1446void glScissor (int x, int y, int width, int height) 1655void glScissor (int x, int y, int width, int height)
1462void glEnd () 1671void glEnd ()
1463 1672
1464void glColor (float r, float g, float b, float a = 1.0) 1673void glColor (float r, float g, float b, float a = 1.0)
1465 PROTOTYPE: @ 1674 PROTOTYPE: @
1466 CODE: 1675 CODE:
1467 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1676 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255),
1678 MIN ((int)(g * 255.f), 255),
1679 MIN ((int)(b * 255.f), 255),
1680 MIN ((int)(a * 255.f), 255));
1681
1682void glInterleavedArrays (int format, int stride, char *data)
1683
1684void glDrawElements (int mode, int count, int type, char *indices)
1685
1686# 1.2 void glDrawRangeElements (int mode, int start, int end
1687
1688void glRasterPos (float x, float y, float z = 0.)
1689 CODE:
1690 glRasterPos3f (0, 0, z);
1691 glBitmap (0, 0, 0, 0, x, y, 0);
1468 1692
1469void glVertex (float x, float y, float z = 0.) 1693void glVertex (float x, float y, float z = 0.)
1470 CODE: 1694 CODE:
1471 glVertex3f (x, y, z); 1695 glVertex3f (x, y, z);
1472 1696
1500 1724
1501void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1502 1726
1503void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504 1728
1505void glRasterPos (int x, int y) 1729void glDrawPixels (int width, int height, int format, int type, char *pixels)
1506 CODE:
1507 glRasterPos2i (x, y);
1508 1730
1509void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1731void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1510 1732
1511int glGenTexture () 1733int glGenTexture ()
1512 CODE: 1734 CODE:
1539 1761
1540void glEndList () 1762void glEndList ()
1541 1763
1542void glCallList (int list) 1764void glCallList (int list)
1543 1765
1766

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines