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

Diff Legend

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