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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines