ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.318 by root, Wed Dec 24 06:12:21 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines