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.191 by root, Thu Apr 26 23:51:02 2007 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
17#endif 27#endif
18 28
19#include <assert.h> 29#include <assert.h>
20#include <math.h> 30#include <math.h>
21#include <string.h> 31#include <string.h>
22#include <stdio.h> 32#include <stdio.h>
23#include <stdlib.h> 33#include <stdlib.h>
24 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
25#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
26#include <SDL_endian.h> 39#include <SDL_endian.h>
27#include <SDL_image.h> 40#include <SDL_image.h>
28#include <SDL_mixer.h> 41#include <SDL_mixer.h>
29#include <SDL_opengl.h> 42#include <SDL_opengl.h>
30 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
31#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
33 51
34#include <glib/gmacros.h> 52#include <glib/gmacros.h>
35 53
36#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
37 66
38#ifndef _WIN32 67#ifndef _WIN32
39# include <sys/types.h> 68# include <sys/types.h>
40# include <sys/socket.h> 69# include <sys/socket.h>
41# include <netinet/in.h> 70# include <netinet/in.h>
42# include <netinet/tcp.h> 71# include <netinet/tcp.h>
43# include <inttypes.h> 72# include <inttypes.h>
44#endif 73#endif
45 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47 85
48#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
49 87
50#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
52 90
53#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
54 92
55#if 0 93/* mask out modifiers we are not interested in */
56# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
57#else
58# define PARACHUTE 0
59#endif
60 95
61static AV *texture_av; 96static AV *texture_av;
62 97
63static struct 98static struct
64{ 99{
65#define GL_FUNC(ptr,name) ptr name; 100#define GL_FUNC(ptr,name) ptr name;
66#include "glfunc.h" 101#include "glfunc.h"
67#undef GL_FUNC 102#undef GL_FUNC
68} gl; 103} gl;
69 104
105static void
70static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 106gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
71{ 107{
72 if (gl.BlendFuncSeparate) 108 if (gl.BlendFuncSeparate)
73 gl.BlendFuncSeparate (sa, da, saa, daa); 109 gl.BlendFuncSeparate (sa, da, saa, daa);
74 else if (gl.BlendFuncSeparateEXT) 110 else if (gl.BlendFuncSeparateEXT)
75 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 111 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
76 else 112 else
77 glBlendFunc (sa, da); 113 glBlendFunc (sa, da);
78} 114}
79 115
116static GLuint
117gen_texture ()
118{
119 GLuint name;
120
121 if (AvFILL (texture_av) >= 0)
122 name = (GLuint)(size_t)av_pop (texture_av);
123 else
124 glGenTextures (1, &name);
125
126 return name;
127}
128
129static void
130del_texture (GLuint name)
131{
132 /* make a half-assed attempt at returning the memory used by the texture */
133 /* textures are frequently being reused by cfplus anyway */
134 /*glBindTexture (GL_TEXTURE_2D, name);*/
135 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
136 av_push (texture_av, (SV *)(size_t)name);
137 glDeleteTextures (1, &name);
138}
139
80#include "texcache.c" 140#include "texcache.c"
141#include "rendercache.c"
81 142
82#include "pango-font.c" 143#include "pango-font.c"
83#include "pango-fontmap.c" 144#include "pango-fontmap.c"
84#include "pango-render.c" 145#include "pango-render.c"
85 146
147typedef IV DC__Channel;
148typedef SDL_RWops *DC__RW;
86typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
87typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
88 151
89typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
90 153
91static int 154static int
92shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
93{ 156{
94 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
… …
108 171
109typedef struct cf_layout { 172typedef struct cf_layout {
110 PangoLayout *pl; 173 PangoLayout *pl;
111 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
112 int base_height; 175 int base_height;
113 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
114} *CFPlus__Layout; 178} *DC__Layout;
115 179
116static CFPlus__Font default_font; 180static DC__Font default_font;
117static PangoContext *opengl_context; 181static PangoContext *opengl_context;
118static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
119 183
120static void 184static void
121substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
… …
126#endif 190#endif
127 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
128} 192}
129 193
130static void 194static void
131layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
132{ 196{
133 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
134 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
135 */ 199 */
136 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
137 201
138 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
139 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
140 204
141 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
142} 206}
143 207
144static void 208static void
145layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
146{ 210{
147 PangoRectangle rect; 211 PangoRectangle rect;
148 212
149 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
150 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
… …
161 225
162typedef uint16_t tileid; 226typedef uint16_t tileid;
163typedef uint16_t faceid; 227typedef uint16_t faceid;
164 228
165typedef struct { 229typedef struct {
166 int name; 230 GLuint name;
167 int w, h; 231 int w, h;
168 float s, t; 232 float s, t;
169 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
170 tileid smoothtile; 234 tileid smoothtile;
171 uint8_t smoothlevel; 235 uint8_t smoothlevel;
… …
189 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
190 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
191 255
192 int32_t rows; 256 int32_t rows;
193 maprow *row; 257 maprow *row;
194} *CFPlus__Map; 258} *DC__Map;
195 259
196static char * 260static char *
197prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
198{ 262{
199 char *p; 263 char *p;
… …
237 self->texs *= 2; 301 self->texs *= 2;
238 } 302 }
239} 303}
240 304
241static maprow * 305static maprow *
242map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
243{ 307{
244 if (0 > y) 308 if (0 > y)
245 { 309 {
246 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
247 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
… …
285 349
286 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
287} 351}
288 352
289static mapcell * 353static mapcell *
290map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
291{ 355{
292 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
293} 357}
294 358
295static void 359static void
296map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
297{ 361{
298 int r; 362 int r;
299 363
300 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
301 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
… …
308 self->oy = 0; 372 self->oy = 0;
309 self->row = 0; 373 self->row = 0;
310 self->rows = 0; 374 self->rows = 0;
311} 375}
312 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
313static void 387static void
314map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
315{ 389{
316 int x, y; 390 int x, y;
317 maprow *row; 391 maprow *row;
318 mapcell *cell; 392 mapcell *cell;
319 393
… …
331 if (x >= row->c1) 405 if (x >= row->c1)
332 break; 406 break;
333 407
334 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
335 409
336 cell->darkness = 0; 410 CELL_CLEAR (cell);
337 cell->stat_hp = 0;
338 cell->flags = 0;
339 cell->player = 0;
340 } 411 }
341 } 412 }
342} 413}
343 414
344typedef struct { 415typedef struct {
… …
398 n |= n >> 16; 469 n |= n >> 16;
399 470
400 return n + 1; 471 return n + 1;
401} 472}
402 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
403/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
404#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
405#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
406 488
407MODULE = CFPlus PACKAGE = CFPlus 489/******************************************************************************/
490
491static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
492static GV *hover_gv;
493
494static int
495within_widget (SV *widget, NV x, NV y)
496{
497 HV *self;
498 SV **svp;
499 NV wx, ww, wy, wh;
500
501 if (!SvROK (widget))
502 return 0;
503
504 self = (HV *)SvRV (widget);
505
506 if (SvTYPE (self) != SVt_PVHV)
507 return 0;
508
509 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
510 if (y < wy)
511 return 0;
512
513 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
514 if (y >= wy + wh)
515 return 0;
516
517 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
518 if (x < wx)
519 return 0;
520
521 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
522 if (x >= wx + ww)
523 return 0;
524
525 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526 if (!svp || !SvTRUE (*svp))
527 return 0;
528
529 return 1;
530}
531
532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
408 571
409PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
410 573
411BOOT: 574BOOT:
412{ 575{
413 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
414 static const struct { 577 static const struct {
415 const char *name; 578 const char *name;
416 IV iv; 579 IV iv;
417 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
418# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
… …
440 603
441 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
442 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
443 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
444 607
608 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST),
445 const_iv (SDLK_KP0), 610 const_iv (SDLK_KP0),
446 const_iv (SDLK_KP1), 611 const_iv (SDLK_KP1),
447 const_iv (SDLK_KP2), 612 const_iv (SDLK_KP2),
448 const_iv (SDLK_KP3), 613 const_iv (SDLK_KP3),
449 const_iv (SDLK_KP4), 614 const_iv (SDLK_KP4),
… …
521 const_iv (KMOD_LMETA), 686 const_iv (KMOD_LMETA),
522 const_iv (KMOD_RMETA), 687 const_iv (KMOD_RMETA),
523 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
524 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
525 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
691
692 const_iv (MIX_DEFAULT_FORMAT),
693
694 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO),
697 const_iv (SDL_INIT_CDROM),
698 const_iv (SDL_INIT_JOYSTICK),
699 const_iv (SDL_INIT_EVERYTHING),
700 const_iv (SDL_INIT_NOPARACHUTE),
701 const_iv (SDL_INIT_EVENTTHREAD),
702
703 const_iv (SDL_GL_RED_SIZE),
704 const_iv (SDL_GL_GREEN_SIZE),
705 const_iv (SDL_GL_BLUE_SIZE),
706 const_iv (SDL_GL_ALPHA_SIZE),
707 const_iv (SDL_GL_DOUBLEBUFFER),
708 const_iv (SDL_GL_BUFFER_SIZE),
709 const_iv (SDL_GL_DEPTH_SIZE),
710 const_iv (SDL_GL_STENCIL_SIZE),
711 const_iv (SDL_GL_ACCUM_RED_SIZE),
712 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
713 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
714 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
715 const_iv (SDL_GL_STEREO),
716 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
717 const_iv (SDL_GL_MULTISAMPLESAMPLES),
718 const_iv (SDL_GL_ACCELERATED_VISUAL),
719 const_iv (SDL_GL_SWAP_CONTROL),
720
721 const_iv (FOW_DARKNESS)
526# undef const_iv 722# undef const_iv
527 }; 723 };
528 724
529 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
530 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
548 744
549NV floor (NV x) 745NV floor (NV x)
550 746
551NV ceil (NV x) 747NV ceil (NV x)
552 748
749IV minpot (UV n)
750
751IV popcount (UV n)
752
553void 753void
554pango_init () 754pango_init ()
555 CODE: 755 CODE:
556{ 756{
557 opengl_fontmap = pango_opengl_font_map_new (); 757 opengl_fontmap = pango_opengl_font_map_new ();
558 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 758 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
559 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 759 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
760 /*pango_context_set_font_description (opengl_context, default_font);*/
761#if PANGO_VERSION_CHECK (1, 15, 2)
762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
764#endif
560} 765}
561 766
562int 767char *SDL_GetError ()
563SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
564 768
565void 769void SDL_braino ()
770
771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
566SDL_Quit () 777void SDL_Quit ()
567 778
779int SDL_GL_SetAttribute (int attr, int value)
780
781int SDL_GL_GetAttribute (int attr)
782 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL))
784 XSRETURN_UNDEF;
785 OUTPUT:
786 RETVAL
787
568void 788void
569SDL_ListModes () 789SDL_ListModes (int rgb, int alpha)
570 PPCODE: 790 PPCODE:
571{ 791{
572 SDL_Rect **m; 792 SDL_Rect **m;
573 793
574 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 794 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
575 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 795 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
576 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 796 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
577 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 797 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
578 798
579 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 799 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
580 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 800 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
581 801
582 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 802 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
583 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
584 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
585 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
586 806
587 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
588#if SDL_VERSION_ATLEAST(1,2,10)
589 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
590 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 808 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
591#endif
592
593 SDL_EnableUNICODE (1);
594 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
595 809
596 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
597 811
598 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
599 while (*m) 813 while (*m)
600 { 814 {
815 if ((*m)->w >= 400 && (*m)->h >= 300)
816 {
601 AV *av = newAV (); 817 AV *av = newAV ();
602 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
603 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
820 av_push (av, newSViv (rgb));
821 av_push (av, newSViv (alpha));
604 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 822 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
823 }
605 824
606 ++m; 825 ++m;
607 } 826 }
608} 827}
609 828
610char *
611SDL_GetError ()
612
613int 829int
614SDL_SetVideoMode (int w, int h, int fullscreen) 830SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
615 CODE: 831 CODE:
832{
833 SDL_EnableUNICODE (1);
834 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
835
836 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
837 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
838 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
839 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
840
616 RETVAL = !!SDL_SetVideoMode ( 841 RETVAL = !!SDL_SetVideoMode (
617 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 842 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
618 ); 843 );
844
619 if (RETVAL) 845 if (RETVAL)
620 { 846 {
621 av_clear (texture_av); 847 av_clear (texture_av);
622 848
623 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
624# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
625# include "glfunc.h" 851#include "glfunc.h"
626# undef GL_FUNC 852#undef GL_FUNC
627
628 } 853 }
854}
629 OUTPUT: 855 OUTPUT:
630 RETVAL 856 RETVAL
631 857
632void 858void
633SDL_GL_SwapBuffers () 859SDL_GL_SwapBuffers ()
634 860
635char * 861char *
636SDL_GetKeyName (int sym) 862SDL_GetKeyName (int sym)
637 863
864int
865SDL_GetAppState ()
866
867int
868SDL_GetModState ()
869
638void 870void
639SDL_PollEvent () 871poll_events ()
640 PPCODE: 872 PPCODE:
641{ 873{
642 SDL_Event ev; 874 SDL_Event ev;
643 875
644 while (SDL_PollEvent (&ev)) 876 SDL_PumpEvents ();
877 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
645 { 878 {
646 HV *hv = newHV (); 879 HV *hv = newHV ();
647 hv_store (hv, "type", 4, newSViv (ev.type), 0); 880 hv_store (hv, "type", 4, newSViv (ev.type), 0);
648 881
649 switch (ev.type) 882 switch (ev.type)
650 { 883 {
651 case SDL_KEYDOWN: 884 case SDL_KEYDOWN:
652 case SDL_KEYUP: 885 case SDL_KEYUP:
653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
655 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
656 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
658 break; 891 break;
659 892
660 case SDL_ACTIVEEVENT: 893 case SDL_ACTIVEEVENT:
661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
662 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 895 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
663 break; 896 break;
664 897
665 case SDL_MOUSEMOTION: 898 case SDL_MOUSEMOTION:
899 {
900 int state = ev.motion.state;
901 int x = ev.motion.x;
902 int y = ev.motion.y;
903 int xrel = ev.motion.xrel;
904 int yrel = ev.motion.yrel;
905
906 /* do simplistic event compression */
907 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
908 && state == ev.motion.state)
909 {
910 xrel += ev.motion.xrel;
911 yrel += ev.motion.yrel;
912 x = ev.motion.x;
913 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 }
916
666 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
667
668 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 918 hv_store (hv, "state", 5, newSViv (state), 0);
669 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 919 hv_store (hv, "x", 1, newSViv (x), 0);
670 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 920 hv_store (hv, "y", 1, newSViv (y), 0);
671 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 921 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
672 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 922 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
923 }
673 break; 924 break;
674 925
675 case SDL_MOUSEBUTTONDOWN: 926 case SDL_MOUSEBUTTONDOWN:
676 case SDL_MOUSEBUTTONUP: 927 case SDL_MOUSEBUTTONUP:
677 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 928 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
678 929
679 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 930 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
680 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 931 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
681 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 932 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
682 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 933 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
687 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 938 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
688 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 939 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
689 break; 940 break;
690 } 941 }
691 942
692 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
693 } 944 }
694} 945}
695 946
696int 947int
697Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
698 POSTCALL: 949 POSTCALL:
699 Mix_HookMusicFinished (music_finished); 950 Mix_HookMusicFinished (music_finished);
700 Mix_ChannelFinished (channel_finished); 951 Mix_ChannelFinished (channel_finished);
701 952
702void 953void
954Mix_QuerySpec ()
955 PPCODE:
956{
957 int freq, channels;
958 Uint16 format;
959
960 if (Mix_QuerySpec (&freq, &format, &channels))
961 {
962 EXTEND (SP, 3);
963 PUSHs (sv_2mortal (newSViv (freq)));
964 PUSHs (sv_2mortal (newSViv (format)));
965 PUSHs (sv_2mortal (newSViv (channels)));
966 }
967}
968
969void
703Mix_CloseAudio () 970Mix_CloseAudio ()
704 971
705int 972int
706Mix_AllocateChannels (int numchans = -1) 973Mix_AllocateChannels (int numchans = -1)
974
975const char *
976Mix_GetError ()
707 977
708void 978void
709lowdelay (int fd, int val = 1) 979lowdelay (int fd, int val = 1)
710 CODE: 980 CODE:
711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 981 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
737 } 1007 }
738 } 1008 }
739#endif 1009#endif
740} 1010}
741 1011
742void 1012int
743add_font (char *file) 1013add_font (char *file)
744 CODE: 1014 CODE:
745 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT:
1017 RETVAL
746 1018
747void 1019void
748load_image_inline (SV *image_) 1020load_image_inline (SV *image_)
749 ALIAS: 1021 ALIAS:
750 load_image_file = 1 1022 load_image_file = 1
… …
753 STRLEN image_len; 1025 STRLEN image_len;
754 char *image = (char *)SvPVbyte (image_, image_len); 1026 char *image = (char *)SvPVbyte (image_, image_len);
755 SDL_Surface *surface, *surface2; 1027 SDL_Surface *surface, *surface2;
756 SDL_PixelFormat fmt; 1028 SDL_PixelFormat fmt;
757 SDL_RWops *rw = ix 1029 SDL_RWops *rw = ix
758 ? SDL_RWFromFile (image, "r") 1030 ? SDL_RWFromFile (image, "rb")
759 : SDL_RWFromConstMem (image, image_len); 1031 : SDL_RWFromConstMem (image, image_len);
760 1032
761 if (!rw) 1033 if (!rw)
762 croak ("load_image: %s", SDL_GetError ()); 1034 croak ("load_image: %s", SDL_GetError ());
763 1035
… …
836void 1108void
837error (char *message) 1109error (char *message)
838 CODE: 1110 CODE:
839 fprintf (stderr, "ERROR: %s\n", message); 1111 fprintf (stderr, "ERROR: %s\n", message);
840#ifdef _WIN32 1112#ifdef _WIN32
841 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1113 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
842#endif 1114#endif
843 1115
844void 1116void
845fatal (char *message) 1117fatal (char *message)
846 CODE: 1118 CODE:
847 fprintf (stderr, "FATAL: %s\n", message); 1119 fprintf (stderr, "FATAL: %s\n", message);
848#ifdef _WIN32 1120#ifdef _WIN32
849 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1121 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
850#endif 1122#endif
851 _exit (1); 1123 _exit (1);
852 1124
853void 1125void
854_exit (int retval = 0) 1126_exit (int retval = 0)
… …
857 ExitThread (retval); // unclean, please beam me up 1129 ExitThread (retval); // unclean, please beam me up
858#else 1130#else
859 _exit (retval); 1131 _exit (retval);
860#endif 1132#endif
861 1133
862MODULE = CFPlus PACKAGE = CFPlus::Font 1134void
1135debug ()
1136 CODE:
1137{
1138#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK;
1140#endif
1141}
863 1142
864CFPlus::Font 1143MODULE = Deliantra::Client PACKAGE = DC::Font
1144
1145PROTOTYPES: DISABLE
1146
1147DC::Font
865new_from_file (SV *class, char *path, int id = 0) 1148new_from_file (SV *class, char *path, int id = 0)
866 CODE: 1149 CODE:
867{ 1150{
868 int count; 1151 int count;
869 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
872} 1155}
873 OUTPUT: 1156 OUTPUT:
874 RETVAL 1157 RETVAL
875 1158
876void 1159void
877DESTROY (CFPlus::Font self) 1160DESTROY (DC::Font self)
878 CODE: 1161 CODE:
879 pango_font_description_free (self); 1162 pango_font_description_free (self);
880 1163
881void 1164void
882make_default (CFPlus::Font self) 1165make_default (DC::Font self)
1166 PROTOTYPE: $
883 CODE: 1167 CODE:
884 default_font = self; 1168 default_font = self;
885 1169
886MODULE = CFPlus PACKAGE = CFPlus::Layout 1170MODULE = Deliantra::Client PACKAGE = DC::Layout
887 1171
1172PROTOTYPES: DISABLE
1173
888void 1174void
889reset_glyph_cache () 1175glyph_cache_backup ()
1176 PROTOTYPE:
890 CODE: 1177 CODE:
1178 tc_backup ();
1179
1180void
1181glyph_cache_restore ()
1182 PROTOTYPE:
1183 CODE:
891 tc_clear (); 1184 tc_restore ();
892 1185
893CFPlus::Layout 1186DC::Layout
894new (SV *class) 1187new (SV *class)
895 CODE: 1188 CODE:
896 New (0, RETVAL, 1, struct cf_layout); 1189 New (0, RETVAL, 1, struct cf_layout);
897 1190
898 RETVAL->pl = pango_layout_new (opengl_context); 1191 RETVAL->pl = pango_layout_new (opengl_context);
… …
900 RETVAL->g = 1.; 1193 RETVAL->g = 1.;
901 RETVAL->b = 1.; 1194 RETVAL->b = 1.;
902 RETVAL->a = 1.; 1195 RETVAL->a = 1.;
903 RETVAL->base_height = MIN_FONT_HEIGHT; 1196 RETVAL->base_height = MIN_FONT_HEIGHT;
904 RETVAL->font = 0; 1197 RETVAL->font = 0;
1198 RETVAL->rc = rc_alloc ();
905 1199
906 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1200 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
907 layout_update_font (RETVAL); 1201 layout_update_font (RETVAL);
908 OUTPUT: 1202 OUTPUT:
909 RETVAL 1203 RETVAL
910 1204
911void 1205void
912DESTROY (CFPlus::Layout self) 1206DESTROY (DC::Layout self)
913 CODE: 1207 CODE:
914 g_object_unref (self->pl); 1208 g_object_unref (self->pl);
1209 rc_free (self->rc);
915 Safefree (self); 1210 Safefree (self);
916 1211
917void 1212void
918set_text (CFPlus::Layout self, SV *text_) 1213set_text (DC::Layout self, SV *text_)
919 CODE: 1214 CODE:
920{ 1215{
921 STRLEN textlen; 1216 STRLEN textlen;
922 char *text = SvPVutf8 (text_, textlen); 1217 char *text = SvPVutf8 (text_, textlen);
923 1218
924 pango_layout_set_text (self->pl, text, textlen); 1219 pango_layout_set_text (self->pl, text, textlen);
925} 1220}
926 1221
927void 1222void
928set_markup (CFPlus::Layout self, SV *text_) 1223set_markup (DC::Layout self, SV *text_)
929 CODE: 1224 CODE:
930{ 1225{
931 STRLEN textlen; 1226 STRLEN textlen;
932 char *text = SvPVutf8 (text_, textlen); 1227 char *text = SvPVutf8 (text_, textlen);
933 1228
934 pango_layout_set_markup (self->pl, text, textlen); 1229 pango_layout_set_markup (self->pl, text, textlen);
935} 1230}
936 1231
937void 1232void
938set_shapes (CFPlus::Layout self, ...) 1233set_shapes (DC::Layout self, ...)
939 CODE: 1234 CODE:
940{ 1235{
941 PangoAttrList *attrs = 0; 1236 PangoAttrList *attrs = 0;
942 const char *text = pango_layout_get_text (self->pl); 1237 const char *text = pango_layout_get_text (self->pl);
943 const char *pos = text; 1238 const char *pos = text;
… …
978 if (attrs) 1273 if (attrs)
979 pango_layout_set_attributes (self->pl, attrs); 1274 pango_layout_set_attributes (self->pl, attrs);
980} 1275}
981 1276
982void 1277void
983get_shapes (CFPlus::Layout self) 1278get_shapes (DC::Layout self)
984 PPCODE: 1279 PPCODE:
985{ 1280{
986 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
987 1282
988 do 1283 do
989 { 1284 {
990 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
991 1286
992 if (run && shape_attr_p (run)) 1287 if (run && shape_attr_p (run))
993 { 1288 {
994 PangoRectangle extents; 1289 PangoRectangle extents;
995 pango_layout_iter_get_run_extents (iter, 0, &extents); 1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1003 1298
1004 pango_layout_iter_free (iter); 1299 pango_layout_iter_free (iter);
1005} 1300}
1006 1301
1007int 1302int
1008has_wrapped (CFPlus::Layout self) 1303has_wrapped (DC::Layout self)
1009 CODE: 1304 CODE:
1010{ 1305{
1011 int lines = 1; 1306 int lines = 1;
1012 const char *text = pango_layout_get_text (self->pl); 1307 const char *text = pango_layout_get_text (self->pl);
1013 1308
… …
1018} 1313}
1019 OUTPUT: 1314 OUTPUT:
1020 RETVAL 1315 RETVAL
1021 1316
1022SV * 1317SV *
1023get_text (CFPlus::Layout self) 1318get_text (DC::Layout self)
1024 CODE: 1319 CODE:
1025 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1320 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1026 sv_utf8_decode (RETVAL); 1321 sv_utf8_decode (RETVAL);
1027 OUTPUT: 1322 OUTPUT:
1028 RETVAL 1323 RETVAL
1029 1324
1030void 1325void
1031set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1326set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1032 CODE: 1327 CODE:
1033 self->r = r; 1328 self->r = r;
1034 self->g = g; 1329 self->g = g;
1035 self->b = b; 1330 self->b = b;
1036 self->a = a; 1331 self->a = a;
1037 1332
1038void 1333void
1039set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1334set_font (DC::Layout self, DC::Font font = 0)
1040 CODE: 1335 CODE:
1041 if (self->font != font) 1336 if (self->font != font)
1042 { 1337 {
1043 self->font = font; 1338 self->font = font;
1044 layout_update_font (self); 1339 layout_update_font (self);
1045 } 1340 }
1046 1341
1047void 1342void
1048set_height (CFPlus::Layout self, int base_height) 1343set_height (DC::Layout self, int base_height)
1049 CODE: 1344 CODE:
1050 if (self->base_height != base_height) 1345 if (self->base_height != base_height)
1051 { 1346 {
1052 self->base_height = base_height; 1347 self->base_height = base_height;
1053 layout_update_font (self); 1348 layout_update_font (self);
1054 } 1349 }
1055 1350
1056void 1351void
1057set_width (CFPlus::Layout self, int max_width = -1) 1352set_width (DC::Layout self, int max_width = -1)
1058 CODE: 1353 CODE:
1059 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1354 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1060 1355
1061void 1356void
1062set_indent (CFPlus::Layout self, int indent) 1357set_indent (DC::Layout self, int indent)
1063 CODE: 1358 CODE:
1064 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1359 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1065 1360
1066void 1361void
1067set_spacing (CFPlus::Layout self, int spacing) 1362set_spacing (DC::Layout self, int spacing)
1068 CODE: 1363 CODE:
1069 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1364 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1070 1365
1071void 1366void
1072set_ellipsise (CFPlus::Layout self, int ellipsise) 1367set_ellipsise (DC::Layout self, int ellipsise)
1073 CODE: 1368 CODE:
1074 pango_layout_set_ellipsize (self->pl, 1369 pango_layout_set_ellipsize (self->pl,
1075 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1370 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1076 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1371 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1077 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1372 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1078 : PANGO_ELLIPSIZE_NONE 1373 : PANGO_ELLIPSIZE_NONE
1079 ); 1374 );
1080 1375
1081void 1376void
1082set_single_paragraph_mode (CFPlus::Layout self, int spm) 1377set_single_paragraph_mode (DC::Layout self, int spm)
1083 CODE: 1378 CODE:
1084 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1379 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1085 1380
1086void 1381void
1087size (CFPlus::Layout self) 1382size (DC::Layout self)
1088 PPCODE: 1383 PPCODE:
1089{ 1384{
1090 int w, h; 1385 int w, h;
1091 1386
1092 layout_get_pixel_size (self, &w, &h); 1387 layout_get_pixel_size (self, &w, &h);
… …
1095 PUSHs (sv_2mortal (newSViv (w))); 1390 PUSHs (sv_2mortal (newSViv (w)));
1096 PUSHs (sv_2mortal (newSViv (h))); 1391 PUSHs (sv_2mortal (newSViv (h)));
1097} 1392}
1098 1393
1099int 1394int
1100descent (CFPlus::Layout self) 1395descent (DC::Layout self)
1101 CODE: 1396 CODE:
1102{ 1397{
1103 PangoRectangle rect; 1398 PangoRectangle rect;
1104 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1105 pango_layout_line_get_pixel_extents (line, 0, &rect); 1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1106 RETVAL = PANGO_DESCENT (rect); 1401 RETVAL = PANGO_DESCENT (rect);
1107} 1402}
1108 OUTPUT: 1403 OUTPUT:
1109 RETVAL 1404 RETVAL
1110 1405
1111int 1406int
1112xy_to_index (CFPlus::Layout self, int x, int y) 1407xy_to_index (DC::Layout self, int x, int y)
1113 CODE: 1408 CODE:
1114{ 1409{
1115 int index, trailing; 1410 int index, trailing;
1116 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1411 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1117 RETVAL = index + trailing; 1412 RETVAL = index + trailing;
1118} 1413}
1119 OUTPUT: 1414 OUTPUT:
1120 RETVAL 1415 RETVAL
1121 1416
1122void 1417void
1123cursor_pos (CFPlus::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
1124 PPCODE: 1419 PPCODE:
1125{ 1420{
1126 PangoRectangle strong_pos; 1421 PangoRectangle pos;
1127 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1128 1423
1129 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1130 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1133} 1428}
1134 1429
1135void 1430void
1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
1137 PPCODE: 1432 PPCODE:
1138{ 1433{
1139 int line, x; 1434 int line, x;
1140 1435
1141 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1436 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1437#if !PANGO_VERSION_CHECK (1, 17, 3)
1142 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1143 1439 --line;
1440#endif
1144 EXTEND (SP, 2); 1441 EXTEND (SP, 2);
1145 PUSHs (sv_2mortal (newSViv (line - 1))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1146 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1147} 1444}
1148 1445
1149void 1446void
1150line_x_to_index (CFPlus::Layout self, int line, int x) 1447line_x_to_index (DC::Layout self, int line, int x)
1151 PPCODE: 1448 PPCODE:
1152{ 1449{
1153 PangoLayoutLine *lp; 1450 PangoLayoutLine *lp;
1154 int index, trailing; 1451 int index, trailing;
1155 1452
1156 if (line < 0) 1453 if (line < 0)
1157 XSRETURN_EMPTY; 1454 XSRETURN_EMPTY;
1158 1455
1159 if (!(lp = pango_layout_get_line (self->pl, line))) 1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1160 XSRETURN_EMPTY; /* do better */ 1457 XSRETURN_EMPTY; /* do better */
1161 1458
1162 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1459 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1163 1460
1164 EXTEND (SP, 2); 1461 EXTEND (SP, 2);
… …
1170 PUSHs (sv_2mortal (newSViv (trailing))); 1467 PUSHs (sv_2mortal (newSViv (trailing)));
1171 } 1468 }
1172} 1469}
1173 1470
1174void 1471void
1175render (CFPlus::Layout self, float x, float y, int flags = 0) 1472render (DC::Layout self, float x, float y, int flags = 0)
1176 PPCODE: 1473 CODE:
1474 rc_clear (self->rc);
1177 pango_opengl_render_layout_subpixel ( 1475 pango_opengl_render_layout_subpixel (
1178 self->pl, 1476 self->pl,
1477 self->rc,
1179 x * PANGO_SCALE, y * PANGO_SCALE, 1478 x * PANGO_SCALE, y * PANGO_SCALE,
1180 self->r, self->g, self->b, self->a, 1479 self->r, self->g, self->b, self->a,
1181 flags 1480 flags
1182 ); 1481 );
1482 // we assume that context_change actually clears/frees stuff
1483 // and does not do any recomputation...
1484 pango_layout_context_changed (self->pl);
1183 1485
1184MODULE = CFPlus PACKAGE = CFPlus::Texture
1185
1186void 1486void
1187pad2pot (SV *data_, SV *w_, SV *h_) 1487draw (DC::Layout self)
1188 CODE: 1488 CODE:
1189{ 1489{
1190 int ow = SvIV (w_); 1490 glEnable (GL_TEXTURE_2D);
1191 int oh = SvIV (h_); 1491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1492 glEnable (GL_BLEND);
1493 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1494 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1495 glEnable (GL_ALPHA_TEST);
1496 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1192 1497
1193 if (ow && oh) 1498 rc_draw (self->rc);
1499
1500 glDisable (GL_ALPHA_TEST);
1501 glDisable (GL_BLEND);
1502 glDisable (GL_TEXTURE_2D);
1503}
1504
1505MODULE = Deliantra::Client PACKAGE = DC::Texture
1506
1507PROTOTYPES: ENABLE
1508
1509void
1510pad (SV *data_, int ow, int oh, int nw, int nh)
1511 CODE:
1512{
1513 if ((nw != ow || nh != oh) && SvOK (data_))
1194 { 1514 {
1195 int nw = minpot (ow);
1196 int nh = minpot (oh);
1197
1198 if (nw != ow || nh != oh)
1199 {
1200 if (SvOK (data_))
1201 {
1202 STRLEN datalen; 1515 STRLEN datalen;
1203 char *data = SvPVbyte (data_, datalen); 1516 char *data = SvPVbyte (data_, datalen);
1204 int bpp = datalen / (ow * oh); 1517 int bpp = datalen / (ow * oh);
1205 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1518 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1206 1519
1207 SvPOK_only (result_); 1520 SvPOK_only (result_);
1208 SvCUR_set (result_, nw * nh * bpp); 1521 SvCUR_set (result_, nw * nh * bpp);
1209 1522
1210 memset (SvPVX (result_), 0, nw * nh * bpp); 1523 memset (SvPVX (result_), 0, nw * nh * bpp);
1211 while (oh--) 1524 while (oh--)
1212 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1525 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1213 1526
1214 sv_setsv (data_, result_); 1527 sv_setsv (data_, result_);
1215 }
1216
1217 sv_setiv (w_, nw);
1218 sv_setiv (h_, nh);
1219 }
1220 } 1528 }
1221} 1529}
1222 1530
1223void 1531void
1224draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1532draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1230{ 1538{
1231 HV *hv = (HV *)SvRV (self); 1539 HV *hv = (HV *)SvRV (self);
1232 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1540 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1233 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1541 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1234 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1542 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1543
1544 if (name <= 0)
1545 XSRETURN_EMPTY;
1235 1546
1236 if (items < 5) 1547 if (items < 5)
1237 { 1548 {
1238 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1549 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1239 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1550 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1267 glDisable (GL_ALPHA_TEST); 1578 glDisable (GL_ALPHA_TEST);
1268 glDisable (GL_BLEND); 1579 glDisable (GL_BLEND);
1269 } 1580 }
1270} 1581}
1271 1582
1272MODULE = CFPlus PACKAGE = CFPlus::Map 1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE:
1585{
1586 GLint width;
1587 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1588 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1589 RETVAL = width > 0;
1590}
1591 OUTPUT:
1592 RETVAL
1273 1593
1274CFPlus::Map 1594MODULE = Deliantra::Client PACKAGE = DC::Map
1595
1596PROTOTYPES: DISABLE
1597
1598DC::Map
1275new (SV *class) 1599new (SV *class)
1276 CODE: 1600 CODE:
1277 New (0, RETVAL, 1, struct map); 1601 New (0, RETVAL, 1, struct map);
1278 RETVAL->x = 0; 1602 RETVAL->x = 0;
1279 RETVAL->y = 0; 1603 RETVAL->y = 0;
… …
1287 RETVAL->row = 0; 1611 RETVAL->row = 0;
1288 OUTPUT: 1612 OUTPUT:
1289 RETVAL 1613 RETVAL
1290 1614
1291void 1615void
1292DESTROY (CFPlus::Map self) 1616DESTROY (DC::Map self)
1293 CODE: 1617 CODE:
1294{ 1618{
1295 map_clear (self); 1619 map_clear (self);
1296 Safefree (self->face2tile); 1620 Safefree (self->face2tile);
1297 Safefree (self->tex); 1621 Safefree (self->tex);
1298 Safefree (self); 1622 Safefree (self);
1299} 1623}
1300 1624
1301void 1625void
1302resize (CFPlus::Map self, int map_width, int map_height) 1626resize (DC::Map self, int map_width, int map_height)
1303 CODE: 1627 CODE:
1304 self->w = map_width; 1628 self->w = map_width;
1305 self->h = map_height; 1629 self->h = map_height;
1306 1630
1307void 1631void
1308clear (CFPlus::Map self) 1632clear (DC::Map self)
1309 CODE: 1633 CODE:
1310 map_clear (self); 1634 map_clear (self);
1311 1635
1312void 1636void
1313set_tileid (CFPlus::Map self, int face, int tile) 1637set_tileid (DC::Map self, int face, int tile)
1314 CODE: 1638 CODE:
1315{ 1639{
1316 need_facenum (self, face); self->face2tile [face] = tile; 1640 need_facenum (self, face); self->face2tile [face] = tile;
1317 need_texid (self, tile); 1641 need_texid (self, tile);
1318} 1642}
1319 1643
1320void 1644void
1321set_smooth (CFPlus::Map self, int face, int smooth, int level) 1645set_smooth (DC::Map self, int face, int smooth, int level)
1322 CODE: 1646 CODE:
1323{ 1647{
1324 tileid texid; 1648 tileid texid;
1325 maptex *tex; 1649 maptex *tex;
1326 1650
… …
1339 tex->smoothtile = self->face2tile [smooth]; 1663 tex->smoothtile = self->face2tile [smooth];
1340 tex->smoothlevel = level; 1664 tex->smoothlevel = level;
1341} 1665}
1342 1666
1343void 1667void
1344set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1668set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1345 CODE: 1669 CODE:
1346{ 1670{
1347 need_texid (self, texid); 1671 need_texid (self, texid);
1348 1672
1349 { 1673 {
… …
1369 // from transparent color bleeding and ugly wrapping effects. 1693 // from transparent color bleeding and ugly wrapping effects.
1370 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1371} 1695}
1372 1696
1373int 1697int
1374ox (CFPlus::Map self) 1698ox (DC::Map self)
1375 ALIAS: 1699 ALIAS:
1376 oy = 1 1700 oy = 1
1377 x = 2 1701 x = 2
1378 y = 3 1702 y = 3
1379 w = 4 1703 w = 4
… …
1390 } 1714 }
1391 OUTPUT: 1715 OUTPUT:
1392 RETVAL 1716 RETVAL
1393 1717
1394void 1718void
1395scroll (CFPlus::Map self, int dx, int dy) 1719scroll (DC::Map self, int dx, int dy)
1396 CODE: 1720 CODE:
1397{ 1721{
1398 if (dx > 0) 1722 if (dx > 0)
1399 map_blank (self, self->x, self->y, dx, self->h); 1723 map_blank (self, self->x, self->y, dx, self->h);
1400 else if (dx < 0) 1724 else if (dx < 0)
… …
1415 self->rows += MAP_EXTEND_Y; 1739 self->rows += MAP_EXTEND_Y;
1416 self->y += MAP_EXTEND_Y; 1740 self->y += MAP_EXTEND_Y;
1417 } 1741 }
1418} 1742}
1419 1743
1420void 1744SV *
1421map1a_update (CFPlus::Map self, SV *data_, int extmap) 1745map1a_update (DC::Map self, SV *data_, int extmap)
1422 CODE: 1746 CODE:
1423{ 1747{
1424 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1425 uint8_t *data_end = (uint8_t *)SvEND (data_); 1749 uint8_t *data_end = (uint8_t *)SvEND (data_);
1426 mapcell *cell; 1750 mapcell *cell;
1427 int x, y, flags; 1751 int x, y, z, flags;
1752 AV *missing = newAV ();
1753 RETVAL = newRV_noinc ((SV *)missing);
1428 1754
1429 while (data < data_end - 1) 1755 while (data < data_end - 1)
1430 { 1756 {
1431 flags = (data [0] << 8) + data [1]; data += 2; 1757 flags = (data [0] << 8) + data [1]; data += 2;
1432 1758
… …
1452 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1453 1779
1454 do 1780 do
1455 { 1781 {
1456 ext = *data++; 1782 ext = *data++;
1457 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1458 1784
1459 if (cmd < 4) 1785 if (cmd < 4)
1460 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1461 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1462 { 1788 {
… …
1465 } 1791 }
1466 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1467 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1468 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1469 { 1795 {
1470 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1471 ; // decode player count 1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1472 1800
1473 data += *data + 1; 1801 data += *data + 1;
1474 } 1802 }
1475 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1476 cell->flags = *data++; 1804 cell->flags = *data++;
… …
1483 } 1811 }
1484 else 1812 else
1485 cell->darkness = *data++ + 1; 1813 cell->darkness = *data++ + 1;
1486 } 1814 }
1487 1815
1816 for (z = 0; z <= 2; ++z)
1488 if (flags & 4) 1817 if (flags & (4 >> z))
1489 { 1818 {
1490 faceid face = (data [0] << 8) + data [1]; data += 2; 1819 faceid face = (data [0] << 8) + data [1]; data += 2;
1491 need_facenum (self, face); 1820 need_facenum (self, face);
1492 cell->tile [0] = self->face2tile [face]; 1821 cell->tile [z] = self->face2tile [face];
1822
1823 if (cell->tile [z])
1824 {
1825 maptex *tex = self->tex + cell->tile [z];
1826 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z]));
1828
1829 if (tex->smoothtile)
1830 {
1831 maptex *smooth = self->tex + tex->smoothtile;
1832 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile));
1834 }
1835 }
1493 } 1836 }
1494
1495 if (flags & 2)
1496 {
1497 faceid face = (data [0] << 8) + data [1]; data += 2;
1498 need_facenum (self, face);
1499 cell->tile [1] = self->face2tile [face];
1500 }
1501
1502 if (flags & 1)
1503 {
1504 faceid face = (data [0] << 8) + data [1]; data += 2;
1505 need_facenum (self, face);
1506 cell->tile [2] = self->face2tile [face];
1507 }
1508 } 1837 }
1509 else 1838 else
1510 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1511 } 1840 }
1512} 1841}
1842 OUTPUT:
1843 RETVAL
1513 1844
1514SV * 1845SV *
1515mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1846mapmap (DC::Map self, int x0, int y0, int w, int h)
1516 CODE: 1847 CODE:
1517{ 1848{
1518 int x1, x; 1849 int x1, x;
1519 int y1, y; 1850 int y1, y;
1520 int z; 1851 int z;
… …
1565} 1896}
1566 OUTPUT: 1897 OUTPUT:
1567 RETVAL 1898 RETVAL
1568 1899
1569void 1900void
1570draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1571 CODE: 1902 CODE:
1572{ 1903{
1904 int x, y, z;
1905
1573 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1574 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1575 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1576 smooth_key skey; 1909 smooth_key skey;
1577 int x, y, z; 1910 int pl_x, pl_y;
1578 int last_name; 1911 maptex pl_tex;
1912 rc_t *rc = rc_alloc ();
1913 rc_key_t key;
1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1579 1917
1580 // thats current max. sorry. 1918 // thats current max. sorry.
1581 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1582 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1583 1921
1584 // clear key, in case of extra padding 1922 // clear key, in case of extra padding
1585 memset (&skey, 0, sizeof (skey)); 1923 memset (&skey, 0, sizeof (skey));
1586 1924
1587 glColor4ub (255, 255, 255, 255); 1925 memset (&key, 0, sizeof (key));
1588 1926 key.r = 255;
1589 glEnable (GL_BLEND); 1927 key.g = 255;
1590 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1928 key.b = 255;
1591 glEnable (GL_TEXTURE_2D); 1929 key.a = 255;
1592 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1930 key.mode = GL_QUADS;
1593 1931 key.format = GL_T2F_V3F;
1594 glBegin (GL_QUADS); 1932 key.texname = -1;
1595
1596 last_name = 0;
1597 1933
1598 mx += self->x; 1934 mx += self->x;
1599 my += self->y; 1935 my += self->y;
1600 1936
1601 // first pass: determine smooth_max 1937 // first pass: determine smooth_max
… …
1617 MAX (self->tex [cell->tile [0]].smoothlevel, 1953 MAX (self->tex [cell->tile [0]].smoothlevel,
1618 MAX (self->tex [cell->tile [1]].smoothlevel, 1954 MAX (self->tex [cell->tile [1]].smoothlevel,
1619 self->tex [cell->tile [2]].smoothlevel)); 1955 self->tex [cell->tile [2]].smoothlevel));
1620 } 1956 }
1621 } 1957 }
1958
1959 glEnable (GL_BLEND);
1960 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1622 1962
1623 for (z = 0; z <= 2; z++) 1963 for (z = 0; z <= 2; z++)
1624 { 1964 {
1625 memset (smooth_level, 0, sizeof (smooth_level)); 1965 memset (smooth_level, 0, sizeof (smooth_level));
1626 1966
… …
1639 { 1979 {
1640 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1641 int px = (x + 1) * T - tex.w; 1981 int px = (x + 1) * T - tex.w;
1642 int py = (y + 1) * T - tex.h; 1982 int py = (y + 1) * T - tex.h;
1643 1983
1644 // suppressing texture state switches here
1645 // is only moderately effective, but worth the extra effort
1646 if (last_name != tex.name) 1984 if (key.texname != tex.name)
1647 { 1985 {
1648 if (!tex.name) 1986 if (!tex.name)
1649 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1650 1988
1651 glEnd (); 1989 key.texname = tex.name;
1652 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1990 arr = rc_array (rc, &key);
1653 glBegin (GL_QUADS);
1654 } 1991 }
1655 1992
1656 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1657 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1658 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1659 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1660
1661 if (cell->flags && z == 2)
1662 { 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
2000
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
1663 if (cell->flags & 1) 2009 if (cell->flags & 1)
1664 { 2010 {
1665 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
1666 int px = x * T + T * 2 / 32; 2012 int px = x * T + T * 2 / 32;
1667 int py = y * T - T * 6 / 32; 2013 int py = y * T - T * 6 / 32;
1668 2014
2015 if (tex.name)
1669 glEnd (); 2016 {
1670 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1671 glBegin (GL_QUADS); 2027 }
1672
1673 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1674 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1675 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1676 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1677 } 2028 }
1678 } 2029 }
1679 2030
1680 // update smooth hash 2031 // update smooth hash
1681 if (tex.smoothtile) 2032 if (tex.smoothtile)
… …
1717 } 2068 }
1718 } 2069 }
1719 } 2070 }
1720 } 2071 }
1721 2072
2073 rc_draw (rc);
2074 rc_clear (rc);
2075
1722 // go through all smoothlevels, lowest to highest, then draw. 2076 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort 2077 // this is basically counting sort
1724 { 2078 {
1725 int w, b; 2079 int w, b;
1726 2080
2081 glEnable (GL_TEXTURE_2D);
2082 glBegin (GL_QUADS);
1727 for (w = 0; w < 256 / 32; ++w) 2083 for (w = 0; w < 256 / 32; ++w)
1728 { 2084 {
1729 uint32_t smask = smooth_level [w]; 2085 uint32_t smask = smooth_level [w];
1730 if (smask) 2086 if (smask)
1731 for (b = 0; b < 32; ++b) 2087 for (b = 0; b < 32; ++b)
… …
1750 int border = bits & 15; 2106 int border = bits & 15;
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2107 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1752 float dx = tex.s * .0625f; // 16 images/row 2108 float dx = tex.s * .0625f; // 16 images/row
1753 float dy = tex.t * .5f ; // 2 images/column 2109 float dy = tex.t * .5f ; // 2 images/column
1754 2110
1755 // this time naively avoiding texture state changes
1756 // save gobs of state changes.
1757 if (last_name != tex.name) 2111 if (tex.name)
1758 { 2112 {
2113 // this time avoiding texture state changes
2114 // save gobs of state changes.
1759 if (!tex.name) 2115 if (key.texname != tex.name)
1760 continue; // smoothing not yet available 2116 {
1761
1762 glEnd (); 2117 glEnd ();
1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1764 glBegin (GL_QUADS); 2119 glBegin (GL_QUADS);
1765 } 2120 }
1766 2121
1767 if (border) 2122 if (border)
1768 { 2123 {
1769 float ox = border * dx; 2124 float ox = border * dx;
1770 2125
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2126 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2127 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2128 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2129 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1775 } 2130 }
1776 2131
1777 if (corner) 2132 if (corner)
1778 { 2133 {
1779 float ox = corner * dx; 2134 float ox = corner * dx;
1780 2135
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2136 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2137 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2138 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2139 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2140 }
1785 } 2141 }
1786 } 2142 }
1787 } 2143 }
1788 } 2144 }
1789 } 2145 }
2146
2147 glEnd ();
2148 glDisable (GL_TEXTURE_2D);
2149 key.texname = -1;
1790 } 2150 }
1791 2151
1792 hv_clear (smooth); 2152 hv_clear (smooth);
1793 } 2153 }
1794 2154
1795 glEnd (); 2155 if (pl_tex.name)
2156 {
2157 maptex tex = pl_tex;
2158 int px = pl_x + sdx;
2159 int py = pl_y + sdy;
1796 2160
1797 glDisable (GL_TEXTURE_2D); 2161 key.texname = tex.name;
2162 arr = rc_array (rc, &key);
2163
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2166 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168
2169 rc_draw (rc);
2170 }
2171
1798 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2173 rc_free (rc);
1799 2174
1800 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
1801 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
1802 if (0 <= y + my && y + my < self->rows) 2177 if (0 <= y + my && y + my < self->rows)
1803 { 2178 {
… …
1828 } 2203 }
1829 } 2204 }
1830} 2205}
1831 2206
1832void 2207void
1833draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1834 CODE: 2209 CODE:
1835{ 2210{
1836 static float color[16][3] = { 2211 static float color[16][3] = {
1837 { 0.00F, 0.00F, 0.00F }, 2212 { 0.00F, 0.00F, 0.00F },
1838 { 1.00F, 1.00F, 1.00F }, 2213 { 1.00F, 1.00F, 1.00F },
… …
1888 glDisable (GL_BLEND); 2263 glDisable (GL_BLEND);
1889 glDisable (GL_TEXTURE_2D); 2264 glDisable (GL_TEXTURE_2D);
1890} 2265}
1891 2266
1892void 2267void
1893fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2268fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1894 PPCODE: 2269 PPCODE:
1895{ 2270{
1896 int x, y; 2271 int x, y;
2272 int sw1 = sw + 2;
2273 int sh1 = sh + 2;
2274 int sh3 = sh * 3;
1897 int sw4 = (sw + 3) & ~3; 2275 int sw34 = (sw * 3 + 3) & ~3;
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1898 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1899 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1900 2279
1901 memset (darkness, 255, sw4 * sh);
1902 SvPOK_only (darkness_sv); 2280 SvPOK_only (darkness3_sv);
1903 SvCUR_set (darkness_sv, sw4 * sh); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
1904 2282
1905 mx += self->x; 2283 mx += self->x - 1;
1906 my += self->y; 2284 my += self->y - 1;
1907 2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287
1908 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh1; y++)
1909 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
1910 { 2290 {
1911 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
1912 2292
1913 for (x = 0; x < sw; x++) 2293 for (x = 0; x < sw1; x++)
1914 if (row->c0 <= x + mx && x + mx < row->c1) 2294 if (row->c0 <= x + mx && x + mx < row->c1)
1915 { 2295 {
1916 mapcell *cell = row->col + (x + mx - row->c0); 2296 mapcell *cell = row->col + (x + mx - row->c0);
1917 2297
1918 darkness[y * sw4 + x] = cell->darkness 2298 darkness1 [y * sw1 + x] = cell->darkness
1919 ? 255 - (cell->darkness - 1) 2299 ? 255 - (cell->darkness - 1)
1920 : 255 - FOW_DARKNESS; 2300 : 255 - FOW_DARKNESS;
1921 } 2301 }
1922 } 2302 }
1923 2303
2304 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x)
2306 {
2307 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2308 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2309 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2310 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2311 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2312 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2313 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2314 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2315 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2316
2317 uint8_t r11 = (d11 + d21 + d12) / 3;
2318 uint8_t r21 = d21;
2319 uint8_t r31 = (d21 + d31 + d32) / 3;
2320
2321 uint8_t r12 = d12;
2322 uint8_t r22 = d22;
2323 uint8_t r32 = d32;
2324
2325 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3;
2328
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2338 }
2339
2340 free (darkness1);
2341
1924 EXTEND (SP, 3); 2342 EXTEND (SP, 3);
1925 PUSHs (sv_2mortal (newSViv (sw4))); 2343 PUSHs (sv_2mortal (newSViv (sw34)));
1926 PUSHs (sv_2mortal (newSViv (sh))); 2344 PUSHs (sv_2mortal (newSViv (sh3)));
1927 PUSHs (darkness_sv); 2345 PUSHs (darkness3_sv);
1928} 2346}
1929 2347
1930SV * 2348SV *
1931get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2349get_rect (DC::Map self, int x0, int y0, int w, int h)
1932 CODE: 2350 CODE:
1933{ 2351{
1934 int x, y, x1, y1; 2352 int x, y, x1, y1;
1935 SV *data_sv = newSV (w * h * 7 + 5); 2353 SV *data_sv = newSV (w * h * 7 + 5);
1936 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2354 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1993 else 2411 else
1994 *data++ = 0; 2412 *data++ = 0;
1995 } 2413 }
1996 } 2414 }
1997 2415
2416 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 {
1998 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
1999 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2000 RETVAL = data_sv; 2423 RETVAL = data_sv;
2001} 2424}
2002 OUTPUT: 2425 OUTPUT:
2003 RETVAL 2426 RETVAL
2004 2427
2005void 2428void
2006set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2007 PPCODE: 2430 PPCODE:
2008{ 2431{
2009 int x, y, z; 2432 int x, y, z;
2010 int w, h; 2433 int w, h;
2011 int x1, y1; 2434 int x1, y1;
2435 STRLEN len;
2436 uint8_t *data, *end;
2437
2438 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv);
2441 end = data + len + 8;
2442
2443 if (len < 5)
2444 XSRETURN_EMPTY;
2012 2445
2013 if (*data++ != 0) 2446 if (*data++ != 0)
2014 return; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2015 2448
2016 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
2017 h = *data++ << 8; h |= *data++; 2450 h = *data++ << 8; h |= *data++;
2018 2451
2019 // we need to do this 'cause we don't keep an absolute coord system for rows 2452 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2031 { 2464 {
2032 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2033 2466
2034 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2035 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2036 uint8_t flags = *data++; 2474 flags = *data++;
2037 2475
2038 if (flags) 2476 if (flags)
2039 { 2477 {
2040 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2041 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
… …
2044 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2045 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2046 2484
2047 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2048 { 2486 {
2049 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2050 2489
2051 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2052 { 2491 {
2053 tileid t = tile [z]; 2492 tileid t = tile [z];
2054 2493
2055 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2056 { 2495 {
2057 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2058 need_texid (self, t); 2497 need_texid (self, t);
2059 } 2498 }
2060 2499
2061 cell->tile [z] = t; 2500 cell->tile [z] = t;
2062 } 2501 }
… …
2064 } 2503 }
2065 } 2504 }
2066 } 2505 }
2067} 2506}
2068 2507
2069MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2508MODULE = Deliantra::Client PACKAGE = DC::RW
2070 2509
2071CFPlus::MixChunk 2510DC::RW
2072new_from_file (SV *class, char *path) 2511new (SV *class, SV *data_sv)
2073 CODE: 2512 CODE:
2074 RETVAL = Mix_LoadWAV (path); 2513{
2514 STRLEN datalen;
2515 char *data = SvPVbyte (data_sv, datalen);
2516
2517 RETVAL = SDL_RWFromConstMem (data, datalen);
2518}
2075 OUTPUT: 2519 OUTPUT:
2076 RETVAL 2520 RETVAL
2077 2521
2522DC::RW
2523new_from_file (SV *class, const char *path, const char *mode = "rb")
2524 CODE:
2525 RETVAL = SDL_RWFromFile (path, mode);
2526 OUTPUT:
2527 RETVAL
2528
2529# fails on win32:
2530# dc.xs(2268) : error C2059: syntax error : '('
2078void 2531#void
2532#close (DC::RW self)
2533# CODE:
2534# (self->(close)) (self);
2535
2536MODULE = Deliantra::Client PACKAGE = DC::Channel
2537
2538PROTOTYPES: DISABLE
2539
2540DC::Channel
2541find ()
2542 CODE:
2543{
2544 RETVAL = Mix_GroupAvailable (-1);
2545
2546 if (RETVAL < 0)
2547 {
2548 RETVAL = Mix_GroupOldest (-1);
2549
2550 if (RETVAL < 0)
2551 XSRETURN_UNDEF;
2552
2553 Mix_HaltChannel (RETVAL);
2554 }
2555
2556 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128);
2558}
2559 OUTPUT:
2560 RETVAL
2561
2562void
2563halt (DC::Channel self)
2564 CODE:
2565 Mix_HaltChannel (self);
2566
2567void
2568expire (DC::Channel self, int ticks = -1)
2569 CODE:
2570 Mix_ExpireChannel (self, ticks);
2571
2572void
2573fade_out (DC::Channel self, int ticks = -1)
2574 CODE:
2575 Mix_FadeOutChannel (self, ticks);
2576
2577int
2578volume (DC::Channel self, int volume)
2579 CODE:
2580 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2581 OUTPUT:
2582 RETVAL
2583
2584void
2585unregister_all_effects (DC::Channel self)
2586 CODE:
2587 Mix_UnregisterAllEffects (self);
2588
2589void
2590set_panning (DC::Channel self, int left, int right)
2591 CODE:
2592 left = CLAMP (left , 0, 255);
2593 right = CLAMP (right, 0, 255);
2594 Mix_SetPanning (self, left, right);
2595
2596void
2597set_distance (DC::Channel self, int distance)
2598 CODE:
2599 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2600
2601void
2602set_position (DC::Channel self, int angle, int distance)
2603 CODE:
2604
2605void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE:
2608{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612}
2613
2614void
2615set_reverse_stereo (DC::Channel self, int flip)
2616 CODE:
2617 Mix_SetReverseStereo (self, flip);
2618
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620
2621PROTOTYPES: DISABLE
2622
2623DC::MixChunk
2624new (SV *class, DC::RW rwops)
2625 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2627 OUTPUT:
2628 RETVAL
2629
2630void
2079DESTROY (CFPlus::MixChunk self) 2631DESTROY (DC::MixChunk self)
2080 CODE: 2632 CODE:
2081 Mix_FreeChunk (self); 2633 Mix_FreeChunk (self);
2082 2634
2083int 2635int
2084volume (CFPlus::MixChunk self, int volume = -1) 2636volume (DC::MixChunk self, int volume = -1)
2085 CODE: 2637 CODE:
2638 if (items > 1)
2639 volume = CLAMP (volume, 0, 128);
2086 RETVAL = Mix_VolumeChunk (self, volume); 2640 RETVAL = Mix_VolumeChunk (self, volume);
2087 OUTPUT: 2641 OUTPUT:
2088 RETVAL 2642 RETVAL
2089 2643
2090int 2644DC::Channel
2091play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2645play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2092 CODE: 2646 CODE:
2647{
2093 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2648 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2649
2650 if (RETVAL < 0)
2651 XSRETURN_UNDEF;
2652
2653 if (channel < 0)
2654 {
2655 Mix_UnregisterAllEffects (RETVAL);
2656 Mix_Volume (RETVAL, 128);
2657 }
2658}
2094 OUTPUT: 2659 OUTPUT:
2095 RETVAL 2660 RETVAL
2096 2661
2097MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2098 2663
2099int 2664int
2100volume (int volume = -1) 2665volume (int volume = -1)
2666 PROTOTYPE: ;$
2101 CODE: 2667 CODE:
2668 if (items > 0)
2669 volume = CLAMP (volume, 0, 128);
2102 RETVAL = Mix_VolumeMusic (volume); 2670 RETVAL = Mix_VolumeMusic (volume);
2103 OUTPUT: 2671 OUTPUT:
2104 RETVAL 2672 RETVAL
2105 2673
2674void
2675fade_out (int ms)
2676 CODE:
2677 Mix_FadeOutMusic (ms);
2678
2679void
2680halt ()
2681 CODE:
2682 Mix_HaltMusic ();
2683
2106CFPlus::MixMusic 2684DC::MixMusic
2107new_from_file (SV *class, char *path) 2685new (SV *class, DC::RW rwops)
2108 CODE: 2686 CODE:
2109 RETVAL = Mix_LoadMUS (path); 2687 RETVAL = Mix_LoadMUS_RW (rwops);
2110 OUTPUT: 2688 OUTPUT:
2111 RETVAL 2689 RETVAL
2112 2690
2113void 2691void
2114DESTROY (CFPlus::MixMusic self) 2692DESTROY (DC::MixMusic self)
2115 CODE: 2693 CODE:
2116 Mix_FreeMusic (self); 2694 Mix_FreeMusic (self);
2117 2695
2118int 2696int
2119play (CFPlus::MixMusic self, int loops = -1) 2697play (DC::MixMusic self, int loops = -1)
2120 CODE: 2698 CODE:
2121 RETVAL = Mix_PlayMusic (self, loops); 2699 RETVAL = Mix_PlayMusic (self, loops);
2122 OUTPUT: 2700 OUTPUT:
2123 RETVAL 2701 RETVAL
2124 2702
2125MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2703void
2704fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2705 CODE:
2706 Mix_FadeInMusicPos (self, loops, ms, position);
2707
2708MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2709
2710PROTOTYPES: ENABLE
2126 2711
2127BOOT: 2712BOOT:
2128{ 2713{
2129 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2714 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2130 static const struct { 2715 static const struct {
2131 const char *name; 2716 const char *name;
2132 IV iv; 2717 IV iv;
2133 } *civ, const_iv[] = { 2718 } *civ, const_iv[] = {
2134# define const_iv(name) { # name, (IV)name } 2719# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS),
2135 const_iv (GL_COLOR_MATERIAL), 2723 const_iv (GL_COLOR_MATERIAL),
2136 const_iv (GL_SMOOTH), 2724 const_iv (GL_SMOOTH),
2137 const_iv (GL_FLAT), 2725 const_iv (GL_FLAT),
2138 const_iv (GL_DITHER), 2726 const_iv (GL_DITHER),
2139 const_iv (GL_BLEND), 2727 const_iv (GL_BLEND),
… …
2143 const_iv (GL_ALPHA_TEST), 2731 const_iv (GL_ALPHA_TEST),
2144 const_iv (GL_NORMALIZE), 2732 const_iv (GL_NORMALIZE),
2145 const_iv (GL_RESCALE_NORMAL), 2733 const_iv (GL_RESCALE_NORMAL),
2146 const_iv (GL_FRONT), 2734 const_iv (GL_FRONT),
2147 const_iv (GL_BACK), 2735 const_iv (GL_BACK),
2736 const_iv (GL_AUX0),
2148 const_iv (GL_AND), 2737 const_iv (GL_AND),
2149 const_iv (GL_ONE), 2738 const_iv (GL_ONE),
2150 const_iv (GL_ZERO), 2739 const_iv (GL_ZERO),
2151 const_iv (GL_SRC_ALPHA), 2740 const_iv (GL_SRC_ALPHA),
2152 const_iv (GL_DST_ALPHA), 2741 const_iv (GL_DST_ALPHA),
… …
2165 const_iv (GL_INTENSITY), 2754 const_iv (GL_INTENSITY),
2166 const_iv (GL_LUMINANCE), 2755 const_iv (GL_LUMINANCE),
2167 const_iv (GL_LUMINANCE_ALPHA), 2756 const_iv (GL_LUMINANCE_ALPHA),
2168 const_iv (GL_FLOAT), 2757 const_iv (GL_FLOAT),
2169 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2758 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2759 const_iv (GL_COMPRESSED_ALPHA_ARB),
2760 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2761 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2762 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2763 const_iv (GL_COMPRESSED_RGB_ARB),
2764 const_iv (GL_COMPRESSED_RGBA_ARB),
2170 const_iv (GL_COMPILE), 2765 const_iv (GL_COMPILE),
2766 const_iv (GL_PROXY_TEXTURE_1D),
2767 const_iv (GL_PROXY_TEXTURE_2D),
2171 const_iv (GL_TEXTURE_1D), 2768 const_iv (GL_TEXTURE_1D),
2172 const_iv (GL_TEXTURE_2D), 2769 const_iv (GL_TEXTURE_2D),
2173 const_iv (GL_TEXTURE_ENV), 2770 const_iv (GL_TEXTURE_ENV),
2174 const_iv (GL_TEXTURE_MAG_FILTER), 2771 const_iv (GL_TEXTURE_MAG_FILTER),
2175 const_iv (GL_TEXTURE_MIN_FILTER), 2772 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2196 const_iv (GL_COLOR_LOGIC_OP), 2793 const_iv (GL_COLOR_LOGIC_OP),
2197 const_iv (GL_SEPARABLE_2D), 2794 const_iv (GL_SEPARABLE_2D),
2198 const_iv (GL_CONVOLUTION_2D), 2795 const_iv (GL_CONVOLUTION_2D),
2199 const_iv (GL_CONVOLUTION_BORDER_MODE), 2796 const_iv (GL_CONVOLUTION_BORDER_MODE),
2200 const_iv (GL_CONSTANT_BORDER), 2797 const_iv (GL_CONSTANT_BORDER),
2798 const_iv (GL_POINTS),
2201 const_iv (GL_LINES), 2799 const_iv (GL_LINES),
2202 const_iv (GL_LINE_STRIP), 2800 const_iv (GL_LINE_STRIP),
2203 const_iv (GL_LINE_LOOP), 2801 const_iv (GL_LINE_LOOP),
2204 const_iv (GL_QUADS), 2802 const_iv (GL_QUADS),
2205 const_iv (GL_QUAD_STRIP), 2803 const_iv (GL_QUAD_STRIP),
2206 const_iv (GL_TRIANGLES), 2804 const_iv (GL_TRIANGLES),
2207 const_iv (GL_TRIANGLE_STRIP), 2805 const_iv (GL_TRIANGLE_STRIP),
2208 const_iv (GL_TRIANGLE_FAN), 2806 const_iv (GL_TRIANGLE_FAN),
2807 const_iv (GL_POLYGON),
2209 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2808 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2809 const_iv (GL_POINT_SMOOTH_HINT),
2810 const_iv (GL_LINE_SMOOTH_HINT),
2811 const_iv (GL_POLYGON_SMOOTH_HINT),
2812 const_iv (GL_GENERATE_MIPMAP_HINT),
2813 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2210 const_iv (GL_FASTEST), 2814 const_iv (GL_FASTEST),
2815 const_iv (GL_DONT_CARE),
2816 const_iv (GL_NICEST),
2211 const_iv (GL_V2F), 2817 const_iv (GL_V2F),
2212 const_iv (GL_V3F), 2818 const_iv (GL_V3F),
2213 const_iv (GL_T2F_V3F), 2819 const_iv (GL_T2F_V3F),
2214 const_iv (GL_T2F_N3F_V3F), 2820 const_iv (GL_T2F_N3F_V3F),
2215# undef const_iv 2821# undef const_iv
… …
2220 2826
2221 texture_av = newAV (); 2827 texture_av = newAV ();
2222 AvREAL_off (texture_av); 2828 AvREAL_off (texture_av);
2223} 2829}
2224 2830
2831void
2832disable_GL_EXT_blend_func_separate ()
2833 CODE:
2834 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0;
2836
2225char * 2837char *
2226gl_vendor () 2838gl_vendor ()
2227 CODE: 2839 CODE:
2228 RETVAL = (char *)glGetString (GL_VENDOR); 2840 RETVAL = (char *)glGetString (GL_VENDOR);
2229 OUTPUT: 2841 OUTPUT:
… …
2241 CODE: 2853 CODE:
2242 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2854 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2243 OUTPUT: 2855 OUTPUT:
2244 RETVAL 2856 RETVAL
2245 2857
2858const char *glGetString (GLenum pname)
2859
2860GLint glGetInteger (GLenum pname)
2861 CODE:
2862 glGetIntegerv (pname, &RETVAL);
2863 OUTPUT:
2864 RETVAL
2865
2866GLdouble glGetDouble (GLenum pname)
2867 CODE:
2868 glGetDoublev (pname, &RETVAL);
2869 OUTPUT:
2870 RETVAL
2871
2246int glGetError () 2872int glGetError ()
2247 2873
2248void glFinish () 2874void glFinish ()
2249 2875
2250void glClear (int mask) 2876void glClear (int mask)
… …
2287# near_ and far_ are due to microsofts buggy "c" compiler 2913# near_ and far_ are due to microsofts buggy "c" compiler
2288void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2914void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2289 2915
2290# near_ and far_ are due to microsofts buggy "c" compiler 2916# near_ and far_ are due to microsofts buggy "c" compiler
2291void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2917void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2918
2919PROTOTYPES: DISABLE
2292 2920
2293void glViewport (int x, int y, int width, int height) 2921void glViewport (int x, int y, int width, int height)
2294 2922
2295void glScissor (int x, int y, int width, int height) 2923void glScissor (int x, int y, int width, int height)
2296 2924
… …
2304 2932
2305void glRotate (float angle, float x, float y, float z) 2933void glRotate (float angle, float x, float y, float z)
2306 CODE: 2934 CODE:
2307 glRotatef (angle, x, y, z); 2935 glRotatef (angle, x, y, z);
2308 2936
2309void glBegin (int mode)
2310
2311void glEnd ()
2312
2313void glColor (float r, float g, float b, float a = 1.0) 2937void glColor (float r, float g, float b, float a = 1.0)
2314 PROTOTYPE: @
2315 ALIAS: 2938 ALIAS:
2316 glColor_premultiply = 1 2939 glColor_premultiply = 1
2317 CODE: 2940 CODE:
2318 if (ix) 2941 if (ix)
2319 { 2942 {
… …
2322 b *= a; 2945 b *= a;
2323 } 2946 }
2324 // microsoft visual "c" rounds instead of truncating... 2947 // microsoft visual "c" rounds instead of truncating...
2325 glColor4f (r, g, b, a); 2948 glColor4f (r, g, b, a);
2326 2949
2327void glInterleavedArrays (int format, int stride, char *data)
2328
2329void glDrawElements (int mode, int count, int type, char *indices)
2330
2331# 1.2 void glDrawRangeElements (int mode, int start, int end
2332
2333void glRasterPos (float x, float y, float z = 0.) 2950void glRasterPos (float x, float y, float z = 0.)
2334 CODE: 2951 CODE:
2335 glRasterPos3f (0, 0, z); 2952 glRasterPos3f (0, 0, z);
2336 glBitmap (0, 0, 0, 0, x, y, 0); 2953 glBitmap (0, 0, 0, 0, x, y, 0);
2337 2954
… …
2341 2958
2342void glTexCoord (float s, float t) 2959void glTexCoord (float s, float t)
2343 CODE: 2960 CODE:
2344 glTexCoord2f (s, t); 2961 glTexCoord2f (s, t);
2345 2962
2963void glRect (float x1, float y1, float x2, float y2)
2964 CODE:
2965 glRectf (x1, y1, x2, y2);
2966
2967void glRect_lineloop (float x1, float y1, float x2, float y2)
2968 CODE:
2969 glBegin (GL_LINE_LOOP);
2970 glVertex2f (x1, y1);
2971 glVertex2f (x2, y1);
2972 glVertex2f (x2, y2);
2973 glVertex2f (x1, y2);
2974 glEnd ();
2975
2976PROTOTYPES: ENABLE
2977
2978void glBegin (int mode)
2979
2980void glEnd ()
2981
2982void glPointSize (GLfloat size)
2983
2984void glLineWidth (GLfloat width)
2985
2986void glInterleavedArrays (int format, int stride, char *data)
2987
2988void glDrawElements (int mode, int count, int type, char *indices)
2989
2990# 1.2 void glDrawRangeElements (int mode, int start, int end
2991
2346void glTexEnv (int target, int pname, float param) 2992void glTexEnv (int target, int pname, float param)
2347 CODE: 2993 CODE:
2348 glTexEnvf (target, pname, param); 2994 glTexEnvf (target, pname, param);
2349 2995
2350void glTexParameter (int target, int pname, float param) 2996void glTexParameter (int target, int pname, float param)
… …
2366void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3012void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2367 CODE: 3013 CODE:
2368 if (gl.SeparableFilter2D) 3014 if (gl.SeparableFilter2D)
2369 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2370 3016
2371void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3017void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2372 3018
2373void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3019void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2374 3020
2375void glDrawPixels (int width, int height, int format, int type, char *pixels) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
3022
3023void glPixelZoom (float x, float y)
2376 3024
2377void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3025void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2378 3026
2379int glGenTexture () 3027int glGenTexture ()
2380 CODE: 3028 CODE:
2381{ 3029 RETVAL = gen_texture ();
2382 GLuint name;
2383 if (AvFILL (texture_av) >= 0)
2384 name = (GLuint)(size_t)av_pop (texture_av);
2385 else
2386 glGenTextures (1, &name);
2387 RETVAL = name;
2388}
2389 OUTPUT: 3030 OUTPUT:
2390 RETVAL 3031 RETVAL
2391 3032
2392void glDeleteTexture (int name) 3033void glDeleteTexture (int name)
2393 CODE: 3034 CODE:
2394{ 3035 del_texture (name);
2395 /* make a half-assed attempt at returning the memory used by the texture */ 3036
2396 /* textures are frequently being reused by cfplus anyway */
2397 /*glBindTexture (GL_TEXTURE_2D, name);*/
2398 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
2399 av_push (texture_av, (SV *)(size_t)name);
2400 { GLuint name_ = name; glDeleteTextures (1, &name_); }
2401}
2402
2403int glGenList () 3037int glGenList ()
2404 CODE: 3038 CODE:
2405 RETVAL = glGenLists (1); 3039 RETVAL = glGenLists (1);
2406 OUTPUT: 3040 OUTPUT:
2407 RETVAL 3041 RETVAL
… …
2414 3048
2415void glEndList () 3049void glEndList ()
2416 3050
2417void glCallList (int list) 3051void glCallList (int list)
2418 3052
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054
3055PROTOTYPES: DISABLE
3056
3057void
3058find_widget (SV *self, NV x, NV y)
3059 PPCODE:
3060{
3061 if (within_widget (self, x, y))
3062 XPUSHs (self);
3063}
3064
3065BOOT:
3066{
3067 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3068
3069 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3070 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3071 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3072 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3073}
3074
3075void
3076draw (SV *self)
3077 CODE:
3078{
3079 HV *hv;
3080 SV **svp;
3081 NV x, y, w, h;
3082 SV *draw_x_sv = GvSV (draw_x_gv);
3083 SV *draw_y_sv = GvSV (draw_y_gv);
3084 SV *draw_w_sv = GvSV (draw_w_gv);
3085 SV *draw_h_sv = GvSV (draw_h_gv);
3086 double draw_x, draw_y;
3087
3088 if (!SvROK (self))
3089 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3090
3091 hv = (HV *)SvRV (self);
3092
3093 if (SvTYPE (hv) != SVt_PVHV)
3094 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3095
3096 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3097 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3098
3099 if (!h || !w)
3100 XSRETURN_EMPTY;
3101
3102 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3103 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3104
3105 draw_x = SvNV (draw_x_sv) + x;
3106 draw_y = SvNV (draw_y_sv) + y;
3107
3108 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3109 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3110 XSRETURN_EMPTY;
3111
3112 sv_setnv (draw_x_sv, draw_x);
3113 sv_setnv (draw_y_sv, draw_y);
3114
3115 glPushMatrix ();
3116 glTranslated (x, y, 0);
3117
3118 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3119 {
3120 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3121
3122 if (svp && SvTRUE (*svp))
3123 {
3124 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3125 glEnable (GL_BLEND);
3126 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3127 glBegin (GL_QUADS);
3128 glVertex2f (0, 0);
3129 glVertex2f (w, 0);
3130 glVertex2f (w, h);
3131 glVertex2f (0, h);
3132 glEnd ();
3133 glDisable (GL_BLEND);
3134 }
3135 }
3136#if 0
3137 // draw borders, for debugging
3138 glPushMatrix ();
3139 glColor4f (1., 1., 0., 1.);
3140 glTranslatef (.5, .5, 0.);
3141 glBegin (GL_LINE_LOOP);
3142 glVertex2f (0 , 0);
3143 glVertex2f (w - 1, 0);
3144 glVertex2f (w - 1, h - 1);
3145 glVertex2f (0 , h - 1);
3146 glEnd ();
3147 glPopMatrix ();
3148#endif
3149 PUSHMARK (SP);
3150 XPUSHs (self);
3151 PUTBACK;
3152 call_method ("_draw", G_VOID | G_DISCARD);
3153 SPAGAIN;
3154
3155 glPopMatrix ();
3156
3157 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3158 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3159}
3160

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines