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.176 by root, Tue Apr 10 09:39:48 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);
… …
159 227
160typedef uint16_t tileid; 228typedef uint16_t tileid;
161typedef uint16_t faceid; 229typedef uint16_t faceid;
162 230
163typedef struct { 231typedef struct {
164 int name; 232 GLuint name;
165 int w, h; 233 int w, h;
166 float s, t; 234 float s, t;
167 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
168 tileid smoothtile; 236 tileid smoothtile;
169 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
170} maptex; 239} maptex;
171 240
172typedef struct { 241typedef struct {
173 uint32_t player; 242 uint32_t player;
174 tileid tile[3]; 243 tileid tile[3];
… …
187 int faces; tileid *face2tile; // [faceid] 256 int faces; tileid *face2tile; // [faceid]
188 int texs; maptex *tex; // [tileid] 257 int texs; maptex *tex; // [tileid]
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;
… …
235 self->texs *= 2; 304 self->texs *= 2;
236 } 305 }
237} 306}
238 307
239static maprow * 308static maprow *
240map_get_row (CFPlus__Map self, int y) 309map_get_row (DC__Map self, int y)
241{ 310{
242 if (0 > y) 311 if (0 > y)
243 { 312 {
244 int extend = - y + MAP_EXTEND_Y; 313 int extend = - y + MAP_EXTEND_Y;
245 Prepend (maprow, self->row, self->rows, extend); 314 Prepend (maprow, self->row, self->rows, extend);
… …
283 352
284 return row->col + (x - row->c0); 353 return row->col + (x - row->c0);
285} 354}
286 355
287static mapcell * 356static mapcell *
288map_get_cell (CFPlus__Map self, int x, int y) 357map_get_cell (DC__Map self, int x, int y)
289{ 358{
290 return row_get_cell (map_get_row (self, y), x); 359 return row_get_cell (map_get_row (self, y), x);
291} 360}
292 361
293static void 362static void
294map_clear (CFPlus__Map self) 363map_clear (DC__Map self)
295{ 364{
296 int r; 365 int r;
297 366
298 for (r = 0; r < self->rows; r++) 367 for (r = 0; r < self->rows; r++)
299 Safefree (self->row[r].col); 368 Safefree (self->row[r].col);
… …
306 self->oy = 0; 375 self->oy = 0;
307 self->row = 0; 376 self->row = 0;
308 self->rows = 0; 377 self->rows = 0;
309} 378}
310 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
311static void 390static void
312map_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)
313{ 392{
314 int x, y; 393 int x, y;
315 maprow *row; 394 maprow *row;
316 mapcell *cell; 395 mapcell *cell;
317 396
… …
329 if (x >= row->c1) 408 if (x >= row->c1)
330 break; 409 break;
331 410
332 cell = row->col + x - row->c0; 411 cell = row->col + x - row->c0;
333 412
334 cell->darkness = 0; 413 CELL_CLEAR (cell);
335 cell->stat_hp = 0;
336 cell->flags = 0;
337 cell->player = 0;
338 } 414 }
339 } 415 }
340} 416}
341 417
342typedef struct { 418typedef struct {
… …
345} smooth_key; 421} smooth_key;
346 422
347static void 423static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 424smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 425{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 426 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 427
352 if (SvIOK (*sv)) 428 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 429 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 430 else
355 sv_setiv (*sv, bits); 431 sv_setiv (*sv, bits);
… …
396 n |= n >> 16; 472 n |= n >> 16;
397 473
398 return n + 1; 474 return n + 1;
399} 475}
400 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
401/* SDL should provide this, really. */ 488/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 489#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 490#define SDLK_MODIFIER_MAX 314
404 491
405MODULE = 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
406 588
407PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
408 590
409BOOT: 591BOOT:
410{ 592{
411 HV *stash = gv_stashpv ("CFPlus", 1); 593 HV *stash = gv_stashpv ("DC", 1);
412 static const struct { 594 static const struct {
413 const char *name; 595 const char *name;
414 IV iv; 596 IV iv;
415 } *civ, const_iv[] = { 597 } *civ, const_iv[] = {
416# define const_iv(name) { # name, (IV)name } 598# define const_iv(name) { # name, (IV)name }
… …
438 620
439 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE), 623 const_iv (SDL_APPACTIVE),
442 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),
443 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
444 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
445 const_iv (SDLK_KP2), 679 const_iv (SDLK_KP2),
446 const_iv (SDLK_KP3), 680 const_iv (SDLK_KP3),
447 const_iv (SDLK_KP4), 681 const_iv (SDLK_KP4),
… …
519 const_iv (KMOD_LMETA), 753 const_iv (KMOD_LMETA),
520 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
521 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
522 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
523 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)
524# undef const_iv 791# undef const_iv
525 }; 792 };
526 793
527 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; )
528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
546 813
547NV floor (NV x) 814NV floor (NV x)
548 815
549NV ceil (NV x) 816NV ceil (NV x)
550 817
818IV minpot (UV n)
819
820IV popcount (UV n)
821
551void 822void
552pango_init () 823pango_init ()
553 CODE: 824 CODE:
554{ 825{
555 opengl_fontmap = pango_opengl_font_map_new (); 826 opengl_fontmap = pango_opengl_font_map_new ();
556 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);
557 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
558} 834}
559 835
560int 836char *SDL_GetError ()
561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
562 837
563void 838void SDL_braino ()
839
840int SDL_Init (U32 flags)
841
842int SDL_InitSubSystem (U32 flags)
843
844void SDL_QuitSubSystem (U32 flags)
845
564SDL_Quit () 846void SDL_Quit ()
565 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
566void 857void
567SDL_ListModes () 858SDL_ListModes (int rgb, int alpha)
568 PPCODE: 859 PPCODE:
569{ 860{
570 SDL_Rect **m; 861 SDL_Rect **m;
571 862
572 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 863 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 864 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 865 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 866 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576 867
577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 868 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579 870
580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 875
585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 876 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586#if SDL_VERSION_ATLEAST(1,2,10)
587 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
588 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 877 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589#endif
590
591 SDL_EnableUNICODE (1);
592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
593 878
594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 879 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
595 880
596 if (m && m != (SDL_Rect **)-1) 881 if (m && m != (SDL_Rect **)-1)
597 while (*m) 882 while (*m)
598 { 883 {
884 if ((*m)->w >= 400 && (*m)->h >= 300)
885 {
599 AV *av = newAV (); 886 AV *av = newAV ();
600 av_push (av, newSViv ((*m)->w)); 887 av_push (av, newSViv ((*m)->w));
601 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));
602 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 891 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
892 }
603 893
604 ++m; 894 ++m;
605 } 895 }
606} 896}
607 897
608char *
609SDL_GetError ()
610
611int 898int
612SDL_SetVideoMode (int w, int h, int fullscreen) 899SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613 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
614 RETVAL = !!SDL_SetVideoMode ( 910 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 911 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 912 );
913
617 if (RETVAL) 914 if (RETVAL)
618 { 915 {
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 916 av_clear (texture_av);
917
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
620# 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);
621# include "glfunc.h" 920#include "glfunc.h"
622# undef GL_FUNC 921#undef GL_FUNC
623 } 922 }
923}
624 OUTPUT: 924 OUTPUT:
625 RETVAL 925 RETVAL
626 926
627void 927void
628SDL_GL_SwapBuffers () 928SDL_GL_SwapBuffers ()
629 929
630char * 930char *
631SDL_GetKeyName (int sym) 931SDL_GetKeyName (int sym)
632 932
933int
934SDL_GetAppState ()
935
936int
937SDL_GetModState ()
938
633void 939void
634SDL_PollEvent () 940poll_events ()
635 PPCODE: 941 PPCODE:
636{ 942{
637 SDL_Event ev; 943 SDL_Event ev;
638 944
639 while (SDL_PollEvent (&ev)) 945 SDL_PumpEvents ();
946 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 947 {
641 HV *hv = newHV (); 948 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 949 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 950
644 switch (ev.type) 951 switch (ev.type)
645 { 952 {
646 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
647 case SDL_KEYUP: 954 case SDL_KEYUP:
648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
650 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);
651 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 */
652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
653 break; 960 break;
654 961
655 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 964 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 965 break;
659 966
660 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
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 }
668 break; 993 break;
669 994
670 case SDL_MOUSEBUTTONDOWN: 995 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 996 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
673 998
674 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 999 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
675 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1000 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
676 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1001 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
677 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1002 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
682 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1007 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
683 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1008 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
684 break; 1009 break;
685 } 1010 }
686 1011
687 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))));
688 } 1013 }
689} 1014}
690 1015
691int 1016int
692Mix_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)
693 POSTCALL: 1018 POSTCALL:
694 Mix_HookMusicFinished (music_finished); 1019 Mix_HookMusicFinished (music_finished);
695 Mix_ChannelFinished (channel_finished); 1020 Mix_ChannelFinished (channel_finished);
696 1021
697void 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
698Mix_CloseAudio () 1039Mix_CloseAudio ()
699 1040
700int 1041int
701Mix_AllocateChannels (int numchans = -1) 1042Mix_AllocateChannels (int numchans = -1)
702 1043
1044const char *
1045Mix_GetError ()
1046
703void 1047void
704lowdelay (int fd, int val = 1) 1048lowdelay (int fd, int val = 1)
705 CODE: 1049 CODE:
706#ifndef _WIN32
707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 1050 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708#endif
709 1051
710void 1052void
711win32_proxy_info () 1053win32_proxy_info ()
712 PPCODE: 1054 PPCODE:
713{ 1055{
… …
734 } 1076 }
735 } 1077 }
736#endif 1078#endif
737} 1079}
738 1080
739void 1081int
740add_font (char *file) 1082add_font (char *file)
741 CODE: 1083 CODE:
742 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT:
1086 RETVAL
743 1087
744void 1088void
745load_image_inline (SV *image_) 1089load_image_inline (SV *image_)
746 ALIAS: 1090 ALIAS:
747 load_image_file = 1 1091 load_image_file = 1
… …
750 STRLEN image_len; 1094 STRLEN image_len;
751 char *image = (char *)SvPVbyte (image_, image_len); 1095 char *image = (char *)SvPVbyte (image_, image_len);
752 SDL_Surface *surface, *surface2; 1096 SDL_Surface *surface, *surface2;
753 SDL_PixelFormat fmt; 1097 SDL_PixelFormat fmt;
754 SDL_RWops *rw = ix 1098 SDL_RWops *rw = ix
755 ? SDL_RWFromFile (image, "r") 1099 ? SDL_RWFromFile (image, "rb")
756 : SDL_RWFromConstMem (image, image_len); 1100 : SDL_RWFromConstMem (image, image_len);
757 1101
758 if (!rw) 1102 if (!rw)
759 croak ("load_image: %s", SDL_GetError ()); 1103 croak ("load_image: %s", SDL_GetError ());
760 1104
… …
833void 1177void
834error (char *message) 1178error (char *message)
835 CODE: 1179 CODE:
836 fprintf (stderr, "ERROR: %s\n", message); 1180 fprintf (stderr, "ERROR: %s\n", message);
837#ifdef _WIN32 1181#ifdef _WIN32
838 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1182 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
839#endif 1183#endif
840 1184
841void 1185void
842fatal (char *message) 1186fatal (char *message)
843 CODE: 1187 CODE:
844 fprintf (stderr, "FATAL: %s\n", message); 1188 fprintf (stderr, "FATAL: %s\n", message);
845#ifdef _WIN32 1189#ifdef _WIN32
846 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1190 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
847#endif 1191#endif
848 _exit (1); 1192 _exit (1);
849 1193
850void 1194void
851_exit (int retval = 0) 1195_exit (int retval = 0)
… …
854 ExitThread (retval); // unclean, please beam me up 1198 ExitThread (retval); // unclean, please beam me up
855#else 1199#else
856 _exit (retval); 1200 _exit (retval);
857#endif 1201#endif
858 1202
859MODULE = CFPlus PACKAGE = CFPlus::Font 1203void
1204debug ()
1205 CODE:
1206{
1207#if DEBUG
1208 VALGRIND_DO_LEAK_CHECK;
1209#endif
1210}
860 1211
861CFPlus::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
862new_from_file (SV *class, char *path, int id = 0) 1224new_from_file (SV *class, char *path, int id = 0)
863 CODE: 1225 CODE:
864{ 1226{
865 int count; 1227 int count;
866 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
869} 1231}
870 OUTPUT: 1232 OUTPUT:
871 RETVAL 1233 RETVAL
872 1234
873void 1235void
874DESTROY (CFPlus::Font self) 1236DESTROY (DC::Font self)
875 CODE: 1237 CODE:
876 pango_font_description_free (self); 1238 pango_font_description_free (self);
877 1239
878void 1240void
879make_default (CFPlus::Font self) 1241make_default (DC::Font self)
1242 PROTOTYPE: $
880 CODE: 1243 CODE:
881 default_font = self; 1244 default_font = self;
882 1245
883MODULE = CFPlus PACKAGE = CFPlus::Layout 1246MODULE = Deliantra::Client PACKAGE = DC::Layout
884 1247
1248PROTOTYPES: DISABLE
1249
885void 1250void
886reset_glyph_cache () 1251glyph_cache_backup ()
1252 PROTOTYPE:
887 CODE: 1253 CODE:
1254 tc_backup ();
1255
1256void
1257glyph_cache_restore ()
1258 PROTOTYPE:
1259 CODE:
888 tc_clear (); 1260 tc_restore ();
889 1261
890CFPlus::Layout 1262DC::Layout
891new (SV *class) 1263new (SV *class)
892 CODE: 1264 CODE:
893 New (0, RETVAL, 1, struct cf_layout); 1265 New (0, RETVAL, 1, struct cf_layout);
894 1266
895 RETVAL->pl = pango_layout_new (opengl_context); 1267 RETVAL->pl = pango_layout_new (opengl_context);
… …
897 RETVAL->g = 1.; 1269 RETVAL->g = 1.;
898 RETVAL->b = 1.; 1270 RETVAL->b = 1.;
899 RETVAL->a = 1.; 1271 RETVAL->a = 1.;
900 RETVAL->base_height = MIN_FONT_HEIGHT; 1272 RETVAL->base_height = MIN_FONT_HEIGHT;
901 RETVAL->font = 0; 1273 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
902 1275
903 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
904 layout_update_font (RETVAL); 1277 layout_update_font (RETVAL);
905 OUTPUT: 1278 OUTPUT:
906 RETVAL 1279 RETVAL
907 1280
908void 1281void
909DESTROY (CFPlus::Layout self) 1282DESTROY (DC::Layout self)
910 CODE: 1283 CODE:
911 g_object_unref (self->pl); 1284 g_object_unref (self->pl);
1285 rc_free (self->rc);
912 Safefree (self); 1286 Safefree (self);
913 1287
914void 1288void
915set_text (CFPlus::Layout self, SV *text_) 1289set_text (DC::Layout self, SV *text_)
916 CODE: 1290 CODE:
917{ 1291{
918 STRLEN textlen; 1292 STRLEN textlen;
919 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
920 1294
921 pango_layout_set_text (self->pl, text, textlen); 1295 pango_layout_set_text (self->pl, text, textlen);
922} 1296}
923 1297
924void 1298void
925set_markup (CFPlus::Layout self, SV *text_) 1299set_markup (DC::Layout self, SV *text_)
926 CODE: 1300 CODE:
927{ 1301{
928 STRLEN textlen; 1302 STRLEN textlen;
929 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
930 1304
931 pango_layout_set_markup (self->pl, text, textlen); 1305 pango_layout_set_markup (self->pl, text, textlen);
932} 1306}
933 1307
934void 1308void
935set_shapes (CFPlus::Layout self, ...) 1309set_shapes (DC::Layout self, ...)
936 CODE: 1310 CODE:
937{ 1311{
938 PangoAttrList *attrs = 0; 1312 PangoAttrList *attrs = 0;
939 const char *text = pango_layout_get_text (self->pl); 1313 const char *text = pango_layout_get_text (self->pl);
940 const char *pos = text; 1314 const char *pos = text;
… …
975 if (attrs) 1349 if (attrs)
976 pango_layout_set_attributes (self->pl, attrs); 1350 pango_layout_set_attributes (self->pl, attrs);
977} 1351}
978 1352
979void 1353void
980get_shapes (CFPlus::Layout self) 1354get_shapes (DC::Layout self)
981 PPCODE: 1355 PPCODE:
982{ 1356{
983 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1357 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
984 1358
985 do 1359 do
986 { 1360 {
987 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1361 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
988 1362
989 if (run && shape_attr_p (run)) 1363 if (run && shape_attr_p (run))
990 { 1364 {
991 PangoRectangle extents; 1365 PangoRectangle extents;
992 pango_layout_iter_get_run_extents (iter, 0, &extents); 1366 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1000 1374
1001 pango_layout_iter_free (iter); 1375 pango_layout_iter_free (iter);
1002} 1376}
1003 1377
1004int 1378int
1005has_wrapped (CFPlus::Layout self) 1379has_wrapped (DC::Layout self)
1006 CODE: 1380 CODE:
1007{ 1381{
1008 int lines = 1; 1382 int lines = 1;
1009 const char *text = pango_layout_get_text (self->pl); 1383 const char *text = pango_layout_get_text (self->pl);
1010 1384
… …
1015} 1389}
1016 OUTPUT: 1390 OUTPUT:
1017 RETVAL 1391 RETVAL
1018 1392
1019SV * 1393SV *
1020get_text (CFPlus::Layout self) 1394get_text (DC::Layout self)
1021 CODE: 1395 CODE:
1022 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1396 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1023 sv_utf8_decode (RETVAL); 1397 sv_utf8_decode (RETVAL);
1024 OUTPUT: 1398 OUTPUT:
1025 RETVAL 1399 RETVAL
1026 1400
1027void 1401void
1028set_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.)
1029 CODE: 1403 CODE:
1030 self->r = r; 1404 self->r = r;
1031 self->g = g; 1405 self->g = g;
1032 self->b = b; 1406 self->b = b;
1033 self->a = a; 1407 self->a = a;
1034 1408
1035void 1409void
1036set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1410set_font (DC::Layout self, DC::Font font = 0)
1037 CODE: 1411 CODE:
1038 if (self->font != font) 1412 if (self->font != font)
1039 { 1413 {
1040 self->font = font; 1414 self->font = font;
1041 layout_update_font (self); 1415 layout_update_font (self);
1042 } 1416 }
1043 1417
1044void 1418void
1045set_height (CFPlus::Layout self, int base_height) 1419set_height (DC::Layout self, int base_height)
1046 CODE: 1420 CODE:
1047 if (self->base_height != base_height) 1421 if (self->base_height != base_height)
1048 { 1422 {
1049 self->base_height = base_height; 1423 self->base_height = base_height;
1050 layout_update_font (self); 1424 layout_update_font (self);
1051 } 1425 }
1052 1426
1053void 1427void
1054set_width (CFPlus::Layout self, int max_width = -1) 1428set_width (DC::Layout self, int max_width = -1)
1055 CODE: 1429 CODE:
1056 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);
1057 1431
1058void 1432void
1059set_indent (CFPlus::Layout self, int indent) 1433set_indent (DC::Layout self, int indent)
1060 CODE: 1434 CODE:
1061 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1435 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1062 1436
1063void 1437void
1064set_spacing (CFPlus::Layout self, int spacing) 1438set_spacing (DC::Layout self, int spacing)
1065 CODE: 1439 CODE:
1066 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1440 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1067 1441
1068void 1442void
1069set_ellipsise (CFPlus::Layout self, int ellipsise) 1443set_ellipsise (DC::Layout self, int ellipsise)
1070 CODE: 1444 CODE:
1071 pango_layout_set_ellipsize (self->pl, 1445 pango_layout_set_ellipsize (self->pl,
1072 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1446 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1073 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1447 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1074 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1448 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1075 : PANGO_ELLIPSIZE_NONE 1449 : PANGO_ELLIPSIZE_NONE
1076 ); 1450 );
1077 1451
1078void 1452void
1079set_single_paragraph_mode (CFPlus::Layout self, int spm) 1453set_single_paragraph_mode (DC::Layout self, int spm)
1080 CODE: 1454 CODE:
1081 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1455 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1082 1456
1083void 1457void
1084size (CFPlus::Layout self) 1458size (DC::Layout self)
1085 PPCODE: 1459 PPCODE:
1086{ 1460{
1087 int w, h; 1461 int w, h;
1088 1462
1089 layout_get_pixel_size (self, &w, &h); 1463 layout_get_pixel_size (self, &w, &h);
… …
1092 PUSHs (sv_2mortal (newSViv (w))); 1466 PUSHs (sv_2mortal (newSViv (w)));
1093 PUSHs (sv_2mortal (newSViv (h))); 1467 PUSHs (sv_2mortal (newSViv (h)));
1094} 1468}
1095 1469
1096int 1470int
1097descent (CFPlus::Layout self) 1471descent (DC::Layout self)
1098 CODE: 1472 CODE:
1099{ 1473{
1100 PangoRectangle rect; 1474 PangoRectangle rect;
1101 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1475 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1102 pango_layout_line_get_pixel_extents (line, 0, &rect); 1476 pango_layout_line_get_pixel_extents (line, 0, &rect);
1103 RETVAL = PANGO_DESCENT (rect); 1477 RETVAL = PANGO_DESCENT (rect);
1104} 1478}
1105 OUTPUT: 1479 OUTPUT:
1106 RETVAL 1480 RETVAL
1107 1481
1108int 1482int
1109xy_to_index (CFPlus::Layout self, int x, int y) 1483xy_to_index (DC::Layout self, int x, int y)
1110 CODE: 1484 CODE:
1111{ 1485{
1112 int index, trailing; 1486 int index, trailing;
1113 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);
1114 RETVAL = index + trailing; 1488 RETVAL = index + trailing;
1115} 1489}
1116 OUTPUT: 1490 OUTPUT:
1117 RETVAL 1491 RETVAL
1118 1492
1119void 1493void
1120cursor_pos (CFPlus::Layout self, int index) 1494cursor_pos (DC::Layout self, int index)
1121 PPCODE: 1495 PPCODE:
1122{ 1496{
1123 PangoRectangle strong_pos; 1497 PangoRectangle pos;
1124 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1498 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1125 1499
1126 EXTEND (SP, 3); 1500 EXTEND (SP, 3);
1127 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1501 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1128 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1502 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1129 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1503 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1130} 1504}
1131 1505
1132void 1506void
1133index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1507index_to_line_x (DC::Layout self, int index, int trailing = 0)
1134 PPCODE: 1508 PPCODE:
1135{ 1509{
1136 int line, x; 1510 int line, x;
1137 1511
1138 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)
1139 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1514 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1140 1515 --line;
1516#endif
1141 EXTEND (SP, 2); 1517 EXTEND (SP, 2);
1142 PUSHs (sv_2mortal (newSViv (line - 1))); 1518 PUSHs (sv_2mortal (newSViv (line)));
1143 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1144} 1520}
1145 1521
1146void 1522void
1147line_x_to_index (CFPlus::Layout self, int line, int x) 1523line_x_to_index (DC::Layout self, int line, int x)
1148 PPCODE: 1524 PPCODE:
1149{ 1525{
1150 PangoLayoutLine *lp; 1526 PangoLayoutLine *lp;
1151 int index, trailing; 1527 int index, trailing;
1152 1528
1153 if (line < 0) 1529 if (line < 0)
1154 XSRETURN_EMPTY; 1530 XSRETURN_EMPTY;
1155 1531
1156 if (!(lp = pango_layout_get_line (self->pl, line))) 1532 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1157 XSRETURN_EMPTY; /* do better */ 1533 XSRETURN_EMPTY; /* do better */
1158 1534
1159 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);
1160 1536
1161 EXTEND (SP, 2); 1537 EXTEND (SP, 2);
… …
1167 PUSHs (sv_2mortal (newSViv (trailing))); 1543 PUSHs (sv_2mortal (newSViv (trailing)));
1168 } 1544 }
1169} 1545}
1170 1546
1171void 1547void
1172render (CFPlus::Layout self, float x, float y, int flags = 0) 1548render (DC::Layout self, float x, float y, int flags = 0)
1173 PPCODE: 1549 CODE:
1550 rc_clear (self->rc);
1174 pango_opengl_render_layout_subpixel ( 1551 pango_opengl_render_layout_subpixel (
1175 self->pl, 1552 self->pl,
1553 self->rc,
1176 x * PANGO_SCALE, y * PANGO_SCALE, 1554 x * PANGO_SCALE, y * PANGO_SCALE,
1177 self->r, self->g, self->b, self->a, 1555 self->r, self->g, self->b, self->a,
1178 flags 1556 flags
1179 ); 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);
1180 1561
1181MODULE = CFPlus PACKAGE = CFPlus::Texture
1182
1183void 1562void
1184pad2pot (SV *data_, SV *w_, SV *h_) 1563draw (DC::Layout self)
1185 CODE: 1564 CODE:
1186{ 1565{
1187 int ow = SvIV (w_); 1566 glEnable (GL_TEXTURE_2D);
1188 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);
1189 1573
1190 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_))
1191 { 1590 {
1192 int nw = minpot (ow);
1193 int nh = minpot (oh);
1194
1195 if (nw != ow || nh != oh)
1196 {
1197 if (SvOK (data_))
1198 {
1199 STRLEN datalen; 1591 STRLEN datalen;
1200 char *data = SvPVbyte (data_, datalen); 1592 char *data = SvPVbyte (data_, datalen);
1201 int bpp = datalen / (ow * oh); 1593 int bpp = datalen / (ow * oh);
1202 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1594 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1203 1595
1204 SvPOK_only (result_); 1596 SvPOK_only (result_);
1205 SvCUR_set (result_, nw * nh * bpp); 1597 SvCUR_set (result_, nw * nh * bpp);
1206 1598
1207 memset (SvPVX (result_), 0, nw * nh * bpp); 1599 memset (SvPVX (result_), 0, nw * nh * bpp);
1208 while (oh--) 1600 while (oh--)
1209 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);
1210 1602
1211 sv_setsv (data_, result_); 1603 sv_setsv (data_, result_);
1212 }
1213
1214 sv_setiv (w_, nw);
1215 sv_setiv (h_, nh);
1216 }
1217 } 1604 }
1218} 1605}
1219 1606
1220void 1607void
1221draw_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.)
… …
1227{ 1614{
1228 HV *hv = (HV *)SvRV (self); 1615 HV *hv = (HV *)SvRV (self);
1229 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1616 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1230 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1617 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1231 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;
1232 1622
1233 if (items < 5) 1623 if (items < 5)
1234 { 1624 {
1235 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1625 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1236 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1626 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1264 glDisable (GL_ALPHA_TEST); 1654 glDisable (GL_ALPHA_TEST);
1265 glDisable (GL_BLEND); 1655 glDisable (GL_BLEND);
1266 } 1656 }
1267} 1657}
1268 1658
1269MODULE = 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
1270 1669
1271CFPlus::Map 1670MODULE = Deliantra::Client PACKAGE = DC::Map
1671
1672PROTOTYPES: DISABLE
1673
1674DC::Map
1272new (SV *class) 1675new (SV *class)
1273 CODE: 1676 CODE:
1274 New (0, RETVAL, 1, struct map); 1677 New (0, RETVAL, 1, struct map);
1275 RETVAL->x = 0; 1678 RETVAL->x = 0;
1276 RETVAL->y = 0; 1679 RETVAL->y = 0;
… …
1284 RETVAL->row = 0; 1687 RETVAL->row = 0;
1285 OUTPUT: 1688 OUTPUT:
1286 RETVAL 1689 RETVAL
1287 1690
1288void 1691void
1289DESTROY (CFPlus::Map self) 1692DESTROY (DC::Map self)
1290 CODE: 1693 CODE:
1291{ 1694{
1292 map_clear (self); 1695 map_clear (self);
1293 Safefree (self->face2tile); 1696 Safefree (self->face2tile);
1294 Safefree (self->tex); 1697 Safefree (self->tex);
1295 Safefree (self); 1698 Safefree (self);
1296} 1699}
1297 1700
1298void 1701void
1299resize (CFPlus::Map self, int map_width, int map_height) 1702resize (DC::Map self, int map_width, int map_height)
1300 CODE: 1703 CODE:
1301 self->w = map_width; 1704 self->w = map_width;
1302 self->h = map_height; 1705 self->h = map_height;
1303 1706
1304void 1707void
1305clear (CFPlus::Map self) 1708clear (DC::Map self)
1306 CODE: 1709 CODE:
1307 map_clear (self); 1710 map_clear (self);
1308 1711
1309void 1712void
1310set_tileid (CFPlus::Map self, int face, int tile) 1713set_tileid (DC::Map self, int face, int tile)
1311 CODE: 1714 CODE:
1312{ 1715{
1313 need_facenum (self, face); self->face2tile [face] = tile; 1716 need_facenum (self, face); self->face2tile [face] = tile;
1314 need_texid (self, tile); 1717 need_texid (self, tile);
1315} 1718}
1316 1719
1317void 1720void
1318set_smooth (CFPlus::Map self, int face, int smooth, int level) 1721set_smooth (DC::Map self, int face, int smooth, int level)
1319 CODE: 1722 CODE:
1320{ 1723{
1321 tileid texid; 1724 tileid texid;
1322 maptex *tex; 1725 maptex *tex;
1323 1726
… …
1336 tex->smoothtile = self->face2tile [smooth]; 1739 tex->smoothtile = self->face2tile [smooth];
1337 tex->smoothlevel = level; 1740 tex->smoothlevel = level;
1338} 1741}
1339 1742
1340void 1743void
1341set_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)
1342 CODE: 1745 CODE:
1343{ 1746{
1344 need_texid (self, texid); 1747 need_texid (self, texid);
1345 1748
1346 { 1749 {
… …
1365 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1366 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1367 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1368} 1771}
1369 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
1370int 1793int
1371ox (CFPlus::Map self) 1794ox (DC::Map self)
1372 ALIAS: 1795 ALIAS:
1373 oy = 1 1796 oy = 1
1374 x = 2 1797 x = 2
1375 y = 3 1798 y = 3
1376 w = 4 1799 w = 4
… …
1387 } 1810 }
1388 OUTPUT: 1811 OUTPUT:
1389 RETVAL 1812 RETVAL
1390 1813
1391void 1814void
1392scroll (CFPlus::Map self, int dx, int dy) 1815scroll (DC::Map self, int dx, int dy)
1393 CODE: 1816 CODE:
1394{ 1817{
1395 if (dx > 0) 1818 if (dx > 0)
1396 map_blank (self, self->x, self->y, dx, self->h); 1819 map_blank (self, self->x, self->y, dx, self->h);
1397 else if (dx < 0) 1820 else if (dx < 0)
1398 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);
1399 1822
1400 if (dy > 0) 1823 if (dy > 0)
1401 map_blank (self, self->x, self->y, self->w, dy); 1824 map_blank (self, self->x, self->y, self->w, dy);
1402 else if (dy < 0) 1825 else if (dy < 0)
1403 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);
1404 1827
1405 self->ox += dx; self->x += dx; 1828 self->ox += dx; self->x += dx;
1406 self->oy += dy; self->y += dy; 1829 self->oy += dy; self->y += dy;
1407 1830
1408 while (self->y < 0) 1831 while (self->y < 0)
… …
1412 self->rows += MAP_EXTEND_Y; 1835 self->rows += MAP_EXTEND_Y;
1413 self->y += MAP_EXTEND_Y; 1836 self->y += MAP_EXTEND_Y;
1414 } 1837 }
1415} 1838}
1416 1839
1417void 1840SV *
1418map1a_update (CFPlus::Map self, SV *data_, int extmap) 1841map1a_update (DC::Map self, SV *data_, int extmap)
1419 CODE: 1842 CODE:
1420{ 1843{
1421 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1422 uint8_t *data_end = (uint8_t *)SvEND (data_); 1845 uint8_t *data_end = (uint8_t *)SvEND (data_);
1423 mapcell *cell; 1846 mapcell *cell;
1424 int x, y, flags; 1847 int x, y, z, flags;
1848 AV *missing = newAV ();
1849 RETVAL = newRV_noinc ((SV *)missing);
1425 1850
1426 while (data < data_end - 1) 1851 while (data < data_end - 1)
1427 { 1852 {
1428 flags = (data [0] << 8) + data [1]; data += 2; 1853 flags = (data [0] << 8) + data [1]; data += 2;
1429 1854
… …
1449 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1450 1875
1451 do 1876 do
1452 { 1877 {
1453 ext = *data++; 1878 ext = *data++;
1454 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1455 1880
1456 if (cmd < 4) 1881 if (cmd < 4)
1457 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1458 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1459 { 1884 {
… …
1462 } 1887 }
1463 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1466 { 1891 {
1467 if (*data == 8) 1892 if (*data == 1) cell->player = data [1];
1468 ; // 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);
1469 1896
1470 data += *data + 1; 1897 data += *data + 1;
1471 } 1898 }
1472 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1473 cell->flags = *data++; 1900 cell->flags = *data++;
… …
1480 } 1907 }
1481 else 1908 else
1482 cell->darkness = *data++ + 1; 1909 cell->darkness = *data++ + 1;
1483 } 1910 }
1484 1911
1912 for (z = 0; z <= 2; ++z)
1485 if (flags & 4) 1913 if (flags & (4 >> z))
1486 { 1914 {
1487 faceid face = (data [0] << 8) + data [1]; data += 2; 1915 faceid face = (data [0] << 8) + data [1]; data += 2;
1488 need_facenum (self, face); 1916 need_facenum (self, face);
1489 cell->tile [0] = self->face2tile [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 }
1490 } 1934 }
1491
1492 if (flags & 2)
1493 {
1494 faceid face = (data [0] << 8) + data [1]; data += 2;
1495 need_facenum (self, face);
1496 cell->tile [1] = self->face2tile [face];
1497 }
1498
1499 if (flags & 1)
1500 {
1501 faceid face = (data [0] << 8) + data [1]; data += 2;
1502 need_facenum (self, face);
1503 cell->tile [2] = self->face2tile [face];
1504 }
1505 } 1935 }
1506 else 1936 else
1507 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1508 } 1938 }
1509} 1939}
1940 OUTPUT:
1941 RETVAL
1510 1942
1511SV * 1943SV *
1512mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1944mapmap (DC::Map self, int x0, int y0, int w, int h)
1513 CODE: 1945 CODE:
1514{ 1946{
1515 int x1, x; 1947 int x1, x;
1516 int y1, y; 1948 int y1, y;
1517 int z; 1949 int z;
… …
1562} 1994}
1563 OUTPUT: 1995 OUTPUT:
1564 RETVAL 1996 RETVAL
1565 1997
1566void 1998void
1567draw (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)
1568 CODE: 2000 CODE:
1569{ 2001{
2002 int x, y, z;
2003
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256]; 2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1573 smooth_key skey; 2007 smooth_key skey;
1574 int x, y, z; 2008 int pl_x, pl_y;
1575 int last_name; 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;
1576 2015
1577 // thats current max. sorry. 2016 // thats current max. sorry.
1578 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1579 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1580 2019
1581 // clear key, in case of extra padding 2020 // clear key, in case of extra padding
1582 memset (&skey, 0, sizeof (skey)); 2021 memset (&skey, 0, sizeof (skey));
1583 2022
1584 glColor4ub (255, 255, 255, 255); 2023 memset (&key, 0, sizeof (key));
1585 2024 key.r = 255;
1586 glEnable (GL_BLEND); 2025 key.g = 255;
1587 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2026 key.b = 255;
1588 glEnable (GL_TEXTURE_2D); 2027 key.a = 255;
1589 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2028 key.mode = GL_QUADS;
1590 2029 key.format = GL_T2F_V3F;
1591 glBegin (GL_QUADS);
1592
1593 last_name = 0;
1594 2030
1595 mx += self->x; 2031 mx += self->x;
1596 my += self->y; 2032 my += self->y;
1597 2033
1598 // first pass: determine smooth_max 2034 // first pass: determine smooth_max
… …
1608 for (x = 0; x < sw; x++) 2044 for (x = 0; x < sw; x++)
1609 if (row->c0 <= x + mx && x + mx < row->c1) 2045 if (row->c0 <= x + mx && x + mx < row->c1)
1610 { 2046 {
1611 mapcell *cell = row->col + (x + mx - row->c0); 2047 mapcell *cell = row->col + (x + mx - row->c0);
1612 2048
1613 for (z = 0; z <= 2; z++)
1614 {
1615 uint8_t level = self->tex [cell->tile [z]].smoothlevel;
1616 if (level > smooth_max [x + 1][y + 1])
1617 smooth_max [x + 1][y + 1] = level; 2049 smooth_max[x + 1][y + 1] =
1618 } 2050 MAX (self->tex [cell->tile [0]].smoothlevel,
2051 MAX (self->tex [cell->tile [1]].smoothlevel,
2052 self->tex [cell->tile [2]].smoothlevel));
1619 } 2053 }
1620 } 2054 }
2055
2056 glEnable (GL_BLEND);
2057 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1621 2059
1622 for (z = 0; z <= 2; z++) 2060 for (z = 0; z <= 2; z++)
1623 { 2061 {
1624 memset (smooth_level, 0, sizeof (smooth_level)); 2062 memset (smooth_level, 0, sizeof (smooth_level));
2063 key.texname = -1;
1625 2064
1626 for (y = 0; y < sh; y++) 2065 for (y = 0; y < sh; y++)
1627 if (0 <= y + my && y + my < self->rows) 2066 if (0 <= y + my && y + my < self->rows)
1628 { 2067 {
1629 maprow *row = self->row + (y + my); 2068 maprow *row = self->row + (y + my);
… …
1638 { 2077 {
1639 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1640 int px = (x + 1) * T - tex.w; 2079 int px = (x + 1) * T - tex.w;
1641 int py = (y + 1) * T - tex.h; 2080 int py = (y + 1) * T - tex.h;
1642 2081
1643 // suppressing texture state switches here
1644 // is only moderately effective, but worth the extra effort
1645 if (last_name != tex.name) 2082 if (key.texname != tex.name)
1646 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1647 if (!tex.name) 2086 if (!tex.name)
1648 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1649 2088
1650 glEnd (); 2089 key.texname = tex.name;
1651 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2090 arr = rc_array (rc, &key);
1652 glBegin (GL_QUADS);
1653 } 2091 }
1654 2092
1655 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1656 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1657 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1658 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1659
1660 if (cell->flags && z == 2)
1661 { 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
1662 if (cell->flags & 1) 2115 if (cell->flags & 1)
1663 { 2116 {
1664 maptex tex = self->tex [1]; 2117 maptex tex = self->tex [1];
1665 int px = x * T + T * 2 / 32; 2118 int px = x * T + T * 2 / 32;
1666 int py = y * T - T * 6 / 32; 2119 int py = y * T - T * 6 / 32;
1667 2120
2121 if (tex.name)
1668 glEnd (); 2122 {
1669 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 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);
1670 glBegin (GL_QUADS); 2133 }
1671
1672 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1673 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1674 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1675 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1676 } 2134 }
1677 } 2135 }
1678 2136
1679 // update smooth hash 2137 // update smooth hash
1680 if (tex.smoothtile) 2138 if (tex.smoothtile)
… …
1685 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2143 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1686 2144
1687 // add bits to current tile and all neighbours. skey.x|y is 2145 // add bits to current tile and all neighbours. skey.x|y is
1688 // shifted +1|+1 so we always stay positive. 2146 // shifted +1|+1 so we always stay positive.
1689 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
1690 // full tile 2160 // full tile
1691 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2161 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1692 2162
1693 // borders 2163 // borders
1694 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 2164 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1695 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092); 2165 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1696 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2166 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1697 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2167 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1698 2168
1699 // corners 2169 // corners
1700 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2170 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
… …
1704 } 2174 }
1705 } 2175 }
1706 } 2176 }
1707 } 2177 }
1708 2178
2179 rc_draw (rc);
2180 rc_clear (rc);
2181
1709 // go through all smoothlevels, lowest to highest, then draw 2182 // go through all smoothlevels, lowest to highest, then draw.
1710 // this is basically counting sort 2183 // this is basically counting sort
1711 { 2184 {
1712 int w, b; 2185 int w, b;
1713 2186
2187 glEnable (GL_TEXTURE_2D);
2188 glBegin (GL_QUADS);
1714 for (w = 0; w < 256 / 32; ++w) 2189 for (w = 0; w < 256 / 32; ++w)
1715 { 2190 {
1716 uint32_t smask = smooth_level [w]; 2191 uint32_t smask = smooth_level [w];
1717 if (smask) 2192 if (smask)
1718 for (b = 0; b < 32; ++b) 2193 for (b = 0; b < 32; ++b)
… …
1725 while ((he = hv_iternext (smooth))) 2200 while ((he = hv_iternext (smooth)))
1726 { 2201 {
1727 smooth_key *skey = (smooth_key *)HeKEY (he); 2202 smooth_key *skey = (smooth_key *)HeKEY (he);
1728 IV bits = SvIVX (HeVAL (he)); 2203 IV bits = SvIVX (HeVAL (he));
1729 2204
1730 // bits is ___n cccc CCCC bbbb
1731 // n do not draw borders&corners
1732 // c draw these corners, but...
1733 // C ... not these
1734 // b draw these borders
1735
1736 if (!(bits & 0x1000) 2205 if (!(bits & 0x1000)
1737 && skey->level == level 2206 && skey->level == level
1738 && level >= smooth_max [skey->x][skey->y]) 2207 && level > smooth_max [skey->x][skey->y])
1739 { 2208 {
1740 maptex tex = self->tex [skey->tile]; 2209 maptex tex = self->tex [skey->tile];
1741 int px = (((int)skey->x) - 1) * T; 2210 int px = (((int)skey->x) - 1) * T;
1742 int py = (((int)skey->y) - 1) * T; 2211 int py = (((int)skey->y) - 1) * T;
1743 int border = bits & 15; 2212 int border = bits & 15;
1744 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2213 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1745 float dx = tex.s * .0625f; // 16 images/row 2214 float dx = tex.s * .0625f; // 16 images/row
1746 float dy = tex.t * .5f ; // 2 images/column 2215 float dy = tex.t * .5f ; // 2 images/column
1747 2216
1748 // this time naively avoiding texture state changes
1749 // save gobs of state changes.
1750 if (last_name != tex.name) 2217 if (tex.name)
1751 { 2218 {
2219 // this time avoiding texture state changes
2220 // save gobs of state changes.
1752 if (!tex.name) 2221 if (key.texname != tex.name)
1753 continue; // smoothing not yet available 2222 {
2223 self->tex [skey->tile].unused = 0;
1754 2224
1755 glEnd (); 2225 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2226 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1757 glBegin (GL_QUADS); 2227 glBegin (GL_QUADS);
1758 } 2228 }
1759 2229
1760 if (border) 2230 if (border)
1761 { 2231 {
1762 float ox = border * dx; 2232 float ox = border * dx;
1763 2233
1764 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2234 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1765 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2235 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1766 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2236 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1767 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2237 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1768 } 2238 }
1769 2239
1770 if (corner) 2240 if (corner)
1771 { 2241 {
1772 float ox = corner * dx; 2242 float ox = corner * dx;
1773 2243
1774 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2244 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1775 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2245 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1776 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2246 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1777 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2247 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2248 }
1778 } 2249 }
1779 } 2250 }
1780 } 2251 }
1781 } 2252 }
1782 } 2253 }
2254
2255 glEnd ();
2256 glDisable (GL_TEXTURE_2D);
2257 key.texname = -1;
1783 } 2258 }
1784 2259
1785 hv_clear (smooth); 2260 hv_clear (smooth);
1786 } 2261 }
1787 2262
1788 glEnd (); 2263 if (pl_tex.name)
2264 {
2265 maptex tex = pl_tex;
2266 int px = pl_x + sdx;
2267 int py = pl_y + sdy;
1789 2268
1790 glDisable (GL_TEXTURE_2D); 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
1791 glDisable (GL_BLEND); 2280 glDisable (GL_BLEND);
2281 rc_free (rc);
1792 2282
1793 // top layer: overlays such as the health bar 2283 // top layer: overlays such as the health bar
1794 for (y = 0; y < sh; y++) 2284 for (y = 0; y < sh; y++)
1795 if (0 <= y + my && y + my < self->rows) 2285 if (0 <= y + my && y + my < self->rows)
1796 { 2286 {
… …
1801 { 2291 {
1802 mapcell *cell = row->col + (x + mx - row->c0); 2292 mapcell *cell = row->col + (x + mx - row->c0);
1803 2293
1804 int px = x * T; 2294 int px = x * T;
1805 int py = y * T; 2295 int py = y * T;
2296
2297 if (expect_false (cell->player == player))
2298 {
2299 px += sdx;
2300 py += sdy;
2301 }
1806 2302
1807 if (cell->stat_hp) 2303 if (cell->stat_hp)
1808 { 2304 {
1809 int width = cell->stat_width * T; 2305 int width = cell->stat_width * T;
1810 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2306 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1821 } 2317 }
1822 } 2318 }
1823} 2319}
1824 2320
1825void 2321void
1826draw_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)
1827 CODE: 2323 CODE:
1828{ 2324{
1829 static float color[16][3] = { 2325 static float color[16][3] = {
1830 { 0.00F, 0.00F, 0.00F }, 2326 { 0.00F, 0.00F, 0.00F },
1831 { 1.00F, 1.00F, 1.00F }, 2327 { 1.00F, 1.00F, 1.00F },
… …
1881 glDisable (GL_BLEND); 2377 glDisable (GL_BLEND);
1882 glDisable (GL_TEXTURE_2D); 2378 glDisable (GL_TEXTURE_2D);
1883} 2379}
1884 2380
1885void 2381void
1886fow_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)
1887 PPCODE: 2383 PPCODE:
1888{ 2384{
1889 int x, y; 2385 int x, y;
2386 int sw1 = sw + 2;
2387 int sh1 = sh + 2;
2388 int sh3 = sh * 3;
1890 int sw4 = (sw + 3) & ~3; 2389 int sw34 = (sw * 3 + 3) & ~3;
2390 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1891 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2391 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1892 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2392 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1893 2393
1894 memset (darkness, 255, sw4 * sh);
1895 SvPOK_only (darkness_sv); 2394 SvPOK_only (darkness3_sv);
1896 SvCUR_set (darkness_sv, sw4 * sh); 2395 SvCUR_set (darkness3_sv, sw34 * sh3);
1897 2396
1898 mx += self->x; 2397 mx += self->x - 1;
1899 my += self->y; 2398 my += self->y - 1;
1900 2399
2400 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2401
1901 for (y = 0; y < sh; y++) 2402 for (y = 0; y < sh1; y++)
1902 if (0 <= y + my && y + my < self->rows) 2403 if (0 <= y + my && y + my < self->rows)
1903 { 2404 {
1904 maprow *row = self->row + (y + my); 2405 maprow *row = self->row + (y + my);
1905 2406
1906 for (x = 0; x < sw; x++) 2407 for (x = 0; x < sw1; x++)
1907 if (row->c0 <= x + mx && x + mx < row->c1) 2408 if (row->c0 <= x + mx && x + mx < row->c1)
1908 { 2409 {
1909 mapcell *cell = row->col + (x + mx - row->c0); 2410 mapcell *cell = row->col + (x + mx - row->c0);
1910 2411
1911 darkness[y * sw4 + x] = cell->darkness 2412 darkness1 [y * sw1 + x] = cell->darkness
1912 ? 255 - (cell->darkness - 1) 2413 ? 255 - (cell->darkness - 1)
1913 : 255 - FOW_DARKNESS; 2414 : 255 - FOW_DARKNESS;
1914 } 2415 }
1915 } 2416 }
1916 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
1917 EXTEND (SP, 3); 2456 EXTEND (SP, 3);
1918 PUSHs (sv_2mortal (newSViv (sw4))); 2457 PUSHs (sv_2mortal (newSViv (sw34)));
1919 PUSHs (sv_2mortal (newSViv (sh))); 2458 PUSHs (sv_2mortal (newSViv (sh3)));
1920 PUSHs (darkness_sv); 2459 PUSHs (darkness3_sv);
1921} 2460}
1922 2461
1923SV * 2462SV *
1924get_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)
1925 CODE: 2464 CODE:
1926{ 2465{
1927 int x, y, x1, y1; 2466 int x, y, x1, y1;
1928 SV *data_sv = newSV (w * h * 7 + 5); 2467 SV *data_sv = newSV (w * h * 7 + 5);
1929 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2468 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1986 else 2525 else
1987 *data++ = 0; 2526 *data++ = 0;
1988 } 2527 }
1989 } 2528 }
1990 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 {
1991 SvPOK_only (data_sv); 2533 SvPOK_only (data_sv);
1992 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2534 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2535 }
2536
1993 RETVAL = data_sv; 2537 RETVAL = data_sv;
1994} 2538}
1995 OUTPUT: 2539 OUTPUT:
1996 RETVAL 2540 RETVAL
1997 2541
1998void 2542void
1999set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2543set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2000 PPCODE: 2544 PPCODE:
2001{ 2545{
2002 int x, y, z; 2546 int x, y, z;
2003 int w, h; 2547 int w, h;
2004 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;
2005 2559
2006 if (*data++ != 0) 2560 if (*data++ != 0)
2007 return; /* version mismatch */ 2561 XSRETURN_EMPTY; /* version mismatch */
2008 2562
2009 w = *data++ << 8; w |= *data++; 2563 w = *data++ << 8; w |= *data++;
2010 h = *data++ << 8; h |= *data++; 2564 h = *data++ << 8; h |= *data++;
2011 2565
2012 // 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
… …
2024 { 2578 {
2025 maprow *row = map_get_row (self, y); 2579 maprow *row = map_get_row (self, y);
2026 2580
2027 for (x = x0; x < x1; x++) 2581 for (x = x0; x < x1; x++)
2028 { 2582 {
2583 uint8_t flags;
2584
2585 if (data + 7 >= end)
2586 XSRETURN_EMPTY;
2587
2029 uint8_t flags = *data++; 2588 flags = *data++;
2030 2589
2031 if (flags) 2590 if (flags)
2032 { 2591 {
2033 mapcell *cell = row_get_cell (row, x); 2592 mapcell *cell = row_get_cell (row, x);
2034 tileid tile[3] = { 0, 0, 0 }; 2593 tileid tile[3] = { 0, 0, 0 };
… …
2037 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2596 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2038 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2597 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2039 2598
2040 if (cell->darkness == 0) 2599 if (cell->darkness == 0)
2041 { 2600 {
2042 cell->darkness = 0; 2601 /*cell->darkness = 0;*/
2602 EXTEND (SP, 3);
2043 2603
2044 for (z = 0; z <= 2; z++) 2604 for (z = 0; z <= 2; z++)
2045 { 2605 {
2046 tileid t = tile [z]; 2606 tileid t = tile [z];
2047 2607
2048 if (t >= self->texs || (t && !self->tex [t].name)) 2608 if (t >= self->texs || (t && !self->tex [t].name))
2049 { 2609 {
2050 XPUSHs (sv_2mortal (newSViv (t))); 2610 PUSHs (sv_2mortal (newSViv (t)));
2051 need_texid (self, t); 2611 need_texid (self, t);
2052 } 2612 }
2053 2613
2054 cell->tile [z] = t; 2614 cell->tile [z] = t;
2055 } 2615 }
… …
2057 } 2617 }
2058 } 2618 }
2059 } 2619 }
2060} 2620}
2061 2621
2062MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2622MODULE = Deliantra::Client PACKAGE = DC::RW
2063 2623
2064CFPlus::MixChunk 2624DC::RW
2065new_from_file (SV *class, char *path) 2625new (SV *class, SV *data_sv)
2066 CODE: 2626 CODE:
2067 RETVAL = Mix_LoadWAV (path); 2627{
2628 STRLEN datalen;
2629 char *data = SvPVbyte (data_sv, datalen);
2630
2631 RETVAL = SDL_RWFromConstMem (data, datalen);
2632}
2068 OUTPUT: 2633 OUTPUT:
2069 RETVAL 2634 RETVAL
2070 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 : '('
2071void 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
2072DESTROY (CFPlus::MixChunk self) 2745DESTROY (DC::MixChunk self)
2073 CODE: 2746 CODE:
2074 Mix_FreeChunk (self); 2747 Mix_FreeChunk (self);
2075 2748
2076int 2749int
2077volume (CFPlus::MixChunk self, int volume = -1) 2750volume (DC::MixChunk self, int volume = -1)
2078 CODE: 2751 CODE:
2752 if (items > 1)
2753 volume = CLAMP (volume, 0, 128);
2079 RETVAL = Mix_VolumeChunk (self, volume); 2754 RETVAL = Mix_VolumeChunk (self, volume);
2080 OUTPUT: 2755 OUTPUT:
2081 RETVAL 2756 RETVAL
2082 2757
2083int 2758DC::Channel
2084play (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)
2085 CODE: 2760 CODE:
2761{
2086 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}
2087 OUTPUT: 2773 OUTPUT:
2088 RETVAL 2774 RETVAL
2089 2775
2090MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2776MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2091 2777
2092int 2778int
2093volume (int volume = -1) 2779volume (int volume = -1)
2780 PROTOTYPE: ;$
2094 CODE: 2781 CODE:
2782 if (items > 0)
2783 volume = CLAMP (volume, 0, 128);
2095 RETVAL = Mix_VolumeMusic (volume); 2784 RETVAL = Mix_VolumeMusic (volume);
2096 OUTPUT: 2785 OUTPUT:
2097 RETVAL 2786 RETVAL
2098 2787
2788void
2789fade_out (int ms)
2790 CODE:
2791 Mix_FadeOutMusic (ms);
2792
2793void
2794halt ()
2795 CODE:
2796 Mix_HaltMusic ();
2797
2099CFPlus::MixMusic 2798DC::MixMusic
2100new_from_file (SV *class, char *path) 2799new (SV *class, DC::RW rwops)
2101 CODE: 2800 CODE:
2102 RETVAL = Mix_LoadMUS (path); 2801 RETVAL = Mix_LoadMUS_RW (rwops);
2103 OUTPUT: 2802 OUTPUT:
2104 RETVAL 2803 RETVAL
2105 2804
2106void 2805void
2107DESTROY (CFPlus::MixMusic self) 2806DESTROY (DC::MixMusic self)
2108 CODE: 2807 CODE:
2109 Mix_FreeMusic (self); 2808 Mix_FreeMusic (self);
2110 2809
2111int 2810int
2112play (CFPlus::MixMusic self, int loops = -1) 2811play (DC::MixMusic self, int loops = -1)
2113 CODE: 2812 CODE:
2114 RETVAL = Mix_PlayMusic (self, loops); 2813 RETVAL = Mix_PlayMusic (self, loops);
2115 OUTPUT: 2814 OUTPUT:
2116 RETVAL 2815 RETVAL
2117 2816
2118MODULE = 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
2119 2825
2120BOOT: 2826BOOT:
2121{ 2827{
2122 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2828 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2123 static const struct { 2829 static const struct {
2124 const char *name; 2830 const char *name;
2125 IV iv; 2831 IV iv;
2126 } *civ, const_iv[] = { 2832 } *civ, const_iv[] = {
2127# 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),
2128 const_iv (GL_COLOR_MATERIAL), 2837 const_iv (GL_COLOR_MATERIAL),
2129 const_iv (GL_SMOOTH), 2838 const_iv (GL_SMOOTH),
2130 const_iv (GL_FLAT), 2839 const_iv (GL_FLAT),
2131 const_iv (GL_DITHER), 2840 const_iv (GL_DITHER),
2132 const_iv (GL_BLEND), 2841 const_iv (GL_BLEND),
… …
2136 const_iv (GL_ALPHA_TEST), 2845 const_iv (GL_ALPHA_TEST),
2137 const_iv (GL_NORMALIZE), 2846 const_iv (GL_NORMALIZE),
2138 const_iv (GL_RESCALE_NORMAL), 2847 const_iv (GL_RESCALE_NORMAL),
2139 const_iv (GL_FRONT), 2848 const_iv (GL_FRONT),
2140 const_iv (GL_BACK), 2849 const_iv (GL_BACK),
2850 const_iv (GL_AUX0),
2141 const_iv (GL_AND), 2851 const_iv (GL_AND),
2142 const_iv (GL_ONE), 2852 const_iv (GL_ONE),
2143 const_iv (GL_ZERO), 2853 const_iv (GL_ZERO),
2144 const_iv (GL_SRC_ALPHA), 2854 const_iv (GL_SRC_ALPHA),
2145 const_iv (GL_DST_ALPHA), 2855 const_iv (GL_DST_ALPHA),
… …
2158 const_iv (GL_INTENSITY), 2868 const_iv (GL_INTENSITY),
2159 const_iv (GL_LUMINANCE), 2869 const_iv (GL_LUMINANCE),
2160 const_iv (GL_LUMINANCE_ALPHA), 2870 const_iv (GL_LUMINANCE_ALPHA),
2161 const_iv (GL_FLOAT), 2871 const_iv (GL_FLOAT),
2162 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),
2163 const_iv (GL_COMPILE), 2879 const_iv (GL_COMPILE),
2880 const_iv (GL_PROXY_TEXTURE_1D),
2881 const_iv (GL_PROXY_TEXTURE_2D),
2164 const_iv (GL_TEXTURE_1D), 2882 const_iv (GL_TEXTURE_1D),
2165 const_iv (GL_TEXTURE_2D), 2883 const_iv (GL_TEXTURE_2D),
2166 const_iv (GL_TEXTURE_ENV), 2884 const_iv (GL_TEXTURE_ENV),
2167 const_iv (GL_TEXTURE_MAG_FILTER), 2885 const_iv (GL_TEXTURE_MAG_FILTER),
2168 const_iv (GL_TEXTURE_MIN_FILTER), 2886 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2189 const_iv (GL_COLOR_LOGIC_OP), 2907 const_iv (GL_COLOR_LOGIC_OP),
2190 const_iv (GL_SEPARABLE_2D), 2908 const_iv (GL_SEPARABLE_2D),
2191 const_iv (GL_CONVOLUTION_2D), 2909 const_iv (GL_CONVOLUTION_2D),
2192 const_iv (GL_CONVOLUTION_BORDER_MODE), 2910 const_iv (GL_CONVOLUTION_BORDER_MODE),
2193 const_iv (GL_CONSTANT_BORDER), 2911 const_iv (GL_CONSTANT_BORDER),
2912 const_iv (GL_POINTS),
2194 const_iv (GL_LINES), 2913 const_iv (GL_LINES),
2195 const_iv (GL_LINE_STRIP), 2914 const_iv (GL_LINE_STRIP),
2196 const_iv (GL_LINE_LOOP), 2915 const_iv (GL_LINE_LOOP),
2197 const_iv (GL_QUADS), 2916 const_iv (GL_QUADS),
2198 const_iv (GL_QUAD_STRIP), 2917 const_iv (GL_QUAD_STRIP),
2199 const_iv (GL_TRIANGLES), 2918 const_iv (GL_TRIANGLES),
2200 const_iv (GL_TRIANGLE_STRIP), 2919 const_iv (GL_TRIANGLE_STRIP),
2201 const_iv (GL_TRIANGLE_FAN), 2920 const_iv (GL_TRIANGLE_FAN),
2921 const_iv (GL_POLYGON),
2202 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),
2203 const_iv (GL_FASTEST), 2928 const_iv (GL_FASTEST),
2929 const_iv (GL_DONT_CARE),
2930 const_iv (GL_NICEST),
2204 const_iv (GL_V2F), 2931 const_iv (GL_V2F),
2205 const_iv (GL_V3F), 2932 const_iv (GL_V3F),
2206 const_iv (GL_T2F_V3F), 2933 const_iv (GL_T2F_V3F),
2207 const_iv (GL_T2F_N3F_V3F), 2934 const_iv (GL_T2F_N3F_V3F),
2208# undef const_iv 2935# undef const_iv
2209 }; 2936 };
2210 2937
2211 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; )
2212 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);
2213} 2943}
2944
2945void
2946disable_GL_EXT_blend_func_separate ()
2947 CODE:
2948 gl.BlendFuncSeparate = 0;
2949 gl.BlendFuncSeparateEXT = 0;
2214 2950
2215char * 2951char *
2216gl_vendor () 2952gl_vendor ()
2217 CODE: 2953 CODE:
2218 RETVAL = (char *)glGetString (GL_VENDOR); 2954 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2231 CODE: 2967 CODE:
2232 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2968 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2233 OUTPUT: 2969 OUTPUT:
2234 RETVAL 2970 RETVAL
2235 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
2236int glGetError () 2986int glGetError ()
2237 2987
2238void glFinish () 2988void glFinish ()
2239 2989
2240void glClear (int mask) 2990void glClear (int mask)
… …
2277# near_ and far_ are due to microsofts buggy "c" compiler 3027# near_ and far_ are due to microsofts buggy "c" compiler
2278void 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_)
2279 3029
2280# near_ and far_ are due to microsofts buggy "c" compiler 3030# near_ and far_ are due to microsofts buggy "c" compiler
2281void 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
2282 3034
2283void glViewport (int x, int y, int width, int height) 3035void glViewport (int x, int y, int width, int height)
2284 3036
2285void glScissor (int x, int y, int width, int height) 3037void glScissor (int x, int y, int width, int height)
2286 3038
… …
2294 3046
2295void glRotate (float angle, float x, float y, float z) 3047void glRotate (float angle, float x, float y, float z)
2296 CODE: 3048 CODE:
2297 glRotatef (angle, x, y, z); 3049 glRotatef (angle, x, y, z);
2298 3050
2299void glBegin (int mode)
2300
2301void glEnd ()
2302
2303void glColor (float r, float g, float b, float a = 1.0) 3051void glColor (float r, float g, float b, float a = 1.0)
2304 PROTOTYPE: @ 3052 PROTOTYPE: @
2305 ALIAS: 3053 ALIAS:
2306 glColor_premultiply = 1 3054 glColor_premultiply = 1
2307 CODE: 3055 CODE:
2308 if (ix) 3056 if (ix)
2309 { 3057 {
… …
2312 b *= a; 3060 b *= a;
2313 } 3061 }
2314 // microsoft visual "c" rounds instead of truncating... 3062 // microsoft visual "c" rounds instead of truncating...
2315 glColor4f (r, g, b, a); 3063 glColor4f (r, g, b, a);
2316 3064
2317void glInterleavedArrays (int format, int stride, char *data)
2318
2319void glDrawElements (int mode, int count, int type, char *indices)
2320
2321# 1.2 void glDrawRangeElements (int mode, int start, int end
2322
2323void glRasterPos (float x, float y, float z = 0.) 3065void glRasterPos (float x, float y, float z = 0.)
2324 CODE: 3066 CODE:
2325 glRasterPos3f (0, 0, z); 3067 glRasterPos3f (0, 0, z);
2326 glBitmap (0, 0, 0, 0, x, y, 0); 3068 glBitmap (0, 0, 0, 0, x, y, 0);
2327 3069
… …
2331 3073
2332void glTexCoord (float s, float t) 3074void glTexCoord (float s, float t)
2333 CODE: 3075 CODE:
2334 glTexCoord2f (s, t); 3076 glTexCoord2f (s, t);
2335 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
2336void glTexEnv (int target, int pname, float param) 3107void glTexEnv (int target, int pname, float param)
2337 CODE: 3108 CODE:
2338 glTexEnvf (target, pname, param); 3109 glTexEnvf (target, pname, param);
2339 3110
2340void glTexParameter (int target, int pname, float param) 3111void glTexParameter (int target, int pname, float param)
… …
2356void 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)
2357 CODE: 3128 CODE:
2358 if (gl.SeparableFilter2D) 3129 if (gl.SeparableFilter2D)
2359 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3130 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2360 3131
2361void 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)
2362 3133
2363void 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)
2364 3135
2365void 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)
2366 3139
2367void 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)
2368 3141
2369int glGenTexture () 3142int glGenTexture ()
2370 CODE: 3143 CODE:
2371{ 3144 RETVAL = gen_texture ();
2372 GLuint name;
2373 glGenTextures (1, &name);
2374 RETVAL = name;
2375}
2376 OUTPUT: 3145 OUTPUT:
2377 RETVAL 3146 RETVAL
2378 3147
2379void glDeleteTexture (int name) 3148void glDeleteTexture (int name)
2380 CODE: 3149 CODE:
2381{
2382 GLuint name_ = name;
2383 glDeleteTextures (1, &name_); 3150 del_texture (name);
2384} 3151
2385
2386int glGenList () 3152int glGenList ()
2387 CODE: 3153 CODE:
2388 RETVAL = glGenLists (1); 3154 RETVAL = glGenLists (1);
2389 OUTPUT: 3155 OUTPUT:
2390 RETVAL 3156 RETVAL
… …
2397 3163
2398void glEndList () 3164void glEndList ()
2399 3165
2400void glCallList (int list) 3166void glCallList (int list)
2401 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