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.116 by root, Thu Jun 15 08:29:16 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines