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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines