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.185 by root, Sat Apr 21 09:21:03 2007 UTC vs.
Revision 1.281 by root, Thu Dec 4 23:58:20 2008 UTC

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

Diff Legend

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