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

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

Diff Legend

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