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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
27#include <stdio.h> 31#include <stdio.h>
28#include <stdlib.h> 32#include <stdlib.h>
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
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
713 } 938 }
714} 939}
715 OUTPUT: 940 OUTPUT:
716 RETVAL 941 RETVAL
717 942
721char * 946char *
722SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
723 948
724int 949int
725SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
726 954
727void 955void
728poll_events () 956poll_events ()
729 PPCODE: 957 PPCODE:
730{ 958{
740 { 968 {
741 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
742 case SDL_KEYUP: 970 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 976 break;
749 977
750 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 997 x = ev.motion.x;
770 y = ev.motion.y; 998 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 1000 }
773 1001
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 1008 }
781 break; 1009 break;
782 1010
783 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1014
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1025 break;
798 } 1026 }
799 1027
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1029 }
802} 1030}
803 1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
1044
804int 1045int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1047 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1049 Mix_ChannelFinished (channel_finished);
809 1050
810void 1051void
1052Mix_QuerySpec ()
1053 PPCODE:
1054{
1055 int freq, channels;
1056 Uint16 format;
1057
1058 if (Mix_QuerySpec (&freq, &format, &channels))
1059 {
1060 EXTEND (SP, 3);
1061 PUSHs (sv_2mortal (newSViv (freq)));
1062 PUSHs (sv_2mortal (newSViv (format)));
1063 PUSHs (sv_2mortal (newSViv (channels)));
1064 }
1065}
1066
1067void
811Mix_CloseAudio () 1068Mix_CloseAudio ()
812 1069
813int 1070int
814Mix_AllocateChannels (int numchans = -1) 1071Mix_AllocateChannels (int numchans = -1)
1072
1073const char *
1074Mix_GetError ()
815 1075
816void 1076void
817lowdelay (int fd, int val = 1) 1077lowdelay (int fd, int val = 1)
818 CODE: 1078 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1079 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1105 }
846 } 1106 }
847#endif 1107#endif
848} 1108}
849 1109
850void 1110int
851add_font (char *file) 1111add_font (char *file)
852 CODE: 1112 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
854 1116
855void 1117void
856load_image_inline (SV *image_) 1118load_image_inline (SV *image_)
857 ALIAS: 1119 ALIAS:
858 load_image_file = 1 1120 load_image_file = 1
861 STRLEN image_len; 1123 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1124 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1125 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1126 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1127 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1128 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1129 : SDL_RWFromConstMem (image, image_len);
868 1130
869 if (!rw) 1131 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1132 croak ("load_image: %s", SDL_GetError ());
871 1133
944void 1206void
945error (char *message) 1207error (char *message)
946 CODE: 1208 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1209 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1210#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1211 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1212#endif
951 1213
952void 1214void
953fatal (char *message) 1215fatal (char *message)
954 CODE: 1216 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1217 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1218#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1219 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1220#endif
959 _exit (1); 1221 _exit (1);
960 1222
961void 1223void
962_exit (int retval = 0) 1224_exit (int retval = 0)
974#if DEBUG 1236#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
976#endif 1238#endif
977} 1239}
978 1240
979MODULE = CFPlus PACKAGE = CFPlus::Font 1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
1247
1248MODULE = Deliantra::Client PACKAGE = DC::Font
980 1249
981PROTOTYPES: DISABLE 1250PROTOTYPES: DISABLE
982 1251
983CFPlus::Font 1252DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1253new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1254 CODE:
986{ 1255{
987 int count; 1256 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1260}
992 OUTPUT: 1261 OUTPUT:
993 RETVAL 1262 RETVAL
994 1263
995void 1264void
996DESTROY (CFPlus::Font self) 1265DESTROY (DC::Font self)
997 CODE: 1266 CODE:
998 pango_font_description_free (self); 1267 pango_font_description_free (self);
999 1268
1000void 1269void
1001make_default (CFPlus::Font self) 1270make_default (DC::Font self)
1002 PROTOTYPE: $ 1271 PROTOTYPE: $
1003 CODE: 1272 CODE:
1004 default_font = self; 1273 default_font = self;
1005 1274
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1275MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1276
1008PROTOTYPES: DISABLE 1277PROTOTYPES: DISABLE
1009 1278
1010void 1279void
1011reset_glyph_cache () 1280glyph_cache_backup ()
1012 PROTOTYPE: 1281 PROTOTYPE:
1013 CODE: 1282 CODE:
1283 tc_backup ();
1284
1285void
1286glyph_cache_restore ()
1287 PROTOTYPE:
1288 CODE:
1014 tc_clear (); 1289 tc_restore ();
1015 1290
1016CFPlus::Layout 1291DC::Layout
1017new (SV *class) 1292new (SV *class)
1018 CODE: 1293 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1294 New (0, RETVAL, 1, struct cf_layout);
1020 1295
1021 RETVAL->pl = pango_layout_new (opengl_context); 1296 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1298 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1299 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1300 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1301 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1302 RETVAL->font = 0;
1303 RETVAL->rc = rc_alloc ();
1028 1304
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1305 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1306 layout_update_font (RETVAL);
1031 OUTPUT: 1307 OUTPUT:
1032 RETVAL 1308 RETVAL
1033 1309
1034void 1310void
1035DESTROY (CFPlus::Layout self) 1311DESTROY (DC::Layout self)
1036 CODE: 1312 CODE:
1037 g_object_unref (self->pl); 1313 g_object_unref (self->pl);
1314 rc_free (self->rc);
1038 Safefree (self); 1315 Safefree (self);
1039 1316
1040void 1317void
1041set_text (CFPlus::Layout self, SV *text_) 1318set_text (DC::Layout self, SV *text_)
1042 CODE: 1319 CODE:
1043{ 1320{
1044 STRLEN textlen; 1321 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1322 char *text = SvPVutf8 (text_, textlen);
1046 1323
1047 pango_layout_set_text (self->pl, text, textlen); 1324 pango_layout_set_text (self->pl, text, textlen);
1048} 1325}
1049 1326
1050void 1327void
1051set_markup (CFPlus::Layout self, SV *text_) 1328set_markup (DC::Layout self, SV *text_)
1052 CODE: 1329 CODE:
1053{ 1330{
1054 STRLEN textlen; 1331 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1332 char *text = SvPVutf8 (text_, textlen);
1056 1333
1057 pango_layout_set_markup (self->pl, text, textlen); 1334 pango_layout_set_markup (self->pl, text, textlen);
1058} 1335}
1059 1336
1060void 1337void
1061set_shapes (CFPlus::Layout self, ...) 1338set_shapes (DC::Layout self, ...)
1062 CODE: 1339 CODE:
1063{ 1340{
1064 PangoAttrList *attrs = 0; 1341 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1342 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1343 const char *pos = text;
1101 if (attrs) 1378 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1379 pango_layout_set_attributes (self->pl, attrs);
1103} 1380}
1104 1381
1105void 1382void
1106get_shapes (CFPlus::Layout self) 1383get_shapes (DC::Layout self)
1107 PPCODE: 1384 PPCODE:
1108{ 1385{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1387
1111 do 1388 do
1112 { 1389 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1391
1115 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1116 { 1393 {
1117 PangoRectangle extents; 1394 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1403
1127 pango_layout_iter_free (iter); 1404 pango_layout_iter_free (iter);
1128} 1405}
1129 1406
1130int 1407int
1131has_wrapped (CFPlus::Layout self) 1408has_wrapped (DC::Layout self)
1132 CODE: 1409 CODE:
1133{ 1410{
1134 int lines = 1; 1411 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1136 1413
1141} 1418}
1142 OUTPUT: 1419 OUTPUT:
1143 RETVAL 1420 RETVAL
1144 1421
1145SV * 1422SV *
1146get_text (CFPlus::Layout self) 1423get_text (DC::Layout self)
1147 CODE: 1424 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1425 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1426 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1427 OUTPUT:
1151 RETVAL 1428 RETVAL
1152 1429
1153void 1430void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1431set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1432 CODE:
1156 self->r = r; 1433 self->r = r;
1157 self->g = g; 1434 self->g = g;
1158 self->b = b; 1435 self->b = b;
1159 self->a = a; 1436 self->a = a;
1160 1437
1161void 1438void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1439set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1440 CODE:
1164 if (self->font != font) 1441 if (self->font != font)
1165 { 1442 {
1166 self->font = font; 1443 self->font = font;
1167 layout_update_font (self); 1444 layout_update_font (self);
1168 } 1445 }
1169 1446
1170void 1447void
1171set_height (CFPlus::Layout self, int base_height) 1448set_height (DC::Layout self, int base_height)
1172 CODE: 1449 CODE:
1173 if (self->base_height != base_height) 1450 if (self->base_height != base_height)
1174 { 1451 {
1175 self->base_height = base_height; 1452 self->base_height = base_height;
1176 layout_update_font (self); 1453 layout_update_font (self);
1177 } 1454 }
1178 1455
1179void 1456void
1180set_width (CFPlus::Layout self, int max_width = -1) 1457set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1458 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1459 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1460
1184void 1461void
1185set_indent (CFPlus::Layout self, int indent) 1462set_indent (DC::Layout self, int indent)
1186 CODE: 1463 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1464 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1465
1189void 1466void
1190set_spacing (CFPlus::Layout self, int spacing) 1467set_spacing (DC::Layout self, int spacing)
1191 CODE: 1468 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1469 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1470
1194void 1471void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1472set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1473 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1474 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1475 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1476 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1477 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1478 : PANGO_ELLIPSIZE_NONE
1202 ); 1479 );
1203 1480
1204void 1481void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1482set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1483 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1484 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1485
1209void 1486void
1210size (CFPlus::Layout self) 1487size (DC::Layout self)
1211 PPCODE: 1488 PPCODE:
1212{ 1489{
1213 int w, h; 1490 int w, h;
1214 1491
1215 layout_get_pixel_size (self, &w, &h); 1492 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1495 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1496 PUSHs (sv_2mortal (newSViv (h)));
1220} 1497}
1221 1498
1222int 1499int
1223descent (CFPlus::Layout self) 1500descent (DC::Layout self)
1224 CODE: 1501 CODE:
1225{ 1502{
1226 PangoRectangle rect; 1503 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1230} 1507}
1231 OUTPUT: 1508 OUTPUT:
1232 RETVAL 1509 RETVAL
1233 1510
1234int 1511int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1512xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1513 CODE:
1237{ 1514{
1238 int index, trailing; 1515 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1516 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1517 RETVAL = index + trailing;
1241} 1518}
1242 OUTPUT: 1519 OUTPUT:
1243 RETVAL 1520 RETVAL
1244 1521
1245void 1522void
1246cursor_pos (CFPlus::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1524 PPCODE:
1248{ 1525{
1249 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1528
1252 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1533}
1257 1534
1258void 1535void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1537 PPCODE:
1261{ 1538{
1262 int line, x; 1539 int line, x;
1263 1540
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1541 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1542#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1543 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1544 --line;
1545#endif
1267 EXTEND (SP, 2); 1546 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1547 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1548 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1549}
1271 1550
1272void 1551void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1552line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1553 PPCODE:
1275{ 1554{
1276 PangoLayoutLine *lp; 1555 PangoLayoutLine *lp;
1277 int index, trailing; 1556 int index, trailing;
1278 1557
1279 if (line < 0) 1558 if (line < 0)
1280 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1281 1560
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1284 1563
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1564 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1565
1287 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1572 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1573 }
1295} 1574}
1296 1575
1297void 1576void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1577render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1578 CODE:
1579 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1580 pango_opengl_render_layout_subpixel (
1301 self->pl, 1581 self->pl,
1582 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1583 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1584 self->r, self->g, self->b, self->a,
1304 flags 1585 flags
1305 ); 1586 );
1587 // we assume that context_change actually clears/frees stuff
1588 // and does not do any recomputation...
1589 pango_layout_context_changed (self->pl);
1306 1590
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1591void
1592draw (DC::Layout self)
1593 CODE:
1594{
1595 glEnable (GL_TEXTURE_2D);
1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1597 glEnable (GL_BLEND);
1598 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1599 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1600 glEnable (GL_ALPHA_TEST);
1601 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1602
1603 rc_draw (self->rc);
1604
1605 glDisable (GL_ALPHA_TEST);
1606 glDisable (GL_BLEND);
1607 glDisable (GL_TEXTURE_2D);
1608}
1609
1610MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1611
1309PROTOTYPES: ENABLE 1612PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1613
1313void 1614void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1615pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1616 CODE:
1316{ 1617{
1343 HV *hv = (HV *)SvRV (self); 1644 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1645 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1646 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1647 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1648
1649 if (name <= 0)
1650 XSRETURN_EMPTY;
1651
1348 if (items < 5) 1652 if (items < 5)
1349 { 1653 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1654 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1655 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1656 }
1379 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1381 } 1685 }
1382} 1686}
1383 1687
1688void
1689draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1807}
1808
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE: 1810 CODE:
1386{ 1811{
1387 GLint width; 1812 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1813 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1390 RETVAL = width > 0; 1815 RETVAL = width > 0;
1391} 1816}
1392 OUTPUT: 1817 OUTPUT:
1393 RETVAL 1818 RETVAL
1394 1819
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1820MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1821
1397PROTOTYPES: DISABLE 1822PROTOTYPES: DISABLE
1398 1823
1399CFPlus::Map 1824DC::Map
1400new (SV *class) 1825new (SV *class)
1401 CODE: 1826 CODE:
1402 New (0, RETVAL, 1, struct map); 1827 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1828 RETVAL->x = 0;
1404 RETVAL->y = 0; 1829 RETVAL->y = 0;
1412 RETVAL->row = 0; 1837 RETVAL->row = 0;
1413 OUTPUT: 1838 OUTPUT:
1414 RETVAL 1839 RETVAL
1415 1840
1416void 1841void
1417DESTROY (CFPlus::Map self) 1842DESTROY (DC::Map self)
1418 CODE: 1843 CODE:
1419{ 1844{
1420 map_clear (self); 1845 map_clear (self);
1421 Safefree (self->face2tile); 1846 Safefree (self->face2tile);
1422 Safefree (self->tex); 1847 Safefree (self->tex);
1423 Safefree (self); 1848 Safefree (self);
1424} 1849}
1425 1850
1426void 1851void
1427resize (CFPlus::Map self, int map_width, int map_height) 1852resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1853 CODE:
1429 self->w = map_width; 1854 self->w = map_width;
1430 self->h = map_height; 1855 self->h = map_height;
1431 1856
1432void 1857void
1433clear (CFPlus::Map self) 1858clear (DC::Map self)
1434 CODE: 1859 CODE:
1435 map_clear (self); 1860 map_clear (self);
1436 1861
1437void 1862void
1438set_tileid (CFPlus::Map self, int face, int tile) 1863set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1864 CODE:
1440{ 1865{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1866 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1867 need_texid (self, tile);
1443} 1868}
1444 1869
1445void 1870void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1871set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1872 CODE:
1448{ 1873{
1449 tileid texid; 1874 tileid texid;
1450 maptex *tex; 1875 maptex *tex;
1451 1876
1464 tex->smoothtile = self->face2tile [smooth]; 1889 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1890 tex->smoothlevel = level;
1466} 1891}
1467 1892
1468void 1893void
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) 1894set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1895 CODE:
1471{ 1896{
1472 need_texid (self, texid); 1897 need_texid (self, texid);
1473 1898
1474 { 1899 {
1493 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1921}
1497 1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1942
1498int 1943int
1499ox (CFPlus::Map self) 1944ox (DC::Map self)
1500 ALIAS: 1945 ALIAS:
1501 oy = 1 1946 oy = 1
1502 x = 2 1947 x = 2
1503 y = 3 1948 y = 3
1504 w = 4 1949 w = 4
1515 } 1960 }
1516 OUTPUT: 1961 OUTPUT:
1517 RETVAL 1962 RETVAL
1518 1963
1519void 1964void
1520scroll (CFPlus::Map self, int dx, int dy) 1965scroll (DC::Map self, int dx, int dy)
1521 CODE: 1966 CODE:
1522{ 1967{
1523 if (dx > 0) 1968 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1969 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1970 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1985 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1986 self->y += MAP_EXTEND_Y;
1542 } 1987 }
1543} 1988}
1544 1989
1545void 1990SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1991map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1992 CODE:
1548{ 1993{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1995 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1996 mapcell *cell;
1552 int x, y, flags; 1997 int x, y, z, flags;
1998 AV *missing = newAV ();
1999 RETVAL = newRV_noinc ((SV *)missing);
1553 2000
1554 while (data < data_end - 1) 2001 while (data < data_end - 1)
1555 { 2002 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 2003 flags = (data [0] << 8) + data [1]; data += 2;
1557 2004
1577 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1578 2025
1579 do 2026 do
1580 { 2027 {
1581 ext = *data++; 2028 ext = *data++;
1582 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1583 2030
1584 if (cmd < 4) 2031 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1586 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1587 { 2034 {
1588 cell->stat_width = 1; 2035 cell->stat_width = 1;
1589 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1590 } 2037 }
1591 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1594 { 2041 {
1595 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 2046
1598 data += *data + 1; 2047 data += *data + 1;
1599 } 2048 }
1600 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 2050 cell->flags = *data++;
1608 } 2057 }
1609 else 2058 else
1610 cell->darkness = *data++ + 1; 2059 cell->darkness = *data++ + 1;
1611 } 2060 }
1612 2061
2062 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2063 if (flags & (4 >> z))
1614 { 2064 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2065 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2066 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
2068
2069 if (cell->tile [z])
2070 {
2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
2073 if (!tex->name)
2074 av_push (missing, newSViv (cell->tile [z]));
2075
2076 if (tex->smoothtile)
2077 {
2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
2080 if (!smooth->name)
2081 av_push (missing, newSViv (tex->smoothtile));
2082 }
2083 }
1618 } 2084 }
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 } 2085 }
1634 else 2086 else
1635 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1636 } 2088 }
1637} 2089}
2090 OUTPUT:
2091 RETVAL
1638 2092
1639SV * 2093SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2094mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2095 CODE:
1642{ 2096{
1643 int x1, x; 2097 int x1, x;
1644 int y1, y; 2098 int y1, y;
1645 int z; 2099 int z;
1690} 2144}
1691 OUTPUT: 2145 OUTPUT:
1692 RETVAL 2146 RETVAL
1693 2147
1694void 2148void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 2150 CODE:
1697{ 2151{
2152 int x, y, z;
2153
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 2157 smooth_key skey;
1702 int x, y, z; 2158 int pl_x, pl_y;
1703 int last_name; 2159 maptex pl_tex;
2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
2162 rc_key_t key;
2163 rc_array_t *arr;
1704 2164
2165 pl_tex.name = 0;
2166
1705 // thats current max. sorry. 2167 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1708 2170
1709 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
1711 2173
1712 glColor4ub (255, 255, 255, 255); 2174 memset (&key, 0, sizeof (key));
1713 2175 key.r = 255;
1714 glEnable (GL_BLEND); 2176 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2177 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 2178 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2179 key.mode = GL_QUADS;
1718 2180 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2181
1723 mx += self->x; 2182 mx += self->x;
1724 my += self->y; 2183 my += self->y;
1725 2184
1726 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2202 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2203 self->tex [cell->tile [2]].smoothlevel));
1745 } 2204 }
1746 } 2205 }
1747 2206
2207 glEnable (GL_BLEND);
2208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210
1748 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1749 { 2212 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1751 2215
1752 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1754 { 2218 {
1755 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
1761 tileid tile = cell->tile [z]; 2225 tileid tile = cell->tile [z];
1762 2226
1763 if (tile) 2227 if (tile)
1764 { 2228 {
1765 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2230 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2231
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2232 if (key.texname != tex.name)
1772 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1773 if (!tex.name) 2236 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2238
1776 glEnd (); 2239 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2240 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2241 }
1780 2242
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2243 px = (x + 1) * T - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2244 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 2245
1786 if (cell->flags && z == 2) 2246 if (expect_false (cell->player == player) && expect_false (z == 2))
1787 { 2247 {
1788 if (cell->flags & 1) 2248 pl_x = px;
2249 pl_y = py;
2250 pl_tex = tex;
1789 { 2251 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 } 2252 }
2253
2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2256 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1804 2258
1805 // update smooth hash 2259 // update smooth hash
1806 if (tex.smoothtile) 2260 if (tex.smoothtile)
1807 { 2261 {
1808 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
1839 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1840 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2294 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1841 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1842 } 2296 }
1843 } 2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2317 }
2318 }
1844 } 2319 }
1845 } 2320 }
2321
2322 rc_draw (rc);
2323 rc_clear (rc);
1846 2324
1847 // go through all smoothlevels, lowest to highest, then draw. 2325 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2326 // this is basically counting sort
1849 { 2327 {
1850 int w, b; 2328 int w, b;
1851 2329
2330 glEnable (GL_TEXTURE_2D);
2331 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2332 for (w = 0; w < 256 / 32; ++w)
1853 { 2333 {
1854 uint32_t smask = smooth_level [w]; 2334 uint32_t smask = smooth_level [w];
1855 if (smask) 2335 if (smask)
1856 for (b = 0; b < 32; ++b) 2336 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2355 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2356 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2357 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2358 float dy = tex.t * .5f ; // 2 images/column
1879 2359
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2360 if (tex.name)
1883 { 2361 {
2362 // this time avoiding texture state changes
2363 // save gobs of state changes.
1884 if (!tex.name) 2364 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2365 {
2366 self->tex [skey->tile].unused = 0;
1886 2367
1887 glEnd (); 2368 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
1890 } 2371 }
1891 2372
1892 if (border) 2373 if (border)
1893 { 2374 {
1894 float ox = border * dx; 2375 float ox = border * dx;
1895 2376
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2381 }
1901 2382
1902 if (corner) 2383 if (corner)
1903 { 2384 {
1904 float ox = corner * dx; 2385 float ox = corner * dx;
1905 2386
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2387 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2391 }
1910 } 2392 }
1911 } 2393 }
1912 } 2394 }
1913 } 2395 }
1914 } 2396 }
2397
2398 glEnd ();
2399 glDisable (GL_TEXTURE_2D);
2400 key.texname = -1;
1915 } 2401 }
1916 2402
1917 hv_clear (smooth); 2403 hv_clear (smooth);
1918 } 2404 }
1919 2405
1920 glEnd (); 2406 if (pl_tex.name)
2407 {
2408 maptex tex = pl_tex;
2409 int px = pl_x + sdx;
2410 int py = pl_y + sdy;
1921 2411
1922 glDisable (GL_TEXTURE_2D); 2412 key.texname = tex.name;
2413 arr = rc_array (rc, &key);
2414
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2417 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2419
2420 rc_draw (rc);
2421 }
2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
1923 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2427 rc_free (rc);
2428 rc_free (rc_ov);
1924 2429
1925 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
1928 { 2433 {
1933 { 2438 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
1935 2440
1936 int px = x * T; 2441 int px = x * T;
1937 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
1938 2449
1939 if (cell->stat_hp) 2450 if (cell->stat_hp)
1940 { 2451 {
1941 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1953 } 2464 }
1954 } 2465 }
1955} 2466}
1956 2467
1957void 2468void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1959 CODE: 2470 CODE:
1960{ 2471{
1961 static float color[16][3] = { 2472 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
1963 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
1964 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
1965 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
1966 2477
1967 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
1968 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
1969 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
1970 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
1971 2482
1972 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
1973 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
1974 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
1975 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
1976 2487
1977 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
1978 2489
1979 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
1980 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
1981 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
1982 }; 2493 };
1983 2494
1984 int x, y; 2495 int x, y;
1985 2496
1986 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
1991 2508
1992 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
1996 2513
1997 if (m) 2514 if (m)
1998 { 2515 {
1999 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2000 2517
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2002 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2003 2520
2004 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2526 }
2013 glDisable (GL_BLEND); 2530 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2531 glDisable (GL_TEXTURE_2D);
2015} 2532}
2016 2533
2017void 2534void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2536 PPCODE:
2020{ 2537{
2021 int x, y; 2538 int x, y;
2022 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2024 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2025 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029 2546
2030 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2032 2549
2033 mx += self->x - 1; 2550 mx += self->x - 1;
2034 my += self->y - 1; 2551 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037 2552
2038 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2040 { 2555 {
2041 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2560 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2047 2562
2048 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2566 }
2052 } 2567 }
2053 2568
2054 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
2074 2589
2075 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2078 2593
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2083 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2598 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); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2088 } 2603 }
2089 2604
2090 free (darkness1); 2605 free (darkness1);
2091 2606
2092 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2093 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2096} 2611}
2097 2612
2098SV * 2613SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2614get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2615 CODE:
2101{ 2616{
2102 int x, y, x1, y1; 2617 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2618 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2619 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2676 else
2162 *data++ = 0; 2677 *data++ = 0;
2163 } 2678 }
2164 } 2679 }
2165 2680
2681 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 {
2166 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2168 RETVAL = data_sv; 2688 RETVAL = data_sv;
2169} 2689}
2170 OUTPUT: 2690 OUTPUT:
2171 RETVAL 2691 RETVAL
2172 2692
2173void 2693void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2695 PPCODE:
2176{ 2696{
2177 int x, y, z; 2697 int x, y, z;
2178 int w, h; 2698 int w, h;
2179 int x1, y1; 2699 int x1, y1;
2700 STRLEN len;
2701 uint8_t *data, *end;
2702
2703 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv);
2706 end = data + len + 8;
2707
2708 if (len < 5)
2709 XSRETURN_EMPTY;
2180 2710
2181 if (*data++ != 0) 2711 if (*data++ != 0)
2182 return; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2183 2713
2184 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2715 h = *data++ << 8; h |= *data++;
2186 2716
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2717 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2729 {
2200 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2201 2731
2202 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2203 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2204 uint8_t flags = *data++; 2739 flags = *data++;
2205 2740
2206 if (flags) 2741 if (flags)
2207 { 2742 {
2208 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2749
2215 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2216 { 2751 {
2217 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2218 2754
2219 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2220 { 2756 {
2221 tileid t = tile [z]; 2757 tileid t = tile [z];
2222 2758
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2760 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2762 need_texid (self, t);
2227 } 2763 }
2228 2764
2229 cell->tile [z] = t; 2765 cell->tile [z] = t;
2230 } 2766 }
2232 } 2768 }
2233 } 2769 }
2234 } 2770 }
2235} 2771}
2236 2772
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2773MODULE = Deliantra::Client PACKAGE = DC::RW
2774
2775DC::RW
2776new (SV *class, SV *data_sv)
2777 CODE:
2778{
2779 STRLEN datalen;
2780 char *data = SvPVbyte (data_sv, datalen);
2781
2782 RETVAL = SDL_RWFromConstMem (data, datalen);
2783}
2784 OUTPUT:
2785 RETVAL
2786
2787DC::RW
2788new_from_file (SV *class, const char *path, const char *mode = "rb")
2789 CODE:
2790 RETVAL = SDL_RWFromFile (path, mode);
2791 OUTPUT:
2792 RETVAL
2793
2794# fails on win32:
2795# dc.xs(2268) : error C2059: syntax error : '('
2796#void
2797#close (DC::RW self)
2798# CODE:
2799# (self->(close)) (self);
2800
2801MODULE = Deliantra::Client PACKAGE = DC::Channel
2238 2802
2239PROTOTYPES: DISABLE 2803PROTOTYPES: DISABLE
2240 2804
2241CFPlus::MixChunk 2805DC::Channel
2242new_from_file (SV *class, char *path) 2806find ()
2243 CODE: 2807 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2808{
2809 RETVAL = Mix_GroupAvailable (-1);
2810
2811 if (RETVAL < 0)
2812 {
2813 RETVAL = Mix_GroupOldest (-1);
2814
2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2821 XSRETURN_UNDEF;
2822 }
2823 else
2824 Mix_HaltChannel (RETVAL);
2825 }
2826
2827 Mix_UnregisterAllEffects (RETVAL);
2828 Mix_Volume (RETVAL, 128);
2829}
2245 OUTPUT: 2830 OUTPUT:
2246 RETVAL 2831 RETVAL
2247 2832
2248void 2833void
2834halt (DC::Channel self)
2835 CODE:
2836 Mix_HaltChannel (self);
2837
2838void
2839expire (DC::Channel self, int ticks = -1)
2840 CODE:
2841 Mix_ExpireChannel (self, ticks);
2842
2843void
2844fade_out (DC::Channel self, int ticks = -1)
2845 CODE:
2846 Mix_FadeOutChannel (self, ticks);
2847
2848int
2849volume (DC::Channel self, int volume)
2850 CODE:
2851 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2852 OUTPUT:
2853 RETVAL
2854
2855void
2856unregister_all_effects (DC::Channel self)
2857 CODE:
2858 Mix_UnregisterAllEffects (self);
2859
2860void
2861set_panning (DC::Channel self, int left, int right)
2862 CODE:
2863 left = CLAMP (left , 0, 255);
2864 right = CLAMP (right, 0, 255);
2865 Mix_SetPanning (self, left, right);
2866
2867void
2868set_distance (DC::Channel self, int distance)
2869 CODE:
2870 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2871
2872void
2873set_position (DC::Channel self, int angle, int distance)
2874 CODE:
2875
2876void
2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2878 CODE:
2879{
2880 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2883}
2884
2885void
2886set_reverse_stereo (DC::Channel self, int flip)
2887 CODE:
2888 Mix_SetReverseStereo (self, flip);
2889
2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2891
2892PROTOTYPES: DISABLE
2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2905
2906DC::MixChunk
2907new (SV *class, DC::RW rwops)
2908 CODE:
2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2910 OUTPUT:
2911 RETVAL
2912
2913void
2249DESTROY (CFPlus::MixChunk self) 2914DESTROY (DC::MixChunk self)
2250 CODE: 2915 CODE:
2251 Mix_FreeChunk (self); 2916 Mix_FreeChunk (self);
2252 2917
2253int 2918int
2254volume (CFPlus::MixChunk self, int volume = -1) 2919volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2920 CODE:
2921 if (items > 1)
2922 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2923 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2924 OUTPUT:
2258 RETVAL 2925 RETVAL
2259 2926
2260int 2927DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2928play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2929 CODE:
2930{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2931 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2932
2933 if (RETVAL < 0)
2934 XSRETURN_UNDEF;
2935
2936 if (channel < 0)
2937 {
2938 Mix_UnregisterAllEffects (RETVAL);
2939 Mix_Volume (RETVAL, 128);
2940 }
2941}
2264 OUTPUT: 2942 OUTPUT:
2265 RETVAL 2943 RETVAL
2266 2944
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2268 2958
2269int 2959int
2270volume (int volume = -1) 2960volume (int volume = -1)
2271 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2272 CODE: 2962 CODE:
2963 if (items > 0)
2964 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2965 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2966 OUTPUT:
2275 RETVAL 2967 RETVAL
2276 2968
2969void
2970fade_out (int ms)
2971 CODE:
2972 Mix_FadeOutMusic (ms);
2973
2974void
2975halt ()
2976 CODE:
2977 Mix_HaltMusic ();
2978
2277int 2979int
2278fade_out (int ms) 2980playing ()
2279 CODE: 2981 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 2982 RETVAL = Mix_PlayingMusic ();
2281 OUTPUT: 2983 OUTPUT:
2282 RETVAL 2984 RETVAL
2283 2985
2284CFPlus::MixMusic 2986DC::MixMusic
2285new_from_file (SV *class, char *path) 2987new (SV *class, DC::RW rwops)
2286 CODE: 2988 CODE:
2287 RETVAL = Mix_LoadMUS (path); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2288 OUTPUT: 2990 OUTPUT:
2289 RETVAL 2991 RETVAL
2290 2992
2291void 2993void
2292DESTROY (CFPlus::MixMusic self) 2994DESTROY (DC::MixMusic self)
2293 CODE: 2995 CODE:
2294 Mix_FreeMusic (self); 2996 Mix_FreeMusic (self);
2295 2997
2296int 2998int
2297play (CFPlus::MixMusic self, int loops = -1) 2999play (DC::MixMusic self, int loops = -1)
2298 CODE: 3000 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 3001 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 3002 OUTPUT:
2301 RETVAL 3003 RETVAL
2302 3004
2303int 3005void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3006fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 3007 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3008 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 3009
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3010MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 3011
2312PROTOTYPES: ENABLE 3012PROTOTYPES: ENABLE
2313 3013
2314BOOT: 3014BOOT:
2315{ 3015{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3016 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 3017 static const struct {
2318 const char *name; 3018 const char *name;
2319 IV iv; 3019 IV iv;
2320 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2322 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2323 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2324 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2325 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2326 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2327 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2328 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2329 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
2341 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2342 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2343 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2344 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2345 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2346 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2347 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2348 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2349 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2350 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
2356 const_iv (GL_INTENSITY), 3061 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 3062 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 3063 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 3064 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3065 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3066 const_iv (GL_COMPRESSED_ALPHA_ARB),
3067 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3068 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3069 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3070 const_iv (GL_COMPRESSED_RGB_ARB),
3071 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 3072 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 3073 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 3074 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 3075 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 3076 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3115 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 3116 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 3117 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 3118 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 3119 const_iv (GL_GENERATE_MIPMAP_HINT),
3120 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 3121 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 3122 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2414 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2415 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2416# undef const_iv 3131# undef const_iv
2417 }; 3132 };
2418 3133
2419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2421 3136
2422 texture_av = newAV (); 3137 texture_av = newAV ();
2423 AvREAL_off (texture_av); 3138 AvREAL_off (texture_av);
2424} 3139}
2425 3140
3141void
3142disable_GL_EXT_blend_func_separate ()
3143 CODE:
3144 gl.BlendFuncSeparate = 0;
3145 gl.BlendFuncSeparateEXT = 0;
3146
3147void
3148apple_nvidia_bug (int enable)
3149
2426char * 3150char *
2427gl_vendor () 3151gl_vendor ()
2428 CODE: 3152 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 3154 OUTPUT:
2460 3184
2461int glGetError () 3185int glGetError ()
2462 3186
2463void glFinish () 3187void glFinish ()
2464 3188
3189void glFlush ()
3190
2465void glClear (int mask) 3191void glClear (int mask)
2466 3192
2467void glClearColor (float r, float g, float b, float a = 1.0) 3193void glClearColor (float r, float g, float b, float a = 1.0)
2468 PROTOTYPE: @ 3194 PROTOTYPE: @
2469 3195
2478void glBlendFunc (int sfactor, int dfactor) 3204void glBlendFunc (int sfactor, int dfactor)
2479 3205
2480void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3206void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2481 CODE: 3207 CODE:
2482 gl_BlendFuncSeparate (sa, da, saa, daa); 3208 gl_BlendFuncSeparate (sa, da, saa, daa);
3209
3210# void glBlendEquation (int se)
2483 3211
2484void glDepthMask (int flag) 3212void glDepthMask (int flag)
2485 3213
2486void glLogicOp (int opcode) 3214void glLogicOp (int opcode)
2487 3215
2522void glRotate (float angle, float x, float y, float z) 3250void glRotate (float angle, float x, float y, float z)
2523 CODE: 3251 CODE:
2524 glRotatef (angle, x, y, z); 3252 glRotatef (angle, x, y, z);
2525 3253
2526void glColor (float r, float g, float b, float a = 1.0) 3254void glColor (float r, float g, float b, float a = 1.0)
3255 PROTOTYPE: @
2527 ALIAS: 3256 ALIAS:
2528 glColor_premultiply = 1 3257 glColor_premultiply = 1
2529 CODE: 3258 CODE:
2530 if (ix) 3259 if (ix)
2531 { 3260 {
2547 3276
2548void glTexCoord (float s, float t) 3277void glTexCoord (float s, float t)
2549 CODE: 3278 CODE:
2550 glTexCoord2f (s, t); 3279 glTexCoord2f (s, t);
2551 3280
3281void glRect (float x1, float y1, float x2, float y2)
3282 CODE:
3283 glRectf (x1, y1, x2, y2);
3284
3285void glRect_lineloop (float x1, float y1, float x2, float y2)
3286 CODE:
3287 glBegin (GL_LINE_LOOP);
3288 glVertex2f (x1, y1);
3289 glVertex2f (x2, y1);
3290 glVertex2f (x2, y2);
3291 glVertex2f (x1, y2);
3292 glEnd ();
3293
2552PROTOTYPES: ENABLE 3294PROTOTYPES: ENABLE
2553 3295
2554void glBegin (int mode) 3296void glBegin (int mode)
2555 3297
2556void glEnd () 3298void glEnd ()
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3330void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 3331 CODE:
2590 if (gl.SeparableFilter2D) 3332 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3333 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 3334
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3335void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 3336
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3337void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 3338
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 3339void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 3340
2624 3366
2625void glEndList () 3367void glEndList ()
2626 3368
2627void glCallList (int list) 3369void glCallList (int list)
2628 3370
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3371void c_init ()
3372 CODE:
3373 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3374 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3375
3376MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 3377
2631PROTOTYPES: DISABLE 3378PROTOTYPES: DISABLE
2632 3379
2633void 3380void
2634find_widget (SV *self, NV x, NV y) 3381find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 3385 XPUSHs (self);
2639} 3386}
2640 3387
2641BOOT: 3388BOOT:
2642{ 3389{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3390 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 3391
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3392 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3393 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3394 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3395 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 3396}
2650 3397
2651void 3398void
2652draw (SV *self) 3399draw (SV *self)
2653 CODE: 3400 CODE:
2657 NV x, y, w, h; 3404 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3405 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3406 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3407 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3408 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3409 double draw_x, draw_y;
2664 3410
2665 if (!SvROK (self)) 3411 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3412 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3413
2668 hv = (HV *)SvRV (self); 3414 hv = (HV *)SvRV (self);
2669 3415
2670 if (SvTYPE (hv) != SVt_PVHV) 3416 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3417 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3418
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3419 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3420 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3421
2676 if (!h || !w) 3422 if (!h || !w)
2696 { 3442 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3443 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3444
2699 if (svp && SvTRUE (*svp)) 3445 if (svp && SvTRUE (*svp))
2700 { 3446 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3447 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3448 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3449 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3450 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3451 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3452 glVertex2f (w, 0);
2709 glEnd (); 3455 glEnd ();
2710 glDisable (GL_BLEND); 3456 glDisable (GL_BLEND);
2711 } 3457 }
2712 } 3458 }
2713#if 0 3459#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3460 // draw borders, for debugging
2715 glPushMatrix; 3461 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3462 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3463 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3464 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3465 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3466 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3467 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3468 glVertex2f (0 , h - 1);
2723 glEnd; 3469 glEnd ();
2724 glPopMatrix; 3470 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3471#endif
2728 PUSHMARK (SP); 3472 PUSHMARK (SP);
2729 XPUSHs (self); 3473 XPUSHs (self);
2730 PUTBACK; 3474 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3475 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines