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.200 by root, Tue Jul 17 16:02:13 2007 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# 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
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
27#include <stdio.h> 31#include <stdio.h>
28#include <stdlib.h> 32#include <stdlib.h>
29 33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35
30#include <SDL.h> 36#include <SDL.h>
37#include <SDL_thread.h>
31#include <SDL_endian.h> 38#include <SDL_endian.h>
32#include <SDL_image.h> 39#include <SDL_image.h>
33#include <SDL_mixer.h> 40#include <SDL_mixer.h>
34#include <SDL_opengl.h> 41#include <SDL_opengl.h>
35 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
36#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
38 52
39#include <glib/gmacros.h> 53#include <glib/gmacros.h>
40 54
41#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
42 67
43#ifndef _WIN32 68#ifndef _WIN32
44# include <sys/types.h> 69# include <sys/types.h>
45# include <sys/socket.h> 70# include <sys/socket.h>
46# include <netinet/in.h> 71# include <netinet/in.h>
47# include <netinet/tcp.h> 72# include <netinet/tcp.h>
48# include <inttypes.h> 73# include <inttypes.h>
49#endif 74#endif
50 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
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 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 */
53#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
54 91
55#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
57 94
58#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
59 96
60#if 0 97/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else 99
63# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
64#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
65 104
66static AV *texture_av; 105static AV *texture_av;
67 106
68static struct 107static struct
69{ 108{
… …
106 av_push (texture_av, (SV *)(size_t)name); 145 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 146 glDeleteTextures (1, &name);
108} 147}
109 148
110#include "texcache.c" 149#include "texcache.c"
150#include "rendercache.c"
111 151
112#include "pango-font.c" 152#include "pango-font.c"
113#include "pango-fontmap.c" 153#include "pango-fontmap.c"
114#include "pango-render.c" 154#include "pango-render.c"
115 155
156typedef IV DC__Channel;
157typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
118 160
119typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
120 162
121static int 163static int
122shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
123{ 165{
124 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
… …
138 180
139typedef struct cf_layout { 181typedef struct cf_layout {
140 PangoLayout *pl; 182 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
142 int base_height; 184 int base_height;
143 CFPlus__Font font; 185 DC__Font font;
186 rc_t *rc;
144} *CFPlus__Layout; 187} *DC__Layout;
145 188
146static CFPlus__Font default_font; 189static DC__Font default_font;
147static PangoContext *opengl_context; 190static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
149 192
150static void 193static void
151substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
… …
156#endif 199#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 201}
159 202
160static void 203static void
161layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
162{ 205{
163 /* 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
164 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
165 */ 208 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
167 210
168 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 213
171 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
172} 215}
173 216
174static void 217static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 219{
177 PangoRectangle rect; 220 PangoRectangle rect;
178 221
179 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
… …
191 234
192typedef uint16_t tileid; 235typedef uint16_t tileid;
193typedef uint16_t faceid; 236typedef uint16_t faceid;
194 237
195typedef struct { 238typedef struct {
196 int name; 239 GLuint name;
197 int w, h; 240 int w, h;
198 float s, t; 241 float s, t;
199 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
200 tileid smoothtile; 243 tileid smoothtile;
201 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
202} maptex; 246} maptex;
203 247
204typedef struct { 248typedef struct {
205 uint32_t player; 249 uint32_t player;
206 tileid tile[3]; 250 tileid tile[3];
… …
219 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
221 265
222 int32_t rows; 266 int32_t rows;
223 maprow *row; 267 maprow *row;
224} *CFPlus__Map; 268} *DC__Map;
225 269
226static char * 270static char *
227prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
228{ 272{
229 char *p; 273 char *p;
… …
267 self->texs *= 2; 311 self->texs *= 2;
268 } 312 }
269} 313}
270 314
271static maprow * 315static maprow *
272map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
273{ 317{
274 if (0 > y) 318 if (0 > y)
275 { 319 {
276 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
… …
315 359
316 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
317} 361}
318 362
319static mapcell * 363static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
321{ 365{
322 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
323} 367}
324 368
325static void 369static void
326map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
327{ 371{
328 int r; 372 int r;
329 373
330 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
… …
338 self->oy = 0; 382 self->oy = 0;
339 self->row = 0; 383 self->row = 0;
340 self->rows = 0; 384 self->rows = 0;
341} 385}
342 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
343static void 397static void
344map_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)
345{ 399{
346 int x, y; 400 int x, y;
347 maprow *row; 401 maprow *row;
348 mapcell *cell; 402 mapcell *cell;
349 403
… …
361 if (x >= row->c1) 415 if (x >= row->c1)
362 break; 416 break;
363 417
364 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
365 419
366 cell->darkness = 0; 420 CELL_CLEAR (cell);
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
370 } 421 }
371 } 422 }
372} 423}
373 424
374typedef struct { 425typedef struct {
… …
428 n |= n >> 16; 479 n |= n >> 16;
429 480
430 return n + 1; 481 return n + 1;
431} 482}
432 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
433/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
436 498
437MODULE = 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
438 595
439PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
440 597
441BOOT: 598BOOT:
442{ 599{
443 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 601 static const struct {
445 const char *name; 602 const char *name;
446 IV iv; 603 IV iv;
447 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
… …
470 627
471 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
474 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),
475 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
555 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)
556# undef const_iv 798# undef const_iv
557 }; 799 };
558 800
559 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; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 820
579NV floor (NV x) 821NV floor (NV x)
580 822
581NV ceil (NV x) 823NV ceil (NV x)
582 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
583void 835void
584pango_init () 836pango_init ()
585 CODE: 837 CODE:
586{ 838{
587 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
588 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);
589 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
590} 847}
591 848
592char *
593SDL_GetError () 849char *SDL_GetError ()
594 850
595int 851void SDL_braino ()
596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
597 852
598void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
599SDL_Quit () 859void SDL_Quit ()
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
600 869
601void 870void
602SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
603 PPCODE: 872 PPCODE:
604{ 873{
… …
616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
619 888
620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
621#if SDL_VERSION_ATLEAST(1,2,10)
622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
624#endif
625 891
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 893
628 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
629 while (*m) 895 while (*m)
630 { 896 {
631 if ((*m)->w >= 640 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
632 { 898 {
633 AV *av = newAV (); 899 AV *av = newAV ();
634 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
635 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
… …
660 926
661 if (RETVAL) 927 if (RETVAL)
662 { 928 {
663 av_clear (texture_av); 929 av_clear (texture_av);
664 930
665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
666#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);
667#include "glfunc.h" 933#include "glfunc.h"
668#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
669 } 938 }
670} 939}
671 OUTPUT: 940 OUTPUT:
672 RETVAL 941 RETVAL
673 942
… …
677char * 946char *
678SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
679 948
680int 949int
681SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
682 954
683void 955void
684poll_events () 956poll_events ()
685 PPCODE: 957 PPCODE:
686{ 958{
… …
696 { 968 {
697 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
698 case SDL_KEYUP: 970 case SDL_KEYUP:
699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
701 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
702 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
704 break; 976 break;
705 977
706 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
725 x = ev.motion.x; 997 x = ev.motion.x;
726 y = ev.motion.y; 998 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 } 1000 }
729 1001
730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
731 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
732 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
733 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
734 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
735 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 } 1008 }
737 break; 1009 break;
738 1010
739 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
740 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
742 1014
743 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
744 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
745 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
746 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
751 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
752 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
753 break; 1025 break;
754 } 1026 }
755 1027
756 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
757 } 1029 }
758} 1030}
759 1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
1044
760int 1045int
761Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
762 POSTCALL: 1047 POSTCALL:
763 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
764 Mix_ChannelFinished (channel_finished); 1049 Mix_ChannelFinished (channel_finished);
765 1050
766void 1051void
1052Mix_QuerySpec ()
1053 PPCODE:
1054{
1055 int freq, channels;
1056 Uint16 format;
1057
1058 if (Mix_QuerySpec (&freq, &format, &channels))
1059 {
1060 EXTEND (SP, 3);
1061 PUSHs (sv_2mortal (newSViv (freq)));
1062 PUSHs (sv_2mortal (newSViv (format)));
1063 PUSHs (sv_2mortal (newSViv (channels)));
1064 }
1065}
1066
1067void
767Mix_CloseAudio () 1068Mix_CloseAudio ()
768 1069
769int 1070int
770Mix_AllocateChannels (int numchans = -1) 1071Mix_AllocateChannels (int numchans = -1)
1072
1073const char *
1074Mix_GetError ()
771 1075
772void 1076void
773lowdelay (int fd, int val = 1) 1077lowdelay (int fd, int val = 1)
774 CODE: 1078 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1079 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
801 } 1105 }
802 } 1106 }
803#endif 1107#endif
804} 1108}
805 1109
806void 1110int
807add_font (char *file) 1111add_font (char *file)
808 CODE: 1112 CODE:
809 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
810 1116
811void 1117void
812load_image_inline (SV *image_) 1118load_image_inline (SV *image_)
813 ALIAS: 1119 ALIAS:
814 load_image_file = 1 1120 load_image_file = 1
… …
817 STRLEN image_len; 1123 STRLEN image_len;
818 char *image = (char *)SvPVbyte (image_, image_len); 1124 char *image = (char *)SvPVbyte (image_, image_len);
819 SDL_Surface *surface, *surface2; 1125 SDL_Surface *surface, *surface2;
820 SDL_PixelFormat fmt; 1126 SDL_PixelFormat fmt;
821 SDL_RWops *rw = ix 1127 SDL_RWops *rw = ix
822 ? SDL_RWFromFile (image, "r") 1128 ? SDL_RWFromFile (image, "rb")
823 : SDL_RWFromConstMem (image, image_len); 1129 : SDL_RWFromConstMem (image, image_len);
824 1130
825 if (!rw) 1131 if (!rw)
826 croak ("load_image: %s", SDL_GetError ()); 1132 croak ("load_image: %s", SDL_GetError ());
827 1133
… …
900void 1206void
901error (char *message) 1207error (char *message)
902 CODE: 1208 CODE:
903 fprintf (stderr, "ERROR: %s\n", message); 1209 fprintf (stderr, "ERROR: %s\n", message);
904#ifdef _WIN32 1210#ifdef _WIN32
905 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1211 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
906#endif 1212#endif
907 1213
908void 1214void
909fatal (char *message) 1215fatal (char *message)
910 CODE: 1216 CODE:
911 fprintf (stderr, "FATAL: %s\n", message); 1217 fprintf (stderr, "FATAL: %s\n", message);
912#ifdef _WIN32 1218#ifdef _WIN32
913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1219 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
914#endif 1220#endif
915 _exit (1); 1221 _exit (1);
916 1222
917void 1223void
918_exit (int retval = 0) 1224_exit (int retval = 0)
… …
930#if DEBUG 1236#if DEBUG
931 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
932#endif 1238#endif
933} 1239}
934 1240
935MODULE = CFPlus PACKAGE = CFPlus::Font 1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
936 1247
937CFPlus::Font 1248MODULE = Deliantra::Client PACKAGE = DC::Font
1249
1250PROTOTYPES: DISABLE
1251
1252DC::Font
938new_from_file (SV *class, char *path, int id = 0) 1253new_from_file (SV *class, char *path, int id = 0)
939 CODE: 1254 CODE:
940{ 1255{
941 int count; 1256 int count;
942 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
945} 1260}
946 OUTPUT: 1261 OUTPUT:
947 RETVAL 1262 RETVAL
948 1263
949void 1264void
950DESTROY (CFPlus::Font self) 1265DESTROY (DC::Font self)
951 CODE: 1266 CODE:
952 pango_font_description_free (self); 1267 pango_font_description_free (self);
953 1268
954void 1269void
955make_default (CFPlus::Font self) 1270make_default (DC::Font self)
1271 PROTOTYPE: $
956 CODE: 1272 CODE:
957 default_font = self; 1273 default_font = self;
958 1274
959MODULE = CFPlus PACKAGE = CFPlus::Layout 1275MODULE = Deliantra::Client PACKAGE = DC::Layout
960 1276
1277PROTOTYPES: DISABLE
1278
961void 1279void
962reset_glyph_cache () 1280glyph_cache_backup ()
1281 PROTOTYPE:
963 CODE: 1282 CODE:
1283 tc_backup ();
1284
1285void
1286glyph_cache_restore ()
1287 PROTOTYPE:
1288 CODE:
964 tc_clear (); 1289 tc_restore ();
965 1290
966CFPlus::Layout 1291DC::Layout
967new (SV *class) 1292new (SV *class)
968 CODE: 1293 CODE:
969 New (0, RETVAL, 1, struct cf_layout); 1294 New (0, RETVAL, 1, struct cf_layout);
970 1295
971 RETVAL->pl = pango_layout_new (opengl_context); 1296 RETVAL->pl = pango_layout_new (opengl_context);
… …
973 RETVAL->g = 1.; 1298 RETVAL->g = 1.;
974 RETVAL->b = 1.; 1299 RETVAL->b = 1.;
975 RETVAL->a = 1.; 1300 RETVAL->a = 1.;
976 RETVAL->base_height = MIN_FONT_HEIGHT; 1301 RETVAL->base_height = MIN_FONT_HEIGHT;
977 RETVAL->font = 0; 1302 RETVAL->font = 0;
1303 RETVAL->rc = rc_alloc ();
978 1304
979 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1305 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
980 layout_update_font (RETVAL); 1306 layout_update_font (RETVAL);
981 OUTPUT: 1307 OUTPUT:
982 RETVAL 1308 RETVAL
983 1309
984void 1310void
985DESTROY (CFPlus::Layout self) 1311DESTROY (DC::Layout self)
986 CODE: 1312 CODE:
987 g_object_unref (self->pl); 1313 g_object_unref (self->pl);
1314 rc_free (self->rc);
988 Safefree (self); 1315 Safefree (self);
989 1316
990void 1317void
991set_text (CFPlus::Layout self, SV *text_) 1318set_text (DC::Layout self, SV *text_)
992 CODE: 1319 CODE:
993{ 1320{
994 STRLEN textlen; 1321 STRLEN textlen;
995 char *text = SvPVutf8 (text_, textlen); 1322 char *text = SvPVutf8 (text_, textlen);
996 1323
997 pango_layout_set_text (self->pl, text, textlen); 1324 pango_layout_set_text (self->pl, text, textlen);
998} 1325}
999 1326
1000void 1327void
1001set_markup (CFPlus::Layout self, SV *text_) 1328set_markup (DC::Layout self, SV *text_)
1002 CODE: 1329 CODE:
1003{ 1330{
1004 STRLEN textlen; 1331 STRLEN textlen;
1005 char *text = SvPVutf8 (text_, textlen); 1332 char *text = SvPVutf8 (text_, textlen);
1006 1333
1007 pango_layout_set_markup (self->pl, text, textlen); 1334 pango_layout_set_markup (self->pl, text, textlen);
1008} 1335}
1009 1336
1010void 1337void
1011set_shapes (CFPlus::Layout self, ...) 1338set_shapes (DC::Layout self, ...)
1012 CODE: 1339 CODE:
1013{ 1340{
1014 PangoAttrList *attrs = 0; 1341 PangoAttrList *attrs = 0;
1015 const char *text = pango_layout_get_text (self->pl); 1342 const char *text = pango_layout_get_text (self->pl);
1016 const char *pos = text; 1343 const char *pos = text;
… …
1051 if (attrs) 1378 if (attrs)
1052 pango_layout_set_attributes (self->pl, attrs); 1379 pango_layout_set_attributes (self->pl, attrs);
1053} 1380}
1054 1381
1055void 1382void
1056get_shapes (CFPlus::Layout self) 1383get_shapes (DC::Layout self)
1057 PPCODE: 1384 PPCODE:
1058{ 1385{
1059 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1060 1387
1061 do 1388 do
1062 { 1389 {
1063 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1064 1391
1065 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1066 { 1393 {
1067 PangoRectangle extents; 1394 PangoRectangle extents;
1068 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1076 1403
1077 pango_layout_iter_free (iter); 1404 pango_layout_iter_free (iter);
1078} 1405}
1079 1406
1080int 1407int
1081has_wrapped (CFPlus::Layout self) 1408has_wrapped (DC::Layout self)
1082 CODE: 1409 CODE:
1083{ 1410{
1084 int lines = 1; 1411 int lines = 1;
1085 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1086 1413
… …
1091} 1418}
1092 OUTPUT: 1419 OUTPUT:
1093 RETVAL 1420 RETVAL
1094 1421
1095SV * 1422SV *
1096get_text (CFPlus::Layout self) 1423get_text (DC::Layout self)
1097 CODE: 1424 CODE:
1098 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1425 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1099 sv_utf8_decode (RETVAL); 1426 sv_utf8_decode (RETVAL);
1100 OUTPUT: 1427 OUTPUT:
1101 RETVAL 1428 RETVAL
1102 1429
1103void 1430void
1104set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1431set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1105 CODE: 1432 CODE:
1106 self->r = r; 1433 self->r = r;
1107 self->g = g; 1434 self->g = g;
1108 self->b = b; 1435 self->b = b;
1109 self->a = a; 1436 self->a = a;
1110 1437
1111void 1438void
1112set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1439set_font (DC::Layout self, DC::Font font = 0)
1113 CODE: 1440 CODE:
1114 if (self->font != font) 1441 if (self->font != font)
1115 { 1442 {
1116 self->font = font; 1443 self->font = font;
1117 layout_update_font (self); 1444 layout_update_font (self);
1118 } 1445 }
1119 1446
1120void 1447void
1121set_height (CFPlus::Layout self, int base_height) 1448set_height (DC::Layout self, int base_height)
1122 CODE: 1449 CODE:
1123 if (self->base_height != base_height) 1450 if (self->base_height != base_height)
1124 { 1451 {
1125 self->base_height = base_height; 1452 self->base_height = base_height;
1126 layout_update_font (self); 1453 layout_update_font (self);
1127 } 1454 }
1128 1455
1129void 1456void
1130set_width (CFPlus::Layout self, int max_width = -1) 1457set_width (DC::Layout self, int max_width = -1)
1131 CODE: 1458 CODE:
1132 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1459 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1133 1460
1134void 1461void
1135set_indent (CFPlus::Layout self, int indent) 1462set_indent (DC::Layout self, int indent)
1136 CODE: 1463 CODE:
1137 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1464 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1138 1465
1139void 1466void
1140set_spacing (CFPlus::Layout self, int spacing) 1467set_spacing (DC::Layout self, int spacing)
1141 CODE: 1468 CODE:
1142 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1469 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1143 1470
1144void 1471void
1145set_ellipsise (CFPlus::Layout self, int ellipsise) 1472set_ellipsise (DC::Layout self, int ellipsise)
1146 CODE: 1473 CODE:
1147 pango_layout_set_ellipsize (self->pl, 1474 pango_layout_set_ellipsize (self->pl,
1148 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1475 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1149 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1476 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1150 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1477 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1151 : PANGO_ELLIPSIZE_NONE 1478 : PANGO_ELLIPSIZE_NONE
1152 ); 1479 );
1153 1480
1154void 1481void
1155set_single_paragraph_mode (CFPlus::Layout self, int spm) 1482set_single_paragraph_mode (DC::Layout self, int spm)
1156 CODE: 1483 CODE:
1157 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1484 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1158 1485
1159void 1486void
1160size (CFPlus::Layout self) 1487size (DC::Layout self)
1161 PPCODE: 1488 PPCODE:
1162{ 1489{
1163 int w, h; 1490 int w, h;
1164 1491
1165 layout_get_pixel_size (self, &w, &h); 1492 layout_get_pixel_size (self, &w, &h);
… …
1168 PUSHs (sv_2mortal (newSViv (w))); 1495 PUSHs (sv_2mortal (newSViv (w)));
1169 PUSHs (sv_2mortal (newSViv (h))); 1496 PUSHs (sv_2mortal (newSViv (h)));
1170} 1497}
1171 1498
1172int 1499int
1173descent (CFPlus::Layout self) 1500descent (DC::Layout self)
1174 CODE: 1501 CODE:
1175{ 1502{
1176 PangoRectangle rect; 1503 PangoRectangle rect;
1177 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1178 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1179 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1180} 1507}
1181 OUTPUT: 1508 OUTPUT:
1182 RETVAL 1509 RETVAL
1183 1510
1184int 1511int
1185xy_to_index (CFPlus::Layout self, int x, int y) 1512xy_to_index (DC::Layout self, int x, int y)
1186 CODE: 1513 CODE:
1187{ 1514{
1188 int index, trailing; 1515 int index, trailing;
1189 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1516 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1190 RETVAL = index + trailing; 1517 RETVAL = index + trailing;
1191} 1518}
1192 OUTPUT: 1519 OUTPUT:
1193 RETVAL 1520 RETVAL
1194 1521
1195void 1522void
1196cursor_pos (CFPlus::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1197 PPCODE: 1524 PPCODE:
1198{ 1525{
1199 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1200 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1201 1528
1202 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1203 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1206} 1533}
1207 1534
1208void 1535void
1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1210 PPCODE: 1537 PPCODE:
1211{ 1538{
1212 int line, x; 1539 int line, x;
1213 1540
1214 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1541 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1542#if !PANGO_VERSION_CHECK (1, 17, 3)
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1543 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1216 1544 --line;
1545#endif
1217 EXTEND (SP, 2); 1546 EXTEND (SP, 2);
1218 PUSHs (sv_2mortal (newSViv (line - 1))); 1547 PUSHs (sv_2mortal (newSViv (line)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1548 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220} 1549}
1221 1550
1222void 1551void
1223line_x_to_index (CFPlus::Layout self, int line, int x) 1552line_x_to_index (DC::Layout self, int line, int x)
1224 PPCODE: 1553 PPCODE:
1225{ 1554{
1226 PangoLayoutLine *lp; 1555 PangoLayoutLine *lp;
1227 int index, trailing; 1556 int index, trailing;
1228 1557
1229 if (line < 0) 1558 if (line < 0)
1230 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1231 1560
1232 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1234 1563
1235 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1564 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1236 1565
1237 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
… …
1243 PUSHs (sv_2mortal (newSViv (trailing))); 1572 PUSHs (sv_2mortal (newSViv (trailing)));
1244 } 1573 }
1245} 1574}
1246 1575
1247void 1576void
1248render (CFPlus::Layout self, float x, float y, int flags = 0) 1577render (DC::Layout self, float x, float y, int flags = 0)
1249 PPCODE: 1578 CODE:
1579 rc_clear (self->rc);
1250 pango_opengl_render_layout_subpixel ( 1580 pango_opengl_render_layout_subpixel (
1251 self->pl, 1581 self->pl,
1582 self->rc,
1252 x * PANGO_SCALE, y * PANGO_SCALE, 1583 x * PANGO_SCALE, y * PANGO_SCALE,
1253 self->r, self->g, self->b, self->a, 1584 self->r, self->g, self->b, self->a,
1254 flags 1585 flags
1255 ); 1586 );
1587 // we assume that context_change actually clears/frees stuff
1588 // and does not do any recomputation...
1589 pango_layout_context_changed (self->pl);
1256 1590
1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1258
1259int minpot (int n)
1260
1261void 1591void
1262pad2pot (SV *data_, SV *w_, SV *h_) 1592draw (DC::Layout self)
1263 CODE: 1593 CODE:
1264{ 1594{
1265 int ow = SvIV (w_); 1595 glEnable (GL_TEXTURE_2D);
1266 int oh = SvIV (h_); 1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1597 glEnable (GL_BLEND);
1598 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1599 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1600 glEnable (GL_ALPHA_TEST);
1601 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1267 1602
1268 if (ow && oh) 1603 rc_draw (self->rc);
1604
1605 glDisable (GL_ALPHA_TEST);
1606 glDisable (GL_BLEND);
1607 glDisable (GL_TEXTURE_2D);
1608}
1609
1610MODULE = Deliantra::Client PACKAGE = DC::Texture
1611
1612PROTOTYPES: ENABLE
1613
1614void
1615pad (SV *data_, int ow, int oh, int nw, int nh)
1616 CODE:
1617{
1618 if ((nw != ow || nh != oh) && SvOK (data_))
1269 { 1619 {
1270 int nw = minpot (ow);
1271 int nh = minpot (oh);
1272
1273 if (nw != ow || nh != oh)
1274 {
1275 if (SvOK (data_))
1276 {
1277 STRLEN datalen; 1620 STRLEN datalen;
1278 char *data = SvPVbyte (data_, datalen); 1621 char *data = SvPVbyte (data_, datalen);
1279 int bpp = datalen / (ow * oh); 1622 int bpp = datalen / (ow * oh);
1280 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1623 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1281 1624
1282 SvPOK_only (result_); 1625 SvPOK_only (result_);
1283 SvCUR_set (result_, nw * nh * bpp); 1626 SvCUR_set (result_, nw * nh * bpp);
1284 1627
1285 memset (SvPVX (result_), 0, nw * nh * bpp); 1628 memset (SvPVX (result_), 0, nw * nh * bpp);
1286 while (oh--) 1629 while (oh--)
1287 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1630 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1288 1631
1289 sv_setsv (data_, result_); 1632 sv_setsv (data_, result_);
1290 }
1291
1292 sv_setiv (w_, nw);
1293 sv_setiv (h_, nh);
1294 }
1295 } 1633 }
1296} 1634}
1297 1635
1298void 1636void
1299draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1637draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1305{ 1643{
1306 HV *hv = (HV *)SvRV (self); 1644 HV *hv = (HV *)SvRV (self);
1307 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1645 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1308 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1646 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1309 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1647 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1648
1649 if (name <= 0)
1650 XSRETURN_EMPTY;
1310 1651
1311 if (items < 5) 1652 if (items < 5)
1312 { 1653 {
1313 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1654 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1314 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1655 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1342 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1344 } 1685 }
1345} 1686}
1346 1687
1688void
1689draw_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)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1807}
1808
1347IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1348 CODE: 1810 CODE:
1349{ 1811{
1350 GLint width; 1812 GLint width;
1351 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1813 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1353 RETVAL = width > 0; 1815 RETVAL = width > 0;
1354} 1816}
1355 OUTPUT: 1817 OUTPUT:
1356 RETVAL 1818 RETVAL
1357 1819
1358MODULE = CFPlus PACKAGE = CFPlus::Map 1820MODULE = Deliantra::Client PACKAGE = DC::Map
1359 1821
1360CFPlus::Map 1822PROTOTYPES: DISABLE
1823
1824DC::Map
1361new (SV *class) 1825new (SV *class)
1362 CODE: 1826 CODE:
1363 New (0, RETVAL, 1, struct map); 1827 New (0, RETVAL, 1, struct map);
1364 RETVAL->x = 0; 1828 RETVAL->x = 0;
1365 RETVAL->y = 0; 1829 RETVAL->y = 0;
… …
1373 RETVAL->row = 0; 1837 RETVAL->row = 0;
1374 OUTPUT: 1838 OUTPUT:
1375 RETVAL 1839 RETVAL
1376 1840
1377void 1841void
1378DESTROY (CFPlus::Map self) 1842DESTROY (DC::Map self)
1379 CODE: 1843 CODE:
1380{ 1844{
1381 map_clear (self); 1845 map_clear (self);
1382 Safefree (self->face2tile); 1846 Safefree (self->face2tile);
1383 Safefree (self->tex); 1847 Safefree (self->tex);
1384 Safefree (self); 1848 Safefree (self);
1385} 1849}
1386 1850
1387void 1851void
1388resize (CFPlus::Map self, int map_width, int map_height) 1852resize (DC::Map self, int map_width, int map_height)
1389 CODE: 1853 CODE:
1390 self->w = map_width; 1854 self->w = map_width;
1391 self->h = map_height; 1855 self->h = map_height;
1392 1856
1393void 1857void
1394clear (CFPlus::Map self) 1858clear (DC::Map self)
1395 CODE: 1859 CODE:
1396 map_clear (self); 1860 map_clear (self);
1397 1861
1398void 1862void
1399set_tileid (CFPlus::Map self, int face, int tile) 1863set_tileid (DC::Map self, int face, int tile)
1400 CODE: 1864 CODE:
1401{ 1865{
1402 need_facenum (self, face); self->face2tile [face] = tile; 1866 need_facenum (self, face); self->face2tile [face] = tile;
1403 need_texid (self, tile); 1867 need_texid (self, tile);
1404} 1868}
1405 1869
1406void 1870void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level) 1871set_smooth (DC::Map self, int face, int smooth, int level)
1408 CODE: 1872 CODE:
1409{ 1873{
1410 tileid texid; 1874 tileid texid;
1411 maptex *tex; 1875 maptex *tex;
1412 1876
… …
1425 tex->smoothtile = self->face2tile [smooth]; 1889 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level; 1890 tex->smoothlevel = level;
1427} 1891}
1428 1892
1429void 1893void
1430set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1894set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1431 CODE: 1895 CODE:
1432{ 1896{
1433 need_texid (self, texid); 1897 need_texid (self, texid);
1434 1898
1435 { 1899 {
… …
1454 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1455 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1456 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1457} 1921}
1458 1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1942
1459int 1943int
1460ox (CFPlus::Map self) 1944ox (DC::Map self)
1461 ALIAS: 1945 ALIAS:
1462 oy = 1 1946 oy = 1
1463 x = 2 1947 x = 2
1464 y = 3 1948 y = 3
1465 w = 4 1949 w = 4
… …
1476 } 1960 }
1477 OUTPUT: 1961 OUTPUT:
1478 RETVAL 1962 RETVAL
1479 1963
1480void 1964void
1481scroll (CFPlus::Map self, int dx, int dy) 1965scroll (DC::Map self, int dx, int dy)
1482 CODE: 1966 CODE:
1483{ 1967{
1484 if (dx > 0) 1968 if (dx > 0)
1485 map_blank (self, self->x, self->y, dx, self->h); 1969 map_blank (self, self->x, self->y, dx, self->h);
1486 else if (dx < 0) 1970 else if (dx < 0)
… …
1501 self->rows += MAP_EXTEND_Y; 1985 self->rows += MAP_EXTEND_Y;
1502 self->y += MAP_EXTEND_Y; 1986 self->y += MAP_EXTEND_Y;
1503 } 1987 }
1504} 1988}
1505 1989
1506void 1990SV *
1507map1a_update (CFPlus::Map self, SV *data_, int extmap) 1991map1a_update (DC::Map self, SV *data_, int extmap)
1508 CODE: 1992 CODE:
1509{ 1993{
1510 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1511 uint8_t *data_end = (uint8_t *)SvEND (data_); 1995 uint8_t *data_end = (uint8_t *)SvEND (data_);
1512 mapcell *cell; 1996 mapcell *cell;
1513 int x, y, flags; 1997 int x, y, z, flags;
1998 AV *missing = newAV ();
1999 RETVAL = newRV_noinc ((SV *)missing);
1514 2000
1515 while (data < data_end - 1) 2001 while (data < data_end - 1)
1516 { 2002 {
1517 flags = (data [0] << 8) + data [1]; data += 2; 2003 flags = (data [0] << 8) + data [1]; data += 2;
1518 2004
… …
1538 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1539 2025
1540 do 2026 do
1541 { 2027 {
1542 ext = *data++; 2028 ext = *data++;
1543 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1544 2030
1545 if (cmd < 4) 2031 if (cmd < 4)
1546 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1547 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1548 { 2034 {
1549 cell->stat_width = 1; 2035 cell->stat_width = 1;
1550 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1551 } 2037 }
1552 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1553 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1554 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1555 { 2041 {
1556 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1557 ; // decode player count 2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1558 2046
1559 data += *data + 1; 2047 data += *data + 1;
1560 } 2048 }
1561 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1562 cell->flags = *data++; 2050 cell->flags = *data++;
… …
1569 } 2057 }
1570 else 2058 else
1571 cell->darkness = *data++ + 1; 2059 cell->darkness = *data++ + 1;
1572 } 2060 }
1573 2061
2062 for (z = 0; z <= 2; ++z)
1574 if (flags & 4) 2063 if (flags & (4 >> z))
1575 { 2064 {
1576 faceid face = (data [0] << 8) + data [1]; data += 2; 2065 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face); 2066 need_facenum (self, face);
1578 cell->tile [0] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
2068
2069 if (cell->tile [z])
2070 {
2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
2073 if (!tex->name)
2074 av_push (missing, newSViv (cell->tile [z]));
2075
2076 if (tex->smoothtile)
2077 {
2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
2080 if (!smooth->name)
2081 av_push (missing, newSViv (tex->smoothtile));
2082 }
2083 }
1579 } 2084 }
1580
1581 if (flags & 2)
1582 {
1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1586 }
1587
1588 if (flags & 1)
1589 {
1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1593 }
1594 } 2085 }
1595 else 2086 else
1596 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1597 } 2088 }
1598} 2089}
2090 OUTPUT:
2091 RETVAL
1599 2092
1600SV * 2093SV *
1601mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2094mapmap (DC::Map self, int x0, int y0, int w, int h)
1602 CODE: 2095 CODE:
1603{ 2096{
1604 int x1, x; 2097 int x1, x;
1605 int y1, y; 2098 int y1, y;
1606 int z; 2099 int z;
… …
1651} 2144}
1652 OUTPUT: 2145 OUTPUT:
1653 RETVAL 2146 RETVAL
1654 2147
1655void 2148void
1656draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1657 CODE: 2150 CODE:
1658{ 2151{
2152 int x, y, z;
2153
1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1661 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1662 smooth_key skey; 2157 smooth_key skey;
1663 int x, y, z; 2158 int pl_x, pl_y;
1664 int last_name; 2159 maptex pl_tex;
2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
2162 rc_key_t key;
2163 rc_array_t *arr;
1665 2164
2165 pl_tex.name = 0;
2166
1666 // thats current max. sorry. 2167 // that's current max. sorry.
1667 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1669 2170
1670 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1671 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
1672 2173
1673 glColor4ub (255, 255, 255, 255); 2174 memset (&key, 0, sizeof (key));
1674 2175 key.r = 255;
1675 glEnable (GL_BLEND); 2176 key.g = 255;
1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2177 key.b = 255;
1677 glEnable (GL_TEXTURE_2D); 2178 key.a = 255;
1678 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2179 key.mode = GL_QUADS;
1679 2180 key.format = GL_T2F_V3F;
1680 glBegin (GL_QUADS);
1681
1682 last_name = 0;
1683 2181
1684 mx += self->x; 2182 mx += self->x;
1685 my += self->y; 2183 my += self->y;
1686 2184
1687 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
… …
1704 MAX (self->tex [cell->tile [1]].smoothlevel, 2202 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel)); 2203 self->tex [cell->tile [2]].smoothlevel));
1706 } 2204 }
1707 } 2205 }
1708 2206
2207 glEnable (GL_BLEND);
2208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210
1709 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1710 { 2212 {
1711 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1712 2215
1713 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1714 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1715 { 2218 {
1716 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
… …
1722 tileid tile = cell->tile [z]; 2225 tileid tile = cell->tile [z];
1723 2226
1724 if (tile) 2227 if (tile)
1725 { 2228 {
1726 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w; 2230 int px, py;
1728 int py = (y + 1) * T - tex.h;
1729 2231
1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name) 2232 if (key.texname != tex.name)
1733 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1734 if (!tex.name) 2236 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1736 2238
1737 glEnd (); 2239 key.texname = tex.name;
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2240 arr = rc_array (rc, &key);
1739 glBegin (GL_QUADS);
1740 } 2241 }
1741 2242
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2243 px = (x + 1) * T - tex.w;
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2244 py = (y + 1) * T - tex.h;
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746 2245
1747 if (cell->flags && z == 2) 2246 if (expect_false (cell->player == player) && expect_false (z == 2))
1748 { 2247 {
1749 if (cell->flags & 1) 2248 pl_x = px;
2249 pl_y = py;
2250 pl_tex = tex;
1750 { 2251 continue;
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 } 2252 }
2253
2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2256 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1765 2258
1766 // update smooth hash 2259 // update smooth hash
1767 if (tex.smoothtile) 2260 if (tex.smoothtile)
1768 { 2261 {
1769 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
… …
1800 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1801 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2294 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1803 } 2296 }
1804 } 2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2317 }
2318 }
1805 } 2319 }
1806 } 2320 }
2321
2322 rc_draw (rc);
2323 rc_clear (rc);
1807 2324
1808 // go through all smoothlevels, lowest to highest, then draw. 2325 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort 2326 // this is basically counting sort
1810 { 2327 {
1811 int w, b; 2328 int w, b;
1812 2329
2330 glEnable (GL_TEXTURE_2D);
2331 glBegin (GL_QUADS);
1813 for (w = 0; w < 256 / 32; ++w) 2332 for (w = 0; w < 256 / 32; ++w)
1814 { 2333 {
1815 uint32_t smask = smooth_level [w]; 2334 uint32_t smask = smooth_level [w];
1816 if (smask) 2335 if (smask)
1817 for (b = 0; b < 32; ++b) 2336 for (b = 0; b < 32; ++b)
… …
1836 int border = bits & 15; 2355 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2356 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row 2357 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column 2358 float dy = tex.t * .5f ; // 2 images/column
1840 2359
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name) 2360 if (tex.name)
1844 { 2361 {
2362 // this time avoiding texture state changes
2363 // save gobs of state changes.
1845 if (!tex.name) 2364 if (key.texname != tex.name)
1846 continue; // smoothing not yet available 2365 {
2366 self->tex [skey->tile].unused = 0;
1847 2367
1848 glEnd (); 2368 glEnd ();
1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1850 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
1851 } 2371 }
1852 2372
1853 if (border) 2373 if (border)
1854 { 2374 {
1855 float ox = border * dx; 2375 float ox = border * dx;
1856 2376
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1861 } 2381 }
1862 2382
1863 if (corner) 2383 if (corner)
1864 { 2384 {
1865 float ox = corner * dx; 2385 float ox = corner * dx;
1866 2386
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2387 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2391 }
1871 } 2392 }
1872 } 2393 }
1873 } 2394 }
1874 } 2395 }
1875 } 2396 }
2397
2398 glEnd ();
2399 glDisable (GL_TEXTURE_2D);
2400 key.texname = -1;
1876 } 2401 }
1877 2402
1878 hv_clear (smooth); 2403 hv_clear (smooth);
1879 } 2404 }
1880 2405
1881 glEnd (); 2406 if (pl_tex.name)
2407 {
2408 maptex tex = pl_tex;
2409 int px = pl_x + sdx;
2410 int py = pl_y + sdy;
1882 2411
1883 glDisable (GL_TEXTURE_2D); 2412 key.texname = tex.name;
2413 arr = rc_array (rc, &key);
2414
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2417 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2419
2420 rc_draw (rc);
2421 }
2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
1884 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2427 rc_free (rc);
2428 rc_free (rc_ov);
1885 2429
1886 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
1887 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
1888 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
1889 { 2433 {
… …
1894 { 2438 {
1895 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
1896 2440
1897 int px = x * T; 2441 int px = x * T;
1898 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
1899 2449
1900 if (cell->stat_hp) 2450 if (cell->stat_hp)
1901 { 2451 {
1902 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1914 } 2464 }
1915 } 2465 }
1916} 2466}
1917 2467
1918void 2468void
1919draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1920 CODE: 2470 CODE:
1921{ 2471{
1922 static float color[16][3] = { 2472 static float color[16][3] = {
1923 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
1924 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
1925 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
1926 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
1927 2477
1928 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
1929 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
1930 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
1931 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
1932 2482
1933 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
1934 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
1935 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
1936 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
1937 2487
1938 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
1939 2489
1940 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
1941 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
1942 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
1943 }; 2493 };
1944 2494
1945 int x, y; 2495 int x, y;
1946 2496
1947 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
1948 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1949 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
1950 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1951 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
1952 2508
1953 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
… …
1957 2513
1958 if (m) 2514 if (m)
1959 { 2515 {
1960 float *c = color [m & 15]; 2516 float *c = color [m & 15];
1961 2517
1962 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
1963 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
1964 2520
1965 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
1966 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1967 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1968 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1969 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1970 } 2526 }
… …
1974 glDisable (GL_BLEND); 2530 glDisable (GL_BLEND);
1975 glDisable (GL_TEXTURE_2D); 2531 glDisable (GL_TEXTURE_2D);
1976} 2532}
1977 2533
1978void 2534void
1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1980 PPCODE: 2536 PPCODE:
1981{ 2537{
1982 int x, y; 2538 int x, y;
1983 int sw4 = (sw + 3) & ~3; 2539 int sw1 = sw + 2;
2540 int sh1 = sh + 2;
2541 int sh3 = sh * 3;
2542 int sw3 = sw * 3;
2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1986 2546
1987 memset (darkness, 255, sw4 * sh);
1988 SvPOK_only (darkness_sv); 2547 SvPOK_only (darkness3_sv);
1989 SvCUR_set (darkness_sv, sw4 * sh); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
1990 2549
1991 mx += self->x; 2550 mx += self->x - 1;
1992 my += self->y; 2551 my += self->y - 1;
1993 2552
1994 for (y = 0; y < sh; y++) 2553 for (y = 0; y < sh1; y++)
1995 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
1996 { 2555 {
1997 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
1998 2557
1999 for (x = 0; x < sw; x++) 2558 for (x = 0; x < sw1; x++)
2000 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2001 { 2560 {
2002 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2003 2562
2004 darkness[y * sw4 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2005 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2006 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2007 } 2566 }
2008 } 2567 }
2009 2568
2569 for (y = 0; y < sh; ++y)
2570 for (x = 0; x < sw; ++x)
2571 {
2572 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2573 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2574 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2575 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2576 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2577 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2578 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2579 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2580 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2581
2582 uint8_t r11 = (d11 + d21 + d12) / 3;
2583 uint8_t r21 = d21;
2584 uint8_t r31 = (d21 + d31 + d32) / 3;
2585
2586 uint8_t r12 = d12;
2587 uint8_t r22 = d22;
2588 uint8_t r32 = d32;
2589
2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2591 uint8_t r23 = d23;
2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2593
2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2598 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2603 }
2604
2605 free (darkness1);
2606
2010 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2011 PUSHs (sv_2mortal (newSViv (sw4))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2012 PUSHs (sv_2mortal (newSViv (sh))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2013 PUSHs (darkness_sv); 2610 PUSHs (darkness3_sv);
2014} 2611}
2015 2612
2016SV * 2613SV *
2017get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2614get_rect (DC::Map self, int x0, int y0, int w, int h)
2018 CODE: 2615 CODE:
2019{ 2616{
2020 int x, y, x1, y1; 2617 int x, y, x1, y1;
2021 SV *data_sv = newSV (w * h * 7 + 5); 2618 SV *data_sv = newSV (w * h * 7 + 5);
2022 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2619 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2079 else 2676 else
2080 *data++ = 0; 2677 *data++ = 0;
2081 } 2678 }
2082 } 2679 }
2083 2680
2681 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 {
2084 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2085 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2086 RETVAL = data_sv; 2688 RETVAL = data_sv;
2087} 2689}
2088 OUTPUT: 2690 OUTPUT:
2089 RETVAL 2691 RETVAL
2090 2692
2091void 2693void
2092set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2093 PPCODE: 2695 PPCODE:
2094{ 2696{
2095 int x, y, z; 2697 int x, y, z;
2096 int w, h; 2698 int w, h;
2097 int x1, y1; 2699 int x1, y1;
2700 STRLEN len;
2701 uint8_t *data, *end;
2702
2703 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv);
2706 end = data + len + 8;
2707
2708 if (len < 5)
2709 XSRETURN_EMPTY;
2098 2710
2099 if (*data++ != 0) 2711 if (*data++ != 0)
2100 return; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2101 2713
2102 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
2103 h = *data++ << 8; h |= *data++; 2715 h = *data++ << 8; h |= *data++;
2104 2716
2105 // we need to do this 'cause we don't keep an absolute coord system for rows 2717 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2117 { 2729 {
2118 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2119 2731
2120 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2121 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2122 uint8_t flags = *data++; 2739 flags = *data++;
2123 2740
2124 if (flags) 2741 if (flags)
2125 { 2742 {
2126 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2127 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
… …
2130 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2131 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2132 2749
2133 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2134 { 2751 {
2135 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2136 2754
2137 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2138 { 2756 {
2139 tileid t = tile [z]; 2757 tileid t = tile [z];
2140 2758
2141 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2142 { 2760 {
2143 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2144 need_texid (self, t); 2762 need_texid (self, t);
2145 } 2763 }
2146 2764
2147 cell->tile [z] = t; 2765 cell->tile [z] = t;
2148 } 2766 }
… …
2150 } 2768 }
2151 } 2769 }
2152 } 2770 }
2153} 2771}
2154 2772
2155MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2773MODULE = Deliantra::Client PACKAGE = DC::RW
2156 2774
2157CFPlus::MixChunk 2775DC::RW
2158new_from_file (SV *class, char *path) 2776new (SV *class, SV *data_sv)
2159 CODE: 2777 CODE:
2160 RETVAL = Mix_LoadWAV (path); 2778{
2779 STRLEN datalen;
2780 char *data = SvPVbyte (data_sv, datalen);
2781
2782 RETVAL = SDL_RWFromConstMem (data, datalen);
2783}
2161 OUTPUT: 2784 OUTPUT:
2162 RETVAL 2785 RETVAL
2163 2786
2787DC::RW
2788new_from_file (SV *class, const char *path, const char *mode = "rb")
2789 CODE:
2790 RETVAL = SDL_RWFromFile (path, mode);
2791 OUTPUT:
2792 RETVAL
2793
2794# fails on win32:
2795# dc.xs(2268) : error C2059: syntax error : '('
2164void 2796#void
2797#close (DC::RW self)
2798# CODE:
2799# (self->(close)) (self);
2800
2801MODULE = Deliantra::Client PACKAGE = DC::Channel
2802
2803PROTOTYPES: DISABLE
2804
2805DC::Channel
2806find ()
2807 CODE:
2808{
2809 RETVAL = Mix_GroupAvailable (-1);
2810
2811 if (RETVAL < 0)
2812 {
2813 RETVAL = Mix_GroupOldest (-1);
2814
2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2821 XSRETURN_UNDEF;
2822 }
2823 else
2824 Mix_HaltChannel (RETVAL);
2825 }
2826
2827 Mix_UnregisterAllEffects (RETVAL);
2828 Mix_Volume (RETVAL, 128);
2829}
2830 OUTPUT:
2831 RETVAL
2832
2833void
2834halt (DC::Channel self)
2835 CODE:
2836 Mix_HaltChannel (self);
2837
2838void
2839expire (DC::Channel self, int ticks = -1)
2840 CODE:
2841 Mix_ExpireChannel (self, ticks);
2842
2843void
2844fade_out (DC::Channel self, int ticks = -1)
2845 CODE:
2846 Mix_FadeOutChannel (self, ticks);
2847
2848int
2849volume (DC::Channel self, int volume)
2850 CODE:
2851 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2852 OUTPUT:
2853 RETVAL
2854
2855void
2856unregister_all_effects (DC::Channel self)
2857 CODE:
2858 Mix_UnregisterAllEffects (self);
2859
2860void
2861set_panning (DC::Channel self, int left, int right)
2862 CODE:
2863 left = CLAMP (left , 0, 255);
2864 right = CLAMP (right, 0, 255);
2865 Mix_SetPanning (self, left, right);
2866
2867void
2868set_distance (DC::Channel self, int distance)
2869 CODE:
2870 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2871
2872void
2873set_position (DC::Channel self, int angle, int distance)
2874 CODE:
2875
2876void
2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2878 CODE:
2879{
2880 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2883}
2884
2885void
2886set_reverse_stereo (DC::Channel self, int flip)
2887 CODE:
2888 Mix_SetReverseStereo (self, flip);
2889
2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2891
2892PROTOTYPES: DISABLE
2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2905
2906DC::MixChunk
2907new (SV *class, DC::RW rwops)
2908 CODE:
2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2910 OUTPUT:
2911 RETVAL
2912
2913void
2165DESTROY (CFPlus::MixChunk self) 2914DESTROY (DC::MixChunk self)
2166 CODE: 2915 CODE:
2167 Mix_FreeChunk (self); 2916 Mix_FreeChunk (self);
2168 2917
2169int 2918int
2170volume (CFPlus::MixChunk self, int volume = -1) 2919volume (DC::MixChunk self, int volume = -1)
2171 CODE: 2920 CODE:
2921 if (items > 1)
2922 volume = CLAMP (volume, 0, 128);
2172 RETVAL = Mix_VolumeChunk (self, volume); 2923 RETVAL = Mix_VolumeChunk (self, volume);
2173 OUTPUT: 2924 OUTPUT:
2174 RETVAL 2925 RETVAL
2175 2926
2176int 2927DC::Channel
2177play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2928play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2178 CODE: 2929 CODE:
2930{
2179 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2931 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2932
2933 if (RETVAL < 0)
2934 XSRETURN_UNDEF;
2935
2936 if (channel < 0)
2937 {
2938 Mix_UnregisterAllEffects (RETVAL);
2939 Mix_Volume (RETVAL, 128);
2940 }
2941}
2180 OUTPUT: 2942 OUTPUT:
2181 RETVAL 2943 RETVAL
2182 2944
2183MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2184 2958
2185int 2959int
2186volume (int volume = -1) 2960volume (int volume = -1)
2961 PROTOTYPE: ;$
2187 CODE: 2962 CODE:
2963 if (items > 0)
2964 volume = CLAMP (volume, 0, 128);
2188 RETVAL = Mix_VolumeMusic (volume); 2965 RETVAL = Mix_VolumeMusic (volume);
2189 OUTPUT: 2966 OUTPUT:
2190 RETVAL 2967 RETVAL
2191 2968
2969void
2970fade_out (int ms)
2971 CODE:
2972 Mix_FadeOutMusic (ms);
2973
2974void
2975halt ()
2976 CODE:
2977 Mix_HaltMusic ();
2978
2192int 2979int
2193fade_out (int ms) 2980playing ()
2194 CODE: 2981 CODE:
2195 RETVAL = Mix_FadeOutMusic (ms); 2982 RETVAL = Mix_PlayingMusic ();
2196 OUTPUT: 2983 OUTPUT:
2197 RETVAL 2984 RETVAL
2198 2985
2199CFPlus::MixMusic 2986DC::MixMusic
2200new_from_file (SV *class, char *path) 2987new (SV *class, DC::RW rwops)
2201 CODE: 2988 CODE:
2202 RETVAL = Mix_LoadMUS (path); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2203 OUTPUT: 2990 OUTPUT:
2204 RETVAL 2991 RETVAL
2205 2992
2206void 2993void
2207DESTROY (CFPlus::MixMusic self) 2994DESTROY (DC::MixMusic self)
2208 CODE: 2995 CODE:
2209 Mix_FreeMusic (self); 2996 Mix_FreeMusic (self);
2210 2997
2211int 2998int
2212play (CFPlus::MixMusic self, int loops = -1) 2999play (DC::MixMusic self, int loops = -1)
2213 CODE: 3000 CODE:
2214 RETVAL = Mix_PlayMusic (self, loops); 3001 RETVAL = Mix_PlayMusic (self, loops);
2215 OUTPUT: 3002 OUTPUT:
2216 RETVAL 3003 RETVAL
2217 3004
2218int 3005void
2219fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3006fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2220 CODE: 3007 CODE:
2221 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3008 Mix_FadeInMusicPos (self, loops, ms, position);
2222 OUTPUT:
2223 RETVAL
2224 3009
2225MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3010MODULE = Deliantra::Client PACKAGE = DC::OpenGL
3011
3012PROTOTYPES: ENABLE
2226 3013
2227BOOT: 3014BOOT:
2228{ 3015{
2229 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3016 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2230 static const struct { 3017 static const struct {
2231 const char *name; 3018 const char *name;
2232 IV iv; 3019 IV iv;
2233 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2234# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2235 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2236 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2237 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2238 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2239 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2240 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2241 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2242 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
… …
2246 const_iv (GL_ALPHA_TEST), 3034 const_iv (GL_ALPHA_TEST),
2247 const_iv (GL_NORMALIZE), 3035 const_iv (GL_NORMALIZE),
2248 const_iv (GL_RESCALE_NORMAL), 3036 const_iv (GL_RESCALE_NORMAL),
2249 const_iv (GL_FRONT), 3037 const_iv (GL_FRONT),
2250 const_iv (GL_BACK), 3038 const_iv (GL_BACK),
3039 const_iv (GL_AUX0),
2251 const_iv (GL_AND), 3040 const_iv (GL_AND),
2252 const_iv (GL_ONE), 3041 const_iv (GL_ONE),
2253 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2254 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2255 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2256 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2257 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2258 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2259 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2260 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2261 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2262 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
… …
2268 const_iv (GL_INTENSITY), 3061 const_iv (GL_INTENSITY),
2269 const_iv (GL_LUMINANCE), 3062 const_iv (GL_LUMINANCE),
2270 const_iv (GL_LUMINANCE_ALPHA), 3063 const_iv (GL_LUMINANCE_ALPHA),
2271 const_iv (GL_FLOAT), 3064 const_iv (GL_FLOAT),
2272 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3065 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3066 const_iv (GL_COMPRESSED_ALPHA_ARB),
3067 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3068 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3069 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3070 const_iv (GL_COMPRESSED_RGB_ARB),
3071 const_iv (GL_COMPRESSED_RGBA_ARB),
2273 const_iv (GL_COMPILE), 3072 const_iv (GL_COMPILE),
2274 const_iv (GL_PROXY_TEXTURE_1D), 3073 const_iv (GL_PROXY_TEXTURE_1D),
2275 const_iv (GL_PROXY_TEXTURE_2D), 3074 const_iv (GL_PROXY_TEXTURE_2D),
2276 const_iv (GL_TEXTURE_1D), 3075 const_iv (GL_TEXTURE_1D),
2277 const_iv (GL_TEXTURE_2D), 3076 const_iv (GL_TEXTURE_2D),
… …
2301 const_iv (GL_COLOR_LOGIC_OP), 3100 const_iv (GL_COLOR_LOGIC_OP),
2302 const_iv (GL_SEPARABLE_2D), 3101 const_iv (GL_SEPARABLE_2D),
2303 const_iv (GL_CONVOLUTION_2D), 3102 const_iv (GL_CONVOLUTION_2D),
2304 const_iv (GL_CONVOLUTION_BORDER_MODE), 3103 const_iv (GL_CONVOLUTION_BORDER_MODE),
2305 const_iv (GL_CONSTANT_BORDER), 3104 const_iv (GL_CONSTANT_BORDER),
3105 const_iv (GL_POINTS),
2306 const_iv (GL_LINES), 3106 const_iv (GL_LINES),
2307 const_iv (GL_LINE_STRIP), 3107 const_iv (GL_LINE_STRIP),
2308 const_iv (GL_LINE_LOOP), 3108 const_iv (GL_LINE_LOOP),
2309 const_iv (GL_QUADS), 3109 const_iv (GL_QUADS),
2310 const_iv (GL_QUAD_STRIP), 3110 const_iv (GL_QUAD_STRIP),
2311 const_iv (GL_TRIANGLES), 3111 const_iv (GL_TRIANGLES),
2312 const_iv (GL_TRIANGLE_STRIP), 3112 const_iv (GL_TRIANGLE_STRIP),
2313 const_iv (GL_TRIANGLE_FAN), 3113 const_iv (GL_TRIANGLE_FAN),
3114 const_iv (GL_POLYGON),
2314 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3115 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3116 const_iv (GL_POINT_SMOOTH_HINT),
3117 const_iv (GL_LINE_SMOOTH_HINT),
3118 const_iv (GL_POLYGON_SMOOTH_HINT),
3119 const_iv (GL_GENERATE_MIPMAP_HINT),
3120 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2315 const_iv (GL_FASTEST), 3121 const_iv (GL_FASTEST),
3122 const_iv (GL_DONT_CARE),
3123 const_iv (GL_NICEST),
2316 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2317 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2318 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2319 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2320# undef const_iv 3131# undef const_iv
2321 }; 3132 };
2322 3133
2323 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2324 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2325 3136
2326 texture_av = newAV (); 3137 texture_av = newAV ();
2327 AvREAL_off (texture_av); 3138 AvREAL_off (texture_av);
2328} 3139}
2329 3140
3141void
3142disable_GL_EXT_blend_func_separate ()
3143 CODE:
3144 gl.BlendFuncSeparate = 0;
3145 gl.BlendFuncSeparateEXT = 0;
3146
3147void
3148apple_nvidia_bug (int enable)
3149
2330char * 3150char *
2331gl_vendor () 3151gl_vendor ()
2332 CODE: 3152 CODE:
2333 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2334 OUTPUT: 3154 OUTPUT:
… …
2346 CODE: 3166 CODE:
2347 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3167 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2348 OUTPUT: 3168 OUTPUT:
2349 RETVAL 3169 RETVAL
2350 3170
2351char *glGetString (GLenum pname) 3171const char *glGetString (GLenum pname)
2352 3172
2353GLint glGetInteger (GLenum pname) 3173GLint glGetInteger (GLenum pname)
2354 CODE: 3174 CODE:
2355 glGetIntegerv (pname, &RETVAL); 3175 glGetIntegerv (pname, &RETVAL);
2356 OUTPUT: 3176 OUTPUT:
… …
2364 3184
2365int glGetError () 3185int glGetError ()
2366 3186
2367void glFinish () 3187void glFinish ()
2368 3188
3189void glFlush ()
3190
2369void glClear (int mask) 3191void glClear (int mask)
2370 3192
2371void glClearColor (float r, float g, float b, float a = 1.0) 3193void glClearColor (float r, float g, float b, float a = 1.0)
2372 PROTOTYPE: @ 3194 PROTOTYPE: @
2373 3195
… …
2383 3205
2384void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3206void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2385 CODE: 3207 CODE:
2386 gl_BlendFuncSeparate (sa, da, saa, daa); 3208 gl_BlendFuncSeparate (sa, da, saa, daa);
2387 3209
3210# void glBlendEquation (int se)
3211
2388void glDepthMask (int flag) 3212void glDepthMask (int flag)
2389 3213
2390void glLogicOp (int opcode) 3214void glLogicOp (int opcode)
2391 3215
2392void glColorMask (int red, int green, int blue, int alpha) 3216void glColorMask (int red, int green, int blue, int alpha)
… …
2406# near_ and far_ are due to microsofts buggy "c" compiler 3230# near_ and far_ are due to microsofts buggy "c" compiler
2407void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3231void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2408 3232
2409# near_ and far_ are due to microsofts buggy "c" compiler 3233# near_ and far_ are due to microsofts buggy "c" compiler
2410void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3234void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3235
3236PROTOTYPES: DISABLE
2411 3237
2412void glViewport (int x, int y, int width, int height) 3238void glViewport (int x, int y, int width, int height)
2413 3239
2414void glScissor (int x, int y, int width, int height) 3240void glScissor (int x, int y, int width, int height)
2415 3241
… …
2423 3249
2424void glRotate (float angle, float x, float y, float z) 3250void glRotate (float angle, float x, float y, float z)
2425 CODE: 3251 CODE:
2426 glRotatef (angle, x, y, z); 3252 glRotatef (angle, x, y, z);
2427 3253
2428void glBegin (int mode)
2429
2430void glEnd ()
2431
2432void glColor (float r, float g, float b, float a = 1.0) 3254void glColor (float r, float g, float b, float a = 1.0)
2433 PROTOTYPE: @ 3255 PROTOTYPE: @
2434 ALIAS: 3256 ALIAS:
2435 glColor_premultiply = 1 3257 glColor_premultiply = 1
2436 CODE: 3258 CODE:
2437 if (ix) 3259 if (ix)
2438 { 3260 {
… …
2441 b *= a; 3263 b *= a;
2442 } 3264 }
2443 // microsoft visual "c" rounds instead of truncating... 3265 // microsoft visual "c" rounds instead of truncating...
2444 glColor4f (r, g, b, a); 3266 glColor4f (r, g, b, a);
2445 3267
2446void glInterleavedArrays (int format, int stride, char *data)
2447
2448void glDrawElements (int mode, int count, int type, char *indices)
2449
2450# 1.2 void glDrawRangeElements (int mode, int start, int end
2451
2452void glRasterPos (float x, float y, float z = 0.) 3268void glRasterPos (float x, float y, float z = 0.)
2453 CODE: 3269 CODE:
2454 glRasterPos3f (0, 0, z); 3270 glRasterPos3f (0, 0, z);
2455 glBitmap (0, 0, 0, 0, x, y, 0); 3271 glBitmap (0, 0, 0, 0, x, y, 0);
2456 3272
… …
2460 3276
2461void glTexCoord (float s, float t) 3277void glTexCoord (float s, float t)
2462 CODE: 3278 CODE:
2463 glTexCoord2f (s, t); 3279 glTexCoord2f (s, t);
2464 3280
3281void glRect (float x1, float y1, float x2, float y2)
3282 CODE:
3283 glRectf (x1, y1, x2, y2);
3284
3285void glRect_lineloop (float x1, float y1, float x2, float y2)
3286 CODE:
3287 glBegin (GL_LINE_LOOP);
3288 glVertex2f (x1, y1);
3289 glVertex2f (x2, y1);
3290 glVertex2f (x2, y2);
3291 glVertex2f (x1, y2);
3292 glEnd ();
3293
3294PROTOTYPES: ENABLE
3295
3296void glBegin (int mode)
3297
3298void glEnd ()
3299
3300void glPointSize (GLfloat size)
3301
3302void glLineWidth (GLfloat width)
3303
3304void glInterleavedArrays (int format, int stride, char *data)
3305
3306void glDrawElements (int mode, int count, int type, char *indices)
3307
3308# 1.2 void glDrawRangeElements (int mode, int start, int end
3309
2465void glTexEnv (int target, int pname, float param) 3310void glTexEnv (int target, int pname, float param)
2466 CODE: 3311 CODE:
2467 glTexEnvf (target, pname, param); 3312 glTexEnvf (target, pname, param);
2468 3313
2469void glTexParameter (int target, int pname, float param) 3314void glTexParameter (int target, int pname, float param)
… …
2485void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3330void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2486 CODE: 3331 CODE:
2487 if (gl.SeparableFilter2D) 3332 if (gl.SeparableFilter2D)
2488 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3333 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2489 3334
2490void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3335void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2491 3336
2492void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3337void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2493 3338
2494void glDrawPixels (int width, int height, int format, int type, char *pixels) 3339void glDrawPixels (int width, int height, int format, int type, char *pixels)
2495 3340
… …
2521 3366
2522void glEndList () 3367void glEndList ()
2523 3368
2524void glCallList (int list) 3369void glCallList (int list)
2525 3370
3371void c_init ()
3372 CODE:
3373 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3374 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3375
3376MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3377
3378PROTOTYPES: DISABLE
3379
3380void
3381find_widget (SV *self, NV x, NV y)
3382 PPCODE:
3383{
3384 if (within_widget (self, x, y))
3385 XPUSHs (self);
3386}
3387
3388BOOT:
3389{
3390 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3391
3392 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3393 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3394 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3395 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3396}
3397
3398void
3399draw (SV *self)
3400 CODE:
3401{
3402 HV *hv;
3403 SV **svp;
3404 NV x, y, w, h;
3405 SV *draw_x_sv = GvSV (draw_x_gv);
3406 SV *draw_y_sv = GvSV (draw_y_gv);
3407 SV *draw_w_sv = GvSV (draw_w_gv);
3408 SV *draw_h_sv = GvSV (draw_h_gv);
3409 double draw_x, draw_y;
3410
3411 if (!SvROK (self))
3412 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3413
3414 hv = (HV *)SvRV (self);
3415
3416 if (SvTYPE (hv) != SVt_PVHV)
3417 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3418
3419 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3420 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3421
3422 if (!h || !w)
3423 XSRETURN_EMPTY;
3424
3425 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3426 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3427
3428 draw_x = SvNV (draw_x_sv) + x;
3429 draw_y = SvNV (draw_y_sv) + y;
3430
3431 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3432 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3433 XSRETURN_EMPTY;
3434
3435 sv_setnv (draw_x_sv, draw_x);
3436 sv_setnv (draw_y_sv, draw_y);
3437
3438 glPushMatrix ();
3439 glTranslated (x, y, 0);
3440
3441 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3442 {
3443 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3444
3445 if (svp && SvTRUE (*svp))
3446 {
3447 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3448 glEnable (GL_BLEND);
3449 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3450 glBegin (GL_QUADS);
3451 glVertex2f (0, 0);
3452 glVertex2f (w, 0);
3453 glVertex2f (w, h);
3454 glVertex2f (0, h);
3455 glEnd ();
3456 glDisable (GL_BLEND);
3457 }
3458 }
3459#if 0
3460 // draw borders, for debugging
3461 glPushMatrix ();
3462 glColor4f (1., 1., 0., 1.);
3463 glTranslatef (.5, .5, 0.);
3464 glBegin (GL_LINE_LOOP);
3465 glVertex2f (0 , 0);
3466 glVertex2f (w - 1, 0);
3467 glVertex2f (w - 1, h - 1);
3468 glVertex2f (0 , h - 1);
3469 glEnd ();
3470 glPopMatrix ();
3471#endif
3472 PUSHMARK (SP);
3473 XPUSHs (self);
3474 PUTBACK;
3475 call_method ("_draw", G_VOID | G_DISCARD);
3476 SPAGAIN;
3477
3478 glPopMatrix ();
3479
3480 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3481 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3482}
3483

Diff Legend

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