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.196 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.280 by root, Wed Nov 26 23:08:34 2008 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 roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
29 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
30#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
31#include <SDL_endian.h> 39#include <SDL_endian.h>
32#include <SDL_image.h> 40#include <SDL_image.h>
33#include <SDL_mixer.h> 41#include <SDL_mixer.h>
34#include <SDL_opengl.h> 42#include <SDL_opengl.h>
35 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
36#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
38 51
39#include <glib/gmacros.h> 52#include <glib/gmacros.h>
40 53
41#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
42 66
43#ifndef _WIN32 67#ifndef _WIN32
44# include <sys/types.h> 68# include <sys/types.h>
45# include <sys/socket.h> 69# include <sys/socket.h>
46# include <netinet/in.h> 70# include <netinet/in.h>
47# include <netinet/tcp.h> 71# include <netinet/tcp.h>
48# include <inttypes.h> 72# include <inttypes.h>
49#endif 73#endif
50 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 85
53#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
54 87
55#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
57 90
58#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
59 92
60#if 0 93/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else 95
63# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
64#endif
65 97
66static AV *texture_av; 98static AV *texture_av;
67 99
68static struct 100static struct
69{ 101{
… …
106 av_push (texture_av, (SV *)(size_t)name); 138 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 139 glDeleteTextures (1, &name);
108} 140}
109 141
110#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
111 144
112#include "pango-font.c" 145#include "pango-font.c"
113#include "pango-fontmap.c" 146#include "pango-fontmap.c"
114#include "pango-render.c" 147#include "pango-render.c"
115 148
149typedef IV DC__Channel;
150typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
118 153
119typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
120 155
121static int 156static int
122shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
123{ 158{
124 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
… …
138 173
139typedef struct cf_layout { 174typedef struct cf_layout {
140 PangoLayout *pl; 175 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
142 int base_height; 177 int base_height;
143 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
144} *CFPlus__Layout; 180} *DC__Layout;
145 181
146static CFPlus__Font default_font; 182static DC__Font default_font;
147static PangoContext *opengl_context; 183static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
149 185
150static void 186static void
151substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
… …
156#endif 192#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 194}
159 195
160static void 196static void
161layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
162{ 198{
163 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
164 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
165 */ 201 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
167 203
168 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 206
171 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
172} 208}
173 209
174static void 210static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 212{
177 PangoRectangle rect; 213 PangoRectangle rect;
178 214
179 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
… …
191 227
192typedef uint16_t tileid; 228typedef uint16_t tileid;
193typedef uint16_t faceid; 229typedef uint16_t faceid;
194 230
195typedef struct { 231typedef struct {
196 int name; 232 GLuint name;
197 int w, h; 233 int w, h;
198 float s, t; 234 float s, t;
199 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
200 tileid smoothtile; 236 tileid smoothtile;
201 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
202} maptex; 239} maptex;
203 240
204typedef struct { 241typedef struct {
205 uint32_t player; 242 uint32_t player;
206 tileid tile[3]; 243 tileid tile[3];
… …
219 int faces; tileid *face2tile; // [faceid] 256 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 257 int texs; maptex *tex; // [tileid]
221 258
222 int32_t rows; 259 int32_t rows;
223 maprow *row; 260 maprow *row;
224} *CFPlus__Map; 261} *DC__Map;
225 262
226static char * 263static char *
227prepend (char *ptr, int sze, int inc) 264prepend (char *ptr, int sze, int inc)
228{ 265{
229 char *p; 266 char *p;
… …
267 self->texs *= 2; 304 self->texs *= 2;
268 } 305 }
269} 306}
270 307
271static maprow * 308static maprow *
272map_get_row (CFPlus__Map self, int y) 309map_get_row (DC__Map self, int y)
273{ 310{
274 if (0 > y) 311 if (0 > y)
275 { 312 {
276 int extend = - y + MAP_EXTEND_Y; 313 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 314 Prepend (maprow, self->row, self->rows, extend);
… …
315 352
316 return row->col + (x - row->c0); 353 return row->col + (x - row->c0);
317} 354}
318 355
319static mapcell * 356static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 357map_get_cell (DC__Map self, int x, int y)
321{ 358{
322 return row_get_cell (map_get_row (self, y), x); 359 return row_get_cell (map_get_row (self, y), x);
323} 360}
324 361
325static void 362static void
326map_clear (CFPlus__Map self) 363map_clear (DC__Map self)
327{ 364{
328 int r; 365 int r;
329 366
330 for (r = 0; r < self->rows; r++) 367 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 368 Safefree (self->row[r].col);
… …
338 self->oy = 0; 375 self->oy = 0;
339 self->row = 0; 376 self->row = 0;
340 self->rows = 0; 377 self->rows = 0;
341} 378}
342 379
380#define CELL_CLEAR(cell) \
381 do { \
382 if ((cell)->player) \
383 (cell)->tile [2] = 0; \
384 (cell)->darkness = 0; \
385 (cell)->stat_hp = 0; \
386 (cell)->flags = 0; \
387 (cell)->player = 0; \
388 } while (0)
389
343static void 390static void
344map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 391map_blank (DC__Map self, int x0, int y0, int w, int h)
345{ 392{
346 int x, y; 393 int x, y;
347 maprow *row; 394 maprow *row;
348 mapcell *cell; 395 mapcell *cell;
349 396
… …
361 if (x >= row->c1) 408 if (x >= row->c1)
362 break; 409 break;
363 410
364 cell = row->col + x - row->c0; 411 cell = row->col + x - row->c0;
365 412
366 cell->darkness = 0; 413 CELL_CLEAR (cell);
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
370 } 414 }
371 } 415 }
372} 416}
373 417
374typedef struct { 418typedef struct {
… …
428 n |= n >> 16; 472 n |= n >> 16;
429 473
430 return n + 1; 474 return n + 1;
431} 475}
432 476
477static unsigned int
478popcount (unsigned int n)
479{
480 n -= (n >> 1) & 0x55555555U;
481 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
482 n = ((n >> 4) + n) & 0x0f0f0f0fU;
483 n *= 0x01010101U;
484
485 return n >> 24;
486}
487
433/* SDL should provide this, really. */ 488/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 489#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 490#define SDLK_MODIFIER_MAX 314
436 491
437MODULE = CFPlus PACKAGE = CFPlus 492/******************************************************************************/
493
494static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
495static GV *hover_gv;
496
497static int
498within_widget (SV *widget, NV x, NV y)
499{
500 HV *self;
501 SV **svp;
502 NV wx, ww, wy, wh;
503
504 if (!SvROK (widget))
505 return 0;
506
507 self = (HV *)SvRV (widget);
508
509 if (SvTYPE (self) != SVt_PVHV)
510 return 0;
511
512 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
513 if (y < wy)
514 return 0;
515
516 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
517 if (y >= wy + wh)
518 return 0;
519
520 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
521 if (x < wx)
522 return 0;
523
524 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
525 if (x >= wx + ww)
526 return 0;
527
528 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
529 if (!svp || !SvTRUE (*svp))
530 return 0;
531
532 return 1;
533}
534
535/******************************************************************************/
536
537/* process keyboard modifiers */
538static int
539mod_munge (int mod)
540{
541 mod &= MOD_MASK;
542
543 if (mod & (KMOD_META | KMOD_ALT))
544 mod |= KMOD_LRAM;
545
546 return mod;
547}
548
549static void
550deliantra_main ()
551{
552 char *argv[] = { 0 };
553 call_argv ("::main", G_DISCARD | G_VOID, argv);
554}
555
556#ifdef __MACOSX__
557 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back.
562 */
563 extern C_LINKAGE int
564 main (int argc, char *argv[])
565 {
566 deliantra_main ();
567 }
568
569 #undef main
570
571 extern C_LINKAGE int main (int argc, char *argv[]);
572
573 static void
574 SDL_braino (void)
575 {
576 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv);
578 }
579#else
580 static void
581 SDL_braino (void)
582 {
583 deliantra_main ();
584 }
585#endif
586
587MODULE = Deliantra::Client PACKAGE = DC
438 588
439PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
440 590
441BOOT: 591BOOT:
442{ 592{
443 HV *stash = gv_stashpv ("CFPlus", 1); 593 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 594 static const struct {
445 const char *name; 595 const char *name;
446 IV iv; 596 IV iv;
447 } *civ, const_iv[] = { 597 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 598# define const_iv(name) { # name, (IV)name }
… …
470 620
471 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 623 const_iv (SDL_APPACTIVE),
474 624
625
626 const_iv (SDLK_UNKNOWN),
627 const_iv (SDLK_FIRST),
628 const_iv (SDLK_BACKSPACE),
629 const_iv (SDLK_TAB),
630 const_iv (SDLK_CLEAR),
631 const_iv (SDLK_RETURN),
632 const_iv (SDLK_PAUSE),
633 const_iv (SDLK_ESCAPE),
634 const_iv (SDLK_SPACE),
635 const_iv (SDLK_EXCLAIM),
636 const_iv (SDLK_QUOTEDBL),
637 const_iv (SDLK_HASH),
638 const_iv (SDLK_DOLLAR),
639 const_iv (SDLK_AMPERSAND),
640 const_iv (SDLK_QUOTE),
641 const_iv (SDLK_LEFTPAREN),
642 const_iv (SDLK_RIGHTPAREN),
643 const_iv (SDLK_ASTERISK),
644 const_iv (SDLK_PLUS),
645 const_iv (SDLK_COMMA),
646 const_iv (SDLK_MINUS),
647 const_iv (SDLK_PERIOD),
648 const_iv (SDLK_SLASH),
649 const_iv (SDLK_0),
650 const_iv (SDLK_1),
651 const_iv (SDLK_2),
652 const_iv (SDLK_3),
653 const_iv (SDLK_4),
654 const_iv (SDLK_5),
655 const_iv (SDLK_6),
656 const_iv (SDLK_7),
657 const_iv (SDLK_8),
658 const_iv (SDLK_9),
659 const_iv (SDLK_COLON),
660 const_iv (SDLK_SEMICOLON),
661 const_iv (SDLK_LESS),
662 const_iv (SDLK_EQUALS),
663 const_iv (SDLK_GREATER),
664 const_iv (SDLK_QUESTION),
665 const_iv (SDLK_AT),
666
667 const_iv (SDLK_LEFTBRACKET),
668 const_iv (SDLK_BACKSLASH),
669 const_iv (SDLK_RIGHTBRACKET),
670 const_iv (SDLK_CARET),
671 const_iv (SDLK_UNDERSCORE),
672 const_iv (SDLK_BACKQUOTE),
673 const_iv (SDLK_DELETE),
674
675 const_iv (SDLK_FIRST),
676 const_iv (SDLK_LAST),
475 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 679 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 680 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 681 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 753 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
555 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
758
759 const_iv (KMOD_LRAM),
760
761 const_iv (MIX_DEFAULT_FORMAT),
762
763 const_iv (SDL_INIT_TIMER),
764 const_iv (SDL_INIT_AUDIO),
765 const_iv (SDL_INIT_VIDEO),
766 const_iv (SDL_INIT_CDROM),
767 const_iv (SDL_INIT_JOYSTICK),
768 const_iv (SDL_INIT_EVERYTHING),
769 const_iv (SDL_INIT_NOPARACHUTE),
770 const_iv (SDL_INIT_EVENTTHREAD),
771
772 const_iv (SDL_GL_RED_SIZE),
773 const_iv (SDL_GL_GREEN_SIZE),
774 const_iv (SDL_GL_BLUE_SIZE),
775 const_iv (SDL_GL_ALPHA_SIZE),
776 const_iv (SDL_GL_DOUBLEBUFFER),
777 const_iv (SDL_GL_BUFFER_SIZE),
778 const_iv (SDL_GL_DEPTH_SIZE),
779 const_iv (SDL_GL_STENCIL_SIZE),
780 const_iv (SDL_GL_ACCUM_RED_SIZE),
781 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
782 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
783 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
784 const_iv (SDL_GL_STEREO),
785 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
786 const_iv (SDL_GL_MULTISAMPLESAMPLES),
787 const_iv (SDL_GL_ACCELERATED_VISUAL),
788 const_iv (SDL_GL_SWAP_CONTROL),
789
790 const_iv (FOW_DARKNESS)
556# undef const_iv 791# undef const_iv
557 }; 792 };
558 793
559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 813
579NV floor (NV x) 814NV floor (NV x)
580 815
581NV ceil (NV x) 816NV ceil (NV x)
582 817
818IV minpot (UV n)
819
820IV popcount (UV n)
821
583void 822void
584pango_init () 823pango_init ()
585 CODE: 824 CODE:
586{ 825{
587 opengl_fontmap = pango_opengl_font_map_new (); 826 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 827 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 828 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
829 /*pango_context_set_font_description (opengl_context, default_font);*/
830#if PANGO_VERSION_CHECK (1, 15, 2)
831 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
832 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
833#endif
590} 834}
591 835
592int 836char *SDL_GetError ()
593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
594 837
595void 838void SDL_braino ()
839
840int SDL_Init (U32 flags)
841
842int SDL_InitSubSystem (U32 flags)
843
844void SDL_QuitSubSystem (U32 flags)
845
596SDL_Quit () 846void SDL_Quit ()
597 847
848int SDL_GL_SetAttribute (int attr, int value)
849
850int SDL_GL_GetAttribute (int attr)
851 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL))
853 XSRETURN_UNDEF;
854 OUTPUT:
855 RETVAL
856
598void 857void
599SDL_ListModes () 858SDL_ListModes (int rgb, int alpha)
600 PPCODE: 859 PPCODE:
601{ 860{
602 SDL_Rect **m; 861 SDL_Rect **m;
603 862
604 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 863 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
605 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 864 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
606 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 865 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
607 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 866 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
608 867
609 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 868 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
610 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
611 870
612 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
616 875
617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 876 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 877 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
622
623 SDL_EnableUNICODE (1);
624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
625 878
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 879 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 880
628 if (m && m != (SDL_Rect **)-1) 881 if (m && m != (SDL_Rect **)-1)
629 while (*m) 882 while (*m)
630 { 883 {
884 if ((*m)->w >= 400 && (*m)->h >= 300)
885 {
631 AV *av = newAV (); 886 AV *av = newAV ();
632 av_push (av, newSViv ((*m)->w)); 887 av_push (av, newSViv ((*m)->w));
633 av_push (av, newSViv ((*m)->h)); 888 av_push (av, newSViv ((*m)->h));
889 av_push (av, newSViv (rgb));
890 av_push (av, newSViv (alpha));
634 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 891 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
892 }
635 893
636 ++m; 894 ++m;
637 } 895 }
638} 896}
639 897
640char *
641SDL_GetError ()
642
643int 898int
644SDL_SetVideoMode (int w, int h, int fullscreen) 899SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
645 CODE: 900 CODE:
901{
902 SDL_EnableUNICODE (1);
903 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
904
905 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
906 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
907 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
908 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
909
646 RETVAL = !!SDL_SetVideoMode ( 910 RETVAL = !!SDL_SetVideoMode (
647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 911 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
648 ); 912 );
913
649 if (RETVAL) 914 if (RETVAL)
650 { 915 {
651 av_clear (texture_av); 916 av_clear (texture_av);
652 917
653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 919#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
655# include "glfunc.h" 920#include "glfunc.h"
656# undef GL_FUNC 921#undef GL_FUNC
657
658 } 922 }
923}
659 OUTPUT: 924 OUTPUT:
660 RETVAL 925 RETVAL
661 926
662void 927void
663SDL_GL_SwapBuffers () 928SDL_GL_SwapBuffers ()
664 929
665char * 930char *
666SDL_GetKeyName (int sym) 931SDL_GetKeyName (int sym)
667 932
933int
934SDL_GetAppState ()
935
936int
937SDL_GetModState ()
938
668void 939void
669SDL_PollEvent () 940poll_events ()
670 PPCODE: 941 PPCODE:
671{ 942{
672 SDL_Event ev; 943 SDL_Event ev;
673 944
674 while (SDL_PollEvent (&ev)) 945 SDL_PumpEvents ();
946 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
675 { 947 {
676 HV *hv = newHV (); 948 HV *hv = newHV ();
677 hv_store (hv, "type", 4, newSViv (ev.type), 0); 949 hv_store (hv, "type", 4, newSViv (ev.type), 0);
678 950
679 switch (ev.type) 951 switch (ev.type)
680 { 952 {
681 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
682 case SDL_KEYUP: 954 case SDL_KEYUP:
683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
685 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 957 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
686 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 958 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
687 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
688 break; 960 break;
689 961
690 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
709 x = ev.motion.x; 981 x = ev.motion.x;
710 y = ev.motion.y; 982 y = ev.motion.y;
711 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
712 } 984 }
713 985
714 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
715 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
716 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
717 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
718 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
719 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
720 } 992 }
721 break; 993 break;
722 994
723 case SDL_MOUSEBUTTONDOWN: 995 case SDL_MOUSEBUTTONDOWN:
724 case SDL_MOUSEBUTTONUP: 996 case SDL_MOUSEBUTTONUP:
725 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
726 998
727 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 999 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
728 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1000 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
729 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1001 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
730 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1002 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
735 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1007 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
736 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1008 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
737 break; 1009 break;
738 } 1010 }
739 1011
740 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1012 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
741 } 1013 }
742} 1014}
743 1015
744int 1016int
745Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1017Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
746 POSTCALL: 1018 POSTCALL:
747 Mix_HookMusicFinished (music_finished); 1019 Mix_HookMusicFinished (music_finished);
748 Mix_ChannelFinished (channel_finished); 1020 Mix_ChannelFinished (channel_finished);
749 1021
750void 1022void
1023Mix_QuerySpec ()
1024 PPCODE:
1025{
1026 int freq, channels;
1027 Uint16 format;
1028
1029 if (Mix_QuerySpec (&freq, &format, &channels))
1030 {
1031 EXTEND (SP, 3);
1032 PUSHs (sv_2mortal (newSViv (freq)));
1033 PUSHs (sv_2mortal (newSViv (format)));
1034 PUSHs (sv_2mortal (newSViv (channels)));
1035 }
1036}
1037
1038void
751Mix_CloseAudio () 1039Mix_CloseAudio ()
752 1040
753int 1041int
754Mix_AllocateChannels (int numchans = -1) 1042Mix_AllocateChannels (int numchans = -1)
1043
1044const char *
1045Mix_GetError ()
755 1046
756void 1047void
757lowdelay (int fd, int val = 1) 1048lowdelay (int fd, int val = 1)
758 CODE: 1049 CODE:
759 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1050 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
785 } 1076 }
786 } 1077 }
787#endif 1078#endif
788} 1079}
789 1080
790void 1081int
791add_font (char *file) 1082add_font (char *file)
792 CODE: 1083 CODE:
793 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT:
1086 RETVAL
794 1087
795void 1088void
796load_image_inline (SV *image_) 1089load_image_inline (SV *image_)
797 ALIAS: 1090 ALIAS:
798 load_image_file = 1 1091 load_image_file = 1
… …
801 STRLEN image_len; 1094 STRLEN image_len;
802 char *image = (char *)SvPVbyte (image_, image_len); 1095 char *image = (char *)SvPVbyte (image_, image_len);
803 SDL_Surface *surface, *surface2; 1096 SDL_Surface *surface, *surface2;
804 SDL_PixelFormat fmt; 1097 SDL_PixelFormat fmt;
805 SDL_RWops *rw = ix 1098 SDL_RWops *rw = ix
806 ? SDL_RWFromFile (image, "r") 1099 ? SDL_RWFromFile (image, "rb")
807 : SDL_RWFromConstMem (image, image_len); 1100 : SDL_RWFromConstMem (image, image_len);
808 1101
809 if (!rw) 1102 if (!rw)
810 croak ("load_image: %s", SDL_GetError ()); 1103 croak ("load_image: %s", SDL_GetError ());
811 1104
… …
884void 1177void
885error (char *message) 1178error (char *message)
886 CODE: 1179 CODE:
887 fprintf (stderr, "ERROR: %s\n", message); 1180 fprintf (stderr, "ERROR: %s\n", message);
888#ifdef _WIN32 1181#ifdef _WIN32
889 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1182 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
890#endif 1183#endif
891 1184
892void 1185void
893fatal (char *message) 1186fatal (char *message)
894 CODE: 1187 CODE:
895 fprintf (stderr, "FATAL: %s\n", message); 1188 fprintf (stderr, "FATAL: %s\n", message);
896#ifdef _WIN32 1189#ifdef _WIN32
897 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1190 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
898#endif 1191#endif
899 _exit (1); 1192 _exit (1);
900 1193
901void 1194void
902_exit (int retval = 0) 1195_exit (int retval = 0)
… …
914#if DEBUG 1207#if DEBUG
915 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
916#endif 1209#endif
917} 1210}
918 1211
919MODULE = CFPlus PACKAGE = CFPlus::Font 1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
920 1218
921CFPlus::Font 1219MODULE = Deliantra::Client PACKAGE = DC::Font
1220
1221PROTOTYPES: DISABLE
1222
1223DC::Font
922new_from_file (SV *class, char *path, int id = 0) 1224new_from_file (SV *class, char *path, int id = 0)
923 CODE: 1225 CODE:
924{ 1226{
925 int count; 1227 int count;
926 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
929} 1231}
930 OUTPUT: 1232 OUTPUT:
931 RETVAL 1233 RETVAL
932 1234
933void 1235void
934DESTROY (CFPlus::Font self) 1236DESTROY (DC::Font self)
935 CODE: 1237 CODE:
936 pango_font_description_free (self); 1238 pango_font_description_free (self);
937 1239
938void 1240void
939make_default (CFPlus::Font self) 1241make_default (DC::Font self)
1242 PROTOTYPE: $
940 CODE: 1243 CODE:
941 default_font = self; 1244 default_font = self;
942 1245
943MODULE = CFPlus PACKAGE = CFPlus::Layout 1246MODULE = Deliantra::Client PACKAGE = DC::Layout
944 1247
1248PROTOTYPES: DISABLE
1249
945void 1250void
946reset_glyph_cache () 1251glyph_cache_backup ()
1252 PROTOTYPE:
947 CODE: 1253 CODE:
1254 tc_backup ();
1255
1256void
1257glyph_cache_restore ()
1258 PROTOTYPE:
1259 CODE:
948 tc_clear (); 1260 tc_restore ();
949 1261
950CFPlus::Layout 1262DC::Layout
951new (SV *class) 1263new (SV *class)
952 CODE: 1264 CODE:
953 New (0, RETVAL, 1, struct cf_layout); 1265 New (0, RETVAL, 1, struct cf_layout);
954 1266
955 RETVAL->pl = pango_layout_new (opengl_context); 1267 RETVAL->pl = pango_layout_new (opengl_context);
… …
957 RETVAL->g = 1.; 1269 RETVAL->g = 1.;
958 RETVAL->b = 1.; 1270 RETVAL->b = 1.;
959 RETVAL->a = 1.; 1271 RETVAL->a = 1.;
960 RETVAL->base_height = MIN_FONT_HEIGHT; 1272 RETVAL->base_height = MIN_FONT_HEIGHT;
961 RETVAL->font = 0; 1273 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
962 1275
963 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
964 layout_update_font (RETVAL); 1277 layout_update_font (RETVAL);
965 OUTPUT: 1278 OUTPUT:
966 RETVAL 1279 RETVAL
967 1280
968void 1281void
969DESTROY (CFPlus::Layout self) 1282DESTROY (DC::Layout self)
970 CODE: 1283 CODE:
971 g_object_unref (self->pl); 1284 g_object_unref (self->pl);
1285 rc_free (self->rc);
972 Safefree (self); 1286 Safefree (self);
973 1287
974void 1288void
975set_text (CFPlus::Layout self, SV *text_) 1289set_text (DC::Layout self, SV *text_)
976 CODE: 1290 CODE:
977{ 1291{
978 STRLEN textlen; 1292 STRLEN textlen;
979 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
980 1294
981 pango_layout_set_text (self->pl, text, textlen); 1295 pango_layout_set_text (self->pl, text, textlen);
982} 1296}
983 1297
984void 1298void
985set_markup (CFPlus::Layout self, SV *text_) 1299set_markup (DC::Layout self, SV *text_)
986 CODE: 1300 CODE:
987{ 1301{
988 STRLEN textlen; 1302 STRLEN textlen;
989 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
990 1304
991 pango_layout_set_markup (self->pl, text, textlen); 1305 pango_layout_set_markup (self->pl, text, textlen);
992} 1306}
993 1307
994void 1308void
995set_shapes (CFPlus::Layout self, ...) 1309set_shapes (DC::Layout self, ...)
996 CODE: 1310 CODE:
997{ 1311{
998 PangoAttrList *attrs = 0; 1312 PangoAttrList *attrs = 0;
999 const char *text = pango_layout_get_text (self->pl); 1313 const char *text = pango_layout_get_text (self->pl);
1000 const char *pos = text; 1314 const char *pos = text;
… …
1035 if (attrs) 1349 if (attrs)
1036 pango_layout_set_attributes (self->pl, attrs); 1350 pango_layout_set_attributes (self->pl, attrs);
1037} 1351}
1038 1352
1039void 1353void
1040get_shapes (CFPlus::Layout self) 1354get_shapes (DC::Layout self)
1041 PPCODE: 1355 PPCODE:
1042{ 1356{
1043 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1357 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1044 1358
1045 do 1359 do
1046 { 1360 {
1047 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1361 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1048 1362
1049 if (run && shape_attr_p (run)) 1363 if (run && shape_attr_p (run))
1050 { 1364 {
1051 PangoRectangle extents; 1365 PangoRectangle extents;
1052 pango_layout_iter_get_run_extents (iter, 0, &extents); 1366 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1060 1374
1061 pango_layout_iter_free (iter); 1375 pango_layout_iter_free (iter);
1062} 1376}
1063 1377
1064int 1378int
1065has_wrapped (CFPlus::Layout self) 1379has_wrapped (DC::Layout self)
1066 CODE: 1380 CODE:
1067{ 1381{
1068 int lines = 1; 1382 int lines = 1;
1069 const char *text = pango_layout_get_text (self->pl); 1383 const char *text = pango_layout_get_text (self->pl);
1070 1384
… …
1075} 1389}
1076 OUTPUT: 1390 OUTPUT:
1077 RETVAL 1391 RETVAL
1078 1392
1079SV * 1393SV *
1080get_text (CFPlus::Layout self) 1394get_text (DC::Layout self)
1081 CODE: 1395 CODE:
1082 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1396 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1083 sv_utf8_decode (RETVAL); 1397 sv_utf8_decode (RETVAL);
1084 OUTPUT: 1398 OUTPUT:
1085 RETVAL 1399 RETVAL
1086 1400
1087void 1401void
1088set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1402set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1089 CODE: 1403 CODE:
1090 self->r = r; 1404 self->r = r;
1091 self->g = g; 1405 self->g = g;
1092 self->b = b; 1406 self->b = b;
1093 self->a = a; 1407 self->a = a;
1094 1408
1095void 1409void
1096set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1410set_font (DC::Layout self, DC::Font font = 0)
1097 CODE: 1411 CODE:
1098 if (self->font != font) 1412 if (self->font != font)
1099 { 1413 {
1100 self->font = font; 1414 self->font = font;
1101 layout_update_font (self); 1415 layout_update_font (self);
1102 } 1416 }
1103 1417
1104void 1418void
1105set_height (CFPlus::Layout self, int base_height) 1419set_height (DC::Layout self, int base_height)
1106 CODE: 1420 CODE:
1107 if (self->base_height != base_height) 1421 if (self->base_height != base_height)
1108 { 1422 {
1109 self->base_height = base_height; 1423 self->base_height = base_height;
1110 layout_update_font (self); 1424 layout_update_font (self);
1111 } 1425 }
1112 1426
1113void 1427void
1114set_width (CFPlus::Layout self, int max_width = -1) 1428set_width (DC::Layout self, int max_width = -1)
1115 CODE: 1429 CODE:
1116 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1430 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1117 1431
1118void 1432void
1119set_indent (CFPlus::Layout self, int indent) 1433set_indent (DC::Layout self, int indent)
1120 CODE: 1434 CODE:
1121 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1435 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1122 1436
1123void 1437void
1124set_spacing (CFPlus::Layout self, int spacing) 1438set_spacing (DC::Layout self, int spacing)
1125 CODE: 1439 CODE:
1126 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1440 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1127 1441
1128void 1442void
1129set_ellipsise (CFPlus::Layout self, int ellipsise) 1443set_ellipsise (DC::Layout self, int ellipsise)
1130 CODE: 1444 CODE:
1131 pango_layout_set_ellipsize (self->pl, 1445 pango_layout_set_ellipsize (self->pl,
1132 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1446 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1133 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1447 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1134 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1448 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1135 : PANGO_ELLIPSIZE_NONE 1449 : PANGO_ELLIPSIZE_NONE
1136 ); 1450 );
1137 1451
1138void 1452void
1139set_single_paragraph_mode (CFPlus::Layout self, int spm) 1453set_single_paragraph_mode (DC::Layout self, int spm)
1140 CODE: 1454 CODE:
1141 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1455 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1142 1456
1143void 1457void
1144size (CFPlus::Layout self) 1458size (DC::Layout self)
1145 PPCODE: 1459 PPCODE:
1146{ 1460{
1147 int w, h; 1461 int w, h;
1148 1462
1149 layout_get_pixel_size (self, &w, &h); 1463 layout_get_pixel_size (self, &w, &h);
… …
1152 PUSHs (sv_2mortal (newSViv (w))); 1466 PUSHs (sv_2mortal (newSViv (w)));
1153 PUSHs (sv_2mortal (newSViv (h))); 1467 PUSHs (sv_2mortal (newSViv (h)));
1154} 1468}
1155 1469
1156int 1470int
1157descent (CFPlus::Layout self) 1471descent (DC::Layout self)
1158 CODE: 1472 CODE:
1159{ 1473{
1160 PangoRectangle rect; 1474 PangoRectangle rect;
1161 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1475 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1162 pango_layout_line_get_pixel_extents (line, 0, &rect); 1476 pango_layout_line_get_pixel_extents (line, 0, &rect);
1163 RETVAL = PANGO_DESCENT (rect); 1477 RETVAL = PANGO_DESCENT (rect);
1164} 1478}
1165 OUTPUT: 1479 OUTPUT:
1166 RETVAL 1480 RETVAL
1167 1481
1168int 1482int
1169xy_to_index (CFPlus::Layout self, int x, int y) 1483xy_to_index (DC::Layout self, int x, int y)
1170 CODE: 1484 CODE:
1171{ 1485{
1172 int index, trailing; 1486 int index, trailing;
1173 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1487 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1174 RETVAL = index + trailing; 1488 RETVAL = index + trailing;
1175} 1489}
1176 OUTPUT: 1490 OUTPUT:
1177 RETVAL 1491 RETVAL
1178 1492
1179void 1493void
1180cursor_pos (CFPlus::Layout self, int index) 1494cursor_pos (DC::Layout self, int index)
1181 PPCODE: 1495 PPCODE:
1182{ 1496{
1183 PangoRectangle strong_pos; 1497 PangoRectangle pos;
1184 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1498 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1185 1499
1186 EXTEND (SP, 3); 1500 EXTEND (SP, 3);
1187 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1501 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1188 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1502 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1189 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1503 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1190} 1504}
1191 1505
1192void 1506void
1193index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1507index_to_line_x (DC::Layout self, int index, int trailing = 0)
1194 PPCODE: 1508 PPCODE:
1195{ 1509{
1196 int line, x; 1510 int line, x;
1197 1511
1198 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1512 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1513#if !PANGO_VERSION_CHECK (1, 17, 3)
1199 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1514 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1200 1515 --line;
1516#endif
1201 EXTEND (SP, 2); 1517 EXTEND (SP, 2);
1202 PUSHs (sv_2mortal (newSViv (line - 1))); 1518 PUSHs (sv_2mortal (newSViv (line)));
1203 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1204} 1520}
1205 1521
1206void 1522void
1207line_x_to_index (CFPlus::Layout self, int line, int x) 1523line_x_to_index (DC::Layout self, int line, int x)
1208 PPCODE: 1524 PPCODE:
1209{ 1525{
1210 PangoLayoutLine *lp; 1526 PangoLayoutLine *lp;
1211 int index, trailing; 1527 int index, trailing;
1212 1528
1213 if (line < 0) 1529 if (line < 0)
1214 XSRETURN_EMPTY; 1530 XSRETURN_EMPTY;
1215 1531
1216 if (!(lp = pango_layout_get_line (self->pl, line))) 1532 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1217 XSRETURN_EMPTY; /* do better */ 1533 XSRETURN_EMPTY; /* do better */
1218 1534
1219 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1535 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1220 1536
1221 EXTEND (SP, 2); 1537 EXTEND (SP, 2);
… …
1227 PUSHs (sv_2mortal (newSViv (trailing))); 1543 PUSHs (sv_2mortal (newSViv (trailing)));
1228 } 1544 }
1229} 1545}
1230 1546
1231void 1547void
1232render (CFPlus::Layout self, float x, float y, int flags = 0) 1548render (DC::Layout self, float x, float y, int flags = 0)
1233 PPCODE: 1549 CODE:
1550 rc_clear (self->rc);
1234 pango_opengl_render_layout_subpixel ( 1551 pango_opengl_render_layout_subpixel (
1235 self->pl, 1552 self->pl,
1553 self->rc,
1236 x * PANGO_SCALE, y * PANGO_SCALE, 1554 x * PANGO_SCALE, y * PANGO_SCALE,
1237 self->r, self->g, self->b, self->a, 1555 self->r, self->g, self->b, self->a,
1238 flags 1556 flags
1239 ); 1557 );
1558 // we assume that context_change actually clears/frees stuff
1559 // and does not do any recomputation...
1560 pango_layout_context_changed (self->pl);
1240 1561
1241MODULE = CFPlus PACKAGE = CFPlus::Texture
1242
1243void 1562void
1244pad2pot (SV *data_, SV *w_, SV *h_) 1563draw (DC::Layout self)
1245 CODE: 1564 CODE:
1246{ 1565{
1247 int ow = SvIV (w_); 1566 glEnable (GL_TEXTURE_2D);
1248 int oh = SvIV (h_); 1567 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1568 glEnable (GL_BLEND);
1569 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1570 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1571 glEnable (GL_ALPHA_TEST);
1572 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1249 1573
1250 if (ow && oh) 1574 rc_draw (self->rc);
1575
1576 glDisable (GL_ALPHA_TEST);
1577 glDisable (GL_BLEND);
1578 glDisable (GL_TEXTURE_2D);
1579}
1580
1581MODULE = Deliantra::Client PACKAGE = DC::Texture
1582
1583PROTOTYPES: ENABLE
1584
1585void
1586pad (SV *data_, int ow, int oh, int nw, int nh)
1587 CODE:
1588{
1589 if ((nw != ow || nh != oh) && SvOK (data_))
1251 { 1590 {
1252 int nw = minpot (ow);
1253 int nh = minpot (oh);
1254
1255 if (nw != ow || nh != oh)
1256 {
1257 if (SvOK (data_))
1258 {
1259 STRLEN datalen; 1591 STRLEN datalen;
1260 char *data = SvPVbyte (data_, datalen); 1592 char *data = SvPVbyte (data_, datalen);
1261 int bpp = datalen / (ow * oh); 1593 int bpp = datalen / (ow * oh);
1262 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1594 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1263 1595
1264 SvPOK_only (result_); 1596 SvPOK_only (result_);
1265 SvCUR_set (result_, nw * nh * bpp); 1597 SvCUR_set (result_, nw * nh * bpp);
1266 1598
1267 memset (SvPVX (result_), 0, nw * nh * bpp); 1599 memset (SvPVX (result_), 0, nw * nh * bpp);
1268 while (oh--) 1600 while (oh--)
1269 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1601 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1270 1602
1271 sv_setsv (data_, result_); 1603 sv_setsv (data_, result_);
1272 }
1273
1274 sv_setiv (w_, nw);
1275 sv_setiv (h_, nh);
1276 }
1277 } 1604 }
1278} 1605}
1279 1606
1280void 1607void
1281draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1608draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1287{ 1614{
1288 HV *hv = (HV *)SvRV (self); 1615 HV *hv = (HV *)SvRV (self);
1289 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1616 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1290 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1617 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1291 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1618 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1619
1620 if (name <= 0)
1621 XSRETURN_EMPTY;
1292 1622
1293 if (items < 5) 1623 if (items < 5)
1294 { 1624 {
1295 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1625 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1296 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1626 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1324 glDisable (GL_ALPHA_TEST); 1654 glDisable (GL_ALPHA_TEST);
1325 glDisable (GL_BLEND); 1655 glDisable (GL_BLEND);
1326 } 1656 }
1327} 1657}
1328 1658
1329MODULE = CFPlus PACKAGE = CFPlus::Map 1659IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660 CODE:
1661{
1662 GLint width;
1663 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1664 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1665 RETVAL = width > 0;
1666}
1667 OUTPUT:
1668 RETVAL
1330 1669
1331CFPlus::Map 1670MODULE = Deliantra::Client PACKAGE = DC::Map
1671
1672PROTOTYPES: DISABLE
1673
1674DC::Map
1332new (SV *class) 1675new (SV *class)
1333 CODE: 1676 CODE:
1334 New (0, RETVAL, 1, struct map); 1677 New (0, RETVAL, 1, struct map);
1335 RETVAL->x = 0; 1678 RETVAL->x = 0;
1336 RETVAL->y = 0; 1679 RETVAL->y = 0;
… …
1344 RETVAL->row = 0; 1687 RETVAL->row = 0;
1345 OUTPUT: 1688 OUTPUT:
1346 RETVAL 1689 RETVAL
1347 1690
1348void 1691void
1349DESTROY (CFPlus::Map self) 1692DESTROY (DC::Map self)
1350 CODE: 1693 CODE:
1351{ 1694{
1352 map_clear (self); 1695 map_clear (self);
1353 Safefree (self->face2tile); 1696 Safefree (self->face2tile);
1354 Safefree (self->tex); 1697 Safefree (self->tex);
1355 Safefree (self); 1698 Safefree (self);
1356} 1699}
1357 1700
1358void 1701void
1359resize (CFPlus::Map self, int map_width, int map_height) 1702resize (DC::Map self, int map_width, int map_height)
1360 CODE: 1703 CODE:
1361 self->w = map_width; 1704 self->w = map_width;
1362 self->h = map_height; 1705 self->h = map_height;
1363 1706
1364void 1707void
1365clear (CFPlus::Map self) 1708clear (DC::Map self)
1366 CODE: 1709 CODE:
1367 map_clear (self); 1710 map_clear (self);
1368 1711
1369void 1712void
1370set_tileid (CFPlus::Map self, int face, int tile) 1713set_tileid (DC::Map self, int face, int tile)
1371 CODE: 1714 CODE:
1372{ 1715{
1373 need_facenum (self, face); self->face2tile [face] = tile; 1716 need_facenum (self, face); self->face2tile [face] = tile;
1374 need_texid (self, tile); 1717 need_texid (self, tile);
1375} 1718}
1376 1719
1377void 1720void
1378set_smooth (CFPlus::Map self, int face, int smooth, int level) 1721set_smooth (DC::Map self, int face, int smooth, int level)
1379 CODE: 1722 CODE:
1380{ 1723{
1381 tileid texid; 1724 tileid texid;
1382 maptex *tex; 1725 maptex *tex;
1383 1726
… …
1396 tex->smoothtile = self->face2tile [smooth]; 1739 tex->smoothtile = self->face2tile [smooth];
1397 tex->smoothlevel = level; 1740 tex->smoothlevel = level;
1398} 1741}
1399 1742
1400void 1743void
1401set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1744set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1402 CODE: 1745 CODE:
1403{ 1746{
1404 need_texid (self, texid); 1747 need_texid (self, texid);
1405 1748
1406 { 1749 {
… …
1425 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1426 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1427 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1428} 1771}
1429 1772
1773void
1774expire_textures (DC::Map self, int texid, int count)
1775 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count)
1777 {
1778 maptex *tex = self->tex + texid;
1779
1780 if (tex->name)
1781 {
1782 if (tex->unused)
1783 {
1784 tex->name = 0;
1785 tex->unused = 0,
1786 XPUSHs (sv_2mortal (newSViv (texid)));
1787 }
1788 else
1789 tex->unused = 1;
1790 }
1791 }
1792
1430int 1793int
1431ox (CFPlus::Map self) 1794ox (DC::Map self)
1432 ALIAS: 1795 ALIAS:
1433 oy = 1 1796 oy = 1
1434 x = 2 1797 x = 2
1435 y = 3 1798 y = 3
1436 w = 4 1799 w = 4
… …
1447 } 1810 }
1448 OUTPUT: 1811 OUTPUT:
1449 RETVAL 1812 RETVAL
1450 1813
1451void 1814void
1452scroll (CFPlus::Map self, int dx, int dy) 1815scroll (DC::Map self, int dx, int dy)
1453 CODE: 1816 CODE:
1454{ 1817{
1455 if (dx > 0) 1818 if (dx > 0)
1456 map_blank (self, self->x, self->y, dx, self->h); 1819 map_blank (self, self->x, self->y, dx, self->h);
1457 else if (dx < 0) 1820 else if (dx < 0)
… …
1472 self->rows += MAP_EXTEND_Y; 1835 self->rows += MAP_EXTEND_Y;
1473 self->y += MAP_EXTEND_Y; 1836 self->y += MAP_EXTEND_Y;
1474 } 1837 }
1475} 1838}
1476 1839
1477void 1840SV *
1478map1a_update (CFPlus::Map self, SV *data_, int extmap) 1841map1a_update (DC::Map self, SV *data_, int extmap)
1479 CODE: 1842 CODE:
1480{ 1843{
1481 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1482 uint8_t *data_end = (uint8_t *)SvEND (data_); 1845 uint8_t *data_end = (uint8_t *)SvEND (data_);
1483 mapcell *cell; 1846 mapcell *cell;
1484 int x, y, flags; 1847 int x, y, z, flags;
1848 AV *missing = newAV ();
1849 RETVAL = newRV_noinc ((SV *)missing);
1485 1850
1486 while (data < data_end - 1) 1851 while (data < data_end - 1)
1487 { 1852 {
1488 flags = (data [0] << 8) + data [1]; data += 2; 1853 flags = (data [0] << 8) + data [1]; data += 2;
1489 1854
… …
1509 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1510 1875
1511 do 1876 do
1512 { 1877 {
1513 ext = *data++; 1878 ext = *data++;
1514 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1515 1880
1516 if (cmd < 4) 1881 if (cmd < 4)
1517 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1518 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1519 { 1884 {
… …
1522 } 1887 }
1523 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1524 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1525 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1526 { 1891 {
1527 if (*data == 4) 1892 if (*data == 1) cell->player = data [1];
1528 ; // decode player count 1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1529 1896
1530 data += *data + 1; 1897 data += *data + 1;
1531 } 1898 }
1532 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1533 cell->flags = *data++; 1900 cell->flags = *data++;
… …
1540 } 1907 }
1541 else 1908 else
1542 cell->darkness = *data++ + 1; 1909 cell->darkness = *data++ + 1;
1543 } 1910 }
1544 1911
1912 for (z = 0; z <= 2; ++z)
1545 if (flags & 4) 1913 if (flags & (4 >> z))
1546 { 1914 {
1547 faceid face = (data [0] << 8) + data [1]; data += 2; 1915 faceid face = (data [0] << 8) + data [1]; data += 2;
1548 need_facenum (self, face); 1916 need_facenum (self, face);
1549 cell->tile [0] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1918
1919 if (cell->tile [z])
1920 {
1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1923 if (!tex->name)
1924 av_push (missing, newSViv (cell->tile [z]));
1925
1926 if (tex->smoothtile)
1927 {
1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1930 if (!smooth->name)
1931 av_push (missing, newSViv (tex->smoothtile));
1932 }
1933 }
1550 } 1934 }
1551
1552 if (flags & 2)
1553 {
1554 faceid face = (data [0] << 8) + data [1]; data += 2;
1555 need_facenum (self, face);
1556 cell->tile [1] = self->face2tile [face];
1557 }
1558
1559 if (flags & 1)
1560 {
1561 faceid face = (data [0] << 8) + data [1]; data += 2;
1562 need_facenum (self, face);
1563 cell->tile [2] = self->face2tile [face];
1564 }
1565 } 1935 }
1566 else 1936 else
1567 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1568 } 1938 }
1569} 1939}
1940 OUTPUT:
1941 RETVAL
1570 1942
1571SV * 1943SV *
1572mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1944mapmap (DC::Map self, int x0, int y0, int w, int h)
1573 CODE: 1945 CODE:
1574{ 1946{
1575 int x1, x; 1947 int x1, x;
1576 int y1, y; 1948 int y1, y;
1577 int z; 1949 int z;
… …
1622} 1994}
1623 OUTPUT: 1995 OUTPUT:
1624 RETVAL 1996 RETVAL
1625 1997
1626void 1998void
1627draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1628 CODE: 2000 CODE:
1629{ 2001{
2002 int x, y, z;
2003
1630 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1631 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1632 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1633 smooth_key skey; 2007 smooth_key skey;
1634 int x, y, z; 2008 int pl_x, pl_y;
1635 int last_name; 2009 maptex pl_tex;
2010 rc_t *rc = rc_alloc ();
2011 rc_key_t key;
2012 rc_array_t *arr;
2013
2014 pl_tex.name = 0;
1636 2015
1637 // thats current max. sorry. 2016 // thats current max. sorry.
1638 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1639 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1640 2019
1641 // clear key, in case of extra padding 2020 // clear key, in case of extra padding
1642 memset (&skey, 0, sizeof (skey)); 2021 memset (&skey, 0, sizeof (skey));
1643 2022
1644 glColor4ub (255, 255, 255, 255); 2023 memset (&key, 0, sizeof (key));
1645 2024 key.r = 255;
1646 glEnable (GL_BLEND); 2025 key.g = 255;
1647 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2026 key.b = 255;
1648 glEnable (GL_TEXTURE_2D); 2027 key.a = 255;
1649 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2028 key.mode = GL_QUADS;
1650 2029 key.format = GL_T2F_V3F;
1651 glBegin (GL_QUADS); 2030 key.texname = -1;
1652
1653 last_name = 0;
1654 2031
1655 mx += self->x; 2032 mx += self->x;
1656 my += self->y; 2033 my += self->y;
1657 2034
1658 // first pass: determine smooth_max 2035 // first pass: determine smooth_max
… …
1674 MAX (self->tex [cell->tile [0]].smoothlevel, 2051 MAX (self->tex [cell->tile [0]].smoothlevel,
1675 MAX (self->tex [cell->tile [1]].smoothlevel, 2052 MAX (self->tex [cell->tile [1]].smoothlevel,
1676 self->tex [cell->tile [2]].smoothlevel)); 2053 self->tex [cell->tile [2]].smoothlevel));
1677 } 2054 }
1678 } 2055 }
2056
2057 glEnable (GL_BLEND);
2058 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2059 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1679 2060
1680 for (z = 0; z <= 2; z++) 2061 for (z = 0; z <= 2; z++)
1681 { 2062 {
1682 memset (smooth_level, 0, sizeof (smooth_level)); 2063 memset (smooth_level, 0, sizeof (smooth_level));
1683 2064
… …
1696 { 2077 {
1697 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1698 int px = (x + 1) * T - tex.w; 2079 int px = (x + 1) * T - tex.w;
1699 int py = (y + 1) * T - tex.h; 2080 int py = (y + 1) * T - tex.h;
1700 2081
1701 // suppressing texture state switches here
1702 // is only moderately effective, but worth the extra effort
1703 if (last_name != tex.name) 2082 if (key.texname != tex.name)
1704 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1705 if (!tex.name) 2086 if (!tex.name)
1706 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1707 2088
1708 glEnd (); 2089 key.texname = tex.name;
1709 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2090 arr = rc_array (rc, &key);
1710 glBegin (GL_QUADS);
1711 } 2091 }
1712 2092
1713 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1714 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1715 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1716 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1717
1718 if (cell->flags && z == 2)
1719 { 2094 {
2095 pl_x = px;
2096 pl_y = py;
2097 pl_tex = tex;
2098 continue;
2099 }
2100
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 // overlays such as the speech bubble, probably more to come
1720 if (cell->flags & 1) 2109 if (cell->flags & 1)
1721 { 2110 {
1722 maptex tex = self->tex [1]; 2111 maptex tex = self->tex [1];
1723 int px = x * T + T * 2 / 32; 2112 int px = x * T + T * 2 / 32;
1724 int py = y * T - T * 6 / 32; 2113 int py = y * T - T * 6 / 32;
1725 2114
2115 if (tex.name)
1726 glEnd (); 2116 {
1727 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2117 if (key.texname != tex.name)
2118 {
2119 key.texname = tex.name;
2120 arr = rc_array (rc, &key);
2121 }
2122
2123 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1728 glBegin (GL_QUADS); 2127 }
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1734 } 2128 }
1735 } 2129 }
1736 2130
1737 // update smooth hash 2131 // update smooth hash
1738 if (tex.smoothtile) 2132 if (tex.smoothtile)
… …
1774 } 2168 }
1775 } 2169 }
1776 } 2170 }
1777 } 2171 }
1778 2172
2173 rc_draw (rc);
2174 rc_clear (rc);
2175
1779 // go through all smoothlevels, lowest to highest, then draw. 2176 // go through all smoothlevels, lowest to highest, then draw.
1780 // this is basically counting sort 2177 // this is basically counting sort
1781 { 2178 {
1782 int w, b; 2179 int w, b;
1783 2180
2181 glEnable (GL_TEXTURE_2D);
2182 glBegin (GL_QUADS);
1784 for (w = 0; w < 256 / 32; ++w) 2183 for (w = 0; w < 256 / 32; ++w)
1785 { 2184 {
1786 uint32_t smask = smooth_level [w]; 2185 uint32_t smask = smooth_level [w];
1787 if (smask) 2186 if (smask)
1788 for (b = 0; b < 32; ++b) 2187 for (b = 0; b < 32; ++b)
… …
1807 int border = bits & 15; 2206 int border = bits & 15;
1808 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2207 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1809 float dx = tex.s * .0625f; // 16 images/row 2208 float dx = tex.s * .0625f; // 16 images/row
1810 float dy = tex.t * .5f ; // 2 images/column 2209 float dy = tex.t * .5f ; // 2 images/column
1811 2210
1812 // this time naively avoiding texture state changes
1813 // save gobs of state changes.
1814 if (last_name != tex.name) 2211 if (tex.name)
1815 { 2212 {
2213 // this time avoiding texture state changes
2214 // save gobs of state changes.
1816 if (!tex.name) 2215 if (key.texname != tex.name)
1817 continue; // smoothing not yet available 2216 {
2217 self->tex [skey->tile].unused = 0;
1818 2218
1819 glEnd (); 2219 glEnd ();
1820 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1821 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
1822 } 2222 }
1823 2223
1824 if (border) 2224 if (border)
1825 { 2225 {
1826 float ox = border * dx; 2226 float ox = border * dx;
1827 2227
1828 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1829 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1830 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1831 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1832 } 2232 }
1833 2233
1834 if (corner) 2234 if (corner)
1835 { 2235 {
1836 float ox = corner * dx; 2236 float ox = corner * dx;
1837 2237
1838 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2238 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1839 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1840 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1841 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2242 }
1842 } 2243 }
1843 } 2244 }
1844 } 2245 }
1845 } 2246 }
1846 } 2247 }
2248
2249 glEnd ();
2250 glDisable (GL_TEXTURE_2D);
2251 key.texname = -1;
1847 } 2252 }
1848 2253
1849 hv_clear (smooth); 2254 hv_clear (smooth);
1850 } 2255 }
1851 2256
1852 glEnd (); 2257 if (pl_tex.name)
2258 {
2259 maptex tex = pl_tex;
2260 int px = pl_x + sdx;
2261 int py = pl_y + sdy;
1853 2262
1854 glDisable (GL_TEXTURE_2D); 2263 key.texname = tex.name;
2264 arr = rc_array (rc, &key);
2265
2266 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2267 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2268 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270
2271 rc_draw (rc);
2272 }
2273
1855 glDisable (GL_BLEND); 2274 glDisable (GL_BLEND);
2275 rc_free (rc);
1856 2276
1857 // top layer: overlays such as the health bar 2277 // top layer: overlays such as the health bar
1858 for (y = 0; y < sh; y++) 2278 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2279 if (0 <= y + my && y + my < self->rows)
1860 { 2280 {
… …
1865 { 2285 {
1866 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
1867 2287
1868 int px = x * T; 2288 int px = x * T;
1869 int py = y * T; 2289 int py = y * T;
2290
2291 if (expect_false (cell->player == player))
2292 {
2293 px += sdx;
2294 py += sdy;
2295 }
1870 2296
1871 if (cell->stat_hp) 2297 if (cell->stat_hp)
1872 { 2298 {
1873 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
1874 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1885 } 2311 }
1886 } 2312 }
1887} 2313}
1888 2314
1889void 2315void
1890draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2316draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1891 CODE: 2317 CODE:
1892{ 2318{
1893 static float color[16][3] = { 2319 static float color[16][3] = {
1894 { 0.00F, 0.00F, 0.00F }, 2320 { 0.00F, 0.00F, 0.00F },
1895 { 1.00F, 1.00F, 1.00F }, 2321 { 1.00F, 1.00F, 1.00F },
… …
1945 glDisable (GL_BLEND); 2371 glDisable (GL_BLEND);
1946 glDisable (GL_TEXTURE_2D); 2372 glDisable (GL_TEXTURE_2D);
1947} 2373}
1948 2374
1949void 2375void
1950fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2376fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1951 PPCODE: 2377 PPCODE:
1952{ 2378{
1953 int x, y; 2379 int x, y;
2380 int sw1 = sw + 2;
2381 int sh1 = sh + 2;
2382 int sh3 = sh * 3;
1954 int sw4 = (sw + 3) & ~3; 2383 int sw34 = (sw * 3 + 3) & ~3;
2384 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1955 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2385 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1956 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2386 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1957 2387
1958 memset (darkness, 255, sw4 * sh);
1959 SvPOK_only (darkness_sv); 2388 SvPOK_only (darkness3_sv);
1960 SvCUR_set (darkness_sv, sw4 * sh); 2389 SvCUR_set (darkness3_sv, sw34 * sh3);
1961 2390
1962 mx += self->x; 2391 mx += self->x - 1;
1963 my += self->y; 2392 my += self->y - 1;
1964 2393
2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395
1965 for (y = 0; y < sh; y++) 2396 for (y = 0; y < sh1; y++)
1966 if (0 <= y + my && y + my < self->rows) 2397 if (0 <= y + my && y + my < self->rows)
1967 { 2398 {
1968 maprow *row = self->row + (y + my); 2399 maprow *row = self->row + (y + my);
1969 2400
1970 for (x = 0; x < sw; x++) 2401 for (x = 0; x < sw1; x++)
1971 if (row->c0 <= x + mx && x + mx < row->c1) 2402 if (row->c0 <= x + mx && x + mx < row->c1)
1972 { 2403 {
1973 mapcell *cell = row->col + (x + mx - row->c0); 2404 mapcell *cell = row->col + (x + mx - row->c0);
1974 2405
1975 darkness[y * sw4 + x] = cell->darkness 2406 darkness1 [y * sw1 + x] = cell->darkness
1976 ? 255 - (cell->darkness - 1) 2407 ? 255 - (cell->darkness - 1)
1977 : 255 - FOW_DARKNESS; 2408 : 255 - FOW_DARKNESS;
1978 } 2409 }
1979 } 2410 }
1980 2411
2412 for (y = 0; y < sh; ++y)
2413 for (x = 0; x < sw; ++x)
2414 {
2415 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2416 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2417 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2418 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2419 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2420 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2421 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2422 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2423 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2424
2425 uint8_t r11 = (d11 + d21 + d12) / 3;
2426 uint8_t r21 = d21;
2427 uint8_t r31 = (d21 + d31 + d32) / 3;
2428
2429 uint8_t r12 = d12;
2430 uint8_t r22 = d22;
2431 uint8_t r32 = d32;
2432
2433 uint8_t r13 = (d13 + d23 + d12) / 3;
2434 uint8_t r23 = d23;
2435 uint8_t r33 = (d23 + d33 + d32) / 3;
2436
2437 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2438 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2439 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2440 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2441 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2442 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2443 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2444 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2445 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2446 }
2447
2448 free (darkness1);
2449
1981 EXTEND (SP, 3); 2450 EXTEND (SP, 3);
1982 PUSHs (sv_2mortal (newSViv (sw4))); 2451 PUSHs (sv_2mortal (newSViv (sw34)));
1983 PUSHs (sv_2mortal (newSViv (sh))); 2452 PUSHs (sv_2mortal (newSViv (sh3)));
1984 PUSHs (darkness_sv); 2453 PUSHs (darkness3_sv);
1985} 2454}
1986 2455
1987SV * 2456SV *
1988get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2457get_rect (DC::Map self, int x0, int y0, int w, int h)
1989 CODE: 2458 CODE:
1990{ 2459{
1991 int x, y, x1, y1; 2460 int x, y, x1, y1;
1992 SV *data_sv = newSV (w * h * 7 + 5); 2461 SV *data_sv = newSV (w * h * 7 + 5);
1993 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2462 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2050 else 2519 else
2051 *data++ = 0; 2520 *data++ = 0;
2052 } 2521 }
2053 } 2522 }
2054 2523
2524 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 {
2055 SvPOK_only (data_sv); 2527 SvPOK_only (data_sv);
2056 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 }
2530
2057 RETVAL = data_sv; 2531 RETVAL = data_sv;
2058} 2532}
2059 OUTPUT: 2533 OUTPUT:
2060 RETVAL 2534 RETVAL
2061 2535
2062void 2536void
2063set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2537set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2064 PPCODE: 2538 PPCODE:
2065{ 2539{
2066 int x, y, z; 2540 int x, y, z;
2067 int w, h; 2541 int w, h;
2068 int x1, y1; 2542 int x1, y1;
2543 STRLEN len;
2544 uint8_t *data, *end;
2545
2546 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv);
2549 end = data + len + 8;
2550
2551 if (len < 5)
2552 XSRETURN_EMPTY;
2069 2553
2070 if (*data++ != 0) 2554 if (*data++ != 0)
2071 return; /* version mismatch */ 2555 XSRETURN_EMPTY; /* version mismatch */
2072 2556
2073 w = *data++ << 8; w |= *data++; 2557 w = *data++ << 8; w |= *data++;
2074 h = *data++ << 8; h |= *data++; 2558 h = *data++ << 8; h |= *data++;
2075 2559
2076 // we need to do this 'cause we don't keep an absolute coord system for rows 2560 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2088 { 2572 {
2089 maprow *row = map_get_row (self, y); 2573 maprow *row = map_get_row (self, y);
2090 2574
2091 for (x = x0; x < x1; x++) 2575 for (x = x0; x < x1; x++)
2092 { 2576 {
2577 uint8_t flags;
2578
2579 if (data + 7 >= end)
2580 XSRETURN_EMPTY;
2581
2093 uint8_t flags = *data++; 2582 flags = *data++;
2094 2583
2095 if (flags) 2584 if (flags)
2096 { 2585 {
2097 mapcell *cell = row_get_cell (row, x); 2586 mapcell *cell = row_get_cell (row, x);
2098 tileid tile[3] = { 0, 0, 0 }; 2587 tileid tile[3] = { 0, 0, 0 };
… …
2101 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2590 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2102 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2591 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2103 2592
2104 if (cell->darkness == 0) 2593 if (cell->darkness == 0)
2105 { 2594 {
2106 cell->darkness = 0; 2595 /*cell->darkness = 0;*/
2596 EXTEND (SP, 3);
2107 2597
2108 for (z = 0; z <= 2; z++) 2598 for (z = 0; z <= 2; z++)
2109 { 2599 {
2110 tileid t = tile [z]; 2600 tileid t = tile [z];
2111 2601
2112 if (t >= self->texs || (t && !self->tex [t].name)) 2602 if (t >= self->texs || (t && !self->tex [t].name))
2113 { 2603 {
2114 XPUSHs (sv_2mortal (newSViv (t))); 2604 PUSHs (sv_2mortal (newSViv (t)));
2115 need_texid (self, t); 2605 need_texid (self, t);
2116 } 2606 }
2117 2607
2118 cell->tile [z] = t; 2608 cell->tile [z] = t;
2119 } 2609 }
… …
2121 } 2611 }
2122 } 2612 }
2123 } 2613 }
2124} 2614}
2125 2615
2126MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2616MODULE = Deliantra::Client PACKAGE = DC::RW
2127 2617
2128CFPlus::MixChunk 2618DC::RW
2129new_from_file (SV *class, char *path) 2619new (SV *class, SV *data_sv)
2130 CODE: 2620 CODE:
2131 RETVAL = Mix_LoadWAV (path); 2621{
2622 STRLEN datalen;
2623 char *data = SvPVbyte (data_sv, datalen);
2624
2625 RETVAL = SDL_RWFromConstMem (data, datalen);
2626}
2132 OUTPUT: 2627 OUTPUT:
2133 RETVAL 2628 RETVAL
2134 2629
2630DC::RW
2631new_from_file (SV *class, const char *path, const char *mode = "rb")
2632 CODE:
2633 RETVAL = SDL_RWFromFile (path, mode);
2634 OUTPUT:
2635 RETVAL
2636
2637# fails on win32:
2638# dc.xs(2268) : error C2059: syntax error : '('
2135void 2639#void
2640#close (DC::RW self)
2641# CODE:
2642# (self->(close)) (self);
2643
2644MODULE = Deliantra::Client PACKAGE = DC::Channel
2645
2646PROTOTYPES: DISABLE
2647
2648DC::Channel
2649find ()
2650 CODE:
2651{
2652 RETVAL = Mix_GroupAvailable (-1);
2653
2654 if (RETVAL < 0)
2655 {
2656 RETVAL = Mix_GroupOldest (-1);
2657
2658 if (RETVAL < 0)
2659 XSRETURN_UNDEF;
2660
2661 Mix_HaltChannel (RETVAL);
2662 }
2663
2664 Mix_UnregisterAllEffects (RETVAL);
2665 Mix_Volume (RETVAL, 128);
2666}
2667 OUTPUT:
2668 RETVAL
2669
2670void
2671halt (DC::Channel self)
2672 CODE:
2673 Mix_HaltChannel (self);
2674
2675void
2676expire (DC::Channel self, int ticks = -1)
2677 CODE:
2678 Mix_ExpireChannel (self, ticks);
2679
2680void
2681fade_out (DC::Channel self, int ticks = -1)
2682 CODE:
2683 Mix_FadeOutChannel (self, ticks);
2684
2685int
2686volume (DC::Channel self, int volume)
2687 CODE:
2688 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2689 OUTPUT:
2690 RETVAL
2691
2692void
2693unregister_all_effects (DC::Channel self)
2694 CODE:
2695 Mix_UnregisterAllEffects (self);
2696
2697void
2698set_panning (DC::Channel self, int left, int right)
2699 CODE:
2700 left = CLAMP (left , 0, 255);
2701 right = CLAMP (right, 0, 255);
2702 Mix_SetPanning (self, left, right);
2703
2704void
2705set_distance (DC::Channel self, int distance)
2706 CODE:
2707 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2708
2709void
2710set_position (DC::Channel self, int angle, int distance)
2711 CODE:
2712
2713void
2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715 CODE:
2716{
2717 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2718 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720}
2721
2722void
2723set_reverse_stereo (DC::Channel self, int flip)
2724 CODE:
2725 Mix_SetReverseStereo (self, flip);
2726
2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728
2729PROTOTYPES: DISABLE
2730
2731DC::MixChunk
2732new (SV *class, DC::RW rwops)
2733 CODE:
2734 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2735 OUTPUT:
2736 RETVAL
2737
2738void
2136DESTROY (CFPlus::MixChunk self) 2739DESTROY (DC::MixChunk self)
2137 CODE: 2740 CODE:
2138 Mix_FreeChunk (self); 2741 Mix_FreeChunk (self);
2139 2742
2140int 2743int
2141volume (CFPlus::MixChunk self, int volume = -1) 2744volume (DC::MixChunk self, int volume = -1)
2142 CODE: 2745 CODE:
2746 if (items > 1)
2747 volume = CLAMP (volume, 0, 128);
2143 RETVAL = Mix_VolumeChunk (self, volume); 2748 RETVAL = Mix_VolumeChunk (self, volume);
2144 OUTPUT: 2749 OUTPUT:
2145 RETVAL 2750 RETVAL
2146 2751
2147int 2752DC::Channel
2148play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2753play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2149 CODE: 2754 CODE:
2755{
2150 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2756 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2757
2758 if (RETVAL < 0)
2759 XSRETURN_UNDEF;
2760
2761 if (channel < 0)
2762 {
2763 Mix_UnregisterAllEffects (RETVAL);
2764 Mix_Volume (RETVAL, 128);
2765 }
2766}
2151 OUTPUT: 2767 OUTPUT:
2152 RETVAL 2768 RETVAL
2153 2769
2154MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2155 2771
2156int 2772int
2157volume (int volume = -1) 2773volume (int volume = -1)
2774 PROTOTYPE: ;$
2158 CODE: 2775 CODE:
2776 if (items > 0)
2777 volume = CLAMP (volume, 0, 128);
2159 RETVAL = Mix_VolumeMusic (volume); 2778 RETVAL = Mix_VolumeMusic (volume);
2160 OUTPUT: 2779 OUTPUT:
2161 RETVAL 2780 RETVAL
2162 2781
2163int 2782void
2164fade_out (int ms) 2783fade_out (int ms)
2165 CODE: 2784 CODE:
2166 RETVAL = Mix_FadeOutMusic (ms); 2785 Mix_FadeOutMusic (ms);
2786
2787void
2788halt ()
2789 CODE:
2790 Mix_HaltMusic ();
2791
2792DC::MixMusic
2793new (SV *class, DC::RW rwops)
2794 CODE:
2795 RETVAL = Mix_LoadMUS_RW (rwops);
2167 OUTPUT: 2796 OUTPUT:
2168 RETVAL 2797 RETVAL
2169 2798
2170CFPlus::MixMusic
2171new_from_file (SV *class, char *path)
2172 CODE:
2173 RETVAL = Mix_LoadMUS (path);
2174 OUTPUT:
2175 RETVAL
2176
2177void 2799void
2178DESTROY (CFPlus::MixMusic self) 2800DESTROY (DC::MixMusic self)
2179 CODE: 2801 CODE:
2180 Mix_FreeMusic (self); 2802 Mix_FreeMusic (self);
2181 2803
2182int 2804int
2183play (CFPlus::MixMusic self, int loops = -1) 2805play (DC::MixMusic self, int loops = -1)
2184 CODE: 2806 CODE:
2185 RETVAL = Mix_PlayMusic (self, loops); 2807 RETVAL = Mix_PlayMusic (self, loops);
2186 OUTPUT: 2808 OUTPUT:
2187 RETVAL 2809 RETVAL
2188 2810
2189int 2811void
2190fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2812fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2191 CODE: 2813 CODE:
2192 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2814 Mix_FadeInMusicPos (self, loops, ms, position);
2193 OUTPUT:
2194 RETVAL
2195 2815
2196MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2816MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2817
2818PROTOTYPES: ENABLE
2197 2819
2198BOOT: 2820BOOT:
2199{ 2821{
2200 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2822 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2201 static const struct { 2823 static const struct {
2202 const char *name; 2824 const char *name;
2203 IV iv; 2825 IV iv;
2204 } *civ, const_iv[] = { 2826 } *civ, const_iv[] = {
2205# define const_iv(name) { # name, (IV)name } 2827# define const_iv(name) { # name, (IV)name }
2828 const_iv (GL_VENDOR),
2829 const_iv (GL_VERSION),
2830 const_iv (GL_EXTENSIONS),
2206 const_iv (GL_COLOR_MATERIAL), 2831 const_iv (GL_COLOR_MATERIAL),
2207 const_iv (GL_SMOOTH), 2832 const_iv (GL_SMOOTH),
2208 const_iv (GL_FLAT), 2833 const_iv (GL_FLAT),
2209 const_iv (GL_DITHER), 2834 const_iv (GL_DITHER),
2210 const_iv (GL_BLEND), 2835 const_iv (GL_BLEND),
… …
2214 const_iv (GL_ALPHA_TEST), 2839 const_iv (GL_ALPHA_TEST),
2215 const_iv (GL_NORMALIZE), 2840 const_iv (GL_NORMALIZE),
2216 const_iv (GL_RESCALE_NORMAL), 2841 const_iv (GL_RESCALE_NORMAL),
2217 const_iv (GL_FRONT), 2842 const_iv (GL_FRONT),
2218 const_iv (GL_BACK), 2843 const_iv (GL_BACK),
2844 const_iv (GL_AUX0),
2219 const_iv (GL_AND), 2845 const_iv (GL_AND),
2220 const_iv (GL_ONE), 2846 const_iv (GL_ONE),
2221 const_iv (GL_ZERO), 2847 const_iv (GL_ZERO),
2222 const_iv (GL_SRC_ALPHA), 2848 const_iv (GL_SRC_ALPHA),
2223 const_iv (GL_DST_ALPHA), 2849 const_iv (GL_DST_ALPHA),
… …
2236 const_iv (GL_INTENSITY), 2862 const_iv (GL_INTENSITY),
2237 const_iv (GL_LUMINANCE), 2863 const_iv (GL_LUMINANCE),
2238 const_iv (GL_LUMINANCE_ALPHA), 2864 const_iv (GL_LUMINANCE_ALPHA),
2239 const_iv (GL_FLOAT), 2865 const_iv (GL_FLOAT),
2240 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2866 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2867 const_iv (GL_COMPRESSED_ALPHA_ARB),
2868 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2869 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2870 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2871 const_iv (GL_COMPRESSED_RGB_ARB),
2872 const_iv (GL_COMPRESSED_RGBA_ARB),
2241 const_iv (GL_COMPILE), 2873 const_iv (GL_COMPILE),
2874 const_iv (GL_PROXY_TEXTURE_1D),
2875 const_iv (GL_PROXY_TEXTURE_2D),
2242 const_iv (GL_TEXTURE_1D), 2876 const_iv (GL_TEXTURE_1D),
2243 const_iv (GL_TEXTURE_2D), 2877 const_iv (GL_TEXTURE_2D),
2244 const_iv (GL_TEXTURE_ENV), 2878 const_iv (GL_TEXTURE_ENV),
2245 const_iv (GL_TEXTURE_MAG_FILTER), 2879 const_iv (GL_TEXTURE_MAG_FILTER),
2246 const_iv (GL_TEXTURE_MIN_FILTER), 2880 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2267 const_iv (GL_COLOR_LOGIC_OP), 2901 const_iv (GL_COLOR_LOGIC_OP),
2268 const_iv (GL_SEPARABLE_2D), 2902 const_iv (GL_SEPARABLE_2D),
2269 const_iv (GL_CONVOLUTION_2D), 2903 const_iv (GL_CONVOLUTION_2D),
2270 const_iv (GL_CONVOLUTION_BORDER_MODE), 2904 const_iv (GL_CONVOLUTION_BORDER_MODE),
2271 const_iv (GL_CONSTANT_BORDER), 2905 const_iv (GL_CONSTANT_BORDER),
2906 const_iv (GL_POINTS),
2272 const_iv (GL_LINES), 2907 const_iv (GL_LINES),
2273 const_iv (GL_LINE_STRIP), 2908 const_iv (GL_LINE_STRIP),
2274 const_iv (GL_LINE_LOOP), 2909 const_iv (GL_LINE_LOOP),
2275 const_iv (GL_QUADS), 2910 const_iv (GL_QUADS),
2276 const_iv (GL_QUAD_STRIP), 2911 const_iv (GL_QUAD_STRIP),
2277 const_iv (GL_TRIANGLES), 2912 const_iv (GL_TRIANGLES),
2278 const_iv (GL_TRIANGLE_STRIP), 2913 const_iv (GL_TRIANGLE_STRIP),
2279 const_iv (GL_TRIANGLE_FAN), 2914 const_iv (GL_TRIANGLE_FAN),
2915 const_iv (GL_POLYGON),
2280 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2916 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2917 const_iv (GL_POINT_SMOOTH_HINT),
2918 const_iv (GL_LINE_SMOOTH_HINT),
2919 const_iv (GL_POLYGON_SMOOTH_HINT),
2920 const_iv (GL_GENERATE_MIPMAP_HINT),
2921 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2281 const_iv (GL_FASTEST), 2922 const_iv (GL_FASTEST),
2923 const_iv (GL_DONT_CARE),
2924 const_iv (GL_NICEST),
2282 const_iv (GL_V2F), 2925 const_iv (GL_V2F),
2283 const_iv (GL_V3F), 2926 const_iv (GL_V3F),
2284 const_iv (GL_T2F_V3F), 2927 const_iv (GL_T2F_V3F),
2285 const_iv (GL_T2F_N3F_V3F), 2928 const_iv (GL_T2F_N3F_V3F),
2286# undef const_iv 2929# undef const_iv
… …
2291 2934
2292 texture_av = newAV (); 2935 texture_av = newAV ();
2293 AvREAL_off (texture_av); 2936 AvREAL_off (texture_av);
2294} 2937}
2295 2938
2939void
2940disable_GL_EXT_blend_func_separate ()
2941 CODE:
2942 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0;
2944
2296char * 2945char *
2297gl_vendor () 2946gl_vendor ()
2298 CODE: 2947 CODE:
2299 RETVAL = (char *)glGetString (GL_VENDOR); 2948 RETVAL = (char *)glGetString (GL_VENDOR);
2300 OUTPUT: 2949 OUTPUT:
… …
2312 CODE: 2961 CODE:
2313 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2962 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2314 OUTPUT: 2963 OUTPUT:
2315 RETVAL 2964 RETVAL
2316 2965
2966const char *glGetString (GLenum pname)
2967
2968GLint glGetInteger (GLenum pname)
2969 CODE:
2970 glGetIntegerv (pname, &RETVAL);
2971 OUTPUT:
2972 RETVAL
2973
2974GLdouble glGetDouble (GLenum pname)
2975 CODE:
2976 glGetDoublev (pname, &RETVAL);
2977 OUTPUT:
2978 RETVAL
2979
2317int glGetError () 2980int glGetError ()
2318 2981
2319void glFinish () 2982void glFinish ()
2320 2983
2321void glClear (int mask) 2984void glClear (int mask)
… …
2358# near_ and far_ are due to microsofts buggy "c" compiler 3021# near_ and far_ are due to microsofts buggy "c" compiler
2359void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3022void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2360 3023
2361# near_ and far_ are due to microsofts buggy "c" compiler 3024# near_ and far_ are due to microsofts buggy "c" compiler
2362void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3025void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3026
3027PROTOTYPES: DISABLE
2363 3028
2364void glViewport (int x, int y, int width, int height) 3029void glViewport (int x, int y, int width, int height)
2365 3030
2366void glScissor (int x, int y, int width, int height) 3031void glScissor (int x, int y, int width, int height)
2367 3032
… …
2375 3040
2376void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2377 CODE: 3042 CODE:
2378 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2379 3044
2380void glBegin (int mode)
2381
2382void glEnd ()
2383
2384void glColor (float r, float g, float b, float a = 1.0) 3045void glColor (float r, float g, float b, float a = 1.0)
2385 PROTOTYPE: @ 3046 PROTOTYPE: @
2386 ALIAS: 3047 ALIAS:
2387 glColor_premultiply = 1 3048 glColor_premultiply = 1
2388 CODE: 3049 CODE:
2389 if (ix) 3050 if (ix)
2390 { 3051 {
… …
2393 b *= a; 3054 b *= a;
2394 } 3055 }
2395 // microsoft visual "c" rounds instead of truncating... 3056 // microsoft visual "c" rounds instead of truncating...
2396 glColor4f (r, g, b, a); 3057 glColor4f (r, g, b, a);
2397 3058
2398void glInterleavedArrays (int format, int stride, char *data)
2399
2400void glDrawElements (int mode, int count, int type, char *indices)
2401
2402# 1.2 void glDrawRangeElements (int mode, int start, int end
2403
2404void glRasterPos (float x, float y, float z = 0.) 3059void glRasterPos (float x, float y, float z = 0.)
2405 CODE: 3060 CODE:
2406 glRasterPos3f (0, 0, z); 3061 glRasterPos3f (0, 0, z);
2407 glBitmap (0, 0, 0, 0, x, y, 0); 3062 glBitmap (0, 0, 0, 0, x, y, 0);
2408 3063
… …
2412 3067
2413void glTexCoord (float s, float t) 3068void glTexCoord (float s, float t)
2414 CODE: 3069 CODE:
2415 glTexCoord2f (s, t); 3070 glTexCoord2f (s, t);
2416 3071
3072void glRect (float x1, float y1, float x2, float y2)
3073 CODE:
3074 glRectf (x1, y1, x2, y2);
3075
3076void glRect_lineloop (float x1, float y1, float x2, float y2)
3077 CODE:
3078 glBegin (GL_LINE_LOOP);
3079 glVertex2f (x1, y1);
3080 glVertex2f (x2, y1);
3081 glVertex2f (x2, y2);
3082 glVertex2f (x1, y2);
3083 glEnd ();
3084
3085PROTOTYPES: ENABLE
3086
3087void glBegin (int mode)
3088
3089void glEnd ()
3090
3091void glPointSize (GLfloat size)
3092
3093void glLineWidth (GLfloat width)
3094
3095void glInterleavedArrays (int format, int stride, char *data)
3096
3097void glDrawElements (int mode, int count, int type, char *indices)
3098
3099# 1.2 void glDrawRangeElements (int mode, int start, int end
3100
2417void glTexEnv (int target, int pname, float param) 3101void glTexEnv (int target, int pname, float param)
2418 CODE: 3102 CODE:
2419 glTexEnvf (target, pname, param); 3103 glTexEnvf (target, pname, param);
2420 3104
2421void glTexParameter (int target, int pname, float param) 3105void glTexParameter (int target, int pname, float param)
… …
2437void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3121void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2438 CODE: 3122 CODE:
2439 if (gl.SeparableFilter2D) 3123 if (gl.SeparableFilter2D)
2440 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3124 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2441 3125
2442void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3126void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2443 3127
2444void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3128void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2445 3129
2446void glDrawPixels (int width, int height, int format, int type, char *pixels) 3130void glDrawPixels (int width, int height, int format, int type, char *pixels)
3131
3132void glPixelZoom (float x, float y)
2447 3133
2448void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3134void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2449 3135
2450int glGenTexture () 3136int glGenTexture ()
2451 CODE: 3137 CODE:
… …
2471 3157
2472void glEndList () 3158void glEndList ()
2473 3159
2474void glCallList (int list) 3160void glCallList (int list)
2475 3161
3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163
3164PROTOTYPES: DISABLE
3165
3166void
3167find_widget (SV *self, NV x, NV y)
3168 PPCODE:
3169{
3170 if (within_widget (self, x, y))
3171 XPUSHs (self);
3172}
3173
3174BOOT:
3175{
3176 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3177
3178 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3179 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3180 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3181 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3182}
3183
3184void
3185draw (SV *self)
3186 CODE:
3187{
3188 HV *hv;
3189 SV **svp;
3190 NV x, y, w, h;
3191 SV *draw_x_sv = GvSV (draw_x_gv);
3192 SV *draw_y_sv = GvSV (draw_y_gv);
3193 SV *draw_w_sv = GvSV (draw_w_gv);
3194 SV *draw_h_sv = GvSV (draw_h_gv);
3195 double draw_x, draw_y;
3196
3197 if (!SvROK (self))
3198 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3199
3200 hv = (HV *)SvRV (self);
3201
3202 if (SvTYPE (hv) != SVt_PVHV)
3203 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3204
3205 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3206 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3207
3208 if (!h || !w)
3209 XSRETURN_EMPTY;
3210
3211 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3212 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3213
3214 draw_x = SvNV (draw_x_sv) + x;
3215 draw_y = SvNV (draw_y_sv) + y;
3216
3217 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3218 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3219 XSRETURN_EMPTY;
3220
3221 sv_setnv (draw_x_sv, draw_x);
3222 sv_setnv (draw_y_sv, draw_y);
3223
3224 glPushMatrix ();
3225 glTranslated (x, y, 0);
3226
3227 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3228 {
3229 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3230
3231 if (svp && SvTRUE (*svp))
3232 {
3233 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3234 glEnable (GL_BLEND);
3235 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3236 glBegin (GL_QUADS);
3237 glVertex2f (0, 0);
3238 glVertex2f (w, 0);
3239 glVertex2f (w, h);
3240 glVertex2f (0, h);
3241 glEnd ();
3242 glDisable (GL_BLEND);
3243 }
3244 }
3245#if 0
3246 // draw borders, for debugging
3247 glPushMatrix ();
3248 glColor4f (1., 1., 0., 1.);
3249 glTranslatef (.5, .5, 0.);
3250 glBegin (GL_LINE_LOOP);
3251 glVertex2f (0 , 0);
3252 glVertex2f (w - 1, 0);
3253 glVertex2f (w - 1, h - 1);
3254 glVertex2f (0 , h - 1);
3255 glEnd ();
3256 glPopMatrix ();
3257#endif
3258 PUSHMARK (SP);
3259 XPUSHs (self);
3260 PUTBACK;
3261 call_method ("_draw", G_VOID | G_DISCARD);
3262 SPAGAIN;
3263
3264 glPopMatrix ();
3265
3266 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3267 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3268}
3269

Diff Legend

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