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.173 by root, Wed Apr 4 02:43:29 2007 UTC vs.
Revision 1.284 by elmex, Thu Dec 11 00:17:47 2008 UTC

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

Diff Legend

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