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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
27#include <stdio.h> 31#include <stdio.h>
28#include <stdlib.h> 32#include <stdlib.h>
33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 35
30#include <SDL.h> 36#include <SDL.h>
31#include <SDL_thread.h> 37#include <SDL_thread.h>
32#include <SDL_endian.h> 38#include <SDL_endian.h>
33#include <SDL_image.h> 39#include <SDL_image.h>
34#include <SDL_mixer.h> 40#include <SDL_mixer.h>
35#include <SDL_opengl.h> 41#include <SDL_opengl.h>
36 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
37#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
39 52
40#include <glib/gmacros.h> 53#include <glib/gmacros.h>
41 54
42#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
43 67
44#ifndef _WIN32 68#ifndef _WIN32
45# include <sys/types.h> 69# include <sys/types.h>
46# include <sys/socket.h> 70# include <sys/socket.h>
47# include <netinet/in.h> 71# include <netinet/in.h>
48# include <netinet/tcp.h> 72# include <netinet/tcp.h>
49# include <inttypes.h> 73# include <inttypes.h>
50#endif 74#endif
51 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
54#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
55 91
56#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
58 94
59#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
60 96
61#if 0 97/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 99
64# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
65#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
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 ()
583{
584 char *argv[] = { 0 };
585 call_argv ("DC::Main::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to shared library magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
618
619MODULE = Deliantra::Client PACKAGE = DC
482 620
483PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
484 622
485BOOT: 623BOOT:
486{ 624{
487 HV *stash = gv_stashpv ("CFPlus", 1); 625 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 626 static const struct {
489 const char *name; 627 const char *name;
490 IV iv; 628 IV iv;
491 } *civ, const_iv[] = { 629 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 630# define const_iv(name) { # name, (IV)name }
514 652
515 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 655 const_iv (SDL_APPACTIVE),
518 656
657
658 const_iv (SDLK_UNKNOWN),
659 const_iv (SDLK_FIRST),
660 const_iv (SDLK_BACKSPACE),
661 const_iv (SDLK_TAB),
662 const_iv (SDLK_CLEAR),
663 const_iv (SDLK_RETURN),
664 const_iv (SDLK_PAUSE),
665 const_iv (SDLK_ESCAPE),
666 const_iv (SDLK_SPACE),
667 const_iv (SDLK_EXCLAIM),
668 const_iv (SDLK_QUOTEDBL),
669 const_iv (SDLK_HASH),
670 const_iv (SDLK_DOLLAR),
671 const_iv (SDLK_AMPERSAND),
672 const_iv (SDLK_QUOTE),
673 const_iv (SDLK_LEFTPAREN),
674 const_iv (SDLK_RIGHTPAREN),
675 const_iv (SDLK_ASTERISK),
676 const_iv (SDLK_PLUS),
677 const_iv (SDLK_COMMA),
678 const_iv (SDLK_MINUS),
679 const_iv (SDLK_PERIOD),
680 const_iv (SDLK_SLASH),
681 const_iv (SDLK_0),
682 const_iv (SDLK_1),
683 const_iv (SDLK_2),
684 const_iv (SDLK_3),
685 const_iv (SDLK_4),
686 const_iv (SDLK_5),
687 const_iv (SDLK_6),
688 const_iv (SDLK_7),
689 const_iv (SDLK_8),
690 const_iv (SDLK_9),
691 const_iv (SDLK_COLON),
692 const_iv (SDLK_SEMICOLON),
693 const_iv (SDLK_LESS),
694 const_iv (SDLK_EQUALS),
695 const_iv (SDLK_GREATER),
696 const_iv (SDLK_QUESTION),
697 const_iv (SDLK_AT),
698
699 const_iv (SDLK_LEFTBRACKET),
700 const_iv (SDLK_BACKSLASH),
701 const_iv (SDLK_RIGHTBRACKET),
702 const_iv (SDLK_CARET),
703 const_iv (SDLK_UNDERSCORE),
704 const_iv (SDLK_BACKQUOTE),
705 const_iv (SDLK_DELETE),
706
707 const_iv (SDLK_FIRST),
708 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 711 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 712 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 713 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 785 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
790
791 const_iv (KMOD_LRAM),
792
793 const_iv (MIX_DEFAULT_FORMAT),
794
795 const_iv (SDL_INIT_TIMER),
796 const_iv (SDL_INIT_AUDIO),
797 const_iv (SDL_INIT_VIDEO),
798 const_iv (SDL_INIT_CDROM),
799 const_iv (SDL_INIT_JOYSTICK),
800 const_iv (SDL_INIT_EVERYTHING),
801 const_iv (SDL_INIT_NOPARACHUTE),
802 const_iv (SDL_INIT_EVENTTHREAD),
803
804 const_iv (SDL_GL_RED_SIZE),
805 const_iv (SDL_GL_GREEN_SIZE),
806 const_iv (SDL_GL_BLUE_SIZE),
807 const_iv (SDL_GL_ALPHA_SIZE),
808 const_iv (SDL_GL_DOUBLEBUFFER),
809 const_iv (SDL_GL_BUFFER_SIZE),
810 const_iv (SDL_GL_DEPTH_SIZE),
811 const_iv (SDL_GL_STENCIL_SIZE),
812 const_iv (SDL_GL_ACCUM_RED_SIZE),
813 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
814 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
815 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
816 const_iv (SDL_GL_STEREO),
817 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
818 const_iv (SDL_GL_MULTISAMPLESAMPLES),
819 const_iv (SDL_GL_ACCELERATED_VISUAL),
820 const_iv (SDL_GL_SWAP_CONTROL),
821
822 const_iv (FOW_DARKNESS)
600# undef const_iv 823# undef const_iv
601 }; 824 };
602 825
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
605 828
606 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
607 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
608} 831}
609 832
622 845
623NV floor (NV x) 846NV floor (NV x)
624 847
625NV ceil (NV x) 848NV ceil (NV x)
626 849
850IV minpot (UV n)
851
852IV popcount (UV n)
853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
859
627void 860void
628pango_init () 861pango_init ()
629 CODE: 862 CODE:
630{ 863{
631 opengl_fontmap = pango_opengl_font_map_new (); 864 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 865 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); 866 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
867 /*pango_context_set_font_description (opengl_context, default_font);*/
868#if PANGO_VERSION_CHECK (1, 15, 2)
869 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
871#endif
634} 872}
635 873
636char *
637SDL_GetError () 874char *SDL_GetError ()
638 875
639int 876void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 877
642void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
643SDL_Quit () 884void SDL_Quit ()
885
886int SDL_GL_SetAttribute (int attr, int value)
887
888int SDL_GL_GetAttribute (int attr)
889 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL))
891 XSRETURN_UNDEF;
892 OUTPUT:
893 RETVAL
644 894
645void 895void
646SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
647 PPCODE: 897 PPCODE:
648{ 898{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 913
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 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); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 916
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 918
672 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
673 while (*m) 920 while (*m)
674 { 921 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 923 {
677 AV *av = newAV (); 924 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
704 951
705 if (RETVAL) 952 if (RETVAL)
706 { 953 {
707 av_clear (texture_av); 954 av_clear (texture_av);
708 955
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 958#include "glfunc.h"
712#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
713 } 963 }
714} 964}
715 OUTPUT: 965 OUTPUT:
716 RETVAL 966 RETVAL
717 967
721char * 971char *
722SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
723 973
724int 974int
725SDL_GetAppState () 975SDL_GetAppState ()
976
977int
978SDL_GetModState ()
726 979
727void 980void
728poll_events () 981poll_events ()
729 PPCODE: 982 PPCODE:
730{ 983{
740 { 993 {
741 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
742 case SDL_KEYUP: 995 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 998 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 */ 999 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); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 1001 break;
749 1002
750 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 1022 x = ev.motion.x;
770 y = ev.motion.y; 1023 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 1025 }
773 1026
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 1033 }
781 break; 1034 break;
782 1035
783 case SDL_MOUSEBUTTONDOWN: 1036 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1037 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1038 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1039
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1040 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1042 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1043 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1048 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1049 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1050 break;
798 } 1051 }
799 1052
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1054 }
802} 1055}
803 1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
1069
804int 1070int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1072 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
809 1075
810void 1076void
1077Mix_QuerySpec ()
1078 PPCODE:
1079{
1080 int freq, channels;
1081 Uint16 format;
1082
1083 if (Mix_QuerySpec (&freq, &format, &channels))
1084 {
1085 EXTEND (SP, 3);
1086 PUSHs (sv_2mortal (newSViv (freq)));
1087 PUSHs (sv_2mortal (newSViv (format)));
1088 PUSHs (sv_2mortal (newSViv (channels)));
1089 }
1090}
1091
1092void
811Mix_CloseAudio () 1093Mix_CloseAudio ()
812 1094
813int 1095int
814Mix_AllocateChannels (int numchans = -1) 1096Mix_AllocateChannels (int numchans = -1)
1097
1098const char *
1099Mix_GetError ()
815 1100
816void 1101void
817lowdelay (int fd, int val = 1) 1102lowdelay (int fd, int val = 1)
818 CODE: 1103 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1104 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1130 }
846 } 1131 }
847#endif 1132#endif
848} 1133}
849 1134
850void 1135int
851add_font (char *file) 1136add_font (char *file)
852 CODE: 1137 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1139 OUTPUT:
1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1144
1145void
1146Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
854 1147
855void 1148void
856load_image_inline (SV *image_) 1149load_image_inline (SV *image_)
857 ALIAS: 1150 ALIAS:
858 load_image_file = 1 1151 load_image_file = 1
861 STRLEN image_len; 1154 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1155 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1156 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1157 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1158 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1159 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1160 : SDL_RWFromConstMem (image, image_len);
868 1161
869 if (!rw) 1162 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1163 croak ("load_image: %s", SDL_GetError ());
871 1164
944void 1237void
945error (char *message) 1238error (char *message)
946 CODE: 1239 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1240 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1241#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1242 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1243#endif
951 1244
952void 1245void
953fatal (char *message) 1246fatal (char *message)
954 CODE: 1247 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1248 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1249#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1250 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1251#endif
959 _exit (1); 1252 _exit (1);
960 1253
961void 1254void
962_exit (int retval = 0) 1255_exit (int retval = 0)
974#if DEBUG 1267#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1268 VALGRIND_DO_LEAK_CHECK;
976#endif 1269#endif
977} 1270}
978 1271
979MODULE = CFPlus PACKAGE = CFPlus::Font 1272int
1273SvREFCNT (SV *sv)
1274 CODE:
1275 RETVAL = SvREFCNT (sv);
1276 OUTPUT:
1277 RETVAL
1278
1279MODULE = Deliantra::Client PACKAGE = DC::Font
980 1280
981PROTOTYPES: DISABLE 1281PROTOTYPES: DISABLE
982 1282
983CFPlus::Font 1283DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1284new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1285 CODE:
986{ 1286{
987 int count; 1287 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1288 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1291}
992 OUTPUT: 1292 OUTPUT:
993 RETVAL 1293 RETVAL
994 1294
995void 1295void
996DESTROY (CFPlus::Font self) 1296DESTROY (DC::Font self)
997 CODE: 1297 CODE:
998 pango_font_description_free (self); 1298 pango_font_description_free (self);
999 1299
1000void 1300void
1001make_default (CFPlus::Font self) 1301make_default (DC::Font self)
1002 PROTOTYPE: $ 1302 PROTOTYPE: $
1003 CODE: 1303 CODE:
1004 default_font = self; 1304 default_font = self;
1005 1305
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1306MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1307
1008PROTOTYPES: DISABLE 1308PROTOTYPES: DISABLE
1009 1309
1010void 1310void
1011reset_glyph_cache () 1311glyph_cache_backup ()
1012 PROTOTYPE: 1312 PROTOTYPE:
1013 CODE: 1313 CODE:
1314 tc_backup ();
1315
1316void
1317glyph_cache_restore ()
1318 PROTOTYPE:
1319 CODE:
1014 tc_clear (); 1320 tc_restore ();
1015 1321
1016CFPlus::Layout 1322DC::Layout
1017new (SV *class) 1323new (SV *class)
1018 CODE: 1324 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1325 New (0, RETVAL, 1, struct cf_layout);
1020 1326
1021 RETVAL->pl = pango_layout_new (opengl_context); 1327 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1329 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1330 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1331 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1332 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1333 RETVAL->font = 0;
1334 RETVAL->rc = rc_alloc ();
1028 1335
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1336 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1337 layout_update_font (RETVAL);
1031 OUTPUT: 1338 OUTPUT:
1032 RETVAL 1339 RETVAL
1033 1340
1034void 1341void
1035DESTROY (CFPlus::Layout self) 1342DESTROY (DC::Layout self)
1036 CODE: 1343 CODE:
1037 g_object_unref (self->pl); 1344 g_object_unref (self->pl);
1345 rc_free (self->rc);
1038 Safefree (self); 1346 Safefree (self);
1039 1347
1040void 1348void
1041set_text (CFPlus::Layout self, SV *text_) 1349set_text (DC::Layout self, SV *text_)
1042 CODE: 1350 CODE:
1043{ 1351{
1044 STRLEN textlen; 1352 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1353 char *text = SvPVutf8 (text_, textlen);
1046 1354
1047 pango_layout_set_text (self->pl, text, textlen); 1355 pango_layout_set_text (self->pl, text, textlen);
1048} 1356}
1049 1357
1050void 1358void
1051set_markup (CFPlus::Layout self, SV *text_) 1359set_markup (DC::Layout self, SV *text_)
1052 CODE: 1360 CODE:
1053{ 1361{
1054 STRLEN textlen; 1362 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1363 char *text = SvPVutf8 (text_, textlen);
1056 1364
1057 pango_layout_set_markup (self->pl, text, textlen); 1365 pango_layout_set_markup (self->pl, text, textlen);
1058} 1366}
1059 1367
1060void 1368void
1061set_shapes (CFPlus::Layout self, ...) 1369set_shapes (DC::Layout self, ...)
1062 CODE: 1370 CODE:
1063{ 1371{
1064 PangoAttrList *attrs = 0; 1372 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1373 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1374 const char *pos = text;
1101 if (attrs) 1409 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1410 pango_layout_set_attributes (self->pl, attrs);
1103} 1411}
1104 1412
1105void 1413void
1106get_shapes (CFPlus::Layout self) 1414get_shapes (DC::Layout self)
1107 PPCODE: 1415 PPCODE:
1108{ 1416{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1417 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1418
1111 do 1419 do
1112 { 1420 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1421 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1422
1115 if (run && shape_attr_p (run)) 1423 if (run && shape_attr_p (run))
1116 { 1424 {
1117 PangoRectangle extents; 1425 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1426 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1434
1127 pango_layout_iter_free (iter); 1435 pango_layout_iter_free (iter);
1128} 1436}
1129 1437
1130int 1438int
1131has_wrapped (CFPlus::Layout self) 1439has_wrapped (DC::Layout self)
1132 CODE: 1440 CODE:
1133{ 1441{
1134 int lines = 1; 1442 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1443 const char *text = pango_layout_get_text (self->pl);
1136 1444
1141} 1449}
1142 OUTPUT: 1450 OUTPUT:
1143 RETVAL 1451 RETVAL
1144 1452
1145SV * 1453SV *
1146get_text (CFPlus::Layout self) 1454get_text (DC::Layout self)
1147 CODE: 1455 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1456 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1457 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1458 OUTPUT:
1151 RETVAL 1459 RETVAL
1152 1460
1153void 1461void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1462set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1463 CODE:
1156 self->r = r; 1464 self->r = r;
1157 self->g = g; 1465 self->g = g;
1158 self->b = b; 1466 self->b = b;
1159 self->a = a; 1467 self->a = a;
1160 1468
1161void 1469void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1470set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1471 CODE:
1164 if (self->font != font) 1472 if (self->font != font)
1165 { 1473 {
1166 self->font = font; 1474 self->font = font;
1167 layout_update_font (self); 1475 layout_update_font (self);
1168 } 1476 }
1169 1477
1170void 1478void
1171set_height (CFPlus::Layout self, int base_height) 1479set_height (DC::Layout self, int base_height)
1172 CODE: 1480 CODE:
1173 if (self->base_height != base_height) 1481 if (self->base_height != base_height)
1174 { 1482 {
1175 self->base_height = base_height; 1483 self->base_height = base_height;
1176 layout_update_font (self); 1484 layout_update_font (self);
1177 } 1485 }
1178 1486
1179void 1487void
1180set_width (CFPlus::Layout self, int max_width = -1) 1488set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1489 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1490 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1491
1184void 1492void
1185set_indent (CFPlus::Layout self, int indent) 1493set_indent (DC::Layout self, int indent)
1186 CODE: 1494 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1495 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1496
1189void 1497void
1190set_spacing (CFPlus::Layout self, int spacing) 1498set_spacing (DC::Layout self, int spacing)
1191 CODE: 1499 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1500 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1501
1194void 1502void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1503set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1504 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1505 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1506 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1507 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1508 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1509 : PANGO_ELLIPSIZE_NONE
1202 ); 1510 );
1203 1511
1204void 1512void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1513set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1514 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1515 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1516
1209void 1517void
1210size (CFPlus::Layout self) 1518size (DC::Layout self)
1211 PPCODE: 1519 PPCODE:
1212{ 1520{
1213 int w, h; 1521 int w, h;
1214 1522
1215 layout_get_pixel_size (self, &w, &h); 1523 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1526 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1527 PUSHs (sv_2mortal (newSViv (h)));
1220} 1528}
1221 1529
1222int 1530int
1223descent (CFPlus::Layout self) 1531descent (DC::Layout self)
1224 CODE: 1532 CODE:
1225{ 1533{
1226 PangoRectangle rect; 1534 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1535 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1536 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1537 RETVAL = PANGO_DESCENT (rect);
1230} 1538}
1231 OUTPUT: 1539 OUTPUT:
1232 RETVAL 1540 RETVAL
1233 1541
1234int 1542int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1543xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1544 CODE:
1237{ 1545{
1238 int index, trailing; 1546 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1547 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1548 RETVAL = index + trailing;
1241} 1549}
1242 OUTPUT: 1550 OUTPUT:
1243 RETVAL 1551 RETVAL
1244 1552
1245void 1553void
1246cursor_pos (CFPlus::Layout self, int index) 1554cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1555 PPCODE:
1248{ 1556{
1249 PangoRectangle strong_pos; 1557 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1558 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1559
1252 EXTEND (SP, 3); 1560 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1561 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1562 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1563 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1564}
1257 1565
1258void 1566void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1567index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1568 PPCODE:
1261{ 1569{
1262 int line, x; 1570 int line, x;
1263 1571
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1572 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1573#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1574 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1575 --line;
1576#endif
1267 EXTEND (SP, 2); 1577 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1578 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1579 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1580}
1271 1581
1272void 1582void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1583line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1584 PPCODE:
1275{ 1585{
1276 PangoLayoutLine *lp; 1586 PangoLayoutLine *lp;
1277 int index, trailing; 1587 int index, trailing;
1278 1588
1279 if (line < 0) 1589 if (line < 0)
1280 XSRETURN_EMPTY; 1590 XSRETURN_EMPTY;
1281 1591
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1592 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1593 XSRETURN_EMPTY; /* do better */
1284 1594
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1595 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1596
1287 EXTEND (SP, 2); 1597 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1603 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1604 }
1295} 1605}
1296 1606
1297void 1607void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1608render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1609 CODE:
1610 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1611 pango_opengl_render_layout_subpixel (
1301 self->pl, 1612 self->pl,
1613 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1614 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1615 self->r, self->g, self->b, self->a,
1304 flags 1616 flags
1305 ); 1617 );
1618 // we assume that context_change actually clears/frees stuff
1619 // and does not do any recomputation...
1620 pango_layout_context_changed (self->pl);
1306 1621
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1622void
1623draw (DC::Layout self)
1624 CODE:
1625{
1626 glEnable (GL_TEXTURE_2D);
1627 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1628 glEnable (GL_BLEND);
1629 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1630 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1631 glEnable (GL_ALPHA_TEST);
1632 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1633
1634 rc_draw (self->rc);
1635
1636 glDisable (GL_ALPHA_TEST);
1637 glDisable (GL_BLEND);
1638 glDisable (GL_TEXTURE_2D);
1639}
1640
1641MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1642
1309PROTOTYPES: ENABLE 1643PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1644
1313void 1645void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1646pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1647 CODE:
1316{ 1648{
1343 HV *hv = (HV *)SvRV (self); 1675 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1676 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1677 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1678 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1679
1680 if (name <= 0)
1681 XSRETURN_EMPTY;
1682
1348 if (items < 5) 1683 if (items < 5)
1349 { 1684 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1685 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1686 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1687 }
1379 glDisable (GL_ALPHA_TEST); 1714 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1715 glDisable (GL_BLEND);
1381 } 1716 }
1382} 1717}
1383 1718
1719void
1720draw_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)
1721 PROTOTYPE: @
1722 CODE:
1723{
1724 glEnable (GL_BLEND);
1725 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1726 glEnable (GL_TEXTURE_2D);
1727 glBindTexture (GL_TEXTURE_2D, name1);
1728
1729 glColor3f (intensity, intensity, intensity);
1730 glPushMatrix ();
1731 glScalef (1./3, 1./3, 1.);
1732
1733 if (blend > 0.f)
1734 {
1735 float dx3 = dx * -3.f / w;
1736 float dy3 = dy * -3.f / h;
1737 GLfloat env_color[4] = { 0., 0., 0., blend };
1738
1739 /* interpolate the two shadow textures */
1740 /* stage 0 == rgb(glcolor) + alpha(t0) */
1741 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1742
1743 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1744 gl.ActiveTexture (GL_TEXTURE1);
1745 glEnable (GL_TEXTURE_2D);
1746 glBindTexture (GL_TEXTURE_2D, name2);
1747 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1748
1749 /* rgb == rgb(glcolor) */
1750 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1751 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1752 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1753
1754 /* alpha = interpolate t0, t1 by env_alpha */
1755 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1756
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1766
1767 glBegin (GL_QUADS);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1769 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1770 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1771 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1772 glEnd ();
1773
1774 glDisable (GL_TEXTURE_2D);
1775 gl.ActiveTexture (GL_TEXTURE0);
1776 }
1777 else
1778 {
1779 /* simple blending of one texture, also opengl <1.3 path */
1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1781
1782 glBegin (GL_QUADS);
1783 glTexCoord2f (0, 0); glVertex2f (0, 0);
1784 glTexCoord2f (0, t); glVertex2f (0, h);
1785 glTexCoord2f (s, t); glVertex2f (w, h);
1786 glTexCoord2f (s, 0); glVertex2f (w, 0);
1787 glEnd ();
1788 }
1789
1790 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1791 {
1792 int x, y;
1793 int dx3 = dx * 3;
1794 int dy3 = dy * 3;
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1797 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1798 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1799 glTranslatef (-1., -1., 0);
1800 glBegin (GL_QUADS);
1801
1802 for (y = 1; y < h; y += 3)
1803 {
1804 int y1 = y - dy3;
1805 int y1valid = y1 >= 0 && y1 < h;
1806
1807 for (x = 1; x < w; x += 3)
1808 {
1809 int x1 = x - dx3;
1810 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1811 uint8_t h2;
1812
1813 if (y1valid && x1 >= 0 && x1 < w)
1814 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1815 else
1816 h2 = 1; /* out of range == invisible */
1817
1818 if (h1 || h2)
1819 {
1820 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1821 glColor4f (1., 1., 1., alpha);
1822
1823 glTexCoord2f (0, 0.); glVertex2i (x , y );
1824 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1825 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1826 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1827 }
1828 }
1829 }
1830 }
1831
1832 glEnd ();
1833
1834 glPopMatrix ();
1835
1836 glDisable (GL_TEXTURE_2D);
1837 glDisable (GL_BLEND);
1838}
1839
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1840IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE: 1841 CODE:
1386{ 1842{
1387 GLint width; 1843 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1844 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1390 RETVAL = width > 0; 1846 RETVAL = width > 0;
1391} 1847}
1392 OUTPUT: 1848 OUTPUT:
1393 RETVAL 1849 RETVAL
1394 1850
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1851MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1852
1397PROTOTYPES: DISABLE 1853PROTOTYPES: DISABLE
1398 1854
1399CFPlus::Map 1855DC::Map
1400new (SV *class) 1856new (SV *class)
1401 CODE: 1857 CODE:
1402 New (0, RETVAL, 1, struct map); 1858 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1859 RETVAL->x = 0;
1404 RETVAL->y = 0; 1860 RETVAL->y = 0;
1412 RETVAL->row = 0; 1868 RETVAL->row = 0;
1413 OUTPUT: 1869 OUTPUT:
1414 RETVAL 1870 RETVAL
1415 1871
1416void 1872void
1417DESTROY (CFPlus::Map self) 1873DESTROY (DC::Map self)
1418 CODE: 1874 CODE:
1419{ 1875{
1420 map_clear (self); 1876 map_clear (self);
1421 Safefree (self->face2tile); 1877 Safefree (self->face2tile);
1422 Safefree (self->tex); 1878 Safefree (self->tex);
1423 Safefree (self); 1879 Safefree (self);
1424} 1880}
1425 1881
1426void 1882void
1427resize (CFPlus::Map self, int map_width, int map_height) 1883resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1884 CODE:
1429 self->w = map_width; 1885 self->w = map_width;
1430 self->h = map_height; 1886 self->h = map_height;
1431 1887
1432void 1888void
1433clear (CFPlus::Map self) 1889clear (DC::Map self)
1434 CODE: 1890 CODE:
1435 map_clear (self); 1891 map_clear (self);
1436 1892
1437void 1893void
1438set_tileid (CFPlus::Map self, int face, int tile) 1894set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1895 CODE:
1440{ 1896{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1897 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1898 need_texid (self, tile);
1443} 1899}
1444 1900
1445void 1901void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1902set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1903 CODE:
1448{ 1904{
1449 tileid texid; 1905 tileid texid;
1450 maptex *tex; 1906 maptex *tex;
1451 1907
1464 tex->smoothtile = self->face2tile [smooth]; 1920 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1921 tex->smoothlevel = level;
1466} 1922}
1467 1923
1468void 1924void
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) 1925set_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: 1926 CODE:
1471{ 1927{
1472 need_texid (self, texid); 1928 need_texid (self, texid);
1473 1929
1474 { 1930 {
1493 // use uglier nearest interpolation because linear suffers 1949 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1950 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1952}
1497 1953
1954void
1955expire_textures (DC::Map self, int texid, int count)
1956 PPCODE:
1957 for (; texid < self->texs && count; ++texid, --count)
1958 {
1959 maptex *tex = self->tex + texid;
1960
1961 if (tex->name)
1962 {
1963 if (tex->unused)
1964 {
1965 tex->name = 0;
1966 tex->unused = 0;
1967 XPUSHs (sv_2mortal (newSViv (texid)));
1968 }
1969 else
1970 tex->unused = 1;
1971 }
1972 }
1973
1498int 1974int
1499ox (CFPlus::Map self) 1975ox (DC::Map self)
1500 ALIAS: 1976 ALIAS:
1501 oy = 1 1977 oy = 1
1502 x = 2 1978 x = 2
1503 y = 3 1979 y = 3
1504 w = 4 1980 w = 4
1515 } 1991 }
1516 OUTPUT: 1992 OUTPUT:
1517 RETVAL 1993 RETVAL
1518 1994
1519void 1995void
1520scroll (CFPlus::Map self, int dx, int dy) 1996scroll (DC::Map self, int dx, int dy)
1521 CODE: 1997 CODE:
1522{ 1998{
1523 if (dx > 0) 1999 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 2000 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 2001 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 2016 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 2017 self->y += MAP_EXTEND_Y;
1542 } 2018 }
1543} 2019}
1544 2020
1545void 2021SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 2022map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 2023 CODE:
1548{ 2024{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2025 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 2026 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 2027 mapcell *cell;
1552 int x, y, flags; 2028 int x, y, z, flags;
2029 AV *missing = newAV ();
2030 RETVAL = newRV_noinc ((SV *)missing);
1553 2031
1554 while (data < data_end - 1) 2032 while (data < data_end - 1)
1555 { 2033 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 2034 flags = (data [0] << 8) + data [1]; data += 2;
1557 2035
1577 uint8_t ext, cmd; 2055 uint8_t ext, cmd;
1578 2056
1579 do 2057 do
1580 { 2058 {
1581 ext = *data++; 2059 ext = *data++;
1582 cmd = ext & 0x3f; 2060 cmd = ext & 0x7f;
1583 2061
1584 if (cmd < 4) 2062 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 2063 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1586 else if (cmd == 5) // health 2064 else if (cmd == 5) // health
1587 { 2065 {
1588 cell->stat_width = 1; 2066 cell->stat_width = 1;
1589 cell->stat_hp = *data++; 2067 cell->stat_hp = *data++;
1590 } 2068 }
1591 else if (cmd == 6) // monster width 2069 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 2070 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 2071 else if (cmd == 0x47)
1594 { 2072 {
1595 if (*data == 4) 2073 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 2074 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2075 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2076 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 2077
1598 data += *data + 1; 2078 data += *data + 1;
1599 } 2079 }
1600 else if (cmd == 8) // cell flags 2080 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 2081 cell->flags = *data++;
1608 } 2088 }
1609 else 2089 else
1610 cell->darkness = *data++ + 1; 2090 cell->darkness = *data++ + 1;
1611 } 2091 }
1612 2092
2093 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2094 if (flags & (4 >> z))
1614 { 2095 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2096 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2097 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 2098 cell->tile [z] = self->face2tile [face];
2099
2100 if (cell->tile [z])
2101 {
2102 maptex *tex = self->tex + cell->tile [z];
2103 tex->unused = 0;
2104 if (!tex->name)
2105 av_push (missing, newSViv (cell->tile [z]));
2106
2107 if (tex->smoothtile)
2108 {
2109 maptex *smooth = self->tex + tex->smoothtile;
2110 smooth->unused = 0;
2111 if (!smooth->name)
2112 av_push (missing, newSViv (tex->smoothtile));
2113 }
2114 }
1618 } 2115 }
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 } 2116 }
1634 else 2117 else
1635 cell->darkness = 0; 2118 CELL_CLEAR (cell);
1636 } 2119 }
1637} 2120}
2121 OUTPUT:
2122 RETVAL
1638 2123
1639SV * 2124SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2125mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2126 CODE:
1642{ 2127{
1643 int x1, x; 2128 int x1, x;
1644 int y1, y; 2129 int y1, y;
1645 int z; 2130 int z;
1658 ? self->row + y 2143 ? self->row + y
1659 : 0; 2144 : 0;
1660 2145
1661 for (x = x0; x < x1; x++) 2146 for (x = x0; x < x1; x++)
1662 { 2147 {
1663 int r = 32, g = 32, b = 32, a = 192; 2148 unsigned int r = 32, g = 32, b = 32, a = 192;
1664 2149
1665 if (row && row->c0 <= x && x < row->c1) 2150 if (row && row->c0 <= x && x < row->c1)
1666 { 2151 {
1667 mapcell *cell = row->col + (x - row->c0); 2152 mapcell *cell = row->col + (x - row->c0);
1668 2153
1670 { 2155 {
1671 maptex tex = self->tex [cell->tile [z]]; 2156 maptex tex = self->tex [cell->tile [z]];
1672 int a0 = 255 - tex.a; 2157 int a0 = 255 - tex.a;
1673 int a1 = tex.a; 2158 int a1 = tex.a;
1674 2159
1675 r = (r * a0 + tex.r * a1) / 255; 2160 r = div255 (r * a0 + tex.r * a1);
1676 g = (g * a0 + tex.g * a1) / 255; 2161 g = div255 (g * a0 + tex.g * a1);
1677 b = (b * a0 + tex.b * a1) / 255; 2162 b = div255 (b * a0 + tex.b * a1);
1678 a = (a * a0 + tex.a * a1) / 255; 2163 a = div255 (a * a0 + tex.a * a1);
1679 } 2164 }
1680 } 2165 }
1681 2166
1682 *map++ = (r ) 2167 *map++ = (r )
1683 | (g << 8) 2168 | (g << 8)
1690} 2175}
1691 OUTPUT: 2176 OUTPUT:
1692 RETVAL 2177 RETVAL
1693 2178
1694void 2179void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2180draw (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: 2181 CODE:
1697{ 2182{
2183 int x, y, z;
2184
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2185 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2186 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) 2187 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 2188 smooth_key skey;
1702 int x, y, z; 2189 int pl_x, pl_y;
1703 int last_name; 2190 maptex pl_tex;
2191 rc_t *rc = rc_alloc ();
2192 rc_t *rc_ov = rc_alloc ();
2193 rc_key_t key;
2194 rc_array_t *arr;
1704 2195
2196 pl_tex.name = 0;
2197
1705 // thats current max. sorry. 2198 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2199 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2200 if (sh > 255) sh = 255;
1708 2201
1709 // clear key, in case of extra padding 2202 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2203 memset (&skey, 0, sizeof (skey));
1711 2204
1712 glColor4ub (255, 255, 255, 255); 2205 memset (&key, 0, sizeof (key));
1713 2206 key.r = 255;
1714 glEnable (GL_BLEND); 2207 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2208 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 2209 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2210 key.mode = GL_QUADS;
1718 2211 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2212
1723 mx += self->x; 2213 mx += self->x;
1724 my += self->y; 2214 my += self->y;
1725 2215
1726 // first pass: determine smooth_max 2216 // first pass: determine smooth_max
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2233 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2234 self->tex [cell->tile [2]].smoothlevel));
1745 } 2235 }
1746 } 2236 }
1747 2237
2238 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2241
1748 for (z = 0; z <= 2; z++) 2242 for (z = 0; z <= 2; z++)
1749 { 2243 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2244 memset (smooth_level, 0, sizeof (smooth_level));
2245 key.texname = -1;
1751 2246
1752 for (y = 0; y < sh; y++) 2247 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2248 if (0 <= y + my && y + my < self->rows)
1754 { 2249 {
1755 maprow *row = self->row + (y + my); 2250 maprow *row = self->row + (y + my);
1761 tileid tile = cell->tile [z]; 2256 tileid tile = cell->tile [z];
1762 2257
1763 if (tile) 2258 if (tile)
1764 { 2259 {
1765 maptex tex = self->tex [tile]; 2260 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2261 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2262
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2263 if (key.texname != tex.name)
1772 { 2264 {
2265 self->tex [tile].unused = 0;
2266
1773 if (!tex.name) 2267 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2268 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2269
1776 glEnd (); 2270 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2271 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2272 }
1780 2273
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2274 px = (x + 1) * Th - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2275 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 2276
1786 if (cell->flags && z == 2) 2277 if (expect_false (cell->player == player) && expect_false (z == 2))
1787 { 2278 {
1788 if (cell->flags & 1) 2279 pl_x = px;
2280 pl_y = py;
2281 pl_tex = tex;
1789 { 2282 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 } 2283 }
2284
2285 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2286 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2287 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2288 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1804 2289
1805 // update smooth hash 2290 // update smooth hash
1806 if (tex.smoothtile) 2291 if (tex.smoothtile)
1807 { 2292 {
1808 skey.tile = tex.smoothtile; 2293 skey.tile = tex.smoothtile;
1839 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2324 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); 2325 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); 2326 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1842 } 2327 }
1843 } 2328 }
2329
2330 if (expect_false (z == 2) && expect_false (cell->flags))
2331 {
2332 // overlays such as the speech bubble, probably more to come
2333 if (cell->flags & 1)
2334 {
2335 rc_key_t key_ov = key;
2336 maptex tex = self->tex [TEXID_SPEECH];
2337 rc_array_t *arr;
2338 int px = x * Tw + Tw * 2 / 32;
2339 int py = y * Th - Th * 6 / 32;
2340
2341 key_ov.texname = tex.name;
2342 arr = rc_array (rc_ov, &key_ov);
2343
2344 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2345 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2346 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2347 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2348 }
2349 }
1844 } 2350 }
1845 } 2351 }
2352
2353 rc_draw (rc);
2354 rc_clear (rc);
1846 2355
1847 // go through all smoothlevels, lowest to highest, then draw. 2356 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2357 // this is basically counting sort
1849 { 2358 {
1850 int w, b; 2359 int w, b;
1851 2360
2361 glEnable (GL_TEXTURE_2D);
2362 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2363 for (w = 0; w < 256 / 32; ++w)
1853 { 2364 {
1854 uint32_t smask = smooth_level [w]; 2365 uint32_t smask = smooth_level [w];
1855 if (smask) 2366 if (smask)
1856 for (b = 0; b < 32; ++b) 2367 for (b = 0; b < 32; ++b)
1868 if (!(bits & 0x1000) 2379 if (!(bits & 0x1000)
1869 && skey->level == level 2380 && skey->level == level
1870 && level > smooth_max [skey->x][skey->y]) 2381 && level > smooth_max [skey->x][skey->y])
1871 { 2382 {
1872 maptex tex = self->tex [skey->tile]; 2383 maptex tex = self->tex [skey->tile];
1873 int px = (((int)skey->x) - 1) * T; 2384 int px = (((int)skey->x) - 1) * Tw;
1874 int py = (((int)skey->y) - 1) * T; 2385 int py = (((int)skey->y) - 1) * Th;
1875 int border = bits & 15; 2386 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2387 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2388 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2389 float dy = tex.t * .5f ; // 2 images/column
1879 2390
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2391 if (tex.name)
1883 { 2392 {
2393 // this time avoiding texture state changes
2394 // save gobs of state changes.
1884 if (!tex.name) 2395 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2396 {
2397 self->tex [skey->tile].unused = 0;
1886 2398
1887 glEnd (); 2399 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2400 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2401 glBegin (GL_QUADS);
1890 } 2402 }
1891 2403
1892 if (border) 2404 if (border)
1893 { 2405 {
1894 float ox = border * dx; 2406 float ox = border * dx;
1895 2407
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2408 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2409 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2410 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2411 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1900 } 2412 }
1901 2413
1902 if (corner) 2414 if (corner)
1903 { 2415 {
1904 float ox = corner * dx; 2416 float ox = corner * dx;
1905 2417
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2418 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2419 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2421 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2422 }
1910 } 2423 }
1911 } 2424 }
1912 } 2425 }
1913 } 2426 }
1914 } 2427 }
2428
2429 glEnd ();
2430 glDisable (GL_TEXTURE_2D);
2431 key.texname = -1;
1915 } 2432 }
1916 2433
1917 hv_clear (smooth); 2434 hv_clear (smooth);
1918 } 2435 }
1919 2436
1920 glEnd (); 2437 if (pl_tex.name)
2438 {
2439 maptex tex = pl_tex;
2440 int px = pl_x + sdx;
2441 int py = pl_y + sdy;
1921 2442
1922 glDisable (GL_TEXTURE_2D); 2443 key.texname = tex.name;
2444 arr = rc_array (rc, &key);
2445
2446 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2447 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2448 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2449 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2450
2451 rc_draw (rc);
2452 }
2453
2454 rc_draw (rc_ov);
2455 rc_clear (rc_ov);
2456
1923 glDisable (GL_BLEND); 2457 glDisable (GL_BLEND);
2458 rc_free (rc);
2459 rc_free (rc_ov);
1924 2460
1925 // top layer: overlays such as the health bar 2461 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2462 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2463 if (0 <= y + my && y + my < self->rows)
1928 { 2464 {
1931 for (x = 0; x < sw; x++) 2467 for (x = 0; x < sw; x++)
1932 if (row->c0 <= x + mx && x + mx < row->c1) 2468 if (row->c0 <= x + mx && x + mx < row->c1)
1933 { 2469 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2470 mapcell *cell = row->col + (x + mx - row->c0);
1935 2471
1936 int px = x * T; 2472 int px = x * Tw;
1937 int py = y * T; 2473 int py = y * Th;
2474
2475 if (expect_false (cell->player == player))
2476 {
2477 px += sdx;
2478 py += sdy;
2479 }
1938 2480
1939 if (cell->stat_hp) 2481 if (cell->stat_hp)
1940 { 2482 {
1941 int width = cell->stat_width * T; 2483 int width = cell->stat_width * Tw;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2484 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1943 2485
1944 glColor3ub (0, 0, 0); 2486 glColor3ub (0, 0, 0);
1945 glRectf (px + 1, py - thick - 2, 2487 glRectf (px + 1, py - thick - 2,
1946 px + width - 1, py); 2488 px + width - 1, py);
1947 2489
1953 } 2495 }
1954 } 2496 }
1955} 2497}
1956 2498
1957void 2499void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2500draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1959 CODE: 2501 CODE:
1960{ 2502{
1961 static float color[16][3] = { 2503 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2504 { 0.00f, 0.00f, 0.00f },
1963 { 1.00F, 1.00F, 1.00F }, 2505 { 1.00f, 1.00f, 1.00f },
1964 { 0.00F, 0.00F, 0.55F }, 2506 { 0.00f, 0.00f, 0.55f },
1965 { 1.00F, 0.00F, 0.00F }, 2507 { 1.00f, 0.00f, 0.00f },
1966 2508
1967 { 1.00F, 0.54F, 0.00F }, 2509 { 1.00f, 0.54f, 0.00f },
1968 { 0.11F, 0.56F, 1.00F }, 2510 { 0.11f, 0.56f, 1.00f },
1969 { 0.93F, 0.46F, 0.00F }, 2511 { 0.93f, 0.46f, 0.00f },
1970 { 0.18F, 0.54F, 0.34F }, 2512 { 0.18f, 0.54f, 0.34f },
1971 2513
1972 { 0.56F, 0.73F, 0.56F }, 2514 { 0.56f, 0.73f, 0.56f },
1973 { 0.80F, 0.80F, 0.80F }, 2515 { 0.80f, 0.80f, 0.80f },
1974 { 0.55F, 0.41F, 0.13F }, 2516 { 0.55f, 0.41f, 0.13f },
1975 { 0.99F, 0.77F, 0.26F }, 2517 { 0.99f, 0.77f, 0.26f },
1976 2518
1977 { 0.74F, 0.65F, 0.41F }, 2519 { 0.74f, 0.65f, 0.41f },
1978 2520
1979 { 0.00F, 1.00F, 1.00F }, 2521 { 0.00f, 1.00f, 1.00f },
1980 { 1.00F, 0.00F, 1.00F }, 2522 { 1.00f, 0.00f, 1.00f },
1981 { 1.00F, 1.00F, 0.00F }, 2523 { 1.00f, 1.00f, 0.00f },
1982 }; 2524 };
1983 2525
1984 int x, y; 2526 int x, y;
1985 2527
1986 glEnable (GL_TEXTURE_2D); 2528 glEnable (GL_TEXTURE_2D);
2529 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2530 * but the nvidia driver (185.18.14) mishandles alpha textures
2531 * and takes the colour from god knows where instead of using
2532 * Cp. MODULATE results in the same colour, but slightly different
2533 * alpha, but atcually gives us the correct colour with nvidia.
2534 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2535 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2536 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2537 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2538 glBegin (GL_QUADS);
1991 2539
1992 for (y = 0; y < h; y++) 2540 for (y = 0; y < h; y++)
1996 2544
1997 if (m) 2545 if (m)
1998 { 2546 {
1999 float *c = color [m & 15]; 2547 float *c = color [m & 15];
2000 2548
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2549 float tx1 = m & 0x40 ? 0.5f : 0.f;
2002 float tx2 = tx1 + 0.5; 2550 float tx2 = tx1 + 0.5f;
2003 2551
2004 glColor4f (c[0], c[1], c[2], 0.75); 2552 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2553 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2554 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2555 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2556 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2557 }
2013 glDisable (GL_BLEND); 2561 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2562 glDisable (GL_TEXTURE_2D);
2015} 2563}
2016 2564
2017void 2565void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2566fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2567 PPCODE:
2020{ 2568{
2021 int x, y; 2569 int x, y;
2022 int sw1 = sw + 2; 2570 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2571 int sh1 = sh + 2;
2024 int sh3 = sh * 3; 2572 int sh3 = sh * 3;
2025 int sw34 = (sw * 3 + 3) & ~3; 2573 int sw3 = sw * 3;
2574 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2575 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2576 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2577 memset (darkness1, 0, sw1*sh1);
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029 2578
2030 SvPOK_only (darkness3_sv); 2579 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2580 SvCUR_set (darkness3_sv, sw3 * sh3);
2032 2581
2033 mx += self->x - 1; 2582 mx += self->x - 1;
2034 my += self->y - 1; 2583 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037 2584
2038 for (y = 0; y < sh1; y++) 2585 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2586 if (0 <= y + my && y + my < self->rows)
2040 { 2587 {
2041 maprow *row = self->row + (y + my); 2588 maprow *row = self->row + (y + my);
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2591 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2592 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2593 mapcell *cell = row->col + (x + mx - row->c0);
2047 2594
2048 darkness1 [y * sw1 + x] = cell->darkness 2595 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2596 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2597 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2598 }
2052 } 2599 }
2053 2600
2054 for (y = 0; y < sh; ++y) 2601 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2602 for (x = 0; x < sw; ++x)
2074 2621
2075 uint8_t r13 = (d13 + d23 + d12) / 3; 2622 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23; 2623 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3; 2624 uint8_t r33 = (d23 + d33 + d32) / 3;
2078 2625
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2626 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2629 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2083 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2630 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); 2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2632 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2088 } 2635 }
2089 2636
2090 free (darkness1); 2637 free (darkness1);
2091 2638
2092 EXTEND (SP, 3); 2639 EXTEND (SP, 3);
2093 PUSHs (sv_2mortal (newSViv (sw34))); 2640 PUSHs (sv_2mortal (newSViv (sw3)));
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2641 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2642 PUSHs (darkness3_sv);
2096} 2643}
2097 2644
2098SV * 2645SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2646get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2647 CODE:
2101{ 2648{
2102 int x, y, x1, y1; 2649 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2650 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2651 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2708 else
2162 *data++ = 0; 2709 *data++ = 0;
2163 } 2710 }
2164 } 2711 }
2165 2712
2713 /* if size is w*h + 5 then no data has been found */
2714 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2715 {
2166 SvPOK_only (data_sv); 2716 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2717 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2718 }
2719
2168 RETVAL = data_sv; 2720 RETVAL = data_sv;
2169} 2721}
2170 OUTPUT: 2722 OUTPUT:
2171 RETVAL 2723 RETVAL
2172 2724
2173void 2725void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2726set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2727 PPCODE:
2176{ 2728{
2177 int x, y, z; 2729 int x, y, z;
2178 int w, h; 2730 int w, h;
2179 int x1, y1; 2731 int x1, y1;
2732 STRLEN len;
2733 uint8_t *data, *end;
2734
2735 len = SvLEN (data_sv);
2736 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2737 data = SvPVbyte_nolen (data_sv);
2738 end = data + len + 8;
2739
2740 if (len < 5)
2741 XSRETURN_EMPTY;
2180 2742
2181 if (*data++ != 0) 2743 if (*data++ != 0)
2182 return; /* version mismatch */ 2744 XSRETURN_EMPTY; /* version mismatch */
2183 2745
2184 w = *data++ << 8; w |= *data++; 2746 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2747 h = *data++ << 8; h |= *data++;
2186 2748
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2749 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2761 {
2200 maprow *row = map_get_row (self, y); 2762 maprow *row = map_get_row (self, y);
2201 2763
2202 for (x = x0; x < x1; x++) 2764 for (x = x0; x < x1; x++)
2203 { 2765 {
2766 uint8_t flags;
2767
2768 if (data + 7 >= end)
2769 XSRETURN_EMPTY;
2770
2204 uint8_t flags = *data++; 2771 flags = *data++;
2205 2772
2206 if (flags) 2773 if (flags)
2207 { 2774 {
2208 mapcell *cell = row_get_cell (row, x); 2775 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2776 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2779 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2780 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2781
2215 if (cell->darkness == 0) 2782 if (cell->darkness == 0)
2216 { 2783 {
2217 cell->darkness = 0; 2784 /*cell->darkness = 0;*/
2785 EXTEND (SP, 3);
2218 2786
2219 for (z = 0; z <= 2; z++) 2787 for (z = 0; z <= 2; z++)
2220 { 2788 {
2221 tileid t = tile [z]; 2789 tileid t = tile [z];
2222 2790
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2791 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2792 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2793 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2794 need_texid (self, t);
2227 } 2795 }
2228 2796
2229 cell->tile [z] = t; 2797 cell->tile [z] = t;
2230 } 2798 }
2232 } 2800 }
2233 } 2801 }
2234 } 2802 }
2235} 2803}
2236 2804
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2805MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2806
2239PROTOTYPES: DISABLE 2807DC::RW
2240 2808new (SV *class, SV *data_sv)
2241CFPlus::MixChunk
2242new_from_file (SV *class, char *path)
2243 CODE: 2809 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2810{
2811 STRLEN datalen;
2812 char *data = SvPVbyte (data_sv, datalen);
2813
2814 RETVAL = SDL_RWFromConstMem (data, datalen);
2815}
2245 OUTPUT: 2816 OUTPUT:
2246 RETVAL 2817 RETVAL
2247 2818
2819DC::RW
2820new_from_file (SV *class, const char *path, const char *mode = "rb")
2821 CODE:
2822 RETVAL = SDL_RWFromFile (path, mode);
2823 OUTPUT:
2824 RETVAL
2825
2826# fails on win32:
2827# dc.xs(2268) : error C2059: syntax error : '('
2248void 2828#void
2829#close (DC::RW self)
2830# CODE:
2831# (self->(close)) (self);
2832
2833MODULE = Deliantra::Client PACKAGE = DC::Channel
2834
2835PROTOTYPES: DISABLE
2836
2837DC::Channel
2838find ()
2839 CODE:
2840{
2841 RETVAL = Mix_GroupAvailable (-1);
2842
2843 if (RETVAL < 0)
2844 {
2845 RETVAL = Mix_GroupOldest (-1);
2846
2847 if (RETVAL < 0)
2848 {
2849 // happens sometimes, maybe it just stopped playing(?)
2850 RETVAL = Mix_GroupAvailable (-1);
2851
2852 if (RETVAL < 0)
2853 XSRETURN_UNDEF;
2854 }
2855 else
2856 Mix_HaltChannel (RETVAL);
2857 }
2858
2859 Mix_UnregisterAllEffects (RETVAL);
2860 Mix_Volume (RETVAL, 128);
2861}
2862 OUTPUT:
2863 RETVAL
2864
2865void
2866halt (DC::Channel self)
2867 CODE:
2868 Mix_HaltChannel (self);
2869
2870void
2871expire (DC::Channel self, int ticks = -1)
2872 CODE:
2873 Mix_ExpireChannel (self, ticks);
2874
2875void
2876fade_out (DC::Channel self, int ticks = -1)
2877 CODE:
2878 Mix_FadeOutChannel (self, ticks);
2879
2880int
2881volume (DC::Channel self, int volume)
2882 CODE:
2883 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2884 OUTPUT:
2885 RETVAL
2886
2887void
2888unregister_all_effects (DC::Channel self)
2889 CODE:
2890 Mix_UnregisterAllEffects (self);
2891
2892void
2893set_panning (DC::Channel self, int left, int right)
2894 CODE:
2895 left = CLAMP (left , 0, 255);
2896 right = CLAMP (right, 0, 255);
2897 Mix_SetPanning (self, left, right);
2898
2899void
2900set_distance (DC::Channel self, int distance)
2901 CODE:
2902 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2903
2904void
2905set_position (DC::Channel self, int angle, int distance)
2906 CODE:
2907
2908void
2909set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2910 CODE:
2911{
2912 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2913 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2914 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2915}
2916
2917void
2918set_reverse_stereo (DC::Channel self, int flip)
2919 CODE:
2920 Mix_SetReverseStereo (self, flip);
2921
2922MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2923
2924PROTOTYPES: DISABLE
2925
2926void
2927decoders ()
2928 PPCODE:
2929#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2930 int i, num = Mix_GetNumChunkDecoders ();
2931 EXTEND (SP, num);
2932 for (i = 0; i < num; ++i)
2933 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2934#else
2935 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2936#endif
2937
2938DC::MixChunk
2939new (SV *class, DC::RW rwops)
2940 CODE:
2941 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2942 OUTPUT:
2943 RETVAL
2944
2945void
2249DESTROY (CFPlus::MixChunk self) 2946DESTROY (DC::MixChunk self)
2250 CODE: 2947 CODE:
2251 Mix_FreeChunk (self); 2948 Mix_FreeChunk (self);
2252 2949
2253int 2950int
2254volume (CFPlus::MixChunk self, int volume = -1) 2951volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2952 CODE:
2953 if (items > 1)
2954 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2955 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2956 OUTPUT:
2258 RETVAL 2957 RETVAL
2259 2958
2260int 2959DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2960play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2961 CODE:
2962{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2963 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2964
2965 if (RETVAL < 0)
2966 XSRETURN_UNDEF;
2967
2968 if (channel < 0)
2969 {
2970 Mix_UnregisterAllEffects (RETVAL);
2971 Mix_Volume (RETVAL, 128);
2972 }
2973}
2264 OUTPUT: 2974 OUTPUT:
2265 RETVAL 2975 RETVAL
2266 2976
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2977MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2978
2979void
2980decoders ()
2981 PPCODE:
2982#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2983 int i, num = Mix_GetNumMusicDecoders ();
2984 EXTEND (SP, num);
2985 for (i = 0; i < num; ++i)
2986 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2987#else
2988 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2989#endif
2268 2990
2269int 2991int
2270volume (int volume = -1) 2992volume (int volume = -1)
2271 PROTOTYPE: ;$ 2993 PROTOTYPE: ;$
2272 CODE: 2994 CODE:
2995 if (items > 0)
2996 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2997 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2998 OUTPUT:
2275 RETVAL 2999 RETVAL
2276 3000
3001void
3002fade_out (int ms)
3003 CODE:
3004 Mix_FadeOutMusic (ms);
3005
3006void
3007halt ()
3008 CODE:
3009 Mix_HaltMusic ();
3010
2277int 3011int
2278fade_out (int ms) 3012playing ()
2279 CODE: 3013 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 3014 RETVAL = Mix_PlayingMusic ();
2281 OUTPUT: 3015 OUTPUT:
2282 RETVAL 3016 RETVAL
2283 3017
2284CFPlus::MixMusic 3018DC::MixMusic
2285new_from_file (SV *class, char *path) 3019new (SV *class, DC::RW rwops)
2286 CODE: 3020 CODE:
2287 RETVAL = Mix_LoadMUS (path); 3021 RETVAL = Mix_LoadMUS_RW (rwops);
2288 OUTPUT: 3022 OUTPUT:
2289 RETVAL 3023 RETVAL
2290 3024
2291void 3025void
2292DESTROY (CFPlus::MixMusic self) 3026DESTROY (DC::MixMusic self)
2293 CODE: 3027 CODE:
2294 Mix_FreeMusic (self); 3028 Mix_FreeMusic (self);
2295 3029
2296int 3030int
2297play (CFPlus::MixMusic self, int loops = -1) 3031play (DC::MixMusic self, int loops = -1)
2298 CODE: 3032 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 3033 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 3034 OUTPUT:
2301 RETVAL 3035 RETVAL
2302 3036
2303int 3037void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3038fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 3039 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3040 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 3041
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3042MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 3043
2312PROTOTYPES: ENABLE 3044PROTOTYPES: ENABLE
2313 3045
2314BOOT: 3046BOOT:
2315{ 3047{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3048 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 3049 static const struct {
2318 const char *name; 3050 const char *name;
2319 IV iv; 3051 IV iv;
2320 } *civ, const_iv[] = { 3052 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 3053# define const_iv(name) { # name, (IV)name }
2322 const_iv (GL_VENDOR), 3054 const_iv (GL_VENDOR),
2323 const_iv (GL_VERSION), 3055 const_iv (GL_VERSION),
2324 const_iv (GL_EXTENSIONS), 3056 const_iv (GL_EXTENSIONS),
3057 const_iv (GL_MAX_TEXTURE_UNITS),
2325 const_iv (GL_COLOR_MATERIAL), 3058 const_iv (GL_COLOR_MATERIAL),
2326 const_iv (GL_SMOOTH), 3059 const_iv (GL_SMOOTH),
2327 const_iv (GL_FLAT), 3060 const_iv (GL_FLAT),
2328 const_iv (GL_DITHER), 3061 const_iv (GL_DITHER),
2329 const_iv (GL_BLEND), 3062 const_iv (GL_BLEND),
2341 const_iv (GL_ZERO), 3074 const_iv (GL_ZERO),
2342 const_iv (GL_SRC_ALPHA), 3075 const_iv (GL_SRC_ALPHA),
2343 const_iv (GL_DST_ALPHA), 3076 const_iv (GL_DST_ALPHA),
2344 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3077 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2345 const_iv (GL_ONE_MINUS_DST_ALPHA), 3078 const_iv (GL_ONE_MINUS_DST_ALPHA),
3079 const_iv (GL_SRC_COLOR),
3080 const_iv (GL_DST_COLOR),
3081 const_iv (GL_ONE_MINUS_SRC_COLOR),
3082 const_iv (GL_ONE_MINUS_DST_COLOR),
2346 const_iv (GL_SRC_ALPHA_SATURATE), 3083 const_iv (GL_SRC_ALPHA_SATURATE),
2347 const_iv (GL_RGB), 3084 const_iv (GL_RGB),
2348 const_iv (GL_RGBA), 3085 const_iv (GL_RGBA),
2349 const_iv (GL_RGBA4), 3086 const_iv (GL_RGBA4),
2350 const_iv (GL_RGBA8), 3087 const_iv (GL_RGBA8),
2356 const_iv (GL_INTENSITY), 3093 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 3094 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 3095 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 3096 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3097 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3098 const_iv (GL_COMPRESSED_ALPHA_ARB),
3099 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3100 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3101 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3102 const_iv (GL_COMPRESSED_RGB_ARB),
3103 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 3104 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 3105 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 3106 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 3107 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 3108 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3147 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 3148 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 3149 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 3150 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 3151 const_iv (GL_GENERATE_MIPMAP_HINT),
3152 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 3153 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 3154 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 3155 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 3156 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 3157 const_iv (GL_V3F),
2414 const_iv (GL_T2F_V3F), 3158 const_iv (GL_T2F_V3F),
2415 const_iv (GL_T2F_N3F_V3F), 3159 const_iv (GL_T2F_N3F_V3F),
3160 const_iv (GL_FUNC_ADD),
3161 const_iv (GL_FUNC_SUBTRACT),
3162 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2416# undef const_iv 3163# undef const_iv
2417 }; 3164 };
2418 3165
2419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3166 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3167 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2421 3168
2422 texture_av = newAV (); 3169 texture_av = newAV ();
2423 AvREAL_off (texture_av); 3170 AvREAL_off (texture_av);
2424} 3171}
3172
3173void
3174disable_GL_EXT_blend_func_separate ()
3175 CODE:
3176 gl.BlendFuncSeparate = 0;
3177 gl.BlendFuncSeparateEXT = 0;
3178
3179void
3180apple_nvidia_bug (int enable)
2425 3181
2426char * 3182char *
2427gl_vendor () 3183gl_vendor ()
2428 CODE: 3184 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 3185 RETVAL = (char *)glGetString (GL_VENDOR);
2460 3216
2461int glGetError () 3217int glGetError ()
2462 3218
2463void glFinish () 3219void glFinish ()
2464 3220
3221void glFlush ()
3222
2465void glClear (int mask) 3223void glClear (int mask)
2466 3224
2467void glClearColor (float r, float g, float b, float a = 1.0) 3225void glClearColor (float r, float g, float b, float a = 1.0)
2468 PROTOTYPE: @ 3226 PROTOTYPE: @
2469 3227
2478void glBlendFunc (int sfactor, int dfactor) 3236void glBlendFunc (int sfactor, int dfactor)
2479 3237
2480void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3238void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2481 CODE: 3239 CODE:
2482 gl_BlendFuncSeparate (sa, da, saa, daa); 3240 gl_BlendFuncSeparate (sa, da, saa, daa);
3241
3242# void glBlendEquation (int se)
2483 3243
2484void glDepthMask (int flag) 3244void glDepthMask (int flag)
2485 3245
2486void glLogicOp (int opcode) 3246void glLogicOp (int opcode)
2487 3247
2522void glRotate (float angle, float x, float y, float z) 3282void glRotate (float angle, float x, float y, float z)
2523 CODE: 3283 CODE:
2524 glRotatef (angle, x, y, z); 3284 glRotatef (angle, x, y, z);
2525 3285
2526void glColor (float r, float g, float b, float a = 1.0) 3286void glColor (float r, float g, float b, float a = 1.0)
3287 PROTOTYPE: @
2527 ALIAS: 3288 ALIAS:
2528 glColor_premultiply = 1 3289 glColor_premultiply = 1
2529 CODE: 3290 CODE:
2530 if (ix) 3291 if (ix)
2531 { 3292 {
2547 3308
2548void glTexCoord (float s, float t) 3309void glTexCoord (float s, float t)
2549 CODE: 3310 CODE:
2550 glTexCoord2f (s, t); 3311 glTexCoord2f (s, t);
2551 3312
3313void glRect (float x1, float y1, float x2, float y2)
3314 CODE:
3315 glRectf (x1, y1, x2, y2);
3316
3317void glRect_lineloop (float x1, float y1, float x2, float y2)
3318 CODE:
3319 glBegin (GL_LINE_LOOP);
3320 glVertex2f (x1, y1);
3321 glVertex2f (x2, y1);
3322 glVertex2f (x2, y2);
3323 glVertex2f (x1, y2);
3324 glEnd ();
3325
2552PROTOTYPES: ENABLE 3326PROTOTYPES: ENABLE
2553 3327
2554void glBegin (int mode) 3328void glBegin (int mode)
2555 3329
2556void glEnd () 3330void glEnd ()
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3362void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 3363 CODE:
2590 if (gl.SeparableFilter2D) 3364 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3365 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 3366
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3367void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 3368
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3369void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 3370
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 3371void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 3372
2624 3398
2625void glEndList () 3399void glEndList ()
2626 3400
2627void glCallList (int list) 3401void glCallList (int list)
2628 3402
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3403void c_init ()
3404 CODE:
3405 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3406 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3407
3408MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 3409
2631PROTOTYPES: DISABLE 3410PROTOTYPES: DISABLE
2632 3411
2633void 3412void
2634find_widget (SV *self, NV x, NV y) 3413find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 3417 XPUSHs (self);
2639} 3418}
2640 3419
2641BOOT: 3420BOOT:
2642{ 3421{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3422 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 3423
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3424 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3425 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3426 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3427 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 3428}
2650 3429
2651void 3430void
2652draw (SV *self) 3431draw (SV *self)
2653 CODE: 3432 CODE:
2657 NV x, y, w, h; 3436 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3437 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3438 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3439 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3440 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3441 double draw_x, draw_y;
2664 3442
2665 if (!SvROK (self)) 3443 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3444 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3445
2668 hv = (HV *)SvRV (self); 3446 hv = (HV *)SvRV (self);
2669 3447
2670 if (SvTYPE (hv) != SVt_PVHV) 3448 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3449 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3450
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3451 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3452 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3453
2676 if (!h || !w) 3454 if (!h || !w)
2696 { 3474 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3475 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3476
2699 if (svp && SvTRUE (*svp)) 3477 if (svp && SvTRUE (*svp))
2700 { 3478 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3479 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3480 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3481 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3482 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3483 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3484 glVertex2f (w, 0);
2709 glEnd (); 3487 glEnd ();
2710 glDisable (GL_BLEND); 3488 glDisable (GL_BLEND);
2711 } 3489 }
2712 } 3490 }
2713#if 0 3491#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3492 // draw borders, for debugging
2715 glPushMatrix; 3493 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3494 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3495 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3496 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3497 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3498 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3499 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3500 glVertex2f (0 , h - 1);
2723 glEnd; 3501 glEnd ();
2724 glPopMatrix; 3502 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3503#endif
2728 PUSHMARK (SP); 3504 PUSHMARK (SP);
2729 XPUSHs (self); 3505 XPUSHs (self);
2730 PUTBACK; 3506 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3507 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines