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.203 by root, Thu Jul 19 13:45:16 2007 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
27#include <stdio.h> 31#include <stdio.h>
28#include <stdlib.h> 32#include <stdlib.h>
33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 35
30#include <SDL.h> 36#include <SDL.h>
31#include <SDL_thread.h> 37#include <SDL_thread.h>
32#include <SDL_endian.h> 38#include <SDL_endian.h>
33#include <SDL_image.h> 39#include <SDL_image.h>
34#include <SDL_mixer.h> 40#include <SDL_mixer.h>
35#include <SDL_opengl.h> 41#include <SDL_opengl.h>
36 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
37#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
39 52
40#include <glib/gmacros.h> 53#include <glib/gmacros.h>
41 54
42#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
43 67
44#ifndef _WIN32 68#ifndef _WIN32
45# include <sys/types.h> 69# include <sys/types.h>
46# include <sys/socket.h> 70# include <sys/socket.h>
47# include <netinet/in.h> 71# include <netinet/in.h>
48# include <netinet/tcp.h> 72# include <netinet/tcp.h>
49# include <inttypes.h> 73# include <inttypes.h>
50#endif 74#endif
51 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
54#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
55 91
56#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
58 94
59#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
60 96
61#if 0 97/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 99
64# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
65#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
66 104
67static AV *texture_av; 105static AV *texture_av;
68 106
69static struct 107static struct
70{ 108{
… …
107 av_push (texture_av, (SV *)(size_t)name); 145 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 146 glDeleteTextures (1, &name);
109} 147}
110 148
111#include "texcache.c" 149#include "texcache.c"
150#include "rendercache.c"
112 151
113#include "pango-font.c" 152#include "pango-font.c"
114#include "pango-fontmap.c" 153#include "pango-fontmap.c"
115#include "pango-render.c" 154#include "pango-render.c"
116 155
156typedef IV DC__Channel;
157typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
119 160
120typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
121 162
122static int 163static int
123shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
124{ 165{
125 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
… …
139 180
140typedef struct cf_layout { 181typedef struct cf_layout {
141 PangoLayout *pl; 182 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
143 int base_height; 184 int base_height;
144 CFPlus__Font font; 185 DC__Font font;
186 rc_t *rc;
145} *CFPlus__Layout; 187} *DC__Layout;
146 188
147static CFPlus__Font default_font; 189static DC__Font default_font;
148static PangoContext *opengl_context; 190static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
150 192
151static void 193static void
152substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
… …
157#endif 199#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 201}
160 202
161static void 203static void
162layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
163{ 205{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
166 */ 208 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
168 210
169 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 213
172 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
173} 215}
174 216
175static void 217static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 219{
178 PangoRectangle rect; 220 PangoRectangle rect;
179 221
180 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
… …
192 234
193typedef uint16_t tileid; 235typedef uint16_t tileid;
194typedef uint16_t faceid; 236typedef uint16_t faceid;
195 237
196typedef struct { 238typedef struct {
197 int name; 239 GLuint name;
198 int w, h; 240 int w, h;
199 float s, t; 241 float s, t;
200 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
201 tileid smoothtile; 243 tileid smoothtile;
202 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
203} maptex; 246} maptex;
204 247
205typedef struct { 248typedef struct {
206 uint32_t player; 249 uint32_t player;
207 tileid tile[3]; 250 tileid tile[3];
… …
220 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
222 265
223 int32_t rows; 266 int32_t rows;
224 maprow *row; 267 maprow *row;
225} *CFPlus__Map; 268} *DC__Map;
226 269
227static char * 270static char *
228prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
229{ 272{
230 char *p; 273 char *p;
… …
268 self->texs *= 2; 311 self->texs *= 2;
269 } 312 }
270} 313}
271 314
272static maprow * 315static maprow *
273map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
274{ 317{
275 if (0 > y) 318 if (0 > y)
276 { 319 {
277 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
… …
316 359
317 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
318} 361}
319 362
320static mapcell * 363static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
322{ 365{
323 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
324} 367}
325 368
326static void 369static void
327map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
328{ 371{
329 int r; 372 int r;
330 373
331 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
… …
339 self->oy = 0; 382 self->oy = 0;
340 self->row = 0; 383 self->row = 0;
341 self->rows = 0; 384 self->rows = 0;
342} 385}
343 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
344static void 397static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 399{
347 int x, y; 400 int x, y;
348 maprow *row; 401 maprow *row;
349 mapcell *cell; 402 mapcell *cell;
350 403
… …
362 if (x >= row->c1) 415 if (x >= row->c1)
363 break; 416 break;
364 417
365 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
366 419
367 cell->darkness = 0; 420 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 421 }
372 } 422 }
373} 423}
374 424
375typedef struct { 425typedef struct {
… …
429 n |= n >> 16; 479 n |= n >> 16;
430 480
431 return n + 1; 481 return n + 1;
432} 482}
433 483
484static unsigned int
485popcount (unsigned int n)
486{
487 n -= (n >> 1) & 0x55555555U;
488 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
489 n = ((n >> 4) + n) & 0x0f0f0f0fU;
490 n *= 0x01010101U;
491
492 return n >> 24;
493}
494
434/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
437 498
438MODULE = CFPlus PACKAGE = CFPlus 499/******************************************************************************/
500
501static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
502static GV *hover_gv;
503
504static int
505within_widget (SV *widget, NV x, NV y)
506{
507 HV *self;
508 SV **svp;
509 NV wx, ww, wy, wh;
510
511 if (!SvROK (widget))
512 return 0;
513
514 self = (HV *)SvRV (widget);
515
516 if (SvTYPE (self) != SVt_PVHV)
517 return 0;
518
519 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
520 if (y < wy)
521 return 0;
522
523 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
524 if (y >= wy + wh)
525 return 0;
526
527 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
528 if (x < wx)
529 return 0;
530
531 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
532 if (x >= wx + ww)
533 return 0;
534
535 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
536 if (!svp || !SvTRUE (*svp))
537 return 0;
538
539 return 1;
540}
541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
593
594MODULE = Deliantra::Client PACKAGE = DC
439 595
440PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
441 597
442BOOT: 598BOOT:
443{ 599{
444 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
445 static const struct { 601 static const struct {
446 const char *name; 602 const char *name;
447 IV iv; 603 IV iv;
448 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
449# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
… …
471 627
472 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
475 631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
681
682 const_iv (SDLK_FIRST),
683 const_iv (SDLK_LAST),
476 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
477 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
478 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
479 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
480 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
… …
552 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
553 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
554 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
555 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
556 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
765
766 const_iv (KMOD_LRAM),
767
768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
557# undef const_iv 798# undef const_iv
558 }; 799 };
559 800
560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
579 820
580NV floor (NV x) 821NV floor (NV x)
581 822
582NV ceil (NV x) 823NV ceil (NV x)
583 824
825IV minpot (UV n)
826
827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
584void 835void
585pango_init () 836pango_init ()
586 CODE: 837 CODE:
587{ 838{
588 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
846#endif
591} 847}
592 848
593char *
594SDL_GetError () 849char *SDL_GetError ()
595 850
596int 851void SDL_braino ()
597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
598 852
599void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
600SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
601 869
602void 870void
603SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
604 PPCODE: 872 PPCODE:
605{ 873{
… …
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
620 888
621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
622#if SDL_VERSION_ATLEAST(1,2,10)
623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
626 891
627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
628 893
629 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
630 while (*m) 895 while (*m)
631 { 896 {
632 if ((*m)->w >= 640 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
633 { 898 {
634 AV *av = newAV (); 899 AV *av = newAV ();
635 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
636 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
… …
661 926
662 if (RETVAL) 927 if (RETVAL)
663 { 928 {
664 av_clear (texture_av); 929 av_clear (texture_av);
665 930
666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
668#include "glfunc.h" 933#include "glfunc.h"
669#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
670 } 938 }
671} 939}
672 OUTPUT: 940 OUTPUT:
673 RETVAL 941 RETVAL
674 942
… …
678char * 946char *
679SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
680 948
681int 949int
682SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
683 954
684void 955void
685poll_events () 956poll_events ()
686 PPCODE: 957 PPCODE:
687{ 958{
… …
697 { 968 {
698 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
699 case SDL_KEYUP: 970 case SDL_KEYUP:
700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
705 break; 976 break;
706 977
707 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
726 x = ev.motion.x; 997 x = ev.motion.x;
727 y = ev.motion.y; 998 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 } 1000 }
730 1001
731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
732 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
733 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
734 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
735 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
736 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 } 1008 }
738 break; 1009 break;
739 1010
740 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
741 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
743 1014
744 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
745 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
746 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
747 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
754 break; 1025 break;
755 } 1026 }
756 1027
757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
758 } 1029 }
759} 1030}
760 1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
1044
761int 1045int
762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
763 POSTCALL: 1047 POSTCALL:
764 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
765 Mix_ChannelFinished (channel_finished); 1049 Mix_ChannelFinished (channel_finished);
766 1050
767void 1051void
1052Mix_QuerySpec ()
1053 PPCODE:
1054{
1055 int freq, channels;
1056 Uint16 format;
1057
1058 if (Mix_QuerySpec (&freq, &format, &channels))
1059 {
1060 EXTEND (SP, 3);
1061 PUSHs (sv_2mortal (newSViv (freq)));
1062 PUSHs (sv_2mortal (newSViv (format)));
1063 PUSHs (sv_2mortal (newSViv (channels)));
1064 }
1065}
1066
1067void
768Mix_CloseAudio () 1068Mix_CloseAudio ()
769 1069
770int 1070int
771Mix_AllocateChannels (int numchans = -1) 1071Mix_AllocateChannels (int numchans = -1)
1072
1073const char *
1074Mix_GetError ()
772 1075
773void 1076void
774lowdelay (int fd, int val = 1) 1077lowdelay (int fd, int val = 1)
775 CODE: 1078 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1079 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
802 } 1105 }
803 } 1106 }
804#endif 1107#endif
805} 1108}
806 1109
807void 1110int
808add_font (char *file) 1111add_font (char *file)
809 CODE: 1112 CODE:
810 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
811 1116
812void 1117void
813load_image_inline (SV *image_) 1118load_image_inline (SV *image_)
814 ALIAS: 1119 ALIAS:
815 load_image_file = 1 1120 load_image_file = 1
… …
818 STRLEN image_len; 1123 STRLEN image_len;
819 char *image = (char *)SvPVbyte (image_, image_len); 1124 char *image = (char *)SvPVbyte (image_, image_len);
820 SDL_Surface *surface, *surface2; 1125 SDL_Surface *surface, *surface2;
821 SDL_PixelFormat fmt; 1126 SDL_PixelFormat fmt;
822 SDL_RWops *rw = ix 1127 SDL_RWops *rw = ix
823 ? SDL_RWFromFile (image, "r") 1128 ? SDL_RWFromFile (image, "rb")
824 : SDL_RWFromConstMem (image, image_len); 1129 : SDL_RWFromConstMem (image, image_len);
825 1130
826 if (!rw) 1131 if (!rw)
827 croak ("load_image: %s", SDL_GetError ()); 1132 croak ("load_image: %s", SDL_GetError ());
828 1133
… …
901void 1206void
902error (char *message) 1207error (char *message)
903 CODE: 1208 CODE:
904 fprintf (stderr, "ERROR: %s\n", message); 1209 fprintf (stderr, "ERROR: %s\n", message);
905#ifdef _WIN32 1210#ifdef _WIN32
906 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1211 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
907#endif 1212#endif
908 1213
909void 1214void
910fatal (char *message) 1215fatal (char *message)
911 CODE: 1216 CODE:
912 fprintf (stderr, "FATAL: %s\n", message); 1217 fprintf (stderr, "FATAL: %s\n", message);
913#ifdef _WIN32 1218#ifdef _WIN32
914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1219 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
915#endif 1220#endif
916 _exit (1); 1221 _exit (1);
917 1222
918void 1223void
919_exit (int retval = 0) 1224_exit (int retval = 0)
… …
931#if DEBUG 1236#if DEBUG
932 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
933#endif 1238#endif
934} 1239}
935 1240
936MODULE = CFPlus PACKAGE = CFPlus::Font 1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
937 1247
938CFPlus::Font 1248MODULE = Deliantra::Client PACKAGE = DC::Font
1249
1250PROTOTYPES: DISABLE
1251
1252DC::Font
939new_from_file (SV *class, char *path, int id = 0) 1253new_from_file (SV *class, char *path, int id = 0)
940 CODE: 1254 CODE:
941{ 1255{
942 int count; 1256 int count;
943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
946} 1260}
947 OUTPUT: 1261 OUTPUT:
948 RETVAL 1262 RETVAL
949 1263
950void 1264void
951DESTROY (CFPlus::Font self) 1265DESTROY (DC::Font self)
952 CODE: 1266 CODE:
953 pango_font_description_free (self); 1267 pango_font_description_free (self);
954 1268
955void 1269void
956make_default (CFPlus::Font self) 1270make_default (DC::Font self)
1271 PROTOTYPE: $
957 CODE: 1272 CODE:
958 default_font = self; 1273 default_font = self;
959 1274
960MODULE = CFPlus PACKAGE = CFPlus::Layout 1275MODULE = Deliantra::Client PACKAGE = DC::Layout
961 1276
1277PROTOTYPES: DISABLE
1278
962void 1279void
963reset_glyph_cache () 1280glyph_cache_backup ()
1281 PROTOTYPE:
964 CODE: 1282 CODE:
1283 tc_backup ();
1284
1285void
1286glyph_cache_restore ()
1287 PROTOTYPE:
1288 CODE:
965 tc_clear (); 1289 tc_restore ();
966 1290
967CFPlus::Layout 1291DC::Layout
968new (SV *class) 1292new (SV *class)
969 CODE: 1293 CODE:
970 New (0, RETVAL, 1, struct cf_layout); 1294 New (0, RETVAL, 1, struct cf_layout);
971 1295
972 RETVAL->pl = pango_layout_new (opengl_context); 1296 RETVAL->pl = pango_layout_new (opengl_context);
… …
974 RETVAL->g = 1.; 1298 RETVAL->g = 1.;
975 RETVAL->b = 1.; 1299 RETVAL->b = 1.;
976 RETVAL->a = 1.; 1300 RETVAL->a = 1.;
977 RETVAL->base_height = MIN_FONT_HEIGHT; 1301 RETVAL->base_height = MIN_FONT_HEIGHT;
978 RETVAL->font = 0; 1302 RETVAL->font = 0;
1303 RETVAL->rc = rc_alloc ();
979 1304
980 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1305 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
981 layout_update_font (RETVAL); 1306 layout_update_font (RETVAL);
982 OUTPUT: 1307 OUTPUT:
983 RETVAL 1308 RETVAL
984 1309
985void 1310void
986DESTROY (CFPlus::Layout self) 1311DESTROY (DC::Layout self)
987 CODE: 1312 CODE:
988 g_object_unref (self->pl); 1313 g_object_unref (self->pl);
1314 rc_free (self->rc);
989 Safefree (self); 1315 Safefree (self);
990 1316
991void 1317void
992set_text (CFPlus::Layout self, SV *text_) 1318set_text (DC::Layout self, SV *text_)
993 CODE: 1319 CODE:
994{ 1320{
995 STRLEN textlen; 1321 STRLEN textlen;
996 char *text = SvPVutf8 (text_, textlen); 1322 char *text = SvPVutf8 (text_, textlen);
997 1323
998 pango_layout_set_text (self->pl, text, textlen); 1324 pango_layout_set_text (self->pl, text, textlen);
999} 1325}
1000 1326
1001void 1327void
1002set_markup (CFPlus::Layout self, SV *text_) 1328set_markup (DC::Layout self, SV *text_)
1003 CODE: 1329 CODE:
1004{ 1330{
1005 STRLEN textlen; 1331 STRLEN textlen;
1006 char *text = SvPVutf8 (text_, textlen); 1332 char *text = SvPVutf8 (text_, textlen);
1007 1333
1008 pango_layout_set_markup (self->pl, text, textlen); 1334 pango_layout_set_markup (self->pl, text, textlen);
1009} 1335}
1010 1336
1011void 1337void
1012set_shapes (CFPlus::Layout self, ...) 1338set_shapes (DC::Layout self, ...)
1013 CODE: 1339 CODE:
1014{ 1340{
1015 PangoAttrList *attrs = 0; 1341 PangoAttrList *attrs = 0;
1016 const char *text = pango_layout_get_text (self->pl); 1342 const char *text = pango_layout_get_text (self->pl);
1017 const char *pos = text; 1343 const char *pos = text;
… …
1052 if (attrs) 1378 if (attrs)
1053 pango_layout_set_attributes (self->pl, attrs); 1379 pango_layout_set_attributes (self->pl, attrs);
1054} 1380}
1055 1381
1056void 1382void
1057get_shapes (CFPlus::Layout self) 1383get_shapes (DC::Layout self)
1058 PPCODE: 1384 PPCODE:
1059{ 1385{
1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1061 1387
1062 do 1388 do
1063 { 1389 {
1064 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1065 1391
1066 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1067 { 1393 {
1068 PangoRectangle extents; 1394 PangoRectangle extents;
1069 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1077 1403
1078 pango_layout_iter_free (iter); 1404 pango_layout_iter_free (iter);
1079} 1405}
1080 1406
1081int 1407int
1082has_wrapped (CFPlus::Layout self) 1408has_wrapped (DC::Layout self)
1083 CODE: 1409 CODE:
1084{ 1410{
1085 int lines = 1; 1411 int lines = 1;
1086 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1087 1413
… …
1092} 1418}
1093 OUTPUT: 1419 OUTPUT:
1094 RETVAL 1420 RETVAL
1095 1421
1096SV * 1422SV *
1097get_text (CFPlus::Layout self) 1423get_text (DC::Layout self)
1098 CODE: 1424 CODE:
1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1425 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1100 sv_utf8_decode (RETVAL); 1426 sv_utf8_decode (RETVAL);
1101 OUTPUT: 1427 OUTPUT:
1102 RETVAL 1428 RETVAL
1103 1429
1104void 1430void
1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1431set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1106 CODE: 1432 CODE:
1107 self->r = r; 1433 self->r = r;
1108 self->g = g; 1434 self->g = g;
1109 self->b = b; 1435 self->b = b;
1110 self->a = a; 1436 self->a = a;
1111 1437
1112void 1438void
1113set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1439set_font (DC::Layout self, DC::Font font = 0)
1114 CODE: 1440 CODE:
1115 if (self->font != font) 1441 if (self->font != font)
1116 { 1442 {
1117 self->font = font; 1443 self->font = font;
1118 layout_update_font (self); 1444 layout_update_font (self);
1119 } 1445 }
1120 1446
1121void 1447void
1122set_height (CFPlus::Layout self, int base_height) 1448set_height (DC::Layout self, int base_height)
1123 CODE: 1449 CODE:
1124 if (self->base_height != base_height) 1450 if (self->base_height != base_height)
1125 { 1451 {
1126 self->base_height = base_height; 1452 self->base_height = base_height;
1127 layout_update_font (self); 1453 layout_update_font (self);
1128 } 1454 }
1129 1455
1130void 1456void
1131set_width (CFPlus::Layout self, int max_width = -1) 1457set_width (DC::Layout self, int max_width = -1)
1132 CODE: 1458 CODE:
1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1459 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1134 1460
1135void 1461void
1136set_indent (CFPlus::Layout self, int indent) 1462set_indent (DC::Layout self, int indent)
1137 CODE: 1463 CODE:
1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1464 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1139 1465
1140void 1466void
1141set_spacing (CFPlus::Layout self, int spacing) 1467set_spacing (DC::Layout self, int spacing)
1142 CODE: 1468 CODE:
1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1469 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1144 1470
1145void 1471void
1146set_ellipsise (CFPlus::Layout self, int ellipsise) 1472set_ellipsise (DC::Layout self, int ellipsise)
1147 CODE: 1473 CODE:
1148 pango_layout_set_ellipsize (self->pl, 1474 pango_layout_set_ellipsize (self->pl,
1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1475 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1476 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1477 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1152 : PANGO_ELLIPSIZE_NONE 1478 : PANGO_ELLIPSIZE_NONE
1153 ); 1479 );
1154 1480
1155void 1481void
1156set_single_paragraph_mode (CFPlus::Layout self, int spm) 1482set_single_paragraph_mode (DC::Layout self, int spm)
1157 CODE: 1483 CODE:
1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1484 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1159 1485
1160void 1486void
1161size (CFPlus::Layout self) 1487size (DC::Layout self)
1162 PPCODE: 1488 PPCODE:
1163{ 1489{
1164 int w, h; 1490 int w, h;
1165 1491
1166 layout_get_pixel_size (self, &w, &h); 1492 layout_get_pixel_size (self, &w, &h);
… …
1169 PUSHs (sv_2mortal (newSViv (w))); 1495 PUSHs (sv_2mortal (newSViv (w)));
1170 PUSHs (sv_2mortal (newSViv (h))); 1496 PUSHs (sv_2mortal (newSViv (h)));
1171} 1497}
1172 1498
1173int 1499int
1174descent (CFPlus::Layout self) 1500descent (DC::Layout self)
1175 CODE: 1501 CODE:
1176{ 1502{
1177 PangoRectangle rect; 1503 PangoRectangle rect;
1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1179 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1180 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1181} 1507}
1182 OUTPUT: 1508 OUTPUT:
1183 RETVAL 1509 RETVAL
1184 1510
1185int 1511int
1186xy_to_index (CFPlus::Layout self, int x, int y) 1512xy_to_index (DC::Layout self, int x, int y)
1187 CODE: 1513 CODE:
1188{ 1514{
1189 int index, trailing; 1515 int index, trailing;
1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1516 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1191 RETVAL = index + trailing; 1517 RETVAL = index + trailing;
1192} 1518}
1193 OUTPUT: 1519 OUTPUT:
1194 RETVAL 1520 RETVAL
1195 1521
1196void 1522void
1197cursor_pos (CFPlus::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1198 PPCODE: 1524 PPCODE:
1199{ 1525{
1200 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1202 1528
1203 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1204 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1207} 1533}
1208 1534
1209void 1535void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1211 PPCODE: 1537 PPCODE:
1212{ 1538{
1213 int line, x; 1539 int line, x;
1214 1540
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1541 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1542#if !PANGO_VERSION_CHECK (1, 17, 3)
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1543 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217 1544 --line;
1545#endif
1218 EXTEND (SP, 2); 1546 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1))); 1547 PUSHs (sv_2mortal (newSViv (line)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1548 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221} 1549}
1222 1550
1223void 1551void
1224line_x_to_index (CFPlus::Layout self, int line, int x) 1552line_x_to_index (DC::Layout self, int line, int x)
1225 PPCODE: 1553 PPCODE:
1226{ 1554{
1227 PangoLayoutLine *lp; 1555 PangoLayoutLine *lp;
1228 int index, trailing; 1556 int index, trailing;
1229 1557
1230 if (line < 0) 1558 if (line < 0)
1231 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1232 1560
1233 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1235 1563
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1564 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237 1565
1238 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
… …
1244 PUSHs (sv_2mortal (newSViv (trailing))); 1572 PUSHs (sv_2mortal (newSViv (trailing)));
1245 } 1573 }
1246} 1574}
1247 1575
1248void 1576void
1249render (CFPlus::Layout self, float x, float y, int flags = 0) 1577render (DC::Layout self, float x, float y, int flags = 0)
1250 PPCODE: 1578 CODE:
1579 rc_clear (self->rc);
1251 pango_opengl_render_layout_subpixel ( 1580 pango_opengl_render_layout_subpixel (
1252 self->pl, 1581 self->pl,
1582 self->rc,
1253 x * PANGO_SCALE, y * PANGO_SCALE, 1583 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a, 1584 self->r, self->g, self->b, self->a,
1255 flags 1585 flags
1256 ); 1586 );
1587 // we assume that context_change actually clears/frees stuff
1588 // and does not do any recomputation...
1589 pango_layout_context_changed (self->pl);
1257 1590
1258MODULE = CFPlus PACKAGE = CFPlus::Texture 1591void
1592draw (DC::Layout self)
1593 CODE:
1594{
1595 glEnable (GL_TEXTURE_2D);
1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1597 glEnable (GL_BLEND);
1598 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1599 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1600 glEnable (GL_ALPHA_TEST);
1601 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1259 1602
1260int minpot (int n) 1603 rc_draw (self->rc);
1604
1605 glDisable (GL_ALPHA_TEST);
1606 glDisable (GL_BLEND);
1607 glDisable (GL_TEXTURE_2D);
1608}
1609
1610MODULE = Deliantra::Client PACKAGE = DC::Texture
1611
1612PROTOTYPES: ENABLE
1261 1613
1262void 1614void
1263pad (SV *data_, int ow, int oh, int nw, int nh) 1615pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE: 1616 CODE:
1265{ 1617{
… …
1292 HV *hv = (HV *)SvRV (self); 1644 HV *hv = (HV *)SvRV (self);
1293 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1645 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1294 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1646 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1295 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1647 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1296 1648
1649 if (name <= 0)
1650 XSRETURN_EMPTY;
1651
1297 if (items < 5) 1652 if (items < 5)
1298 { 1653 {
1299 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1654 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1300 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1655 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1301 } 1656 }
… …
1328 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1329 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1330 } 1685 }
1331} 1686}
1332 1687
1688void
1689draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1807}
1808
1333IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1334 CODE: 1810 CODE:
1335{ 1811{
1336 GLint width; 1812 GLint width;
1337 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1813 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1339 RETVAL = width > 0; 1815 RETVAL = width > 0;
1340} 1816}
1341 OUTPUT: 1817 OUTPUT:
1342 RETVAL 1818 RETVAL
1343 1819
1344MODULE = CFPlus PACKAGE = CFPlus::Map 1820MODULE = Deliantra::Client PACKAGE = DC::Map
1345 1821
1346CFPlus::Map 1822PROTOTYPES: DISABLE
1823
1824DC::Map
1347new (SV *class) 1825new (SV *class)
1348 CODE: 1826 CODE:
1349 New (0, RETVAL, 1, struct map); 1827 New (0, RETVAL, 1, struct map);
1350 RETVAL->x = 0; 1828 RETVAL->x = 0;
1351 RETVAL->y = 0; 1829 RETVAL->y = 0;
… …
1359 RETVAL->row = 0; 1837 RETVAL->row = 0;
1360 OUTPUT: 1838 OUTPUT:
1361 RETVAL 1839 RETVAL
1362 1840
1363void 1841void
1364DESTROY (CFPlus::Map self) 1842DESTROY (DC::Map self)
1365 CODE: 1843 CODE:
1366{ 1844{
1367 map_clear (self); 1845 map_clear (self);
1368 Safefree (self->face2tile); 1846 Safefree (self->face2tile);
1369 Safefree (self->tex); 1847 Safefree (self->tex);
1370 Safefree (self); 1848 Safefree (self);
1371} 1849}
1372 1850
1373void 1851void
1374resize (CFPlus::Map self, int map_width, int map_height) 1852resize (DC::Map self, int map_width, int map_height)
1375 CODE: 1853 CODE:
1376 self->w = map_width; 1854 self->w = map_width;
1377 self->h = map_height; 1855 self->h = map_height;
1378 1856
1379void 1857void
1380clear (CFPlus::Map self) 1858clear (DC::Map self)
1381 CODE: 1859 CODE:
1382 map_clear (self); 1860 map_clear (self);
1383 1861
1384void 1862void
1385set_tileid (CFPlus::Map self, int face, int tile) 1863set_tileid (DC::Map self, int face, int tile)
1386 CODE: 1864 CODE:
1387{ 1865{
1388 need_facenum (self, face); self->face2tile [face] = tile; 1866 need_facenum (self, face); self->face2tile [face] = tile;
1389 need_texid (self, tile); 1867 need_texid (self, tile);
1390} 1868}
1391 1869
1392void 1870void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level) 1871set_smooth (DC::Map self, int face, int smooth, int level)
1394 CODE: 1872 CODE:
1395{ 1873{
1396 tileid texid; 1874 tileid texid;
1397 maptex *tex; 1875 maptex *tex;
1398 1876
… …
1411 tex->smoothtile = self->face2tile [smooth]; 1889 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level; 1890 tex->smoothlevel = level;
1413} 1891}
1414 1892
1415void 1893void
1416set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1894set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1417 CODE: 1895 CODE:
1418{ 1896{
1419 need_texid (self, texid); 1897 need_texid (self, texid);
1420 1898
1421 { 1899 {
… …
1440 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1441 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1443} 1921}
1444 1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1942
1445int 1943int
1446ox (CFPlus::Map self) 1944ox (DC::Map self)
1447 ALIAS: 1945 ALIAS:
1448 oy = 1 1946 oy = 1
1449 x = 2 1947 x = 2
1450 y = 3 1948 y = 3
1451 w = 4 1949 w = 4
… …
1462 } 1960 }
1463 OUTPUT: 1961 OUTPUT:
1464 RETVAL 1962 RETVAL
1465 1963
1466void 1964void
1467scroll (CFPlus::Map self, int dx, int dy) 1965scroll (DC::Map self, int dx, int dy)
1468 CODE: 1966 CODE:
1469{ 1967{
1470 if (dx > 0) 1968 if (dx > 0)
1471 map_blank (self, self->x, self->y, dx, self->h); 1969 map_blank (self, self->x, self->y, dx, self->h);
1472 else if (dx < 0) 1970 else if (dx < 0)
… …
1487 self->rows += MAP_EXTEND_Y; 1985 self->rows += MAP_EXTEND_Y;
1488 self->y += MAP_EXTEND_Y; 1986 self->y += MAP_EXTEND_Y;
1489 } 1987 }
1490} 1988}
1491 1989
1492void 1990SV *
1493map1a_update (CFPlus::Map self, SV *data_, int extmap) 1991map1a_update (DC::Map self, SV *data_, int extmap)
1494 CODE: 1992 CODE:
1495{ 1993{
1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1497 uint8_t *data_end = (uint8_t *)SvEND (data_); 1995 uint8_t *data_end = (uint8_t *)SvEND (data_);
1498 mapcell *cell; 1996 mapcell *cell;
1499 int x, y, flags; 1997 int x, y, z, flags;
1998 AV *missing = newAV ();
1999 RETVAL = newRV_noinc ((SV *)missing);
1500 2000
1501 while (data < data_end - 1) 2001 while (data < data_end - 1)
1502 { 2002 {
1503 flags = (data [0] << 8) + data [1]; data += 2; 2003 flags = (data [0] << 8) + data [1]; data += 2;
1504 2004
… …
1524 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1525 2025
1526 do 2026 do
1527 { 2027 {
1528 ext = *data++; 2028 ext = *data++;
1529 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1530 2030
1531 if (cmd < 4) 2031 if (cmd < 4)
1532 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1533 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1534 { 2034 {
1535 cell->stat_width = 1; 2035 cell->stat_width = 1;
1536 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1537 } 2037 }
1538 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1539 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1540 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1541 { 2041 {
1542 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1543 ; // decode player count 2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1544 2046
1545 data += *data + 1; 2047 data += *data + 1;
1546 } 2048 }
1547 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1548 cell->flags = *data++; 2050 cell->flags = *data++;
… …
1555 } 2057 }
1556 else 2058 else
1557 cell->darkness = *data++ + 1; 2059 cell->darkness = *data++ + 1;
1558 } 2060 }
1559 2061
2062 for (z = 0; z <= 2; ++z)
1560 if (flags & 4) 2063 if (flags & (4 >> z))
1561 { 2064 {
1562 faceid face = (data [0] << 8) + data [1]; data += 2; 2065 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face); 2066 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
2068
2069 if (cell->tile [z])
2070 {
2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
2073 if (!tex->name)
2074 av_push (missing, newSViv (cell->tile [z]));
2075
2076 if (tex->smoothtile)
2077 {
2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
2080 if (!smooth->name)
2081 av_push (missing, newSViv (tex->smoothtile));
2082 }
2083 }
1565 } 2084 }
1566
1567 if (flags & 2)
1568 {
1569 faceid face = (data [0] << 8) + data [1]; data += 2;
1570 need_facenum (self, face);
1571 cell->tile [1] = self->face2tile [face];
1572 }
1573
1574 if (flags & 1)
1575 {
1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [2] = self->face2tile [face];
1579 }
1580 } 2085 }
1581 else 2086 else
1582 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1583 } 2088 }
1584} 2089}
2090 OUTPUT:
2091 RETVAL
1585 2092
1586SV * 2093SV *
1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2094mapmap (DC::Map self, int x0, int y0, int w, int h)
1588 CODE: 2095 CODE:
1589{ 2096{
1590 int x1, x; 2097 int x1, x;
1591 int y1, y; 2098 int y1, y;
1592 int z; 2099 int z;
… …
1637} 2144}
1638 OUTPUT: 2145 OUTPUT:
1639 RETVAL 2146 RETVAL
1640 2147
1641void 2148void
1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1643 CODE: 2150 CODE:
1644{ 2151{
2152 int x, y, z;
2153
1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1648 smooth_key skey; 2157 smooth_key skey;
1649 int x, y, z; 2158 int pl_x, pl_y;
1650 int last_name; 2159 maptex pl_tex;
2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
2162 rc_key_t key;
2163 rc_array_t *arr;
1651 2164
2165 pl_tex.name = 0;
2166
1652 // thats current max. sorry. 2167 // that's current max. sorry.
1653 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1655 2170
1656 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1657 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
1658 2173
1659 glColor4ub (255, 255, 255, 255); 2174 memset (&key, 0, sizeof (key));
1660 2175 key.r = 255;
1661 glEnable (GL_BLEND); 2176 key.g = 255;
1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2177 key.b = 255;
1663 glEnable (GL_TEXTURE_2D); 2178 key.a = 255;
1664 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2179 key.mode = GL_QUADS;
1665 2180 key.format = GL_T2F_V3F;
1666 glBegin (GL_QUADS);
1667
1668 last_name = 0;
1669 2181
1670 mx += self->x; 2182 mx += self->x;
1671 my += self->y; 2183 my += self->y;
1672 2184
1673 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
… …
1690 MAX (self->tex [cell->tile [1]].smoothlevel, 2202 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel)); 2203 self->tex [cell->tile [2]].smoothlevel));
1692 } 2204 }
1693 } 2205 }
1694 2206
2207 glEnable (GL_BLEND);
2208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210
1695 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1696 { 2212 {
1697 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1698 2215
1699 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1700 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1701 { 2218 {
1702 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
… …
1708 tileid tile = cell->tile [z]; 2225 tileid tile = cell->tile [z];
1709 2226
1710 if (tile) 2227 if (tile)
1711 { 2228 {
1712 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w; 2230 int px, py;
1714 int py = (y + 1) * T - tex.h;
1715 2231
1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name) 2232 if (key.texname != tex.name)
1719 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1720 if (!tex.name) 2236 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1722 2238
1723 glEnd (); 2239 key.texname = tex.name;
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2240 arr = rc_array (rc, &key);
1725 glBegin (GL_QUADS);
1726 } 2241 }
1727 2242
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2243 px = (x + 1) * T - tex.w;
1729 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2244 py = (y + 1) * T - tex.h;
1730 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1731 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1732 2245
1733 if (cell->flags && z == 2) 2246 if (expect_false (cell->player == player) && expect_false (z == 2))
1734 { 2247 {
1735 if (cell->flags & 1) 2248 pl_x = px;
2249 pl_y = py;
2250 pl_tex = tex;
1736 { 2251 continue;
1737 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32;
1740
1741 glEnd ();
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1743 glBegin (GL_QUADS);
1744
1745 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1746 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1747 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1748 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1749 }
1750 } 2252 }
2253
2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2256 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1751 2258
1752 // update smooth hash 2259 // update smooth hash
1753 if (tex.smoothtile) 2260 if (tex.smoothtile)
1754 { 2261 {
1755 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
… …
1786 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1787 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2294 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1788 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1789 } 2296 }
1790 } 2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2317 }
2318 }
1791 } 2319 }
1792 } 2320 }
2321
2322 rc_draw (rc);
2323 rc_clear (rc);
1793 2324
1794 // go through all smoothlevels, lowest to highest, then draw. 2325 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort 2326 // this is basically counting sort
1796 { 2327 {
1797 int w, b; 2328 int w, b;
1798 2329
2330 glEnable (GL_TEXTURE_2D);
2331 glBegin (GL_QUADS);
1799 for (w = 0; w < 256 / 32; ++w) 2332 for (w = 0; w < 256 / 32; ++w)
1800 { 2333 {
1801 uint32_t smask = smooth_level [w]; 2334 uint32_t smask = smooth_level [w];
1802 if (smask) 2335 if (smask)
1803 for (b = 0; b < 32; ++b) 2336 for (b = 0; b < 32; ++b)
… …
1822 int border = bits & 15; 2355 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2356 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row 2357 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column 2358 float dy = tex.t * .5f ; // 2 images/column
1826 2359
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name) 2360 if (tex.name)
1830 { 2361 {
2362 // this time avoiding texture state changes
2363 // save gobs of state changes.
1831 if (!tex.name) 2364 if (key.texname != tex.name)
1832 continue; // smoothing not yet available 2365 {
2366 self->tex [skey->tile].unused = 0;
1833 2367
1834 glEnd (); 2368 glEnd ();
1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1836 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
1837 } 2371 }
1838 2372
1839 if (border) 2373 if (border)
1840 { 2374 {
1841 float ox = border * dx; 2375 float ox = border * dx;
1842 2376
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1847 } 2381 }
1848 2382
1849 if (corner) 2383 if (corner)
1850 { 2384 {
1851 float ox = corner * dx; 2385 float ox = corner * dx;
1852 2386
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2387 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2391 }
1857 } 2392 }
1858 } 2393 }
1859 } 2394 }
1860 } 2395 }
1861 } 2396 }
2397
2398 glEnd ();
2399 glDisable (GL_TEXTURE_2D);
2400 key.texname = -1;
1862 } 2401 }
1863 2402
1864 hv_clear (smooth); 2403 hv_clear (smooth);
1865 } 2404 }
1866 2405
1867 glEnd (); 2406 if (pl_tex.name)
2407 {
2408 maptex tex = pl_tex;
2409 int px = pl_x + sdx;
2410 int py = pl_y + sdy;
1868 2411
1869 glDisable (GL_TEXTURE_2D); 2412 key.texname = tex.name;
2413 arr = rc_array (rc, &key);
2414
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2417 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2419
2420 rc_draw (rc);
2421 }
2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
1870 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2427 rc_free (rc);
2428 rc_free (rc_ov);
1871 2429
1872 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
1873 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
1874 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
1875 { 2433 {
… …
1880 { 2438 {
1881 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
1882 2440
1883 int px = x * T; 2441 int px = x * T;
1884 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
1885 2449
1886 if (cell->stat_hp) 2450 if (cell->stat_hp)
1887 { 2451 {
1888 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
1889 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1900 } 2464 }
1901 } 2465 }
1902} 2466}
1903 2467
1904void 2468void
1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1906 CODE: 2470 CODE:
1907{ 2471{
1908 static float color[16][3] = { 2472 static float color[16][3] = {
1909 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
1910 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
1911 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
1912 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
1913 2477
1914 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
1915 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
1916 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
1917 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
1918 2482
1919 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
1920 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
1921 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
1922 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
1923 2487
1924 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
1925 2489
1926 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
1927 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
1928 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
1929 }; 2493 };
1930 2494
1931 int x, y; 2495 int x, y;
1932 2496
1933 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
1934 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1935 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
1936 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1937 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
1938 2508
1939 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
… …
1943 2513
1944 if (m) 2514 if (m)
1945 { 2515 {
1946 float *c = color [m & 15]; 2516 float *c = color [m & 15];
1947 2517
1948 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
1949 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
1950 2520
1951 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
1952 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1953 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1954 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1955 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1956 } 2526 }
… …
1960 glDisable (GL_BLEND); 2530 glDisable (GL_BLEND);
1961 glDisable (GL_TEXTURE_2D); 2531 glDisable (GL_TEXTURE_2D);
1962} 2532}
1963 2533
1964void 2534void
1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1966 PPCODE: 2536 PPCODE:
1967{ 2537{
1968 int x, y; 2538 int x, y;
1969 int sw4 = (sw + 3) & ~3; 2539 int sw1 = sw + 2;
2540 int sh1 = sh + 2;
2541 int sh3 = sh * 3;
2542 int sw3 = sw * 3;
2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1972 2546
1973 memset (darkness, 255, sw4 * sh);
1974 SvPOK_only (darkness_sv); 2547 SvPOK_only (darkness3_sv);
1975 SvCUR_set (darkness_sv, sw4 * sh); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
1976 2549
1977 mx += self->x; 2550 mx += self->x - 1;
1978 my += self->y; 2551 my += self->y - 1;
1979 2552
1980 for (y = 0; y < sh; y++) 2553 for (y = 0; y < sh1; y++)
1981 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
1982 { 2555 {
1983 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
1984 2557
1985 for (x = 0; x < sw; x++) 2558 for (x = 0; x < sw1; x++)
1986 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
1987 { 2560 {
1988 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
1989 2562
1990 darkness[y * sw4 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
1991 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1992 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
1993 } 2566 }
1994 } 2567 }
1995 2568
1996 if (smoothing)
1997 {
1998 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
1999 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2000
2001 SvPOK_only (darkness2_sv);
2002 SvCUR_set (darkness2_sv, sw4 * sh);
2003
2004 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x) 2570 for (x = 0; x < sw; ++x)
2006 { 2571 {
2007 float *f = (float *)matrix; 2572 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2008 int dx, dy; 2573 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2009 float sum = 0.f; 2574 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2575 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2576 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2577 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2578 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2579 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2580 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2010 2581
2011 for (dy = -1; dy <= 1; ++dy) 2582 uint8_t r11 = (d11 + d21 + d12) / 3;
2012 for (dx = -1; dx <= 1; ++dx) 2583 uint8_t r21 = d21;
2013 { 2584 uint8_t r31 = (d21 + d31 + d32) / 3;
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016 2585
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2586 uint8_t r12 = d12;
2018 } 2587 uint8_t r22 = d22;
2588 uint8_t r32 = d32;
2019 2589
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2021 } 2591 uint8_t r23 = d23;
2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2022 2593
2023 darkness_sv = darkness2_sv; 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2598 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2024 } 2603 }
2604
2605 free (darkness1);
2025 2606
2026 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2027 PUSHs (sv_2mortal (newSViv (sw4))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2028 PUSHs (sv_2mortal (newSViv (sh))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2029 PUSHs (darkness_sv); 2610 PUSHs (darkness3_sv);
2030} 2611}
2031 2612
2032SV * 2613SV *
2033get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2614get_rect (DC::Map self, int x0, int y0, int w, int h)
2034 CODE: 2615 CODE:
2035{ 2616{
2036 int x, y, x1, y1; 2617 int x, y, x1, y1;
2037 SV *data_sv = newSV (w * h * 7 + 5); 2618 SV *data_sv = newSV (w * h * 7 + 5);
2038 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2619 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2095 else 2676 else
2096 *data++ = 0; 2677 *data++ = 0;
2097 } 2678 }
2098 } 2679 }
2099 2680
2681 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 {
2100 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2101 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2102 RETVAL = data_sv; 2688 RETVAL = data_sv;
2103} 2689}
2104 OUTPUT: 2690 OUTPUT:
2105 RETVAL 2691 RETVAL
2106 2692
2107void 2693void
2108set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2109 PPCODE: 2695 PPCODE:
2110{ 2696{
2111 int x, y, z; 2697 int x, y, z;
2112 int w, h; 2698 int w, h;
2113 int x1, y1; 2699 int x1, y1;
2700 STRLEN len;
2701 uint8_t *data, *end;
2702
2703 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv);
2706 end = data + len + 8;
2707
2708 if (len < 5)
2709 XSRETURN_EMPTY;
2114 2710
2115 if (*data++ != 0) 2711 if (*data++ != 0)
2116 return; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2117 2713
2118 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
2119 h = *data++ << 8; h |= *data++; 2715 h = *data++ << 8; h |= *data++;
2120 2716
2121 // we need to do this 'cause we don't keep an absolute coord system for rows 2717 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2133 { 2729 {
2134 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2135 2731
2136 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2137 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2138 uint8_t flags = *data++; 2739 flags = *data++;
2139 2740
2140 if (flags) 2741 if (flags)
2141 { 2742 {
2142 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2143 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
… …
2146 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2147 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2148 2749
2149 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2150 { 2751 {
2151 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2152 2754
2153 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2154 { 2756 {
2155 tileid t = tile [z]; 2757 tileid t = tile [z];
2156 2758
2157 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2158 { 2760 {
2159 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2160 need_texid (self, t); 2762 need_texid (self, t);
2161 } 2763 }
2162 2764
2163 cell->tile [z] = t; 2765 cell->tile [z] = t;
2164 } 2766 }
… …
2166 } 2768 }
2167 } 2769 }
2168 } 2770 }
2169} 2771}
2170 2772
2171MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2773MODULE = Deliantra::Client PACKAGE = DC::RW
2172 2774
2173CFPlus::MixChunk 2775DC::RW
2174new_from_file (SV *class, char *path) 2776new (SV *class, SV *data_sv)
2175 CODE: 2777 CODE:
2176 RETVAL = Mix_LoadWAV (path); 2778{
2779 STRLEN datalen;
2780 char *data = SvPVbyte (data_sv, datalen);
2781
2782 RETVAL = SDL_RWFromConstMem (data, datalen);
2783}
2177 OUTPUT: 2784 OUTPUT:
2178 RETVAL 2785 RETVAL
2179 2786
2787DC::RW
2788new_from_file (SV *class, const char *path, const char *mode = "rb")
2789 CODE:
2790 RETVAL = SDL_RWFromFile (path, mode);
2791 OUTPUT:
2792 RETVAL
2793
2794# fails on win32:
2795# dc.xs(2268) : error C2059: syntax error : '('
2180void 2796#void
2797#close (DC::RW self)
2798# CODE:
2799# (self->(close)) (self);
2800
2801MODULE = Deliantra::Client PACKAGE = DC::Channel
2802
2803PROTOTYPES: DISABLE
2804
2805DC::Channel
2806find ()
2807 CODE:
2808{
2809 RETVAL = Mix_GroupAvailable (-1);
2810
2811 if (RETVAL < 0)
2812 {
2813 RETVAL = Mix_GroupOldest (-1);
2814
2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2821 XSRETURN_UNDEF;
2822 }
2823 else
2824 Mix_HaltChannel (RETVAL);
2825 }
2826
2827 Mix_UnregisterAllEffects (RETVAL);
2828 Mix_Volume (RETVAL, 128);
2829}
2830 OUTPUT:
2831 RETVAL
2832
2833void
2834halt (DC::Channel self)
2835 CODE:
2836 Mix_HaltChannel (self);
2837
2838void
2839expire (DC::Channel self, int ticks = -1)
2840 CODE:
2841 Mix_ExpireChannel (self, ticks);
2842
2843void
2844fade_out (DC::Channel self, int ticks = -1)
2845 CODE:
2846 Mix_FadeOutChannel (self, ticks);
2847
2848int
2849volume (DC::Channel self, int volume)
2850 CODE:
2851 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2852 OUTPUT:
2853 RETVAL
2854
2855void
2856unregister_all_effects (DC::Channel self)
2857 CODE:
2858 Mix_UnregisterAllEffects (self);
2859
2860void
2861set_panning (DC::Channel self, int left, int right)
2862 CODE:
2863 left = CLAMP (left , 0, 255);
2864 right = CLAMP (right, 0, 255);
2865 Mix_SetPanning (self, left, right);
2866
2867void
2868set_distance (DC::Channel self, int distance)
2869 CODE:
2870 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2871
2872void
2873set_position (DC::Channel self, int angle, int distance)
2874 CODE:
2875
2876void
2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2878 CODE:
2879{
2880 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2883}
2884
2885void
2886set_reverse_stereo (DC::Channel self, int flip)
2887 CODE:
2888 Mix_SetReverseStereo (self, flip);
2889
2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2891
2892PROTOTYPES: DISABLE
2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2905
2906DC::MixChunk
2907new (SV *class, DC::RW rwops)
2908 CODE:
2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2910 OUTPUT:
2911 RETVAL
2912
2913void
2181DESTROY (CFPlus::MixChunk self) 2914DESTROY (DC::MixChunk self)
2182 CODE: 2915 CODE:
2183 Mix_FreeChunk (self); 2916 Mix_FreeChunk (self);
2184 2917
2185int 2918int
2186volume (CFPlus::MixChunk self, int volume = -1) 2919volume (DC::MixChunk self, int volume = -1)
2187 CODE: 2920 CODE:
2921 if (items > 1)
2922 volume = CLAMP (volume, 0, 128);
2188 RETVAL = Mix_VolumeChunk (self, volume); 2923 RETVAL = Mix_VolumeChunk (self, volume);
2189 OUTPUT: 2924 OUTPUT:
2190 RETVAL 2925 RETVAL
2191 2926
2192int 2927DC::Channel
2193play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2928play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2194 CODE: 2929 CODE:
2930{
2195 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2931 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2932
2933 if (RETVAL < 0)
2934 XSRETURN_UNDEF;
2935
2936 if (channel < 0)
2937 {
2938 Mix_UnregisterAllEffects (RETVAL);
2939 Mix_Volume (RETVAL, 128);
2940 }
2941}
2196 OUTPUT: 2942 OUTPUT:
2197 RETVAL 2943 RETVAL
2198 2944
2199MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2200 2958
2201int 2959int
2202volume (int volume = -1) 2960volume (int volume = -1)
2961 PROTOTYPE: ;$
2203 CODE: 2962 CODE:
2963 if (items > 0)
2964 volume = CLAMP (volume, 0, 128);
2204 RETVAL = Mix_VolumeMusic (volume); 2965 RETVAL = Mix_VolumeMusic (volume);
2205 OUTPUT: 2966 OUTPUT:
2206 RETVAL 2967 RETVAL
2207 2968
2969void
2970fade_out (int ms)
2971 CODE:
2972 Mix_FadeOutMusic (ms);
2973
2974void
2975halt ()
2976 CODE:
2977 Mix_HaltMusic ();
2978
2208int 2979int
2209fade_out (int ms) 2980playing ()
2210 CODE: 2981 CODE:
2211 RETVAL = Mix_FadeOutMusic (ms); 2982 RETVAL = Mix_PlayingMusic ();
2212 OUTPUT: 2983 OUTPUT:
2213 RETVAL 2984 RETVAL
2214 2985
2215CFPlus::MixMusic 2986DC::MixMusic
2216new_from_file (SV *class, char *path) 2987new (SV *class, DC::RW rwops)
2217 CODE: 2988 CODE:
2218 RETVAL = Mix_LoadMUS (path); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2219 OUTPUT: 2990 OUTPUT:
2220 RETVAL 2991 RETVAL
2221 2992
2222void 2993void
2223DESTROY (CFPlus::MixMusic self) 2994DESTROY (DC::MixMusic self)
2224 CODE: 2995 CODE:
2225 Mix_FreeMusic (self); 2996 Mix_FreeMusic (self);
2226 2997
2227int 2998int
2228play (CFPlus::MixMusic self, int loops = -1) 2999play (DC::MixMusic self, int loops = -1)
2229 CODE: 3000 CODE:
2230 RETVAL = Mix_PlayMusic (self, loops); 3001 RETVAL = Mix_PlayMusic (self, loops);
2231 OUTPUT: 3002 OUTPUT:
2232 RETVAL 3003 RETVAL
2233 3004
2234int 3005void
2235fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3006fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2236 CODE: 3007 CODE:
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3008 Mix_FadeInMusicPos (self, loops, ms, position);
2238 OUTPUT:
2239 RETVAL
2240 3009
2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3010MODULE = Deliantra::Client PACKAGE = DC::OpenGL
3011
3012PROTOTYPES: ENABLE
2242 3013
2243BOOT: 3014BOOT:
2244{ 3015{
2245 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3016 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2246 static const struct { 3017 static const struct {
2247 const char *name; 3018 const char *name;
2248 IV iv; 3019 IV iv;
2249 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2250# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2251 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2252 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2253 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2254 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2255 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2256 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2257 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2258 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
… …
2262 const_iv (GL_ALPHA_TEST), 3034 const_iv (GL_ALPHA_TEST),
2263 const_iv (GL_NORMALIZE), 3035 const_iv (GL_NORMALIZE),
2264 const_iv (GL_RESCALE_NORMAL), 3036 const_iv (GL_RESCALE_NORMAL),
2265 const_iv (GL_FRONT), 3037 const_iv (GL_FRONT),
2266 const_iv (GL_BACK), 3038 const_iv (GL_BACK),
3039 const_iv (GL_AUX0),
2267 const_iv (GL_AND), 3040 const_iv (GL_AND),
2268 const_iv (GL_ONE), 3041 const_iv (GL_ONE),
2269 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2270 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2271 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2272 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2273 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2274 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2275 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2276 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2277 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2278 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
… …
2284 const_iv (GL_INTENSITY), 3061 const_iv (GL_INTENSITY),
2285 const_iv (GL_LUMINANCE), 3062 const_iv (GL_LUMINANCE),
2286 const_iv (GL_LUMINANCE_ALPHA), 3063 const_iv (GL_LUMINANCE_ALPHA),
2287 const_iv (GL_FLOAT), 3064 const_iv (GL_FLOAT),
2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3065 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3066 const_iv (GL_COMPRESSED_ALPHA_ARB),
3067 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3068 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3069 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3070 const_iv (GL_COMPRESSED_RGB_ARB),
3071 const_iv (GL_COMPRESSED_RGBA_ARB),
2289 const_iv (GL_COMPILE), 3072 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D), 3073 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D), 3074 const_iv (GL_PROXY_TEXTURE_2D),
2292 const_iv (GL_TEXTURE_1D), 3075 const_iv (GL_TEXTURE_1D),
2293 const_iv (GL_TEXTURE_2D), 3076 const_iv (GL_TEXTURE_2D),
… …
2317 const_iv (GL_COLOR_LOGIC_OP), 3100 const_iv (GL_COLOR_LOGIC_OP),
2318 const_iv (GL_SEPARABLE_2D), 3101 const_iv (GL_SEPARABLE_2D),
2319 const_iv (GL_CONVOLUTION_2D), 3102 const_iv (GL_CONVOLUTION_2D),
2320 const_iv (GL_CONVOLUTION_BORDER_MODE), 3103 const_iv (GL_CONVOLUTION_BORDER_MODE),
2321 const_iv (GL_CONSTANT_BORDER), 3104 const_iv (GL_CONSTANT_BORDER),
3105 const_iv (GL_POINTS),
2322 const_iv (GL_LINES), 3106 const_iv (GL_LINES),
2323 const_iv (GL_LINE_STRIP), 3107 const_iv (GL_LINE_STRIP),
2324 const_iv (GL_LINE_LOOP), 3108 const_iv (GL_LINE_LOOP),
2325 const_iv (GL_QUADS), 3109 const_iv (GL_QUADS),
2326 const_iv (GL_QUAD_STRIP), 3110 const_iv (GL_QUAD_STRIP),
2327 const_iv (GL_TRIANGLES), 3111 const_iv (GL_TRIANGLES),
2328 const_iv (GL_TRIANGLE_STRIP), 3112 const_iv (GL_TRIANGLE_STRIP),
2329 const_iv (GL_TRIANGLE_FAN), 3113 const_iv (GL_TRIANGLE_FAN),
3114 const_iv (GL_POLYGON),
2330 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3115 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3116 const_iv (GL_POINT_SMOOTH_HINT),
3117 const_iv (GL_LINE_SMOOTH_HINT),
3118 const_iv (GL_POLYGON_SMOOTH_HINT),
3119 const_iv (GL_GENERATE_MIPMAP_HINT),
3120 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2331 const_iv (GL_FASTEST), 3121 const_iv (GL_FASTEST),
3122 const_iv (GL_DONT_CARE),
3123 const_iv (GL_NICEST),
2332 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2333 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2334 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2335 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2336# undef const_iv 3131# undef const_iv
2337 }; 3132 };
2338 3133
2339 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2340 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2341 3136
2342 texture_av = newAV (); 3137 texture_av = newAV ();
2343 AvREAL_off (texture_av); 3138 AvREAL_off (texture_av);
2344} 3139}
2345 3140
3141void
3142disable_GL_EXT_blend_func_separate ()
3143 CODE:
3144 gl.BlendFuncSeparate = 0;
3145 gl.BlendFuncSeparateEXT = 0;
3146
3147void
3148apple_nvidia_bug (int enable)
3149
2346char * 3150char *
2347gl_vendor () 3151gl_vendor ()
2348 CODE: 3152 CODE:
2349 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2350 OUTPUT: 3154 OUTPUT:
… …
2380 3184
2381int glGetError () 3185int glGetError ()
2382 3186
2383void glFinish () 3187void glFinish ()
2384 3188
3189void glFlush ()
3190
2385void glClear (int mask) 3191void glClear (int mask)
2386 3192
2387void glClearColor (float r, float g, float b, float a = 1.0) 3193void glClearColor (float r, float g, float b, float a = 1.0)
2388 PROTOTYPE: @ 3194 PROTOTYPE: @
2389 3195
… …
2399 3205
2400void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3206void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2401 CODE: 3207 CODE:
2402 gl_BlendFuncSeparate (sa, da, saa, daa); 3208 gl_BlendFuncSeparate (sa, da, saa, daa);
2403 3209
3210# void glBlendEquation (int se)
3211
2404void glDepthMask (int flag) 3212void glDepthMask (int flag)
2405 3213
2406void glLogicOp (int opcode) 3214void glLogicOp (int opcode)
2407 3215
2408void glColorMask (int red, int green, int blue, int alpha) 3216void glColorMask (int red, int green, int blue, int alpha)
… …
2422# near_ and far_ are due to microsofts buggy "c" compiler 3230# near_ and far_ are due to microsofts buggy "c" compiler
2423void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3231void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2424 3232
2425# near_ and far_ are due to microsofts buggy "c" compiler 3233# near_ and far_ are due to microsofts buggy "c" compiler
2426void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3234void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3235
3236PROTOTYPES: DISABLE
2427 3237
2428void glViewport (int x, int y, int width, int height) 3238void glViewport (int x, int y, int width, int height)
2429 3239
2430void glScissor (int x, int y, int width, int height) 3240void glScissor (int x, int y, int width, int height)
2431 3241
… …
2439 3249
2440void glRotate (float angle, float x, float y, float z) 3250void glRotate (float angle, float x, float y, float z)
2441 CODE: 3251 CODE:
2442 glRotatef (angle, x, y, z); 3252 glRotatef (angle, x, y, z);
2443 3253
2444void glBegin (int mode)
2445
2446void glEnd ()
2447
2448void glColor (float r, float g, float b, float a = 1.0) 3254void glColor (float r, float g, float b, float a = 1.0)
2449 PROTOTYPE: @ 3255 PROTOTYPE: @
2450 ALIAS: 3256 ALIAS:
2451 glColor_premultiply = 1 3257 glColor_premultiply = 1
2452 CODE: 3258 CODE:
2453 if (ix) 3259 if (ix)
2454 { 3260 {
… …
2457 b *= a; 3263 b *= a;
2458 } 3264 }
2459 // microsoft visual "c" rounds instead of truncating... 3265 // microsoft visual "c" rounds instead of truncating...
2460 glColor4f (r, g, b, a); 3266 glColor4f (r, g, b, a);
2461 3267
2462void glInterleavedArrays (int format, int stride, char *data)
2463
2464void glDrawElements (int mode, int count, int type, char *indices)
2465
2466# 1.2 void glDrawRangeElements (int mode, int start, int end
2467
2468void glRasterPos (float x, float y, float z = 0.) 3268void glRasterPos (float x, float y, float z = 0.)
2469 CODE: 3269 CODE:
2470 glRasterPos3f (0, 0, z); 3270 glRasterPos3f (0, 0, z);
2471 glBitmap (0, 0, 0, 0, x, y, 0); 3271 glBitmap (0, 0, 0, 0, x, y, 0);
2472 3272
… …
2476 3276
2477void glTexCoord (float s, float t) 3277void glTexCoord (float s, float t)
2478 CODE: 3278 CODE:
2479 glTexCoord2f (s, t); 3279 glTexCoord2f (s, t);
2480 3280
3281void glRect (float x1, float y1, float x2, float y2)
3282 CODE:
3283 glRectf (x1, y1, x2, y2);
3284
3285void glRect_lineloop (float x1, float y1, float x2, float y2)
3286 CODE:
3287 glBegin (GL_LINE_LOOP);
3288 glVertex2f (x1, y1);
3289 glVertex2f (x2, y1);
3290 glVertex2f (x2, y2);
3291 glVertex2f (x1, y2);
3292 glEnd ();
3293
3294PROTOTYPES: ENABLE
3295
3296void glBegin (int mode)
3297
3298void glEnd ()
3299
3300void glPointSize (GLfloat size)
3301
3302void glLineWidth (GLfloat width)
3303
3304void glInterleavedArrays (int format, int stride, char *data)
3305
3306void glDrawElements (int mode, int count, int type, char *indices)
3307
3308# 1.2 void glDrawRangeElements (int mode, int start, int end
3309
2481void glTexEnv (int target, int pname, float param) 3310void glTexEnv (int target, int pname, float param)
2482 CODE: 3311 CODE:
2483 glTexEnvf (target, pname, param); 3312 glTexEnvf (target, pname, param);
2484 3313
2485void glTexParameter (int target, int pname, float param) 3314void glTexParameter (int target, int pname, float param)
… …
2501void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3330void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2502 CODE: 3331 CODE:
2503 if (gl.SeparableFilter2D) 3332 if (gl.SeparableFilter2D)
2504 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3333 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2505 3334
2506void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3335void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2507 3336
2508void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3337void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2509 3338
2510void glDrawPixels (int width, int height, int format, int type, char *pixels) 3339void glDrawPixels (int width, int height, int format, int type, char *pixels)
2511 3340
… …
2537 3366
2538void glEndList () 3367void glEndList ()
2539 3368
2540void glCallList (int list) 3369void glCallList (int list)
2541 3370
3371void c_init ()
3372 CODE:
3373 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3374 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3375
3376MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3377
3378PROTOTYPES: DISABLE
3379
3380void
3381find_widget (SV *self, NV x, NV y)
3382 PPCODE:
3383{
3384 if (within_widget (self, x, y))
3385 XPUSHs (self);
3386}
3387
3388BOOT:
3389{
3390 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3391
3392 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3393 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3394 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3395 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3396}
3397
3398void
3399draw (SV *self)
3400 CODE:
3401{
3402 HV *hv;
3403 SV **svp;
3404 NV x, y, w, h;
3405 SV *draw_x_sv = GvSV (draw_x_gv);
3406 SV *draw_y_sv = GvSV (draw_y_gv);
3407 SV *draw_w_sv = GvSV (draw_w_gv);
3408 SV *draw_h_sv = GvSV (draw_h_gv);
3409 double draw_x, draw_y;
3410
3411 if (!SvROK (self))
3412 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3413
3414 hv = (HV *)SvRV (self);
3415
3416 if (SvTYPE (hv) != SVt_PVHV)
3417 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3418
3419 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3420 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3421
3422 if (!h || !w)
3423 XSRETURN_EMPTY;
3424
3425 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3426 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3427
3428 draw_x = SvNV (draw_x_sv) + x;
3429 draw_y = SvNV (draw_y_sv) + y;
3430
3431 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3432 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3433 XSRETURN_EMPTY;
3434
3435 sv_setnv (draw_x_sv, draw_x);
3436 sv_setnv (draw_y_sv, draw_y);
3437
3438 glPushMatrix ();
3439 glTranslated (x, y, 0);
3440
3441 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3442 {
3443 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3444
3445 if (svp && SvTRUE (*svp))
3446 {
3447 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3448 glEnable (GL_BLEND);
3449 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3450 glBegin (GL_QUADS);
3451 glVertex2f (0, 0);
3452 glVertex2f (w, 0);
3453 glVertex2f (w, h);
3454 glVertex2f (0, h);
3455 glEnd ();
3456 glDisable (GL_BLEND);
3457 }
3458 }
3459#if 0
3460 // draw borders, for debugging
3461 glPushMatrix ();
3462 glColor4f (1., 1., 0., 1.);
3463 glTranslatef (.5, .5, 0.);
3464 glBegin (GL_LINE_LOOP);
3465 glVertex2f (0 , 0);
3466 glVertex2f (w - 1, 0);
3467 glVertex2f (w - 1, h - 1);
3468 glVertex2f (0 , h - 1);
3469 glEnd ();
3470 glPopMatrix ();
3471#endif
3472 PUSHMARK (SP);
3473 XPUSHs (self);
3474 PUTBACK;
3475 call_method ("_draw", G_VOID | G_DISCARD);
3476 SPAGAIN;
3477
3478 glPopMatrix ();
3479
3480 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3481 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3482}
3483

Diff Legend

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