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.176 by root, Tue Apr 10 09:39:48 2007 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines