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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.319 by root, Sun Nov 18 00:52:22 2018 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 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
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib.h>
48 54
49#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
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 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 */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
73 123
74static AV *texture_av; 124static AV *texture_av;
75 125
76static struct 126static struct
77{ 127{
… …
114 av_push (texture_av, (SV *)(size_t)name); 164 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 165 glDeleteTextures (1, &name);
116} 166}
117 167
118#include "texcache.c" 168#include "texcache.c"
169#include "rendercache.c"
119 170
120#include "pango-font.c" 171#include "pango-font.c"
121#include "pango-fontmap.c" 172#include "pango-fontmap.c"
122#include "pango-render.c" 173#include "pango-render.c"
123 174
124typedef IV CFPlus__Channel; 175typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 176typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 177typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 178typedef Mix_Music *DC__MixMusic;
128 179
129typedef PangoFontDescription *CFPlus__Font; 180typedef PangoFontDescription *DC__Font;
130 181
131static int 182static int
132shape_attr_p (PangoLayoutRun *run) 183shape_attr_p (PangoLayoutRun *run)
133{ 184{
134 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
135 186
136 while (attrs) 187 while (attrs)
137 { 188 {
138 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
139 190
140 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
141 return 1; 192 return 1;
142 193
143 attrs = attrs->next; 194 attrs = attrs->next;
… …
148 199
149typedef struct cf_layout { 200typedef struct cf_layout {
150 PangoLayout *pl; 201 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 202 float r, g, b, a; // default color for rgba mode
152 int base_height; 203 int base_height;
153 CFPlus__Font font; 204 DC__Font font;
205 rc_t *rc;
154} *CFPlus__Layout; 206} *DC__Layout;
155 207
156static CFPlus__Font default_font; 208static DC__Font default_font;
157static PangoContext *opengl_context; 209static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
159 211
160static void 212static void
161substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
… …
166#endif 218#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 220}
169 221
170static void 222static void
171layout_update_font (CFPlus__Layout self) 223layout_update_font (DC__Layout self)
172{ 224{
173 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
174 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
175 */ 227 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
177 229
178 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 232
181 pango_layout_set_font_description (self->pl, font); 233 pango_layout_set_font_description (self->pl, font);
182} 234}
183 235
184static void 236static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 237layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 238{
187 PangoRectangle rect; 239 PangoRectangle rect;
188 240
189 // get_pixel_* wrongly rounds down 241 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 242 pango_layout_get_extents (self->pl, 0, &rect);
… …
201 253
202typedef uint16_t tileid; 254typedef uint16_t tileid;
203typedef uint16_t faceid; 255typedef uint16_t faceid;
204 256
205typedef struct { 257typedef struct {
206 int name; 258 GLuint name;
207 int w, h; 259 int w, h;
208 float s, t; 260 float s, t;
209 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
210 tileid smoothtile; 262 tileid smoothtile;
211 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
212} maptex; 265} maptex;
213 266
214typedef struct { 267typedef struct {
215 uint32_t player; 268 uint32_t player;
216 tileid tile[3]; 269 tileid tile[3];
… …
229 int faces; tileid *face2tile; // [faceid] 282 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 283 int texs; maptex *tex; // [tileid]
231 284
232 int32_t rows; 285 int32_t rows;
233 maprow *row; 286 maprow *row;
234} *CFPlus__Map; 287} *DC__Map;
235 288
236static char * 289static char *
237prepend (char *ptr, int sze, int inc) 290prepend (char *ptr, int sze, int inc)
238{ 291{
239 char *p; 292 char *p;
… …
277 self->texs *= 2; 330 self->texs *= 2;
278 } 331 }
279} 332}
280 333
281static maprow * 334static maprow *
282map_get_row (CFPlus__Map self, int y) 335map_get_row (DC__Map self, int y)
283{ 336{
284 if (0 > y) 337 if (0 > y)
285 { 338 {
286 int extend = - y + MAP_EXTEND_Y; 339 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 340 Prepend (maprow, self->row, self->rows, extend);
… …
325 378
326 return row->col + (x - row->c0); 379 return row->col + (x - row->c0);
327} 380}
328 381
329static mapcell * 382static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 383map_get_cell (DC__Map self, int x, int y)
331{ 384{
332 return row_get_cell (map_get_row (self, y), x); 385 return row_get_cell (map_get_row (self, y), x);
333} 386}
334 387
335static void 388static void
336map_clear (CFPlus__Map self) 389map_clear (DC__Map self)
337{ 390{
338 int r; 391 int r;
339 392
340 for (r = 0; r < self->rows; r++) 393 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 394 Safefree (self->row[r].col);
… …
348 self->oy = 0; 401 self->oy = 0;
349 self->row = 0; 402 self->row = 0;
350 self->rows = 0; 403 self->rows = 0;
351} 404}
352 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
353static void 416static void
354map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
355{ 418{
356 int x, y; 419 int x, y;
357 maprow *row; 420 maprow *row;
358 mapcell *cell; 421 mapcell *cell;
359 422
… …
371 if (x >= row->c1) 434 if (x >= row->c1)
372 break; 435 break;
373 436
374 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
375 438
376 cell->darkness = 0; 439 CELL_CLEAR (cell);
377 cell->stat_hp = 0;
378 cell->flags = 0;
379 cell->player = 0;
380 } 440 }
381 } 441 }
382} 442}
383 443
384typedef struct { 444typedef struct {
… …
419 ev.code = 1; 479 ev.code = 1;
420 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
421 ev.data2 = 0; 481 ev.data2 = 0;
422 482
423 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
424} 490}
425 491
426static unsigned int 492static unsigned int
427minpot (unsigned int n) 493minpot (unsigned int n)
428{ 494{
… …
438 n |= n >> 16; 504 n |= n >> 16;
439 505
440 return n + 1; 506 return n + 1;
441} 507}
442 508
509static unsigned int
510popcount (unsigned int n)
511{
512 n -= (n >> 1) & 0x55555555U;
513 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
514 n = ((n >> 4) + n) & 0x0f0f0f0fU;
515 n *= 0x01010101U;
516
517 return n >> 24;
518}
519
443/* SDL should provide this, really. */ 520/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 521#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 522#define SDLK_MODIFIER_MAX 314
446 523
447/******************************************************************************/ 524/******************************************************************************/
… …
485 return 0; 562 return 0;
486 563
487 return 1; 564 return 1;
488} 565}
489 566
490MODULE = CFPlus PACKAGE = CFPlus 567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main_;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
624
625MODULE = Deliantra::Client PACKAGE = DC
491 626
492PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
493 628
494BOOT: 629BOOT:
495{ 630{
496 HV *stash = gv_stashpv ("CFPlus", 1); 631 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 632 static const struct {
498 const char *name; 633 const char *name;
499 IV iv; 634 IV iv;
500 } *civ, const_iv[] = { 635 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 636# define const_iv(name) { # name, (IV)name }
… …
523 658
524 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
527 662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
712
713 const_iv (SDLK_FIRST),
714 const_iv (SDLK_LAST),
528 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 717 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 718 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 719 const_iv (SDLK_KP4),
… …
604 const_iv (KMOD_LMETA), 791 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
608 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
796
797 const_iv (KMOD_LRAM),
798
799 const_iv (MIX_DEFAULT_FORMAT),
800
801 const_iv (SDL_INIT_TIMER),
802 const_iv (SDL_INIT_AUDIO),
803 const_iv (SDL_INIT_VIDEO),
804 const_iv (SDL_INIT_CDROM),
805 const_iv (SDL_INIT_JOYSTICK),
806 const_iv (SDL_INIT_EVERYTHING),
807 const_iv (SDL_INIT_NOPARACHUTE),
808 const_iv (SDL_INIT_EVENTTHREAD),
809
810 const_iv (SDL_GL_RED_SIZE),
811 const_iv (SDL_GL_GREEN_SIZE),
812 const_iv (SDL_GL_BLUE_SIZE),
813 const_iv (SDL_GL_ALPHA_SIZE),
814 const_iv (SDL_GL_DOUBLEBUFFER),
815 const_iv (SDL_GL_BUFFER_SIZE),
816 const_iv (SDL_GL_DEPTH_SIZE),
817 const_iv (SDL_GL_STENCIL_SIZE),
818 const_iv (SDL_GL_ACCUM_RED_SIZE),
819 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
820 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
821 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
822 const_iv (SDL_GL_STEREO),
823 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
824 const_iv (SDL_GL_MULTISAMPLESAMPLES),
825 const_iv (SDL_GL_ACCELERATED_VISUAL),
826 const_iv (SDL_GL_SWAP_CONTROL),
827
828 const_iv (FOW_DARKNESS)
609# undef const_iv 829# undef const_iv
610 }; 830 };
611 831
612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
614 834
615 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
616 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
617} 837}
618 838
… …
630 RETVAL 850 RETVAL
631 851
632NV floor (NV x) 852NV floor (NV x)
633 853
634NV ceil (NV x) 854NV ceil (NV x)
855
856IV minpot (UV n)
857
858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
635 865
636void 866void
637pango_init () 867pango_init ()
638 CODE: 868 CODE:
639{ 869{
640 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
641 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 871 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
642 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 872 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
873 /*pango_context_set_font_description (opengl_context, default_font);*/
874#if PANGO_VERSION_CHECK (1, 15, 2)
875 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
877#endif
643} 878}
644 879
645char *
646SDL_GetError () 880char *SDL_GetError ()
647 881
648int 882void SDL_main_hack (SV *real_main)
649SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
650 884
651void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
652SDL_Quit () 891void SDL_Quit ()
892
893int SDL_GL_SetAttribute (int attr, int value)
894 C_ARGS: (SDL_GLattr)attr, value
895
896int SDL_GL_GetAttribute (int attr)
897 CODE:
898 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
899 XSRETURN_UNDEF;
900 OUTPUT:
901 RETVAL
653 902
654void 903void
655SDL_ListModes (int rgb, int alpha) 904SDL_ListModes (int rgb, int alpha)
656 PPCODE: 905 PPCODE:
657{ 906{
… …
669 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 920 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672 921
673 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 922 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674#if SDL_VERSION_ATLEAST(1,2,10)
675 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 923 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677#endif
678 924
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 925 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 926
681 if (m && m != (SDL_Rect **)-1) 927 if (m && m != (SDL_Rect **)-1)
682 while (*m) 928 while (*m)
683 { 929 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 930 if ((*m)->w >= 400 && (*m)->h >= 300)
685 { 931 {
686 AV *av = newAV (); 932 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 933 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 934 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 935 av_push (av, newSViv (rgb));
… …
712 ); 958 );
713 959
714 if (RETVAL) 960 if (RETVAL)
715 { 961 {
716 av_clear (texture_av); 962 av_clear (texture_av);
717
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
719#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 963#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720#include "glfunc.h" 964#include "glfunc.h"
721#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
722 } 968 }
723} 969}
724 OUTPUT: 970 OUTPUT:
725 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
726 975
727void 976void
728SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
729 978
730char * 979char *
731SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
732 982
733int 983int
734SDL_GetAppState () 984SDL_GetAppState ()
735 985
986int
987SDL_GetModState ()
988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
736void 993void
994SDL_PumpEvents ()
995
996void
737poll_events () 997peep_events ()
738 PPCODE: 998 PPCODE:
739{ 999{
740 SDL_Event ev; 1000 SDL_Event ev;
741 1001
742 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
… …
749 { 1009 {
750 case SDL_KEYDOWN: 1010 case SDL_KEYDOWN:
751 case SDL_KEYUP: 1011 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1013 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1014 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
755 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1015 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1016 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 1017 break;
758 1018
759 case SDL_ACTIVEEVENT: 1019 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1020 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
778 x = ev.motion.x; 1038 x = ev.motion.x;
779 y = ev.motion.y; 1039 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1040 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 1041 }
782 1042
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 1044 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 1045 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 1046 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1047 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1048 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 1049 }
790 break; 1050 break;
791 1051
792 case SDL_MOUSEBUTTONDOWN: 1052 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 1053 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1054 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 1055
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1056 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1057 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1058 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1059 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1064 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1065 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 1066 break;
807 } 1067 }
808 1068
809 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1069 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810 } 1070 }
811} 1071}
812 1072
1073char *
1074SDL_AudioDriverName ()
1075 CODE:
1076{
1077 char buf [256];
1078 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1079 XSRETURN_UNDEF;
1080
1081 RETVAL = buf;
1082}
1083 OUTPUT:
1084 RETVAL
1085
813int 1086int
814Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1087Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815 POSTCALL: 1088 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
817 Mix_ChannelFinished (channel_finished); 1090 Mix_ChannelFinished (channel_finished);
1091
1092void
1093Mix_QuerySpec ()
1094 PPCODE:
1095{
1096 int freq, channels;
1097 Uint16 format;
1098
1099 if (Mix_QuerySpec (&freq, &format, &channels))
1100 {
1101 EXTEND (SP, 3);
1102 PUSHs (sv_2mortal (newSViv (freq)));
1103 PUSHs (sv_2mortal (newSViv (format)));
1104 PUSHs (sv_2mortal (newSViv (channels)));
1105 }
1106}
818 1107
819void 1108void
820Mix_CloseAudio () 1109Mix_CloseAudio ()
821 1110
822int 1111int
… …
857 } 1146 }
858 } 1147 }
859#endif 1148#endif
860} 1149}
861 1150
862void 1151int
863add_font (char *file) 1152add_font (char *file)
864 CODE: 1153 CODE:
865 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1154 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1155 OUTPUT:
1156 RETVAL
1157
1158void
1159IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1160
1161# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1162void
1163Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
866 1164
867void 1165void
868load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
869 ALIAS: 1167 ALIAS:
870 load_image_file = 1 1168 load_image_file = 1
… …
916 1214
917 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
918 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
919 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
920 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
921 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
922 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1220 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
923 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
924 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
925 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
926 1224
… …
956void 1254void
957error (char *message) 1255error (char *message)
958 CODE: 1256 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1257 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1258#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1259 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1260#endif
963 1261
964void 1262void
965fatal (char *message) 1263fatal (char *message)
966 CODE: 1264 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1265 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1266#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1267 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1268#endif
971 _exit (1); 1269 _exit (1);
972 1270
973void 1271void
974_exit (int retval = 0) 1272_exit (int retval = 0)
… …
986#if DEBUG 1284#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1285 VALGRIND_DO_LEAK_CHECK;
988#endif 1286#endif
989} 1287}
990 1288
991MODULE = CFPlus PACKAGE = CFPlus::Font 1289int
1290SvREFCNT (SV *sv)
1291 CODE:
1292 RETVAL = SvREFCNT (sv);
1293 OUTPUT:
1294 RETVAL
1295
1296MODULE = Deliantra::Client PACKAGE = DC::Font
992 1297
993PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
994 1299
995CFPlus::Font 1300DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
997 CODE: 1302 CODE:
998{ 1303{
999 int count; 1304 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1001 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1003} 1308}
1004 OUTPUT: 1309 OUTPUT:
1005 RETVAL 1310 RETVAL
1006 1311
1007void 1312void
1008DESTROY (CFPlus::Font self) 1313DESTROY (DC::Font self)
1009 CODE: 1314 CODE:
1010 pango_font_description_free (self); 1315 pango_font_description_free (self);
1011 1316
1012void 1317void
1013make_default (CFPlus::Font self) 1318make_default (DC::Font self)
1014 PROTOTYPE: $ 1319 PROTOTYPE: $
1015 CODE: 1320 CODE:
1016 default_font = self; 1321 default_font = self;
1017 1322
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1323MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1324
1020PROTOTYPES: DISABLE 1325PROTOTYPES: DISABLE
1021 1326
1022void 1327void
1023reset_glyph_cache () 1328glyph_cache_backup ()
1024 PROTOTYPE: 1329 PROTOTYPE:
1025 CODE: 1330 CODE:
1331 tc_backup ();
1332
1333void
1334glyph_cache_restore ()
1335 PROTOTYPE:
1336 CODE:
1026 tc_clear (); 1337 tc_restore ();
1027 1338
1028CFPlus::Layout 1339DC::Layout
1029new (SV *class) 1340new (SV *klass)
1030 CODE: 1341 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1032 1343
1033 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1034 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1035 RETVAL->g = 1.; 1346 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1347 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1348 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1349 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1350 RETVAL->font = 0;
1351 RETVAL->rc = rc_alloc ();
1040 1352
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1353 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1354 layout_update_font (RETVAL);
1043 OUTPUT: 1355 OUTPUT:
1044 RETVAL 1356 RETVAL
1045 1357
1046void 1358void
1047DESTROY (CFPlus::Layout self) 1359DESTROY (DC::Layout self)
1048 CODE: 1360 CODE:
1049 g_object_unref (self->pl); 1361 g_object_unref (self->pl);
1362 rc_free (self->rc);
1050 Safefree (self); 1363 Safefree (self);
1051 1364
1052void 1365void
1053set_text (CFPlus::Layout self, SV *text_) 1366set_text (DC::Layout self, SV *text_)
1054 CODE: 1367 CODE:
1055{ 1368{
1056 STRLEN textlen; 1369 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1370 char *text = SvPVutf8 (text_, textlen);
1058 1371
1059 pango_layout_set_text (self->pl, text, textlen); 1372 pango_layout_set_text (self->pl, text, textlen);
1060} 1373}
1061 1374
1062void 1375void
1063set_markup (CFPlus::Layout self, SV *text_) 1376set_markup (DC::Layout self, SV *text_)
1064 CODE: 1377 CODE:
1065{ 1378{
1066 STRLEN textlen; 1379 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1380 char *text = SvPVutf8 (text_, textlen);
1068 1381
1069 pango_layout_set_markup (self->pl, text, textlen); 1382 pango_layout_set_markup (self->pl, text, textlen);
1070} 1383}
1071 1384
1072void 1385void
1073set_shapes (CFPlus::Layout self, ...) 1386set_shapes (DC::Layout self, ...)
1074 CODE: 1387 CODE:
1075{ 1388{
1076 PangoAttrList *attrs = 0; 1389 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1390 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1391 const char *pos = text;
… …
1113 if (attrs) 1426 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1427 pango_layout_set_attributes (self->pl, attrs);
1115} 1428}
1116 1429
1117void 1430void
1118get_shapes (CFPlus::Layout self) 1431get_shapes (DC::Layout self)
1119 PPCODE: 1432 PPCODE:
1120{ 1433{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1434 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1435
1123 do 1436 do
1124 { 1437 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1438 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1439
1127 if (run && shape_attr_p (run)) 1440 if (run && shape_attr_p (run))
1128 { 1441 {
1129 PangoRectangle extents; 1442 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1443 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1138 1451
1139 pango_layout_iter_free (iter); 1452 pango_layout_iter_free (iter);
1140} 1453}
1141 1454
1142int 1455int
1143has_wrapped (CFPlus::Layout self) 1456has_wrapped (DC::Layout self)
1144 CODE: 1457 CODE:
1145{ 1458{
1146 int lines = 1; 1459 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1460 const char *text = pango_layout_get_text (self->pl);
1148 1461
… …
1153} 1466}
1154 OUTPUT: 1467 OUTPUT:
1155 RETVAL 1468 RETVAL
1156 1469
1157SV * 1470SV *
1158get_text (CFPlus::Layout self) 1471get_text (DC::Layout self)
1159 CODE: 1472 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1473 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1474 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1475 OUTPUT:
1163 RETVAL 1476 RETVAL
1164 1477
1165void 1478void
1166set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1479set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167 CODE: 1480 CODE:
1168 self->r = r; 1481 self->r = r;
1169 self->g = g; 1482 self->g = g;
1170 self->b = b; 1483 self->b = b;
1171 self->a = a; 1484 self->a = a;
1172 1485
1173void 1486void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1487set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1488 CODE:
1176 if (self->font != font) 1489 if (self->font != font)
1177 { 1490 {
1178 self->font = font; 1491 self->font = font;
1179 layout_update_font (self); 1492 layout_update_font (self);
1180 } 1493 }
1181 1494
1182void 1495void
1183set_height (CFPlus::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1184 CODE: 1497 CODE:
1185 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1186 { 1499 {
1187 self->base_height = base_height; 1500 self->base_height = base_height;
1188 layout_update_font (self); 1501 layout_update_font (self);
1189 } 1502 }
1190 1503
1191void 1504void
1192set_width (CFPlus::Layout self, int max_width = -1) 1505set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1506 CODE:
1194 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1507 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195 1508
1196void 1509void
1197set_indent (CFPlus::Layout self, int indent) 1510set_indent (DC::Layout self, int indent)
1198 CODE: 1511 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1512 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1513
1201void 1514void
1202set_spacing (CFPlus::Layout self, int spacing) 1515set_spacing (DC::Layout self, int spacing)
1203 CODE: 1516 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1517 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1518
1206void 1519void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1520set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1521 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1522 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1523 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1524 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1525 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1526 : PANGO_ELLIPSIZE_NONE
1214 ); 1527 );
1215 1528
1216void 1529void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1530set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1531 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1532 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1533
1221void 1534void
1222size (CFPlus::Layout self) 1535size (DC::Layout self)
1223 PPCODE: 1536 PPCODE:
1224{ 1537{
1225 int w, h; 1538 int w, h;
1226 1539
1227 layout_get_pixel_size (self, &w, &h); 1540 layout_get_pixel_size (self, &w, &h);
… …
1230 PUSHs (sv_2mortal (newSViv (w))); 1543 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1544 PUSHs (sv_2mortal (newSViv (h)));
1232} 1545}
1233 1546
1234int 1547int
1235descent (CFPlus::Layout self) 1548descent (DC::Layout self)
1236 CODE: 1549 CODE:
1237{ 1550{
1238 PangoRectangle rect; 1551 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1552 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1553 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1554 RETVAL = PANGO_DESCENT (rect);
1242} 1555}
1243 OUTPUT: 1556 OUTPUT:
1244 RETVAL 1557 RETVAL
1245 1558
1246int 1559int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1560xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1561 CODE:
1249{ 1562{
1250 int index, trailing; 1563 int index, trailing;
1251 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1564 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252 RETVAL = index + trailing; 1565 RETVAL = index + trailing;
1253} 1566}
1254 OUTPUT: 1567 OUTPUT:
1255 RETVAL 1568 RETVAL
1256 1569
1257void 1570void
1258cursor_pos (CFPlus::Layout self, int index) 1571cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1572 PPCODE:
1260{ 1573{
1261 PangoRectangle strong_pos; 1574 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1575 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1576
1264 EXTEND (SP, 3); 1577 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1579 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1580 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1581}
1269 1582
1270void 1583void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1584index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1585 PPCODE:
1273{ 1586{
1274 int line, x; 1587 int line, x;
1275 1588
1276 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1589 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1590#if !PANGO_VERSION_CHECK (1, 17, 3)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1591 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1592 --line;
1593#endif
1279 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1595 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1596 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1597}
1283 1598
1284void 1599void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1600line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1601 PPCODE:
1287{ 1602{
1288 PangoLayoutLine *lp; 1603 PangoLayoutLine *lp;
1289 int index, trailing; 1604 int index, trailing;
1290 1605
1291 if (line < 0) 1606 if (line < 0)
1292 XSRETURN_EMPTY; 1607 XSRETURN_EMPTY;
1293 1608
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1609 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1610 XSRETURN_EMPTY; /* do better */
1296 1611
1297 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1612 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298 1613
1299 EXTEND (SP, 2); 1614 EXTEND (SP, 2);
… …
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1620 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1621 }
1307} 1622}
1308 1623
1309void 1624void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1625render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1626 CODE:
1627 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1628 pango_opengl_render_layout_subpixel (
1313 self->pl, 1629 self->pl,
1630 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1631 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1632 self->r, self->g, self->b, self->a,
1316 flags 1633 flags
1317 ); 1634 );
1635 // we assume that context_change actually clears/frees stuff
1636 // and does not do any recomputation...
1637 pango_layout_context_changed (self->pl);
1318 1638
1319MODULE = CFPlus PACKAGE = CFPlus::Texture 1639void
1640draw (DC::Layout self)
1641 CODE:
1642{
1643 glEnable (GL_TEXTURE_2D);
1644 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1645 glEnable (GL_BLEND);
1646 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1647 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1648 glEnable (GL_ALPHA_TEST);
1649 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1650
1651 rc_draw (self->rc);
1652
1653 glDisable (GL_ALPHA_TEST);
1654 glDisable (GL_BLEND);
1655 glDisable (GL_TEXTURE_2D);
1656}
1657
1658MODULE = Deliantra::Client PACKAGE = DC::Texture
1320 1659
1321PROTOTYPES: ENABLE 1660PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1661
1325void 1662void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1663pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1664 CODE:
1328{ 1665{
… …
1394 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1395 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1396 } 1733 }
1397} 1734}
1398 1735
1736void
1737draw_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)
1738 PROTOTYPE: @
1739 CODE:
1740{
1741 glEnable (GL_BLEND);
1742 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1743 glEnable (GL_TEXTURE_2D);
1744 glBindTexture (GL_TEXTURE_2D, name1);
1745
1746 glColor3f (intensity, intensity, intensity);
1747 glPushMatrix ();
1748 glScalef (1./3, 1./3, 1.);
1749
1750 if (blend > 0.f)
1751 {
1752 float dx3 = dx * -3.f / w;
1753 float dy3 = dy * -3.f / h;
1754 GLfloat env_color[4] = { 0., 0., 0., blend };
1755
1756 /* interpolate the two shadow textures */
1757 /* stage 0 == rgb(glcolor) + alpha(t0) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759
1760 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1761 gl.ActiveTexture (GL_TEXTURE1);
1762 glEnable (GL_TEXTURE_2D);
1763 glBindTexture (GL_TEXTURE_2D, name2);
1764 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1765
1766 /* rgb == rgb(glcolor) */
1767 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1770
1771 /* alpha = interpolate t0, t1 by env_alpha */
1772 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1773
1774 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1775 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1777
1778 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1780
1781 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1782 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1783
1784 glBegin (GL_QUADS);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1789 glEnd ();
1790
1791 glDisable (GL_TEXTURE_2D);
1792 gl.ActiveTexture (GL_TEXTURE0);
1793 }
1794 else
1795 {
1796 /* simple blending of one texture, also opengl <1.3 path */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1798
1799 glBegin (GL_QUADS);
1800 glTexCoord2f (0, 0); glVertex2f (0, 0);
1801 glTexCoord2f (0, t); glVertex2f (0, h);
1802 glTexCoord2f (s, t); glVertex2f (w, h);
1803 glTexCoord2f (s, 0); glVertex2f (w, 0);
1804 glEnd ();
1805 }
1806
1807 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1808 {
1809 int x, y;
1810 int dx3 = dx * 3;
1811 int dy3 = dy * 3;
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1814 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1815 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1816 glTranslatef (-1., -1., 0);
1817 glBegin (GL_QUADS);
1818
1819 for (y = 1; y < h; y += 3)
1820 {
1821 int y1 = y - dy3;
1822 int y1valid = y1 >= 0 && y1 < h;
1823
1824 for (x = 1; x < w; x += 3)
1825 {
1826 int x1 = x - dx3;
1827 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1828 uint8_t h2;
1829
1830 if (y1valid && x1 >= 0 && x1 < w)
1831 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1832 else
1833 h2 = 1; /* out of range == invisible */
1834
1835 if (h1 || h2)
1836 {
1837 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1838 glColor4f (1., 1., 1., alpha);
1839
1840 glTexCoord2f (0, 0.); glVertex2i (x , y );
1841 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1842 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1843 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1844 }
1845 }
1846 }
1847 }
1848
1849 glEnd ();
1850
1851 glPopMatrix ();
1852
1853 glDisable (GL_TEXTURE_2D);
1854 glDisable (GL_BLEND);
1855}
1856
1399IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1857IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1400 CODE: 1858 CODE:
1401{ 1859{
1402 GLint width; 1860 GLint width;
1403 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1861 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1405 RETVAL = width > 0; 1863 RETVAL = width > 0;
1406} 1864}
1407 OUTPUT: 1865 OUTPUT:
1408 RETVAL 1866 RETVAL
1409 1867
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1869
1412PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1413 1871
1414CFPlus::Map 1872DC::Map
1415new (SV *class) 1873new (SV *klass)
1416 CODE: 1874 CODE:
1417 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1876 RETVAL->x = 0;
1419 RETVAL->y = 0; 1877 RETVAL->y = 0;
1420 RETVAL->w = 0; 1878 RETVAL->w = 0;
… …
1427 RETVAL->row = 0; 1885 RETVAL->row = 0;
1428 OUTPUT: 1886 OUTPUT:
1429 RETVAL 1887 RETVAL
1430 1888
1431void 1889void
1432DESTROY (CFPlus::Map self) 1890DESTROY (DC::Map self)
1433 CODE: 1891 CODE:
1434{ 1892{
1435 map_clear (self); 1893 map_clear (self);
1436 Safefree (self->face2tile); 1894 Safefree (self->face2tile);
1437 Safefree (self->tex); 1895 Safefree (self->tex);
1438 Safefree (self); 1896 Safefree (self);
1439} 1897}
1440 1898
1441void 1899void
1442resize (CFPlus::Map self, int map_width, int map_height) 1900resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1901 CODE:
1444 self->w = map_width; 1902 self->w = map_width;
1445 self->h = map_height; 1903 self->h = map_height;
1446 1904
1447void 1905void
1448clear (CFPlus::Map self) 1906clear (DC::Map self)
1449 CODE: 1907 CODE:
1450 map_clear (self); 1908 map_clear (self);
1451 1909
1452void 1910void
1453set_tileid (CFPlus::Map self, int face, int tile) 1911set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1912 CODE:
1455{ 1913{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1914 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1915 need_texid (self, tile);
1458} 1916}
1459 1917
1460void 1918void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1919set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1920 CODE:
1463{ 1921{
1464 tileid texid; 1922 tileid texid;
1465 maptex *tex; 1923 maptex *tex;
1466 1924
… …
1479 tex->smoothtile = self->face2tile [smooth]; 1937 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1938 tex->smoothlevel = level;
1481} 1939}
1482 1940
1483void 1941void
1484set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1942set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1485 CODE: 1943 CODE:
1486{ 1944{
1487 need_texid (self, texid); 1945 need_texid (self, texid);
1488 1946
1489 { 1947 {
… …
1508 // use uglier nearest interpolation because linear suffers 1966 // use uglier nearest interpolation because linear suffers
1509 // from transparent color bleeding and ugly wrapping effects. 1967 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1968 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1969}
1512 1970
1971void
1972expire_textures (DC::Map self, int texid, int count)
1973 PPCODE:
1974 for (; texid < self->texs && count; ++texid, --count)
1975 {
1976 maptex *tex = self->tex + texid;
1977
1978 if (tex->name)
1979 {
1980 if (tex->unused)
1981 {
1982 tex->name = 0;
1983 tex->unused = 0;
1984 XPUSHs (sv_2mortal (newSViv (texid)));
1985 }
1986 else
1987 tex->unused = 1;
1988 }
1989 }
1990
1513int 1991int
1514ox (CFPlus::Map self) 1992ox (DC::Map self)
1515 ALIAS: 1993 ALIAS:
1516 oy = 1 1994 oy = 1
1517 x = 2 1995 x = 2
1518 y = 3 1996 y = 3
1519 w = 4 1997 w = 4
… …
1530 } 2008 }
1531 OUTPUT: 2009 OUTPUT:
1532 RETVAL 2010 RETVAL
1533 2011
1534void 2012void
1535scroll (CFPlus::Map self, int dx, int dy) 2013scroll (DC::Map self, int dx, int dy)
1536 CODE: 2014 CODE:
1537{ 2015{
1538 if (dx > 0) 2016 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 2017 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 2018 else if (dx < 0)
… …
1556 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1557 } 2035 }
1558} 2036}
1559 2037
1560SV * 2038SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1562 CODE: 2040 CODE:
1563{ 2041{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 2044 mapcell *cell;
… …
1587 2065
1588 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1589 2067
1590 if (flags & 8) 2068 if (flags & 8)
1591 { 2069 {
2070 uint8_t ext, cmd;
2071
1592 if (extmap) 2072 do
1593 { 2073 {
1594 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1595 2076
1596 do 2077 if (cmd < 4)
2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2079 else if (cmd == 5) // health
1597 { 2080 {
1598 ext = *data++;
1599 cmd = ext & 0x3f;
1600
1601 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1;
1603 else if (cmd == 5) // health
1604 {
1605 cell->stat_width = 1; 2081 cell->stat_width = 1;
1606 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1607 }
1608 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47)
1611 {
1612 if (*data == 4)
1613 ; // decode player count
1614
1615 data += *data + 1;
1616 }
1617 else if (cmd == 8) // cell flags
1618 cell->flags = *data++;
1619 else if (ext & 0x40) // unknown, multibyte => skip
1620 data += *data + 1;
1621 else
1622 data++;
1623 } 2083 }
1624 while (ext & 0x80); 2084 else if (cmd == 6) // monster width
2085 cell->stat_width = *data++ + 1;
2086 else if (cmd == 0x47)
2087 {
2088 if (*data == 1) cell->player = data [1];
2089 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2090 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2091 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2092
2093 data += *data + 1;
2094 }
2095 else if (cmd == 8) // cell flags
2096 cell->flags = *data++;
2097 else if (ext & 0x40) // unknown, multibyte => skip
2098 data += *data + 1;
2099 else
2100 data++;
1625 } 2101 }
1626 else 2102 while (ext & 0x80);
1627 cell->darkness = *data++ + 1;
1628 } 2103 }
1629 2104
1630 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1631 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1632 { 2107 {
… …
1635 cell->tile [z] = self->face2tile [face]; 2110 cell->tile [z] = self->face2tile [face];
1636 2111
1637 if (cell->tile [z]) 2112 if (cell->tile [z])
1638 { 2113 {
1639 maptex *tex = self->tex + cell->tile [z]; 2114 maptex *tex = self->tex + cell->tile [z];
2115 tex->unused = 0;
1640 if (!tex->name) 2116 if (!tex->name)
1641 av_push (missing, newSViv (cell->tile [z])); 2117 av_push (missing, newSViv (cell->tile [z]));
1642 2118
1643 if (tex->smoothtile) 2119 if (tex->smoothtile)
1644 { 2120 {
1645 maptex *smooth = self->tex + tex->smoothtile; 2121 maptex *smooth = self->tex + tex->smoothtile;
2122 smooth->unused = 0;
1646 if (!smooth->name) 2123 if (!smooth->name)
1647 av_push (missing, newSViv (tex->smoothtile)); 2124 av_push (missing, newSViv (tex->smoothtile));
1648 } 2125 }
1649 } 2126 }
1650 } 2127 }
1651 } 2128 }
1652 else 2129 else
1653 cell->darkness = 0; 2130 CELL_CLEAR (cell);
1654 } 2131 }
1655} 2132}
1656 OUTPUT: 2133 OUTPUT:
1657 RETVAL 2134 RETVAL
1658 2135
1659SV * 2136SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2137mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 2138 CODE:
1662{ 2139{
1663 int x1, x; 2140 int x1, x;
1664 int y1, y; 2141 int y1, y;
1665 int z; 2142 int z;
… …
1678 ? self->row + y 2155 ? self->row + y
1679 : 0; 2156 : 0;
1680 2157
1681 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1682 { 2159 {
1683 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1684 2161
1685 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1686 { 2163 {
1687 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1688 2165
… …
1690 { 2167 {
1691 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1692 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1693 int a1 = tex.a; 2170 int a1 = tex.a;
1694 2171
1695 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1696 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1697 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1698 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1699 } 2176 }
1700 } 2177 }
1701 2178
1702 *map++ = (r ) 2179 *map++ = (r )
1703 | (g << 8) 2180 | (g << 8)
… …
1710} 2187}
1711 OUTPUT: 2188 OUTPUT:
1712 RETVAL 2189 RETVAL
1713 2190
1714void 2191void
1715draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2192draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1716 CODE: 2193 CODE:
1717{ 2194{
2195 int x, y, z;
2196
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2198 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2199 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721 smooth_key skey; 2200 smooth_key skey;
1722 int x, y, z; 2201 int pl_x, pl_y;
1723 int last_name; 2202 maptex pl_tex;
2203 rc_t *rc = rc_alloc ();
2204 rc_t *rc_ov = rc_alloc ();
2205 rc_key_t key;
2206 rc_array_t *arr;
1724 2207
2208 pl_tex.name = 0;
2209
1725 // thats current max. sorry. 2210 // that's current max. sorry.
1726 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 2212 if (sh > 255) sh = 255;
1728 2213
1729 // clear key, in case of extra padding 2214 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 2215 memset (&skey, 0, sizeof (skey));
1731 2216
1732 glColor4ub (255, 255, 255, 255); 2217 memset (&key, 0, sizeof (key));
1733 2218 key.r = 255;
1734 glEnable (GL_BLEND); 2219 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2220 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 2221 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2222 key.mode = GL_QUADS;
1738 2223 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1;
1742 2224
1743 mx += self->x; 2225 mx += self->x;
1744 my += self->y; 2226 my += self->y;
1745 2227
1746 // first pass: determine smooth_max 2228 // first pass: determine smooth_max
… …
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 2245 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 2246 self->tex [cell->tile [2]].smoothlevel));
1765 } 2247 }
1766 } 2248 }
1767 2249
2250 glEnable (GL_BLEND);
2251 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2253
1768 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
1769 { 2255 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2257 key.texname = -1;
1771 2258
1772 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1773 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1774 { 2261 {
1775 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
… …
1783 if (tile) 2270 if (tile)
1784 { 2271 {
1785 maptex tex = self->tex [tile]; 2272 maptex tex = self->tex [tile];
1786 int px, py; 2273 int px, py;
1787 2274
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 2275 if (key.texname != tex.name)
1791 { 2276 {
2277 self->tex [tile].unused = 0;
2278
1792 if (!tex.name) 2279 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1794 2281
1795 glEnd (); 2282 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2283 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 2284 }
1799 2285
1800 px = (x + 1) * T - tex.w; 2286 px = (x + 1) * Th - tex.w;
1801 py = (y + 1) * T - tex.h; 2287 py = (y + 1) * Tw - tex.h;
1802 2288
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2289 if (expect_false (cell->player == player) && expect_false (z == 2))
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808 if (cell->flags && z == 2)
1809 { 2290 {
1810 if (cell->flags & 1) 2291 pl_x = px;
2292 pl_y = py;
2293 pl_tex = tex;
1811 { 2294 continue;
1812 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32;
1815
1816 glEnd ();
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1818 glBegin (GL_QUADS);
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 }
1825 } 2295 }
2296
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1826 2301
1827 // update smooth hash 2302 // update smooth hash
1828 if (tex.smoothtile) 2303 if (tex.smoothtile)
1829 { 2304 {
1830 skey.tile = tex.smoothtile; 2305 skey.tile = tex.smoothtile;
… …
1861 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2336 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1862 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2337 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1863 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2338 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1864 } 2339 }
1865 } 2340 }
2341
2342 if (expect_false (z == 2) && expect_false (cell->flags))
2343 {
2344 // overlays such as the speech bubble, probably more to come
2345 if (cell->flags & 1)
2346 {
2347 rc_key_t key_ov = key;
2348 maptex tex = self->tex [TEXID_SPEECH];
2349 rc_array_t *arr;
2350 int px = x * Tw + Tw * 2 / 32;
2351 int py = y * Th - Th * 6 / 32;
2352
2353 key_ov.texname = tex.name;
2354 arr = rc_array (rc_ov, &key_ov);
2355
2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2358 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2360 }
2361 }
1866 } 2362 }
1867 } 2363 }
2364
2365 rc_draw (rc);
2366 rc_clear (rc);
1868 2367
1869 // go through all smoothlevels, lowest to highest, then draw. 2368 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 2369 // this is basically counting sort
1871 { 2370 {
1872 int w, b; 2371 int w, b;
1873 2372
2373 glEnable (GL_TEXTURE_2D);
2374 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2375 for (w = 0; w < 256 / 32; ++w)
1875 { 2376 {
1876 uint32_t smask = smooth_level [w]; 2377 uint32_t smask = smooth_level [w];
1877 if (smask) 2378 if (smask)
1878 for (b = 0; b < 32; ++b) 2379 for (b = 0; b < 32; ++b)
… …
1890 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
1891 && skey->level == level 2392 && skey->level == level
1892 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
1893 { 2394 {
1894 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
1895 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
1896 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
1897 int border = bits & 15; 2398 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
1901 2402
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2403 if (tex.name)
1905 { 2404 {
2405 // this time avoiding texture state changes
2406 // save gobs of state changes.
1906 if (!tex.name) 2407 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2408 {
2409 self->tex [skey->tile].unused = 0;
1908 2410
1909 glEnd (); 2411 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2413 glBegin (GL_QUADS);
1912 } 2414 }
1913 2415
1914 if (border) 2416 if (border)
1915 { 2417 {
1916 float ox = border * dx; 2418 float ox = border * dx;
1917 2419
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1922 } 2424 }
1923 2425
1924 if (corner) 2426 if (corner)
1925 { 2427 {
1926 float ox = corner * dx; 2428 float ox = corner * dx;
1927 2429
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2434 }
1932 } 2435 }
1933 } 2436 }
1934 } 2437 }
1935 } 2438 }
1936 } 2439 }
2440
2441 glEnd ();
2442 glDisable (GL_TEXTURE_2D);
2443 key.texname = -1;
1937 } 2444 }
1938 2445
1939 hv_clear (smooth); 2446 hv_clear (smooth);
1940 } 2447 }
1941 2448
1942 glEnd (); 2449 if (pl_tex.name)
2450 {
2451 maptex tex = pl_tex;
2452 int px = pl_x + sdx;
2453 int py = pl_y + sdy;
1943 2454
1944 glDisable (GL_TEXTURE_2D); 2455 key.texname = tex.name;
2456 arr = rc_array (rc, &key);
2457
2458 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2459 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2460 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2461 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2462
2463 rc_draw (rc);
2464 }
2465
2466 rc_draw (rc_ov);
2467 rc_clear (rc_ov);
2468
1945 glDisable (GL_BLEND); 2469 glDisable (GL_BLEND);
2470 rc_free (rc);
2471 rc_free (rc_ov);
1946 2472
1947 // top layer: overlays such as the health bar 2473 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2474 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2475 if (0 <= y + my && y + my < self->rows)
1950 { 2476 {
… …
1953 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
1954 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
1955 { 2481 {
1956 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
1957 2483
1958 int px = x * T; 2484 int px = x * Tw;
1959 int py = y * T; 2485 int py = y * Th;
2486
2487 if (expect_false (cell->player == player))
2488 {
2489 px += sdx;
2490 py += sdy;
2491 }
1960 2492
1961 if (cell->stat_hp) 2493 if (cell->stat_hp)
1962 { 2494 {
1963 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
1964 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1965 2497
1966 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
1967 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
1968 px + width - 1, py); 2500 px + width - 1, py);
1969 2501
… …
1975 } 2507 }
1976 } 2508 }
1977} 2509}
1978 2510
1979void 2511void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2512draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1981 CODE: 2513 CODE:
1982{ 2514{
1983 static float color[16][3] = { 2515 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
1985 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
1986 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
1987 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
1988 2520
1989 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
1990 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
1991 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
1992 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
1993 2525
1994 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
1995 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
1996 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
1997 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
1998 2530
1999 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2000 2532
2001 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2002 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2003 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2004 }; 2536 };
2005 2537
2006 int x, y; 2538 int x, y;
2007 2539
2008 glEnable (GL_TEXTURE_2D); 2540 glEnable (GL_TEXTURE_2D);
2541 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2542 * but the nvidia driver (185.18.14) mishandles alpha textures
2543 * and takes the colour from god knows where instead of using
2544 * Cp. MODULATE results in the same colour, but slightly different
2545 * alpha, but atcually gives us the correct colour with nvidia.
2546 */
2009 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2010 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2011 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2012 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2013 2551
2014 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
… …
2018 2556
2019 if (m) 2557 if (m)
2020 { 2558 {
2021 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2022 2560
2023 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2024 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2025 2563
2026 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2027 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2028 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2029 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2030 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2031 } 2569 }
… …
2035 glDisable (GL_BLEND); 2573 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2574 glDisable (GL_TEXTURE_2D);
2037} 2575}
2038 2576
2039void 2577void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2578fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2579 PPCODE:
2042{ 2580{
2043 int x, y; 2581 int x, y;
2044 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2046 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2047 int sw34 = (sw * 3 + 3) & ~3; 2585 int sw3 = sw * 3;
2586 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2587 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2048 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2049 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2050 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2051 2590
2052 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2054 2593
2055 mx += self->x - 1; 2594 mx += self->x - 1;
2056 my += self->y - 1; 2595 my += self->y - 1;
2057
2058 memset (darkness1, 255, sw1 * sh1);
2059 2596
2060 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2062 { 2599 {
2063 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
… …
2066 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2067 { 2604 {
2068 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2069 2606
2070 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2071 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2072 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2073 } 2610 }
2074 } 2611 }
2075 2612
2076 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2077 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
… …
2096 2633
2097 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2098 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2099 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2100 2637
2101 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2102 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2103 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2104 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2105 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2106 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2107 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2108 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2109 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2110 } 2647 }
2111 2648
2112 free (darkness1); 2649 free (darkness1);
2113 2650
2114 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2115 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2118} 2655}
2119 2656
2120SV * 2657SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2658get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2659 CODE:
2123{ 2660{
2124 int x, y, x1, y1; 2661 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2662 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2663 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2183 else 2720 else
2184 *data++ = 0; 2721 *data++ = 0;
2185 } 2722 }
2186 } 2723 }
2187 2724
2725 /* if size is w*h + 5 then no data has been found */
2726 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2727 {
2188 SvPOK_only (data_sv); 2728 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2729 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2730 }
2731
2190 RETVAL = data_sv; 2732 RETVAL = data_sv;
2191} 2733}
2192 OUTPUT: 2734 OUTPUT:
2193 RETVAL 2735 RETVAL
2194 2736
2195void 2737void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2738set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2739 PPCODE:
2198{ 2740{
2199 int x, y, z; 2741 int x, y, z;
2200 int w, h; 2742 int w, h;
2201 int x1, y1; 2743 int x1, y1;
2744 STRLEN len;
2745 uint8_t *data, *end;
2746
2747 len = SvLEN (data_sv);
2748 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2749 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2750 end = data + len + 8;
2751
2752 if (len < 5)
2753 XSRETURN_EMPTY;
2202 2754
2203 if (*data++ != 0) 2755 if (*data++ != 0)
2204 return; /* version mismatch */ 2756 XSRETURN_EMPTY; /* version mismatch */
2205 2757
2206 w = *data++ << 8; w |= *data++; 2758 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2759 h = *data++ << 8; h |= *data++;
2208 2760
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2761 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2221 { 2773 {
2222 maprow *row = map_get_row (self, y); 2774 maprow *row = map_get_row (self, y);
2223 2775
2224 for (x = x0; x < x1; x++) 2776 for (x = x0; x < x1; x++)
2225 { 2777 {
2778 uint8_t flags;
2779
2780 if (data + 7 >= end)
2781 XSRETURN_EMPTY;
2782
2226 uint8_t flags = *data++; 2783 flags = *data++;
2227 2784
2228 if (flags) 2785 if (flags)
2229 { 2786 {
2230 mapcell *cell = row_get_cell (row, x); 2787 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2788 tileid tile[3] = { 0, 0, 0 };
… …
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2791 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2792 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2793
2237 if (cell->darkness == 0) 2794 if (cell->darkness == 0)
2238 { 2795 {
2239 cell->darkness = 0; 2796 /*cell->darkness = 0;*/
2797 EXTEND (SP, 3);
2240 2798
2241 for (z = 0; z <= 2; z++) 2799 for (z = 0; z <= 2; z++)
2242 { 2800 {
2243 tileid t = tile [z]; 2801 tileid t = tile [z];
2244 2802
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2803 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2804 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2805 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2806 need_texid (self, t);
2249 } 2807 }
2250 2808
2251 cell->tile [z] = t; 2809 cell->tile [z] = t;
2252 } 2810 }
… …
2254 } 2812 }
2255 } 2813 }
2256 } 2814 }
2257} 2815}
2258 2816
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2818
2261CFPlus::RW 2819DC::RW
2262new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2263 CODE: 2821 CODE:
2264{ 2822{
2265 STRLEN datalen; 2823 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2267 2825
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2826 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2827}
2270 OUTPUT: 2828 OUTPUT:
2271 RETVAL 2829 RETVAL
2272 2830
2273CFPlus::RW 2831DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2275 CODE: 2833 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2835 OUTPUT:
2278 RETVAL 2836 RETVAL
2279 2837
2280# fails on win32: 2838# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2839# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2840#void
2283#close (CFPlus::RW self) 2841#close (DC::RW self)
2284# CODE: 2842# CODE:
2285# (self->(close)) (self); 2843# (self->(close)) (self);
2286 2844
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2845MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2846
2289PROTOTYPES: DISABLE 2847PROTOTYPES: DISABLE
2290 2848
2291CFPlus::Channel 2849DC::Channel
2292find () 2850find ()
2293 CODE: 2851 CODE:
2294{ 2852{
2295 RETVAL = Mix_GroupAvailable (-1); 2853 RETVAL = Mix_GroupAvailable (-1);
2296 2854
2297 if (RETVAL < 0) 2855 if (RETVAL < 0)
2298 { 2856 {
2299 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2300 2858
2301 if (RETVAL < 0) 2859 if (RETVAL < 0)
2860 {
2861 // happens sometimes, maybe it just stopped playing(?)
2862 RETVAL = Mix_GroupAvailable (-1);
2863
2864 if (RETVAL < 0)
2302 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2303 2866 }
2867 else
2304 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2305 } 2869 }
2306 2870
2307 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2308 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2309} 2873}
2310 OUTPUT: 2874 OUTPUT:
2311 RETVAL 2875 RETVAL
2312 2876
2313void 2877void
2314halt (CFPlus::Channel self) 2878halt (DC::Channel self)
2315 CODE: 2879 CODE:
2316 Mix_HaltChannel (self); 2880 Mix_HaltChannel (self);
2317 2881
2318void 2882void
2319expire (CFPlus::Channel self, int ticks = -1) 2883expire (DC::Channel self, int ticks = -1)
2320 CODE: 2884 CODE:
2321 Mix_ExpireChannel (self, ticks); 2885 Mix_ExpireChannel (self, ticks);
2322 2886
2323void 2887void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2888fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2889 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2890 Mix_FadeOutChannel (self, ticks);
2327 2891
2328int 2892int
2329volume (CFPlus::Channel self, int volume) 2893volume (DC::Channel self, int volume)
2330 CODE: 2894 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2895 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2896 OUTPUT:
2333 RETVAL 2897 RETVAL
2334 2898
2335void 2899void
2336unregister_all_effects (CFPlus::Channel self) 2900unregister_all_effects (DC::Channel self)
2337 CODE: 2901 CODE:
2338 Mix_UnregisterAllEffects (self); 2902 Mix_UnregisterAllEffects (self);
2339 2903
2340void 2904void
2341set_panning (CFPlus::Channel self, int left, int right) 2905set_panning (DC::Channel self, int left, int right)
2342 CODE: 2906 CODE:
2343 left = CLAMP (left , 0, 255); 2907 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2908 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2909 Mix_SetPanning (self, left, right);
2346 2910
2347void 2911void
2348set_distance (CFPlus::Channel self, int distance) 2912set_distance (DC::Channel self, int distance)
2349 CODE: 2913 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2914 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2915
2352void 2916void
2353set_position (CFPlus::Channel self, int angle, int distance) 2917set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2918 CODE:
2355 2919
2356void 2920void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2922 CODE:
2359{ 2923{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2924 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2925 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2927}
2364 2928
2365void 2929void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2931 CODE:
2368 Mix_SetReverseStereo (self, flip); 2932 Mix_SetReverseStereo (self, flip);
2369 2933
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2935
2372PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2373 2937
2938void
2939decoders ()
2940 PPCODE:
2941#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2942 int i, num = Mix_GetNumChunkDecoders ();
2943 EXTEND (SP, num);
2944 for (i = 0; i < num; ++i)
2945 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2946#else
2947 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2948#endif
2949
2374CFPlus::MixChunk 2950DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2951new (SV *klass, DC::RW rwops)
2376 CODE: 2952 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2954 OUTPUT:
2379 RETVAL 2955 RETVAL
2380 2956
2381void 2957void
2382DESTROY (CFPlus::MixChunk self) 2958DESTROY (DC::MixChunk self)
2383 CODE: 2959 CODE:
2384 Mix_FreeChunk (self); 2960 Mix_FreeChunk (self);
2385 2961
2386int 2962int
2387volume (CFPlus::MixChunk self, int volume = -1) 2963volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2964 CODE:
2389 if (items > 1) 2965 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2966 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2967 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2968 OUTPUT:
2393 RETVAL 2969 RETVAL
2394 2970
2395CFPlus::Channel 2971DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2972play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2973 CODE:
2398{ 2974{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2975 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2976
2401 if (RETVAL < 0) 2977 if (RETVAL < 0)
… …
2408 } 2984 }
2409} 2985}
2410 OUTPUT: 2986 OUTPUT:
2411 RETVAL 2987 RETVAL
2412 2988
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2990
2991void
2992decoders ()
2993 PPCODE:
2994#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2995 int i, num = Mix_GetNumMusicDecoders ();
2996 EXTEND (SP, num);
2997 for (i = 0; i < num; ++i)
2998 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2999#else
3000 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3001#endif
2414 3002
2415int 3003int
2416volume (int volume = -1) 3004volume (int volume = -1)
2417 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2418 CODE: 3006 CODE:
… …
2430void 3018void
2431halt () 3019halt ()
2432 CODE: 3020 CODE:
2433 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2434 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2435CFPlus::MixMusic 3030DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 3031new (SV *klass, DC::RW rwops)
2437 CODE: 3032 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 3034 OUTPUT:
2440 RETVAL 3035 RETVAL
2441 3036
2442void 3037void
2443DESTROY (CFPlus::MixMusic self) 3038DESTROY (DC::MixMusic self)
2444 CODE: 3039 CODE:
2445 Mix_FreeMusic (self); 3040 Mix_FreeMusic (self);
2446 3041
2447int 3042int
2448play (CFPlus::MixMusic self, int loops = -1) 3043play (DC::MixMusic self, int loops = -1)
2449 CODE: 3044 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 3045 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 3046 OUTPUT:
2452 RETVAL 3047 RETVAL
2453 3048
2454void 3049void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3050fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 3051 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 3052 Mix_FadeInMusicPos (self, loops, ms, position);
2458 3053
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3054MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 3055
2461PROTOTYPES: ENABLE 3056PROTOTYPES: ENABLE
2462 3057
2463BOOT: 3058BOOT:
2464{ 3059{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3060 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 3061 static const struct {
2467 const char *name; 3062 const char *name;
2468 IV iv; 3063 IV iv;
2469 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2471 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2472 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2473 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2474 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2475 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2476 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2477 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2478 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
… …
2490 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2491 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2492 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2493 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2494 const_iv (GL_ONE_MINUS_DST_ALPHA), 3090 const_iv (GL_ONE_MINUS_DST_ALPHA),
3091 const_iv (GL_SRC_COLOR),
3092 const_iv (GL_DST_COLOR),
3093 const_iv (GL_ONE_MINUS_SRC_COLOR),
3094 const_iv (GL_ONE_MINUS_DST_COLOR),
2495 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2496 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2497 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2498 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2499 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
… …
2505 const_iv (GL_INTENSITY), 3105 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 3106 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 3107 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 3108 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3109 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3110 const_iv (GL_COMPRESSED_ALPHA_ARB),
3111 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3112 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3113 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3114 const_iv (GL_COMPRESSED_RGB_ARB),
3115 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 3116 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 3117 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 3118 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 3119 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 3120 const_iv (GL_TEXTURE_2D),
… …
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3159 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 3160 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 3161 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 3162 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 3163 const_iv (GL_GENERATE_MIPMAP_HINT),
3164 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 3165 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 3166 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2563 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2564 const_iv (GL_T2F_N3F_V3F), 3171 const_iv (GL_T2F_N3F_V3F),
3172 const_iv (GL_FUNC_ADD),
3173 const_iv (GL_FUNC_SUBTRACT),
3174 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2565# undef const_iv 3175# undef const_iv
2566 }; 3176 };
2567 3177
2568 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3178 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2569 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2570 3180
2571 texture_av = newAV (); 3181 texture_av = newAV ();
2572 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2573} 3183}
2574 3184
2575char * 3185void
3186disable_GL_EXT_blend_func_separate ()
3187 CODE:
3188 gl.BlendFuncSeparate = 0;
3189 gl.BlendFuncSeparateEXT = 0;
3190
3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2576gl_vendor () 3195gl_vendor ()
2577 CODE: 3196 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2579 OUTPUT: 3198 OUTPUT:
2580 RETVAL 3199 RETVAL
2581 3200
2582char * 3201const char *
2583gl_version () 3202gl_version ()
2584 CODE: 3203 CODE:
2585 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2586 OUTPUT: 3205 OUTPUT:
2587 RETVAL 3206 RETVAL
2588 3207
2589char * 3208const char *
2590gl_extensions () 3209gl_extensions ()
2591 CODE: 3210 CODE:
2592 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2593 OUTPUT: 3212 OUTPUT:
2594 RETVAL 3213 RETVAL
2595 3214
2596const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2597 3220
2598GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2599 CODE: 3222 CODE:
2600 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2601 OUTPUT: 3224 OUTPUT:
… …
2609 3232
2610int glGetError () 3233int glGetError ()
2611 3234
2612void glFinish () 3235void glFinish ()
2613 3236
3237void glFlush ()
3238
2614void glClear (int mask) 3239void glClear (int mask)
2615 3240
2616void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
2617 PROTOTYPE: @ 3242 PROTOTYPE: @
2618 3243
… …
2627void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
2628 3253
2629void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2630 CODE: 3255 CODE:
2631 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
2632 3259
2633void glDepthMask (int flag) 3260void glDepthMask (int flag)
2634 3261
2635void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
2636 3263
… …
2671void glRotate (float angle, float x, float y, float z) 3298void glRotate (float angle, float x, float y, float z)
2672 CODE: 3299 CODE:
2673 glRotatef (angle, x, y, z); 3300 glRotatef (angle, x, y, z);
2674 3301
2675void glColor (float r, float g, float b, float a = 1.0) 3302void glColor (float r, float g, float b, float a = 1.0)
3303 PROTOTYPE: @
2676 ALIAS: 3304 ALIAS:
2677 glColor_premultiply = 1 3305 glColor_premultiply = 1
2678 CODE: 3306 CODE:
2679 if (ix) 3307 if (ix)
2680 { 3308 {
… …
2700 3328
2701void glRect (float x1, float y1, float x2, float y2) 3329void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 3330 CODE:
2703 glRectf (x1, y1, x2, y2); 3331 glRectf (x1, y1, x2, y2);
2704 3332
3333void glRect_lineloop (float x1, float y1, float x2, float y2)
3334 CODE:
3335 glBegin (GL_LINE_LOOP);
3336 glVertex2f (x1, y1);
3337 glVertex2f (x2, y1);
3338 glVertex2f (x2, y2);
3339 glVertex2f (x1, y2);
3340 glEnd ();
3341
2705PROTOTYPES: ENABLE 3342PROTOTYPES: ENABLE
2706 3343
2707void glBegin (int mode) 3344void glBegin (int mode)
2708 3345
2709void glEnd () 3346void glEnd ()
… …
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3378void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 3379 CODE:
2743 if (gl.SeparableFilter2D) 3380 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3381 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 3382
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3383void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 3384
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3385void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 3386
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 3387void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 3388
… …
2777 3414
2778void glEndList () 3415void glEndList ()
2779 3416
2780void glCallList (int list) 3417void glCallList (int list)
2781 3418
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3419void c_init ()
3420 CODE:
3421 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3422 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3423
3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 3425
2784PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
2785 3427
2786void 3428void
2787find_widget (SV *self, NV x, NV y) 3429find_widget (SV *self, NV x, NV y)
… …
2791 XPUSHs (self); 3433 XPUSHs (self);
2792} 3434}
2793 3435
2794BOOT: 3436BOOT:
2795{ 3437{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3438 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3439
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3440 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3441 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3442 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3443 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 3444}
2803 3445
2804void 3446void
2805draw (SV *self) 3447draw (SV *self)
2806 CODE: 3448 CODE:
… …
2810 NV x, y, w, h; 3452 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3453 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3454 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3455 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3456 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3457 double draw_x, draw_y;
2817 3458
2818 if (!SvROK (self)) 3459 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3460 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3461
2821 hv = (HV *)SvRV (self); 3462 hv = (HV *)SvRV (self);
2822 3463
2823 if (SvTYPE (hv) != SVt_PVHV) 3464 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3465 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3466
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3467 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3468 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 3469
2829 if (!h || !w) 3470 if (!h || !w)
… …
2849 { 3490 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3491 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3492
2852 if (svp && SvTRUE (*svp)) 3493 if (svp && SvTRUE (*svp))
2853 { 3494 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3495 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 3496 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3497 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3498 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3499 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3500 glVertex2f (w, 0);
… …
2862 glEnd (); 3503 glEnd ();
2863 glDisable (GL_BLEND); 3504 glDisable (GL_BLEND);
2864 } 3505 }
2865 } 3506 }
2866#if 0 3507#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3508 // draw borders, for debugging
2868 glPushMatrix; 3509 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3510 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3511 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3512 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3513 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3514 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3515 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3516 glVertex2f (0 , h - 1);
2876 glEnd; 3517 glEnd ();
2877 glPopMatrix; 3518 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3519#endif
2881 PUSHMARK (SP); 3520 PUSHMARK (SP);
2882 XPUSHs (self); 3521 XPUSHs (self);
2883 PUTBACK; 3522 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3523 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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