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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines