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.117 by root, Thu Jun 15 15:33:57 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 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>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
6#endif 8#endif
7 9
8#include "EXTERN.h" 10#include "EXTERN.h"
9#include "perl.h" 11#include "perl.h"
10#include "XSUB.h" 12#include "XSUB.h"
13
14#ifdef _WIN32
15# undef pipe
16#endif
11 17
12#include <math.h> 18#include <math.h>
13#include <string.h> 19#include <string.h>
14#include <stdio.h> 20#include <stdio.h>
15#include <stdlib.h> 21#include <stdlib.h>
18#include <SDL_endian.h> 24#include <SDL_endian.h>
19#include <SDL_image.h> 25#include <SDL_image.h>
20#include <SDL_mixer.h> 26#include <SDL_mixer.h>
21#include <SDL_opengl.h> 27#include <SDL_opengl.h>
22 28
29#define PANGO_ENABLE_BACKEND
30#define G_DISABLE_CAST_CHECKS
31
23#include <glib/gmacros.h> 32#include <glib/gmacros.h>
24 33
25#include <pango/pango.h> 34#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 35
30#ifndef _WIN32 36#ifndef _WIN32
31# include <sys/types.h> 37# include <sys/types.h>
32# include <sys/socket.h> 38# include <sys/socket.h>
33# include <netinet/in.h> 39# include <netinet/in.h>
40 typedef signed char int8_t; 46 typedef signed char int8_t;
41 typedef signed short int16_t; 47 typedef signed short int16_t;
42 typedef signed int int32_t; 48 typedef signed int int32_t;
43#endif 49#endif
44 50
45#include "glext.h" 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46 52
47#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
48 54
49#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
51 57
52#define MIN_FONT_HEIGHT 10 58#define MIN_FONT_HEIGHT 10
59
60#if 0
61# define PARACHUTE SDL_INIT_NOPARACHUTE
62#else
63# define PARACHUTE 0
64#endif
53 65
54static struct 66static struct
55{ 67{
56#define GL_FUNC(ptr,name) ptr name; 68#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 69#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 78 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 79 else
68 glBlendFunc (sa, da); 80 glBlendFunc (sa, da);
69} 81}
70 82
83#include "texcache.c"
84
85#include "pango-font.c"
86#include "pango-fontmap.c"
87#include "pango-render.c"
88
71typedef Mix_Chunk *CFClient__MixChunk; 89typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 90typedef Mix_Music *CFPlus__MixMusic;
73 91
74typedef PangoFontDescription *CFClient__Font; 92typedef PangoFontDescription *CFPlus__Font;
93
94static int
95shape_attr_p (PangoLayoutRun *run)
96{
97 GSList *attrs = run->item->analysis.extra_attrs;
98
99 while (attrs)
100 {
101 PangoAttribute *attr = attrs->data;
102
103 if (attr->klass->type == PANGO_ATTR_SHAPE)
104 return 1;
105
106 attrs = attrs->next;
107 }
108
109 return 0;
110}
75 111
76typedef struct cf_layout { 112typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 113 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 114 float r, g, b, a; // default color for rgba mode
80 int base_height; 115 int base_height;
81 CFClient__Font font; 116 CFPlus__Font font;
82} *CFClient__Layout; 117} *CFPlus__Layout;
83 118
84static CFClient__Font default_font; 119static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 120static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 121static PangoFontMap *opengl_fontmap;
87 122
88static void 123static void
89substitute_func (FcPattern *pattern, gpointer data) 124substitute_func (FcPattern *pattern, gpointer data)
90{ 125{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 126 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 127#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 128 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 129#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 130 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 131}
101 132
102static void 133static void
103layout_update_font (CFClient__Layout self) 134layout_update_font (CFPlus__Layout self)
104{ 135{
105 /* use a random scale factor to account for unknown descenders, 0.8 works 136 /* use a random scale factor to account for unknown descenders, 0.8 works
106 * reasonably well with bitstream vera 137 * reasonably well with bitstream vera
107 */ 138 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 139 PangoFontDescription *font = self->font ? self->font : default_font;
112 143
113 pango_layout_set_font_description (self->pl, font); 144 pango_layout_set_font_description (self->pl, font);
114} 145}
115 146
116static void 147static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 148layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 149{
150 PangoRectangle rect;
151
152 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 153 pango_layout_get_extents (self->pl, 0, &rect);
120 154
121 if (!*w) *w = 1; 155 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 156 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 157
124 *w = (*w + 3) & ~3; 158 if (!rect.width) rect.width = 1;
159 if (!rect.height) rect.height = 1;
160
161 *w = rect.width;
162 *h = rect.height;
125} 163}
126 164
127typedef uint16_t mapface; 165typedef uint16_t mapface;
128 166
129typedef struct { 167typedef struct {
132 float s, t; 170 float s, t;
133 uint8_t r, g, b, a; 171 uint8_t r, g, b, a;
134} maptex; 172} maptex;
135 173
136typedef struct { 174typedef struct {
137 int16_t darkness; 175 uint32_t player;
138 mapface face[3]; 176 mapface face[3];
177 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags;
139} mapcell; 179} mapcell;
140 180
141typedef struct { 181typedef struct {
142 int32_t c0, c1; 182 int32_t c0, c1;
143 mapcell *col; 183 mapcell *col;
152 int texs; 192 int texs;
153 maptex *tex; 193 maptex *tex;
154 194
155 int32_t rows; 195 int32_t rows;
156 maprow *row; 196 maprow *row;
157} *CFClient__Map; 197} *CFPlus__Map;
158 198
159static char * 199static char *
160prepend (char *ptr, int sze, int inc) 200prepend (char *ptr, int sze, int inc)
161{ 201{
162 char *p; 202 char *p;
180 220
181#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 221#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)) 222#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183 223
184static maprow * 224static maprow *
185map_get_row (CFClient__Map self, int y) 225map_get_row (CFPlus__Map self, int y)
186{ 226{
187 if (0 > y) 227 if (0 > y)
188 { 228 {
189 int extend = - y + MAP_EXTEND_Y; 229 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 230 Prepend (maprow, self->row, self->rows, extend);
228 268
229 return row->col + (x - row->c0); 269 return row->col + (x - row->c0);
230} 270}
231 271
232static mapcell * 272static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 273map_get_cell (CFPlus__Map self, int x, int y)
234{ 274{
235 return row_get_cell (map_get_row (self, y), x); 275 return row_get_cell (map_get_row (self, y), x);
236} 276}
237 277
238static void 278static void
239map_clear (CFClient__Map self) 279map_clear (CFPlus__Map self)
240{ 280{
241 int r; 281 int r;
242 282
243 for (r = 0; r < self->rows; r++) 283 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 284 Safefree (self->row[r].col);
252 self->row = 0; 292 self->row = 0;
253 self->rows = 0; 293 self->rows = 0;
254} 294}
255 295
256static void 296static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 297map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 298{
259 int x, y; 299 int x, y;
260 maprow *row; 300 maprow *row;
301 mapcell *cell;
261 302
262 for (y = y0; y < y0 + h; y++) 303 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 304 if (y >= 0)
264 { 305 {
265 if (y >= self->rows) 306 if (y >= self->rows)
271 if (x >= row->c0) 312 if (x >= row->c0)
272 { 313 {
273 if (x >= row->c1) 314 if (x >= row->c1)
274 break; 315 break;
275 316
276 row->col[x - row->c0].darkness = -1; 317 cell = row->col + x - row->c0;
318
319 cell->darkness = 0;
320 cell->stat_hp = 0;
321 cell->flags = 0;
322 cell->player = 0;
277 } 323 }
278 } 324 }
279} 325}
280 326
281static void 327static void
319 n |= n >> 16; 365 n |= n >> 16;
320 366
321 return n + 1; 367 return n + 1;
322} 368}
323 369
324MODULE = CFClient PACKAGE = CFClient 370MODULE = CFPlus PACKAGE = CFPlus
325 371
326PROTOTYPES: ENABLE 372PROTOTYPES: ENABLE
327 373
328BOOT: 374BOOT:
329{ 375{
330 HV *stash = gv_stashpv ("CFClient", 1); 376 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 377 static const struct {
332 const char *name; 378 const char *name;
333 IV iv; 379 IV iv;
334 } *civ, const_iv[] = { 380 } *civ, const_iv[] = {
335# define const_iv(name) { # name, (IV)name } 381# define const_iv(name) { # name, (IV)name }
436 482
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 483 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439} 485}
440 486
487int
488in_destruct ()
489 CODE:
490 RETVAL = PL_main_cv == Nullcv;
491 OUTPUT:
492 RETVAL
493
441NV floor (NV x) 494NV floor (NV x)
442 495
443NV ceil (NV x) 496NV ceil (NV x)
444 497
445void 498void
446pango_init () 499pango_init ()
447 CODE: 500 CODE:
448 // delayed, so it can pick up new fonts added by AddFontResourceEx
449{ 501{
450 {
451 ft2_fontmap = pango_ft2_font_map_new (); 502 opengl_fontmap = pango_opengl_font_map_new ();
452 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 503 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 504 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454 }
455 {
456 cairo_font_options_t *fopt = cairo_font_options_create ();
457 cairo_fontmap = pango_cairo_font_map_get_default ();
458 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459#ifdef _WIN32
460 // cairo looks like shit eaten twice on windows
461 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462#else
463 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464#endif
465 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467 pango_cairo_context_set_font_options (cairo_context, fopt);
468 cairo_font_options_destroy (fopt);
469 }
470} 505}
471 506
472int 507int
473SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 508SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
474 509
475void 510void
476SDL_Quit () 511SDL_Quit ()
477 512
478void 513void
493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496 531
497 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 532 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
533#if SDL_VERSION_ATLEAST(1,2,10)
534 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
535 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
536#endif
498 537
499 SDL_EnableUNICODE (1); 538 SDL_EnableUNICODE (1);
500 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501 540
502 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
589 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 628 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 629 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591 break; 630 break;
592 } 631 }
593 632
594 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 633 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595 } 634 }
596} 635}
597 636
598int 637int
599Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 638Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
613#ifndef _WIN32 652#ifndef _WIN32
614 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
615#endif 654#endif
616 655
617void 656void
657win32_proxy_info ()
658 PPCODE:
659{
660#ifdef _WIN32
661 char buffer[2048];
662 DWORD buflen;
663
664 EXTEND (SP, 3);
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
668 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
669 {
670 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
671
672 buflen = sizeof (buffer);
673 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
674 {
675 PUSHs (newSVpv (buffer, 0));
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
679 PUSHs (newSVpv (buffer, 0));
680 }
681 }
682#endif
683}
684
685void
618add_font (char *file) 686add_font (char *file)
619 CODE: 687 CODE:
620 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621#ifdef _WIN32
622 // cairo... sigh... requires win2000
623 AddFontResourceEx (file, FR_PRIVATE, 0);
624#endif
625 689
626void 690void
627load_image_inline (SV *image_) 691load_image_inline (SV *image_)
628 ALIAS: 692 ALIAS:
629 load_image_file = 1 693 load_image_file = 1
671 735
672 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673 737
674 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
675 739
740 SDL_LockSurface (surface2);
676 EXTEND (SP, 5); 741 EXTEND (SP, 6);
677 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
678 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
679 SDL_LockSurface (surface2);
680 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681 SDL_UnlockSurface (surface2);
682 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 745 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
685 749
686 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
687 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
688} 752}
689 753
728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
729#endif 793#endif
730 _exit (1); 794 _exit (1);
731 795
732void 796void
733_exit (int retval) 797_exit (int retval = 0)
734 CODE: 798 CODE:
799#ifdef WIN32
800 ExitThread (retval); // unclean, please beam me up
801#else
735 _exit (retval); 802 _exit (retval);
803#endif
736 804
737MODULE = CFClient PACKAGE = CFClient::Font 805MODULE = CFPlus PACKAGE = CFPlus::Font
738 806
739CFClient::Font 807CFPlus::Font
740new_from_file (SV *class, char *path, int id = 0) 808new_from_file (SV *class, char *path, int id = 0)
741 CODE: 809 CODE:
742{ 810{
743 int count; 811 int count;
744 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 812 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
747} 815}
748 OUTPUT: 816 OUTPUT:
749 RETVAL 817 RETVAL
750 818
751void 819void
752DESTROY (CFClient::Font self) 820DESTROY (CFPlus::Font self)
753 CODE: 821 CODE:
754 pango_font_description_free (self); 822 pango_font_description_free (self);
755 823
756void 824void
757make_default (CFClient::Font self) 825make_default (CFPlus::Font self)
758 CODE: 826 CODE:
759 default_font = self; 827 default_font = self;
760 828
761MODULE = CFClient PACKAGE = CFClient::Layout 829MODULE = CFPlus PACKAGE = CFPlus::Layout
762 830
763CFClient::Layout 831void
764new (SV *class, int rgba = 0) 832reset_glyph_cache ()
833 CODE:
834 tc_clear ();
835
836CFPlus::Layout
837new (SV *class)
765 CODE: 838 CODE:
766 New (0, RETVAL, 1, struct cf_layout); 839 New (0, RETVAL, 1, struct cf_layout);
767 840
768 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 841 RETVAL->pl = pango_layout_new (opengl_context);
769 RETVAL->rgba = rgba;
770 RETVAL->r = 1.; 842 RETVAL->r = 1.;
771 RETVAL->g = 1.; 843 RETVAL->g = 1.;
772 RETVAL->b = 1.; 844 RETVAL->b = 1.;
773 RETVAL->a = 1.; 845 RETVAL->a = 1.;
774 RETVAL->base_height = MIN_FONT_HEIGHT; 846 RETVAL->base_height = MIN_FONT_HEIGHT;
778 layout_update_font (RETVAL); 850 layout_update_font (RETVAL);
779 OUTPUT: 851 OUTPUT:
780 RETVAL 852 RETVAL
781 853
782void 854void
783DESTROY (CFClient::Layout self) 855DESTROY (CFPlus::Layout self)
784 CODE: 856 CODE:
785 g_object_unref (self->pl); 857 g_object_unref (self->pl);
786 Safefree (self); 858 Safefree (self);
787 859
788int
789is_rgba (CFClient::Layout self)
790 CODE:
791 RETVAL = self->rgba;
792 OUTPUT:
793 RETVAL
794
795void 860void
796set_text (CFClient::Layout self, SV *text_) 861set_text (CFPlus::Layout self, SV *text_)
797 CODE: 862 CODE:
798{ 863{
799 STRLEN textlen; 864 STRLEN textlen;
800 char *text = SvPVutf8 (text_, textlen); 865 char *text = SvPVutf8 (text_, textlen);
801 866
802 pango_layout_set_text (self->pl, text, textlen); 867 pango_layout_set_text (self->pl, text, textlen);
803} 868}
804 869
805void 870void
806set_markup (CFClient::Layout self, SV *text_) 871set_markup (CFPlus::Layout self, SV *text_)
807 CODE: 872 CODE:
808{ 873{
809 STRLEN textlen; 874 STRLEN textlen;
810 char *text = SvPVutf8 (text_, textlen); 875 char *text = SvPVutf8 (text_, textlen);
811 876
812 pango_layout_set_markup (self->pl, text, textlen); 877 pango_layout_set_markup (self->pl, text, textlen);
813} 878}
814 879
880void
881set_shapes (CFPlus::Layout self, ...)
882 CODE:
883{
884 PangoAttrList *attrs = 0;
885 const char *text = pango_layout_get_text (self->pl);
886 const char *pos = text;
887 int arg = 4;
888
889 while (arg < items && (pos = strstr (pos, OBJ_STR)))
890 {
891 PangoRectangle inkrect, rect;
892 PangoAttribute *attr;
893
894 int x = SvIV (ST (arg - 3));
895 int y = SvIV (ST (arg - 2));
896 int w = SvIV (ST (arg - 1));
897 int h = SvIV (ST (arg ));
898
899 inkrect.x = 0;
900 inkrect.y = 0;
901 inkrect.width = 0;
902 inkrect.height = 0;
903
904 rect.x = x * PANGO_SCALE;
905 rect.y = y * PANGO_SCALE;
906 rect.width = w * PANGO_SCALE;
907 rect.height = h * PANGO_SCALE;
908
909 if (!attrs)
910 attrs = pango_layout_get_attributes (self->pl);
911
912 attr = pango_attr_shape_new (&inkrect, &rect);
913 attr->start_index = pos - text;
914 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
915 pango_attr_list_insert (attrs, attr);
916
917 arg += 4;
918 pos += sizeof (OBJ_STR) - 1;
919 }
920
921 if (attrs)
922 pango_layout_set_attributes (self->pl, attrs);
923}
924
925void
926get_shapes (CFPlus::Layout self)
927 PPCODE:
928{
929 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
930
931 do
932 {
933 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
934
935 if (run && shape_attr_p (run))
936 {
937 PangoRectangle extents;
938 pango_layout_iter_get_run_extents (iter, 0, &extents);
939
940 EXTEND (SP, 2);
941 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
942 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
943 }
944 }
945 while (pango_layout_iter_next_run (iter));
946
947 pango_layout_iter_free (iter);
948}
949
950int
951has_wrapped (CFPlus::Layout self)
952 CODE:
953{
954 int lines = 1;
955 const char *text = pango_layout_get_text (self->pl);
956
957 while (*text)
958 lines += *text++ == '\n';
959
960 RETVAL = lines < pango_layout_get_line_count (self->pl);
961}
962 OUTPUT:
963 RETVAL
964
815SV * 965SV *
816get_text (CFClient::Layout self) 966get_text (CFPlus::Layout self)
817 CODE: 967 CODE:
818 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 968 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819 sv_utf8_decode (RETVAL); 969 sv_utf8_decode (RETVAL);
820 OUTPUT: 970 OUTPUT:
821 RETVAL 971 RETVAL
822 972
823void 973void
824set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 974set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825 CODE: 975 CODE:
826 self->r = r; 976 self->r = r;
827 self->g = g; 977 self->g = g;
828 self->b = b; 978 self->b = b;
829 self->a = a; 979 self->a = a;
830 980
831void 981void
832set_font (CFClient::Layout self, CFClient::Font font = 0) 982set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833 CODE: 983 CODE:
834 if (self->font != font) 984 if (self->font != font)
835 { 985 {
836 self->font = font; 986 self->font = font;
837 layout_update_font (self); 987 layout_update_font (self);
838 } 988 }
839 989
840void 990void
841set_height (CFClient::Layout self, int base_height) 991set_height (CFPlus::Layout self, int base_height)
842 CODE: 992 CODE:
843 if (self->base_height != base_height) 993 if (self->base_height != base_height)
844 { 994 {
845 self->base_height = base_height; 995 self->base_height = base_height;
846 layout_update_font (self); 996 layout_update_font (self);
847 } 997 }
848 998
849void 999void
850set_width (CFClient::Layout self, int max_width = -1) 1000set_width (CFPlus::Layout self, int max_width = -1)
851 CODE: 1001 CODE:
852 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1002 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853 1003
854void 1004void
855set_indent (CFClient::Layout self, int indent) 1005set_indent (CFPlus::Layout self, int indent)
856 CODE: 1006 CODE:
857 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1007 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858 1008
859void 1009void
860set_spacing (CFClient::Layout self, int spacing) 1010set_spacing (CFPlus::Layout self, int spacing)
861 CODE: 1011 CODE:
862 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1012 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863 1013
864void 1014void
865set_ellipsise (CFClient::Layout self, int ellipsise) 1015set_ellipsise (CFPlus::Layout self, int ellipsise)
866 CODE: 1016 CODE:
867 pango_layout_set_ellipsize (self->pl, 1017 pango_layout_set_ellipsize (self->pl,
868 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1018 ellipsise == 1 ? PANGO_ELLIPSIZE_START
869 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1019 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1020 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
871 : PANGO_ELLIPSIZE_NONE 1021 : PANGO_ELLIPSIZE_NONE
872 ); 1022 );
873 1023
874void 1024void
875set_single_paragraph_mode (CFClient::Layout self, int spm) 1025set_single_paragraph_mode (CFPlus::Layout self, int spm)
876 CODE: 1026 CODE:
877 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1027 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878 1028
879void 1029void
880size (CFClient::Layout self) 1030size (CFPlus::Layout self)
881 PPCODE: 1031 PPCODE:
882{ 1032{
883 int w, h; 1033 int w, h;
884 1034
885 layout_get_pixel_size (self, &w, &h); 1035 layout_get_pixel_size (self, &w, &h);
888 PUSHs (sv_2mortal (newSViv (w))); 1038 PUSHs (sv_2mortal (newSViv (w)));
889 PUSHs (sv_2mortal (newSViv (h))); 1039 PUSHs (sv_2mortal (newSViv (h)));
890} 1040}
891 1041
892int 1042int
1043descent (CFPlus::Layout self)
1044 CODE:
1045{
1046 PangoRectangle rect;
1047 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1048 pango_layout_line_get_pixel_extents (line, 0, &rect);
1049 RETVAL = PANGO_DESCENT (rect);
1050}
1051 OUTPUT:
1052 RETVAL
1053
1054int
893xy_to_index (CFClient::Layout self, int x, int y) 1055xy_to_index (CFPlus::Layout self, int x, int y)
894 CODE: 1056 CODE:
895{ 1057{
896 int index, trailing; 1058 int index, trailing;
897 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1059 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898 RETVAL = index; 1060 RETVAL = index;
899} 1061}
900 OUTPUT: 1062 OUTPUT:
901 RETVAL 1063 RETVAL
902 1064
903void 1065void
904cursor_pos (CFClient::Layout self, int index) 1066cursor_pos (CFPlus::Layout self, int index)
905 PPCODE: 1067 PPCODE:
906{ 1068{
907 PangoRectangle strong_pos; 1069 PangoRectangle strong_pos;
908 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1070 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909 1071
912 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1074 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1075 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914} 1076}
915 1077
916void 1078void
917render (CFClient::Layout self) 1079render (CFPlus::Layout self, float x, float y, int flags = 0)
918 PPCODE: 1080 PPCODE:
919{ 1081 pango_opengl_render_layout_subpixel (
920 SV *retval; 1082 self->pl,
921 int w, h; 1083 x * PANGO_SCALE, y * PANGO_SCALE,
922 1084 self->r, self->g, self->b, self->a,
923 layout_get_pixel_size (self, &w, &h);
924
925 if (self->rgba)
926 { 1085 flags
927 cairo_surface_t *surface;
928 cairo_t *cairo;
929
930 retval = newSV (w * h * 4);
931 SvPOK_only (retval);
932 SvCUR_set (retval, w * h * 4);
933
934 memset (SvPVX (retval), 0, w * h * 4);
935
936 surface = cairo_image_surface_create_for_data (
937 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
938 cairo = cairo_create (surface);
939 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941 pango_cairo_show_layout (cairo, self->pl);
942
943 cairo_destroy (cairo);
944 cairo_surface_destroy (surface);
945
946 // what a mess, and its premultiplied, too :(
947 {
948 uint32_t *p = (uint32_t *)SvPVX (retval);
949 uint32_t *e = p + w * h;
950
951 while (p < e)
952 {
953 uint32_t rgba = *p;
954 rgba = (rgba >> 24) | (rgba << 8);
955#if 0
956#ifdef _WIN32
957 {//D
958 uint8_t r = rgba >> 24;
959 uint8_t g = rgba >> 16;
960 uint8_t b = rgba >> 8;
961 uint8_t a = rgba >> 0;
962
963 rgba = (rgba & 0xffffff00) | a;
964 }
965#endif
966#endif
967 rgba = SDL_SwapBE32 (rgba);
968 *p++ = rgba;
969 }
970 }
971
972 EXTEND (SP, 5);
973 PUSHs (sv_2mortal (newSViv (w)));
974 PUSHs (sv_2mortal (newSViv (h)));
975 PUSHs (sv_2mortal (retval));
976 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978 } 1086 );
979 else
980 {
981 FT_Bitmap bitmap;
982 1087
983 retval = newSV (w * h);
984 SvPOK_only (retval);
985 SvCUR_set (retval, w * h);
986
987 bitmap.rows = h;
988 bitmap.width = w;
989 bitmap.pitch = w;
990 bitmap.buffer = (unsigned char*)SvPVX (retval);
991 bitmap.num_grays = 256;
992 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994 memset (bitmap.buffer, 0, w * h);
995
996 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998 EXTEND (SP, 5);
999 PUSHs (sv_2mortal (newSViv (w)));
1000 PUSHs (sv_2mortal (newSViv (h)));
1001 PUSHs (sv_2mortal (retval));
1002 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004 }
1005}
1006
1007MODULE = CFClient PACKAGE = CFClient::Texture 1088MODULE = CFPlus PACKAGE = CFPlus::Texture
1008 1089
1009void 1090void
1010pad2pot (SV *data_, SV *w_, SV *h_) 1091pad2pot (SV *data_, SV *w_, SV *h_)
1011 CODE: 1092 CODE:
1012{ 1093{
1090 glDisable (GL_ALPHA_TEST); 1171 glDisable (GL_ALPHA_TEST);
1091 glDisable (GL_BLEND); 1172 glDisable (GL_BLEND);
1092 } 1173 }
1093} 1174}
1094 1175
1095MODULE = CFClient PACKAGE = CFClient::Map 1176MODULE = CFPlus PACKAGE = CFPlus::Map
1096 1177
1097CFClient::Map 1178CFPlus::Map
1098new (SV *class, int map_width, int map_height) 1179new (SV *class, int map_width, int map_height)
1099 CODE: 1180 CODE:
1100 New (0, RETVAL, 1, struct map); 1181 New (0, RETVAL, 1, struct map);
1101 RETVAL->x = 0; 1182 RETVAL->x = 0;
1102 RETVAL->y = 0; 1183 RETVAL->y = 0;
1112 RETVAL->row = 0; 1193 RETVAL->row = 0;
1113 OUTPUT: 1194 OUTPUT:
1114 RETVAL 1195 RETVAL
1115 1196
1116void 1197void
1117DESTROY (CFClient::Map self) 1198DESTROY (CFPlus::Map self)
1118 CODE: 1199 CODE:
1119{ 1200{
1120 map_clear (self); 1201 map_clear (self);
1121 Safefree (self->face); 1202 Safefree (self->face);
1122 Safefree (self->tex); 1203 Safefree (self->tex);
1123 Safefree (self); 1204 Safefree (self);
1124} 1205}
1125 1206
1126void 1207void
1127clear (CFClient::Map self) 1208clear (CFPlus::Map self)
1128 CODE: 1209 CODE:
1129 map_clear (self); 1210 map_clear (self);
1130 1211
1131void 1212void
1132set_face (CFClient::Map self, int face, int texid) 1213set_face (CFPlus::Map self, int face, int texid)
1133 CODE: 1214 CODE:
1134{ 1215{
1135 while (self->faces <= face) 1216 while (self->faces <= face)
1136 { 1217 {
1137 Append (mapface, self->face, self->faces, self->faces); 1218 Append (mapface, self->face, self->faces, self->faces);
1140 1221
1141 self->face [face] = texid; 1222 self->face [face] = texid;
1142} 1223}
1143 1224
1144void 1225void
1145set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1226set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1146 CODE: 1227 CODE:
1147{ 1228{
1148 while (self->texs <= texid) 1229 while (self->texs <= texid)
1149 { 1230 {
1150 Append (maptex, self->tex, self->texs, self->texs); 1231 Append (maptex, self->tex, self->texs, self->texs);
1174 // from transparent color bleeding and ugly wrapping effects. 1255 // from transparent color bleeding and ugly wrapping effects.
1175 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1256 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176} 1257}
1177 1258
1178int 1259int
1179ox (CFClient::Map self) 1260ox (CFPlus::Map self)
1180 ALIAS: 1261 ALIAS:
1181 oy = 1 1262 oy = 1
1182 x = 2 1263 x = 2
1183 y = 3 1264 y = 3
1184 w = 4 1265 w = 4
1195 } 1276 }
1196 OUTPUT: 1277 OUTPUT:
1197 RETVAL 1278 RETVAL
1198 1279
1199void 1280void
1200scroll (CFClient::Map self, int dx, int dy) 1281scroll (CFPlus::Map self, int dx, int dy)
1201 CODE: 1282 CODE:
1202{ 1283{
1203 if (dx > 0) 1284 if (dx > 0)
1204 map_blank (self, self->x, self->y, dx - 1, self->h); 1285 map_blank (self, self->x, self->y, dx, self->h);
1205 else if (dx < 0) 1286 else if (dx < 0)
1206 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1287 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1207 1288
1208 if (dy > 0) 1289 if (dy > 0)
1209 map_blank (self, self->x, self->y, self->w, dy - 1); 1290 map_blank (self, self->x, self->y, self->w, dy);
1210 else if (dy < 0) 1291 else if (dy < 0)
1211 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1292 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1212 1293
1213 self->ox += dx; self->x += dx; 1294 self->ox += dx; self->x += dx;
1214 self->oy += dy; self->y += dy; 1295 self->oy += dy; self->y += dy;
1215 1296
1216 while (self->y < 0) 1297 while (self->y < 0)
1221 self->y += MAP_EXTEND_Y; 1302 self->y += MAP_EXTEND_Y;
1222 } 1303 }
1223} 1304}
1224 1305
1225void 1306void
1226map1a_update (CFClient::Map self, SV *data_) 1307map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227 CODE: 1308 CODE:
1228{ 1309{
1229 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1310 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1230 uint8_t *data_end = (uint8_t *)SvEND (data_); 1311 uint8_t *data_end = (uint8_t *)SvEND (data_);
1231 mapcell *cell; 1312 mapcell *cell;
1232 int x, y, flags; 1313 int x, y, flags;
1233 1314
1234 while (data < data_end) 1315 while (data < data_end - 1)
1235 { 1316 {
1236 flags = (data [0] << 8) + data [1]; data += 2; 1317 flags = (data [0] << 8) + data [1]; data += 2;
1237 1318
1238 x = ((flags >> 10) & 63) + self->x; 1319 x = self->x + ((flags >> 10) & 63);
1239 y = ((flags >> 4) & 63) + self->y; 1320 y = self->y + ((flags >> 4) & 63);
1240 1321
1241 cell = map_get_cell (self, x, y); 1322 cell = map_get_cell (self, x, y);
1242 1323
1243 if (flags & 15) 1324 if (flags & 15)
1244 { 1325 {
1245 if (cell->darkness < 0) 1326 if (!cell->darkness)
1246 { 1327 {
1328 memset (cell, 0, sizeof (*cell));
1247 cell->darkness = 0; 1329 cell->darkness = 256;
1248 cell->face [0] = 0;
1249 cell->face [1] = 0;
1250 cell->face [2] = 0;
1251 } 1330 }
1252 1331
1253 cell->darkness = flags & 8 ? *data++ : 255;
1254
1255 //TODO: don't trust server data to be in-range(!) 1332 //TODO: don't trust server data to be in-range(!)
1333
1334 if (flags & 8)
1335 {
1336 if (extmap)
1337 {
1338 uint8_t ext, cmd;
1339
1340 do
1341 {
1342 ext = *data++;
1343 cmd = ext & 0x3f;
1344
1345 if (cmd < 4)
1346 cell->darkness = 255 - ext * 64 + 1;
1347 else if (cmd == 5) // health
1348 {
1349 cell->stat_width = 1;
1350 cell->stat_hp = *data++;
1351 }
1352 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width
1355 {
1356 if (*data == 4)
1357 ; // decode player tag
1358
1359 data += *data + 1;
1360 }
1361 else if (cmd == 8) // cell flags
1362 cell->flags = *data++;
1363 else if (ext & 0x40) // unknown, multibyte => skip
1364 data += *data + 1;
1365 else
1366 data++;
1367 }
1368 while (ext & 0x80);
1369 }
1370 else
1371 cell->darkness = *data++ + 1;
1372 }
1256 1373
1257 if (flags & 4) 1374 if (flags & 4)
1258 { 1375 {
1259 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1376 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1260 } 1377 }
1268 { 1385 {
1269 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1386 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1270 } 1387 }
1271 } 1388 }
1272 else 1389 else
1273 cell->darkness = -1; 1390 cell->darkness = 0;
1274 } 1391 }
1275} 1392}
1276 1393
1277SV * 1394SV *
1278mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279 CODE: 1396 CODE:
1280{ 1397{
1281 int x1, x; 1398 int x1, x;
1282 int y1, y; 1399 int y1, y;
1283 int z; 1400 int z;
1333} 1450}
1334 OUTPUT: 1451 OUTPUT:
1335 RETVAL 1452 RETVAL
1336 1453
1337void 1454void
1338draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1455draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1339 CODE: 1456 CODE:
1340{ 1457{
1341 int vx, vy; 1458 int vx, vy;
1342 int x, y, z; 1459 int x, y, z;
1343 int last_name; 1460 int last_name;
1344 mapface face; 1461 mapface face;
1345 1462
1346 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1463 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1464 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348 1465
1349 /* 1466 /*
1350 int vx = self->vx = self->w >= sw 1467 int vx = self->vx = self->w >= sw
1351 ? self->x + (self->w - sw) / 2 1468 ? self->x + (self->w - sw) / 2
1352 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1469 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1378 { 1495 {
1379 mapcell *cell = row->col + (x + vx - row->c0); 1496 mapcell *cell = row->col + (x + vx - row->c0);
1380 1497
1381 face = cell->face [z]; 1498 face = cell->face [z];
1382 1499
1383 if (face) 1500 if (face && face < self->texs)
1384 { 1501 {
1385 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [face];
1386
1387 int px = (x + 1) * 32 - tex.w; 1503 int px = (x + 1) * 32 - tex.w;
1388 int py = (y + 1) * 32 - tex.h; 1504 int py = (y + 1) * 32 - tex.h;
1389 1505
1390 if (last_name != tex.name) 1506 if (last_name != tex.name)
1391 { 1507 {
1392 glEnd (); 1508 glEnd ();
1393 last_name = tex.name;
1394 glBindTexture (GL_TEXTURE_2D, last_name); 1509 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1395 glBegin (GL_QUADS); 1510 glBegin (GL_QUADS);
1396 } 1511 }
1397 1512
1398 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1513 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1399 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1514 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1400 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1515 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1401 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1516 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1402 } 1517 }
1518
1519 if (cell->flags && z == 2)
1520 {
1521 if (cell->flags & 1)
1522 {
1523 maptex tex = self->tex [1];
1524 int px = (x + 1) * 32 - tex.w + 2;
1525 int py = (y + 1) * 32 - tex.h - 6;
1526
1527 glEnd ();
1528 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1529 glBegin (GL_QUADS);
1530
1531 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1532 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1533 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1534 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1535 }
1536 }
1403 } 1537 }
1404 } 1538 }
1405 1539
1406 glEnd (); 1540 glEnd ();
1407 1541
1408 glDisable (GL_TEXTURE_2D); 1542 glDisable (GL_TEXTURE_2D);
1409 glDisable (GL_BLEND); 1543 glDisable (GL_BLEND);
1410}
1411 1544
1545 // top layer: overlays such as the health bar
1546 for (y = 0; y < sh; y++)
1547 if (0 <= y + vy && y + vy < self->rows)
1548 {
1549 maprow *row = self->row + (y + vy);
1550
1551 for (x = 0; x < sw; x++)
1552 if (row->c0 <= x + vx && x + vx < row->c1)
1553 {
1554 mapcell *cell = row->col + (x + vx - row->c0);
1555
1556 int px = x * 32;
1557 int py = y * 32;
1558
1559 if (cell->stat_hp)
1560 {
1561 int width = cell->stat_width * 32;
1562 int thick = sh / 28 + 1 + cell->stat_width;
1563
1564 glColor3ub (0, 0, 0);
1565 glRectf (px + 1, py - thick - 2,
1566 px + width - 1, py);
1567
1568 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1569 glRectf (px + 2,
1570 py - thick - 1,
1571 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1572 }
1573 }
1574 }
1575}
1576
1412void 1577void
1413draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1578draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414 CODE: 1579 CODE:
1415{ 1580{
1416 static float color[16][3] = { 1581 static float color[16][3] = {
1417 { 0.00, 0.00, 0.00 }, 1582 { 0.00F, 0.00F, 0.00F },
1418 { 1.00, 1.00, 1.00 }, 1583 { 1.00F, 1.00F, 1.00F },
1419 { 0.00, 0.00, 0.55 }, 1584 { 0.00F, 0.00F, 0.55F },
1420 { 1.00, 0.00, 0.00 }, 1585 { 1.00F, 0.00F, 0.00F },
1421 1586
1422 { 1.00, 0.54, 0.00 }, 1587 { 1.00F, 0.54F, 0.00F },
1423 { 0.11, 0.56, 1.00 }, 1588 { 0.11F, 0.56F, 1.00F },
1424 { 0.93, 0.46, 0.00 }, 1589 { 0.93F, 0.46F, 0.00F },
1425 { 0.18, 0.54, 0.34 }, 1590 { 0.18F, 0.54F, 0.34F },
1426 1591
1427 { 0.56, 0.73, 0.56 }, 1592 { 0.56F, 0.73F, 0.56F },
1428 { 0.80, 0.80, 0.80 }, 1593 { 0.80F, 0.80F, 0.80F },
1429 { 0.55, 0.41, 0.13 }, 1594 { 0.55F, 0.41F, 0.13F },
1430 { 0.99, 0.77, 0.26 }, 1595 { 0.99F, 0.77F, 0.26F },
1431 1596
1432 { 0.74, 0.65, 0.41 }, 1597 { 0.74F, 0.65F, 0.41F },
1433 1598
1434 { 0.00, 1.00, 1.00 }, 1599 { 0.00F, 1.00F, 1.00F },
1435 { 1.00, 0.00, 1.00 }, 1600 { 1.00F, 0.00F, 1.00F },
1436 { 1.00, 1.00, 0.00 }, 1601 { 1.00F, 1.00F, 0.00F },
1437 }; 1602 };
1438 1603
1439 int x, y; 1604 int x, y;
1440 1605
1441 glEnable (GL_TEXTURE_2D); 1606 glEnable (GL_TEXTURE_2D);
1447 for (y = 0; y < h; y++) 1612 for (y = 0; y < h; y++)
1448 for (x = 0; x < w; x++) 1613 for (x = 0; x < w; x++)
1449 { 1614 {
1450 unsigned char m = data [x + y * w]; 1615 unsigned char m = data [x + y * w];
1451 1616
1617 if (m)
1618 {
1452 float *c = color [m & 15]; 1619 float *c = color [m & 15];
1453 1620
1454 float tx1 = m & 0x40 ? 0.5 : m & 0x80 ? 0.25 : 0.; 1621 float tx1 = m & 0x40 ? 0.5 : 0.;
1455 float tx2 = tx1 + 0.25; 1622 float tx2 = tx1 + 0.5;
1456 1623
1457 glColor4f (c[0], c[1], c[2], 0.75); 1624 glColor4f (c[0], c[1], c[2], 0.75);
1458 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 1625 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1459 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 1626 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1460 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 1627 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1461 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 1628 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1629 }
1462 } 1630 }
1463 1631
1464 glEnd (); 1632 glEnd ();
1465 glDisable (GL_BLEND); 1633 glDisable (GL_BLEND);
1466 glDisable (GL_TEXTURE_2D); 1634 glDisable (GL_TEXTURE_2D);
1467} 1635}
1468 1636
1469void 1637void
1470fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1638fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1471 PPCODE: 1639 PPCODE:
1472{ 1640{
1473 int vx, vy; 1641 int vx, vy;
1474 int x, y; 1642 int x, y;
1475 int sw4 = (sw + 3) & ~3; 1643 int sw4 = (sw + 3) & ~3;
1491 for (x = 0; x < sw; x++) 1659 for (x = 0; x < sw; x++)
1492 if (row->c0 <= x + vx && x + vx < row->c1) 1660 if (row->c0 <= x + vx && x + vx < row->c1)
1493 { 1661 {
1494 mapcell *cell = row->col + (x + vx - row->c0); 1662 mapcell *cell = row->col + (x + vx - row->c0);
1495 1663
1496 darkness[y * sw4 + x] = cell->darkness < 0 1664 darkness[y * sw4 + x] = cell->darkness
1665 ? 255 - (cell->darkness - 1)
1497 ? 255 - FOW_DARKNESS 1666 : 255 - FOW_DARKNESS;
1498 : 255 - cell->darkness;
1499 } 1667 }
1500 } 1668 }
1501 1669
1502 EXTEND (SP, 3); 1670 EXTEND (SP, 3);
1503 PUSHs (sv_2mortal (newSViv (sw4))); 1671 PUSHs (sv_2mortal (newSViv (sw4)));
1504 PUSHs (sv_2mortal (newSViv (sh))); 1672 PUSHs (sv_2mortal (newSViv (sh)));
1505 PUSHs (darkness_sv); 1673 PUSHs (darkness_sv);
1506} 1674}
1507 1675
1508SV * 1676SV *
1509get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1677get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1510 CODE: 1678 CODE:
1511{ 1679{
1512 int x, y, x1, y1; 1680 int x, y, x1, y1;
1513 SV *data_sv = newSV (w * h * 7 + 5); 1681 SV *data_sv = newSV (w * h * 7 + 5);
1514 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1682 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1576} 1744}
1577 OUTPUT: 1745 OUTPUT:
1578 RETVAL 1746 RETVAL
1579 1747
1580void 1748void
1581set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1749set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1582 PPCODE: 1750 PPCODE:
1583{ 1751{
1584 int x, y, z; 1752 int x, y, z;
1585 int w, h; 1753 int w, h;
1586 int x1, y1; 1754 int x1, y1;
1618 1786
1619 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1787 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1620 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1788 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1621 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1789 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1622 1790
1623 if (cell->darkness <= 0) 1791 if (cell->darkness == 0)
1624 { 1792 {
1625 cell->darkness = -1; 1793 cell->darkness = 0;
1626 1794
1627 for (z = 0; z <= 2; z++) 1795 for (z = 0; z <= 2; z++)
1628 { 1796 {
1629 cell->face[z] = face[z]; 1797 cell->face[z] = face[z];
1630 1798
1635 } 1803 }
1636 } 1804 }
1637 } 1805 }
1638} 1806}
1639 1807
1640MODULE = CFClient PACKAGE = CFClient::MixChunk 1808MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1641 1809
1642CFClient::MixChunk 1810CFPlus::MixChunk
1643new_from_file (SV *class, char *path) 1811new_from_file (SV *class, char *path)
1644 CODE: 1812 CODE:
1645 RETVAL = Mix_LoadWAV (path); 1813 RETVAL = Mix_LoadWAV (path);
1646 OUTPUT: 1814 OUTPUT:
1647 RETVAL 1815 RETVAL
1648 1816
1649void 1817void
1650DESTROY (CFClient::MixChunk self) 1818DESTROY (CFPlus::MixChunk self)
1651 CODE: 1819 CODE:
1652 Mix_FreeChunk (self); 1820 Mix_FreeChunk (self);
1653 1821
1654int 1822int
1655volume (CFClient::MixChunk self, int volume = -1) 1823volume (CFPlus::MixChunk self, int volume = -1)
1656 CODE: 1824 CODE:
1657 RETVAL = Mix_VolumeChunk (self, volume); 1825 RETVAL = Mix_VolumeChunk (self, volume);
1658 OUTPUT: 1826 OUTPUT:
1659 RETVAL 1827 RETVAL
1660 1828
1661int 1829int
1662play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1830play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1663 CODE: 1831 CODE:
1664 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1832 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1665 OUTPUT: 1833 OUTPUT:
1666 RETVAL 1834 RETVAL
1667 1835
1668MODULE = CFClient PACKAGE = CFClient::MixMusic 1836MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1669 1837
1670int 1838int
1671volume (int volume = -1) 1839volume (int volume = -1)
1672 CODE: 1840 CODE:
1673 RETVAL = Mix_VolumeMusic (volume); 1841 RETVAL = Mix_VolumeMusic (volume);
1674 OUTPUT: 1842 OUTPUT:
1675 RETVAL 1843 RETVAL
1676 1844
1677CFClient::MixMusic 1845CFPlus::MixMusic
1678new_from_file (SV *class, char *path) 1846new_from_file (SV *class, char *path)
1679 CODE: 1847 CODE:
1680 RETVAL = Mix_LoadMUS (path); 1848 RETVAL = Mix_LoadMUS (path);
1681 OUTPUT: 1849 OUTPUT:
1682 RETVAL 1850 RETVAL
1683 1851
1684void 1852void
1685DESTROY (CFClient::MixMusic self) 1853DESTROY (CFPlus::MixMusic self)
1686 CODE: 1854 CODE:
1687 Mix_FreeMusic (self); 1855 Mix_FreeMusic (self);
1688 1856
1689int 1857int
1690play (CFClient::MixMusic self, int loops = -1) 1858play (CFPlus::MixMusic self, int loops = -1)
1691 CODE: 1859 CODE:
1692 RETVAL = Mix_PlayMusic (self, loops); 1860 RETVAL = Mix_PlayMusic (self, loops);
1693 OUTPUT: 1861 OUTPUT:
1694 RETVAL 1862 RETVAL
1695 1863
1696MODULE = CFClient PACKAGE = CFClient::OpenGL 1864MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1697 1865
1698BOOT: 1866BOOT:
1699{ 1867{
1700 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1868 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1701 static const struct { 1869 static const struct {
1702 const char *name; 1870 const char *name;
1703 IV iv; 1871 IV iv;
1704 } *civ, const_iv[] = { 1872 } *civ, const_iv[] = {
1705# define const_iv(name) { # name, (IV)name } 1873# define const_iv(name) { # name, (IV)name }
1712 const_iv (GL_SCISSOR_TEST), 1880 const_iv (GL_SCISSOR_TEST),
1713 const_iv (GL_DEPTH_TEST), 1881 const_iv (GL_DEPTH_TEST),
1714 const_iv (GL_ALPHA_TEST), 1882 const_iv (GL_ALPHA_TEST),
1715 const_iv (GL_NORMALIZE), 1883 const_iv (GL_NORMALIZE),
1716 const_iv (GL_RESCALE_NORMAL), 1884 const_iv (GL_RESCALE_NORMAL),
1885 const_iv (GL_FRONT),
1886 const_iv (GL_BACK),
1717 const_iv (GL_AND), 1887 const_iv (GL_AND),
1718 const_iv (GL_ONE), 1888 const_iv (GL_ONE),
1719 const_iv (GL_ZERO), 1889 const_iv (GL_ZERO),
1720 const_iv (GL_SRC_ALPHA), 1890 const_iv (GL_SRC_ALPHA),
1721 const_iv (GL_DST_ALPHA), 1891 const_iv (GL_DST_ALPHA),
1766 const_iv (GL_SEPARABLE_2D), 1936 const_iv (GL_SEPARABLE_2D),
1767 const_iv (GL_CONVOLUTION_2D), 1937 const_iv (GL_CONVOLUTION_2D),
1768 const_iv (GL_CONVOLUTION_BORDER_MODE), 1938 const_iv (GL_CONVOLUTION_BORDER_MODE),
1769 const_iv (GL_CONSTANT_BORDER), 1939 const_iv (GL_CONSTANT_BORDER),
1770 const_iv (GL_LINES), 1940 const_iv (GL_LINES),
1941 const_iv (GL_LINE_STRIP),
1771 const_iv (GL_LINE_LOOP), 1942 const_iv (GL_LINE_LOOP),
1772 const_iv (GL_QUADS), 1943 const_iv (GL_QUADS),
1773 const_iv (GL_QUAD_STRIP), 1944 const_iv (GL_QUAD_STRIP),
1774 const_iv (GL_TRIANGLES), 1945 const_iv (GL_TRIANGLES),
1775 const_iv (GL_TRIANGLE_STRIP), 1946 const_iv (GL_TRIANGLE_STRIP),
1843 2014
1844void glPopMatrix () 2015void glPopMatrix ()
1845 2016
1846void glLoadIdentity () 2017void glLoadIdentity ()
1847 2018
2019void glDrawBuffer (int buffer)
2020
2021void glReadBuffer (int buffer)
2022
1848# near_ and far_ are due to microsofts buggy "c" compiler 2023# near_ and far_ are due to microsofts buggy "c" compiler
1849void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2024void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1850 2025
1851# near_ and far_ are due to microsofts buggy "c" compiler 2026# near_ and far_ are due to microsofts buggy "c" compiler
1852void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2027void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1881 r *= a; 2056 r *= a;
1882 g *= a; 2057 g *= a;
1883 b *= a; 2058 b *= a;
1884 } 2059 }
1885 // microsoft visual "c" rounds instead of truncating... 2060 // microsoft visual "c" rounds instead of truncating...
1886 glColor4ub (MIN ((int)(r * 256.f), 255), 2061 glColor4f (r, g, b, a);
1887 MIN ((int)(g * 256.f), 255),
1888 MIN ((int)(b * 256.f), 255),
1889 MIN ((int)(a * 256.f), 255));
1890 2062
1891void glInterleavedArrays (int format, int stride, char *data) 2063void glInterleavedArrays (int format, int stride, char *data)
1892 2064
1893void glDrawElements (int mode, int count, int type, char *indices) 2065void glDrawElements (int mode, int count, int type, char *indices)
1894 2066
1971 2143
1972void glEndList () 2144void glEndList ()
1973 2145
1974void glCallList (int list) 2146void glCallList (int list)
1975 2147
1976

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines