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.106 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 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>
20#include <stdlib.h>
15 21
16#include <SDL.h> 22#include <SDL.h>
17#include <SDL_endian.h> 23#include <SDL_endian.h>
18#include <SDL_image.h> 24#include <SDL_image.h>
19#include <SDL_mixer.h> 25#include <SDL_mixer.h>
20#include <SDL_opengl.h> 26#include <SDL_opengl.h>
21 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
22#include <glib/gmacros.h> 31#include <glib/gmacros.h>
23 32
24#include <pango/pango.h> 33#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 34
29#ifndef _WIN32 35#ifndef _WIN32
30# include <sys/types.h> 36# include <sys/types.h>
31# include <sys/socket.h> 37# include <sys/socket.h>
32# include <netinet/in.h> 38# include <netinet/in.h>
39 typedef signed char int8_t; 45 typedef signed char int8_t;
40 typedef signed short int16_t; 46 typedef signed short int16_t;
41 typedef signed int int32_t; 47 typedef signed int int32_t;
42#endif 48#endif
43 49
44#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45 51
46#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
47 53
48#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
50 56
51#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
52 64
53static struct 65static struct
54{ 66{
55#define GL_FUNC(ptr,name) ptr name; 67#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 68#include "glfunc.h"
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 78 else
67 glBlendFunc (sa, da); 79 glBlendFunc (sa, da);
68} 80}
69 81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
70typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
72 90
73typedef 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}
74 110
75typedef struct cf_layout { 111typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
79 int base_height; 114 int base_height;
80 CFClient__Font font; 115 CFPlus__Font font;
81} *CFClient__Layout; 116} *CFPlus__Layout;
82 117
83static CFClient__Font default_font; 118static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
86 121
87static void 122static void
88substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
89{ 124{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef _WIN32 126#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#else 128#endif
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
96} 130}
97 131
98static void 132static void
99layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
100{ 134{
101 /* 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
102 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
103 */ 137 */
104 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
108 142
109 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
110} 144}
111 145
112static void 146static void
113layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
115 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
116 153
117 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119 156
120 *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;
121} 162}
122 163
123typedef uint16_t mapface; 164typedef uint16_t mapface;
124 165
125typedef struct { 166typedef struct {
128 float s, t; 169 float s, t;
129 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
130} maptex; 171} maptex;
131 172
132typedef struct { 173typedef struct {
133 int16_t darkness; 174 uint16_t darkness;
134 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
135} mapcell; 177} mapcell;
136 178
137typedef struct { 179typedef struct {
138 int32_t c0, c1; 180 int32_t c0, c1;
139 mapcell *col; 181 mapcell *col;
148 int texs; 190 int texs;
149 maptex *tex; 191 maptex *tex;
150 192
151 int32_t rows; 193 int32_t rows;
152 maprow *row; 194 maprow *row;
153} *CFClient__Map; 195} *CFPlus__Map;
154 196
155static char * 197static char *
156prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
157{ 199{
158 char *p; 200 char *p;
176 218
177#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
178#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
179 221
180static maprow * 222static maprow *
181map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
182{ 224{
183 if (0 > y) 225 if (0 > y)
184 { 226 {
185 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
186 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
224 266
225 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
226} 268}
227 269
228static mapcell * 270static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
230{ 272{
231 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
232} 274}
233 275
234static void 276static void
235map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
236{ 278{
237 int r; 279 int r;
238 280
239 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
240 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
248 self->row = 0; 290 self->row = 0;
249 self->rows = 0; 291 self->rows = 0;
250} 292}
251 293
252static void 294static void
253map_blank (CFClient__Map self, int x0, int y0, int w, int h) 295map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
254{ 296{
255 int x, y; 297 int x, y;
256 maprow *row; 298 maprow *row;
257 299
258 for (y = y0; y < y0 + h; y++) 300 for (y = y0; y < y0 + h; y++)
267 if (x >= row->c0) 309 if (x >= row->c0)
268 { 310 {
269 if (x >= row->c1) 311 if (x >= row->c1)
270 break; 312 break;
271 313
272 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
273 } 315 }
274 } 316 }
275} 317}
276 318
277static void 319static void
298 ev.data2 = 0; 340 ev.data2 = 0;
299 341
300 SDL_PushEvent ((SDL_Event *)&ev); 342 SDL_PushEvent ((SDL_Event *)&ev);
301} 343}
302 344
345static unsigned int
346minpot (unsigned int n)
347{
348 if (!n)
349 return 0;
350
351 --n;
352
353 n |= n >> 1;
354 n |= n >> 2;
355 n |= n >> 4;
356 n |= n >> 8;
357 n |= n >> 16;
358
359 return n + 1;
360}
361
303MODULE = CFClient PACKAGE = CFClient 362MODULE = CFPlus PACKAGE = CFPlus
304 363
305PROTOTYPES: ENABLE 364PROTOTYPES: ENABLE
306 365
307BOOT: 366BOOT:
308{ 367{
309 HV *stash = gv_stashpv ("CFClient", 1); 368 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 369 static const struct {
311 const char *name; 370 const char *name;
312 IV iv; 371 IV iv;
313 } *civ, const_iv[] = { 372 } *civ, const_iv[] = {
314# define const_iv(name) { # name, (IV)name } 373# define const_iv(name) { # name, (IV)name }
415 474
416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 475 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418} 477}
419 478
479int
480in_destruct ()
481 CODE:
482 RETVAL = PL_main_cv == Nullcv;
483 OUTPUT:
484 RETVAL
485
486NV floor (NV x)
487
488NV ceil (NV x)
489
420void 490void
421pango_init () 491pango_init ()
422 CODE: 492 CODE:
423 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{ 493{
425 {
426 ft2_fontmap = pango_ft2_font_map_new (); 494 opengl_fontmap = pango_opengl_font_map_new ();
427 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 495 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
428 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 496 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
429 }
430 {
431 cairo_font_options_t *fopt = cairo_font_options_create ();
432 cairo_fontmap = pango_cairo_font_map_get_default ();
433 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434#ifdef _WIN32
435 // cairo looks like shit eaten twice on windows
436 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437#else
438 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439#endif
440 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442 pango_cairo_context_set_font_options (cairo_context, fopt);
443 cairo_font_options_destroy (fopt);
444 }
445} 497}
446 498
447int 499int
448SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 500SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
449 501
450void 502void
451SDL_Quit () 503SDL_Quit ()
452 504
453void 505void
460 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
461 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
462 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
463 515
464 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
466 518
467 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
468 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
469 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
471 523
472 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 524 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
525#if SDL_VERSION_ATLEAST(1,2,10)
526 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
527 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
528#endif
473 529
474 SDL_EnableUNICODE (1); 530 SDL_EnableUNICODE (1);
475 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
476 532
477 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
564 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 620 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
565 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 621 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
566 break; 622 break;
567 } 623 }
568 624
569 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 625 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
570 } 626 }
571} 627}
572 628
573int 629int
574Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 630Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
590#endif 646#endif
591 647
592void 648void
593add_font (char *file) 649add_font (char *file)
594 CODE: 650 CODE:
595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 651 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
596#ifdef _WIN32
597 // cairo... sigh... requires win2000
598 AddFontResourceEx (file, FR_PRIVATE, 0);
599#endif
600 652
601void 653void
602load_image_inline (SV *image_) 654load_image_inline (SV *image_)
603 ALIAS: 655 ALIAS:
604 load_image_file = 1 656 load_image_file = 1
646 698
647 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 699 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
648 700
649 assert (surface2->pitch == surface2->w * 4); 701 assert (surface2->pitch == surface2->w * 4);
650 702
703 SDL_LockSurface (surface2);
651 EXTEND (SP, 5); 704 EXTEND (SP, 6);
652 PUSHs (sv_2mortal (newSViv (surface2->w))); 705 PUSHs (sv_2mortal (newSViv (surface2->w)));
653 PUSHs (sv_2mortal (newSViv (surface2->h))); 706 PUSHs (sv_2mortal (newSViv (surface2->h)));
654 SDL_LockSurface (surface2);
655 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 707 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
656 SDL_UnlockSurface (surface2);
657 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 708 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
658 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 709 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
659 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 710 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
711 SDL_UnlockSurface (surface2);
660 712
661 SDL_FreeSurface (surface); 713 SDL_FreeSurface (surface);
662 SDL_FreeSurface (surface2); 714 SDL_FreeSurface (surface2);
663} 715}
664 716
700 CODE: 752 CODE:
701 fprintf (stderr, "FATAL: %s\n", message); 753 fprintf (stderr, "FATAL: %s\n", message);
702#ifdef _WIN32 754#ifdef _WIN32
703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
704#endif 756#endif
705 exit (1); 757 _exit (1);
706 758
759void
760_exit (int retval)
761 CODE:
762 _exit (retval);
763
707MODULE = CFClient PACKAGE = CFClient::Font 764MODULE = CFPlus PACKAGE = CFPlus::Font
708 765
709CFClient::Font 766CFPlus::Font
710new_from_file (SV *class, char *path, int id = 0) 767new_from_file (SV *class, char *path, int id = 0)
711 CODE: 768 CODE:
712{ 769{
713 int count; 770 int count;
714 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 771 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
717} 774}
718 OUTPUT: 775 OUTPUT:
719 RETVAL 776 RETVAL
720 777
721void 778void
722DESTROY (CFClient::Font self) 779DESTROY (CFPlus::Font self)
723 CODE: 780 CODE:
724 pango_font_description_free (self); 781 pango_font_description_free (self);
725 782
726void 783void
727make_default (CFClient::Font self) 784make_default (CFPlus::Font self)
728 CODE: 785 CODE:
729 default_font = self; 786 default_font = self;
730 787
731MODULE = CFClient PACKAGE = CFClient::Layout 788MODULE = CFPlus PACKAGE = CFPlus::Layout
732 789
733CFClient::Layout 790void
734new (SV *class, int rgba = 0) 791reset_glyph_cache ()
792 CODE:
793 tc_clear ();
794
795CFPlus::Layout
796new (SV *class)
735 CODE: 797 CODE:
736 New (0, RETVAL, 1, struct cf_layout); 798 New (0, RETVAL, 1, struct cf_layout);
737 799
738 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 800 RETVAL->pl = pango_layout_new (opengl_context);
739 RETVAL->rgba = rgba;
740 RETVAL->r = 1.; 801 RETVAL->r = 1.;
741 RETVAL->g = 1.; 802 RETVAL->g = 1.;
742 RETVAL->b = 1.; 803 RETVAL->b = 1.;
743 RETVAL->a = 1.; 804 RETVAL->a = 1.;
744 RETVAL->base_height = MIN_FONT_HEIGHT; 805 RETVAL->base_height = MIN_FONT_HEIGHT;
748 layout_update_font (RETVAL); 809 layout_update_font (RETVAL);
749 OUTPUT: 810 OUTPUT:
750 RETVAL 811 RETVAL
751 812
752void 813void
753DESTROY (CFClient::Layout self) 814DESTROY (CFPlus::Layout self)
754 CODE: 815 CODE:
755 g_object_unref (self->pl); 816 g_object_unref (self->pl);
756 Safefree (self); 817 Safefree (self);
757 818
758int
759is_rgba (CFClient::Layout self)
760 CODE:
761 RETVAL = self->rgba;
762 OUTPUT:
763 RETVAL
764
765void 819void
766set_text (CFClient::Layout self, SV *text_) 820set_text (CFPlus::Layout self, SV *text_)
767 CODE: 821 CODE:
768{ 822{
769 STRLEN textlen; 823 STRLEN textlen;
770 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
771 825
772 pango_layout_set_text (self->pl, text, textlen); 826 pango_layout_set_text (self->pl, text, textlen);
773} 827}
774 828
775void 829void
776set_markup (CFClient::Layout self, SV *text_) 830set_markup (CFPlus::Layout self, SV *text_)
777 CODE: 831 CODE:
778{ 832{
779 STRLEN textlen; 833 STRLEN textlen;
780 char *text = SvPVutf8 (text_, textlen); 834 char *text = SvPVutf8 (text_, textlen);
781 835
782 pango_layout_set_markup (self->pl, text, textlen); 836 pango_layout_set_markup (self->pl, text, textlen);
783} 837}
784 838
839void
840set_shapes (CFPlus::Layout self, ...)
841 CODE:
842{
843 PangoAttrList *attrs = 0;
844 const char *text = pango_layout_get_text (self->pl);
845 const char *pos = text;
846 int arg = 4;
847
848 while (arg < items && (pos = strstr (pos, OBJ_STR)))
849 {
850 PangoRectangle inkrect, rect;
851 PangoAttribute *attr;
852
853 int x = SvIV (ST (arg - 3));
854 int y = SvIV (ST (arg - 2));
855 int w = SvIV (ST (arg - 1));
856 int h = SvIV (ST (arg ));
857
858 inkrect.x = 0;
859 inkrect.y = 0;
860 inkrect.width = 0;
861 inkrect.height = 0;
862
863 rect.x = x * PANGO_SCALE;
864 rect.y = y * PANGO_SCALE;
865 rect.width = w * PANGO_SCALE;
866 rect.height = h * PANGO_SCALE;
867
868 if (!attrs)
869 attrs = pango_layout_get_attributes (self->pl);
870
871 attr = pango_attr_shape_new (&inkrect, &rect);
872 attr->start_index = pos - text;
873 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
874 pango_attr_list_insert (attrs, attr);
875
876 arg += 4;
877 pos += sizeof (OBJ_STR) - 1;
878 }
879
880 if (attrs)
881 pango_layout_set_attributes (self->pl, attrs);
882}
883
884void
885get_shapes (CFPlus::Layout self)
886 PPCODE:
887{
888 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
889
890 do
891 {
892 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
893
894 if (run && shape_attr_p (run))
895 {
896 PangoRectangle extents;
897 pango_layout_iter_get_run_extents (iter, 0, &extents);
898
899 EXTEND (SP, 2);
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
901 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
902 }
903 }
904 while (pango_layout_iter_next_run (iter));
905
906 pango_layout_iter_free (iter);
907}
908
909int
910has_wrapped (CFPlus::Layout self)
911 CODE:
912{
913 int lines = 1;
914 const char *text = pango_layout_get_text (self->pl);
915
916 while (*text)
917 lines += *text++ == '\n';
918
919 RETVAL = lines < pango_layout_get_line_count (self->pl);
920}
921 OUTPUT:
922 RETVAL
923
785SV * 924SV *
786get_text (CFClient::Layout self) 925get_text (CFPlus::Layout self)
787 CODE: 926 CODE:
788 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 927 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
789 SvUTF8_on (RETVAL); 928 sv_utf8_decode (RETVAL);
790 OUTPUT: 929 OUTPUT:
791 RETVAL 930 RETVAL
792 931
793void 932void
794set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 933set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
795 CODE: 934 CODE:
796 self->r = r; 935 self->r = r;
797 self->g = g; 936 self->g = g;
798 self->b = b; 937 self->b = b;
799 self->a = a; 938 self->a = a;
800 939
801void 940void
802set_font (CFClient::Layout self, CFClient::Font font = 0) 941set_font (CFPlus::Layout self, CFPlus::Font font = 0)
803 CODE: 942 CODE:
804 if (self->font != font) 943 if (self->font != font)
805 { 944 {
806 self->font = font; 945 self->font = font;
807 layout_update_font (self); 946 layout_update_font (self);
808 } 947 }
809 948
810void 949void
811set_height (CFClient::Layout self, int base_height) 950set_height (CFPlus::Layout self, int base_height)
812 CODE: 951 CODE:
813 if (self->base_height != base_height) 952 if (self->base_height != base_height)
814 { 953 {
815 self->base_height = base_height; 954 self->base_height = base_height;
816 layout_update_font (self); 955 layout_update_font (self);
817 } 956 }
818 957
819void 958void
820set_width (CFClient::Layout self, int max_width = -1) 959set_width (CFPlus::Layout self, int max_width = -1)
821 CODE: 960 CODE:
822 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 961 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
823 962
824void 963void
825set_indent (CFClient::Layout self, int indent) 964set_indent (CFPlus::Layout self, int indent)
826 CODE: 965 CODE:
827 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 966 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
828 967
829void 968void
830set_spacing (CFClient::Layout self, int spacing) 969set_spacing (CFPlus::Layout self, int spacing)
831 CODE: 970 CODE:
832 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 971 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
833 972
834void 973void
835set_ellipsise (CFClient::Layout self, int ellipsise) 974set_ellipsise (CFPlus::Layout self, int ellipsise)
836 CODE: 975 CODE:
837 pango_layout_set_ellipsize (self->pl, 976 pango_layout_set_ellipsize (self->pl,
838 ellipsise == 1 ? PANGO_ELLIPSIZE_START 977 ellipsise == 1 ? PANGO_ELLIPSIZE_START
839 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 978 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
840 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 979 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
841 : PANGO_ELLIPSIZE_NONE 980 : PANGO_ELLIPSIZE_NONE
842 ); 981 );
843 982
844void 983void
845set_single_paragraph_mode (CFClient::Layout self, int spm) 984set_single_paragraph_mode (CFPlus::Layout self, int spm)
846 CODE: 985 CODE:
847 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 986 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
848 987
849void 988void
850size (CFClient::Layout self) 989size (CFPlus::Layout self)
851 PPCODE: 990 PPCODE:
852{ 991{
853 int w, h; 992 int w, h;
854 993
855 layout_get_pixel_size (self, &w, &h); 994 layout_get_pixel_size (self, &w, &h);
858 PUSHs (sv_2mortal (newSViv (w))); 997 PUSHs (sv_2mortal (newSViv (w)));
859 PUSHs (sv_2mortal (newSViv (h))); 998 PUSHs (sv_2mortal (newSViv (h)));
860} 999}
861 1000
862int 1001int
1002descent (CFPlus::Layout self)
1003 CODE:
1004{
1005 PangoRectangle rect;
1006 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1007 pango_layout_line_get_pixel_extents (line, 0, &rect);
1008 RETVAL = PANGO_DESCENT (rect);
1009}
1010 OUTPUT:
1011 RETVAL
1012
1013int
863xy_to_index (CFClient::Layout self, int x, int y) 1014xy_to_index (CFPlus::Layout self, int x, int y)
864 CODE: 1015 CODE:
865{ 1016{
866 int index, trailing; 1017 int index, trailing;
867 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1018 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
868 RETVAL = index; 1019 RETVAL = index;
869} 1020}
870 OUTPUT: 1021 OUTPUT:
871 RETVAL 1022 RETVAL
872 1023
873void 1024void
874cursor_pos (CFClient::Layout self, int index) 1025cursor_pos (CFPlus::Layout self, int index)
875 PPCODE: 1026 PPCODE:
876{ 1027{
877 PangoRectangle strong_pos; 1028 PangoRectangle strong_pos;
878 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1029 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
879 1030
882 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
883 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
884} 1035}
885 1036
886void 1037void
887render (CFClient::Layout self) 1038render (CFPlus::Layout self, float x, float y, int flags = 0)
888 PPCODE: 1039 PPCODE:
889{ 1040 pango_opengl_render_layout_subpixel (
890 SV *retval; 1041 self->pl,
891 int w, h; 1042 x * PANGO_SCALE, y * PANGO_SCALE,
1043 self->r, self->g, self->b, self->a,
1044 flags
1045 );
892 1046
893 layout_get_pixel_size (self, &w, &h); 1047MODULE = CFPlus PACKAGE = CFPlus::Texture
894 1048
895 if (self->rgba) 1049void
1050pad2pot (SV *data_, SV *w_, SV *h_)
1051 CODE:
1052{
1053 int ow = SvIV (w_);
1054 int oh = SvIV (h_);
1055
1056 if (ow && oh)
896 { 1057 {
897 cairo_surface_t *surface; 1058 int nw = minpot (ow);
898 cairo_t *cairo; 1059 int nh = minpot (oh);
899 1060
900 retval = newSV (w * h * 4); 1061 if (nw != ow || nh != oh)
901 SvPOK_only (retval);
902 SvCUR_set (retval, w * h * 4);
903
904 memset (SvPVX (retval), 0, w * h * 4);
905
906 surface = cairo_image_surface_create_for_data (
907 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
908 cairo = cairo_create (surface);
909 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
910
911 pango_cairo_show_layout (cairo, self->pl);
912
913 cairo_destroy (cairo);
914 cairo_surface_destroy (surface);
915
916 // what a mess, and its premultiplied, too :(
917 { 1062 {
918 uint32_t *p = (uint32_t *)SvPVX (retval); 1063 if (SvOK (data_))
919 uint32_t *e = p + w * h;
920
921 while (p < e)
922 { 1064 {
923 uint32_t rgba = *p; 1065 STRLEN datalen;
924 rgba = (rgba >> 24) | (rgba << 8); 1066 char *data = SvPVbyte (data_, datalen);
925#if 0 1067 int bpp = datalen / (ow * oh);
926#ifdef _WIN32 1068 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
927 {//D
928 uint8_t r = rgba >> 24;
929 uint8_t g = rgba >> 16;
930 uint8_t b = rgba >> 8;
931 uint8_t a = rgba >> 0;
932 1069
933 rgba = (rgba & 0xffffff00) | a; 1070 SvPOK_only (result_);
1071 SvCUR_set (result_, nw * nh * bpp);
1072
1073 memset (SvPVX (result_), 0, nw * nh * bpp);
1074 while (oh--)
1075 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1076
1077 sv_setsv (data_, result_);
934 } 1078 }
935#endif 1079
936#endif 1080 sv_setiv (w_, nw);
937 rgba = SDL_SwapBE32 (rgba); 1081 sv_setiv (h_, nh);
938 *p++ = rgba;
939 } 1082 }
940 }
941
942 EXTEND (SP, 5);
943 PUSHs (sv_2mortal (newSViv (w)));
944 PUSHs (sv_2mortal (newSViv (h)));
945 PUSHs (sv_2mortal (retval));
946 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
947 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
948 } 1083 }
949 else
950 {
951 FT_Bitmap bitmap;
952
953 retval = newSV (w * h);
954 SvPOK_only (retval);
955 SvCUR_set (retval, w * h);
956
957 bitmap.rows = h;
958 bitmap.width = w;
959 bitmap.pitch = w;
960 bitmap.buffer = (unsigned char*)SvPVX (retval);
961 bitmap.num_grays = 256;
962 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
963
964 memset (bitmap.buffer, 0, w * h);
965
966 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
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_ALPHA)));
973 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
974 }
975} 1084}
976 1085
977MODULE = CFClient PACKAGE = CFClient::Texture
978
979void 1086void
980draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1087draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
981 PROTOTYPE: $$$;$$ 1088 PROTOTYPE: $$$;$$
982 ALIAS: 1089 ALIAS:
983 draw_quad_alpha = 1 1090 draw_quad_alpha = 1
984 draw_quad_alpha_premultiplied = 2 1091 draw_quad_alpha_premultiplied = 2
985 CODE: 1092 CODE:
1023 glDisable (GL_ALPHA_TEST); 1130 glDisable (GL_ALPHA_TEST);
1024 glDisable (GL_BLEND); 1131 glDisable (GL_BLEND);
1025 } 1132 }
1026} 1133}
1027 1134
1028MODULE = CFClient PACKAGE = CFClient::Map 1135MODULE = CFPlus PACKAGE = CFPlus::Map
1029 1136
1030CFClient::Map 1137CFPlus::Map
1031new (SV *class, int map_width, int map_height) 1138new (SV *class, int map_width, int map_height)
1032 CODE: 1139 CODE:
1033 New (0, RETVAL, 1, struct map); 1140 New (0, RETVAL, 1, struct map);
1034 RETVAL->x = 0; 1141 RETVAL->x = 0;
1035 RETVAL->y = 0; 1142 RETVAL->y = 0;
1045 RETVAL->row = 0; 1152 RETVAL->row = 0;
1046 OUTPUT: 1153 OUTPUT:
1047 RETVAL 1154 RETVAL
1048 1155
1049void 1156void
1050DESTROY (CFClient::Map self) 1157DESTROY (CFPlus::Map self)
1051 CODE: 1158 CODE:
1052{ 1159{
1053 map_clear (self); 1160 map_clear (self);
1054 Safefree (self->face); 1161 Safefree (self->face);
1162 Safefree (self->tex);
1055 Safefree (self); 1163 Safefree (self);
1056} 1164}
1057 1165
1058void 1166void
1059clear (CFClient::Map self) 1167clear (CFPlus::Map self)
1060 CODE: 1168 CODE:
1061 map_clear (self); 1169 map_clear (self);
1062 1170
1063void 1171void
1064set_face (CFClient::Map self, int face, int texid) 1172set_face (CFPlus::Map self, int face, int texid)
1065 CODE: 1173 CODE:
1066{ 1174{
1067 while (self->faces <= face) 1175 while (self->faces <= face)
1068 { 1176 {
1069 Append (mapface, self->face, self->faces, self->faces); 1177 Append (mapface, self->face, self->faces, self->faces);
1072 1180
1073 self->face [face] = texid; 1181 self->face [face] = texid;
1074} 1182}
1075 1183
1076void 1184void
1077set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1185set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1078 CODE: 1186 CODE:
1079{ 1187{
1080 while (self->texs <= texid) 1188 while (self->texs <= texid)
1081 { 1189 {
1082 Append (maptex, self->tex, self->texs, self->texs); 1190 Append (maptex, self->tex, self->texs, self->texs);
1106 // from transparent color bleeding and ugly wrapping effects. 1214 // from transparent color bleeding and ugly wrapping effects.
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1215 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108} 1216}
1109 1217
1110int 1218int
1111ox (CFClient::Map self) 1219ox (CFPlus::Map self)
1112 ALIAS: 1220 ALIAS:
1113 oy = 1 1221 oy = 1
1114 x = 2 1222 x = 2
1115 y = 3 1223 y = 3
1116 w = 4 1224 w = 4
1127 } 1235 }
1128 OUTPUT: 1236 OUTPUT:
1129 RETVAL 1237 RETVAL
1130 1238
1131void 1239void
1132scroll (CFClient::Map self, int dx, int dy) 1240scroll (CFPlus::Map self, int dx, int dy)
1133 CODE: 1241 CODE:
1134{ 1242{
1135 if (dx > 0) 1243 if (dx > 0)
1136 map_blank (self, self->x, self->y, dx - 1, self->h); 1244 map_blank (self, self->x, self->y, dx - 1, self->h);
1137 else if (dx < 0) 1245 else if (dx < 0)
1153 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1154 } 1262 }
1155} 1263}
1156 1264
1157void 1265void
1158map1a_update (CFClient::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1159 CODE: 1267 CODE:
1160{ 1268{
1161 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1162 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1163 mapcell *cell; 1271 mapcell *cell;
1165 1273
1166 while (data < data_end) 1274 while (data < data_end)
1167 { 1275 {
1168 flags = (data [0] << 8) + data [1]; data += 2; 1276 flags = (data [0] << 8) + data [1]; data += 2;
1169 1277
1170 x = ((flags >> 10) & 63) + self->x; 1278 x = self->x + ((flags >> 10) & 63);
1171 y = ((flags >> 4) & 63) + self->y; 1279 y = self->y + ((flags >> 4) & 63);
1172 1280
1173 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1174 1282
1175 if (flags & 15) 1283 if (flags & 15)
1176 { 1284 {
1177 if (cell->darkness < 0) 1285 if (!cell->darkness)
1178 { 1286 {
1179 cell->darkness = 0; 1287 cell->darkness = 256;
1180 cell->face [0] = 0; 1288 cell->face [0] = 0;
1181 cell->face [1] = 0; 1289 cell->face [1] = 0;
1182 cell->face [2] = 0; 1290 cell->face [2] = 0;
1183 } 1291 }
1184 1292
1185 cell->darkness = flags & 8 ? *data++ : 255;
1186
1187 //TODO: don't trust server data to be in-range(!) 1293 //TODO: don't trust server data to be in-range(!)
1294
1295 if (flags & 8)
1296 {
1297 if (extmap)
1298 {
1299 uint8_t ext, cmd;
1300
1301 do
1302 {
1303 ext = *data++;
1304 cmd = ext & 0x7f;
1305
1306 if (ext < 4)
1307 cell->darkness = 255 - ext * 64 + 1;
1308 else if (ext == 5) // health
1309 cell->stat_hp = *data++;
1310 }
1311 while (cmd & 0x80);
1312 }
1313 else
1314 cell->darkness = *data++ + 1;
1315 }
1188 1316
1189 if (flags & 4) 1317 if (flags & 4)
1190 { 1318 {
1191 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1319 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1192 } 1320 }
1200 { 1328 {
1201 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1329 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1202 } 1330 }
1203 } 1331 }
1204 else 1332 else
1205 cell->darkness = -1; 1333 cell->darkness = 0;
1206 } 1334 }
1207} 1335}
1208 1336
1209SV * 1337SV *
1210mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1338mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1211 CODE: 1339 CODE:
1212{ 1340{
1213 int x1, x; 1341 int x1, x;
1214 int y1, y; 1342 int y1, y;
1215 int z; 1343 int z;
1265} 1393}
1266 OUTPUT: 1394 OUTPUT:
1267 RETVAL 1395 RETVAL
1268 1396
1269void 1397void
1270draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1398draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1271 PPCODE: 1399 CODE:
1272{ 1400{
1273 int vx, vy; 1401 int vx, vy;
1274 int x, y, z; 1402 int x, y, z;
1275 int last_name; 1403 int last_name;
1276 mapface face; 1404 mapface face;
1277 int sw4 = (sw + 3) & ~3;
1278 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1279 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1280 1405
1281 memset (darkness, 255, sw4 * sh);
1282 SvPOK_only (darkness_sv);
1283 SvCUR_set (darkness_sv, sw4 * sh);
1284
1285 vx = self->x + (self->w - sw) / 2 - shift_x; 1406 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1286 vy = self->y + (self->h - sh) / 2 - shift_y; 1407 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1287 1408
1288 /* 1409 /*
1289 int vx = self->vx = self->w >= sw 1410 int vx = self->vx = self->w >= sw
1290 ? self->x + (self->w - sw) / 2 1411 ? self->x + (self->w - sw) / 2
1291 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1412 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1295 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1416 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1296 */ 1417 */
1297 1418
1298 glColor4ub (255, 255, 255, 255); 1419 glColor4ub (255, 255, 255, 255);
1299 1420
1421 glEnable (GL_BLEND);
1300 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1422 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1301 glEnable (GL_BLEND);
1302 glEnable (GL_TEXTURE_2D); 1423 glEnable (GL_TEXTURE_2D);
1303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1424 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1304 1425
1305 glBegin (GL_QUADS); 1426 glBegin (GL_QUADS);
1306 1427
1314 1435
1315 for (x = 0; x < sw; x++) 1436 for (x = 0; x < sw; x++)
1316 if (row->c0 <= x + vx && x + vx < row->c1) 1437 if (row->c0 <= x + vx && x + vx < row->c1)
1317 { 1438 {
1318 mapcell *cell = row->col + (x + vx - row->c0); 1439 mapcell *cell = row->col + (x + vx - row->c0);
1319
1320 darkness[y * sw4 + x] = cell->darkness < 0
1321 ? 255 - FOW_DARKNESS
1322 : 255 - cell->darkness;
1323 1440
1324 face = cell->face [z]; 1441 face = cell->face [z];
1325 1442
1326 if (face) 1443 if (face)
1327 { 1444 {
1348 1465
1349 glEnd (); 1466 glEnd ();
1350 1467
1351 glDisable (GL_TEXTURE_2D); 1468 glDisable (GL_TEXTURE_2D);
1352 glDisable (GL_BLEND); 1469 glDisable (GL_BLEND);
1470}
1471
1472void
1473draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1474 CODE:
1475{
1476 static float color[16][3] = {
1477 { 0.00F, 0.00F, 0.00F },
1478 { 1.00F, 1.00F, 1.00F },
1479 { 0.00F, 0.00F, 0.55F },
1480 { 1.00F, 0.00F, 0.00F },
1481
1482 { 1.00F, 0.54F, 0.00F },
1483 { 0.11F, 0.56F, 1.00F },
1484 { 0.93F, 0.46F, 0.00F },
1485 { 0.18F, 0.54F, 0.34F },
1486
1487 { 0.56F, 0.73F, 0.56F },
1488 { 0.80F, 0.80F, 0.80F },
1489 { 0.55F, 0.41F, 0.13F },
1490 { 0.99F, 0.77F, 0.26F },
1491
1492 { 0.74F, 0.65F, 0.41F },
1493
1494 { 0.00F, 1.00F, 1.00F },
1495 { 1.00F, 0.00F, 1.00F },
1496 { 1.00F, 1.00F, 0.00F },
1497 };
1498
1499 int x, y;
1500
1501 glEnable (GL_TEXTURE_2D);
1502 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1503 glEnable (GL_BLEND);
1504 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1505 glBegin (GL_QUADS);
1506
1507 for (y = 0; y < h; y++)
1508 for (x = 0; x < w; x++)
1509 {
1510 unsigned char m = data [x + y * w];
1511
1512 if (m)
1513 {
1514 float *c = color [m & 15];
1515
1516 float tx1 = m & 0x40 ? 0.5 : 0.;
1517 float tx2 = tx1 + 0.5;
1518
1519 glColor4f (c[0], c[1], c[2], 0.75);
1520 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1521 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1522 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1523 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1524 }
1525 }
1526
1527 glEnd ();
1528 glDisable (GL_BLEND);
1529 glDisable (GL_TEXTURE_2D);
1530}
1531
1532void
1533fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1534 PPCODE:
1535{
1536 int vx, vy;
1537 int x, y;
1538 int sw4 = (sw + 3) & ~3;
1539 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1540 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1541
1542 memset (darkness, 255, sw4 * sh);
1543 SvPOK_only (darkness_sv);
1544 SvCUR_set (darkness_sv, sw4 * sh);
1545
1546 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1547 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1548
1549 for (y = 0; y < sh; y++)
1550 if (0 <= y + vy && y + vy < self->rows)
1551 {
1552 maprow *row = self->row + (y + vy);
1553
1554 for (x = 0; x < sw; x++)
1555 if (row->c0 <= x + vx && x + vx < row->c1)
1556 {
1557 mapcell *cell = row->col + (x + vx - row->c0);
1558
1559 darkness[y * sw4 + x] = cell->darkness
1560 ? 255 - cell->darkness + 1
1561 : 255 - FOW_DARKNESS;
1562 }
1563 }
1353 1564
1354 EXTEND (SP, 3); 1565 EXTEND (SP, 3);
1355 PUSHs (sv_2mortal (newSViv (sw4))); 1566 PUSHs (sv_2mortal (newSViv (sw4)));
1356 PUSHs (sv_2mortal (newSViv (sh))); 1567 PUSHs (sv_2mortal (newSViv (sh)));
1357 PUSHs (darkness_sv); 1568 PUSHs (darkness_sv);
1358} 1569}
1359 1570
1360SV * 1571SV *
1361get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1572get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1362 CODE: 1573 CODE:
1363{ 1574{
1364 int x, y, x1, y1; 1575 int x, y, x1, y1;
1365 SV *data_sv = newSV (w * h * 7 + 5); 1576 SV *data_sv = newSV (w * h * 7 + 5);
1366 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1577 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1428} 1639}
1429 OUTPUT: 1640 OUTPUT:
1430 RETVAL 1641 RETVAL
1431 1642
1432void 1643void
1433set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1644set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1434 PPCODE: 1645 PPCODE:
1435{ 1646{
1436 int x, y, z; 1647 int x, y, z;
1437 int w, h; 1648 int w, h;
1438 int x1, y1; 1649 int x1, y1;
1470 1681
1471 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1682 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1472 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1683 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1473 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1684 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1474 1685
1475 if (cell->darkness <= 0) 1686 if (cell->darkness <= 1)
1476 { 1687 {
1477 cell->darkness = -1; 1688 cell->darkness = 0;
1478 1689
1479 for (z = 0; z <= 2; z++) 1690 for (z = 0; z <= 2; z++)
1480 { 1691 {
1481 cell->face[z] = face[z]; 1692 cell->face[z] = face[z];
1482 1693
1487 } 1698 }
1488 } 1699 }
1489 } 1700 }
1490} 1701}
1491 1702
1492MODULE = CFClient PACKAGE = CFClient::MixChunk 1703MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1493 1704
1494CFClient::MixChunk 1705CFPlus::MixChunk
1495new_from_file (SV *class, char *path) 1706new_from_file (SV *class, char *path)
1496 CODE: 1707 CODE:
1497 RETVAL = Mix_LoadWAV (path); 1708 RETVAL = Mix_LoadWAV (path);
1498 OUTPUT: 1709 OUTPUT:
1499 RETVAL 1710 RETVAL
1500 1711
1501void 1712void
1502DESTROY (CFClient::MixChunk self) 1713DESTROY (CFPlus::MixChunk self)
1503 CODE: 1714 CODE:
1504 Mix_FreeChunk (self); 1715 Mix_FreeChunk (self);
1505 1716
1506int 1717int
1507volume (CFClient::MixChunk self, int volume = -1) 1718volume (CFPlus::MixChunk self, int volume = -1)
1508 CODE: 1719 CODE:
1509 RETVAL = Mix_VolumeChunk (self, volume); 1720 RETVAL = Mix_VolumeChunk (self, volume);
1510 OUTPUT: 1721 OUTPUT:
1511 RETVAL 1722 RETVAL
1512 1723
1513int 1724int
1514play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1725play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1515 CODE: 1726 CODE:
1516 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1727 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1517 OUTPUT: 1728 OUTPUT:
1518 RETVAL 1729 RETVAL
1519 1730
1520MODULE = CFClient PACKAGE = CFClient::MixMusic 1731MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1521 1732
1522int 1733int
1523volume (int volume = -1) 1734volume (int volume = -1)
1524 CODE: 1735 CODE:
1525 RETVAL = Mix_VolumeMusic (volume); 1736 RETVAL = Mix_VolumeMusic (volume);
1526 OUTPUT: 1737 OUTPUT:
1527 RETVAL 1738 RETVAL
1528 1739
1529CFClient::MixMusic 1740CFPlus::MixMusic
1530new_from_file (SV *class, char *path) 1741new_from_file (SV *class, char *path)
1531 CODE: 1742 CODE:
1532 RETVAL = Mix_LoadMUS (path); 1743 RETVAL = Mix_LoadMUS (path);
1533 OUTPUT: 1744 OUTPUT:
1534 RETVAL 1745 RETVAL
1535 1746
1536void 1747void
1537DESTROY (CFClient::MixMusic self) 1748DESTROY (CFPlus::MixMusic self)
1538 CODE: 1749 CODE:
1539 Mix_FreeMusic (self); 1750 Mix_FreeMusic (self);
1540 1751
1541int 1752int
1542play (CFClient::MixMusic self, int loops = -1) 1753play (CFPlus::MixMusic self, int loops = -1)
1543 CODE: 1754 CODE:
1544 RETVAL = Mix_PlayMusic (self, loops); 1755 RETVAL = Mix_PlayMusic (self, loops);
1545 OUTPUT: 1756 OUTPUT:
1546 RETVAL 1757 RETVAL
1547 1758
1548MODULE = CFClient PACKAGE = CFClient::OpenGL 1759MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1549 1760
1550BOOT: 1761BOOT:
1551{ 1762{
1552 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1763 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1553 static const struct { 1764 static const struct {
1554 const char *name; 1765 const char *name;
1555 IV iv; 1766 IV iv;
1556 } *civ, const_iv[] = { 1767 } *civ, const_iv[] = {
1557# define const_iv(name) { # name, (IV)name } 1768# define const_iv(name) { # name, (IV)name }
1564 const_iv (GL_SCISSOR_TEST), 1775 const_iv (GL_SCISSOR_TEST),
1565 const_iv (GL_DEPTH_TEST), 1776 const_iv (GL_DEPTH_TEST),
1566 const_iv (GL_ALPHA_TEST), 1777 const_iv (GL_ALPHA_TEST),
1567 const_iv (GL_NORMALIZE), 1778 const_iv (GL_NORMALIZE),
1568 const_iv (GL_RESCALE_NORMAL), 1779 const_iv (GL_RESCALE_NORMAL),
1780 const_iv (GL_FRONT),
1781 const_iv (GL_BACK),
1569 const_iv (GL_AND), 1782 const_iv (GL_AND),
1570 const_iv (GL_ONE), 1783 const_iv (GL_ONE),
1571 const_iv (GL_ZERO), 1784 const_iv (GL_ZERO),
1572 const_iv (GL_SRC_ALPHA), 1785 const_iv (GL_SRC_ALPHA),
1573 const_iv (GL_DST_ALPHA), 1786 const_iv (GL_DST_ALPHA),
1574 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1787 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575 const_iv (GL_ONE_MINUS_DST_ALPHA), 1788 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE), 1789 const_iv (GL_SRC_ALPHA_SATURATE),
1577 const_iv (GL_RGB), 1790 const_iv (GL_RGB),
1578 const_iv (GL_RGBA), 1791 const_iv (GL_RGBA),
1792 const_iv (GL_RGBA4),
1793 const_iv (GL_RGBA8),
1794 const_iv (GL_RGB5_A1),
1579 const_iv (GL_UNSIGNED_BYTE), 1795 const_iv (GL_UNSIGNED_BYTE),
1580 const_iv (GL_UNSIGNED_SHORT), 1796 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT), 1797 const_iv (GL_UNSIGNED_INT),
1582 const_iv (GL_ALPHA), 1798 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY), 1799 const_iv (GL_INTENSITY),
1615 const_iv (GL_SEPARABLE_2D), 1831 const_iv (GL_SEPARABLE_2D),
1616 const_iv (GL_CONVOLUTION_2D), 1832 const_iv (GL_CONVOLUTION_2D),
1617 const_iv (GL_CONVOLUTION_BORDER_MODE), 1833 const_iv (GL_CONVOLUTION_BORDER_MODE),
1618 const_iv (GL_CONSTANT_BORDER), 1834 const_iv (GL_CONSTANT_BORDER),
1619 const_iv (GL_LINES), 1835 const_iv (GL_LINES),
1836 const_iv (GL_LINE_STRIP),
1620 const_iv (GL_LINE_LOOP), 1837 const_iv (GL_LINE_LOOP),
1621 const_iv (GL_QUADS), 1838 const_iv (GL_QUADS),
1622 const_iv (GL_QUAD_STRIP), 1839 const_iv (GL_QUAD_STRIP),
1623 const_iv (GL_TRIANGLES), 1840 const_iv (GL_TRIANGLES),
1624 const_iv (GL_TRIANGLE_STRIP), 1841 const_iv (GL_TRIANGLE_STRIP),
1657 OUTPUT: 1874 OUTPUT:
1658 RETVAL 1875 RETVAL
1659 1876
1660int glGetError () 1877int glGetError ()
1661 1878
1879void glFinish ()
1880
1662void glClear (int mask) 1881void glClear (int mask)
1663 1882
1664void glClearColor (float r, float g, float b, float a = 1.0) 1883void glClearColor (float r, float g, float b, float a = 1.0)
1665 PROTOTYPE: @ 1884 PROTOTYPE: @
1666 1885
1689void glPushMatrix () 1908void glPushMatrix ()
1690 1909
1691void glPopMatrix () 1910void glPopMatrix ()
1692 1911
1693void glLoadIdentity () 1912void glLoadIdentity ()
1913
1914void glDrawBuffer (int buffer)
1915
1916void glReadBuffer (int buffer)
1694 1917
1695# near_ and far_ are due to microsofts buggy "c" compiler 1918# near_ and far_ are due to microsofts buggy "c" compiler
1696void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1919void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697 1920
1698# near_ and far_ are due to microsofts buggy "c" compiler 1921# near_ and far_ are due to microsofts buggy "c" compiler
1728 r *= a; 1951 r *= a;
1729 g *= a; 1952 g *= a;
1730 b *= a; 1953 b *= a;
1731 } 1954 }
1732 // microsoft visual "c" rounds instead of truncating... 1955 // microsoft visual "c" rounds instead of truncating...
1733 glColor4ub (MIN ((int)(r * 256.f), 255), 1956 glColor4f (r, g, b, a);
1734 MIN ((int)(g * 256.f), 255),
1735 MIN ((int)(b * 256.f), 255),
1736 MIN ((int)(a * 256.f), 255));
1737 1957
1738void glInterleavedArrays (int format, int stride, char *data) 1958void glInterleavedArrays (int format, int stride, char *data)
1739 1959
1740void glDrawElements (int mode, int count, int type, char *indices) 1960void glDrawElements (int mode, int count, int type, char *indices)
1741 1961
1818 2038
1819void glEndList () 2039void glEndList ()
1820 2040
1821void glCallList (int list) 2041void glCallList (int list)
1822 2042
1823

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines