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.61 by root, Sun Apr 23 21:47:30 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>
40#define FOW_DARKNESS 32 46#define FOW_DARKNESS 32
41 47
42#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
44 50
45#define MIN_FONT_HEIGHT 8 51#define MIN_FONT_HEIGHT 10
52
53#define GL_CALL(type,func,args) \
54 { \
55 static int init_; \
56 static type fptr_; \
57 \
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
46 67
47typedef Mix_Chunk *CFClient__MixChunk; 68typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 69typedef Mix_Music *CFClient__MixMusic;
49 70
50typedef PangoFontDescription *CFClient__Font; 71typedef PangoFontDescription *CFClient__Font;
51 72
52typedef struct cf_layout { 73typedef struct cf_layout {
53 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
54 int base_height; 77 int base_height;
55 CFClient__Font font; 78 CFClient__Font font;
56} *CFClient__Layout; 79} *CFClient__Layout;
57 80
58static CFClient__Font default_font; 81static CFClient__Font default_font;
59static PangoContext *context; 82static PangoContext *ft2_context, *cairo_context;
60static PangoFontMap *fontmap; 83static PangoFontMap *ft2_fontmap, *cairo_fontmap;
61 84
62static void 85static void
63substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
64{ 87{
65 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
66 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
67} 94}
68 95
69static void 96static void
70layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
71{ 98{
83static void 110static void
84layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 111layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
85{ 112{
86 pango_layout_get_pixel_size (self->pl, w, h); 113 pango_layout_get_pixel_size (self->pl, w, h);
87 114
88 *w = (*w + 3) & ~3;
89 if (!*w) *w = 1; 115 if (!*w) *w = 1;
90 if (!*h) *h = 1; 116 if (!*h) *h = 1;
117
118 *w = (*w + 3) & ~3;
91} 119}
92 120
93typedef uint16_t mapface; 121typedef uint16_t mapface;
94 122
95typedef struct { 123typedef struct {
243 } 271 }
244 } 272 }
245} 273}
246 274
247static void 275static void
248music_finished () 276music_finished (void)
249{ 277{
250 SDL_UserEvent ev; 278 SDL_UserEvent ev;
251 279
252 ev.type = SDL_USEREVENT; 280 ev.type = SDL_USEREVENT;
253 ev.code = 0; 281 ev.code = 0;
254 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;
255 ev.data2 = 0; 296 ev.data2 = 0;
256 297
257 SDL_PushEvent ((SDL_Event *)&ev); 298 SDL_PushEvent ((SDL_Event *)&ev);
258} 299}
259 300
370# undef const_iv 411# undef const_iv
371 }; 412 };
372 413
373 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; )
374 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
375 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
376 fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
377 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);
378 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);
379} 429}
380 430
381int 431int
382SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
383 433
393 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
394 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
395 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
396 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
397 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
398 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
399 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
400 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
401 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
402 455
403 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
404 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
405 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
406 457
407 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
408 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409 460
410 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
419 470
420 ++m; 471 ++m;
421 } 472 }
422} 473}
423 474
475char *
476SDL_GetError ()
477
424int 478int
425SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
426 CODE: 480 CODE:
427 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
428 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
432 RETVAL 486 RETVAL
433 487
434void 488void
435SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
436 490
491char *
492SDL_GetKeyName (int sym)
493
437void 494void
438SDL_PollEvent () 495SDL_PollEvent ()
439 PPCODE: 496 PPCODE:
440{ 497{
441 SDL_Event ev; 498 SDL_Event ev;
442 499
443 while (SDL_PollEvent (&ev)) 500 while (SDL_PollEvent (&ev))
444 { 501 {
445 HV *hv = newHV (); 502 HV *hv = newHV ();
446 hv_store (hv, "type", 4, newSViv (ev.type), 0); 503 hv_store (hv, "type", 4, newSViv (ev.type), 0);
504
447 switch (ev.type) 505 switch (ev.type)
448 { 506 {
449 case SDL_KEYDOWN: 507 case SDL_KEYDOWN:
450 case SDL_KEYUP: 508 case SDL_KEYUP:
451 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 509 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
458 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
459 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
460 break; 518 break;
461 519
462 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
463 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
464 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
465 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
466 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
467 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
468 break; 528 break;
469 529
470 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
471 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
472 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475 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;
476 } 545 }
477 546
478 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
479 } 548 }
480} 549}
481 550
482int 551int
483Mix_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)
484 POSTCALL: 553 POSTCALL:
485 Mix_HookMusicFinished (music_finished); 554 Mix_HookMusicFinished (music_finished);
555 Mix_ChannelFinished (channel_finished);
486 556
487void 557void
488Mix_CloseAudio () 558Mix_CloseAudio ()
489 559
490int 560int
496#ifndef _WIN32 566#ifndef _WIN32
497 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
498#endif 568#endif
499 569
500char * 570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
576
577char *
501gl_version () 578gl_version ()
502 CODE: 579 CODE:
503 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
504 OUTPUT: 581 OUTPUT:
505 RETVAL 582 RETVAL
513 590
514void 591void
515add_font (char *file) 592add_font (char *file)
516 CODE: 593 CODE:
517 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
518 599
519void 600void
520load_image_inline (SV *image_) 601load_image_inline (SV *image_)
521 ALIAS: 602 ALIAS:
522 load_image_file = 1 603 load_image_file = 1
604 PUSHs (sv_2mortal (newSViv (b / y))); 685 PUSHs (sv_2mortal (newSViv (b / y)));
605 PUSHs (sv_2mortal (newSViv (a / y))); 686 PUSHs (sv_2mortal (newSViv (a / y)));
606} 687}
607 688
608void 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
609fatal (char *message) 698fatal (char *message)
610 CODE: 699 CODE:
700 fprintf (stderr, "FATAL: %s\n", message);
611#ifdef _WIN32 701#ifdef _WIN32
612 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
613#else
614 fprintf (stderr, "FATAL: %s\n", message);
615#endif 703#endif
616 exit (1); 704 exit (1);
617 705
618MODULE = CFClient PACKAGE = CFClient::Font 706MODULE = CFClient PACKAGE = CFClient::Font
619 707
620CFClient::Font 708CFClient::Font
621new_from_file (SV *class, char *path) 709new_from_file (SV *class, char *path, int id = 0)
622 CODE: 710 CODE:
623{ 711{
624 int count; 712 int count;
625 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 713 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
626 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 714 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627 FcPatternDestroy (pattern); 715 FcPatternDestroy (pattern);
628} 716}
629 OUTPUT: 717 OUTPUT:
630 RETVAL 718 RETVAL
640 default_font = self; 728 default_font = self;
641 729
642MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
643 731
644CFClient::Layout 732CFClient::Layout
645new (SV *class, int base_height = MIN_FONT_HEIGHT) 733new (SV *class, int rgba = 0)
646 CODE: 734 CODE:
735#if _WIN32
736 rgba = 0;//D
737#endif
647 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
648 RETVAL->pl = pango_layout_new (context); 739
649 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;
650 RETVAL->font = 0; 747 RETVAL->font = 0;
748
651 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 749 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652 pango_layout_set_font_description (RETVAL->pl, default_font); 750 layout_update_font (RETVAL);
653 OUTPUT: 751 OUTPUT:
654 RETVAL 752 RETVAL
655 753
656void 754void
657DESTROY (CFClient::Layout self) 755DESTROY (CFClient::Layout self)
658 CODE: 756 CODE:
659 g_object_unref (self->pl); 757 g_object_unref (self->pl);
660 Safefree (self); 758 Safefree (self);
661 759
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
662void 767void
663set_text (CFClient::Layout self, SV *text_) 768set_text (CFClient::Layout self, SV *text_)
664 CODE: 769 CODE:
665{ 770{
666 STRLEN textlen; 771 STRLEN textlen;
684 CODE: 789 CODE:
685 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686 SvUTF8_on (RETVAL); 791 SvUTF8_on (RETVAL);
687 OUTPUT: 792 OUTPUT:
688 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;
689 802
690void 803void
691set_font (CFClient::Layout self, CFClient::Font font = 0) 804set_font (CFClient::Layout self, CFClient::Font font = 0)
692 CODE: 805 CODE:
693 if (self->font != font) 806 if (self->font != font)
709set_width (CFClient::Layout self, int max_width = -1) 822set_width (CFClient::Layout self, int max_width = -1)
710 CODE: 823 CODE:
711 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);
712 825
713void 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
714size (CFClient::Layout self) 852size (CFClient::Layout self)
715 PPCODE: 853 PPCODE:
716{ 854{
717 int w, h; 855 int w, h;
718 856
751render (CFClient::Layout self) 889render (CFClient::Layout self)
752 PPCODE: 890 PPCODE:
753{ 891{
754 SV *retval; 892 SV *retval;
755 int w, h; 893 int w, h;
756 FT_Bitmap bitmap;
757 894
758 layout_get_pixel_size (self, &w, &h); 895 layout_get_pixel_size (self, &w, &h);
759 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
760 retval = newSV (w * h); 955 retval = newSV (w * h);
761 SvPOK_only (retval); 956 SvPOK_only (retval);
762 SvCUR_set (retval, w * h); 957 SvCUR_set (retval, w * h);
763 958
764 bitmap.rows = h; 959 bitmap.rows = h;
765 bitmap.width = w; 960 bitmap.width = w;
766 bitmap.pitch = w; 961 bitmap.pitch = w;
767 bitmap.buffer = (unsigned char*)SvPVX (retval); 962 bitmap.buffer = (unsigned char*)SvPVX (retval);
768 bitmap.num_grays = 256; 963 bitmap.num_grays = 256;
769 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 964 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770 965
771 memset (bitmap.buffer, 0, w * h); 966 memset (bitmap.buffer, 0, w * h);
772 967
773 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);
774 969
775 EXTEND (SP, 3); 970 EXTEND (SP, 5);
776 PUSHs (sv_2mortal (newSViv (w))); 971 PUSHs (sv_2mortal (newSViv (w)));
777 PUSHs (sv_2mortal (newSViv (h))); 972 PUSHs (sv_2mortal (newSViv (h)));
778 PUSHs (sv_2mortal (retval)); 973 PUSHs (sv_2mortal (retval));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 }
779} 977}
780 978
781MODULE = CFClient PACKAGE = CFClient::Texture 979MODULE = CFClient PACKAGE = CFClient::Texture
782 980
783void 981void
784draw_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)
785 PROTOTYPE: $$$;$$ 983 PROTOTYPE: $$$;$$
984 ALIAS:
985 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2
786 CODE: 987 CODE:
787{ 988{
788 HV *hv = (HV *)SvRV (self); 989 HV *hv = (HV *)SvRV (self);
789 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 990 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 991 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
795 { 996 {
796 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 997 w = SvNV (*hv_fetch (hv, "w", 1, 1));
797 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 998 h = SvNV (*hv_fetch (hv, "h", 1, 1));
798 } 999 }
799 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
800 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
1010
801 if (wrap_mode) { 1011 if (wrap_mode)
1012 {
802 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); 1013 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); 1014 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804 } 1015 }
1016
805 glBegin (GL_QUADS); 1017 glBegin (GL_QUADS);
806 glTexCoord2f (0, 0); glVertex2f (x , y ); 1018 glTexCoord2f (0, 0); glVertex2f (x , y );
807 glTexCoord2f (0, t); glVertex2f (x , y + h); 1019 glTexCoord2f (0, t); glVertex2f (x , y + h);
808 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
810 glEnd (); 1022 glEnd ();
1023
1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND);
1028 }
811} 1029}
812 1030
813MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
814 1032
815CFClient::Map 1033CFClient::Map
1324 } *civ, const_iv[] = { 1542 } *civ, const_iv[] = {
1325# define const_iv(name) { # name, (IV)name } 1543# define const_iv(name) { # name, (IV)name }
1326 const_iv (GL_COLOR_MATERIAL), 1544 const_iv (GL_COLOR_MATERIAL),
1327 const_iv (GL_SMOOTH), 1545 const_iv (GL_SMOOTH),
1328 const_iv (GL_FLAT), 1546 const_iv (GL_FLAT),
1547 const_iv (GL_DITHER),
1329 const_iv (GL_BLEND), 1548 const_iv (GL_BLEND),
1549 const_iv (GL_CULL_FACE),
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),
1330 const_iv (GL_AND), 1555 const_iv (GL_AND),
1556 const_iv (GL_ONE),
1557 const_iv (GL_ZERO),
1331 const_iv (GL_SRC_ALPHA), 1558 const_iv (GL_SRC_ALPHA),
1559 const_iv (GL_SRC_ALPHA_SATURATE),
1332 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1560 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561 const_iv (GL_ONE_MINUS_DST_ALPHA),
1333 const_iv (GL_RGB), 1562 const_iv (GL_RGB),
1334 const_iv (GL_RGBA), 1563 const_iv (GL_RGBA),
1335 const_iv (GL_UNSIGNED_BYTE), 1564 const_iv (GL_UNSIGNED_BYTE),
1336 const_iv (GL_ALPHA4), 1565 const_iv (GL_UNSIGNED_SHORT),
1566 const_iv (GL_UNSIGNED_INT),
1337 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),
1338 const_iv (GL_FLOAT), 1571 const_iv (GL_FLOAT),
1339 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1572 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340 const_iv (GL_COMPILE), 1573 const_iv (GL_COMPILE),
1341 const_iv (GL_TEXTURE_1D), 1574 const_iv (GL_TEXTURE_1D),
1342 const_iv (GL_TEXTURE_2D), 1575 const_iv (GL_TEXTURE_2D),
1353 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1586 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1587 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1588 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1589 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357 const_iv (GL_GENERATE_MIPMAP), 1590 const_iv (GL_GENERATE_MIPMAP),
1358 const_iv (GL_LINEAR),
1359 const_iv (GL_MODULATE), 1591 const_iv (GL_MODULATE),
1592 const_iv (GL_DECAL),
1360 const_iv (GL_REPLACE), 1593 const_iv (GL_REPLACE),
1594 const_iv (GL_DEPTH_BUFFER_BIT),
1361 const_iv (GL_COLOR_BUFFER_BIT), 1595 const_iv (GL_COLOR_BUFFER_BIT),
1362 const_iv (GL_PROJECTION), 1596 const_iv (GL_PROJECTION),
1363 const_iv (GL_MODELVIEW), 1597 const_iv (GL_MODELVIEW),
1364 const_iv (GL_COLOR_LOGIC_OP), 1598 const_iv (GL_COLOR_LOGIC_OP),
1599 const_iv (GL_SEPARABLE_2D),
1365 const_iv (GL_CONVOLUTION_2D), 1600 const_iv (GL_CONVOLUTION_2D),
1366 const_iv (GL_CONVOLUTION_BORDER_MODE), 1601 const_iv (GL_CONVOLUTION_BORDER_MODE),
1367 const_iv (GL_CONSTANT_BORDER), 1602 const_iv (GL_CONSTANT_BORDER),
1368 const_iv (GL_LINES), 1603 const_iv (GL_LINES),
1604 const_iv (GL_LINE_LOOP),
1369 const_iv (GL_QUADS), 1605 const_iv (GL_QUADS),
1370 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),
1371 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1610 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1372 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),
1373# undef const_iv 1616# undef const_iv
1374 }; 1617 };
1375 1618
1376 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; )
1377 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1392 1635
1393void glHint (int target, int mode) 1636void glHint (int target, int mode)
1394 1637
1395void glBlendFunc (int sfactor, int dfactor) 1638void glBlendFunc (int sfactor, int dfactor)
1396 1639
1640void glDepthMask (int flag)
1641
1397void glLogicOp (int opcode) 1642void glLogicOp (int opcode)
1398 1643
1644void glColorMask (int red, int green, int blue, int alpha)
1645
1399void glMatrixMode (int mode) 1646void glMatrixMode (int mode)
1400 1647
1401void glPushMatrix () 1648void glPushMatrix ()
1402 1649
1403void glPopMatrix () 1650void glPopMatrix ()
1404 1651
1405void glLoadIdentity () 1652void glLoadIdentity ()
1406 1653
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
1407void 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_)
1408 1659
1409void glViewport (int x, int y, int width, int height) 1660void glViewport (int x, int y, int width, int height)
1661
1662void glScissor (int x, int y, int width, int height)
1410 1663
1411void glTranslate (float x, float y, float z = 0.) 1664void glTranslate (float x, float y, float z = 0.)
1412 CODE: 1665 CODE:
1413 glTranslatef (x, y, z); 1666 glTranslatef (x, y, z);
1414 1667
1415void glScale (float x, float y, float z) 1668void glScale (float x, float y, float z = 1.)
1416 CODE: 1669 CODE:
1417 glScalef (x, y, z); 1670 glScalef (x, y, z);
1418 1671
1419void glRotate (float angle, float x, float y, float z) 1672void glRotate (float angle, float x, float y, float z)
1420 CODE: 1673 CODE:
1425void glEnd () 1678void glEnd ()
1426 1679
1427void glColor (float r, float g, float b, float a = 1.0) 1680void glColor (float r, float g, float b, float a = 1.0)
1428 PROTOTYPE: @ 1681 PROTOTYPE: @
1429 CODE: 1682 CODE:
1430 glColor4f (r, g, b, a); 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);
1431 1699
1432void glVertex (float x, float y, float z = 0.) 1700void glVertex (float x, float y, float z = 0.)
1433 CODE: 1701 CODE:
1434 glVertex3f (x, y, z); 1702 glVertex3f (x, y, z);
1435 1703
1447 1715
1448void glBindTexture (int target, int name) 1716void glBindTexture (int target, int name)
1449 1717
1450void glConvolutionParameter (int target, int pname, float params) 1718void glConvolutionParameter (int target, int pname, float params)
1451 CODE: 1719 CODE:
1452 glConvolutionParameterf (target, pname, params); 1720 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1453 1721
1454void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1722void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723 CODE:
1724 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1725 (target, internalformat, width, height, format, type, data));
1726
1727void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1728 CODE:
1729 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1730 (target, internalformat, width, height, format, type, row, column));
1455 1731
1456void 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)
1457 1733
1458void 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)
1735
1736void glDrawPixels (int width, int height, int format, int type, char *pixels)
1737
1738void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459 1739
1460int glGenTexture () 1740int glGenTexture ()
1461 CODE: 1741 CODE:
1462{ 1742{
1463 GLuint name; 1743 GLuint name;
1488 1768
1489void glEndList () 1769void glEndList ()
1490 1770
1491void glCallList (int list) 1771void glCallList (int list)
1492 1772
1773

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines