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.67 by root, Tue Apr 25 11:18:48 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
406 SDL_Rect **m; 441 SDL_Rect **m;
407 442
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, 0); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
412 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);
434 470
435 ++m; 471 ++m;
436 } 472 }
437} 473}
438 474
475char *
476SDL_GetError ()
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 (
443 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
457 496
458 while (SDL_PollEvent (&ev)) 497 while (SDL_PollEvent (&ev))
459 { 498 {
460 HV *hv = newHV (); 499 HV *hv = newHV ();
461 hv_store (hv, "type", 4, newSViv (ev.type), 0); 500 hv_store (hv, "type", 4, newSViv (ev.type), 0);
501
462 switch (ev.type) 502 switch (ev.type)
463 { 503 {
464 case SDL_KEYDOWN: 504 case SDL_KEYDOWN:
465 case SDL_KEYUP: 505 case SDL_KEYUP:
466 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 506 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
486 case SDL_MOUSEBUTTONUP: 526 case SDL_MOUSEBUTTONUP:
487 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
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;
491 } 538 }
492 539
493 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494 } 541 }
495} 542}
496 543
497int 544int
498Mix_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)
499 POSTCALL: 546 POSTCALL:
500 Mix_HookMusicFinished (music_finished); 547 Mix_HookMusicFinished (music_finished);
548 Mix_ChannelFinished (channel_finished);
501 549
502void 550void
503Mix_CloseAudio () 551Mix_CloseAudio ()
504 552
505int 553int
511#ifndef _WIN32 559#ifndef _WIN32
512 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
513#endif 561#endif
514 562
515char * 563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
516gl_version () 571gl_version ()
517 CODE: 572 CODE:
518 RETVAL = (char *)glGetString (GL_VERSION); 573 RETVAL = (char *)glGetString (GL_VERSION);
519 OUTPUT: 574 OUTPUT:
520 RETVAL 575 RETVAL
528 583
529void 584void
530add_font (char *file) 585add_font (char *file)
531 CODE: 586 CODE:
532 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
533 592
534void 593void
535load_image_inline (SV *image_) 594load_image_inline (SV *image_)
536 ALIAS: 595 ALIAS:
537 load_image_file = 1 596 load_image_file = 1
621} 680}
622 681
623void 682void
624error (char *message) 683error (char *message)
625 CODE: 684 CODE:
685 fprintf (stderr, "ERROR: %s\n", message);
626#ifdef _WIN32 686#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 687 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
628#else
629 fprintf (stderr, "ERROR: %s\n", message);
630#endif 688#endif
631 689
632void 690void
633fatal (char *message) 691fatal (char *message)
634 CODE: 692 CODE:
693 fprintf (stderr, "FATAL: %s\n", message);
635#ifdef _WIN32 694#ifdef _WIN32
636 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
637#else
638 fprintf (stderr, "FATAL: %s\n", message);
639#endif 696#endif
640 exit (1); 697 exit (1);
641 698
642MODULE = CFClient PACKAGE = CFClient::Font 699MODULE = CFClient PACKAGE = CFClient::Font
643 700
644CFClient::Font 701CFClient::Font
645new_from_file (SV *class, char *path) 702new_from_file (SV *class, char *path, int id = 0)
646 CODE: 703 CODE:
647{ 704{
648 int count; 705 int count;
649 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 706 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
650 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 707 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651 FcPatternDestroy (pattern); 708 FcPatternDestroy (pattern);
652} 709}
653 OUTPUT: 710 OUTPUT:
654 RETVAL 711 RETVAL
664 default_font = self; 721 default_font = self;
665 722
666MODULE = CFClient PACKAGE = CFClient::Layout 723MODULE = CFClient PACKAGE = CFClient::Layout
667 724
668CFClient::Layout 725CFClient::Layout
669new (SV *class, int base_height = MIN_FONT_HEIGHT) 726new (SV *class, int rgba = 0)
670 CODE: 727 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
671 New (0, RETVAL, 1, struct cf_layout); 731 New (0, RETVAL, 1, struct cf_layout);
672 RETVAL->pl = pango_layout_new (context); 732
673 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;
674 RETVAL->font = 0; 740 RETVAL->font = 0;
741
675 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 742 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676 pango_layout_set_font_description (RETVAL->pl, default_font); 743 layout_update_font (RETVAL);
677 OUTPUT: 744 OUTPUT:
678 RETVAL 745 RETVAL
679 746
680void 747void
681DESTROY (CFClient::Layout self) 748DESTROY (CFClient::Layout self)
682 CODE: 749 CODE:
683 g_object_unref (self->pl); 750 g_object_unref (self->pl);
684 Safefree (self); 751 Safefree (self);
685 752
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
686void 760void
687set_text (CFClient::Layout self, SV *text_) 761set_text (CFClient::Layout self, SV *text_)
688 CODE: 762 CODE:
689{ 763{
690 STRLEN textlen; 764 STRLEN textlen;
708 CODE: 782 CODE:
709 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710 SvUTF8_on (RETVAL); 784 SvUTF8_on (RETVAL);
711 OUTPUT: 785 OUTPUT:
712 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;
713 795
714void 796void
715set_font (CFClient::Layout self, CFClient::Font font = 0) 797set_font (CFClient::Layout self, CFClient::Font font = 0)
716 CODE: 798 CODE:
717 if (self->font != font) 799 if (self->font != font)
733set_width (CFClient::Layout self, int max_width = -1) 815set_width (CFClient::Layout self, int max_width = -1)
734 CODE: 816 CODE:
735 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);
736 818
737void 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
738size (CFClient::Layout self) 845size (CFClient::Layout self)
739 PPCODE: 846 PPCODE:
740{ 847{
741 int w, h; 848 int w, h;
742 849
775render (CFClient::Layout self) 882render (CFClient::Layout self)
776 PPCODE: 883 PPCODE:
777{ 884{
778 SV *retval; 885 SV *retval;
779 int w, h; 886 int w, h;
780 FT_Bitmap bitmap;
781 887
782 layout_get_pixel_size (self, &w, &h); 888 layout_get_pixel_size (self, &w, &h);
783 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
784 retval = newSV (w * h); 948 retval = newSV (w * h);
785 SvPOK_only (retval); 949 SvPOK_only (retval);
786 SvCUR_set (retval, w * h); 950 SvCUR_set (retval, w * h);
787 951
788 bitmap.rows = h; 952 bitmap.rows = h;
789 bitmap.width = w; 953 bitmap.width = w;
790 bitmap.pitch = w; 954 bitmap.pitch = w;
791 bitmap.buffer = (unsigned char*)SvPVX (retval); 955 bitmap.buffer = (unsigned char*)SvPVX (retval);
792 bitmap.num_grays = 256; 956 bitmap.num_grays = 256;
793 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 957 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794 958
795 memset (bitmap.buffer, 0, w * h); 959 memset (bitmap.buffer, 0, w * h);
796 960
797 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);
798 962
799 EXTEND (SP, 3); 963 EXTEND (SP, 5);
800 PUSHs (sv_2mortal (newSViv (w))); 964 PUSHs (sv_2mortal (newSViv (w)));
801 PUSHs (sv_2mortal (newSViv (h))); 965 PUSHs (sv_2mortal (newSViv (h)));
802 PUSHs (sv_2mortal (retval)); 966 PUSHs (sv_2mortal (retval));
967 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
968 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
969 }
803} 970}
804 971
805MODULE = CFClient PACKAGE = CFClient::Texture 972MODULE = CFClient PACKAGE = CFClient::Texture
806 973
807void 974void
808draw_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)
809 PROTOTYPE: $$$;$$ 976 PROTOTYPE: $$$;$$
977 ALIAS:
978 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2
810 CODE: 980 CODE:
811{ 981{
812 HV *hv = (HV *)SvRV (self); 982 HV *hv = (HV *)SvRV (self);
813 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 983 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 984 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
819 { 989 {
820 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 990 w = SvNV (*hv_fetch (hv, "w", 1, 1));
821 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 991 h = SvNV (*hv_fetch (hv, "h", 1, 1));
822 } 992 }
823 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
824 glBindTexture (GL_TEXTURE_2D, name); 1002 glBindTexture (GL_TEXTURE_2D, name);
1003
825 if (wrap_mode) { 1004 if (wrap_mode)
1005 {
826 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828 } 1008 }
1009
829 glBegin (GL_QUADS); 1010 glBegin (GL_QUADS);
830 glTexCoord2f (0, 0); glVertex2f (x , y ); 1011 glTexCoord2f (0, 0); glVertex2f (x , y );
831 glTexCoord2f (0, t); glVertex2f (x , y + h); 1012 glTexCoord2f (0, t); glVertex2f (x , y + h);
832 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1014 glTexCoord2f (s, 0); glVertex2f (x + w, y );
834 glEnd (); 1015 glEnd ();
1016
1017 if (ix)
1018 {
1019 glDisable (GL_ALPHA_TEST);
1020 glDisable (GL_BLEND);
1021 }
835} 1022}
836 1023
837MODULE = CFClient PACKAGE = CFClient::Map 1024MODULE = CFClient PACKAGE = CFClient::Map
838 1025
839CFClient::Map 1026CFClient::Map
1348 } *civ, const_iv[] = { 1535 } *civ, const_iv[] = {
1349# define const_iv(name) { # name, (IV)name } 1536# define const_iv(name) { # name, (IV)name }
1350 const_iv (GL_COLOR_MATERIAL), 1537 const_iv (GL_COLOR_MATERIAL),
1351 const_iv (GL_SMOOTH), 1538 const_iv (GL_SMOOTH),
1352 const_iv (GL_FLAT), 1539 const_iv (GL_FLAT),
1540 const_iv (GL_DITHER),
1353 const_iv (GL_BLEND), 1541 const_iv (GL_BLEND),
1542 const_iv (GL_CULL_FACE),
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),
1354 const_iv (GL_AND), 1548 const_iv (GL_AND),
1355 const_iv (GL_ONE), 1549 const_iv (GL_ONE),
1356 const_iv (GL_ZERO), 1550 const_iv (GL_ZERO),
1357 const_iv (GL_SRC_ALPHA), 1551 const_iv (GL_SRC_ALPHA),
1358 const_iv (GL_SRC_ALPHA_SATURATE), 1552 const_iv (GL_SRC_ALPHA_SATURATE),
1359 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1553 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1360 const_iv (GL_ONE_MINUS_DST_ALPHA), 1554 const_iv (GL_ONE_MINUS_DST_ALPHA),
1361 const_iv (GL_RGB), 1555 const_iv (GL_RGB),
1362 const_iv (GL_RGBA), 1556 const_iv (GL_RGBA),
1363 const_iv (GL_UNSIGNED_BYTE), 1557 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT),
1364 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),
1365 const_iv (GL_FLOAT), 1564 const_iv (GL_FLOAT),
1366 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1565 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1367 const_iv (GL_COMPILE), 1566 const_iv (GL_COMPILE),
1368 const_iv (GL_TEXTURE_1D), 1567 const_iv (GL_TEXTURE_1D),
1369 const_iv (GL_TEXTURE_2D), 1568 const_iv (GL_TEXTURE_2D),
1381 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1580 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1382 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1581 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1383 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1582 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1384 const_iv (GL_GENERATE_MIPMAP), 1583 const_iv (GL_GENERATE_MIPMAP),
1385 const_iv (GL_MODULATE), 1584 const_iv (GL_MODULATE),
1585 const_iv (GL_DECAL),
1386 const_iv (GL_REPLACE), 1586 const_iv (GL_REPLACE),
1587 const_iv (GL_DEPTH_BUFFER_BIT),
1387 const_iv (GL_COLOR_BUFFER_BIT), 1588 const_iv (GL_COLOR_BUFFER_BIT),
1388 const_iv (GL_PROJECTION), 1589 const_iv (GL_PROJECTION),
1389 const_iv (GL_MODELVIEW), 1590 const_iv (GL_MODELVIEW),
1390 const_iv (GL_COLOR_LOGIC_OP), 1591 const_iv (GL_COLOR_LOGIC_OP),
1592 const_iv (GL_SEPARABLE_2D),
1391 const_iv (GL_CONVOLUTION_2D), 1593 const_iv (GL_CONVOLUTION_2D),
1392 const_iv (GL_CONVOLUTION_BORDER_MODE), 1594 const_iv (GL_CONVOLUTION_BORDER_MODE),
1393 const_iv (GL_CONSTANT_BORDER), 1595 const_iv (GL_CONSTANT_BORDER),
1394 const_iv (GL_LINES), 1596 const_iv (GL_LINES),
1597 const_iv (GL_LINE_LOOP),
1395 const_iv (GL_QUADS), 1598 const_iv (GL_QUADS),
1396 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),
1397 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1603 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1398 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),
1399# undef const_iv 1609# undef const_iv
1400 }; 1610 };
1401 1611
1402 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; )
1403 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1418 1628
1419void glHint (int target, int mode) 1629void glHint (int target, int mode)
1420 1630
1421void glBlendFunc (int sfactor, int dfactor) 1631void glBlendFunc (int sfactor, int dfactor)
1422 1632
1633void glDepthMask (int flag)
1634
1423void glLogicOp (int opcode) 1635void glLogicOp (int opcode)
1424 1636
1637void glColorMask (int red, int green, int blue, int alpha)
1638
1425void glMatrixMode (int mode) 1639void glMatrixMode (int mode)
1426 1640
1427void glPushMatrix () 1641void glPushMatrix ()
1428 1642
1429void glPopMatrix () 1643void glPopMatrix ()
1430 1644
1431void glLoadIdentity () 1645void glLoadIdentity ()
1432 1646
1433# 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
1434void 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_)
1435 1652
1436void glViewport (int x, int y, int width, int height) 1653void glViewport (int x, int y, int width, int height)
1654
1655void glScissor (int x, int y, int width, int height)
1437 1656
1438void glTranslate (float x, float y, float z = 0.) 1657void glTranslate (float x, float y, float z = 0.)
1439 CODE: 1658 CODE:
1440 glTranslatef (x, y, z); 1659 glTranslatef (x, y, z);
1441 1660
1452void glEnd () 1671void glEnd ()
1453 1672
1454void glColor (float r, float g, float b, float a = 1.0) 1673void glColor (float r, float g, float b, float a = 1.0)
1455 PROTOTYPE: @ 1674 PROTOTYPE: @
1456 CODE: 1675 CODE:
1457 glColor4f (r, g, b, a); 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);
1458 1692
1459void glVertex (float x, float y, float z = 0.) 1693void glVertex (float x, float y, float z = 0.)
1460 CODE: 1694 CODE:
1461 glVertex3f (x, y, z); 1695 glVertex3f (x, y, z);
1462 1696
1481void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1482 CODE: 1716 CODE:
1483 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1484 (target, internalformat, width, height, format, type, data)); 1718 (target, internalformat, width, height, format, type, data));
1485 1719
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1723 (target, internalformat, width, height, format, type, row, column));
1724
1486void 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)
1487 1726
1488void 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)
1728
1729void glDrawPixels (int width, int height, int format, int type, char *pixels)
1730
1731void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1489 1732
1490int glGenTexture () 1733int glGenTexture ()
1491 CODE: 1734 CODE:
1492{ 1735{
1493 GLuint name; 1736 GLuint name;
1518 1761
1519void glEndList () 1762void glEndList ()
1520 1763
1521void glCallList (int list) 1764void glCallList (int list)
1522 1765
1766

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines