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

Diff Legend

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