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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC

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

Diff Legend

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