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

Diff Legend

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