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

Diff Legend

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