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.279 by root, Thu Oct 2 15:59:40 2008 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
17#endif 27#endif
18 28
19#include <assert.h> 29#include <assert.h>
20#include <math.h> 30#include <math.h>
21#include <string.h> 31#include <string.h>
22#include <stdio.h> 32#include <stdio.h>
23#include <stdlib.h> 33#include <stdlib.h>
24 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
25#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
26#include <SDL_endian.h> 39#include <SDL_endian.h>
27#include <SDL_image.h> 40#include <SDL_image.h>
28#include <SDL_mixer.h> 41#include <SDL_mixer.h>
29#include <SDL_opengl.h> 42#include <SDL_opengl.h>
30 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
31#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
33 51
34#include <glib/gmacros.h> 52#include <glib/gmacros.h>
35 53
36#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
37 66
38#ifndef _WIN32 67#ifndef _WIN32
39# include <sys/types.h> 68# include <sys/types.h>
40# include <sys/socket.h> 69# include <sys/socket.h>
41# include <netinet/in.h> 70# include <netinet/in.h>
42# include <netinet/tcp.h> 71# include <netinet/tcp.h>
43# include <inttypes.h> 72# include <inttypes.h>
44#endif 73#endif
45 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47 85
48#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
49 87
50#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
52 90
53#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
54 92
55#if 0 93/* mask out modifiers we are not interested in */
56# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
57#else 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;
… …
187 int faces; tileid *face2tile; // [faceid] 255 int faces; tileid *face2tile; // [faceid]
188 int texs; maptex *tex; // [tileid] 256 int texs; maptex *tex; // [tileid]
189 257
190 int32_t rows; 258 int32_t rows;
191 maprow *row; 259 maprow *row;
192} *CFPlus__Map; 260} *DC__Map;
193 261
194static char * 262static char *
195prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
196{ 264{
197 char *p; 265 char *p;
… …
235 self->texs *= 2; 303 self->texs *= 2;
236 } 304 }
237} 305}
238 306
239static maprow * 307static maprow *
240map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
241{ 309{
242 if (0 > y) 310 if (0 > y)
243 { 311 {
244 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
245 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
… …
283 351
284 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
285} 353}
286 354
287static mapcell * 355static mapcell *
288map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
289{ 357{
290 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
291} 359}
292 360
293static void 361static void
294map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
295{ 363{
296 int r; 364 int r;
297 365
298 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
299 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
… …
306 self->oy = 0; 374 self->oy = 0;
307 self->row = 0; 375 self->row = 0;
308 self->rows = 0; 376 self->rows = 0;
309} 377}
310 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
311static void 389static void
312map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
313{ 391{
314 int x, y; 392 int x, y;
315 maprow *row; 393 maprow *row;
316 mapcell *cell; 394 mapcell *cell;
317 395
… …
329 if (x >= row->c1) 407 if (x >= row->c1)
330 break; 408 break;
331 409
332 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
333 411
334 cell->darkness = 0; 412 CELL_CLEAR (cell);
335 cell->stat_hp = 0;
336 cell->flags = 0;
337 cell->player = 0;
338 } 413 }
339 } 414 }
340} 415}
341 416
342typedef struct { 417typedef struct {
… …
345} smooth_key; 420} smooth_key;
346 421
347static void 422static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 423smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 424{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 426
352 if (SvIOK (*sv)) 427 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 428 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 429 else
355 sv_setiv (*sv, bits); 430 sv_setiv (*sv, bits);
… …
396 n |= n >> 16; 471 n |= n >> 16;
397 472
398 return n + 1; 473 return n + 1;
399} 474}
400 475
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
401/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
404 490
405MODULE = CFPlus PACKAGE = CFPlus 491/******************************************************************************/
492
493static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
494static GV *hover_gv;
495
496static int
497within_widget (SV *widget, NV x, NV y)
498{
499 HV *self;
500 SV **svp;
501 NV wx, ww, wy, wh;
502
503 if (!SvROK (widget))
504 return 0;
505
506 self = (HV *)SvRV (widget);
507
508 if (SvTYPE (self) != SVt_PVHV)
509 return 0;
510
511 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
512 if (y < wy)
513 return 0;
514
515 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
516 if (y >= wy + wh)
517 return 0;
518
519 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
520 if (x < wx)
521 return 0;
522
523 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
524 if (x >= wx + ww)
525 return 0;
526
527 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
528 if (!svp || !SvTRUE (*svp))
529 return 0;
530
531 return 1;
532}
533
534/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
585
586MODULE = Deliantra::Client PACKAGE = DC
406 587
407PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
408 589
409BOOT: 590BOOT:
410{ 591{
411 HV *stash = gv_stashpv ("CFPlus", 1); 592 HV *stash = gv_stashpv ("DC", 1);
412 static const struct { 593 static const struct {
413 const char *name; 594 const char *name;
414 IV iv; 595 IV iv;
415 } *civ, const_iv[] = { 596 } *civ, const_iv[] = {
416# define const_iv(name) { # name, (IV)name } 597# define const_iv(name) { # name, (IV)name }
… …
438 619
439 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
442 623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
673
674 const_iv (SDLK_FIRST),
675 const_iv (SDLK_LAST),
443 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
444 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
445 const_iv (SDLK_KP2), 678 const_iv (SDLK_KP2),
446 const_iv (SDLK_KP3), 679 const_iv (SDLK_KP3),
447 const_iv (SDLK_KP4), 680 const_iv (SDLK_KP4),
… …
519 const_iv (KMOD_LMETA), 752 const_iv (KMOD_LMETA),
520 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
521 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
522 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
523 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
757
758 const_iv (KMOD_LRAM),
759
760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
524# undef const_iv 790# undef const_iv
525 }; 791 };
526 792
527 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
546 812
547NV floor (NV x) 813NV floor (NV x)
548 814
549NV ceil (NV x) 815NV ceil (NV x)
550 816
817IV minpot (UV n)
818
819IV popcount (UV n)
820
551void 821void
552pango_init () 822pango_init ()
553 CODE: 823 CODE:
554{ 824{
555 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
556 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 826 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); 827 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
828 /*pango_context_set_font_description (opengl_context, default_font);*/
829#if PANGO_VERSION_CHECK (1, 15, 2)
830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
832#endif
558} 833}
559 834
560int 835char *SDL_GetError ()
561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
562 836
563void 837void SDL_braino ()
838
839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
564SDL_Quit () 845void SDL_Quit ()
565 846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
855
566void 856void
567SDL_ListModes () 857SDL_ListModes (int rgb, int alpha)
568 PPCODE: 858 PPCODE:
569{ 859{
570 SDL_Rect **m; 860 SDL_Rect **m;
571 861
572 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 862 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 863 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 864 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 865 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576 866
577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 867 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 868 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579 869
580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 874
585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 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); 876 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 877
594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
595 879
596 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
597 while (*m) 881 while (*m)
598 { 882 {
883 if ((*m)->w >= 400 && (*m)->h >= 300)
884 {
599 AV *av = newAV (); 885 AV *av = newAV ();
600 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
601 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
888 av_push (av, newSViv (rgb));
889 av_push (av, newSViv (alpha));
602 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 890 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
891 }
603 892
604 ++m; 893 ++m;
605 } 894 }
606} 895}
607 896
608char *
609SDL_GetError ()
610
611int 897int
612SDL_SetVideoMode (int w, int h, int fullscreen) 898SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613 CODE: 899 CODE:
900{
901 SDL_EnableUNICODE (1);
902 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
903
904 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
905 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
906 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
907 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
908
614 RETVAL = !!SDL_SetVideoMode ( 909 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 910 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 911 );
912
617 if (RETVAL) 913 if (RETVAL)
618 { 914 {
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 915 av_clear (texture_av);
916
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h" 919#include "glfunc.h"
622# undef GL_FUNC 920#undef GL_FUNC
623 } 921 }
922}
624 OUTPUT: 923 OUTPUT:
625 RETVAL 924 RETVAL
626 925
627void 926void
628SDL_GL_SwapBuffers () 927SDL_GL_SwapBuffers ()
629 928
630char * 929char *
631SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
632 931
932int
933SDL_GetAppState ()
934
935int
936SDL_GetModState ()
937
633void 938void
634SDL_PollEvent () 939poll_events ()
635 PPCODE: 940 PPCODE:
636{ 941{
637 SDL_Event ev; 942 SDL_Event ev;
638 943
639 while (SDL_PollEvent (&ev)) 944 SDL_PumpEvents ();
945 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 946 {
641 HV *hv = newHV (); 947 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 948 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 949
644 switch (ev.type) 950 switch (ev.type)
645 { 951 {
646 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
647 case SDL_KEYUP: 953 case SDL_KEYUP:
648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
650 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 956 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 */ 957 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); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
653 break; 959 break;
654 960
655 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 963 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 964 break;
659 965
660 case SDL_MOUSEMOTION: 966 case SDL_MOUSEMOTION:
967 {
968 int state = ev.motion.state;
969 int x = ev.motion.x;
970 int y = ev.motion.y;
971 int xrel = ev.motion.xrel;
972 int yrel = ev.motion.yrel;
973
974 /* do simplistic event compression */
975 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
976 && state == ev.motion.state)
977 {
978 xrel += ev.motion.xrel;
979 yrel += ev.motion.yrel;
980 x = ev.motion.x;
981 y = ev.motion.y;
982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
983 }
984
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
991 }
668 break; 992 break;
669 993
670 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
673 997
674 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
675 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
676 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
677 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
682 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1006 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
683 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1007 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
684 break; 1008 break;
685 } 1009 }
686 1010
687 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
688 } 1012 }
689} 1013}
690 1014
691int 1015int
692Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
693 POSTCALL: 1017 POSTCALL:
694 Mix_HookMusicFinished (music_finished); 1018 Mix_HookMusicFinished (music_finished);
695 Mix_ChannelFinished (channel_finished); 1019 Mix_ChannelFinished (channel_finished);
696 1020
697void 1021void
1022Mix_QuerySpec ()
1023 PPCODE:
1024{
1025 int freq, channels;
1026 Uint16 format;
1027
1028 if (Mix_QuerySpec (&freq, &format, &channels))
1029 {
1030 EXTEND (SP, 3);
1031 PUSHs (sv_2mortal (newSViv (freq)));
1032 PUSHs (sv_2mortal (newSViv (format)));
1033 PUSHs (sv_2mortal (newSViv (channels)));
1034 }
1035}
1036
1037void
698Mix_CloseAudio () 1038Mix_CloseAudio ()
699 1039
700int 1040int
701Mix_AllocateChannels (int numchans = -1) 1041Mix_AllocateChannels (int numchans = -1)
702 1042
1043const char *
1044Mix_GetError ()
1045
703void 1046void
704lowdelay (int fd, int val = 1) 1047lowdelay (int fd, int val = 1)
705 CODE: 1048 CODE:
706#ifndef _WIN32
707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 1049 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708#endif
709 1050
710void 1051void
711win32_proxy_info () 1052win32_proxy_info ()
712 PPCODE: 1053 PPCODE:
713{ 1054{
… …
734 } 1075 }
735 } 1076 }
736#endif 1077#endif
737} 1078}
738 1079
739void 1080int
740add_font (char *file) 1081add_font (char *file)
741 CODE: 1082 CODE:
742 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
743 1086
744void 1087void
745load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
746 ALIAS: 1089 ALIAS:
747 load_image_file = 1 1090 load_image_file = 1
… …
750 STRLEN image_len; 1093 STRLEN image_len;
751 char *image = (char *)SvPVbyte (image_, image_len); 1094 char *image = (char *)SvPVbyte (image_, image_len);
752 SDL_Surface *surface, *surface2; 1095 SDL_Surface *surface, *surface2;
753 SDL_PixelFormat fmt; 1096 SDL_PixelFormat fmt;
754 SDL_RWops *rw = ix 1097 SDL_RWops *rw = ix
755 ? SDL_RWFromFile (image, "r") 1098 ? SDL_RWFromFile (image, "rb")
756 : SDL_RWFromConstMem (image, image_len); 1099 : SDL_RWFromConstMem (image, image_len);
757 1100
758 if (!rw) 1101 if (!rw)
759 croak ("load_image: %s", SDL_GetError ()); 1102 croak ("load_image: %s", SDL_GetError ());
760 1103
… …
833void 1176void
834error (char *message) 1177error (char *message)
835 CODE: 1178 CODE:
836 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
837#ifdef _WIN32 1180#ifdef _WIN32
838 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
839#endif 1182#endif
840 1183
841void 1184void
842fatal (char *message) 1185fatal (char *message)
843 CODE: 1186 CODE:
844 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
845#ifdef _WIN32 1188#ifdef _WIN32
846 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
847#endif 1190#endif
848 _exit (1); 1191 _exit (1);
849 1192
850void 1193void
851_exit (int retval = 0) 1194_exit (int retval = 0)
… …
854 ExitThread (retval); // unclean, please beam me up 1197 ExitThread (retval); // unclean, please beam me up
855#else 1198#else
856 _exit (retval); 1199 _exit (retval);
857#endif 1200#endif
858 1201
859MODULE = CFPlus PACKAGE = CFPlus::Font 1202void
1203debug ()
1204 CODE:
1205{
1206#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK;
1208#endif
1209}
860 1210
861CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
1212
1213PROTOTYPES: DISABLE
1214
1215DC::Font
862new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
863 CODE: 1217 CODE:
864{ 1218{
865 int count; 1219 int count;
866 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
869} 1223}
870 OUTPUT: 1224 OUTPUT:
871 RETVAL 1225 RETVAL
872 1226
873void 1227void
874DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
875 CODE: 1229 CODE:
876 pango_font_description_free (self); 1230 pango_font_description_free (self);
877 1231
878void 1232void
879make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1234 PROTOTYPE: $
880 CODE: 1235 CODE:
881 default_font = self; 1236 default_font = self;
882 1237
883MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
884 1239
1240PROTOTYPES: DISABLE
1241
885void 1242void
886reset_glyph_cache () 1243glyph_cache_backup ()
1244 PROTOTYPE:
887 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
888 tc_clear (); 1252 tc_restore ();
889 1253
890CFPlus::Layout 1254DC::Layout
891new (SV *class) 1255new (SV *class)
892 CODE: 1256 CODE:
893 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
894 1258
895 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
… …
897 RETVAL->g = 1.; 1261 RETVAL->g = 1.;
898 RETVAL->b = 1.; 1262 RETVAL->b = 1.;
899 RETVAL->a = 1.; 1263 RETVAL->a = 1.;
900 RETVAL->base_height = MIN_FONT_HEIGHT; 1264 RETVAL->base_height = MIN_FONT_HEIGHT;
901 RETVAL->font = 0; 1265 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
902 1267
903 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
904 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
905 OUTPUT: 1270 OUTPUT:
906 RETVAL 1271 RETVAL
907 1272
908void 1273void
909DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
910 CODE: 1275 CODE:
911 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1277 rc_free (self->rc);
912 Safefree (self); 1278 Safefree (self);
913 1279
914void 1280void
915set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
916 CODE: 1282 CODE:
917{ 1283{
918 STRLEN textlen; 1284 STRLEN textlen;
919 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
920 1286
921 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
922} 1288}
923 1289
924void 1290void
925set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
926 CODE: 1292 CODE:
927{ 1293{
928 STRLEN textlen; 1294 STRLEN textlen;
929 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
930 1296
931 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
932} 1298}
933 1299
934void 1300void
935set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
936 CODE: 1302 CODE:
937{ 1303{
938 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
939 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
940 const char *pos = text; 1306 const char *pos = text;
… …
975 if (attrs) 1341 if (attrs)
976 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
977} 1343}
978 1344
979void 1345void
980get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
981 PPCODE: 1347 PPCODE:
982{ 1348{
983 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
984 1350
985 do 1351 do
986 { 1352 {
987 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
988 1354
989 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
990 { 1356 {
991 PangoRectangle extents; 1357 PangoRectangle extents;
992 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1000 1366
1001 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
1002} 1368}
1003 1369
1004int 1370int
1005has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
1006 CODE: 1372 CODE:
1007{ 1373{
1008 int lines = 1; 1374 int lines = 1;
1009 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
1010 1376
… …
1015} 1381}
1016 OUTPUT: 1382 OUTPUT:
1017 RETVAL 1383 RETVAL
1018 1384
1019SV * 1385SV *
1020get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
1021 CODE: 1387 CODE:
1022 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1023 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
1024 OUTPUT: 1390 OUTPUT:
1025 RETVAL 1391 RETVAL
1026 1392
1027void 1393void
1028set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1394set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1029 CODE: 1395 CODE:
1030 self->r = r; 1396 self->r = r;
1031 self->g = g; 1397 self->g = g;
1032 self->b = b; 1398 self->b = b;
1033 self->a = a; 1399 self->a = a;
1034 1400
1035void 1401void
1036set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
1037 CODE: 1403 CODE:
1038 if (self->font != font) 1404 if (self->font != font)
1039 { 1405 {
1040 self->font = font; 1406 self->font = font;
1041 layout_update_font (self); 1407 layout_update_font (self);
1042 } 1408 }
1043 1409
1044void 1410void
1045set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1046 CODE: 1412 CODE:
1047 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1048 { 1414 {
1049 self->base_height = base_height; 1415 self->base_height = base_height;
1050 layout_update_font (self); 1416 layout_update_font (self);
1051 } 1417 }
1052 1418
1053void 1419void
1054set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1055 CODE: 1421 CODE:
1056 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1422 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1057 1423
1058void 1424void
1059set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1060 CODE: 1426 CODE:
1061 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1062 1428
1063void 1429void
1064set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1065 CODE: 1431 CODE:
1066 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1067 1433
1068void 1434void
1069set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1070 CODE: 1436 CODE:
1071 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1072 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1073 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1074 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1075 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1076 ); 1442 );
1077 1443
1078void 1444void
1079set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1080 CODE: 1446 CODE:
1081 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1082 1448
1083void 1449void
1084size (CFPlus::Layout self) 1450size (DC::Layout self)
1085 PPCODE: 1451 PPCODE:
1086{ 1452{
1087 int w, h; 1453 int w, h;
1088 1454
1089 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
… …
1092 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1093 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1094} 1460}
1095 1461
1096int 1462int
1097descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1098 CODE: 1464 CODE:
1099{ 1465{
1100 PangoRectangle rect; 1466 PangoRectangle rect;
1101 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1102 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1103 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1104} 1470}
1105 OUTPUT: 1471 OUTPUT:
1106 RETVAL 1472 RETVAL
1107 1473
1108int 1474int
1109xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1110 CODE: 1476 CODE:
1111{ 1477{
1112 int index, trailing; 1478 int index, trailing;
1113 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1479 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1114 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1115} 1481}
1116 OUTPUT: 1482 OUTPUT:
1117 RETVAL 1483 RETVAL
1118 1484
1119void 1485void
1120cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1121 PPCODE: 1487 PPCODE:
1122{ 1488{
1123 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1124 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1125 1491
1126 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1127 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1128 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1129 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1130} 1496}
1131 1497
1132void 1498void
1133index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1134 PPCODE: 1500 PPCODE:
1135{ 1501{
1136 int line, x; 1502 int line, x;
1137 1503
1138 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1504 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1505#if !PANGO_VERSION_CHECK (1, 17, 3)
1139 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1140 1507 --line;
1508#endif
1141 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1142 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1143 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1144} 1512}
1145 1513
1146void 1514void
1147line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1148 PPCODE: 1516 PPCODE:
1149{ 1517{
1150 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1151 int index, trailing; 1519 int index, trailing;
1152 1520
1153 if (line < 0) 1521 if (line < 0)
1154 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1155 1523
1156 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1157 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1158 1526
1159 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1527 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1160 1528
1161 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
… …
1167 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1168 } 1536 }
1169} 1537}
1170 1538
1171void 1539void
1172render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1173 PPCODE: 1541 CODE:
1542 rc_clear (self->rc);
1174 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1175 self->pl, 1544 self->pl,
1545 self->rc,
1176 x * PANGO_SCALE, y * PANGO_SCALE, 1546 x * PANGO_SCALE, y * PANGO_SCALE,
1177 self->r, self->g, self->b, self->a, 1547 self->r, self->g, self->b, self->a,
1178 flags 1548 flags
1179 ); 1549 );
1550 // we assume that context_change actually clears/frees stuff
1551 // and does not do any recomputation...
1552 pango_layout_context_changed (self->pl);
1180 1553
1181MODULE = CFPlus PACKAGE = CFPlus::Texture
1182
1183void 1554void
1184pad2pot (SV *data_, SV *w_, SV *h_) 1555draw (DC::Layout self)
1185 CODE: 1556 CODE:
1186{ 1557{
1187 int ow = SvIV (w_); 1558 glEnable (GL_TEXTURE_2D);
1188 int oh = SvIV (h_); 1559 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1560 glEnable (GL_BLEND);
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1189 1565
1190 if (ow && oh) 1566 rc_draw (self->rc);
1567
1568 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D);
1571}
1572
1573MODULE = Deliantra::Client PACKAGE = DC::Texture
1574
1575PROTOTYPES: ENABLE
1576
1577void
1578pad (SV *data_, int ow, int oh, int nw, int nh)
1579 CODE:
1580{
1581 if ((nw != ow || nh != oh) && SvOK (data_))
1191 { 1582 {
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; 1583 STRLEN datalen;
1200 char *data = SvPVbyte (data_, datalen); 1584 char *data = SvPVbyte (data_, datalen);
1201 int bpp = datalen / (ow * oh); 1585 int bpp = datalen / (ow * oh);
1202 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1586 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1203 1587
1204 SvPOK_only (result_); 1588 SvPOK_only (result_);
1205 SvCUR_set (result_, nw * nh * bpp); 1589 SvCUR_set (result_, nw * nh * bpp);
1206 1590
1207 memset (SvPVX (result_), 0, nw * nh * bpp); 1591 memset (SvPVX (result_), 0, nw * nh * bpp);
1208 while (oh--) 1592 while (oh--)
1209 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1593 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1210 1594
1211 sv_setsv (data_, result_); 1595 sv_setsv (data_, result_);
1212 }
1213
1214 sv_setiv (w_, nw);
1215 sv_setiv (h_, nh);
1216 }
1217 } 1596 }
1218} 1597}
1219 1598
1220void 1599void
1221draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1600draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1227{ 1606{
1228 HV *hv = (HV *)SvRV (self); 1607 HV *hv = (HV *)SvRV (self);
1229 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1608 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1230 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1609 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1231 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1610 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1611
1612 if (name <= 0)
1613 XSRETURN_EMPTY;
1232 1614
1233 if (items < 5) 1615 if (items < 5)
1234 { 1616 {
1235 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1617 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1236 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1618 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1264 glDisable (GL_ALPHA_TEST); 1646 glDisable (GL_ALPHA_TEST);
1265 glDisable (GL_BLEND); 1647 glDisable (GL_BLEND);
1266 } 1648 }
1267} 1649}
1268 1650
1269MODULE = CFPlus PACKAGE = CFPlus::Map 1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE:
1653{
1654 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1656 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1657 RETVAL = width > 0;
1658}
1659 OUTPUT:
1660 RETVAL
1270 1661
1271CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1663
1664PROTOTYPES: DISABLE
1665
1666DC::Map
1272new (SV *class) 1667new (SV *class)
1273 CODE: 1668 CODE:
1274 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1275 RETVAL->x = 0; 1670 RETVAL->x = 0;
1276 RETVAL->y = 0; 1671 RETVAL->y = 0;
… …
1284 RETVAL->row = 0; 1679 RETVAL->row = 0;
1285 OUTPUT: 1680 OUTPUT:
1286 RETVAL 1681 RETVAL
1287 1682
1288void 1683void
1289DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1290 CODE: 1685 CODE:
1291{ 1686{
1292 map_clear (self); 1687 map_clear (self);
1293 Safefree (self->face2tile); 1688 Safefree (self->face2tile);
1294 Safefree (self->tex); 1689 Safefree (self->tex);
1295 Safefree (self); 1690 Safefree (self);
1296} 1691}
1297 1692
1298void 1693void
1299resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1300 CODE: 1695 CODE:
1301 self->w = map_width; 1696 self->w = map_width;
1302 self->h = map_height; 1697 self->h = map_height;
1303 1698
1304void 1699void
1305clear (CFPlus::Map self) 1700clear (DC::Map self)
1306 CODE: 1701 CODE:
1307 map_clear (self); 1702 map_clear (self);
1308 1703
1309void 1704void
1310set_tileid (CFPlus::Map self, int face, int tile) 1705set_tileid (DC::Map self, int face, int tile)
1311 CODE: 1706 CODE:
1312{ 1707{
1313 need_facenum (self, face); self->face2tile [face] = tile; 1708 need_facenum (self, face); self->face2tile [face] = tile;
1314 need_texid (self, tile); 1709 need_texid (self, tile);
1315} 1710}
1316 1711
1317void 1712void
1318set_smooth (CFPlus::Map self, int face, int smooth, int level) 1713set_smooth (DC::Map self, int face, int smooth, int level)
1319 CODE: 1714 CODE:
1320{ 1715{
1321 tileid texid; 1716 tileid texid;
1322 maptex *tex; 1717 maptex *tex;
1323 1718
… …
1336 tex->smoothtile = self->face2tile [smooth]; 1731 tex->smoothtile = self->face2tile [smooth];
1337 tex->smoothlevel = level; 1732 tex->smoothlevel = level;
1338} 1733}
1339 1734
1340void 1735void
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) 1736set_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: 1737 CODE:
1343{ 1738{
1344 need_texid (self, texid); 1739 need_texid (self, texid);
1345 1740
1346 { 1741 {
… …
1366 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1367 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1368} 1763}
1369 1764
1370int 1765int
1371ox (CFPlus::Map self) 1766ox (DC::Map self)
1372 ALIAS: 1767 ALIAS:
1373 oy = 1 1768 oy = 1
1374 x = 2 1769 x = 2
1375 y = 3 1770 y = 3
1376 w = 4 1771 w = 4
… …
1387 } 1782 }
1388 OUTPUT: 1783 OUTPUT:
1389 RETVAL 1784 RETVAL
1390 1785
1391void 1786void
1392scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1393 CODE: 1788 CODE:
1394{ 1789{
1395 if (dx > 0) 1790 if (dx > 0)
1396 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1397 else if (dx < 0) 1792 else if (dx < 0)
1398 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1793 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1399 1794
1400 if (dy > 0) 1795 if (dy > 0)
1401 map_blank (self, self->x, self->y, self->w, dy); 1796 map_blank (self, self->x, self->y, self->w, dy);
1402 else if (dy < 0) 1797 else if (dy < 0)
1403 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1798 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1404 1799
1405 self->ox += dx; self->x += dx; 1800 self->ox += dx; self->x += dx;
1406 self->oy += dy; self->y += dy; 1801 self->oy += dy; self->y += dy;
1407 1802
1408 while (self->y < 0) 1803 while (self->y < 0)
… …
1412 self->rows += MAP_EXTEND_Y; 1807 self->rows += MAP_EXTEND_Y;
1413 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1414 } 1809 }
1415} 1810}
1416 1811
1417void 1812SV *
1418map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1419 CODE: 1814 CODE:
1420{ 1815{
1421 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1422 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1423 mapcell *cell; 1818 mapcell *cell;
1424 int x, y, flags; 1819 int x, y, z, flags;
1820 AV *missing = newAV ();
1821 RETVAL = newRV_noinc ((SV *)missing);
1425 1822
1426 while (data < data_end - 1) 1823 while (data < data_end - 1)
1427 { 1824 {
1428 flags = (data [0] << 8) + data [1]; data += 2; 1825 flags = (data [0] << 8) + data [1]; data += 2;
1429 1826
… …
1449 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1450 1847
1451 do 1848 do
1452 { 1849 {
1453 ext = *data++; 1850 ext = *data++;
1454 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1455 1852
1456 if (cmd < 4) 1853 if (cmd < 4)
1457 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1458 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1459 { 1856 {
… …
1462 } 1859 }
1463 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1466 { 1863 {
1467 if (*data == 8) 1864 if (*data == 1) cell->player = data [1];
1468 ; // decode player uuid 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1469 1868
1470 data += *data + 1; 1869 data += *data + 1;
1471 } 1870 }
1472 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1473 cell->flags = *data++; 1872 cell->flags = *data++;
… …
1480 } 1879 }
1481 else 1880 else
1482 cell->darkness = *data++ + 1; 1881 cell->darkness = *data++ + 1;
1483 } 1882 }
1484 1883
1884 for (z = 0; z <= 2; ++z)
1485 if (flags & 4) 1885 if (flags & (4 >> z))
1486 { 1886 {
1487 faceid face = (data [0] << 8) + data [1]; data += 2; 1887 faceid face = (data [0] << 8) + data [1]; data += 2;
1488 need_facenum (self, face); 1888 need_facenum (self, face);
1489 cell->tile [0] = self->face2tile [face]; 1889 cell->tile [z] = self->face2tile [face];
1890
1891 if (cell->tile [z])
1892 {
1893 maptex *tex = self->tex + cell->tile [z];
1894 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z]));
1896
1897 if (tex->smoothtile)
1898 {
1899 maptex *smooth = self->tex + tex->smoothtile;
1900 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile));
1902 }
1903 }
1490 } 1904 }
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 } 1905 }
1506 else 1906 else
1507 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1508 } 1908 }
1509} 1909}
1910 OUTPUT:
1911 RETVAL
1510 1912
1511SV * 1913SV *
1512mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1513 CODE: 1915 CODE:
1514{ 1916{
1515 int x1, x; 1917 int x1, x;
1516 int y1, y; 1918 int y1, y;
1517 int z; 1919 int z;
… …
1562} 1964}
1563 OUTPUT: 1965 OUTPUT:
1564 RETVAL 1966 RETVAL
1565 1967
1566void 1968void
1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1568 CODE: 1970 CODE:
1569{ 1971{
1972 int x, y, z;
1973
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256]; 1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1573 smooth_key skey; 1977 smooth_key skey;
1574 int x, y, z; 1978 int pl_x, pl_y;
1575 int last_name; 1979 maptex pl_tex;
1980 rc_t *rc = rc_alloc ();
1981 rc_key_t key;
1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1576 1985
1577 // thats current max. sorry. 1986 // thats current max. sorry.
1578 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1579 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1580 1989
1581 // clear key, in case of extra padding 1990 // clear key, in case of extra padding
1582 memset (&skey, 0, sizeof (skey)); 1991 memset (&skey, 0, sizeof (skey));
1583 1992
1584 glColor4ub (255, 255, 255, 255); 1993 memset (&key, 0, sizeof (key));
1585 1994 key.r = 255;
1586 glEnable (GL_BLEND); 1995 key.g = 255;
1587 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1996 key.b = 255;
1588 glEnable (GL_TEXTURE_2D); 1997 key.a = 255;
1589 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1998 key.mode = GL_QUADS;
1590 1999 key.format = GL_T2F_V3F;
1591 glBegin (GL_QUADS); 2000 key.texname = -1;
1592
1593 last_name = 0;
1594 2001
1595 mx += self->x; 2002 mx += self->x;
1596 my += self->y; 2003 my += self->y;
1597 2004
1598 // first pass: determine smooth_max 2005 // first pass: determine smooth_max
… …
1608 for (x = 0; x < sw; x++) 2015 for (x = 0; x < sw; x++)
1609 if (row->c0 <= x + mx && x + mx < row->c1) 2016 if (row->c0 <= x + mx && x + mx < row->c1)
1610 { 2017 {
1611 mapcell *cell = row->col + (x + mx - row->c0); 2018 mapcell *cell = row->col + (x + mx - row->c0);
1612 2019
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; 2020 smooth_max[x + 1][y + 1] =
1618 } 2021 MAX (self->tex [cell->tile [0]].smoothlevel,
2022 MAX (self->tex [cell->tile [1]].smoothlevel,
2023 self->tex [cell->tile [2]].smoothlevel));
1619 } 2024 }
1620 } 2025 }
2026
2027 glEnable (GL_BLEND);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1621 2030
1622 for (z = 0; z <= 2; z++) 2031 for (z = 0; z <= 2; z++)
1623 { 2032 {
1624 memset (smooth_level, 0, sizeof (smooth_level)); 2033 memset (smooth_level, 0, sizeof (smooth_level));
1625 2034
… …
1638 { 2047 {
1639 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1640 int px = (x + 1) * T - tex.w; 2049 int px = (x + 1) * T - tex.w;
1641 int py = (y + 1) * T - tex.h; 2050 int py = (y + 1) * T - tex.h;
1642 2051
1643 // suppressing texture state switches here
1644 // is only moderately effective, but worth the extra effort
1645 if (last_name != tex.name) 2052 if (key.texname != tex.name)
1646 { 2053 {
1647 if (!tex.name) 2054 if (!tex.name)
1648 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1649 2056
1650 glEnd (); 2057 key.texname = tex.name;
1651 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2058 arr = rc_array (rc, &key);
1652 glBegin (GL_QUADS);
1653 } 2059 }
1654 2060
1655 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2061 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 { 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
2068
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
1662 if (cell->flags & 1) 2077 if (cell->flags & 1)
1663 { 2078 {
1664 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
1665 int px = x * T + T * 2 / 32; 2080 int px = x * T + T * 2 / 32;
1666 int py = y * T - T * 6 / 32; 2081 int py = y * T - T * 6 / 32;
1667 2082
2083 if (tex.name)
1668 glEnd (); 2084 {
1669 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1670 glBegin (GL_QUADS); 2095 }
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 } 2096 }
1677 } 2097 }
1678 2098
1679 // update smooth hash 2099 // update smooth hash
1680 if (tex.smoothtile) 2100 if (tex.smoothtile)
… …
1685 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2105 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1686 2106
1687 // add bits to current tile and all neighbours. skey.x|y is 2107 // add bits to current tile and all neighbours. skey.x|y is
1688 // shifted +1|+1 so we always stay positive. 2108 // shifted +1|+1 so we always stay positive.
1689 2109
2110 // bits is ___n cccc CCCC bbbb
2111 // n do not draw borders&corners
2112 // c draw these corners, but...
2113 // C ... not these
2114 // b draw these borders
2115
2116 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
2117 // ┃· ·· ·┃ ━━
2118
2119 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2120 // ·· ·· ·┏ ┓·
2121
1690 // full tile 2122 // full tile
1691 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2123 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1692 2124
1693 // borders 2125 // borders
1694 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 2126 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); 2127 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); 2128 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); 2129 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1698 2130
1699 // corners 2131 // corners
1700 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
… …
1704 } 2136 }
1705 } 2137 }
1706 } 2138 }
1707 } 2139 }
1708 2140
2141 rc_draw (rc);
2142 rc_clear (rc);
2143
1709 // go through all smoothlevels, lowest to highest, then draw 2144 // go through all smoothlevels, lowest to highest, then draw.
1710 // this is basically counting sort 2145 // this is basically counting sort
1711 { 2146 {
1712 int w, b; 2147 int w, b;
1713 2148
2149 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS);
1714 for (w = 0; w < 256 / 32; ++w) 2151 for (w = 0; w < 256 / 32; ++w)
1715 { 2152 {
1716 uint32_t smask = smooth_level [w]; 2153 uint32_t smask = smooth_level [w];
1717 if (smask) 2154 if (smask)
1718 for (b = 0; b < 32; ++b) 2155 for (b = 0; b < 32; ++b)
… …
1725 while ((he = hv_iternext (smooth))) 2162 while ((he = hv_iternext (smooth)))
1726 { 2163 {
1727 smooth_key *skey = (smooth_key *)HeKEY (he); 2164 smooth_key *skey = (smooth_key *)HeKEY (he);
1728 IV bits = SvIVX (HeVAL (he)); 2165 IV bits = SvIVX (HeVAL (he));
1729 2166
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) 2167 if (!(bits & 0x1000)
1737 && skey->level == level 2168 && skey->level == level
1738 && level >= smooth_max [skey->x][skey->y]) 2169 && level > smooth_max [skey->x][skey->y])
1739 { 2170 {
1740 maptex tex = self->tex [skey->tile]; 2171 maptex tex = self->tex [skey->tile];
1741 int px = (((int)skey->x) - 1) * T; 2172 int px = (((int)skey->x) - 1) * T;
1742 int py = (((int)skey->y) - 1) * T; 2173 int py = (((int)skey->y) - 1) * T;
1743 int border = bits & 15; 2174 int border = bits & 15;
1744 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1745 float dx = tex.s * .0625f; // 16 images/row 2176 float dx = tex.s * .0625f; // 16 images/row
1746 float dy = tex.t * .5f ; // 2 images/column 2177 float dy = tex.t * .5f ; // 2 images/column
1747 2178
1748 // this time naively avoiding texture state changes
1749 // save gobs of state changes.
1750 if (last_name != tex.name) 2179 if (tex.name)
1751 { 2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
1752 if (!tex.name) 2183 if (key.texname != tex.name)
1753 continue; // smoothing not yet available 2184 {
1754
1755 glEnd (); 2185 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1757 glBegin (GL_QUADS); 2187 glBegin (GL_QUADS);
1758 } 2188 }
1759 2189
1760 if (border) 2190 if (border)
1761 { 2191 {
1762 float ox = border * dx; 2192 float ox = border * dx;
1763 2193
1764 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1765 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1766 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1767 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1768 } 2198 }
1769 2199
1770 if (corner) 2200 if (corner)
1771 { 2201 {
1772 float ox = corner * dx; 2202 float ox = corner * dx;
1773 2203
1774 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2204 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1775 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1776 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1777 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2208 }
1778 } 2209 }
1779 } 2210 }
1780 } 2211 }
1781 } 2212 }
1782 } 2213 }
2214
2215 glEnd ();
2216 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1;
1783 } 2218 }
1784 2219
1785 hv_clear (smooth); 2220 hv_clear (smooth);
1786 } 2221 }
1787 2222
1788 glEnd (); 2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
1789 2228
1790 glDisable (GL_TEXTURE_2D); 2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
1791 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2241 rc_free (rc);
1792 2242
1793 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
1794 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1795 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1796 { 2246 {
… …
1801 { 2251 {
1802 mapcell *cell = row->col + (x + mx - row->c0); 2252 mapcell *cell = row->col + (x + mx - row->c0);
1803 2253
1804 int px = x * T; 2254 int px = x * T;
1805 int py = y * T; 2255 int py = y * T;
2256
2257 if (expect_false (cell->player == player))
2258 {
2259 px += sdx;
2260 py += sdy;
2261 }
1806 2262
1807 if (cell->stat_hp) 2263 if (cell->stat_hp)
1808 { 2264 {
1809 int width = cell->stat_width * T; 2265 int width = cell->stat_width * T;
1810 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1821 } 2277 }
1822 } 2278 }
1823} 2279}
1824 2280
1825void 2281void
1826draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1827 CODE: 2283 CODE:
1828{ 2284{
1829 static float color[16][3] = { 2285 static float color[16][3] = {
1830 { 0.00F, 0.00F, 0.00F }, 2286 { 0.00F, 0.00F, 0.00F },
1831 { 1.00F, 1.00F, 1.00F }, 2287 { 1.00F, 1.00F, 1.00F },
… …
1881 glDisable (GL_BLEND); 2337 glDisable (GL_BLEND);
1882 glDisable (GL_TEXTURE_2D); 2338 glDisable (GL_TEXTURE_2D);
1883} 2339}
1884 2340
1885void 2341void
1886fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2342fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1887 PPCODE: 2343 PPCODE:
1888{ 2344{
1889 int x, y; 2345 int x, y;
2346 int sw1 = sw + 2;
2347 int sh1 = sh + 2;
2348 int sh3 = sh * 3;
1890 int sw4 = (sw + 3) & ~3; 2349 int sw34 = (sw * 3 + 3) & ~3;
2350 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1891 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2351 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1892 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2352 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1893 2353
1894 memset (darkness, 255, sw4 * sh);
1895 SvPOK_only (darkness_sv); 2354 SvPOK_only (darkness3_sv);
1896 SvCUR_set (darkness_sv, sw4 * sh); 2355 SvCUR_set (darkness3_sv, sw34 * sh3);
1897 2356
1898 mx += self->x; 2357 mx += self->x - 1;
1899 my += self->y; 2358 my += self->y - 1;
1900 2359
2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2361
1901 for (y = 0; y < sh; y++) 2362 for (y = 0; y < sh1; y++)
1902 if (0 <= y + my && y + my < self->rows) 2363 if (0 <= y + my && y + my < self->rows)
1903 { 2364 {
1904 maprow *row = self->row + (y + my); 2365 maprow *row = self->row + (y + my);
1905 2366
1906 for (x = 0; x < sw; x++) 2367 for (x = 0; x < sw1; x++)
1907 if (row->c0 <= x + mx && x + mx < row->c1) 2368 if (row->c0 <= x + mx && x + mx < row->c1)
1908 { 2369 {
1909 mapcell *cell = row->col + (x + mx - row->c0); 2370 mapcell *cell = row->col + (x + mx - row->c0);
1910 2371
1911 darkness[y * sw4 + x] = cell->darkness 2372 darkness1 [y * sw1 + x] = cell->darkness
1912 ? 255 - (cell->darkness - 1) 2373 ? 255 - (cell->darkness - 1)
1913 : 255 - FOW_DARKNESS; 2374 : 255 - FOW_DARKNESS;
1914 } 2375 }
1915 } 2376 }
1916 2377
2378 for (y = 0; y < sh; ++y)
2379 for (x = 0; x < sw; ++x)
2380 {
2381 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2382 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2383 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2384 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2385 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2386 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2387 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2388 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2389 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2390
2391 uint8_t r11 = (d11 + d21 + d12) / 3;
2392 uint8_t r21 = d21;
2393 uint8_t r31 = (d21 + d31 + d32) / 3;
2394
2395 uint8_t r12 = d12;
2396 uint8_t r22 = d22;
2397 uint8_t r32 = d32;
2398
2399 uint8_t r13 = (d13 + d23 + d12) / 3;
2400 uint8_t r23 = d23;
2401 uint8_t r33 = (d23 + d33 + d32) / 3;
2402
2403 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2404 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2405 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2406 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2407 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2408 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2409 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2410 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2411 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2412 }
2413
2414 free (darkness1);
2415
1917 EXTEND (SP, 3); 2416 EXTEND (SP, 3);
1918 PUSHs (sv_2mortal (newSViv (sw4))); 2417 PUSHs (sv_2mortal (newSViv (sw34)));
1919 PUSHs (sv_2mortal (newSViv (sh))); 2418 PUSHs (sv_2mortal (newSViv (sh3)));
1920 PUSHs (darkness_sv); 2419 PUSHs (darkness3_sv);
1921} 2420}
1922 2421
1923SV * 2422SV *
1924get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2423get_rect (DC::Map self, int x0, int y0, int w, int h)
1925 CODE: 2424 CODE:
1926{ 2425{
1927 int x, y, x1, y1; 2426 int x, y, x1, y1;
1928 SV *data_sv = newSV (w * h * 7 + 5); 2427 SV *data_sv = newSV (w * h * 7 + 5);
1929 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2428 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1986 else 2485 else
1987 *data++ = 0; 2486 *data++ = 0;
1988 } 2487 }
1989 } 2488 }
1990 2489
2490 /* if size is w*h + 5 then no data has been found */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 {
1991 SvPOK_only (data_sv); 2493 SvPOK_only (data_sv);
1992 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 }
2496
1993 RETVAL = data_sv; 2497 RETVAL = data_sv;
1994} 2498}
1995 OUTPUT: 2499 OUTPUT:
1996 RETVAL 2500 RETVAL
1997 2501
1998void 2502void
1999set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2503set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2000 PPCODE: 2504 PPCODE:
2001{ 2505{
2002 int x, y, z; 2506 int x, y, z;
2003 int w, h; 2507 int w, h;
2004 int x1, y1; 2508 int x1, y1;
2509 STRLEN len;
2510 uint8_t *data, *end;
2511
2512 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv);
2515 end = data + len + 8;
2516
2517 if (len < 5)
2518 XSRETURN_EMPTY;
2005 2519
2006 if (*data++ != 0) 2520 if (*data++ != 0)
2007 return; /* version mismatch */ 2521 XSRETURN_EMPTY; /* version mismatch */
2008 2522
2009 w = *data++ << 8; w |= *data++; 2523 w = *data++ << 8; w |= *data++;
2010 h = *data++ << 8; h |= *data++; 2524 h = *data++ << 8; h |= *data++;
2011 2525
2012 // we need to do this 'cause we don't keep an absolute coord system for rows 2526 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2024 { 2538 {
2025 maprow *row = map_get_row (self, y); 2539 maprow *row = map_get_row (self, y);
2026 2540
2027 for (x = x0; x < x1; x++) 2541 for (x = x0; x < x1; x++)
2028 { 2542 {
2543 uint8_t flags;
2544
2545 if (data + 7 >= end)
2546 XSRETURN_EMPTY;
2547
2029 uint8_t flags = *data++; 2548 flags = *data++;
2030 2549
2031 if (flags) 2550 if (flags)
2032 { 2551 {
2033 mapcell *cell = row_get_cell (row, x); 2552 mapcell *cell = row_get_cell (row, x);
2034 tileid tile[3] = { 0, 0, 0 }; 2553 tileid tile[3] = { 0, 0, 0 };
… …
2037 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2556 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2038 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2557 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2039 2558
2040 if (cell->darkness == 0) 2559 if (cell->darkness == 0)
2041 { 2560 {
2042 cell->darkness = 0; 2561 /*cell->darkness = 0;*/
2562 EXTEND (SP, 3);
2043 2563
2044 for (z = 0; z <= 2; z++) 2564 for (z = 0; z <= 2; z++)
2045 { 2565 {
2046 tileid t = tile [z]; 2566 tileid t = tile [z];
2047 2567
2048 if (t >= self->texs || (t && !self->tex [t].name)) 2568 if (t >= self->texs || (t && !self->tex [t].name))
2049 { 2569 {
2050 XPUSHs (sv_2mortal (newSViv (t))); 2570 PUSHs (sv_2mortal (newSViv (t)));
2051 need_texid (self, t); 2571 need_texid (self, t);
2052 } 2572 }
2053 2573
2054 cell->tile [z] = t; 2574 cell->tile [z] = t;
2055 } 2575 }
… …
2057 } 2577 }
2058 } 2578 }
2059 } 2579 }
2060} 2580}
2061 2581
2062MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2582MODULE = Deliantra::Client PACKAGE = DC::RW
2063 2583
2064CFPlus::MixChunk 2584DC::RW
2065new_from_file (SV *class, char *path) 2585new (SV *class, SV *data_sv)
2066 CODE: 2586 CODE:
2067 RETVAL = Mix_LoadWAV (path); 2587{
2588 STRLEN datalen;
2589 char *data = SvPVbyte (data_sv, datalen);
2590
2591 RETVAL = SDL_RWFromConstMem (data, datalen);
2592}
2068 OUTPUT: 2593 OUTPUT:
2069 RETVAL 2594 RETVAL
2070 2595
2596DC::RW
2597new_from_file (SV *class, const char *path, const char *mode = "rb")
2598 CODE:
2599 RETVAL = SDL_RWFromFile (path, mode);
2600 OUTPUT:
2601 RETVAL
2602
2603# fails on win32:
2604# dc.xs(2268) : error C2059: syntax error : '('
2071void 2605#void
2606#close (DC::RW self)
2607# CODE:
2608# (self->(close)) (self);
2609
2610MODULE = Deliantra::Client PACKAGE = DC::Channel
2611
2612PROTOTYPES: DISABLE
2613
2614DC::Channel
2615find ()
2616 CODE:
2617{
2618 RETVAL = Mix_GroupAvailable (-1);
2619
2620 if (RETVAL < 0)
2621 {
2622 RETVAL = Mix_GroupOldest (-1);
2623
2624 if (RETVAL < 0)
2625 XSRETURN_UNDEF;
2626
2627 Mix_HaltChannel (RETVAL);
2628 }
2629
2630 Mix_UnregisterAllEffects (RETVAL);
2631 Mix_Volume (RETVAL, 128);
2632}
2633 OUTPUT:
2634 RETVAL
2635
2636void
2637halt (DC::Channel self)
2638 CODE:
2639 Mix_HaltChannel (self);
2640
2641void
2642expire (DC::Channel self, int ticks = -1)
2643 CODE:
2644 Mix_ExpireChannel (self, ticks);
2645
2646void
2647fade_out (DC::Channel self, int ticks = -1)
2648 CODE:
2649 Mix_FadeOutChannel (self, ticks);
2650
2651int
2652volume (DC::Channel self, int volume)
2653 CODE:
2654 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2655 OUTPUT:
2656 RETVAL
2657
2658void
2659unregister_all_effects (DC::Channel self)
2660 CODE:
2661 Mix_UnregisterAllEffects (self);
2662
2663void
2664set_panning (DC::Channel self, int left, int right)
2665 CODE:
2666 left = CLAMP (left , 0, 255);
2667 right = CLAMP (right, 0, 255);
2668 Mix_SetPanning (self, left, right);
2669
2670void
2671set_distance (DC::Channel self, int distance)
2672 CODE:
2673 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2674
2675void
2676set_position (DC::Channel self, int angle, int distance)
2677 CODE:
2678
2679void
2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2681 CODE:
2682{
2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2684 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2686}
2687
2688void
2689set_reverse_stereo (DC::Channel self, int flip)
2690 CODE:
2691 Mix_SetReverseStereo (self, flip);
2692
2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2694
2695PROTOTYPES: DISABLE
2696
2697DC::MixChunk
2698new (SV *class, DC::RW rwops)
2699 CODE:
2700 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2701 OUTPUT:
2702 RETVAL
2703
2704void
2072DESTROY (CFPlus::MixChunk self) 2705DESTROY (DC::MixChunk self)
2073 CODE: 2706 CODE:
2074 Mix_FreeChunk (self); 2707 Mix_FreeChunk (self);
2075 2708
2076int 2709int
2077volume (CFPlus::MixChunk self, int volume = -1) 2710volume (DC::MixChunk self, int volume = -1)
2078 CODE: 2711 CODE:
2712 if (items > 1)
2713 volume = CLAMP (volume, 0, 128);
2079 RETVAL = Mix_VolumeChunk (self, volume); 2714 RETVAL = Mix_VolumeChunk (self, volume);
2080 OUTPUT: 2715 OUTPUT:
2081 RETVAL 2716 RETVAL
2082 2717
2083int 2718DC::Channel
2084play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2719play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2085 CODE: 2720 CODE:
2721{
2086 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2722 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2723
2724 if (RETVAL < 0)
2725 XSRETURN_UNDEF;
2726
2727 if (channel < 0)
2728 {
2729 Mix_UnregisterAllEffects (RETVAL);
2730 Mix_Volume (RETVAL, 128);
2731 }
2732}
2087 OUTPUT: 2733 OUTPUT:
2088 RETVAL 2734 RETVAL
2089 2735
2090MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2091 2737
2092int 2738int
2093volume (int volume = -1) 2739volume (int volume = -1)
2740 PROTOTYPE: ;$
2094 CODE: 2741 CODE:
2742 if (items > 0)
2743 volume = CLAMP (volume, 0, 128);
2095 RETVAL = Mix_VolumeMusic (volume); 2744 RETVAL = Mix_VolumeMusic (volume);
2096 OUTPUT: 2745 OUTPUT:
2097 RETVAL 2746 RETVAL
2098 2747
2748void
2749fade_out (int ms)
2750 CODE:
2751 Mix_FadeOutMusic (ms);
2752
2753void
2754halt ()
2755 CODE:
2756 Mix_HaltMusic ();
2757
2099CFPlus::MixMusic 2758DC::MixMusic
2100new_from_file (SV *class, char *path) 2759new (SV *class, DC::RW rwops)
2101 CODE: 2760 CODE:
2102 RETVAL = Mix_LoadMUS (path); 2761 RETVAL = Mix_LoadMUS_RW (rwops);
2103 OUTPUT: 2762 OUTPUT:
2104 RETVAL 2763 RETVAL
2105 2764
2106void 2765void
2107DESTROY (CFPlus::MixMusic self) 2766DESTROY (DC::MixMusic self)
2108 CODE: 2767 CODE:
2109 Mix_FreeMusic (self); 2768 Mix_FreeMusic (self);
2110 2769
2111int 2770int
2112play (CFPlus::MixMusic self, int loops = -1) 2771play (DC::MixMusic self, int loops = -1)
2113 CODE: 2772 CODE:
2114 RETVAL = Mix_PlayMusic (self, loops); 2773 RETVAL = Mix_PlayMusic (self, loops);
2115 OUTPUT: 2774 OUTPUT:
2116 RETVAL 2775 RETVAL
2117 2776
2118MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2777void
2778fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2779 CODE:
2780 Mix_FadeInMusicPos (self, loops, ms, position);
2781
2782MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2783
2784PROTOTYPES: ENABLE
2119 2785
2120BOOT: 2786BOOT:
2121{ 2787{
2122 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2788 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2123 static const struct { 2789 static const struct {
2124 const char *name; 2790 const char *name;
2125 IV iv; 2791 IV iv;
2126 } *civ, const_iv[] = { 2792 } *civ, const_iv[] = {
2127# define const_iv(name) { # name, (IV)name } 2793# define const_iv(name) { # name, (IV)name }
2794 const_iv (GL_VENDOR),
2795 const_iv (GL_VERSION),
2796 const_iv (GL_EXTENSIONS),
2128 const_iv (GL_COLOR_MATERIAL), 2797 const_iv (GL_COLOR_MATERIAL),
2129 const_iv (GL_SMOOTH), 2798 const_iv (GL_SMOOTH),
2130 const_iv (GL_FLAT), 2799 const_iv (GL_FLAT),
2131 const_iv (GL_DITHER), 2800 const_iv (GL_DITHER),
2132 const_iv (GL_BLEND), 2801 const_iv (GL_BLEND),
… …
2136 const_iv (GL_ALPHA_TEST), 2805 const_iv (GL_ALPHA_TEST),
2137 const_iv (GL_NORMALIZE), 2806 const_iv (GL_NORMALIZE),
2138 const_iv (GL_RESCALE_NORMAL), 2807 const_iv (GL_RESCALE_NORMAL),
2139 const_iv (GL_FRONT), 2808 const_iv (GL_FRONT),
2140 const_iv (GL_BACK), 2809 const_iv (GL_BACK),
2810 const_iv (GL_AUX0),
2141 const_iv (GL_AND), 2811 const_iv (GL_AND),
2142 const_iv (GL_ONE), 2812 const_iv (GL_ONE),
2143 const_iv (GL_ZERO), 2813 const_iv (GL_ZERO),
2144 const_iv (GL_SRC_ALPHA), 2814 const_iv (GL_SRC_ALPHA),
2145 const_iv (GL_DST_ALPHA), 2815 const_iv (GL_DST_ALPHA),
… …
2158 const_iv (GL_INTENSITY), 2828 const_iv (GL_INTENSITY),
2159 const_iv (GL_LUMINANCE), 2829 const_iv (GL_LUMINANCE),
2160 const_iv (GL_LUMINANCE_ALPHA), 2830 const_iv (GL_LUMINANCE_ALPHA),
2161 const_iv (GL_FLOAT), 2831 const_iv (GL_FLOAT),
2162 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2832 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2833 const_iv (GL_COMPRESSED_ALPHA_ARB),
2834 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2835 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2836 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2837 const_iv (GL_COMPRESSED_RGB_ARB),
2838 const_iv (GL_COMPRESSED_RGBA_ARB),
2163 const_iv (GL_COMPILE), 2839 const_iv (GL_COMPILE),
2840 const_iv (GL_PROXY_TEXTURE_1D),
2841 const_iv (GL_PROXY_TEXTURE_2D),
2164 const_iv (GL_TEXTURE_1D), 2842 const_iv (GL_TEXTURE_1D),
2165 const_iv (GL_TEXTURE_2D), 2843 const_iv (GL_TEXTURE_2D),
2166 const_iv (GL_TEXTURE_ENV), 2844 const_iv (GL_TEXTURE_ENV),
2167 const_iv (GL_TEXTURE_MAG_FILTER), 2845 const_iv (GL_TEXTURE_MAG_FILTER),
2168 const_iv (GL_TEXTURE_MIN_FILTER), 2846 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2189 const_iv (GL_COLOR_LOGIC_OP), 2867 const_iv (GL_COLOR_LOGIC_OP),
2190 const_iv (GL_SEPARABLE_2D), 2868 const_iv (GL_SEPARABLE_2D),
2191 const_iv (GL_CONVOLUTION_2D), 2869 const_iv (GL_CONVOLUTION_2D),
2192 const_iv (GL_CONVOLUTION_BORDER_MODE), 2870 const_iv (GL_CONVOLUTION_BORDER_MODE),
2193 const_iv (GL_CONSTANT_BORDER), 2871 const_iv (GL_CONSTANT_BORDER),
2872 const_iv (GL_POINTS),
2194 const_iv (GL_LINES), 2873 const_iv (GL_LINES),
2195 const_iv (GL_LINE_STRIP), 2874 const_iv (GL_LINE_STRIP),
2196 const_iv (GL_LINE_LOOP), 2875 const_iv (GL_LINE_LOOP),
2197 const_iv (GL_QUADS), 2876 const_iv (GL_QUADS),
2198 const_iv (GL_QUAD_STRIP), 2877 const_iv (GL_QUAD_STRIP),
2199 const_iv (GL_TRIANGLES), 2878 const_iv (GL_TRIANGLES),
2200 const_iv (GL_TRIANGLE_STRIP), 2879 const_iv (GL_TRIANGLE_STRIP),
2201 const_iv (GL_TRIANGLE_FAN), 2880 const_iv (GL_TRIANGLE_FAN),
2881 const_iv (GL_POLYGON),
2202 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2882 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2883 const_iv (GL_POINT_SMOOTH_HINT),
2884 const_iv (GL_LINE_SMOOTH_HINT),
2885 const_iv (GL_POLYGON_SMOOTH_HINT),
2886 const_iv (GL_GENERATE_MIPMAP_HINT),
2887 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2203 const_iv (GL_FASTEST), 2888 const_iv (GL_FASTEST),
2889 const_iv (GL_DONT_CARE),
2890 const_iv (GL_NICEST),
2204 const_iv (GL_V2F), 2891 const_iv (GL_V2F),
2205 const_iv (GL_V3F), 2892 const_iv (GL_V3F),
2206 const_iv (GL_T2F_V3F), 2893 const_iv (GL_T2F_V3F),
2207 const_iv (GL_T2F_N3F_V3F), 2894 const_iv (GL_T2F_N3F_V3F),
2208# undef const_iv 2895# undef const_iv
2209 }; 2896 };
2210 2897
2211 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2898 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2212 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2899 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2900
2901 texture_av = newAV ();
2902 AvREAL_off (texture_av);
2213} 2903}
2904
2905void
2906disable_GL_EXT_blend_func_separate ()
2907 CODE:
2908 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0;
2214 2910
2215char * 2911char *
2216gl_vendor () 2912gl_vendor ()
2217 CODE: 2913 CODE:
2218 RETVAL = (char *)glGetString (GL_VENDOR); 2914 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2231 CODE: 2927 CODE:
2232 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2928 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2233 OUTPUT: 2929 OUTPUT:
2234 RETVAL 2930 RETVAL
2235 2931
2932const char *glGetString (GLenum pname)
2933
2934GLint glGetInteger (GLenum pname)
2935 CODE:
2936 glGetIntegerv (pname, &RETVAL);
2937 OUTPUT:
2938 RETVAL
2939
2940GLdouble glGetDouble (GLenum pname)
2941 CODE:
2942 glGetDoublev (pname, &RETVAL);
2943 OUTPUT:
2944 RETVAL
2945
2236int glGetError () 2946int glGetError ()
2237 2947
2238void glFinish () 2948void glFinish ()
2239 2949
2240void glClear (int mask) 2950void glClear (int mask)
… …
2277# near_ and far_ are due to microsofts buggy "c" compiler 2987# near_ and far_ are due to microsofts buggy "c" compiler
2278void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2988void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2279 2989
2280# near_ and far_ are due to microsofts buggy "c" compiler 2990# near_ and far_ are due to microsofts buggy "c" compiler
2281void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2991void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2992
2993PROTOTYPES: DISABLE
2282 2994
2283void glViewport (int x, int y, int width, int height) 2995void glViewport (int x, int y, int width, int height)
2284 2996
2285void glScissor (int x, int y, int width, int height) 2997void glScissor (int x, int y, int width, int height)
2286 2998
… …
2294 3006
2295void glRotate (float angle, float x, float y, float z) 3007void glRotate (float angle, float x, float y, float z)
2296 CODE: 3008 CODE:
2297 glRotatef (angle, x, y, z); 3009 glRotatef (angle, x, y, z);
2298 3010
2299void glBegin (int mode)
2300
2301void glEnd ()
2302
2303void glColor (float r, float g, float b, float a = 1.0) 3011void glColor (float r, float g, float b, float a = 1.0)
2304 PROTOTYPE: @ 3012 PROTOTYPE: @
2305 ALIAS: 3013 ALIAS:
2306 glColor_premultiply = 1 3014 glColor_premultiply = 1
2307 CODE: 3015 CODE:
2308 if (ix) 3016 if (ix)
2309 { 3017 {
… …
2312 b *= a; 3020 b *= a;
2313 } 3021 }
2314 // microsoft visual "c" rounds instead of truncating... 3022 // microsoft visual "c" rounds instead of truncating...
2315 glColor4f (r, g, b, a); 3023 glColor4f (r, g, b, a);
2316 3024
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.) 3025void glRasterPos (float x, float y, float z = 0.)
2324 CODE: 3026 CODE:
2325 glRasterPos3f (0, 0, z); 3027 glRasterPos3f (0, 0, z);
2326 glBitmap (0, 0, 0, 0, x, y, 0); 3028 glBitmap (0, 0, 0, 0, x, y, 0);
2327 3029
… …
2331 3033
2332void glTexCoord (float s, float t) 3034void glTexCoord (float s, float t)
2333 CODE: 3035 CODE:
2334 glTexCoord2f (s, t); 3036 glTexCoord2f (s, t);
2335 3037
3038void glRect (float x1, float y1, float x2, float y2)
3039 CODE:
3040 glRectf (x1, y1, x2, y2);
3041
3042void glRect_lineloop (float x1, float y1, float x2, float y2)
3043 CODE:
3044 glBegin (GL_LINE_LOOP);
3045 glVertex2f (x1, y1);
3046 glVertex2f (x2, y1);
3047 glVertex2f (x2, y2);
3048 glVertex2f (x1, y2);
3049 glEnd ();
3050
3051PROTOTYPES: ENABLE
3052
3053void glBegin (int mode)
3054
3055void glEnd ()
3056
3057void glPointSize (GLfloat size)
3058
3059void glLineWidth (GLfloat width)
3060
3061void glInterleavedArrays (int format, int stride, char *data)
3062
3063void glDrawElements (int mode, int count, int type, char *indices)
3064
3065# 1.2 void glDrawRangeElements (int mode, int start, int end
3066
2336void glTexEnv (int target, int pname, float param) 3067void glTexEnv (int target, int pname, float param)
2337 CODE: 3068 CODE:
2338 glTexEnvf (target, pname, param); 3069 glTexEnvf (target, pname, param);
2339 3070
2340void glTexParameter (int target, int pname, float param) 3071void 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) 3087void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2357 CODE: 3088 CODE:
2358 if (gl.SeparableFilter2D) 3089 if (gl.SeparableFilter2D)
2359 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3090 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2360 3091
2361void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3092void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2362 3093
2363void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3094void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2364 3095
2365void glDrawPixels (int width, int height, int format, int type, char *pixels) 3096void glDrawPixels (int width, int height, int format, int type, char *pixels)
3097
3098void glPixelZoom (float x, float y)
2366 3099
2367void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3100void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2368 3101
2369int glGenTexture () 3102int glGenTexture ()
2370 CODE: 3103 CODE:
2371{ 3104 RETVAL = gen_texture ();
2372 GLuint name;
2373 glGenTextures (1, &name);
2374 RETVAL = name;
2375}
2376 OUTPUT: 3105 OUTPUT:
2377 RETVAL 3106 RETVAL
2378 3107
2379void glDeleteTexture (int name) 3108void glDeleteTexture (int name)
2380 CODE: 3109 CODE:
2381{
2382 GLuint name_ = name;
2383 glDeleteTextures (1, &name_); 3110 del_texture (name);
2384} 3111
2385
2386int glGenList () 3112int glGenList ()
2387 CODE: 3113 CODE:
2388 RETVAL = glGenLists (1); 3114 RETVAL = glGenLists (1);
2389 OUTPUT: 3115 OUTPUT:
2390 RETVAL 3116 RETVAL
… …
2397 3123
2398void glEndList () 3124void glEndList ()
2399 3125
2400void glCallList (int list) 3126void glCallList (int list)
2401 3127
3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3129
3130PROTOTYPES: DISABLE
3131
3132void
3133find_widget (SV *self, NV x, NV y)
3134 PPCODE:
3135{
3136 if (within_widget (self, x, y))
3137 XPUSHs (self);
3138}
3139
3140BOOT:
3141{
3142 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3143
3144 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3145 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3146 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3147 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3148}
3149
3150void
3151draw (SV *self)
3152 CODE:
3153{
3154 HV *hv;
3155 SV **svp;
3156 NV x, y, w, h;
3157 SV *draw_x_sv = GvSV (draw_x_gv);
3158 SV *draw_y_sv = GvSV (draw_y_gv);
3159 SV *draw_w_sv = GvSV (draw_w_gv);
3160 SV *draw_h_sv = GvSV (draw_h_gv);
3161 double draw_x, draw_y;
3162
3163 if (!SvROK (self))
3164 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3165
3166 hv = (HV *)SvRV (self);
3167
3168 if (SvTYPE (hv) != SVt_PVHV)
3169 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3170
3171 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3172 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3173
3174 if (!h || !w)
3175 XSRETURN_EMPTY;
3176
3177 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3178 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3179
3180 draw_x = SvNV (draw_x_sv) + x;
3181 draw_y = SvNV (draw_y_sv) + y;
3182
3183 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3184 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3185 XSRETURN_EMPTY;
3186
3187 sv_setnv (draw_x_sv, draw_x);
3188 sv_setnv (draw_y_sv, draw_y);
3189
3190 glPushMatrix ();
3191 glTranslated (x, y, 0);
3192
3193 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3194 {
3195 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3196
3197 if (svp && SvTRUE (*svp))
3198 {
3199 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3200 glEnable (GL_BLEND);
3201 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3202 glBegin (GL_QUADS);
3203 glVertex2f (0, 0);
3204 glVertex2f (w, 0);
3205 glVertex2f (w, h);
3206 glVertex2f (0, h);
3207 glEnd ();
3208 glDisable (GL_BLEND);
3209 }
3210 }
3211#if 0
3212 // draw borders, for debugging
3213 glPushMatrix ();
3214 glColor4f (1., 1., 0., 1.);
3215 glTranslatef (.5, .5, 0.);
3216 glBegin (GL_LINE_LOOP);
3217 glVertex2f (0 , 0);
3218 glVertex2f (w - 1, 0);
3219 glVertex2f (w - 1, h - 1);
3220 glVertex2f (0 , h - 1);
3221 glEnd ();
3222 glPopMatrix ();
3223#endif
3224 PUSHMARK (SP);
3225 XPUSHs (self);
3226 PUTBACK;
3227 call_method ("_draw", G_VOID | G_DISCARD);
3228 SPAGAIN;
3229
3230 glPopMatrix ();
3231
3232 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3233 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3234}
3235

Diff Legend

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