ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

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