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

Diff Legend

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