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.197 by root, Sun Jul 15 21:08:40 2007 UTC vs.
Revision 1.299 by root, Tue Dec 22 01:37:41 2009 UTC

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

Diff Legend

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