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.159 by root, Sun Oct 8 21:22:29 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
494NV floor (NV x)
495
496NV ceil (NV x)
497
441void 498void
442pango_init () 499pango_init ()
443 CODE: 500 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{ 501{
446 {
447 ft2_fontmap = pango_ft2_font_map_new (); 502 opengl_fontmap = pango_opengl_font_map_new ();
448 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);
449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 504 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} 505}
467 506
468int 507int
469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 508SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470 509
471void 510void
472SDL_Quit () 511SDL_Quit ()
473 512
474void 513void
481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 520 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 521 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 522 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484 523
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 524 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 525 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487 526
488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492 531
493 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
494 537
495 SDL_EnableUNICODE (1); 538 SDL_EnableUNICODE (1);
496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497 540
498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 628 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 629 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break; 630 break;
588 } 631 }
589 632
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 633 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591 } 634 }
592} 635}
593 636
594int 637int
595Mix_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)
609#ifndef _WIN32 652#ifndef _WIN32
610 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
611#endif 654#endif
612 655
613void 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
614add_font (char *file) 686add_font (char *file)
615 CODE: 687 CODE:
616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
621 689
622void 690void
623load_image_inline (SV *image_) 691load_image_inline (SV *image_)
624 ALIAS: 692 ALIAS:
625 load_image_file = 1 693 load_image_file = 1
667 735
668 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669 737
670 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
671 739
740 SDL_LockSurface (surface2);
672 EXTEND (SP, 5); 741 EXTEND (SP, 6);
673 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
674 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
675 SDL_LockSurface (surface2);
676 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 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))); 745 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
681 749
682 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
683 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
684} 752}
685 753
724 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
725#endif 793#endif
726 _exit (1); 794 _exit (1);
727 795
728void 796void
729_exit (int retval) 797_exit (int retval = 0)
730 CODE: 798 CODE:
731 _exit (retval); 799 _exit (retval);
732 800
733MODULE = CFClient PACKAGE = CFClient::Font 801MODULE = CFPlus PACKAGE = CFPlus::Font
734 802
735CFClient::Font 803CFPlus::Font
736new_from_file (SV *class, char *path, int id = 0) 804new_from_file (SV *class, char *path, int id = 0)
737 CODE: 805 CODE:
738{ 806{
739 int count; 807 int count;
740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
743} 811}
744 OUTPUT: 812 OUTPUT:
745 RETVAL 813 RETVAL
746 814
747void 815void
748DESTROY (CFClient::Font self) 816DESTROY (CFPlus::Font self)
749 CODE: 817 CODE:
750 pango_font_description_free (self); 818 pango_font_description_free (self);
751 819
752void 820void
753make_default (CFClient::Font self) 821make_default (CFPlus::Font self)
754 CODE: 822 CODE:
755 default_font = self; 823 default_font = self;
756 824
757MODULE = CFClient PACKAGE = CFClient::Layout 825MODULE = CFPlus PACKAGE = CFPlus::Layout
758 826
759CFClient::Layout 827void
760new (SV *class, int rgba = 0) 828reset_glyph_cache ()
829 CODE:
830 tc_clear ();
831
832CFPlus::Layout
833new (SV *class)
761 CODE: 834 CODE:
762 New (0, RETVAL, 1, struct cf_layout); 835 New (0, RETVAL, 1, struct cf_layout);
763 836
764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 837 RETVAL->pl = pango_layout_new (opengl_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.; 838 RETVAL->r = 1.;
767 RETVAL->g = 1.; 839 RETVAL->g = 1.;
768 RETVAL->b = 1.; 840 RETVAL->b = 1.;
769 RETVAL->a = 1.; 841 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT; 842 RETVAL->base_height = MIN_FONT_HEIGHT;
774 layout_update_font (RETVAL); 846 layout_update_font (RETVAL);
775 OUTPUT: 847 OUTPUT:
776 RETVAL 848 RETVAL
777 849
778void 850void
779DESTROY (CFClient::Layout self) 851DESTROY (CFPlus::Layout self)
780 CODE: 852 CODE:
781 g_object_unref (self->pl); 853 g_object_unref (self->pl);
782 Safefree (self); 854 Safefree (self);
783 855
784int
785is_rgba (CFClient::Layout self)
786 CODE:
787 RETVAL = self->rgba;
788 OUTPUT:
789 RETVAL
790
791void 856void
792set_text (CFClient::Layout self, SV *text_) 857set_text (CFPlus::Layout self, SV *text_)
793 CODE: 858 CODE:
794{ 859{
795 STRLEN textlen; 860 STRLEN textlen;
796 char *text = SvPVutf8 (text_, textlen); 861 char *text = SvPVutf8 (text_, textlen);
797 862
798 pango_layout_set_text (self->pl, text, textlen); 863 pango_layout_set_text (self->pl, text, textlen);
799} 864}
800 865
801void 866void
802set_markup (CFClient::Layout self, SV *text_) 867set_markup (CFPlus::Layout self, SV *text_)
803 CODE: 868 CODE:
804{ 869{
805 STRLEN textlen; 870 STRLEN textlen;
806 char *text = SvPVutf8 (text_, textlen); 871 char *text = SvPVutf8 (text_, textlen);
807 872
808 pango_layout_set_markup (self->pl, text, textlen); 873 pango_layout_set_markup (self->pl, text, textlen);
809} 874}
810 875
876void
877set_shapes (CFPlus::Layout self, ...)
878 CODE:
879{
880 PangoAttrList *attrs = 0;
881 const char *text = pango_layout_get_text (self->pl);
882 const char *pos = text;
883 int arg = 4;
884
885 while (arg < items && (pos = strstr (pos, OBJ_STR)))
886 {
887 PangoRectangle inkrect, rect;
888 PangoAttribute *attr;
889
890 int x = SvIV (ST (arg - 3));
891 int y = SvIV (ST (arg - 2));
892 int w = SvIV (ST (arg - 1));
893 int h = SvIV (ST (arg ));
894
895 inkrect.x = 0;
896 inkrect.y = 0;
897 inkrect.width = 0;
898 inkrect.height = 0;
899
900 rect.x = x * PANGO_SCALE;
901 rect.y = y * PANGO_SCALE;
902 rect.width = w * PANGO_SCALE;
903 rect.height = h * PANGO_SCALE;
904
905 if (!attrs)
906 attrs = pango_layout_get_attributes (self->pl);
907
908 attr = pango_attr_shape_new (&inkrect, &rect);
909 attr->start_index = pos - text;
910 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
911 pango_attr_list_insert (attrs, attr);
912
913 arg += 4;
914 pos += sizeof (OBJ_STR) - 1;
915 }
916
917 if (attrs)
918 pango_layout_set_attributes (self->pl, attrs);
919}
920
921void
922get_shapes (CFPlus::Layout self)
923 PPCODE:
924{
925 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
926
927 do
928 {
929 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
930
931 if (run && shape_attr_p (run))
932 {
933 PangoRectangle extents;
934 pango_layout_iter_get_run_extents (iter, 0, &extents);
935
936 EXTEND (SP, 2);
937 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
938 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
939 }
940 }
941 while (pango_layout_iter_next_run (iter));
942
943 pango_layout_iter_free (iter);
944}
945
946int
947has_wrapped (CFPlus::Layout self)
948 CODE:
949{
950 int lines = 1;
951 const char *text = pango_layout_get_text (self->pl);
952
953 while (*text)
954 lines += *text++ == '\n';
955
956 RETVAL = lines < pango_layout_get_line_count (self->pl);
957}
958 OUTPUT:
959 RETVAL
960
811SV * 961SV *
812get_text (CFClient::Layout self) 962get_text (CFPlus::Layout self)
813 CODE: 963 CODE:
814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815 sv_utf8_decode (RETVAL); 965 sv_utf8_decode (RETVAL);
816 OUTPUT: 966 OUTPUT:
817 RETVAL 967 RETVAL
818 968
819void 969void
820set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 970set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821 CODE: 971 CODE:
822 self->r = r; 972 self->r = r;
823 self->g = g; 973 self->g = g;
824 self->b = b; 974 self->b = b;
825 self->a = a; 975 self->a = a;
826 976
827void 977void
828set_font (CFClient::Layout self, CFClient::Font font = 0) 978set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829 CODE: 979 CODE:
830 if (self->font != font) 980 if (self->font != font)
831 { 981 {
832 self->font = font; 982 self->font = font;
833 layout_update_font (self); 983 layout_update_font (self);
834 } 984 }
835 985
836void 986void
837set_height (CFClient::Layout self, int base_height) 987set_height (CFPlus::Layout self, int base_height)
838 CODE: 988 CODE:
839 if (self->base_height != base_height) 989 if (self->base_height != base_height)
840 { 990 {
841 self->base_height = base_height; 991 self->base_height = base_height;
842 layout_update_font (self); 992 layout_update_font (self);
843 } 993 }
844 994
845void 995void
846set_width (CFClient::Layout self, int max_width = -1) 996set_width (CFPlus::Layout self, int max_width = -1)
847 CODE: 997 CODE:
848 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 998 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849 999
850void 1000void
851set_indent (CFClient::Layout self, int indent) 1001set_indent (CFPlus::Layout self, int indent)
852 CODE: 1002 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854 1004
855void 1005void
856set_spacing (CFClient::Layout self, int spacing) 1006set_spacing (CFPlus::Layout self, int spacing)
857 CODE: 1007 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859 1009
860void 1010void
861set_ellipsise (CFClient::Layout self, int ellipsise) 1011set_ellipsise (CFPlus::Layout self, int ellipsise)
862 CODE: 1012 CODE:
863 pango_layout_set_ellipsize (self->pl, 1013 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE 1017 : PANGO_ELLIPSIZE_NONE
868 ); 1018 );
869 1019
870void 1020void
871set_single_paragraph_mode (CFClient::Layout self, int spm) 1021set_single_paragraph_mode (CFPlus::Layout self, int spm)
872 CODE: 1022 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874 1024
875void 1025void
876size (CFClient::Layout self) 1026size (CFPlus::Layout self)
877 PPCODE: 1027 PPCODE:
878{ 1028{
879 int w, h; 1029 int w, h;
880 1030
881 layout_get_pixel_size (self, &w, &h); 1031 layout_get_pixel_size (self, &w, &h);
884 PUSHs (sv_2mortal (newSViv (w))); 1034 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h))); 1035 PUSHs (sv_2mortal (newSViv (h)));
886} 1036}
887 1037
888int 1038int
1039descent (CFPlus::Layout self)
1040 CODE:
1041{
1042 PangoRectangle rect;
1043 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1044 pango_layout_line_get_pixel_extents (line, 0, &rect);
1045 RETVAL = PANGO_DESCENT (rect);
1046}
1047 OUTPUT:
1048 RETVAL
1049
1050int
889xy_to_index (CFClient::Layout self, int x, int y) 1051xy_to_index (CFPlus::Layout self, int x, int y)
890 CODE: 1052 CODE:
891{ 1053{
892 int index, trailing; 1054 int index, trailing;
893 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1055 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894 RETVAL = index; 1056 RETVAL = index;
895} 1057}
896 OUTPUT: 1058 OUTPUT:
897 RETVAL 1059 RETVAL
898 1060
899void 1061void
900cursor_pos (CFClient::Layout self, int index) 1062cursor_pos (CFPlus::Layout self, int index)
901 PPCODE: 1063 PPCODE:
902{ 1064{
903 PangoRectangle strong_pos; 1065 PangoRectangle strong_pos;
904 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905 1067
908 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910} 1072}
911 1073
912void 1074void
913render (CFClient::Layout self) 1075render (CFPlus::Layout self, float x, float y, int flags = 0)
914 PPCODE: 1076 PPCODE:
915{ 1077 pango_opengl_render_layout_subpixel (
916 SV *retval; 1078 self->pl,
917 int w, h; 1079 x * PANGO_SCALE, y * PANGO_SCALE,
918 1080 self->r, self->g, self->b, self->a,
919 layout_get_pixel_size (self, &w, &h);
920
921 if (self->rgba)
922 { 1081 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 } 1082 );
975 else
976 {
977 FT_Bitmap bitmap;
978 1083
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 1084MODULE = CFPlus PACKAGE = CFPlus::Texture
1004 1085
1005void 1086void
1006pad2pot (SV *data_, SV *w_, SV *h_) 1087pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE: 1088 CODE:
1008{ 1089{
1038 } 1119 }
1039 } 1120 }
1040} 1121}
1041 1122
1042void 1123void
1043draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1124draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1044 PROTOTYPE: $$$;$$ 1125 PROTOTYPE: $$$;$$
1045 ALIAS: 1126 ALIAS:
1046 draw_quad_alpha = 1 1127 draw_quad_alpha = 1
1047 draw_quad_alpha_premultiplied = 2 1128 draw_quad_alpha_premultiplied = 2
1048 CODE: 1129 CODE:
1086 glDisable (GL_ALPHA_TEST); 1167 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND); 1168 glDisable (GL_BLEND);
1088 } 1169 }
1089} 1170}
1090 1171
1091MODULE = CFClient PACKAGE = CFClient::Map 1172MODULE = CFPlus PACKAGE = CFPlus::Map
1092 1173
1093CFClient::Map 1174CFPlus::Map
1094new (SV *class, int map_width, int map_height) 1175new (SV *class, int map_width, int map_height)
1095 CODE: 1176 CODE:
1096 New (0, RETVAL, 1, struct map); 1177 New (0, RETVAL, 1, struct map);
1097 RETVAL->x = 0; 1178 RETVAL->x = 0;
1098 RETVAL->y = 0; 1179 RETVAL->y = 0;
1108 RETVAL->row = 0; 1189 RETVAL->row = 0;
1109 OUTPUT: 1190 OUTPUT:
1110 RETVAL 1191 RETVAL
1111 1192
1112void 1193void
1113DESTROY (CFClient::Map self) 1194DESTROY (CFPlus::Map self)
1114 CODE: 1195 CODE:
1115{ 1196{
1116 map_clear (self); 1197 map_clear (self);
1117 Safefree (self->face); 1198 Safefree (self->face);
1118 Safefree (self->tex); 1199 Safefree (self->tex);
1119 Safefree (self); 1200 Safefree (self);
1120} 1201}
1121 1202
1122void 1203void
1123clear (CFClient::Map self) 1204clear (CFPlus::Map self)
1124 CODE: 1205 CODE:
1125 map_clear (self); 1206 map_clear (self);
1126 1207
1127void 1208void
1128set_face (CFClient::Map self, int face, int texid) 1209set_face (CFPlus::Map self, int face, int texid)
1129 CODE: 1210 CODE:
1130{ 1211{
1131 while (self->faces <= face) 1212 while (self->faces <= face)
1132 { 1213 {
1133 Append (mapface, self->face, self->faces, self->faces); 1214 Append (mapface, self->face, self->faces, self->faces);
1136 1217
1137 self->face [face] = texid; 1218 self->face [face] = texid;
1138} 1219}
1139 1220
1140void 1221void
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) 1222set_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: 1223 CODE:
1143{ 1224{
1144 while (self->texs <= texid) 1225 while (self->texs <= texid)
1145 { 1226 {
1146 Append (maptex, self->tex, self->texs, self->texs); 1227 Append (maptex, self->tex, self->texs, self->texs);
1170 // from transparent color bleeding and ugly wrapping effects. 1251 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172} 1253}
1173 1254
1174int 1255int
1175ox (CFClient::Map self) 1256ox (CFPlus::Map self)
1176 ALIAS: 1257 ALIAS:
1177 oy = 1 1258 oy = 1
1178 x = 2 1259 x = 2
1179 y = 3 1260 y = 3
1180 w = 4 1261 w = 4
1191 } 1272 }
1192 OUTPUT: 1273 OUTPUT:
1193 RETVAL 1274 RETVAL
1194 1275
1195void 1276void
1196scroll (CFClient::Map self, int dx, int dy) 1277scroll (CFPlus::Map self, int dx, int dy)
1197 CODE: 1278 CODE:
1198{ 1279{
1199 if (dx > 0) 1280 if (dx > 0)
1200 map_blank (self, self->x, self->y, dx - 1, self->h); 1281 map_blank (self, self->x, self->y, dx, self->h);
1201 else if (dx < 0) 1282 else if (dx < 0)
1202 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1283 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1203 1284
1204 if (dy > 0) 1285 if (dy > 0)
1205 map_blank (self, self->x, self->y, self->w, dy - 1); 1286 map_blank (self, self->x, self->y, self->w, dy);
1206 else if (dy < 0) 1287 else if (dy < 0)
1207 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1288 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1208 1289
1209 self->ox += dx; self->x += dx; 1290 self->ox += dx; self->x += dx;
1210 self->oy += dy; self->y += dy; 1291 self->oy += dy; self->y += dy;
1211 1292
1212 while (self->y < 0) 1293 while (self->y < 0)
1217 self->y += MAP_EXTEND_Y; 1298 self->y += MAP_EXTEND_Y;
1218 } 1299 }
1219} 1300}
1220 1301
1221void 1302void
1222map1a_update (CFClient::Map self, SV *data_) 1303map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223 CODE: 1304 CODE:
1224{ 1305{
1225 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226 uint8_t *data_end = (uint8_t *)SvEND (data_); 1307 uint8_t *data_end = (uint8_t *)SvEND (data_);
1227 mapcell *cell; 1308 mapcell *cell;
1228 int x, y, flags; 1309 int x, y, flags;
1229 1310
1230 while (data < data_end) 1311 while (data < data_end - 1)
1231 { 1312 {
1232 flags = (data [0] << 8) + data [1]; data += 2; 1313 flags = (data [0] << 8) + data [1]; data += 2;
1233 1314
1234 x = ((flags >> 10) & 63) + self->x; 1315 x = self->x + ((flags >> 10) & 63);
1235 y = ((flags >> 4) & 63) + self->y; 1316 y = self->y + ((flags >> 4) & 63);
1236 1317
1237 cell = map_get_cell (self, x, y); 1318 cell = map_get_cell (self, x, y);
1238 1319
1239 if (flags & 15) 1320 if (flags & 15)
1240 { 1321 {
1241 if (cell->darkness < 0) 1322 if (!cell->darkness)
1242 { 1323 {
1324 memset (cell, 0, sizeof (*cell));
1243 cell->darkness = 0; 1325 cell->darkness = 256;
1244 cell->face [0] = 0;
1245 cell->face [1] = 0;
1246 cell->face [2] = 0;
1247 } 1326 }
1248 1327
1249 cell->darkness = flags & 8 ? *data++ : 255;
1250
1251 //TODO: don't trust server data to be in-range(!) 1328 //TODO: don't trust server data to be in-range(!)
1329
1330 if (flags & 8)
1331 {
1332 if (extmap)
1333 {
1334 uint8_t ext, cmd;
1335
1336 do
1337 {
1338 ext = *data++;
1339 cmd = ext & 0x3f;
1340
1341 if (cmd < 4)
1342 cell->darkness = 255 - ext * 64 + 1;
1343 else if (cmd == 5) // health
1344 {
1345 cell->stat_width = 1;
1346 cell->stat_hp = *data++;
1347 }
1348 else if (cmd == 6) // monster width
1349 cell->stat_width = *data++ + 1;
1350 else if (cmd == 0x47) // monster width
1351 {
1352 if (*data == 4)
1353 ; // decode player tag
1354
1355 data += *data + 1;
1356 }
1357 else if (cmd == 8) // cell flags
1358 cell->flags = *data++;
1359 else if (ext & 0x40) // unknown, multibyte => skip
1360 data += *data + 1;
1361 else
1362 data++;
1363 }
1364 while (ext & 0x80);
1365 }
1366 else
1367 cell->darkness = *data++ + 1;
1368 }
1252 1369
1253 if (flags & 4) 1370 if (flags & 4)
1254 { 1371 {
1255 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1372 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1256 } 1373 }
1264 { 1381 {
1265 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1382 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1266 } 1383 }
1267 } 1384 }
1268 else 1385 else
1269 cell->darkness = -1; 1386 cell->darkness = 0;
1270 } 1387 }
1271} 1388}
1272 1389
1273SV * 1390SV *
1274mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275 CODE: 1392 CODE:
1276{ 1393{
1277 int x1, x; 1394 int x1, x;
1278 int y1, y; 1395 int y1, y;
1279 int z; 1396 int z;
1329} 1446}
1330 OUTPUT: 1447 OUTPUT:
1331 RETVAL 1448 RETVAL
1332 1449
1333void 1450void
1334draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335 PPCODE: 1452 CODE:
1336{ 1453{
1337 int vx, vy; 1454 int vx, vy;
1338 int x, y, z; 1455 int x, y, z;
1339 int last_name; 1456 int last_name;
1340 mapface face; 1457 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 1458
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; 1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350 vy = self->y + (self->h - sh) / 2 - shift_y; 1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351 1461
1352 /* 1462 /*
1353 int vx = self->vx = self->w >= sw 1463 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2 1464 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1465 : 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)); 1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360 */ 1470 */
1361 1471
1362 glColor4ub (255, 255, 255, 255); 1472 glColor4ub (255, 255, 255, 255);
1363 1473
1474 glEnable (GL_BLEND);
1364 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 glEnable (GL_BLEND);
1366 glEnable (GL_TEXTURE_2D); 1476 glEnable (GL_TEXTURE_2D);
1367 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368 1478
1369 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1370 1480
1379 for (x = 0; x < sw; x++) 1489 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1490 if (row->c0 <= x + vx && x + vx < row->c1)
1381 { 1491 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1492 mapcell *cell = row->col + (x + vx - row->c0);
1383 1493
1384 darkness[y * sw4 + x] = cell->darkness < 0
1385 ? 255 - FOW_DARKNESS
1386 : 255 - cell->darkness;
1387
1388 face = cell->face [z]; 1494 face = cell->face [z];
1389 1495
1390 if (face) 1496 if (face && face < self->texs)
1391 { 1497 {
1392 maptex tex = self->tex [face]; 1498 maptex tex = self->tex [face];
1393
1394 int px = (x + 1) * 32 - tex.w; 1499 int px = (x + 1) * 32 - tex.w;
1395 int py = (y + 1) * 32 - tex.h; 1500 int py = (y + 1) * 32 - tex.h;
1396 1501
1397 if (last_name != tex.name) 1502 if (last_name != tex.name)
1398 { 1503 {
1399 glEnd (); 1504 glEnd ();
1400 last_name = tex.name;
1401 glBindTexture (GL_TEXTURE_2D, last_name); 1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1402 glBegin (GL_QUADS); 1506 glBegin (GL_QUADS);
1403 } 1507 }
1404 1508
1405 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1406 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1407 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1511 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1408 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1409 } 1513 }
1514
1515 if (cell->flags && z == 2)
1516 {
1517 if (cell->flags & 1)
1518 {
1519 maptex tex = self->tex [1];
1520 int px = (x + 1) * 32 - tex.w + 2;
1521 int py = (y + 1) * 32 - tex.h - 6;
1522
1523 glEnd ();
1524 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1525 glBegin (GL_QUADS);
1526
1527 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1528 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1529 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1530 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1531 }
1532 }
1410 } 1533 }
1411 } 1534 }
1412 1535
1413 glEnd (); 1536 glEnd ();
1414 1537
1415 glDisable (GL_TEXTURE_2D); 1538 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND); 1539 glDisable (GL_BLEND);
1540
1541 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows)
1544 {
1545 maprow *row = self->row + (y + vy);
1546
1547 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1)
1549 {
1550 mapcell *cell = row->col + (x + vx - row->c0);
1551
1552 int px = x * 32;
1553 int py = y * 32;
1554
1555 if (cell->stat_hp)
1556 {
1557 int width = cell->stat_width * 32;
1558 int thick = sh / 28 + 1 + cell->stat_width;
1559
1560 glColor3ub (0, 0, 0);
1561 glRectf (px + 1, py - thick - 2,
1562 px + width - 1, py);
1563
1564 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1565 glRectf (px + 2,
1566 py - thick - 1,
1567 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1568 }
1569 }
1570 }
1571}
1572
1573void
1574draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1575 CODE:
1576{
1577 static float color[16][3] = {
1578 { 0.00F, 0.00F, 0.00F },
1579 { 1.00F, 1.00F, 1.00F },
1580 { 0.00F, 0.00F, 0.55F },
1581 { 1.00F, 0.00F, 0.00F },
1582
1583 { 1.00F, 0.54F, 0.00F },
1584 { 0.11F, 0.56F, 1.00F },
1585 { 0.93F, 0.46F, 0.00F },
1586 { 0.18F, 0.54F, 0.34F },
1587
1588 { 0.56F, 0.73F, 0.56F },
1589 { 0.80F, 0.80F, 0.80F },
1590 { 0.55F, 0.41F, 0.13F },
1591 { 0.99F, 0.77F, 0.26F },
1592
1593 { 0.74F, 0.65F, 0.41F },
1594
1595 { 0.00F, 1.00F, 1.00F },
1596 { 1.00F, 0.00F, 1.00F },
1597 { 1.00F, 1.00F, 0.00F },
1598 };
1599
1600 int x, y;
1601
1602 glEnable (GL_TEXTURE_2D);
1603 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1604 glEnable (GL_BLEND);
1605 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1606 glBegin (GL_QUADS);
1607
1608 for (y = 0; y < h; y++)
1609 for (x = 0; x < w; x++)
1610 {
1611 unsigned char m = data [x + y * w];
1612
1613 if (m)
1614 {
1615 float *c = color [m & 15];
1616
1617 float tx1 = m & 0x40 ? 0.5 : 0.;
1618 float tx2 = tx1 + 0.5;
1619
1620 glColor4f (c[0], c[1], c[2], 0.75);
1621 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1622 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1623 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1624 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1625 }
1626 }
1627
1628 glEnd ();
1629 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D);
1631}
1632
1633void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1635 PPCODE:
1636{
1637 int vx, vy;
1638 int x, y;
1639 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642
1643 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh);
1646
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1649
1650 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows)
1652 {
1653 maprow *row = self->row + (y + vy);
1654
1655 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1)
1657 {
1658 mapcell *cell = row->col + (x + vx - row->c0);
1659
1660 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS;
1663 }
1664 }
1417 1665
1418 EXTEND (SP, 3); 1666 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 1667 PUSHs (sv_2mortal (newSViv (sw4)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 1668 PUSHs (sv_2mortal (newSViv (sh)));
1421 PUSHs (darkness_sv); 1669 PUSHs (darkness_sv);
1422} 1670}
1423 1671
1424SV * 1672SV *
1425get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1673get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426 CODE: 1674 CODE:
1427{ 1675{
1428 int x, y, x1, y1; 1676 int x, y, x1, y1;
1429 SV *data_sv = newSV (w * h * 7 + 5); 1677 SV *data_sv = newSV (w * h * 7 + 5);
1430 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1492} 1740}
1493 OUTPUT: 1741 OUTPUT:
1494 RETVAL 1742 RETVAL
1495 1743
1496void 1744void
1497set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498 PPCODE: 1746 PPCODE:
1499{ 1747{
1500 int x, y, z; 1748 int x, y, z;
1501 int w, h; 1749 int w, h;
1502 int x1, y1; 1750 int x1, y1;
1534 1782
1535 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1536 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1537 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1538 1786
1539 if (cell->darkness <= 0) 1787 if (cell->darkness == 0)
1540 { 1788 {
1541 cell->darkness = -1; 1789 cell->darkness = 0;
1542 1790
1543 for (z = 0; z <= 2; z++) 1791 for (z = 0; z <= 2; z++)
1544 { 1792 {
1545 cell->face[z] = face[z]; 1793 cell->face[z] = face[z];
1546 1794
1551 } 1799 }
1552 } 1800 }
1553 } 1801 }
1554} 1802}
1555 1803
1556MODULE = CFClient PACKAGE = CFClient::MixChunk 1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557 1805
1558CFClient::MixChunk 1806CFPlus::MixChunk
1559new_from_file (SV *class, char *path) 1807new_from_file (SV *class, char *path)
1560 CODE: 1808 CODE:
1561 RETVAL = Mix_LoadWAV (path); 1809 RETVAL = Mix_LoadWAV (path);
1562 OUTPUT: 1810 OUTPUT:
1563 RETVAL 1811 RETVAL
1564 1812
1565void 1813void
1566DESTROY (CFClient::MixChunk self) 1814DESTROY (CFPlus::MixChunk self)
1567 CODE: 1815 CODE:
1568 Mix_FreeChunk (self); 1816 Mix_FreeChunk (self);
1569 1817
1570int 1818int
1571volume (CFClient::MixChunk self, int volume = -1) 1819volume (CFPlus::MixChunk self, int volume = -1)
1572 CODE: 1820 CODE:
1573 RETVAL = Mix_VolumeChunk (self, volume); 1821 RETVAL = Mix_VolumeChunk (self, volume);
1574 OUTPUT: 1822 OUTPUT:
1575 RETVAL 1823 RETVAL
1576 1824
1577int 1825int
1578play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1826play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579 CODE: 1827 CODE:
1580 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1828 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581 OUTPUT: 1829 OUTPUT:
1582 RETVAL 1830 RETVAL
1583 1831
1584MODULE = CFClient PACKAGE = CFClient::MixMusic 1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585 1833
1586int 1834int
1587volume (int volume = -1) 1835volume (int volume = -1)
1588 CODE: 1836 CODE:
1589 RETVAL = Mix_VolumeMusic (volume); 1837 RETVAL = Mix_VolumeMusic (volume);
1590 OUTPUT: 1838 OUTPUT:
1591 RETVAL 1839 RETVAL
1592 1840
1593CFClient::MixMusic 1841CFPlus::MixMusic
1594new_from_file (SV *class, char *path) 1842new_from_file (SV *class, char *path)
1595 CODE: 1843 CODE:
1596 RETVAL = Mix_LoadMUS (path); 1844 RETVAL = Mix_LoadMUS (path);
1597 OUTPUT: 1845 OUTPUT:
1598 RETVAL 1846 RETVAL
1599 1847
1600void 1848void
1601DESTROY (CFClient::MixMusic self) 1849DESTROY (CFPlus::MixMusic self)
1602 CODE: 1850 CODE:
1603 Mix_FreeMusic (self); 1851 Mix_FreeMusic (self);
1604 1852
1605int 1853int
1606play (CFClient::MixMusic self, int loops = -1) 1854play (CFPlus::MixMusic self, int loops = -1)
1607 CODE: 1855 CODE:
1608 RETVAL = Mix_PlayMusic (self, loops); 1856 RETVAL = Mix_PlayMusic (self, loops);
1609 OUTPUT: 1857 OUTPUT:
1610 RETVAL 1858 RETVAL
1611 1859
1612MODULE = CFClient PACKAGE = CFClient::OpenGL 1860MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613 1861
1614BOOT: 1862BOOT:
1615{ 1863{
1616 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617 static const struct { 1865 static const struct {
1618 const char *name; 1866 const char *name;
1619 IV iv; 1867 IV iv;
1620 } *civ, const_iv[] = { 1868 } *civ, const_iv[] = {
1621# define const_iv(name) { # name, (IV)name } 1869# define const_iv(name) { # name, (IV)name }
1628 const_iv (GL_SCISSOR_TEST), 1876 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST), 1877 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST), 1878 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE), 1879 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL), 1880 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT),
1882 const_iv (GL_BACK),
1633 const_iv (GL_AND), 1883 const_iv (GL_AND),
1634 const_iv (GL_ONE), 1884 const_iv (GL_ONE),
1635 const_iv (GL_ZERO), 1885 const_iv (GL_ZERO),
1636 const_iv (GL_SRC_ALPHA), 1886 const_iv (GL_SRC_ALPHA),
1637 const_iv (GL_DST_ALPHA), 1887 const_iv (GL_DST_ALPHA),
1638 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1888 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639 const_iv (GL_ONE_MINUS_DST_ALPHA), 1889 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE), 1890 const_iv (GL_SRC_ALPHA_SATURATE),
1641 const_iv (GL_RGB), 1891 const_iv (GL_RGB),
1642 const_iv (GL_RGBA), 1892 const_iv (GL_RGBA),
1893 const_iv (GL_RGBA4),
1894 const_iv (GL_RGBA8),
1895 const_iv (GL_RGB5_A1),
1643 const_iv (GL_UNSIGNED_BYTE), 1896 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT), 1897 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT), 1898 const_iv (GL_UNSIGNED_INT),
1646 const_iv (GL_ALPHA), 1899 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY), 1900 const_iv (GL_INTENSITY),
1679 const_iv (GL_SEPARABLE_2D), 1932 const_iv (GL_SEPARABLE_2D),
1680 const_iv (GL_CONVOLUTION_2D), 1933 const_iv (GL_CONVOLUTION_2D),
1681 const_iv (GL_CONVOLUTION_BORDER_MODE), 1934 const_iv (GL_CONVOLUTION_BORDER_MODE),
1682 const_iv (GL_CONSTANT_BORDER), 1935 const_iv (GL_CONSTANT_BORDER),
1683 const_iv (GL_LINES), 1936 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP),
1684 const_iv (GL_LINE_LOOP), 1938 const_iv (GL_LINE_LOOP),
1685 const_iv (GL_QUADS), 1939 const_iv (GL_QUADS),
1686 const_iv (GL_QUAD_STRIP), 1940 const_iv (GL_QUAD_STRIP),
1687 const_iv (GL_TRIANGLES), 1941 const_iv (GL_TRIANGLES),
1688 const_iv (GL_TRIANGLE_STRIP), 1942 const_iv (GL_TRIANGLE_STRIP),
1721 OUTPUT: 1975 OUTPUT:
1722 RETVAL 1976 RETVAL
1723 1977
1724int glGetError () 1978int glGetError ()
1725 1979
1980void glFinish ()
1981
1726void glClear (int mask) 1982void glClear (int mask)
1727 1983
1728void glClearColor (float r, float g, float b, float a = 1.0) 1984void glClearColor (float r, float g, float b, float a = 1.0)
1729 PROTOTYPE: @ 1985 PROTOTYPE: @
1730 1986
1753void glPushMatrix () 2009void glPushMatrix ()
1754 2010
1755void glPopMatrix () 2011void glPopMatrix ()
1756 2012
1757void glLoadIdentity () 2013void glLoadIdentity ()
2014
2015void glDrawBuffer (int buffer)
2016
2017void glReadBuffer (int buffer)
1758 2018
1759# near_ and far_ are due to microsofts buggy "c" compiler 2019# near_ and far_ are due to microsofts buggy "c" compiler
1760void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2020void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761 2021
1762# near_ and far_ are due to microsofts buggy "c" compiler 2022# near_ and far_ are due to microsofts buggy "c" compiler
1792 r *= a; 2052 r *= a;
1793 g *= a; 2053 g *= a;
1794 b *= a; 2054 b *= a;
1795 } 2055 }
1796 // microsoft visual "c" rounds instead of truncating... 2056 // microsoft visual "c" rounds instead of truncating...
1797 glColor4ub (MIN ((int)(r * 256.f), 255), 2057 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 2058
1802void glInterleavedArrays (int format, int stride, char *data) 2059void glInterleavedArrays (int format, int stride, char *data)
1803 2060
1804void glDrawElements (int mode, int count, int type, char *indices) 2061void glDrawElements (int mode, int count, int type, char *indices)
1805 2062
1882 2139
1883void glEndList () 2140void glEndList ()
1884 2141
1885void glCallList (int list) 2142void glCallList (int list)
1886 2143
1887

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines