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.64 by root, Mon Apr 24 08:11:31 2006 UTC vs.
Revision 1.95 by root, Wed May 24 01:46:53 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);
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)
447 RETVAL 486 RETVAL
448 487
449void 488void
450SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
451 490
491char *
492SDL_GetKeyName (int sym)
493
452void 494void
453SDL_PollEvent () 495SDL_PollEvent ()
454 PPCODE: 496 PPCODE:
455{ 497{
456 SDL_Event ev; 498 SDL_Event ev;
457 499
458 while (SDL_PollEvent (&ev)) 500 while (SDL_PollEvent (&ev))
459 { 501 {
460 HV *hv = newHV (); 502 HV *hv = newHV ();
461 hv_store (hv, "type", 4, newSViv (ev.type), 0); 503 hv_store (hv, "type", 4, newSViv (ev.type), 0);
504
462 switch (ev.type) 505 switch (ev.type)
463 { 506 {
464 case SDL_KEYDOWN: 507 case SDL_KEYDOWN:
465 case SDL_KEYUP: 508 case SDL_KEYUP:
466 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 509 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
473 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
474 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
475 break; 518 break;
476 519
477 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
478 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
479 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
480 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
481 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
482 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
483 break; 528 break;
484 529
485 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
486 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
487 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
538 break;
539
540 case SDL_USEREVENT:
541 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
542 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544 break;
491 } 545 }
492 546
493 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494 } 548 }
495} 549}
496 550
497int 551int
498Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 552Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499 POSTCALL: 553 POSTCALL:
500 Mix_HookMusicFinished (music_finished); 554 Mix_HookMusicFinished (music_finished);
555 Mix_ChannelFinished (channel_finished);
501 556
502void 557void
503Mix_CloseAudio () 558Mix_CloseAudio ()
504 559
505int 560int
511#ifndef _WIN32 566#ifndef _WIN32
512 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
513#endif 568#endif
514 569
515char * 570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
576
577char *
516gl_version () 578gl_version ()
517 CODE: 579 CODE:
518 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
519 OUTPUT: 581 OUTPUT:
520 RETVAL 582 RETVAL
528 590
529void 591void
530add_font (char *file) 592add_font (char *file)
531 CODE: 593 CODE:
532 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
533 599
534void 600void
535load_image_inline (SV *image_) 601load_image_inline (SV *image_)
536 ALIAS: 602 ALIAS:
537 load_image_file = 1 603 load_image_file = 1
619 PUSHs (sv_2mortal (newSViv (b / y))); 685 PUSHs (sv_2mortal (newSViv (b / y)));
620 PUSHs (sv_2mortal (newSViv (a / y))); 686 PUSHs (sv_2mortal (newSViv (a / y)));
621} 687}
622 688
623void 689void
690error (char *message)
691 CODE:
692 fprintf (stderr, "ERROR: %s\n", message);
693#ifdef _WIN32
694 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
695#endif
696
697void
624fatal (char *message) 698fatal (char *message)
625 CODE: 699 CODE:
700 fprintf (stderr, "FATAL: %s\n", message);
626#ifdef _WIN32 701#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
628#else
629 fprintf (stderr, "FATAL: %s\n", message);
630#endif 703#endif
631 exit (1); 704 exit (1);
632 705
633MODULE = CFClient PACKAGE = CFClient::Font 706MODULE = CFClient PACKAGE = CFClient::Font
634 707
635CFClient::Font 708CFClient::Font
636new_from_file (SV *class, char *path) 709new_from_file (SV *class, char *path, int id = 0)
637 CODE: 710 CODE:
638{ 711{
639 int count; 712 int count;
640 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 713 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
641 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 714 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642 FcPatternDestroy (pattern); 715 FcPatternDestroy (pattern);
643} 716}
644 OUTPUT: 717 OUTPUT:
645 RETVAL 718 RETVAL
655 default_font = self; 728 default_font = self;
656 729
657MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
658 731
659CFClient::Layout 732CFClient::Layout
660new (SV *class, int base_height = MIN_FONT_HEIGHT) 733new (SV *class, int rgba = 0)
661 CODE: 734 CODE:
735#if _WIN32
736 rgba = 0;//D
737#endif
662 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
663 RETVAL->pl = pango_layout_new (context); 739
664 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;
665 RETVAL->font = 0; 747 RETVAL->font = 0;
748
666 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 749 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
667 pango_layout_set_font_description (RETVAL->pl, default_font); 750 layout_update_font (RETVAL);
668 OUTPUT: 751 OUTPUT:
669 RETVAL 752 RETVAL
670 753
671void 754void
672DESTROY (CFClient::Layout self) 755DESTROY (CFClient::Layout self)
673 CODE: 756 CODE:
674 g_object_unref (self->pl); 757 g_object_unref (self->pl);
675 Safefree (self); 758 Safefree (self);
676 759
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
677void 767void
678set_text (CFClient::Layout self, SV *text_) 768set_text (CFClient::Layout self, SV *text_)
679 CODE: 769 CODE:
680{ 770{
681 STRLEN textlen; 771 STRLEN textlen;
699 CODE: 789 CODE:
700 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
701 SvUTF8_on (RETVAL); 791 SvUTF8_on (RETVAL);
702 OUTPUT: 792 OUTPUT:
703 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;
704 802
705void 803void
706set_font (CFClient::Layout self, CFClient::Font font = 0) 804set_font (CFClient::Layout self, CFClient::Font font = 0)
707 CODE: 805 CODE:
708 if (self->font != font) 806 if (self->font != font)
724set_width (CFClient::Layout self, int max_width = -1) 822set_width (CFClient::Layout self, int max_width = -1)
725 CODE: 823 CODE:
726 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);
727 825
728void 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
729size (CFClient::Layout self) 852size (CFClient::Layout self)
730 PPCODE: 853 PPCODE:
731{ 854{
732 int w, h; 855 int w, h;
733 856
766render (CFClient::Layout self) 889render (CFClient::Layout self)
767 PPCODE: 890 PPCODE:
768{ 891{
769 SV *retval; 892 SV *retval;
770 int w, h; 893 int w, h;
771 FT_Bitmap bitmap;
772 894
773 layout_get_pixel_size (self, &w, &h); 895 layout_get_pixel_size (self, &w, &h);
774 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
775 retval = newSV (w * h); 955 retval = newSV (w * h);
776 SvPOK_only (retval); 956 SvPOK_only (retval);
777 SvCUR_set (retval, w * h); 957 SvCUR_set (retval, w * h);
778 958
779 bitmap.rows = h; 959 bitmap.rows = h;
780 bitmap.width = w; 960 bitmap.width = w;
781 bitmap.pitch = w; 961 bitmap.pitch = w;
782 bitmap.buffer = (unsigned char*)SvPVX (retval); 962 bitmap.buffer = (unsigned char*)SvPVX (retval);
783 bitmap.num_grays = 256; 963 bitmap.num_grays = 256;
784 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 964 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
785 965
786 memset (bitmap.buffer, 0, w * h); 966 memset (bitmap.buffer, 0, w * h);
787 967
788 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);
789 969
790 EXTEND (SP, 3); 970 EXTEND (SP, 5);
791 PUSHs (sv_2mortal (newSViv (w))); 971 PUSHs (sv_2mortal (newSViv (w)));
792 PUSHs (sv_2mortal (newSViv (h))); 972 PUSHs (sv_2mortal (newSViv (h)));
793 PUSHs (sv_2mortal (retval)); 973 PUSHs (sv_2mortal (retval));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 }
794} 977}
795 978
796MODULE = CFClient PACKAGE = CFClient::Texture 979MODULE = CFClient PACKAGE = CFClient::Texture
797 980
798void 981void
799draw_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)
800 PROTOTYPE: $$$;$$ 983 PROTOTYPE: $$$;$$
984 ALIAS:
985 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2
801 CODE: 987 CODE:
802{ 988{
803 HV *hv = (HV *)SvRV (self); 989 HV *hv = (HV *)SvRV (self);
804 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 990 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
805 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 991 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
810 { 996 {
811 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 997 w = SvNV (*hv_fetch (hv, "w", 1, 1));
812 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 998 h = SvNV (*hv_fetch (hv, "h", 1, 1));
813 } 999 }
814 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
815 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
1010
816 if (wrap_mode) { 1011 if (wrap_mode)
1012 {
817 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1013 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
818 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1014 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
819 } 1015 }
1016
820 glBegin (GL_QUADS); 1017 glBegin (GL_QUADS);
821 glTexCoord2f (0, 0); glVertex2f (x , y ); 1018 glTexCoord2f (0, 0); glVertex2f (x , y );
822 glTexCoord2f (0, t); glVertex2f (x , y + h); 1019 glTexCoord2f (0, t); glVertex2f (x , y + h);
823 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
824 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
825 glEnd (); 1022 glEnd ();
1023
1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND);
1028 }
826} 1029}
827 1030
828MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
829 1032
830CFClient::Map 1033CFClient::Map
894 tex->r = r; 1097 tex->r = r;
895 tex->g = g; 1098 tex->g = g;
896 tex->b = b; 1099 tex->b = b;
897 tex->a = a; 1100 tex->a = a;
898 } 1101 }
1102
1103 // somewhat hackish, but for textures that require it, it really
1104 // improves the look, and most others don't suffer.
1105 glBindTexture (GL_TEXTURE_2D, name);
1106 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
899} 1108}
900 1109
901int 1110int
902ox (CFClient::Map self) 1111ox (CFClient::Map self)
903 ALIAS: 1112 ALIAS:
1339 } *civ, const_iv[] = { 1548 } *civ, const_iv[] = {
1340# define const_iv(name) { # name, (IV)name } 1549# define const_iv(name) { # name, (IV)name }
1341 const_iv (GL_COLOR_MATERIAL), 1550 const_iv (GL_COLOR_MATERIAL),
1342 const_iv (GL_SMOOTH), 1551 const_iv (GL_SMOOTH),
1343 const_iv (GL_FLAT), 1552 const_iv (GL_FLAT),
1553 const_iv (GL_DITHER),
1344 const_iv (GL_BLEND), 1554 const_iv (GL_BLEND),
1555 const_iv (GL_CULL_FACE),
1556 const_iv (GL_SCISSOR_TEST),
1557 const_iv (GL_DEPTH_TEST),
1558 const_iv (GL_ALPHA_TEST),
1559 const_iv (GL_NORMALIZE),
1560 const_iv (GL_RESCALE_NORMAL),
1345 const_iv (GL_AND), 1561 const_iv (GL_AND),
1562 const_iv (GL_ONE),
1563 const_iv (GL_ZERO),
1346 const_iv (GL_SRC_ALPHA), 1564 const_iv (GL_SRC_ALPHA),
1565 const_iv (GL_SRC_ALPHA_SATURATE),
1347 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1566 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1567 const_iv (GL_ONE_MINUS_DST_ALPHA),
1348 const_iv (GL_RGB), 1568 const_iv (GL_RGB),
1349 const_iv (GL_RGBA), 1569 const_iv (GL_RGBA),
1350 const_iv (GL_UNSIGNED_BYTE), 1570 const_iv (GL_UNSIGNED_BYTE),
1351 const_iv (GL_ALPHA4), 1571 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT),
1352 const_iv (GL_ALPHA), 1573 const_iv (GL_ALPHA),
1574 const_iv (GL_INTENSITY),
1575 const_iv (GL_LUMINANCE),
1576 const_iv (GL_LUMINANCE_ALPHA),
1353 const_iv (GL_FLOAT), 1577 const_iv (GL_FLOAT),
1354 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1578 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1355 const_iv (GL_COMPILE), 1579 const_iv (GL_COMPILE),
1356 const_iv (GL_TEXTURE_1D), 1580 const_iv (GL_TEXTURE_1D),
1357 const_iv (GL_TEXTURE_2D), 1581 const_iv (GL_TEXTURE_2D),
1368 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1592 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1369 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1593 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1370 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1594 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1371 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1595 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1372 const_iv (GL_GENERATE_MIPMAP), 1596 const_iv (GL_GENERATE_MIPMAP),
1373 const_iv (GL_LINEAR),
1374 const_iv (GL_MODULATE), 1597 const_iv (GL_MODULATE),
1598 const_iv (GL_DECAL),
1375 const_iv (GL_REPLACE), 1599 const_iv (GL_REPLACE),
1600 const_iv (GL_DEPTH_BUFFER_BIT),
1376 const_iv (GL_COLOR_BUFFER_BIT), 1601 const_iv (GL_COLOR_BUFFER_BIT),
1377 const_iv (GL_PROJECTION), 1602 const_iv (GL_PROJECTION),
1378 const_iv (GL_MODELVIEW), 1603 const_iv (GL_MODELVIEW),
1379 const_iv (GL_COLOR_LOGIC_OP), 1604 const_iv (GL_COLOR_LOGIC_OP),
1605 const_iv (GL_SEPARABLE_2D),
1380 const_iv (GL_CONVOLUTION_2D), 1606 const_iv (GL_CONVOLUTION_2D),
1381 const_iv (GL_CONVOLUTION_BORDER_MODE), 1607 const_iv (GL_CONVOLUTION_BORDER_MODE),
1382 const_iv (GL_CONSTANT_BORDER), 1608 const_iv (GL_CONSTANT_BORDER),
1383 const_iv (GL_LINES), 1609 const_iv (GL_LINES),
1610 const_iv (GL_LINE_LOOP),
1384 const_iv (GL_QUADS), 1611 const_iv (GL_QUADS),
1385 const_iv (GL_LINE_LOOP), 1612 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP),
1615 const_iv (GL_TRIANGLE_FAN),
1386 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1616 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1387 const_iv (GL_FASTEST), 1617 const_iv (GL_FASTEST),
1618 const_iv (GL_V2F),
1619 const_iv (GL_V3F),
1620 const_iv (GL_T2F_V3F),
1621 const_iv (GL_T2F_N3F_V3F),
1388# undef const_iv 1622# undef const_iv
1389 }; 1623 };
1390 1624
1391 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1625 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1392 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1407 1641
1408void glHint (int target, int mode) 1642void glHint (int target, int mode)
1409 1643
1410void glBlendFunc (int sfactor, int dfactor) 1644void glBlendFunc (int sfactor, int dfactor)
1411 1645
1646void glDepthMask (int flag)
1647
1412void glLogicOp (int opcode) 1648void glLogicOp (int opcode)
1413 1649
1650void glColorMask (int red, int green, int blue, int alpha)
1651
1414void glMatrixMode (int mode) 1652void glMatrixMode (int mode)
1415 1653
1416void glPushMatrix () 1654void glPushMatrix ()
1417 1655
1418void glPopMatrix () 1656void glPopMatrix ()
1419 1657
1420void glLoadIdentity () 1658void glLoadIdentity ()
1421 1659
1422# near and far are due to microsofts buggy c compiler 1660# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662
1663# near_ and far_ are due to microsofts buggy "c" compiler
1423void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1664void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1424 1665
1425void glViewport (int x, int y, int width, int height) 1666void glViewport (int x, int y, int width, int height)
1667
1668void glScissor (int x, int y, int width, int height)
1426 1669
1427void glTranslate (float x, float y, float z = 0.) 1670void glTranslate (float x, float y, float z = 0.)
1428 CODE: 1671 CODE:
1429 glTranslatef (x, y, z); 1672 glTranslatef (x, y, z);
1430 1673
1441void glEnd () 1684void glEnd ()
1442 1685
1443void glColor (float r, float g, float b, float a = 1.0) 1686void glColor (float r, float g, float b, float a = 1.0)
1444 PROTOTYPE: @ 1687 PROTOTYPE: @
1445 CODE: 1688 CODE:
1446 glColor4f (r, g, b, a); 1689 // microsoft visual "c" rounds instead of truncating...
1690 glColor4ub (MIN ((int)(r * 255.f), 255),
1691 MIN ((int)(g * 255.f), 255),
1692 MIN ((int)(b * 255.f), 255),
1693 MIN ((int)(a * 255.f), 255));
1694
1695void glInterleavedArrays (int format, int stride, char *data)
1696
1697void glDrawElements (int mode, int count, int type, char *indices)
1698
1699# 1.2 void glDrawRangeElements (int mode, int start, int end
1700
1701void glRasterPos (float x, float y, float z = 0.)
1702 CODE:
1703 glRasterPos3f (0, 0, z);
1704 glBitmap (0, 0, 0, 0, x, y, 0);
1447 1705
1448void glVertex (float x, float y, float z = 0.) 1706void glVertex (float x, float y, float z = 0.)
1449 CODE: 1707 CODE:
1450 glVertex3f (x, y, z); 1708 glVertex3f (x, y, z);
1451 1709
1470void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1728void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1471 CODE: 1729 CODE:
1472 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1730 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1473 (target, internalformat, width, height, format, type, data)); 1731 (target, internalformat, width, height, format, type, data));
1474 1732
1733void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1734 CODE:
1735 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1736 (target, internalformat, width, height, format, type, row, column));
1737
1475void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1476 1739
1477void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741
1742void glDrawPixels (int width, int height, int format, int type, char *pixels)
1743
1744void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1478 1745
1479int glGenTexture () 1746int glGenTexture ()
1480 CODE: 1747 CODE:
1481{ 1748{
1482 GLuint name; 1749 GLuint name;
1507 1774
1508void glEndList () 1775void glEndList ()
1509 1776
1510void glCallList (int list) 1777void glCallList (int list)
1511 1778
1779

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines