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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.302 by root, Tue Apr 20 10:53:11 2010 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
27#include <stdio.h> 31#include <stdio.h>
28#include <stdlib.h> 32#include <stdlib.h>
33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 35
30#include <SDL.h> 36#include <SDL.h>
31#include <SDL_thread.h> 37#include <SDL_thread.h>
32#include <SDL_endian.h> 38#include <SDL_endian.h>
33#include <SDL_image.h> 39#include <SDL_image.h>
34#include <SDL_mixer.h> 40#include <SDL_mixer.h>
35#include <SDL_opengl.h> 41#include <SDL_opengl.h>
36 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
37#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
39 52
40#include <glib/gmacros.h> 53#include <glib/gmacros.h>
41 54
42#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
43 67
44#ifndef _WIN32 68#ifndef _WIN32
45# include <sys/types.h> 69# include <sys/types.h>
46# include <sys/socket.h> 70# include <sys/socket.h>
47# include <netinet/in.h> 71# include <netinet/in.h>
48# include <netinet/tcp.h> 72# include <netinet/tcp.h>
49# include <inttypes.h> 73# include <inttypes.h>
50#endif 74#endif
51 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
54#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
55 91
56#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
58 94
59#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
60 96
61#if 0 97/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 99
64# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
65#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
66 104
67static AV *texture_av; 105static AV *texture_av;
68 106
69static struct 107static struct
70{ 108{
… …
107 av_push (texture_av, (SV *)(size_t)name); 145 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 146 glDeleteTextures (1, &name);
109} 147}
110 148
111#include "texcache.c" 149#include "texcache.c"
150#include "rendercache.c"
112 151
113#include "pango-font.c" 152#include "pango-font.c"
114#include "pango-fontmap.c" 153#include "pango-fontmap.c"
115#include "pango-render.c" 154#include "pango-render.c"
116 155
156typedef IV DC__Channel;
157typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
119 160
120typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
121 162
122static int 163static int
123shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
124{ 165{
125 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
… …
139 180
140typedef struct cf_layout { 181typedef struct cf_layout {
141 PangoLayout *pl; 182 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
143 int base_height; 184 int base_height;
144 CFPlus__Font font; 185 DC__Font font;
186 rc_t *rc;
145} *CFPlus__Layout; 187} *DC__Layout;
146 188
147static CFPlus__Font default_font; 189static DC__Font default_font;
148static PangoContext *opengl_context; 190static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
150 192
151static void 193static void
152substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
… …
157#endif 199#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 201}
160 202
161static void 203static void
162layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
163{ 205{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
166 */ 208 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
168 210
169 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 213
172 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
173} 215}
174 216
175static void 217static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 219{
178 PangoRectangle rect; 220 PangoRectangle rect;
179 221
180 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
… …
192 234
193typedef uint16_t tileid; 235typedef uint16_t tileid;
194typedef uint16_t faceid; 236typedef uint16_t faceid;
195 237
196typedef struct { 238typedef struct {
197 int name; 239 GLuint name;
198 int w, h; 240 int w, h;
199 float s, t; 241 float s, t;
200 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
201 tileid smoothtile; 243 tileid smoothtile;
202 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
203} maptex; 246} maptex;
204 247
205typedef struct { 248typedef struct {
206 uint32_t player; 249 uint32_t player;
207 tileid tile[3]; 250 tileid tile[3];
… …
220 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
222 265
223 int32_t rows; 266 int32_t rows;
224 maprow *row; 267 maprow *row;
225} *CFPlus__Map; 268} *DC__Map;
226 269
227static char * 270static char *
228prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
229{ 272{
230 char *p; 273 char *p;
… …
268 self->texs *= 2; 311 self->texs *= 2;
269 } 312 }
270} 313}
271 314
272static maprow * 315static maprow *
273map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
274{ 317{
275 if (0 > y) 318 if (0 > y)
276 { 319 {
277 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
… …
316 359
317 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
318} 361}
319 362
320static mapcell * 363static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
322{ 365{
323 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
324} 367}
325 368
326static void 369static void
327map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
328{ 371{
329 int r; 372 int r;
330 373
331 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
… …
339 self->oy = 0; 382 self->oy = 0;
340 self->row = 0; 383 self->row = 0;
341 self->rows = 0; 384 self->rows = 0;
342} 385}
343 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
344static void 397static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 399{
347 int x, y; 400 int x, y;
348 maprow *row; 401 maprow *row;
349 mapcell *cell; 402 mapcell *cell;
350 403
… …
362 if (x >= row->c1) 415 if (x >= row->c1)
363 break; 416 break;
364 417
365 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
366 419
367 cell->darkness = 0; 420 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 421 }
372 } 422 }
373} 423}
374 424
375typedef struct { 425typedef struct {
… …
429 n |= n >> 16; 479 n |= n >> 16;
430 480
431 return n + 1; 481 return n + 1;
432} 482}
433 483
484static unsigned int
485popcount (unsigned int n)
486{
487 n -= (n >> 1) & 0x55555555U;
488 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
489 n = ((n >> 4) + n) & 0x0f0f0f0fU;
490 n *= 0x01010101U;
491
492 return n >> 24;
493}
494
434/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
437 498
438/******************************************************************************/ 499/******************************************************************************/
… …
476 return 0; 537 return 0;
477 538
478 return 1; 539 return 1;
479} 540}
480 541
481MODULE = 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
482 595
483PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
484 597
485BOOT: 598BOOT:
486{ 599{
487 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 601 static const struct {
489 const char *name; 602 const char *name;
490 IV iv; 603 IV iv;
491 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
… …
514 627
515 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
518 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),
519 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
… …
595 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
599 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)
600# undef const_iv 798# undef const_iv
601 }; 799 };
602 800
603 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; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
622 820
623NV floor (NV x) 821NV floor (NV x)
624 822
625NV ceil (NV x) 823NV ceil (NV x)
626 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
627void 835void
628pango_init () 836pango_init ()
629 CODE: 837 CODE:
630{ 838{
631 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
632 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);
633 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
634} 847}
635 848
636char *
637SDL_GetError () 849char *SDL_GetError ()
638 850
639int 851void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 852
642void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
643SDL_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
644 869
645void 870void
646SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
647 PPCODE: 872 PPCODE:
648{ 873{
… …
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 888
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 891
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 893
672 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
673 while (*m) 895 while (*m)
674 { 896 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 898 {
677 AV *av = newAV (); 899 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
… …
704 926
705 if (RETVAL) 927 if (RETVAL)
706 { 928 {
707 av_clear (texture_av); 929 av_clear (texture_av);
708 930
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#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);
711#include "glfunc.h" 933#include "glfunc.h"
712#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
713 } 938 }
714} 939}
715 OUTPUT: 940 OUTPUT:
716 RETVAL 941 RETVAL
717 942
… …
721char * 946char *
722SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
723 948
724int 949int
725SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
726 954
727void 955void
728poll_events () 956poll_events ()
729 PPCODE: 957 PPCODE:
730{ 958{
… …
740 { 968 {
741 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
742 case SDL_KEYUP: 970 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 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);
746 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 */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 976 break;
749 977
750 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
769 x = ev.motion.x; 997 x = ev.motion.x;
770 y = ev.motion.y; 998 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 1000 }
773 1001
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 1008 }
781 break; 1009 break;
782 1010
783 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1014
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1025 break;
798 } 1026 }
799 1027
800 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))));
801 } 1029 }
802} 1030}
803 1031
804int 1032int
805Mix_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)
806 POSTCALL: 1034 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1035 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1036 Mix_ChannelFinished (channel_finished);
809 1037
810void 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
811Mix_CloseAudio () 1055Mix_CloseAudio ()
812 1056
813int 1057int
814Mix_AllocateChannels (int numchans = -1) 1058Mix_AllocateChannels (int numchans = -1)
1059
1060const char *
1061Mix_GetError ()
815 1062
816void 1063void
817lowdelay (int fd, int val = 1) 1064lowdelay (int fd, int val = 1)
818 CODE: 1065 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1066 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
845 } 1092 }
846 } 1093 }
847#endif 1094#endif
848} 1095}
849 1096
850void 1097int
851add_font (char *file) 1098add_font (char *file)
852 CODE: 1099 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT:
1102 RETVAL
854 1103
855void 1104void
856load_image_inline (SV *image_) 1105load_image_inline (SV *image_)
857 ALIAS: 1106 ALIAS:
858 load_image_file = 1 1107 load_image_file = 1
… …
861 STRLEN image_len; 1110 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1111 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1112 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1113 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1114 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1115 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1116 : SDL_RWFromConstMem (image, image_len);
868 1117
869 if (!rw) 1118 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1119 croak ("load_image: %s", SDL_GetError ());
871 1120
… …
944void 1193void
945error (char *message) 1194error (char *message)
946 CODE: 1195 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1196 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1197#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1198 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1199#endif
951 1200
952void 1201void
953fatal (char *message) 1202fatal (char *message)
954 CODE: 1203 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1204 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1205#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1206 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1207#endif
959 _exit (1); 1208 _exit (1);
960 1209
961void 1210void
962_exit (int retval = 0) 1211_exit (int retval = 0)
… …
974#if DEBUG 1223#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
976#endif 1225#endif
977} 1226}
978 1227
979MODULE = CFPlus PACKAGE = CFPlus::Font 1228int
1229SvREFCNT (SV *sv)
1230 CODE:
1231 RETVAL = SvREFCNT (sv);
1232 OUTPUT:
1233 RETVAL
1234
1235MODULE = Deliantra::Client PACKAGE = DC::Font
980 1236
981PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
982 1238
983CFPlus::Font 1239DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1240new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1241 CODE:
986{ 1242{
987 int count; 1243 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
991} 1247}
992 OUTPUT: 1248 OUTPUT:
993 RETVAL 1249 RETVAL
994 1250
995void 1251void
996DESTROY (CFPlus::Font self) 1252DESTROY (DC::Font self)
997 CODE: 1253 CODE:
998 pango_font_description_free (self); 1254 pango_font_description_free (self);
999 1255
1000void 1256void
1001make_default (CFPlus::Font self) 1257make_default (DC::Font self)
1002 PROTOTYPE: $ 1258 PROTOTYPE: $
1003 CODE: 1259 CODE:
1004 default_font = self; 1260 default_font = self;
1005 1261
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1262MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1263
1008PROTOTYPES: DISABLE 1264PROTOTYPES: DISABLE
1009 1265
1010void 1266void
1011reset_glyph_cache () 1267glyph_cache_backup ()
1012 PROTOTYPE: 1268 PROTOTYPE:
1013 CODE: 1269 CODE:
1270 tc_backup ();
1271
1272void
1273glyph_cache_restore ()
1274 PROTOTYPE:
1275 CODE:
1014 tc_clear (); 1276 tc_restore ();
1015 1277
1016CFPlus::Layout 1278DC::Layout
1017new (SV *class) 1279new (SV *class)
1018 CODE: 1280 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1281 New (0, RETVAL, 1, struct cf_layout);
1020 1282
1021 RETVAL->pl = pango_layout_new (opengl_context); 1283 RETVAL->pl = pango_layout_new (opengl_context);
… …
1023 RETVAL->g = 1.; 1285 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1286 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1287 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1288 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1289 RETVAL->font = 0;
1290 RETVAL->rc = rc_alloc ();
1028 1291
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1292 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1293 layout_update_font (RETVAL);
1031 OUTPUT: 1294 OUTPUT:
1032 RETVAL 1295 RETVAL
1033 1296
1034void 1297void
1035DESTROY (CFPlus::Layout self) 1298DESTROY (DC::Layout self)
1036 CODE: 1299 CODE:
1037 g_object_unref (self->pl); 1300 g_object_unref (self->pl);
1301 rc_free (self->rc);
1038 Safefree (self); 1302 Safefree (self);
1039 1303
1040void 1304void
1041set_text (CFPlus::Layout self, SV *text_) 1305set_text (DC::Layout self, SV *text_)
1042 CODE: 1306 CODE:
1043{ 1307{
1044 STRLEN textlen; 1308 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1309 char *text = SvPVutf8 (text_, textlen);
1046 1310
1047 pango_layout_set_text (self->pl, text, textlen); 1311 pango_layout_set_text (self->pl, text, textlen);
1048} 1312}
1049 1313
1050void 1314void
1051set_markup (CFPlus::Layout self, SV *text_) 1315set_markup (DC::Layout self, SV *text_)
1052 CODE: 1316 CODE:
1053{ 1317{
1054 STRLEN textlen; 1318 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1319 char *text = SvPVutf8 (text_, textlen);
1056 1320
1057 pango_layout_set_markup (self->pl, text, textlen); 1321 pango_layout_set_markup (self->pl, text, textlen);
1058} 1322}
1059 1323
1060void 1324void
1061set_shapes (CFPlus::Layout self, ...) 1325set_shapes (DC::Layout self, ...)
1062 CODE: 1326 CODE:
1063{ 1327{
1064 PangoAttrList *attrs = 0; 1328 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1329 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1330 const char *pos = text;
… …
1101 if (attrs) 1365 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1366 pango_layout_set_attributes (self->pl, attrs);
1103} 1367}
1104 1368
1105void 1369void
1106get_shapes (CFPlus::Layout self) 1370get_shapes (DC::Layout self)
1107 PPCODE: 1371 PPCODE:
1108{ 1372{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1373 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1374
1111 do 1375 do
1112 { 1376 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1377 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1378
1115 if (run && shape_attr_p (run)) 1379 if (run && shape_attr_p (run))
1116 { 1380 {
1117 PangoRectangle extents; 1381 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1382 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1126 1390
1127 pango_layout_iter_free (iter); 1391 pango_layout_iter_free (iter);
1128} 1392}
1129 1393
1130int 1394int
1131has_wrapped (CFPlus::Layout self) 1395has_wrapped (DC::Layout self)
1132 CODE: 1396 CODE:
1133{ 1397{
1134 int lines = 1; 1398 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1399 const char *text = pango_layout_get_text (self->pl);
1136 1400
… …
1141} 1405}
1142 OUTPUT: 1406 OUTPUT:
1143 RETVAL 1407 RETVAL
1144 1408
1145SV * 1409SV *
1146get_text (CFPlus::Layout self) 1410get_text (DC::Layout self)
1147 CODE: 1411 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1412 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1413 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1414 OUTPUT:
1151 RETVAL 1415 RETVAL
1152 1416
1153void 1417void
1154set_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.)
1155 CODE: 1419 CODE:
1156 self->r = r; 1420 self->r = r;
1157 self->g = g; 1421 self->g = g;
1158 self->b = b; 1422 self->b = b;
1159 self->a = a; 1423 self->a = a;
1160 1424
1161void 1425void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1426set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1427 CODE:
1164 if (self->font != font) 1428 if (self->font != font)
1165 { 1429 {
1166 self->font = font; 1430 self->font = font;
1167 layout_update_font (self); 1431 layout_update_font (self);
1168 } 1432 }
1169 1433
1170void 1434void
1171set_height (CFPlus::Layout self, int base_height) 1435set_height (DC::Layout self, int base_height)
1172 CODE: 1436 CODE:
1173 if (self->base_height != base_height) 1437 if (self->base_height != base_height)
1174 { 1438 {
1175 self->base_height = base_height; 1439 self->base_height = base_height;
1176 layout_update_font (self); 1440 layout_update_font (self);
1177 } 1441 }
1178 1442
1179void 1443void
1180set_width (CFPlus::Layout self, int max_width = -1) 1444set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1445 CODE:
1182 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);
1183 1447
1184void 1448void
1185set_indent (CFPlus::Layout self, int indent) 1449set_indent (DC::Layout self, int indent)
1186 CODE: 1450 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1451 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1452
1189void 1453void
1190set_spacing (CFPlus::Layout self, int spacing) 1454set_spacing (DC::Layout self, int spacing)
1191 CODE: 1455 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1456 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1457
1194void 1458void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1459set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1460 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1461 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1462 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1463 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1464 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1465 : PANGO_ELLIPSIZE_NONE
1202 ); 1466 );
1203 1467
1204void 1468void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1469set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1470 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1471 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1472
1209void 1473void
1210size (CFPlus::Layout self) 1474size (DC::Layout self)
1211 PPCODE: 1475 PPCODE:
1212{ 1476{
1213 int w, h; 1477 int w, h;
1214 1478
1215 layout_get_pixel_size (self, &w, &h); 1479 layout_get_pixel_size (self, &w, &h);
… …
1218 PUSHs (sv_2mortal (newSViv (w))); 1482 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1483 PUSHs (sv_2mortal (newSViv (h)));
1220} 1484}
1221 1485
1222int 1486int
1223descent (CFPlus::Layout self) 1487descent (DC::Layout self)
1224 CODE: 1488 CODE:
1225{ 1489{
1226 PangoRectangle rect; 1490 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1491 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1492 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1493 RETVAL = PANGO_DESCENT (rect);
1230} 1494}
1231 OUTPUT: 1495 OUTPUT:
1232 RETVAL 1496 RETVAL
1233 1497
1234int 1498int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1499xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1500 CODE:
1237{ 1501{
1238 int index, trailing; 1502 int index, trailing;
1239 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);
1240 RETVAL = index + trailing; 1504 RETVAL = index + trailing;
1241} 1505}
1242 OUTPUT: 1506 OUTPUT:
1243 RETVAL 1507 RETVAL
1244 1508
1245void 1509void
1246cursor_pos (CFPlus::Layout self, int index) 1510cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1511 PPCODE:
1248{ 1512{
1249 PangoRectangle strong_pos; 1513 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1514 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1515
1252 EXTEND (SP, 3); 1516 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1517 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1518 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1520}
1257 1521
1258void 1522void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1523index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1524 PPCODE:
1261{ 1525{
1262 int line, x; 1526 int line, x;
1263 1527
1264 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)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1530 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1531 --line;
1532#endif
1267 EXTEND (SP, 2); 1533 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1534 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1535 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1536}
1271 1537
1272void 1538void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1539line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1540 PPCODE:
1275{ 1541{
1276 PangoLayoutLine *lp; 1542 PangoLayoutLine *lp;
1277 int index, trailing; 1543 int index, trailing;
1278 1544
1279 if (line < 0) 1545 if (line < 0)
1280 XSRETURN_EMPTY; 1546 XSRETURN_EMPTY;
1281 1547
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1548 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1549 XSRETURN_EMPTY; /* do better */
1284 1550
1285 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);
1286 1552
1287 EXTEND (SP, 2); 1553 EXTEND (SP, 2);
… …
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1559 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1560 }
1295} 1561}
1296 1562
1297void 1563void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1564render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1565 CODE:
1566 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1567 pango_opengl_render_layout_subpixel (
1301 self->pl, 1568 self->pl,
1569 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1570 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1571 self->r, self->g, self->b, self->a,
1304 flags 1572 flags
1305 ); 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);
1306 1577
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1578void
1579draw (DC::Layout self)
1580 CODE:
1581{
1582 glEnable (GL_TEXTURE_2D);
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);
1589
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
1308 1598
1309PROTOTYPES: ENABLE 1599PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1600
1313void 1601void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1602pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1603 CODE:
1316{ 1604{
… …
1343 HV *hv = (HV *)SvRV (self); 1631 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1632 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1633 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1634 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1635
1636 if (name <= 0)
1637 XSRETURN_EMPTY;
1638
1348 if (items < 5) 1639 if (items < 5)
1349 { 1640 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1641 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1642 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1643 }
… …
1379 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1381 } 1672 }
1382} 1673}
1383 1674
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 (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1682 glEnable (GL_TEXTURE_2D);
1683 glBindTexture (GL_TEXTURE_2D, name1);
1684
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_PRIMARY_COLOR);
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
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1796IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE: 1797 CODE:
1386{ 1798{
1387 GLint width; 1799 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1800 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1390 RETVAL = width > 0; 1802 RETVAL = width > 0;
1391} 1803}
1392 OUTPUT: 1804 OUTPUT:
1393 RETVAL 1805 RETVAL
1394 1806
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1807MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1808
1397PROTOTYPES: DISABLE 1809PROTOTYPES: DISABLE
1398 1810
1399CFPlus::Map 1811DC::Map
1400new (SV *class) 1812new (SV *class)
1401 CODE: 1813 CODE:
1402 New (0, RETVAL, 1, struct map); 1814 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1815 RETVAL->x = 0;
1404 RETVAL->y = 0; 1816 RETVAL->y = 0;
… …
1412 RETVAL->row = 0; 1824 RETVAL->row = 0;
1413 OUTPUT: 1825 OUTPUT:
1414 RETVAL 1826 RETVAL
1415 1827
1416void 1828void
1417DESTROY (CFPlus::Map self) 1829DESTROY (DC::Map self)
1418 CODE: 1830 CODE:
1419{ 1831{
1420 map_clear (self); 1832 map_clear (self);
1421 Safefree (self->face2tile); 1833 Safefree (self->face2tile);
1422 Safefree (self->tex); 1834 Safefree (self->tex);
1423 Safefree (self); 1835 Safefree (self);
1424} 1836}
1425 1837
1426void 1838void
1427resize (CFPlus::Map self, int map_width, int map_height) 1839resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1840 CODE:
1429 self->w = map_width; 1841 self->w = map_width;
1430 self->h = map_height; 1842 self->h = map_height;
1431 1843
1432void 1844void
1433clear (CFPlus::Map self) 1845clear (DC::Map self)
1434 CODE: 1846 CODE:
1435 map_clear (self); 1847 map_clear (self);
1436 1848
1437void 1849void
1438set_tileid (CFPlus::Map self, int face, int tile) 1850set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1851 CODE:
1440{ 1852{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1853 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1854 need_texid (self, tile);
1443} 1855}
1444 1856
1445void 1857void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1858set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1859 CODE:
1448{ 1860{
1449 tileid texid; 1861 tileid texid;
1450 maptex *tex; 1862 maptex *tex;
1451 1863
… …
1464 tex->smoothtile = self->face2tile [smooth]; 1876 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1877 tex->smoothlevel = level;
1466} 1878}
1467 1879
1468void 1880void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1470 CODE: 1882 CODE:
1471{ 1883{
1472 need_texid (self, texid); 1884 need_texid (self, texid);
1473 1885
1474 { 1886 {
… …
1493 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1908}
1497 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
1498int 1930int
1499ox (CFPlus::Map self) 1931ox (DC::Map self)
1500 ALIAS: 1932 ALIAS:
1501 oy = 1 1933 oy = 1
1502 x = 2 1934 x = 2
1503 y = 3 1935 y = 3
1504 w = 4 1936 w = 4
… …
1515 } 1947 }
1516 OUTPUT: 1948 OUTPUT:
1517 RETVAL 1949 RETVAL
1518 1950
1519void 1951void
1520scroll (CFPlus::Map self, int dx, int dy) 1952scroll (DC::Map self, int dx, int dy)
1521 CODE: 1953 CODE:
1522{ 1954{
1523 if (dx > 0) 1955 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1956 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1957 else if (dx < 0)
… …
1540 self->rows += MAP_EXTEND_Y; 1972 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1973 self->y += MAP_EXTEND_Y;
1542 } 1974 }
1543} 1975}
1544 1976
1545void 1977SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1978map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1979 CODE:
1548{ 1980{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1982 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1983 mapcell *cell;
1552 int x, y, flags; 1984 int x, y, z, flags;
1985 AV *missing = newAV ();
1986 RETVAL = newRV_noinc ((SV *)missing);
1553 1987
1554 while (data < data_end - 1) 1988 while (data < data_end - 1)
1555 { 1989 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1990 flags = (data [0] << 8) + data [1]; data += 2;
1557 1991
… …
1577 uint8_t ext, cmd; 2011 uint8_t ext, cmd;
1578 2012
1579 do 2013 do
1580 { 2014 {
1581 ext = *data++; 2015 ext = *data++;
1582 cmd = ext & 0x3f; 2016 cmd = ext & 0x7f;
1583 2017
1584 if (cmd < 4) 2018 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1586 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1587 { 2021 {
1588 cell->stat_width = 1; 2022 cell->stat_width = 1;
1589 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1590 } 2024 }
1591 else if (cmd == 6) // monster width 2025 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 2026 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 2027 else if (cmd == 0x47)
1594 { 2028 {
1595 if (*data == 4) 2029 if (*data == 1) cell->player = data [1];
1596 ; // 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);
1597 2033
1598 data += *data + 1; 2034 data += *data + 1;
1599 } 2035 }
1600 else if (cmd == 8) // cell flags 2036 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 2037 cell->flags = *data++;
… …
1608 } 2044 }
1609 else 2045 else
1610 cell->darkness = *data++ + 1; 2046 cell->darkness = *data++ + 1;
1611 } 2047 }
1612 2048
2049 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2050 if (flags & (4 >> z))
1614 { 2051 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2052 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2053 need_facenum (self, face);
1617 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 }
1618 } 2071 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 2072 }
1634 else 2073 else
1635 cell->darkness = 0; 2074 CELL_CLEAR (cell);
1636 } 2075 }
1637} 2076}
2077 OUTPUT:
2078 RETVAL
1638 2079
1639SV * 2080SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2081mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2082 CODE:
1642{ 2083{
1643 int x1, x; 2084 int x1, x;
1644 int y1, y; 2085 int y1, y;
1645 int z; 2086 int z;
… …
1690} 2131}
1691 OUTPUT: 2132 OUTPUT:
1692 RETVAL 2133 RETVAL
1693 2134
1694void 2135void
1695draw (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)
1696 CODE: 2137 CODE:
1697{ 2138{
2139 int x, y, z;
2140
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 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
1700 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)
1701 smooth_key skey; 2144 smooth_key skey;
1702 int x, y, z; 2145 int pl_x, pl_y;
1703 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;
1704 2151
2152 pl_tex.name = 0;
2153
1705 // thats current max. sorry. 2154 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1708 2157
1709 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
1711 2160
1712 glColor4ub (255, 255, 255, 255); 2161 memset (&key, 0, sizeof (key));
1713 2162 key.r = 255;
1714 glEnable (GL_BLEND); 2163 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2164 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 2165 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2166 key.mode = GL_QUADS;
1718 2167 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2168
1723 mx += self->x; 2169 mx += self->x;
1724 my += self->y; 2170 my += self->y;
1725 2171
1726 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
… …
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2189 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2190 self->tex [cell->tile [2]].smoothlevel));
1745 } 2191 }
1746 } 2192 }
1747 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
1748 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1749 { 2199 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1751 2202
1752 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1754 { 2205 {
1755 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
… …
1761 tileid tile = cell->tile [z]; 2212 tileid tile = cell->tile [z];
1762 2213
1763 if (tile) 2214 if (tile)
1764 { 2215 {
1765 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2217 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2218
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2219 if (key.texname != tex.name)
1772 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1773 if (!tex.name) 2223 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2225
1776 glEnd (); 2226 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2227 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2228 }
1780 2229
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2230 px = (x + 1) * T - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2231 py = (y + 1) * T - tex.h;
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785 2232
1786 if (cell->flags && z == 2) 2233 if (expect_false (cell->player == player) && expect_false (z == 2))
1787 { 2234 {
1788 if (cell->flags & 1) 2235 pl_x = px;
2236 pl_y = py;
2237 pl_tex = tex;
1789 { 2238 continue;
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 } 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);
1804 2245
1805 // update smooth hash 2246 // update smooth hash
1806 if (tex.smoothtile) 2247 if (tex.smoothtile)
1807 { 2248 {
1808 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
… …
1839 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);
1840 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);
1841 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);
1842 } 2283 }
1843 } 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 }
1844 } 2306 }
1845 } 2307 }
2308
2309 rc_draw (rc);
2310 rc_clear (rc);
1846 2311
1847 // go through all smoothlevels, lowest to highest, then draw. 2312 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2313 // this is basically counting sort
1849 { 2314 {
1850 int w, b; 2315 int w, b;
1851 2316
2317 glEnable (GL_TEXTURE_2D);
2318 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2319 for (w = 0; w < 256 / 32; ++w)
1853 { 2320 {
1854 uint32_t smask = smooth_level [w]; 2321 uint32_t smask = smooth_level [w];
1855 if (smask) 2322 if (smask)
1856 for (b = 0; b < 32; ++b) 2323 for (b = 0; b < 32; ++b)
… …
1875 int border = bits & 15; 2342 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2343 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2344 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2345 float dy = tex.t * .5f ; // 2 images/column
1879 2346
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2347 if (tex.name)
1883 { 2348 {
2349 // this time avoiding texture state changes
2350 // save gobs of state changes.
1884 if (!tex.name) 2351 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2352 {
2353 self->tex [skey->tile].unused = 0;
1886 2354
1887 glEnd (); 2355 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
1890 } 2358 }
1891 2359
1892 if (border) 2360 if (border)
1893 { 2361 {
1894 float ox = border * dx; 2362 float ox = border * dx;
1895 2363
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2364 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2365 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2366 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2367 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2368 }
1901 2369
1902 if (corner) 2370 if (corner)
1903 { 2371 {
1904 float ox = corner * dx; 2372 float ox = corner * dx;
1905 2373
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2374 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2375 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2376 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2377 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2378 }
1910 } 2379 }
1911 } 2380 }
1912 } 2381 }
1913 } 2382 }
1914 } 2383 }
2384
2385 glEnd ();
2386 glDisable (GL_TEXTURE_2D);
2387 key.texname = -1;
1915 } 2388 }
1916 2389
1917 hv_clear (smooth); 2390 hv_clear (smooth);
1918 } 2391 }
1919 2392
1920 glEnd (); 2393 if (pl_tex.name)
2394 {
2395 maptex tex = pl_tex;
2396 int px = pl_x + sdx;
2397 int py = pl_y + sdy;
1921 2398
1922 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
1923 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2414 rc_free (rc);
2415 rc_free (rc_ov);
1924 2416
1925 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
1928 { 2420 {
… …
1933 { 2425 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
1935 2427
1936 int px = x * T; 2428 int px = x * T;
1937 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 }
1938 2436
1939 if (cell->stat_hp) 2437 if (cell->stat_hp)
1940 { 2438 {
1941 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1953 } 2451 }
1954 } 2452 }
1955} 2453}
1956 2454
1957void 2455void
1958draw_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)
1959 CODE: 2457 CODE:
1960{ 2458{
1961 static float color[16][3] = { 2459 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
1963 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
1964 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
1965 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
1966 2464
1967 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
1968 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
1969 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
1970 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
1971 2469
1972 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
1973 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
1974 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
1975 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
1976 2474
1977 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
1978 2476
1979 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
1980 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
1981 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
1982 }; 2480 };
1983 2481
1984 int x, y; 2482 int x, y;
1985 2483
1986 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 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
1991 2495
1992 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
… …
1996 2500
1997 if (m) 2501 if (m)
1998 { 2502 {
1999 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2000 2504
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2002 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2003 2507
2004 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2513 }
… …
2013 glDisable (GL_BLEND); 2517 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2518 glDisable (GL_TEXTURE_2D);
2015} 2519}
2016 2520
2017void 2521void
2018fow_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)
2019 PPCODE: 2523 PPCODE:
2020{ 2524{
2021 int x, y; 2525 int x, y;
2022 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2024 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2025 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029 2533
2030 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2032 2536
2033 mx += self->x - 1; 2537 mx += self->x - 1;
2034 my += self->y - 1; 2538 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037 2539
2038 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2040 { 2542 {
2041 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
… …
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2547 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2047 2549
2048 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2553 }
2052 } 2554 }
2053 2555
2054 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
… …
2074 2576
2075 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2078 2580
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2083 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2084 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2088 } 2590 }
2089 2591
2090 free (darkness1); 2592 free (darkness1);
2091 2593
2092 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2093 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2096} 2598}
2097 2599
2098SV * 2600SV *
2099get_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)
2100 CODE: 2602 CODE:
2101{ 2603{
2102 int x, y, x1, y1; 2604 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2605 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2606 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2161 else 2663 else
2162 *data++ = 0; 2664 *data++ = 0;
2163 } 2665 }
2164 } 2666 }
2165 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 {
2166 SvPOK_only (data_sv); 2671 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 }
2674
2168 RETVAL = data_sv; 2675 RETVAL = data_sv;
2169} 2676}
2170 OUTPUT: 2677 OUTPUT:
2171 RETVAL 2678 RETVAL
2172 2679
2173void 2680void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2681set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2682 PPCODE:
2176{ 2683{
2177 int x, y, z; 2684 int x, y, z;
2178 int w, h; 2685 int w, h;
2179 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;
2180 2697
2181 if (*data++ != 0) 2698 if (*data++ != 0)
2182 return; /* version mismatch */ 2699 XSRETURN_EMPTY; /* version mismatch */
2183 2700
2184 w = *data++ << 8; w |= *data++; 2701 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2702 h = *data++ << 8; h |= *data++;
2186 2703
2187 // 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
… …
2199 { 2716 {
2200 maprow *row = map_get_row (self, y); 2717 maprow *row = map_get_row (self, y);
2201 2718
2202 for (x = x0; x < x1; x++) 2719 for (x = x0; x < x1; x++)
2203 { 2720 {
2721 uint8_t flags;
2722
2723 if (data + 7 >= end)
2724 XSRETURN_EMPTY;
2725
2204 uint8_t flags = *data++; 2726 flags = *data++;
2205 2727
2206 if (flags) 2728 if (flags)
2207 { 2729 {
2208 mapcell *cell = row_get_cell (row, x); 2730 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2731 tileid tile[3] = { 0, 0, 0 };
… …
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2734 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2735 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2736
2215 if (cell->darkness == 0) 2737 if (cell->darkness == 0)
2216 { 2738 {
2217 cell->darkness = 0; 2739 /*cell->darkness = 0;*/
2740 EXTEND (SP, 3);
2218 2741
2219 for (z = 0; z <= 2; z++) 2742 for (z = 0; z <= 2; z++)
2220 { 2743 {
2221 tileid t = tile [z]; 2744 tileid t = tile [z];
2222 2745
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2746 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2747 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2748 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2749 need_texid (self, t);
2227 } 2750 }
2228 2751
2229 cell->tile [z] = t; 2752 cell->tile [z] = t;
2230 } 2753 }
… …
2232 } 2755 }
2233 } 2756 }
2234 } 2757 }
2235} 2758}
2236 2759
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2760MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2761
2239PROTOTYPES: DISABLE 2762DC::RW
2240 2763new (SV *class, SV *data_sv)
2241CFPlus::MixChunk
2242new_from_file (SV *class, char *path)
2243 CODE: 2764 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2765{
2766 STRLEN datalen;
2767 char *data = SvPVbyte (data_sv, datalen);
2768
2769 RETVAL = SDL_RWFromConstMem (data, datalen);
2770}
2245 OUTPUT: 2771 OUTPUT:
2246 RETVAL 2772 RETVAL
2247 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 : '('
2248void 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 {
2804 // happens sometimes, maybe it just stopped playing(?)
2805 RETVAL = Mix_GroupAvailable (-1);
2806
2807 if (RETVAL < 0)
2808 XSRETURN_UNDEF;
2809 }
2810 else
2811 Mix_HaltChannel (RETVAL);
2812 }
2813
2814 Mix_UnregisterAllEffects (RETVAL);
2815 Mix_Volume (RETVAL, 128);
2816}
2817 OUTPUT:
2818 RETVAL
2819
2820void
2821halt (DC::Channel self)
2822 CODE:
2823 Mix_HaltChannel (self);
2824
2825void
2826expire (DC::Channel self, int ticks = -1)
2827 CODE:
2828 Mix_ExpireChannel (self, ticks);
2829
2830void
2831fade_out (DC::Channel self, int ticks = -1)
2832 CODE:
2833 Mix_FadeOutChannel (self, ticks);
2834
2835int
2836volume (DC::Channel self, int volume)
2837 CODE:
2838 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2839 OUTPUT:
2840 RETVAL
2841
2842void
2843unregister_all_effects (DC::Channel self)
2844 CODE:
2845 Mix_UnregisterAllEffects (self);
2846
2847void
2848set_panning (DC::Channel self, int left, int right)
2849 CODE:
2850 left = CLAMP (left , 0, 255);
2851 right = CLAMP (right, 0, 255);
2852 Mix_SetPanning (self, left, right);
2853
2854void
2855set_distance (DC::Channel self, int distance)
2856 CODE:
2857 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2858
2859void
2860set_position (DC::Channel self, int angle, int distance)
2861 CODE:
2862
2863void
2864set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2865 CODE:
2866{
2867 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2868 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2869 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2870}
2871
2872void
2873set_reverse_stereo (DC::Channel self, int flip)
2874 CODE:
2875 Mix_SetReverseStereo (self, flip);
2876
2877MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2878
2879PROTOTYPES: DISABLE
2880
2881void
2882decoders ()
2883 PPCODE:
2884#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2885 int i, num = Mix_GetNumChunkDecoders ();
2886 EXTEND (SP, num);
2887 for (i = 0; i < num; ++i)
2888 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2889#else
2890 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2891#endif
2892
2893DC::MixChunk
2894new (SV *class, DC::RW rwops)
2895 CODE:
2896 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2897 OUTPUT:
2898 RETVAL
2899
2900void
2249DESTROY (CFPlus::MixChunk self) 2901DESTROY (DC::MixChunk self)
2250 CODE: 2902 CODE:
2251 Mix_FreeChunk (self); 2903 Mix_FreeChunk (self);
2252 2904
2253int 2905int
2254volume (CFPlus::MixChunk self, int volume = -1) 2906volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2907 CODE:
2908 if (items > 1)
2909 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2910 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2911 OUTPUT:
2258 RETVAL 2912 RETVAL
2259 2913
2260int 2914DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2915play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2916 CODE:
2917{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2918 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2919
2920 if (RETVAL < 0)
2921 XSRETURN_UNDEF;
2922
2923 if (channel < 0)
2924 {
2925 Mix_UnregisterAllEffects (RETVAL);
2926 Mix_Volume (RETVAL, 128);
2927 }
2928}
2264 OUTPUT: 2929 OUTPUT:
2265 RETVAL 2930 RETVAL
2266 2931
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2932MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2933
2934void
2935decoders ()
2936 PPCODE:
2937#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2938 int i, num = Mix_GetNumMusicDecoders ();
2939 EXTEND (SP, num);
2940 for (i = 0; i < num; ++i)
2941 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2942#else
2943 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2944#endif
2268 2945
2269int 2946int
2270volume (int volume = -1) 2947volume (int volume = -1)
2271 PROTOTYPE: ;$ 2948 PROTOTYPE: ;$
2272 CODE: 2949 CODE:
2950 if (items > 0)
2951 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2952 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2953 OUTPUT:
2275 RETVAL 2954 RETVAL
2276 2955
2956void
2957fade_out (int ms)
2958 CODE:
2959 Mix_FadeOutMusic (ms);
2960
2961void
2962halt ()
2963 CODE:
2964 Mix_HaltMusic ();
2965
2277int 2966int
2278fade_out (int ms) 2967playing ()
2279 CODE: 2968 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 2969 RETVAL = Mix_PlayingMusic ();
2281 OUTPUT: 2970 OUTPUT:
2282 RETVAL 2971 RETVAL
2283 2972
2284CFPlus::MixMusic 2973DC::MixMusic
2285new_from_file (SV *class, char *path) 2974new (SV *class, DC::RW rwops)
2286 CODE: 2975 CODE:
2287 RETVAL = Mix_LoadMUS (path); 2976 RETVAL = Mix_LoadMUS_RW (rwops);
2288 OUTPUT: 2977 OUTPUT:
2289 RETVAL 2978 RETVAL
2290 2979
2291void 2980void
2292DESTROY (CFPlus::MixMusic self) 2981DESTROY (DC::MixMusic self)
2293 CODE: 2982 CODE:
2294 Mix_FreeMusic (self); 2983 Mix_FreeMusic (self);
2295 2984
2296int 2985int
2297play (CFPlus::MixMusic self, int loops = -1) 2986play (DC::MixMusic self, int loops = -1)
2298 CODE: 2987 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2988 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2989 OUTPUT:
2301 RETVAL 2990 RETVAL
2302 2991
2303int 2992void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2993fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2994 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2995 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2996
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2997MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2998
2312PROTOTYPES: ENABLE 2999PROTOTYPES: ENABLE
2313 3000
2314BOOT: 3001BOOT:
2315{ 3002{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3003 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 3004 static const struct {
2318 const char *name; 3005 const char *name;
2319 IV iv; 3006 IV iv;
2320 } *civ, const_iv[] = { 3007 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 3008# define const_iv(name) { # name, (IV)name }
2322 const_iv (GL_VENDOR), 3009 const_iv (GL_VENDOR),
2323 const_iv (GL_VERSION), 3010 const_iv (GL_VERSION),
2324 const_iv (GL_EXTENSIONS), 3011 const_iv (GL_EXTENSIONS),
3012 const_iv (GL_MAX_TEXTURE_UNITS),
2325 const_iv (GL_COLOR_MATERIAL), 3013 const_iv (GL_COLOR_MATERIAL),
2326 const_iv (GL_SMOOTH), 3014 const_iv (GL_SMOOTH),
2327 const_iv (GL_FLAT), 3015 const_iv (GL_FLAT),
2328 const_iv (GL_DITHER), 3016 const_iv (GL_DITHER),
2329 const_iv (GL_BLEND), 3017 const_iv (GL_BLEND),
… …
2341 const_iv (GL_ZERO), 3029 const_iv (GL_ZERO),
2342 const_iv (GL_SRC_ALPHA), 3030 const_iv (GL_SRC_ALPHA),
2343 const_iv (GL_DST_ALPHA), 3031 const_iv (GL_DST_ALPHA),
2344 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3032 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2345 const_iv (GL_ONE_MINUS_DST_ALPHA), 3033 const_iv (GL_ONE_MINUS_DST_ALPHA),
3034 const_iv (GL_SRC_COLOR),
3035 const_iv (GL_DST_COLOR),
3036 const_iv (GL_ONE_MINUS_SRC_COLOR),
3037 const_iv (GL_ONE_MINUS_DST_COLOR),
2346 const_iv (GL_SRC_ALPHA_SATURATE), 3038 const_iv (GL_SRC_ALPHA_SATURATE),
2347 const_iv (GL_RGB), 3039 const_iv (GL_RGB),
2348 const_iv (GL_RGBA), 3040 const_iv (GL_RGBA),
2349 const_iv (GL_RGBA4), 3041 const_iv (GL_RGBA4),
2350 const_iv (GL_RGBA8), 3042 const_iv (GL_RGBA8),
… …
2356 const_iv (GL_INTENSITY), 3048 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 3049 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 3050 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 3051 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3052 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3053 const_iv (GL_COMPRESSED_ALPHA_ARB),
3054 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3055 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3056 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3057 const_iv (GL_COMPRESSED_RGB_ARB),
3058 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 3059 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 3060 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 3061 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 3062 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 3063 const_iv (GL_TEXTURE_2D),
… …
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3102 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 3103 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 3104 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 3105 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 3106 const_iv (GL_GENERATE_MIPMAP_HINT),
3107 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 3108 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 3109 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 3110 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 3111 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 3112 const_iv (GL_V3F),
2414 const_iv (GL_T2F_V3F), 3113 const_iv (GL_T2F_V3F),
2415 const_iv (GL_T2F_N3F_V3F), 3114 const_iv (GL_T2F_N3F_V3F),
3115 const_iv (GL_FUNC_ADD),
3116 const_iv (GL_FUNC_SUBTRACT),
3117 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2416# undef const_iv 3118# undef const_iv
2417 }; 3119 };
2418 3120
2419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3121 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3122 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2421 3123
2422 texture_av = newAV (); 3124 texture_av = newAV ();
2423 AvREAL_off (texture_av); 3125 AvREAL_off (texture_av);
2424} 3126}
2425 3127
3128void
3129disable_GL_EXT_blend_func_separate ()
3130 CODE:
3131 gl.BlendFuncSeparate = 0;
3132 gl.BlendFuncSeparateEXT = 0;
3133
3134void
3135apple_nvidia_bug (int enable)
3136
2426char * 3137char *
2427gl_vendor () 3138gl_vendor ()
2428 CODE: 3139 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 3140 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 3141 OUTPUT:
… …
2479 3190
2480void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3191void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2481 CODE: 3192 CODE:
2482 gl_BlendFuncSeparate (sa, da, saa, daa); 3193 gl_BlendFuncSeparate (sa, da, saa, daa);
2483 3194
3195# void glBlendEquation (int se)
3196
2484void glDepthMask (int flag) 3197void glDepthMask (int flag)
2485 3198
2486void glLogicOp (int opcode) 3199void glLogicOp (int opcode)
2487 3200
2488void glColorMask (int red, int green, int blue, int alpha) 3201void glColorMask (int red, int green, int blue, int alpha)
… …
2522void glRotate (float angle, float x, float y, float z) 3235void glRotate (float angle, float x, float y, float z)
2523 CODE: 3236 CODE:
2524 glRotatef (angle, x, y, z); 3237 glRotatef (angle, x, y, z);
2525 3238
2526void glColor (float r, float g, float b, float a = 1.0) 3239void glColor (float r, float g, float b, float a = 1.0)
3240 PROTOTYPE: @
2527 ALIAS: 3241 ALIAS:
2528 glColor_premultiply = 1 3242 glColor_premultiply = 1
2529 CODE: 3243 CODE:
2530 if (ix) 3244 if (ix)
2531 { 3245 {
… …
2547 3261
2548void glTexCoord (float s, float t) 3262void glTexCoord (float s, float t)
2549 CODE: 3263 CODE:
2550 glTexCoord2f (s, t); 3264 glTexCoord2f (s, t);
2551 3265
3266void glRect (float x1, float y1, float x2, float y2)
3267 CODE:
3268 glRectf (x1, y1, x2, y2);
3269
3270void glRect_lineloop (float x1, float y1, float x2, float y2)
3271 CODE:
3272 glBegin (GL_LINE_LOOP);
3273 glVertex2f (x1, y1);
3274 glVertex2f (x2, y1);
3275 glVertex2f (x2, y2);
3276 glVertex2f (x1, y2);
3277 glEnd ();
3278
2552PROTOTYPES: ENABLE 3279PROTOTYPES: ENABLE
2553 3280
2554void glBegin (int mode) 3281void glBegin (int mode)
2555 3282
2556void glEnd () 3283void glEnd ()
… …
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3315void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 3316 CODE:
2590 if (gl.SeparableFilter2D) 3317 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3318 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 3319
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3320void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 3321
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3322void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 3323
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 3324void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 3325
… …
2624 3351
2625void glEndList () 3352void glEndList ()
2626 3353
2627void glCallList (int list) 3354void glCallList (int list)
2628 3355
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3356void c_init ()
3357 CODE:
3358 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3359 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3360
3361MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 3362
2631PROTOTYPES: DISABLE 3363PROTOTYPES: DISABLE
2632 3364
2633void 3365void
2634find_widget (SV *self, NV x, NV y) 3366find_widget (SV *self, NV x, NV y)
… …
2638 XPUSHs (self); 3370 XPUSHs (self);
2639} 3371}
2640 3372
2641BOOT: 3373BOOT:
2642{ 3374{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3375 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 3376
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3377 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3378 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3379 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3380 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 3381}
2650 3382
2651void 3383void
2652draw (SV *self) 3384draw (SV *self)
2653 CODE: 3385 CODE:
… …
2657 NV x, y, w, h; 3389 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3390 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3391 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3392 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3393 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3394 double draw_x, draw_y;
2664 3395
2665 if (!SvROK (self)) 3396 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3397 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3398
2668 hv = (HV *)SvRV (self); 3399 hv = (HV *)SvRV (self);
2669 3400
2670 if (SvTYPE (hv) != SVt_PVHV) 3401 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3402 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3403
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3404 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3405 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3406
2676 if (!h || !w) 3407 if (!h || !w)
… …
2696 { 3427 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3428 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3429
2699 if (svp && SvTRUE (*svp)) 3430 if (svp && SvTRUE (*svp))
2700 { 3431 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3432 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3433 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3434 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3435 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3436 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3437 glVertex2f (w, 0);
… …
2709 glEnd (); 3440 glEnd ();
2710 glDisable (GL_BLEND); 3441 glDisable (GL_BLEND);
2711 } 3442 }
2712 } 3443 }
2713#if 0 3444#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3445 // draw borders, for debugging
2715 glPushMatrix; 3446 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3447 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3448 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3449 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3450 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3451 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3452 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3453 glVertex2f (0 , h - 1);
2723 glEnd; 3454 glEnd ();
2724 glPopMatrix; 3455 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3456#endif
2728 PUSHMARK (SP); 3457 PUSHMARK (SP);
2729 XPUSHs (self); 3458 XPUSHs (self);
2730 PUTBACK; 3459 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3460 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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