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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines