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.120 by root, Sun Jun 18 19:13:19 2006 UTC vs.
Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
5# pragma warning(disable:4244) 6# pragma warning(disable:4244)
6#endif 7#endif
7 8
8#include "EXTERN.h" 9#include "EXTERN.h"
9#include "perl.h" 10#include "perl.h"
10#include "XSUB.h" 11#include "XSUB.h"
11 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
12#include <math.h> 17#include <math.h>
13#include <string.h> 18#include <string.h>
14#include <stdio.h> 19#include <stdio.h>
15#include <stdlib.h> 20#include <stdlib.h>
16 21
18#include <SDL_endian.h> 23#include <SDL_endian.h>
19#include <SDL_image.h> 24#include <SDL_image.h>
20#include <SDL_mixer.h> 25#include <SDL_mixer.h>
21#include <SDL_opengl.h> 26#include <SDL_opengl.h>
22 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
23#include <glib/gmacros.h> 31#include <glib/gmacros.h>
24 32
25#include <pango/pango.h> 33#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 34
30#ifndef _WIN32 35#ifndef _WIN32
31# include <sys/types.h> 36# include <sys/types.h>
32# include <sys/socket.h> 37# include <sys/socket.h>
33# include <netinet/in.h> 38# include <netinet/in.h>
40 typedef signed char int8_t; 45 typedef signed char int8_t;
41 typedef signed short int16_t; 46 typedef signed short int16_t;
42 typedef signed int int32_t; 47 typedef signed int int32_t;
43#endif 48#endif
44 49
45#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46 51
47#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
48 53
49#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
51 56
52#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
58
59#if 0
60# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else
62# define PARACHUTE 0
63#endif
53 64
54static struct 65static struct
55{ 66{
56#define GL_FUNC(ptr,name) ptr name; 67#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 68#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 78 else
68 glBlendFunc (sa, da); 79 glBlendFunc (sa, da);
69} 80}
70 81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
71typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
73 90
74typedef PangoFontDescription *CFClient__Font; 91typedef PangoFontDescription *CFPlus__Font;
92
93static int
94shape_attr_p (PangoLayoutRun *run)
95{
96 GSList *attrs = run->item->analysis.extra_attrs;
97
98 while (attrs)
99 {
100 PangoAttribute *attr = attrs->data;
101
102 if (attr->klass->type == PANGO_ATTR_SHAPE)
103 return 1;
104
105 attrs = attrs->next;
106 }
107
108 return 0;
109}
75 110
76typedef struct cf_layout { 111typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
80 int base_height; 114 int base_height;
81 CFClient__Font font; 115 CFPlus__Font font;
82} *CFClient__Layout; 116} *CFPlus__Layout;
83 117
84static CFClient__Font default_font; 118static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
87 121
88static void 122static void
89substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
90{ 124{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 126#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 128#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 130}
101 131
102static void 132static void
103layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
104{ 134{
105 /* use a random scale factor to account for unknown descenders, 0.8 works 135 /* use a random scale factor to account for unknown descenders, 0.8 works
106 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
107 */ 137 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
112 142
113 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
114} 144}
115 145
116static void 146static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
120 153
121 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 156
124 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
125} 162}
126 163
127typedef uint16_t mapface; 164typedef uint16_t mapface;
128 165
129typedef struct { 166typedef struct {
152 int texs; 189 int texs;
153 maptex *tex; 190 maptex *tex;
154 191
155 int32_t rows; 192 int32_t rows;
156 maprow *row; 193 maprow *row;
157} *CFClient__Map; 194} *CFPlus__Map;
158 195
159static char * 196static char *
160prepend (char *ptr, int sze, int inc) 197prepend (char *ptr, int sze, int inc)
161{ 198{
162 char *p; 199 char *p;
180 217
181#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 218#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183 220
184static maprow * 221static maprow *
185map_get_row (CFClient__Map self, int y) 222map_get_row (CFPlus__Map self, int y)
186{ 223{
187 if (0 > y) 224 if (0 > y)
188 { 225 {
189 int extend = - y + MAP_EXTEND_Y; 226 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 227 Prepend (maprow, self->row, self->rows, extend);
228 265
229 return row->col + (x - row->c0); 266 return row->col + (x - row->c0);
230} 267}
231 268
232static mapcell * 269static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 270map_get_cell (CFPlus__Map self, int x, int y)
234{ 271{
235 return row_get_cell (map_get_row (self, y), x); 272 return row_get_cell (map_get_row (self, y), x);
236} 273}
237 274
238static void 275static void
239map_clear (CFClient__Map self) 276map_clear (CFPlus__Map self)
240{ 277{
241 int r; 278 int r;
242 279
243 for (r = 0; r < self->rows; r++) 280 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 281 Safefree (self->row[r].col);
252 self->row = 0; 289 self->row = 0;
253 self->rows = 0; 290 self->rows = 0;
254} 291}
255 292
256static void 293static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 294map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 295{
259 int x, y; 296 int x, y;
260 maprow *row; 297 maprow *row;
261 298
262 for (y = y0; y < y0 + h; y++) 299 for (y = y0; y < y0 + h; y++)
319 n |= n >> 16; 356 n |= n >> 16;
320 357
321 return n + 1; 358 return n + 1;
322} 359}
323 360
324MODULE = CFClient PACKAGE = CFClient 361MODULE = CFPlus PACKAGE = CFPlus
325 362
326PROTOTYPES: ENABLE 363PROTOTYPES: ENABLE
327 364
328BOOT: 365BOOT:
329{ 366{
330 HV *stash = gv_stashpv ("CFClient", 1); 367 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 368 static const struct {
332 const char *name; 369 const char *name;
333 IV iv; 370 IV iv;
334 } *civ, const_iv[] = { 371 } *civ, const_iv[] = {
335# define const_iv(name) { # name, (IV)name } 372# define const_iv(name) { # name, (IV)name }
436 473
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 474 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 475 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439} 476}
440 477
478int
479in_destruct ()
480 CODE:
481 RETVAL = PL_main_cv == Nullcv;
482 OUTPUT:
483 RETVAL
484
441NV floor (NV x) 485NV floor (NV x)
442 486
443NV ceil (NV x) 487NV ceil (NV x)
444 488
445void 489void
446pango_init () 490pango_init ()
447 CODE: 491 CODE:
448 // delayed, so it can pick up new fonts added by AddFontResourceEx
449{ 492{
450 {
451 ft2_fontmap = pango_ft2_font_map_new (); 493 opengl_fontmap = pango_opengl_font_map_new ();
452 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 494 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 495 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454 }
455 {
456 cairo_font_options_t *fopt = cairo_font_options_create ();
457 cairo_fontmap = pango_cairo_font_map_get_default ();
458 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459#ifdef _WIN32
460 // cairo looks like shit eaten twice on windows
461 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462#else
463 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464#endif
465 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467 pango_cairo_context_set_font_options (cairo_context, fopt);
468 cairo_font_options_destroy (fopt);
469 }
470} 496}
471 497
472int 498int
473SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 499SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
474 500
475void 501void
476SDL_Quit () 502SDL_Quit ()
477 503
478void 504void
493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496 522
497 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 523 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
524#if SDL_VERSION_ATLEAST(1,2,10)
525 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
526 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
527#endif
498 528
499 SDL_EnableUNICODE (1); 529 SDL_EnableUNICODE (1);
500 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 530 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501 531
502 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 532 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
589 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 619 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 620 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591 break; 621 break;
592 } 622 }
593 623
594 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 624 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595 } 625 }
596} 626}
597 627
598int 628int
599Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 629Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
615#endif 645#endif
616 646
617void 647void
618add_font (char *file) 648add_font (char *file)
619 CODE: 649 CODE:
620 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 650 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621#ifdef _WIN32
622 // cairo... sigh... requires win2000
623 AddFontResourceEx (file, FR_PRIVATE, 0);
624#endif
625 651
626void 652void
627load_image_inline (SV *image_) 653load_image_inline (SV *image_)
628 ALIAS: 654 ALIAS:
629 load_image_file = 1 655 load_image_file = 1
671 697
672 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 698 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673 699
674 assert (surface2->pitch == surface2->w * 4); 700 assert (surface2->pitch == surface2->w * 4);
675 701
702 SDL_LockSurface (surface2);
676 EXTEND (SP, 5); 703 EXTEND (SP, 6);
677 PUSHs (sv_2mortal (newSViv (surface2->w))); 704 PUSHs (sv_2mortal (newSViv (surface2->w)));
678 PUSHs (sv_2mortal (newSViv (surface2->h))); 705 PUSHs (sv_2mortal (newSViv (surface2->h)));
679 SDL_LockSurface (surface2);
680 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 706 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681 SDL_UnlockSurface (surface2);
682 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 707 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 708 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 709 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
710 SDL_UnlockSurface (surface2);
685 711
686 SDL_FreeSurface (surface); 712 SDL_FreeSurface (surface);
687 SDL_FreeSurface (surface2); 713 SDL_FreeSurface (surface2);
688} 714}
689 715
732void 758void
733_exit (int retval) 759_exit (int retval)
734 CODE: 760 CODE:
735 _exit (retval); 761 _exit (retval);
736 762
737MODULE = CFClient PACKAGE = CFClient::Font 763MODULE = CFPlus PACKAGE = CFPlus::Font
738 764
739CFClient::Font 765CFPlus::Font
740new_from_file (SV *class, char *path, int id = 0) 766new_from_file (SV *class, char *path, int id = 0)
741 CODE: 767 CODE:
742{ 768{
743 int count; 769 int count;
744 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 770 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
747} 773}
748 OUTPUT: 774 OUTPUT:
749 RETVAL 775 RETVAL
750 776
751void 777void
752DESTROY (CFClient::Font self) 778DESTROY (CFPlus::Font self)
753 CODE: 779 CODE:
754 pango_font_description_free (self); 780 pango_font_description_free (self);
755 781
756void 782void
757make_default (CFClient::Font self) 783make_default (CFPlus::Font self)
758 CODE: 784 CODE:
759 default_font = self; 785 default_font = self;
760 786
761MODULE = CFClient PACKAGE = CFClient::Layout 787MODULE = CFPlus PACKAGE = CFPlus::Layout
762 788
763CFClient::Layout 789void
764new (SV *class, int rgba = 0) 790reset_glyph_cache ()
791 CODE:
792 tc_clear ();
793
794CFPlus::Layout
795new (SV *class)
765 CODE: 796 CODE:
766 New (0, RETVAL, 1, struct cf_layout); 797 New (0, RETVAL, 1, struct cf_layout);
767 798
768 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 799 RETVAL->pl = pango_layout_new (opengl_context);
769 RETVAL->rgba = rgba;
770 RETVAL->r = 1.; 800 RETVAL->r = 1.;
771 RETVAL->g = 1.; 801 RETVAL->g = 1.;
772 RETVAL->b = 1.; 802 RETVAL->b = 1.;
773 RETVAL->a = 1.; 803 RETVAL->a = 1.;
774 RETVAL->base_height = MIN_FONT_HEIGHT; 804 RETVAL->base_height = MIN_FONT_HEIGHT;
778 layout_update_font (RETVAL); 808 layout_update_font (RETVAL);
779 OUTPUT: 809 OUTPUT:
780 RETVAL 810 RETVAL
781 811
782void 812void
783DESTROY (CFClient::Layout self) 813DESTROY (CFPlus::Layout self)
784 CODE: 814 CODE:
785 g_object_unref (self->pl); 815 g_object_unref (self->pl);
786 Safefree (self); 816 Safefree (self);
787 817
788int
789is_rgba (CFClient::Layout self)
790 CODE:
791 RETVAL = self->rgba;
792 OUTPUT:
793 RETVAL
794
795void 818void
796set_text (CFClient::Layout self, SV *text_) 819set_text (CFPlus::Layout self, SV *text_)
797 CODE: 820 CODE:
798{ 821{
799 STRLEN textlen; 822 STRLEN textlen;
800 char *text = SvPVutf8 (text_, textlen); 823 char *text = SvPVutf8 (text_, textlen);
801 824
802 pango_layout_set_text (self->pl, text, textlen); 825 pango_layout_set_text (self->pl, text, textlen);
803} 826}
804 827
805void 828void
806set_markup (CFClient::Layout self, SV *text_) 829set_markup (CFPlus::Layout self, SV *text_)
807 CODE: 830 CODE:
808{ 831{
809 STRLEN textlen; 832 STRLEN textlen;
810 char *text = SvPVutf8 (text_, textlen); 833 char *text = SvPVutf8 (text_, textlen);
811 834
812 pango_layout_set_markup (self->pl, text, textlen); 835 pango_layout_set_markup (self->pl, text, textlen);
813} 836}
814 837
838void
839set_shapes (CFPlus::Layout self, ...)
840 CODE:
841{
842 PangoAttrList *attrs = 0;
843 const char *text = pango_layout_get_text (self->pl);
844 const char *pos = text;
845 int arg = 4;
846
847 while (arg < items && (pos = strstr (pos, OBJ_STR)))
848 {
849 PangoRectangle inkrect, rect;
850 PangoAttribute *attr;
851
852 int x = SvIV (ST (arg - 3));
853 int y = SvIV (ST (arg - 2));
854 int w = SvIV (ST (arg - 1));
855 int h = SvIV (ST (arg ));
856
857 inkrect.x = 0;
858 inkrect.y = 0;
859 inkrect.width = 0;
860 inkrect.height = 0;
861
862 rect.x = x * PANGO_SCALE;
863 rect.y = y * PANGO_SCALE;
864 rect.width = w * PANGO_SCALE;
865 rect.height = h * PANGO_SCALE;
866
867 if (!attrs)
868 attrs = pango_layout_get_attributes (self->pl);
869
870 attr = pango_attr_shape_new (&inkrect, &rect);
871 attr->start_index = pos - text;
872 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
873 pango_attr_list_insert (attrs, attr);
874
875 arg += 4;
876 pos += sizeof (OBJ_STR) - 1;
877 }
878
879 if (attrs)
880 pango_layout_set_attributes (self->pl, attrs);
881}
882
883void
884get_shapes (CFPlus::Layout self)
885 PPCODE:
886{
887 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
888
889 do
890 {
891 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
892
893 if (run && shape_attr_p (run))
894 {
895 PangoRectangle extents;
896 pango_layout_iter_get_run_extents (iter, 0, &extents);
897
898 EXTEND (SP, 2);
899 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
901 }
902 }
903 while (pango_layout_iter_next_run (iter));
904
905 pango_layout_iter_free (iter);
906}
907
908int
909has_wrapped (CFPlus::Layout self)
910 CODE:
911{
912 int lines = 1;
913 const char *text = pango_layout_get_text (self->pl);
914
915 while (*text)
916 lines += *text++ == '\n';
917
918 RETVAL = lines < pango_layout_get_line_count (self->pl);
919}
920 OUTPUT:
921 RETVAL
922
815SV * 923SV *
816get_text (CFClient::Layout self) 924get_text (CFPlus::Layout self)
817 CODE: 925 CODE:
818 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 926 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819 sv_utf8_decode (RETVAL); 927 sv_utf8_decode (RETVAL);
820 OUTPUT: 928 OUTPUT:
821 RETVAL 929 RETVAL
822 930
823void 931void
824set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 932set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825 CODE: 933 CODE:
826 self->r = r; 934 self->r = r;
827 self->g = g; 935 self->g = g;
828 self->b = b; 936 self->b = b;
829 self->a = a; 937 self->a = a;
830 938
831void 939void
832set_font (CFClient::Layout self, CFClient::Font font = 0) 940set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833 CODE: 941 CODE:
834 if (self->font != font) 942 if (self->font != font)
835 { 943 {
836 self->font = font; 944 self->font = font;
837 layout_update_font (self); 945 layout_update_font (self);
838 } 946 }
839 947
840void 948void
841set_height (CFClient::Layout self, int base_height) 949set_height (CFPlus::Layout self, int base_height)
842 CODE: 950 CODE:
843 if (self->base_height != base_height) 951 if (self->base_height != base_height)
844 { 952 {
845 self->base_height = base_height; 953 self->base_height = base_height;
846 layout_update_font (self); 954 layout_update_font (self);
847 } 955 }
848 956
849void 957void
850set_width (CFClient::Layout self, int max_width = -1) 958set_width (CFPlus::Layout self, int max_width = -1)
851 CODE: 959 CODE:
852 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 960 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853 961
854void 962void
855set_indent (CFClient::Layout self, int indent) 963set_indent (CFPlus::Layout self, int indent)
856 CODE: 964 CODE:
857 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 965 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858 966
859void 967void
860set_spacing (CFClient::Layout self, int spacing) 968set_spacing (CFPlus::Layout self, int spacing)
861 CODE: 969 CODE:
862 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 970 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863 971
864void 972void
865set_ellipsise (CFClient::Layout self, int ellipsise) 973set_ellipsise (CFPlus::Layout self, int ellipsise)
866 CODE: 974 CODE:
867 pango_layout_set_ellipsize (self->pl, 975 pango_layout_set_ellipsize (self->pl,
868 ellipsise == 1 ? PANGO_ELLIPSIZE_START 976 ellipsise == 1 ? PANGO_ELLIPSIZE_START
869 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 977 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 978 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
871 : PANGO_ELLIPSIZE_NONE 979 : PANGO_ELLIPSIZE_NONE
872 ); 980 );
873 981
874void 982void
875set_single_paragraph_mode (CFClient::Layout self, int spm) 983set_single_paragraph_mode (CFPlus::Layout self, int spm)
876 CODE: 984 CODE:
877 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 985 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878 986
879void 987void
880size (CFClient::Layout self) 988size (CFPlus::Layout self)
881 PPCODE: 989 PPCODE:
882{ 990{
883 int w, h; 991 int w, h;
884 992
885 layout_get_pixel_size (self, &w, &h); 993 layout_get_pixel_size (self, &w, &h);
888 PUSHs (sv_2mortal (newSViv (w))); 996 PUSHs (sv_2mortal (newSViv (w)));
889 PUSHs (sv_2mortal (newSViv (h))); 997 PUSHs (sv_2mortal (newSViv (h)));
890} 998}
891 999
892int 1000int
1001descent (CFPlus::Layout self)
1002 CODE:
1003{
1004 PangoRectangle rect;
1005 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1006 pango_layout_line_get_pixel_extents (line, 0, &rect);
1007 RETVAL = PANGO_DESCENT (rect);
1008}
1009 OUTPUT:
1010 RETVAL
1011
1012int
893xy_to_index (CFClient::Layout self, int x, int y) 1013xy_to_index (CFPlus::Layout self, int x, int y)
894 CODE: 1014 CODE:
895{ 1015{
896 int index, trailing; 1016 int index, trailing;
897 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1017 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898 RETVAL = index; 1018 RETVAL = index;
899} 1019}
900 OUTPUT: 1020 OUTPUT:
901 RETVAL 1021 RETVAL
902 1022
903void 1023void
904cursor_pos (CFClient::Layout self, int index) 1024cursor_pos (CFPlus::Layout self, int index)
905 PPCODE: 1025 PPCODE:
906{ 1026{
907 PangoRectangle strong_pos; 1027 PangoRectangle strong_pos;
908 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1028 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909 1029
912 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1032 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914} 1034}
915 1035
916void 1036void
917render (CFClient::Layout self) 1037render (CFPlus::Layout self, float x, float y, int flags = 0)
918 PPCODE: 1038 PPCODE:
919{ 1039 pango_opengl_render_layout_subpixel (
920 SV *retval; 1040 self->pl,
921 int w, h; 1041 x * PANGO_SCALE, y * PANGO_SCALE,
922 1042 self->r, self->g, self->b, self->a,
923 layout_get_pixel_size (self, &w, &h);
924
925 if (self->rgba)
926 { 1043 flags
927 cairo_surface_t *surface;
928 cairo_t *cairo;
929
930 retval = newSV (w * h * 4);
931 SvPOK_only (retval);
932 SvCUR_set (retval, w * h * 4);
933
934 memset (SvPVX (retval), 0, w * h * 4);
935
936 surface = cairo_image_surface_create_for_data (
937 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
938 cairo = cairo_create (surface);
939 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941 pango_cairo_show_layout (cairo, self->pl);
942
943 cairo_destroy (cairo);
944 cairo_surface_destroy (surface);
945
946 // what a mess, and its premultiplied, too :(
947 {
948 uint32_t *p = (uint32_t *)SvPVX (retval);
949 uint32_t *e = p + w * h;
950
951 while (p < e)
952 {
953 uint32_t rgba = *p;
954 rgba = (rgba >> 24) | (rgba << 8);
955#if 0
956#ifdef _WIN32
957 {//D
958 uint8_t r = rgba >> 24;
959 uint8_t g = rgba >> 16;
960 uint8_t b = rgba >> 8;
961 uint8_t a = rgba >> 0;
962
963 rgba = (rgba & 0xffffff00) | a;
964 }
965#endif
966#endif
967 rgba = SDL_SwapBE32 (rgba);
968 *p++ = rgba;
969 }
970 }
971
972 EXTEND (SP, 5);
973 PUSHs (sv_2mortal (newSViv (w)));
974 PUSHs (sv_2mortal (newSViv (h)));
975 PUSHs (sv_2mortal (retval));
976 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978 } 1044 );
979 else
980 {
981 FT_Bitmap bitmap;
982 1045
983 retval = newSV (w * h);
984 SvPOK_only (retval);
985 SvCUR_set (retval, w * h);
986
987 bitmap.rows = h;
988 bitmap.width = w;
989 bitmap.pitch = w;
990 bitmap.buffer = (unsigned char*)SvPVX (retval);
991 bitmap.num_grays = 256;
992 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994 memset (bitmap.buffer, 0, w * h);
995
996 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998 EXTEND (SP, 5);
999 PUSHs (sv_2mortal (newSViv (w)));
1000 PUSHs (sv_2mortal (newSViv (h)));
1001 PUSHs (sv_2mortal (retval));
1002 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004 }
1005}
1006
1007MODULE = CFClient PACKAGE = CFClient::Texture 1046MODULE = CFPlus PACKAGE = CFPlus::Texture
1008 1047
1009void 1048void
1010pad2pot (SV *data_, SV *w_, SV *h_) 1049pad2pot (SV *data_, SV *w_, SV *h_)
1011 CODE: 1050 CODE:
1012{ 1051{
1090 glDisable (GL_ALPHA_TEST); 1129 glDisable (GL_ALPHA_TEST);
1091 glDisable (GL_BLEND); 1130 glDisable (GL_BLEND);
1092 } 1131 }
1093} 1132}
1094 1133
1095MODULE = CFClient PACKAGE = CFClient::Map 1134MODULE = CFPlus PACKAGE = CFPlus::Map
1096 1135
1097CFClient::Map 1136CFPlus::Map
1098new (SV *class, int map_width, int map_height) 1137new (SV *class, int map_width, int map_height)
1099 CODE: 1138 CODE:
1100 New (0, RETVAL, 1, struct map); 1139 New (0, RETVAL, 1, struct map);
1101 RETVAL->x = 0; 1140 RETVAL->x = 0;
1102 RETVAL->y = 0; 1141 RETVAL->y = 0;
1112 RETVAL->row = 0; 1151 RETVAL->row = 0;
1113 OUTPUT: 1152 OUTPUT:
1114 RETVAL 1153 RETVAL
1115 1154
1116void 1155void
1117DESTROY (CFClient::Map self) 1156DESTROY (CFPlus::Map self)
1118 CODE: 1157 CODE:
1119{ 1158{
1120 map_clear (self); 1159 map_clear (self);
1121 Safefree (self->face); 1160 Safefree (self->face);
1122 Safefree (self->tex); 1161 Safefree (self->tex);
1123 Safefree (self); 1162 Safefree (self);
1124} 1163}
1125 1164
1126void 1165void
1127clear (CFClient::Map self) 1166clear (CFPlus::Map self)
1128 CODE: 1167 CODE:
1129 map_clear (self); 1168 map_clear (self);
1130 1169
1131void 1170void
1132set_face (CFClient::Map self, int face, int texid) 1171set_face (CFPlus::Map self, int face, int texid)
1133 CODE: 1172 CODE:
1134{ 1173{
1135 while (self->faces <= face) 1174 while (self->faces <= face)
1136 { 1175 {
1137 Append (mapface, self->face, self->faces, self->faces); 1176 Append (mapface, self->face, self->faces, self->faces);
1140 1179
1141 self->face [face] = texid; 1180 self->face [face] = texid;
1142} 1181}
1143 1182
1144void 1183void
1145set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1184set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1146 CODE: 1185 CODE:
1147{ 1186{
1148 while (self->texs <= texid) 1187 while (self->texs <= texid)
1149 { 1188 {
1150 Append (maptex, self->tex, self->texs, self->texs); 1189 Append (maptex, self->tex, self->texs, self->texs);
1174 // from transparent color bleeding and ugly wrapping effects. 1213 // from transparent color bleeding and ugly wrapping effects.
1175 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1214 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176} 1215}
1177 1216
1178int 1217int
1179ox (CFClient::Map self) 1218ox (CFPlus::Map self)
1180 ALIAS: 1219 ALIAS:
1181 oy = 1 1220 oy = 1
1182 x = 2 1221 x = 2
1183 y = 3 1222 y = 3
1184 w = 4 1223 w = 4
1195 } 1234 }
1196 OUTPUT: 1235 OUTPUT:
1197 RETVAL 1236 RETVAL
1198 1237
1199void 1238void
1200scroll (CFClient::Map self, int dx, int dy) 1239scroll (CFPlus::Map self, int dx, int dy)
1201 CODE: 1240 CODE:
1202{ 1241{
1203 if (dx > 0) 1242 if (dx > 0)
1204 map_blank (self, self->x, self->y, dx - 1, self->h); 1243 map_blank (self, self->x, self->y, dx - 1, self->h);
1205 else if (dx < 0) 1244 else if (dx < 0)
1221 self->y += MAP_EXTEND_Y; 1260 self->y += MAP_EXTEND_Y;
1222 } 1261 }
1223} 1262}
1224 1263
1225void 1264void
1226map1a_update (CFClient::Map self, SV *data_) 1265map1a_update (CFPlus::Map self, SV *data_)
1227 CODE: 1266 CODE:
1228{ 1267{
1229 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1268 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1230 uint8_t *data_end = (uint8_t *)SvEND (data_); 1269 uint8_t *data_end = (uint8_t *)SvEND (data_);
1231 mapcell *cell; 1270 mapcell *cell;
1273 cell->darkness = -1; 1312 cell->darkness = -1;
1274 } 1313 }
1275} 1314}
1276 1315
1277SV * 1316SV *
1278mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1317mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279 CODE: 1318 CODE:
1280{ 1319{
1281 int x1, x; 1320 int x1, x;
1282 int y1, y; 1321 int y1, y;
1283 int z; 1322 int z;
1333} 1372}
1334 OUTPUT: 1373 OUTPUT:
1335 RETVAL 1374 RETVAL
1336 1375
1337void 1376void
1338draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1377draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1339 CODE: 1378 CODE:
1340{ 1379{
1341 int vx, vy; 1380 int vx, vy;
1342 int x, y, z; 1381 int x, y, z;
1343 int last_name; 1382 int last_name;
1408 glDisable (GL_TEXTURE_2D); 1447 glDisable (GL_TEXTURE_2D);
1409 glDisable (GL_BLEND); 1448 glDisable (GL_BLEND);
1410} 1449}
1411 1450
1412void 1451void
1413draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1452draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414 CODE: 1453 CODE:
1415{ 1454{
1416 static float color[16][3] = { 1455 static float color[16][3] = {
1417 { 0.00, 0.00, 0.00 }, 1456 { 0.00F, 0.00F, 0.00F },
1418 { 1.00, 1.00, 1.00 }, 1457 { 1.00F, 1.00F, 1.00F },
1419 { 0.00, 0.00, 0.55 }, 1458 { 0.00F, 0.00F, 0.55F },
1420 { 1.00, 0.00, 0.00 }, 1459 { 1.00F, 0.00F, 0.00F },
1421 1460
1422 { 1.00, 0.54, 0.00 }, 1461 { 1.00F, 0.54F, 0.00F },
1423 { 0.11, 0.56, 1.00 }, 1462 { 0.11F, 0.56F, 1.00F },
1424 { 0.93, 0.46, 0.00 }, 1463 { 0.93F, 0.46F, 0.00F },
1425 { 0.18, 0.54, 0.34 }, 1464 { 0.18F, 0.54F, 0.34F },
1426 1465
1427 { 0.56, 0.73, 0.56 }, 1466 { 0.56F, 0.73F, 0.56F },
1428 { 0.80, 0.80, 0.80 }, 1467 { 0.80F, 0.80F, 0.80F },
1429 { 0.55, 0.41, 0.13 }, 1468 { 0.55F, 0.41F, 0.13F },
1430 { 0.99, 0.77, 0.26 }, 1469 { 0.99F, 0.77F, 0.26F },
1431 1470
1432 { 0.74, 0.65, 0.41 }, 1471 { 0.74F, 0.65F, 0.41F },
1433 1472
1434 { 0.00, 1.00, 1.00 }, 1473 { 0.00F, 1.00F, 1.00F },
1435 { 1.00, 0.00, 1.00 }, 1474 { 1.00F, 0.00F, 1.00F },
1436 { 1.00, 1.00, 0.00 }, 1475 { 1.00F, 1.00F, 0.00F },
1437 }; 1476 };
1438 1477
1439 int x, y; 1478 int x, y;
1440 1479
1441 glEnable (GL_TEXTURE_2D); 1480 glEnable (GL_TEXTURE_2D);
1468 glDisable (GL_BLEND); 1507 glDisable (GL_BLEND);
1469 glDisable (GL_TEXTURE_2D); 1508 glDisable (GL_TEXTURE_2D);
1470} 1509}
1471 1510
1472void 1511void
1473fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1512fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1474 PPCODE: 1513 PPCODE:
1475{ 1514{
1476 int vx, vy; 1515 int vx, vy;
1477 int x, y; 1516 int x, y;
1478 int sw4 = (sw + 3) & ~3; 1517 int sw4 = (sw + 3) & ~3;
1507 PUSHs (sv_2mortal (newSViv (sh))); 1546 PUSHs (sv_2mortal (newSViv (sh)));
1508 PUSHs (darkness_sv); 1547 PUSHs (darkness_sv);
1509} 1548}
1510 1549
1511SV * 1550SV *
1512get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1551get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513 CODE: 1552 CODE:
1514{ 1553{
1515 int x, y, x1, y1; 1554 int x, y, x1, y1;
1516 SV *data_sv = newSV (w * h * 7 + 5); 1555 SV *data_sv = newSV (w * h * 7 + 5);
1517 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1556 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1579} 1618}
1580 OUTPUT: 1619 OUTPUT:
1581 RETVAL 1620 RETVAL
1582 1621
1583void 1622void
1584set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1623set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585 PPCODE: 1624 PPCODE:
1586{ 1625{
1587 int x, y, z; 1626 int x, y, z;
1588 int w, h; 1627 int w, h;
1589 int x1, y1; 1628 int x1, y1;
1638 } 1677 }
1639 } 1678 }
1640 } 1679 }
1641} 1680}
1642 1681
1643MODULE = CFClient PACKAGE = CFClient::MixChunk 1682MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644 1683
1645CFClient::MixChunk 1684CFPlus::MixChunk
1646new_from_file (SV *class, char *path) 1685new_from_file (SV *class, char *path)
1647 CODE: 1686 CODE:
1648 RETVAL = Mix_LoadWAV (path); 1687 RETVAL = Mix_LoadWAV (path);
1649 OUTPUT: 1688 OUTPUT:
1650 RETVAL 1689 RETVAL
1651 1690
1652void 1691void
1653DESTROY (CFClient::MixChunk self) 1692DESTROY (CFPlus::MixChunk self)
1654 CODE: 1693 CODE:
1655 Mix_FreeChunk (self); 1694 Mix_FreeChunk (self);
1656 1695
1657int 1696int
1658volume (CFClient::MixChunk self, int volume = -1) 1697volume (CFPlus::MixChunk self, int volume = -1)
1659 CODE: 1698 CODE:
1660 RETVAL = Mix_VolumeChunk (self, volume); 1699 RETVAL = Mix_VolumeChunk (self, volume);
1661 OUTPUT: 1700 OUTPUT:
1662 RETVAL 1701 RETVAL
1663 1702
1664int 1703int
1665play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1704play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666 CODE: 1705 CODE:
1667 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1706 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668 OUTPUT: 1707 OUTPUT:
1669 RETVAL 1708 RETVAL
1670 1709
1671MODULE = CFClient PACKAGE = CFClient::MixMusic 1710MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672 1711
1673int 1712int
1674volume (int volume = -1) 1713volume (int volume = -1)
1675 CODE: 1714 CODE:
1676 RETVAL = Mix_VolumeMusic (volume); 1715 RETVAL = Mix_VolumeMusic (volume);
1677 OUTPUT: 1716 OUTPUT:
1678 RETVAL 1717 RETVAL
1679 1718
1680CFClient::MixMusic 1719CFPlus::MixMusic
1681new_from_file (SV *class, char *path) 1720new_from_file (SV *class, char *path)
1682 CODE: 1721 CODE:
1683 RETVAL = Mix_LoadMUS (path); 1722 RETVAL = Mix_LoadMUS (path);
1684 OUTPUT: 1723 OUTPUT:
1685 RETVAL 1724 RETVAL
1686 1725
1687void 1726void
1688DESTROY (CFClient::MixMusic self) 1727DESTROY (CFPlus::MixMusic self)
1689 CODE: 1728 CODE:
1690 Mix_FreeMusic (self); 1729 Mix_FreeMusic (self);
1691 1730
1692int 1731int
1693play (CFClient::MixMusic self, int loops = -1) 1732play (CFPlus::MixMusic self, int loops = -1)
1694 CODE: 1733 CODE:
1695 RETVAL = Mix_PlayMusic (self, loops); 1734 RETVAL = Mix_PlayMusic (self, loops);
1696 OUTPUT: 1735 OUTPUT:
1697 RETVAL 1736 RETVAL
1698 1737
1699MODULE = CFClient PACKAGE = CFClient::OpenGL 1738MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700 1739
1701BOOT: 1740BOOT:
1702{ 1741{
1703 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1742 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704 static const struct { 1743 static const struct {
1705 const char *name; 1744 const char *name;
1706 IV iv; 1745 IV iv;
1707 } *civ, const_iv[] = { 1746 } *civ, const_iv[] = {
1708# define const_iv(name) { # name, (IV)name } 1747# define const_iv(name) { # name, (IV)name }
1771 const_iv (GL_SEPARABLE_2D), 1810 const_iv (GL_SEPARABLE_2D),
1772 const_iv (GL_CONVOLUTION_2D), 1811 const_iv (GL_CONVOLUTION_2D),
1773 const_iv (GL_CONVOLUTION_BORDER_MODE), 1812 const_iv (GL_CONVOLUTION_BORDER_MODE),
1774 const_iv (GL_CONSTANT_BORDER), 1813 const_iv (GL_CONSTANT_BORDER),
1775 const_iv (GL_LINES), 1814 const_iv (GL_LINES),
1815 const_iv (GL_LINE_STRIP),
1776 const_iv (GL_LINE_LOOP), 1816 const_iv (GL_LINE_LOOP),
1777 const_iv (GL_QUADS), 1817 const_iv (GL_QUADS),
1778 const_iv (GL_QUAD_STRIP), 1818 const_iv (GL_QUAD_STRIP),
1779 const_iv (GL_TRIANGLES), 1819 const_iv (GL_TRIANGLES),
1780 const_iv (GL_TRIANGLE_STRIP), 1820 const_iv (GL_TRIANGLE_STRIP),
1890 r *= a; 1930 r *= a;
1891 g *= a; 1931 g *= a;
1892 b *= a; 1932 b *= a;
1893 } 1933 }
1894 // microsoft visual "c" rounds instead of truncating... 1934 // microsoft visual "c" rounds instead of truncating...
1895 glColor4ub (MIN ((int)(r * 256.f), 255), 1935 glColor4f (r, g, b, a);
1896 MIN ((int)(g * 256.f), 255),
1897 MIN ((int)(b * 256.f), 255),
1898 MIN ((int)(a * 256.f), 255));
1899 1936
1900void glInterleavedArrays (int format, int stride, char *data) 1937void glInterleavedArrays (int format, int stride, char *data)
1901 1938
1902void glDrawElements (int mode, int count, int type, char *indices) 1939void glDrawElements (int mode, int count, int type, char *indices)
1903 1940
1980 2017
1981void glEndList () 2018void glEndList ()
1982 2019
1983void glCallList (int list) 2020void glCallList (int list)
1984 2021
1985

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines