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.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.144 by root, Fri Aug 18 02:25:12 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 {
132 float s, t; 169 float s, t;
133 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
134} maptex; 171} maptex;
135 172
136typedef struct { 173typedef struct {
137 int16_t darkness; 174 uint16_t darkness;
138 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
139} mapcell; 177} mapcell;
140 178
141typedef struct { 179typedef struct {
142 int32_t c0, c1; 180 int32_t c0, c1;
143 mapcell *col; 181 mapcell *col;
152 int texs; 190 int texs;
153 maptex *tex; 191 maptex *tex;
154 192
155 int32_t rows; 193 int32_t rows;
156 maprow *row; 194 maprow *row;
157} *CFClient__Map; 195} *CFPlus__Map;
158 196
159static char * 197static char *
160prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
161{ 199{
162 char *p; 200 char *p;
180 218
181#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#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)) 220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183 221
184static maprow * 222static maprow *
185map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
186{ 224{
187 if (0 > y) 225 if (0 > y)
188 { 226 {
189 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
228 266
229 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
230} 268}
231 269
232static mapcell * 270static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
234{ 272{
235 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
236} 274}
237 275
238static void 276static void
239map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
240{ 278{
241 int r; 279 int r;
242 280
243 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
252 self->row = 0; 290 self->row = 0;
253 self->rows = 0; 291 self->rows = 0;
254} 292}
255 293
256static void 294static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 295map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 296{
259 int x, y; 297 int x, y;
260 maprow *row; 298 maprow *row;
261 299
262 for (y = y0; y < y0 + h; y++) 300 for (y = y0; y < y0 + h; y++)
271 if (x >= row->c0) 309 if (x >= row->c0)
272 { 310 {
273 if (x >= row->c1) 311 if (x >= row->c1)
274 break; 312 break;
275 313
276 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
277 } 315 }
278 } 316 }
279} 317}
280 318
281static void 319static void
319 n |= n >> 16; 357 n |= n >> 16;
320 358
321 return n + 1; 359 return n + 1;
322} 360}
323 361
324MODULE = CFClient PACKAGE = CFClient 362MODULE = CFPlus PACKAGE = CFPlus
325 363
326PROTOTYPES: ENABLE 364PROTOTYPES: ENABLE
327 365
328BOOT: 366BOOT:
329{ 367{
330 HV *stash = gv_stashpv ("CFClient", 1); 368 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 369 static const struct {
332 const char *name; 370 const char *name;
333 IV iv; 371 IV iv;
334 } *civ, const_iv[] = { 372 } *civ, const_iv[] = {
335# define const_iv(name) { # name, (IV)name } 373# define const_iv(name) { # name, (IV)name }
436 474
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 475 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439} 477}
440 478
479int
480in_destruct ()
481 CODE:
482 RETVAL = PL_main_cv == Nullcv;
483 OUTPUT:
484 RETVAL
485
486NV floor (NV x)
487
488NV ceil (NV x)
489
441void 490void
442pango_init () 491pango_init ()
443 CODE: 492 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{ 493{
446 {
447 ft2_fontmap = pango_ft2_font_map_new (); 494 opengl_fontmap = pango_opengl_font_map_new ();
448 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 495 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 496 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450 }
451 {
452 cairo_font_options_t *fopt = cairo_font_options_create ();
453 cairo_fontmap = pango_cairo_font_map_get_default ();
454 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455#ifdef _WIN32
456 // cairo looks like shit eaten twice on windows
457 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458#else
459 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460#endif
461 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463 pango_cairo_context_set_font_options (cairo_context, fopt);
464 cairo_font_options_destroy (fopt);
465 }
466} 497}
467 498
468int 499int
469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 500SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470 501
471void 502void
472SDL_Quit () 503SDL_Quit ()
473 504
474void 505void
481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484 515
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487 518
488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492 523
493 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 524 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
525#if SDL_VERSION_ATLEAST(1,2,10)
526 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
527 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
528#endif
494 529
495 SDL_EnableUNICODE (1); 530 SDL_EnableUNICODE (1);
496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497 532
498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 620 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 621 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break; 622 break;
588 } 623 }
589 624
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 625 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591 } 626 }
592} 627}
593 628
594int 629int
595Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 630Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
611#endif 646#endif
612 647
613void 648void
614add_font (char *file) 649add_font (char *file)
615 CODE: 650 CODE:
616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 651 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
621 652
622void 653void
623load_image_inline (SV *image_) 654load_image_inline (SV *image_)
624 ALIAS: 655 ALIAS:
625 load_image_file = 1 656 load_image_file = 1
667 698
668 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 699 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669 700
670 assert (surface2->pitch == surface2->w * 4); 701 assert (surface2->pitch == surface2->w * 4);
671 702
703 SDL_LockSurface (surface2);
672 EXTEND (SP, 5); 704 EXTEND (SP, 6);
673 PUSHs (sv_2mortal (newSViv (surface2->w))); 705 PUSHs (sv_2mortal (newSViv (surface2->w)));
674 PUSHs (sv_2mortal (newSViv (surface2->h))); 706 PUSHs (sv_2mortal (newSViv (surface2->h)));
675 SDL_LockSurface (surface2);
676 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 707 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677 SDL_UnlockSurface (surface2);
678 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 708 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 709 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 710 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
711 SDL_UnlockSurface (surface2);
681 712
682 SDL_FreeSurface (surface); 713 SDL_FreeSurface (surface);
683 SDL_FreeSurface (surface2); 714 SDL_FreeSurface (surface2);
684} 715}
685 716
728void 759void
729_exit (int retval) 760_exit (int retval)
730 CODE: 761 CODE:
731 _exit (retval); 762 _exit (retval);
732 763
733MODULE = CFClient PACKAGE = CFClient::Font 764MODULE = CFPlus PACKAGE = CFPlus::Font
734 765
735CFClient::Font 766CFPlus::Font
736new_from_file (SV *class, char *path, int id = 0) 767new_from_file (SV *class, char *path, int id = 0)
737 CODE: 768 CODE:
738{ 769{
739 int count; 770 int count;
740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 771 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
743} 774}
744 OUTPUT: 775 OUTPUT:
745 RETVAL 776 RETVAL
746 777
747void 778void
748DESTROY (CFClient::Font self) 779DESTROY (CFPlus::Font self)
749 CODE: 780 CODE:
750 pango_font_description_free (self); 781 pango_font_description_free (self);
751 782
752void 783void
753make_default (CFClient::Font self) 784make_default (CFPlus::Font self)
754 CODE: 785 CODE:
755 default_font = self; 786 default_font = self;
756 787
757MODULE = CFClient PACKAGE = CFClient::Layout 788MODULE = CFPlus PACKAGE = CFPlus::Layout
758 789
759CFClient::Layout 790void
760new (SV *class, int rgba = 0) 791reset_glyph_cache ()
792 CODE:
793 tc_clear ();
794
795CFPlus::Layout
796new (SV *class)
761 CODE: 797 CODE:
762 New (0, RETVAL, 1, struct cf_layout); 798 New (0, RETVAL, 1, struct cf_layout);
763 799
764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 800 RETVAL->pl = pango_layout_new (opengl_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.; 801 RETVAL->r = 1.;
767 RETVAL->g = 1.; 802 RETVAL->g = 1.;
768 RETVAL->b = 1.; 803 RETVAL->b = 1.;
769 RETVAL->a = 1.; 804 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT; 805 RETVAL->base_height = MIN_FONT_HEIGHT;
774 layout_update_font (RETVAL); 809 layout_update_font (RETVAL);
775 OUTPUT: 810 OUTPUT:
776 RETVAL 811 RETVAL
777 812
778void 813void
779DESTROY (CFClient::Layout self) 814DESTROY (CFPlus::Layout self)
780 CODE: 815 CODE:
781 g_object_unref (self->pl); 816 g_object_unref (self->pl);
782 Safefree (self); 817 Safefree (self);
783 818
784int
785is_rgba (CFClient::Layout self)
786 CODE:
787 RETVAL = self->rgba;
788 OUTPUT:
789 RETVAL
790
791void 819void
792set_text (CFClient::Layout self, SV *text_) 820set_text (CFPlus::Layout self, SV *text_)
793 CODE: 821 CODE:
794{ 822{
795 STRLEN textlen; 823 STRLEN textlen;
796 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
797 825
798 pango_layout_set_text (self->pl, text, textlen); 826 pango_layout_set_text (self->pl, text, textlen);
799} 827}
800 828
801void 829void
802set_markup (CFClient::Layout self, SV *text_) 830set_markup (CFPlus::Layout self, SV *text_)
803 CODE: 831 CODE:
804{ 832{
805 STRLEN textlen; 833 STRLEN textlen;
806 char *text = SvPVutf8 (text_, textlen); 834 char *text = SvPVutf8 (text_, textlen);
807 835
808 pango_layout_set_markup (self->pl, text, textlen); 836 pango_layout_set_markup (self->pl, text, textlen);
809} 837}
810 838
839void
840set_shapes (CFPlus::Layout self, ...)
841 CODE:
842{
843 PangoAttrList *attrs = 0;
844 const char *text = pango_layout_get_text (self->pl);
845 const char *pos = text;
846 int arg = 4;
847
848 while (arg < items && (pos = strstr (pos, OBJ_STR)))
849 {
850 PangoRectangle inkrect, rect;
851 PangoAttribute *attr;
852
853 int x = SvIV (ST (arg - 3));
854 int y = SvIV (ST (arg - 2));
855 int w = SvIV (ST (arg - 1));
856 int h = SvIV (ST (arg ));
857
858 inkrect.x = 0;
859 inkrect.y = 0;
860 inkrect.width = 0;
861 inkrect.height = 0;
862
863 rect.x = x * PANGO_SCALE;
864 rect.y = y * PANGO_SCALE;
865 rect.width = w * PANGO_SCALE;
866 rect.height = h * PANGO_SCALE;
867
868 if (!attrs)
869 attrs = pango_layout_get_attributes (self->pl);
870
871 attr = pango_attr_shape_new (&inkrect, &rect);
872 attr->start_index = pos - text;
873 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
874 pango_attr_list_insert (attrs, attr);
875
876 arg += 4;
877 pos += sizeof (OBJ_STR) - 1;
878 }
879
880 if (attrs)
881 pango_layout_set_attributes (self->pl, attrs);
882}
883
884void
885get_shapes (CFPlus::Layout self)
886 PPCODE:
887{
888 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
889
890 do
891 {
892 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
893
894 if (run && shape_attr_p (run))
895 {
896 PangoRectangle extents;
897 pango_layout_iter_get_run_extents (iter, 0, &extents);
898
899 EXTEND (SP, 2);
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
901 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
902 }
903 }
904 while (pango_layout_iter_next_run (iter));
905
906 pango_layout_iter_free (iter);
907}
908
909int
910has_wrapped (CFPlus::Layout self)
911 CODE:
912{
913 int lines = 1;
914 const char *text = pango_layout_get_text (self->pl);
915
916 while (*text)
917 lines += *text++ == '\n';
918
919 RETVAL = lines < pango_layout_get_line_count (self->pl);
920}
921 OUTPUT:
922 RETVAL
923
811SV * 924SV *
812get_text (CFClient::Layout self) 925get_text (CFPlus::Layout self)
813 CODE: 926 CODE:
814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 927 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815 sv_utf8_decode (RETVAL); 928 sv_utf8_decode (RETVAL);
816 OUTPUT: 929 OUTPUT:
817 RETVAL 930 RETVAL
818 931
819void 932void
820set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 933set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821 CODE: 934 CODE:
822 self->r = r; 935 self->r = r;
823 self->g = g; 936 self->g = g;
824 self->b = b; 937 self->b = b;
825 self->a = a; 938 self->a = a;
826 939
827void 940void
828set_font (CFClient::Layout self, CFClient::Font font = 0) 941set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829 CODE: 942 CODE:
830 if (self->font != font) 943 if (self->font != font)
831 { 944 {
832 self->font = font; 945 self->font = font;
833 layout_update_font (self); 946 layout_update_font (self);
834 } 947 }
835 948
836void 949void
837set_height (CFClient::Layout self, int base_height) 950set_height (CFPlus::Layout self, int base_height)
838 CODE: 951 CODE:
839 if (self->base_height != base_height) 952 if (self->base_height != base_height)
840 { 953 {
841 self->base_height = base_height; 954 self->base_height = base_height;
842 layout_update_font (self); 955 layout_update_font (self);
843 } 956 }
844 957
845void 958void
846set_width (CFClient::Layout self, int max_width = -1) 959set_width (CFPlus::Layout self, int max_width = -1)
847 CODE: 960 CODE:
848 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 961 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849 962
850void 963void
851set_indent (CFClient::Layout self, int indent) 964set_indent (CFPlus::Layout self, int indent)
852 CODE: 965 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 966 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854 967
855void 968void
856set_spacing (CFClient::Layout self, int spacing) 969set_spacing (CFPlus::Layout self, int spacing)
857 CODE: 970 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 971 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859 972
860void 973void
861set_ellipsise (CFClient::Layout self, int ellipsise) 974set_ellipsise (CFPlus::Layout self, int ellipsise)
862 CODE: 975 CODE:
863 pango_layout_set_ellipsize (self->pl, 976 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START 977 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 978 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 979 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE 980 : PANGO_ELLIPSIZE_NONE
868 ); 981 );
869 982
870void 983void
871set_single_paragraph_mode (CFClient::Layout self, int spm) 984set_single_paragraph_mode (CFPlus::Layout self, int spm)
872 CODE: 985 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 986 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874 987
875void 988void
876size (CFClient::Layout self) 989size (CFPlus::Layout self)
877 PPCODE: 990 PPCODE:
878{ 991{
879 int w, h; 992 int w, h;
880 993
881 layout_get_pixel_size (self, &w, &h); 994 layout_get_pixel_size (self, &w, &h);
884 PUSHs (sv_2mortal (newSViv (w))); 997 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h))); 998 PUSHs (sv_2mortal (newSViv (h)));
886} 999}
887 1000
888int 1001int
1002descent (CFPlus::Layout self)
1003 CODE:
1004{
1005 PangoRectangle rect;
1006 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1007 pango_layout_line_get_pixel_extents (line, 0, &rect);
1008 RETVAL = PANGO_DESCENT (rect);
1009}
1010 OUTPUT:
1011 RETVAL
1012
1013int
889xy_to_index (CFClient::Layout self, int x, int y) 1014xy_to_index (CFPlus::Layout self, int x, int y)
890 CODE: 1015 CODE:
891{ 1016{
892 int index, trailing; 1017 int index, trailing;
893 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1018 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894 RETVAL = index; 1019 RETVAL = index;
895} 1020}
896 OUTPUT: 1021 OUTPUT:
897 RETVAL 1022 RETVAL
898 1023
899void 1024void
900cursor_pos (CFClient::Layout self, int index) 1025cursor_pos (CFPlus::Layout self, int index)
901 PPCODE: 1026 PPCODE:
902{ 1027{
903 PangoRectangle strong_pos; 1028 PangoRectangle strong_pos;
904 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1029 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905 1030
908 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910} 1035}
911 1036
912void 1037void
913render (CFClient::Layout self) 1038render (CFPlus::Layout self, float x, float y, int flags = 0)
914 PPCODE: 1039 PPCODE:
915{ 1040 pango_opengl_render_layout_subpixel (
916 SV *retval; 1041 self->pl,
917 int w, h; 1042 x * PANGO_SCALE, y * PANGO_SCALE,
918 1043 self->r, self->g, self->b, self->a,
919 layout_get_pixel_size (self, &w, &h);
920
921 if (self->rgba)
922 { 1044 flags
923 cairo_surface_t *surface;
924 cairo_t *cairo;
925
926 retval = newSV (w * h * 4);
927 SvPOK_only (retval);
928 SvCUR_set (retval, w * h * 4);
929
930 memset (SvPVX (retval), 0, w * h * 4);
931
932 surface = cairo_image_surface_create_for_data (
933 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934 cairo = cairo_create (surface);
935 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937 pango_cairo_show_layout (cairo, self->pl);
938
939 cairo_destroy (cairo);
940 cairo_surface_destroy (surface);
941
942 // what a mess, and its premultiplied, too :(
943 {
944 uint32_t *p = (uint32_t *)SvPVX (retval);
945 uint32_t *e = p + w * h;
946
947 while (p < e)
948 {
949 uint32_t rgba = *p;
950 rgba = (rgba >> 24) | (rgba << 8);
951#if 0
952#ifdef _WIN32
953 {//D
954 uint8_t r = rgba >> 24;
955 uint8_t g = rgba >> 16;
956 uint8_t b = rgba >> 8;
957 uint8_t a = rgba >> 0;
958
959 rgba = (rgba & 0xffffff00) | a;
960 }
961#endif
962#endif
963 rgba = SDL_SwapBE32 (rgba);
964 *p++ = rgba;
965 }
966 }
967
968 EXTEND (SP, 5);
969 PUSHs (sv_2mortal (newSViv (w)));
970 PUSHs (sv_2mortal (newSViv (h)));
971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974 } 1045 );
975 else
976 {
977 FT_Bitmap bitmap;
978 1046
979 retval = newSV (w * h);
980 SvPOK_only (retval);
981 SvCUR_set (retval, w * h);
982
983 bitmap.rows = h;
984 bitmap.width = w;
985 bitmap.pitch = w;
986 bitmap.buffer = (unsigned char*)SvPVX (retval);
987 bitmap.num_grays = 256;
988 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990 memset (bitmap.buffer, 0, w * h);
991
992 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994 EXTEND (SP, 5);
995 PUSHs (sv_2mortal (newSViv (w)));
996 PUSHs (sv_2mortal (newSViv (h)));
997 PUSHs (sv_2mortal (retval));
998 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000 }
1001}
1002
1003MODULE = CFClient PACKAGE = CFClient::Texture 1047MODULE = CFPlus PACKAGE = CFPlus::Texture
1004 1048
1005void 1049void
1006pad2pot (SV *data_, SV *w_, SV *h_) 1050pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE: 1051 CODE:
1008{ 1052{
1038 } 1082 }
1039 } 1083 }
1040} 1084}
1041 1085
1042void 1086void
1043draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1087draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1044 PROTOTYPE: $$$;$$ 1088 PROTOTYPE: $$$;$$
1045 ALIAS: 1089 ALIAS:
1046 draw_quad_alpha = 1 1090 draw_quad_alpha = 1
1047 draw_quad_alpha_premultiplied = 2 1091 draw_quad_alpha_premultiplied = 2
1048 CODE: 1092 CODE:
1086 glDisable (GL_ALPHA_TEST); 1130 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND); 1131 glDisable (GL_BLEND);
1088 } 1132 }
1089} 1133}
1090 1134
1091MODULE = CFClient PACKAGE = CFClient::Map 1135MODULE = CFPlus PACKAGE = CFPlus::Map
1092 1136
1093CFClient::Map 1137CFPlus::Map
1094new (SV *class, int map_width, int map_height) 1138new (SV *class, int map_width, int map_height)
1095 CODE: 1139 CODE:
1096 New (0, RETVAL, 1, struct map); 1140 New (0, RETVAL, 1, struct map);
1097 RETVAL->x = 0; 1141 RETVAL->x = 0;
1098 RETVAL->y = 0; 1142 RETVAL->y = 0;
1108 RETVAL->row = 0; 1152 RETVAL->row = 0;
1109 OUTPUT: 1153 OUTPUT:
1110 RETVAL 1154 RETVAL
1111 1155
1112void 1156void
1113DESTROY (CFClient::Map self) 1157DESTROY (CFPlus::Map self)
1114 CODE: 1158 CODE:
1115{ 1159{
1116 map_clear (self); 1160 map_clear (self);
1117 Safefree (self->face); 1161 Safefree (self->face);
1118 Safefree (self->tex); 1162 Safefree (self->tex);
1119 Safefree (self); 1163 Safefree (self);
1120} 1164}
1121 1165
1122void 1166void
1123clear (CFClient::Map self) 1167clear (CFPlus::Map self)
1124 CODE: 1168 CODE:
1125 map_clear (self); 1169 map_clear (self);
1126 1170
1127void 1171void
1128set_face (CFClient::Map self, int face, int texid) 1172set_face (CFPlus::Map self, int face, int texid)
1129 CODE: 1173 CODE:
1130{ 1174{
1131 while (self->faces <= face) 1175 while (self->faces <= face)
1132 { 1176 {
1133 Append (mapface, self->face, self->faces, self->faces); 1177 Append (mapface, self->face, self->faces, self->faces);
1136 1180
1137 self->face [face] = texid; 1181 self->face [face] = texid;
1138} 1182}
1139 1183
1140void 1184void
1141set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1185set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1142 CODE: 1186 CODE:
1143{ 1187{
1144 while (self->texs <= texid) 1188 while (self->texs <= texid)
1145 { 1189 {
1146 Append (maptex, self->tex, self->texs, self->texs); 1190 Append (maptex, self->tex, self->texs, self->texs);
1170 // from transparent color bleeding and ugly wrapping effects. 1214 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1215 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172} 1216}
1173 1217
1174int 1218int
1175ox (CFClient::Map self) 1219ox (CFPlus::Map self)
1176 ALIAS: 1220 ALIAS:
1177 oy = 1 1221 oy = 1
1178 x = 2 1222 x = 2
1179 y = 3 1223 y = 3
1180 w = 4 1224 w = 4
1191 } 1235 }
1192 OUTPUT: 1236 OUTPUT:
1193 RETVAL 1237 RETVAL
1194 1238
1195void 1239void
1196scroll (CFClient::Map self, int dx, int dy) 1240scroll (CFPlus::Map self, int dx, int dy)
1197 CODE: 1241 CODE:
1198{ 1242{
1199 if (dx > 0) 1243 if (dx > 0)
1200 map_blank (self, self->x, self->y, dx - 1, self->h); 1244 map_blank (self, self->x, self->y, dx - 1, self->h);
1201 else if (dx < 0) 1245 else if (dx < 0)
1217 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1218 } 1262 }
1219} 1263}
1220 1264
1221void 1265void
1222map1a_update (CFClient::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223 CODE: 1267 CODE:
1224{ 1268{
1225 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1227 mapcell *cell; 1271 mapcell *cell;
1229 1273
1230 while (data < data_end) 1274 while (data < data_end)
1231 { 1275 {
1232 flags = (data [0] << 8) + data [1]; data += 2; 1276 flags = (data [0] << 8) + data [1]; data += 2;
1233 1277
1234 x = ((flags >> 10) & 63) + self->x; 1278 x = self->x + ((flags >> 10) & 63);
1235 y = ((flags >> 4) & 63) + self->y; 1279 y = self->y + ((flags >> 4) & 63);
1236 1280
1237 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1238 1282
1239 if (flags & 15) 1283 if (flags & 15)
1240 { 1284 {
1241 if (cell->darkness < 0) 1285 if (!cell->darkness)
1242 { 1286 {
1243 cell->darkness = 0; 1287 cell->darkness = 256;
1244 cell->face [0] = 0; 1288 cell->face [0] = 0;
1245 cell->face [1] = 0; 1289 cell->face [1] = 0;
1246 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1247 } 1292 }
1248 1293
1249 cell->darkness = flags & 8 ? *data++ : 255;
1250
1251 //TODO: don't trust server data to be in-range(!) 1294 //TODO: don't trust server data to be in-range(!)
1295
1296 if (flags & 8)
1297 {
1298 if (extmap)
1299 {
1300 uint8_t ext, cmd;
1301
1302 do
1303 {
1304 ext = *data++;
1305 cmd = ext & 0x3f;
1306
1307 if (ext < 4)
1308 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health
1310 cell->stat_hp = *data++;
1311 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1;
1313 }
1314 while (cmd & 0x80);
1315 }
1316 else
1317 cell->darkness = *data++ + 1;
1318 }
1252 1319
1253 if (flags & 4) 1320 if (flags & 4)
1254 { 1321 {
1255 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1322 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1256 } 1323 }
1264 { 1331 {
1265 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1332 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1266 } 1333 }
1267 } 1334 }
1268 else 1335 else
1269 cell->darkness = -1; 1336 cell->darkness = 0;
1270 } 1337 }
1271} 1338}
1272 1339
1273SV * 1340SV *
1274mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1341mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275 CODE: 1342 CODE:
1276{ 1343{
1277 int x1, x; 1344 int x1, x;
1278 int y1, y; 1345 int y1, y;
1279 int z; 1346 int z;
1329} 1396}
1330 OUTPUT: 1397 OUTPUT:
1331 RETVAL 1398 RETVAL
1332 1399
1333void 1400void
1334draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1401draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335 PPCODE: 1402 CODE:
1336{ 1403{
1337 int vx, vy; 1404 int vx, vy;
1338 int x, y, z; 1405 int x, y, z;
1339 int last_name; 1406 int last_name;
1340 mapface face; 1407 mapface face;
1341 int sw4 = (sw + 3) & ~3;
1342 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344 1408
1345 memset (darkness, 255, sw4 * sh);
1346 SvPOK_only (darkness_sv);
1347 SvCUR_set (darkness_sv, sw4 * sh);
1348
1349 vx = self->x + (self->w - sw) / 2 - shift_x; 1409 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350 vy = self->y + (self->h - sh) / 2 - shift_y; 1410 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351 1411
1352 /* 1412 /*
1353 int vx = self->vx = self->w >= sw 1413 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2 1414 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1415 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1359 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1419 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360 */ 1420 */
1361 1421
1362 glColor4ub (255, 255, 255, 255); 1422 glColor4ub (255, 255, 255, 255);
1363 1423
1424 glEnable (GL_BLEND);
1364 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1425 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 glEnable (GL_BLEND);
1366 glEnable (GL_TEXTURE_2D); 1426 glEnable (GL_TEXTURE_2D);
1367 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1427 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368 1428
1369 glBegin (GL_QUADS); 1429 glBegin (GL_QUADS);
1370 1430
1378 1438
1379 for (x = 0; x < sw; x++) 1439 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1440 if (row->c0 <= x + vx && x + vx < row->c1)
1381 { 1441 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1442 mapcell *cell = row->col + (x + vx - row->c0);
1383
1384 darkness[y * sw4 + x] = cell->darkness < 0
1385 ? 255 - FOW_DARKNESS
1386 : 255 - cell->darkness;
1387 1443
1388 face = cell->face [z]; 1444 face = cell->face [z];
1389 1445
1390 if (face) 1446 if (face)
1391 { 1447 {
1413 glEnd (); 1469 glEnd ();
1414 1470
1415 glDisable (GL_TEXTURE_2D); 1471 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND); 1472 glDisable (GL_BLEND);
1417 1473
1474 for (y = 0; y < sh; y++)
1475 if (0 <= y + vy && y + vy < self->rows)
1476 {
1477 maprow *row = self->row + (y + vy);
1478
1479 for (x = 0; x < sw; x++)
1480 if (row->c0 <= x + vx && x + vx < row->c1)
1481 {
1482 mapcell *cell = row->col + (x + vx - row->c0);
1483
1484 int px = x * 32;
1485 int py = y * 32;
1486
1487 if (cell->stat_hp)
1488 {
1489 glColor3ub (0, 0, 0);
1490 glRectf (px + 1, py + 1, px + 31, py + 4);
1491
1492 glColor3ub (0, 255, 0);
1493 glBegin (GL_LINES);
1494 glVertex2f (px + 2, py + 2.5f);
1495 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
1496 glEnd ();
1497 }
1498 }
1499 }
1500}
1501
1502void
1503draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1504 CODE:
1505{
1506 static float color[16][3] = {
1507 { 0.00F, 0.00F, 0.00F },
1508 { 1.00F, 1.00F, 1.00F },
1509 { 0.00F, 0.00F, 0.55F },
1510 { 1.00F, 0.00F, 0.00F },
1511
1512 { 1.00F, 0.54F, 0.00F },
1513 { 0.11F, 0.56F, 1.00F },
1514 { 0.93F, 0.46F, 0.00F },
1515 { 0.18F, 0.54F, 0.34F },
1516
1517 { 0.56F, 0.73F, 0.56F },
1518 { 0.80F, 0.80F, 0.80F },
1519 { 0.55F, 0.41F, 0.13F },
1520 { 0.99F, 0.77F, 0.26F },
1521
1522 { 0.74F, 0.65F, 0.41F },
1523
1524 { 0.00F, 1.00F, 1.00F },
1525 { 1.00F, 0.00F, 1.00F },
1526 { 1.00F, 1.00F, 0.00F },
1527 };
1528
1529 int x, y;
1530
1531 glEnable (GL_TEXTURE_2D);
1532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1533 glEnable (GL_BLEND);
1534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1535 glBegin (GL_QUADS);
1536
1537 for (y = 0; y < h; y++)
1538 for (x = 0; x < w; x++)
1539 {
1540 unsigned char m = data [x + y * w];
1541
1542 if (m)
1543 {
1544 float *c = color [m & 15];
1545
1546 float tx1 = m & 0x40 ? 0.5 : 0.;
1547 float tx2 = tx1 + 0.5;
1548
1549 glColor4f (c[0], c[1], c[2], 0.75);
1550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1554 }
1555 }
1556
1557 glEnd ();
1558 glDisable (GL_BLEND);
1559 glDisable (GL_TEXTURE_2D);
1560}
1561
1562void
1563fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1564 PPCODE:
1565{
1566 int vx, vy;
1567 int x, y;
1568 int sw4 = (sw + 3) & ~3;
1569 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1570 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1571
1572 memset (darkness, 255, sw4 * sh);
1573 SvPOK_only (darkness_sv);
1574 SvCUR_set (darkness_sv, sw4 * sh);
1575
1576 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1577 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1578
1579 for (y = 0; y < sh; y++)
1580 if (0 <= y + vy && y + vy < self->rows)
1581 {
1582 maprow *row = self->row + (y + vy);
1583
1584 for (x = 0; x < sw; x++)
1585 if (row->c0 <= x + vx && x + vx < row->c1)
1586 {
1587 mapcell *cell = row->col + (x + vx - row->c0);
1588
1589 darkness[y * sw4 + x] = cell->darkness
1590 ? 255 - (cell->darkness - 1)
1591 : 255 - FOW_DARKNESS;
1592 }
1593 }
1594
1418 EXTEND (SP, 3); 1595 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 1596 PUSHs (sv_2mortal (newSViv (sw4)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 1597 PUSHs (sv_2mortal (newSViv (sh)));
1421 PUSHs (darkness_sv); 1598 PUSHs (darkness_sv);
1422} 1599}
1423 1600
1424SV * 1601SV *
1425get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1602get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426 CODE: 1603 CODE:
1427{ 1604{
1428 int x, y, x1, y1; 1605 int x, y, x1, y1;
1429 SV *data_sv = newSV (w * h * 7 + 5); 1606 SV *data_sv = newSV (w * h * 7 + 5);
1430 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1607 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1492} 1669}
1493 OUTPUT: 1670 OUTPUT:
1494 RETVAL 1671 RETVAL
1495 1672
1496void 1673void
1497set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1674set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498 PPCODE: 1675 PPCODE:
1499{ 1676{
1500 int x, y, z; 1677 int x, y, z;
1501 int w, h; 1678 int w, h;
1502 int x1, y1; 1679 int x1, y1;
1534 1711
1535 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1712 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1536 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1713 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1537 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1714 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1538 1715
1539 if (cell->darkness <= 0) 1716 if (cell->darkness == 0)
1540 { 1717 {
1541 cell->darkness = -1; 1718 cell->darkness = 0;
1542 1719
1543 for (z = 0; z <= 2; z++) 1720 for (z = 0; z <= 2; z++)
1544 { 1721 {
1545 cell->face[z] = face[z]; 1722 cell->face[z] = face[z];
1546 1723
1551 } 1728 }
1552 } 1729 }
1553 } 1730 }
1554} 1731}
1555 1732
1556MODULE = CFClient PACKAGE = CFClient::MixChunk 1733MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557 1734
1558CFClient::MixChunk 1735CFPlus::MixChunk
1559new_from_file (SV *class, char *path) 1736new_from_file (SV *class, char *path)
1560 CODE: 1737 CODE:
1561 RETVAL = Mix_LoadWAV (path); 1738 RETVAL = Mix_LoadWAV (path);
1562 OUTPUT: 1739 OUTPUT:
1563 RETVAL 1740 RETVAL
1564 1741
1565void 1742void
1566DESTROY (CFClient::MixChunk self) 1743DESTROY (CFPlus::MixChunk self)
1567 CODE: 1744 CODE:
1568 Mix_FreeChunk (self); 1745 Mix_FreeChunk (self);
1569 1746
1570int 1747int
1571volume (CFClient::MixChunk self, int volume = -1) 1748volume (CFPlus::MixChunk self, int volume = -1)
1572 CODE: 1749 CODE:
1573 RETVAL = Mix_VolumeChunk (self, volume); 1750 RETVAL = Mix_VolumeChunk (self, volume);
1574 OUTPUT: 1751 OUTPUT:
1575 RETVAL 1752 RETVAL
1576 1753
1577int 1754int
1578play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1755play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579 CODE: 1756 CODE:
1580 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1757 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581 OUTPUT: 1758 OUTPUT:
1582 RETVAL 1759 RETVAL
1583 1760
1584MODULE = CFClient PACKAGE = CFClient::MixMusic 1761MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585 1762
1586int 1763int
1587volume (int volume = -1) 1764volume (int volume = -1)
1588 CODE: 1765 CODE:
1589 RETVAL = Mix_VolumeMusic (volume); 1766 RETVAL = Mix_VolumeMusic (volume);
1590 OUTPUT: 1767 OUTPUT:
1591 RETVAL 1768 RETVAL
1592 1769
1593CFClient::MixMusic 1770CFPlus::MixMusic
1594new_from_file (SV *class, char *path) 1771new_from_file (SV *class, char *path)
1595 CODE: 1772 CODE:
1596 RETVAL = Mix_LoadMUS (path); 1773 RETVAL = Mix_LoadMUS (path);
1597 OUTPUT: 1774 OUTPUT:
1598 RETVAL 1775 RETVAL
1599 1776
1600void 1777void
1601DESTROY (CFClient::MixMusic self) 1778DESTROY (CFPlus::MixMusic self)
1602 CODE: 1779 CODE:
1603 Mix_FreeMusic (self); 1780 Mix_FreeMusic (self);
1604 1781
1605int 1782int
1606play (CFClient::MixMusic self, int loops = -1) 1783play (CFPlus::MixMusic self, int loops = -1)
1607 CODE: 1784 CODE:
1608 RETVAL = Mix_PlayMusic (self, loops); 1785 RETVAL = Mix_PlayMusic (self, loops);
1609 OUTPUT: 1786 OUTPUT:
1610 RETVAL 1787 RETVAL
1611 1788
1612MODULE = CFClient PACKAGE = CFClient::OpenGL 1789MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613 1790
1614BOOT: 1791BOOT:
1615{ 1792{
1616 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1793 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617 static const struct { 1794 static const struct {
1618 const char *name; 1795 const char *name;
1619 IV iv; 1796 IV iv;
1620 } *civ, const_iv[] = { 1797 } *civ, const_iv[] = {
1621# define const_iv(name) { # name, (IV)name } 1798# define const_iv(name) { # name, (IV)name }
1628 const_iv (GL_SCISSOR_TEST), 1805 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST), 1806 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST), 1807 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE), 1808 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL), 1809 const_iv (GL_RESCALE_NORMAL),
1810 const_iv (GL_FRONT),
1811 const_iv (GL_BACK),
1633 const_iv (GL_AND), 1812 const_iv (GL_AND),
1634 const_iv (GL_ONE), 1813 const_iv (GL_ONE),
1635 const_iv (GL_ZERO), 1814 const_iv (GL_ZERO),
1636 const_iv (GL_SRC_ALPHA), 1815 const_iv (GL_SRC_ALPHA),
1637 const_iv (GL_DST_ALPHA), 1816 const_iv (GL_DST_ALPHA),
1638 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1817 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639 const_iv (GL_ONE_MINUS_DST_ALPHA), 1818 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE), 1819 const_iv (GL_SRC_ALPHA_SATURATE),
1641 const_iv (GL_RGB), 1820 const_iv (GL_RGB),
1642 const_iv (GL_RGBA), 1821 const_iv (GL_RGBA),
1822 const_iv (GL_RGBA4),
1823 const_iv (GL_RGBA8),
1824 const_iv (GL_RGB5_A1),
1643 const_iv (GL_UNSIGNED_BYTE), 1825 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT), 1826 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT), 1827 const_iv (GL_UNSIGNED_INT),
1646 const_iv (GL_ALPHA), 1828 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY), 1829 const_iv (GL_INTENSITY),
1679 const_iv (GL_SEPARABLE_2D), 1861 const_iv (GL_SEPARABLE_2D),
1680 const_iv (GL_CONVOLUTION_2D), 1862 const_iv (GL_CONVOLUTION_2D),
1681 const_iv (GL_CONVOLUTION_BORDER_MODE), 1863 const_iv (GL_CONVOLUTION_BORDER_MODE),
1682 const_iv (GL_CONSTANT_BORDER), 1864 const_iv (GL_CONSTANT_BORDER),
1683 const_iv (GL_LINES), 1865 const_iv (GL_LINES),
1866 const_iv (GL_LINE_STRIP),
1684 const_iv (GL_LINE_LOOP), 1867 const_iv (GL_LINE_LOOP),
1685 const_iv (GL_QUADS), 1868 const_iv (GL_QUADS),
1686 const_iv (GL_QUAD_STRIP), 1869 const_iv (GL_QUAD_STRIP),
1687 const_iv (GL_TRIANGLES), 1870 const_iv (GL_TRIANGLES),
1688 const_iv (GL_TRIANGLE_STRIP), 1871 const_iv (GL_TRIANGLE_STRIP),
1721 OUTPUT: 1904 OUTPUT:
1722 RETVAL 1905 RETVAL
1723 1906
1724int glGetError () 1907int glGetError ()
1725 1908
1909void glFinish ()
1910
1726void glClear (int mask) 1911void glClear (int mask)
1727 1912
1728void glClearColor (float r, float g, float b, float a = 1.0) 1913void glClearColor (float r, float g, float b, float a = 1.0)
1729 PROTOTYPE: @ 1914 PROTOTYPE: @
1730 1915
1753void glPushMatrix () 1938void glPushMatrix ()
1754 1939
1755void glPopMatrix () 1940void glPopMatrix ()
1756 1941
1757void glLoadIdentity () 1942void glLoadIdentity ()
1943
1944void glDrawBuffer (int buffer)
1945
1946void glReadBuffer (int buffer)
1758 1947
1759# near_ and far_ are due to microsofts buggy "c" compiler 1948# near_ and far_ are due to microsofts buggy "c" compiler
1760void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1949void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761 1950
1762# near_ and far_ are due to microsofts buggy "c" compiler 1951# near_ and far_ are due to microsofts buggy "c" compiler
1792 r *= a; 1981 r *= a;
1793 g *= a; 1982 g *= a;
1794 b *= a; 1983 b *= a;
1795 } 1984 }
1796 // microsoft visual "c" rounds instead of truncating... 1985 // microsoft visual "c" rounds instead of truncating...
1797 glColor4ub (MIN ((int)(r * 256.f), 255), 1986 glColor4f (r, g, b, a);
1798 MIN ((int)(g * 256.f), 255),
1799 MIN ((int)(b * 256.f), 255),
1800 MIN ((int)(a * 256.f), 255));
1801 1987
1802void glInterleavedArrays (int format, int stride, char *data) 1988void glInterleavedArrays (int format, int stride, char *data)
1803 1989
1804void glDrawElements (int mode, int count, int type, char *indices) 1990void glDrawElements (int mode, int count, int type, char *indices)
1805 1991
1882 2068
1883void glEndList () 2069void glEndList ()
1884 2070
1885void glCallList (int list) 2071void glCallList (int list)
1886 2072
1887

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines