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

Diff Legend

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