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.177 by root, Tue Apr 10 10:13:10 2007 UTC vs.
Revision 1.261 by root, Sun Jul 13 12:17:00 2008 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 roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
17#endif 27#endif
18 28
19#include <assert.h> 29#include <assert.h>
20#include <math.h> 30#include <math.h>
21#include <string.h> 31#include <string.h>
22#include <stdio.h> 32#include <stdio.h>
23#include <stdlib.h> 33#include <stdlib.h>
24 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
25#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
26#include <SDL_endian.h> 39#include <SDL_endian.h>
27#include <SDL_image.h> 40#include <SDL_image.h>
28#include <SDL_mixer.h> 41#include <SDL_mixer.h>
29#include <SDL_opengl.h> 42#include <SDL_opengl.h>
30 43
32#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
33 46
34#include <glib/gmacros.h> 47#include <glib/gmacros.h>
35 48
36#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
37 61
38#ifndef _WIN32 62#ifndef _WIN32
39# include <sys/types.h> 63# include <sys/types.h>
40# include <sys/socket.h> 64# include <sys/socket.h>
41# include <netinet/in.h> 65# include <netinet/in.h>
42# include <netinet/tcp.h> 66# include <netinet/tcp.h>
43# include <inttypes.h> 67# include <inttypes.h>
44#endif 68#endif
45 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47 80
48#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
49 82
50#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
52 85
53#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
54 87
88/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90
55#if 0 91#if 1
56# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 93#else
58# define PARACHUTE 0 94# define PARACHUTE 0
59#endif 95#endif
60 96
97static AV *texture_av;
98
61static struct 99static struct
62{ 100{
63#define GL_FUNC(ptr,name) ptr name; 101#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 102#include "glfunc.h"
65#undef GL_FUNC 103#undef GL_FUNC
66} gl; 104} gl;
67 105
106static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 107gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 108{
70 if (gl.BlendFuncSeparate) 109 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 110 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 111 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 112 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 113 else
75 glBlendFunc (sa, da); 114 glBlendFunc (sa, da);
76} 115}
77 116
117static GLuint
118gen_texture ()
119{
120 GLuint name;
121
122 if (AvFILL (texture_av) >= 0)
123 name = (GLuint)(size_t)av_pop (texture_av);
124 else
125 glGenTextures (1, &name);
126
127 return name;
128}
129
130static void
131del_texture (GLuint name)
132{
133 /* make a half-assed attempt at returning the memory used by the texture */
134 /* textures are frequently being reused by cfplus anyway */
135 /*glBindTexture (GL_TEXTURE_2D, name);*/
136 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
137 av_push (texture_av, (SV *)(size_t)name);
138 glDeleteTextures (1, &name);
139}
140
78#include "texcache.c" 141#include "texcache.c"
142#include "rendercache.c"
79 143
80#include "pango-font.c" 144#include "pango-font.c"
81#include "pango-fontmap.c" 145#include "pango-fontmap.c"
82#include "pango-render.c" 146#include "pango-render.c"
83 147
148typedef IV DC__Channel;
149typedef SDL_RWops *DC__RW;
84typedef Mix_Chunk *CFPlus__MixChunk; 150typedef Mix_Chunk *DC__MixChunk;
85typedef Mix_Music *CFPlus__MixMusic; 151typedef Mix_Music *DC__MixMusic;
86 152
87typedef PangoFontDescription *CFPlus__Font; 153typedef PangoFontDescription *DC__Font;
88 154
89static int 155static int
90shape_attr_p (PangoLayoutRun *run) 156shape_attr_p (PangoLayoutRun *run)
91{ 157{
92 GSList *attrs = run->item->analysis.extra_attrs; 158 GSList *attrs = run->item->analysis.extra_attrs;
106 172
107typedef struct cf_layout { 173typedef struct cf_layout {
108 PangoLayout *pl; 174 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode 175 float r, g, b, a; // default color for rgba mode
110 int base_height; 176 int base_height;
111 CFPlus__Font font; 177 DC__Font font;
178 rc_t *rc;
112} *CFPlus__Layout; 179} *DC__Layout;
113 180
114static CFPlus__Font default_font; 181static DC__Font default_font;
115static PangoContext *opengl_context; 182static PangoContext *opengl_context;
116static PangoFontMap *opengl_fontmap; 183static PangoFontMap *opengl_fontmap;
117 184
118static void 185static void
119substitute_func (FcPattern *pattern, gpointer data) 186substitute_func (FcPattern *pattern, gpointer data)
124#endif 191#endif
125 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 192 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
126} 193}
127 194
128static void 195static void
129layout_update_font (CFPlus__Layout self) 196layout_update_font (DC__Layout self)
130{ 197{
131 /* use a random scale factor to account for unknown descenders, 0.8 works 198 /* use a random scale factor to account for unknown descenders, 0.8 works
132 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
133 */ 200 */
134 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
135 202
136 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
137 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
138 205
139 pango_layout_set_font_description (self->pl, font); 206 pango_layout_set_font_description (self->pl, font);
140} 207}
141 208
142static void 209static void
143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 210layout_get_pixel_size (DC__Layout self, int *w, int *h)
144{ 211{
145 PangoRectangle rect; 212 PangoRectangle rect;
146 213
147 // get_pixel_* wrongly rounds down 214 // get_pixel_* wrongly rounds down
148 pango_layout_get_extents (self->pl, 0, &rect); 215 pango_layout_get_extents (self->pl, 0, &rect);
159 226
160typedef uint16_t tileid; 227typedef uint16_t tileid;
161typedef uint16_t faceid; 228typedef uint16_t faceid;
162 229
163typedef struct { 230typedef struct {
164 int name; 231 GLuint name;
165 int w, h; 232 int w, h;
166 float s, t; 233 float s, t;
167 uint8_t r, g, b, a; 234 uint8_t r, g, b, a;
168 tileid smoothtile; 235 tileid smoothtile;
169 uint8_t smoothlevel; 236 uint8_t smoothlevel;
187 int faces; tileid *face2tile; // [faceid] 254 int faces; tileid *face2tile; // [faceid]
188 int texs; maptex *tex; // [tileid] 255 int texs; maptex *tex; // [tileid]
189 256
190 int32_t rows; 257 int32_t rows;
191 maprow *row; 258 maprow *row;
192} *CFPlus__Map; 259} *DC__Map;
193 260
194static char * 261static char *
195prepend (char *ptr, int sze, int inc) 262prepend (char *ptr, int sze, int inc)
196{ 263{
197 char *p; 264 char *p;
235 self->texs *= 2; 302 self->texs *= 2;
236 } 303 }
237} 304}
238 305
239static maprow * 306static maprow *
240map_get_row (CFPlus__Map self, int y) 307map_get_row (DC__Map self, int y)
241{ 308{
242 if (0 > y) 309 if (0 > y)
243 { 310 {
244 int extend = - y + MAP_EXTEND_Y; 311 int extend = - y + MAP_EXTEND_Y;
245 Prepend (maprow, self->row, self->rows, extend); 312 Prepend (maprow, self->row, self->rows, extend);
283 350
284 return row->col + (x - row->c0); 351 return row->col + (x - row->c0);
285} 352}
286 353
287static mapcell * 354static mapcell *
288map_get_cell (CFPlus__Map self, int x, int y) 355map_get_cell (DC__Map self, int x, int y)
289{ 356{
290 return row_get_cell (map_get_row (self, y), x); 357 return row_get_cell (map_get_row (self, y), x);
291} 358}
292 359
293static void 360static void
294map_clear (CFPlus__Map self) 361map_clear (DC__Map self)
295{ 362{
296 int r; 363 int r;
297 364
298 for (r = 0; r < self->rows; r++) 365 for (r = 0; r < self->rows; r++)
299 Safefree (self->row[r].col); 366 Safefree (self->row[r].col);
307 self->row = 0; 374 self->row = 0;
308 self->rows = 0; 375 self->rows = 0;
309} 376}
310 377
311static void 378static void
312map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 379map_blank (DC__Map self, int x0, int y0, int w, int h)
313{ 380{
314 int x, y; 381 int x, y;
315 maprow *row; 382 maprow *row;
316 mapcell *cell; 383 mapcell *cell;
317 384
345} smooth_key; 412} smooth_key;
346 413
347static void 414static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 415smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 416{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 417 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 418
352 if (SvIOK (*sv)) 419 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 420 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 421 else
355 sv_setiv (*sv, bits); 422 sv_setiv (*sv, bits);
396 n |= n >> 16; 463 n |= n >> 16;
397 464
398 return n + 1; 465 return n + 1;
399} 466}
400 467
468static unsigned int
469popcount (unsigned int n)
470{
471 n -= (n >> 1) & 0x55555555U;
472 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
473 n = ((n >> 4) + n) & 0x0f0f0f0fU;
474 n *= 0x01010101U;
475
476 return n >> 24;
477}
478
401/* SDL should provide this, really. */ 479/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 480#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 481#define SDLK_MODIFIER_MAX 314
404 482
405MODULE = CFPlus PACKAGE = CFPlus 483/******************************************************************************/
484
485static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
486static GV *hover_gv;
487
488static int
489within_widget (SV *widget, NV x, NV y)
490{
491 HV *self;
492 SV **svp;
493 NV wx, ww, wy, wh;
494
495 if (!SvROK (widget))
496 return 0;
497
498 self = (HV *)SvRV (widget);
499
500 if (SvTYPE (self) != SVt_PVHV)
501 return 0;
502
503 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
504 if (y < wy)
505 return 0;
506
507 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
508 if (y >= wy + wh)
509 return 0;
510
511 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
512 if (x < wx)
513 return 0;
514
515 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
516 if (x >= wx + ww)
517 return 0;
518
519 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
520 if (!svp || !SvTRUE (*svp))
521 return 0;
522
523 return 1;
524}
525
526MODULE = Deliantra::Client PACKAGE = DC
406 527
407PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
408 529
409BOOT: 530BOOT:
410{ 531{
411 HV *stash = gv_stashpv ("CFPlus", 1); 532 HV *stash = gv_stashpv ("DC", 1);
412 static const struct { 533 static const struct {
413 const char *name; 534 const char *name;
414 IV iv; 535 IV iv;
415 } *civ, const_iv[] = { 536 } *civ, const_iv[] = {
416# define const_iv(name) { # name, (IV)name } 537# define const_iv(name) { # name, (IV)name }
438 559
439 const_iv (SDL_APPINPUTFOCUS), 560 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS), 561 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE), 562 const_iv (SDL_APPACTIVE),
442 563
564 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST),
443 const_iv (SDLK_KP0), 566 const_iv (SDLK_KP0),
444 const_iv (SDLK_KP1), 567 const_iv (SDLK_KP1),
445 const_iv (SDLK_KP2), 568 const_iv (SDLK_KP2),
446 const_iv (SDLK_KP3), 569 const_iv (SDLK_KP3),
447 const_iv (SDLK_KP4), 570 const_iv (SDLK_KP4),
519 const_iv (KMOD_LMETA), 642 const_iv (KMOD_LMETA),
520 const_iv (KMOD_RMETA), 643 const_iv (KMOD_RMETA),
521 const_iv (KMOD_NUM), 644 const_iv (KMOD_NUM),
522 const_iv (KMOD_CAPS), 645 const_iv (KMOD_CAPS),
523 const_iv (KMOD_MODE), 646 const_iv (KMOD_MODE),
647
648 const_iv (MIX_DEFAULT_FORMAT),
524# undef const_iv 649# undef const_iv
525 }; 650 };
526 651
527 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
546 671
547NV floor (NV x) 672NV floor (NV x)
548 673
549NV ceil (NV x) 674NV ceil (NV x)
550 675
676IV minpot (UV n)
677
678IV popcount (UV n)
679
551void 680void
552pango_init () 681pango_init ()
553 CODE: 682 CODE:
554{ 683{
555 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
556 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 685 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); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
687 /*pango_context_set_font_description (opengl_context, default_font);*/
688#if PANGO_VERSION_CHECK (1, 15, 2)
689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif
558} 692}
693
694char *
695SDL_GetError ()
559 696
560int 697int
561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
562 699
563void 700void
564SDL_Quit () 701SDL_Quit ()
565 702
566void 703void
567SDL_ListModes () 704SDL_ListModes (int rgb, int alpha)
568 PPCODE: 705 PPCODE:
569{ 706{
570 SDL_Rect **m; 707 SDL_Rect **m;
571 708
572 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 709 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 710 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 711 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 712 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576 713
577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 714 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 715 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579 716
580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 717 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 721
585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586#if SDL_VERSION_ATLEAST(1,2,10) 723#if SDL_VERSION_ATLEAST(1,2,10)
587 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 724 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
588 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 725 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589#endif 726#endif
590 727
591 SDL_EnableUNICODE (1);
592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
593
594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
595 729
596 if (m && m != (SDL_Rect **)-1) 730 if (m && m != (SDL_Rect **)-1)
597 while (*m) 731 while (*m)
598 { 732 {
733 if ((*m)->w >= 800 && (*m)->h >= 480)
734 {
599 AV *av = newAV (); 735 AV *av = newAV ();
600 av_push (av, newSViv ((*m)->w)); 736 av_push (av, newSViv ((*m)->w));
601 av_push (av, newSViv ((*m)->h)); 737 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb));
739 av_push (av, newSViv (alpha));
602 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 740 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
741 }
603 742
604 ++m; 743 ++m;
605 } 744 }
606} 745}
607 746
608char *
609SDL_GetError ()
610
611int 747int
612SDL_SetVideoMode (int w, int h, int fullscreen) 748SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613 CODE: 749 CODE:
750{
751 SDL_EnableUNICODE (1);
752 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
753
754 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
755 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
756 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
757 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
758
614 RETVAL = !!SDL_SetVideoMode ( 759 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 760 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 761 );
762
617 if (RETVAL) 763 if (RETVAL)
618 { 764 {
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 765 av_clear (texture_av);
766
767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 768#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h" 769#include "glfunc.h"
622# undef GL_FUNC 770#undef GL_FUNC
623 } 771 }
772}
624 OUTPUT: 773 OUTPUT:
625 RETVAL 774 RETVAL
626 775
627void 776void
628SDL_GL_SwapBuffers () 777SDL_GL_SwapBuffers ()
629 778
630char * 779char *
631SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
632 781
782int
783SDL_GetAppState ()
784
785int
786SDL_GetModState ()
787
633void 788void
634SDL_PollEvent () 789poll_events ()
635 PPCODE: 790 PPCODE:
636{ 791{
637 SDL_Event ev; 792 SDL_Event ev;
638 793
639 while (SDL_PollEvent (&ev)) 794 SDL_PumpEvents ();
795 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 796 {
641 HV *hv = newHV (); 797 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 798 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 799
644 switch (ev.type) 800 switch (ev.type)
645 { 801 {
646 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
647 case SDL_KEYUP: 803 case SDL_KEYUP:
648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
650 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
651 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
653 break; 809 break;
654 810
655 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 813 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 814 break;
659 815
660 case SDL_MOUSEMOTION: 816 case SDL_MOUSEMOTION:
817 {
818 int state = ev.motion.state;
819 int x = ev.motion.x;
820 int y = ev.motion.y;
821 int xrel = ev.motion.xrel;
822 int yrel = ev.motion.yrel;
823
824 /* do simplistic event compression */
825 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
826 && state == ev.motion.state)
827 {
828 xrel += ev.motion.xrel;
829 yrel += ev.motion.yrel;
830 x = ev.motion.x;
831 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 }
834
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
841 }
668 break; 842 break;
669 843
670 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
673 847
674 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
675 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
676 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
677 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
682 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 856 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
683 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 857 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
684 break; 858 break;
685 } 859 }
686 860
687 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
688 } 862 }
689} 863}
690 864
691int 865int
692Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
693 POSTCALL: 867 POSTCALL:
694 Mix_HookMusicFinished (music_finished); 868 Mix_HookMusicFinished (music_finished);
695 Mix_ChannelFinished (channel_finished); 869 Mix_ChannelFinished (channel_finished);
696 870
697void 871void
872Mix_QuerySpec ()
873 PPCODE:
874{
875 int freq, channels;
876 Uint16 format;
877
878 if (Mix_QuerySpec (&freq, &format, &channels))
879 {
880 EXTEND (SP, 3);
881 PUSHs (sv_2mortal (newSViv (freq)));
882 PUSHs (sv_2mortal (newSViv (format)));
883 PUSHs (sv_2mortal (newSViv (channels)));
884 }
885}
886
887void
698Mix_CloseAudio () 888Mix_CloseAudio ()
699 889
700int 890int
701Mix_AllocateChannels (int numchans = -1) 891Mix_AllocateChannels (int numchans = -1)
702 892
893const char *
894Mix_GetError ()
895
703void 896void
704lowdelay (int fd, int val = 1) 897lowdelay (int fd, int val = 1)
705 CODE: 898 CODE:
706#ifndef _WIN32
707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 899 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708#endif
709 900
710void 901void
711win32_proxy_info () 902win32_proxy_info ()
712 PPCODE: 903 PPCODE:
713{ 904{
734 } 925 }
735 } 926 }
736#endif 927#endif
737} 928}
738 929
739void 930int
740add_font (char *file) 931add_font (char *file)
741 CODE: 932 CODE:
742 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
743 936
744void 937void
745load_image_inline (SV *image_) 938load_image_inline (SV *image_)
746 ALIAS: 939 ALIAS:
747 load_image_file = 1 940 load_image_file = 1
750 STRLEN image_len; 943 STRLEN image_len;
751 char *image = (char *)SvPVbyte (image_, image_len); 944 char *image = (char *)SvPVbyte (image_, image_len);
752 SDL_Surface *surface, *surface2; 945 SDL_Surface *surface, *surface2;
753 SDL_PixelFormat fmt; 946 SDL_PixelFormat fmt;
754 SDL_RWops *rw = ix 947 SDL_RWops *rw = ix
755 ? SDL_RWFromFile (image, "r") 948 ? SDL_RWFromFile (image, "rb")
756 : SDL_RWFromConstMem (image, image_len); 949 : SDL_RWFromConstMem (image, image_len);
757 950
758 if (!rw) 951 if (!rw)
759 croak ("load_image: %s", SDL_GetError ()); 952 croak ("load_image: %s", SDL_GetError ());
760 953
833void 1026void
834error (char *message) 1027error (char *message)
835 CODE: 1028 CODE:
836 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
837#ifdef _WIN32 1030#ifdef _WIN32
838 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
839#endif 1032#endif
840 1033
841void 1034void
842fatal (char *message) 1035fatal (char *message)
843 CODE: 1036 CODE:
844 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
845#ifdef _WIN32 1038#ifdef _WIN32
846 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
847#endif 1040#endif
848 _exit (1); 1041 _exit (1);
849 1042
850void 1043void
851_exit (int retval = 0) 1044_exit (int retval = 0)
854 ExitThread (retval); // unclean, please beam me up 1047 ExitThread (retval); // unclean, please beam me up
855#else 1048#else
856 _exit (retval); 1049 _exit (retval);
857#endif 1050#endif
858 1051
859MODULE = CFPlus PACKAGE = CFPlus::Font 1052void
1053debug ()
1054 CODE:
1055{
1056#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK;
1058#endif
1059}
860 1060
861CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
1062
1063PROTOTYPES: DISABLE
1064
1065DC::Font
862new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
863 CODE: 1067 CODE:
864{ 1068{
865 int count; 1069 int count;
866 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
869} 1073}
870 OUTPUT: 1074 OUTPUT:
871 RETVAL 1075 RETVAL
872 1076
873void 1077void
874DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
875 CODE: 1079 CODE:
876 pango_font_description_free (self); 1080 pango_font_description_free (self);
877 1081
878void 1082void
879make_default (CFPlus::Font self) 1083make_default (DC::Font self)
1084 PROTOTYPE: $
880 CODE: 1085 CODE:
881 default_font = self; 1086 default_font = self;
882 1087
883MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
884 1089
1090PROTOTYPES: DISABLE
1091
885void 1092void
886reset_glyph_cache () 1093glyph_cache_backup ()
1094 PROTOTYPE:
887 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
888 tc_clear (); 1102 tc_restore ();
889 1103
890CFPlus::Layout 1104DC::Layout
891new (SV *class) 1105new (SV *class)
892 CODE: 1106 CODE:
893 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
894 1108
895 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
897 RETVAL->g = 1.; 1111 RETVAL->g = 1.;
898 RETVAL->b = 1.; 1112 RETVAL->b = 1.;
899 RETVAL->a = 1.; 1113 RETVAL->a = 1.;
900 RETVAL->base_height = MIN_FONT_HEIGHT; 1114 RETVAL->base_height = MIN_FONT_HEIGHT;
901 RETVAL->font = 0; 1115 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
902 1117
903 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
904 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
905 OUTPUT: 1120 OUTPUT:
906 RETVAL 1121 RETVAL
907 1122
908void 1123void
909DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
910 CODE: 1125 CODE:
911 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1127 rc_free (self->rc);
912 Safefree (self); 1128 Safefree (self);
913 1129
914void 1130void
915set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
916 CODE: 1132 CODE:
917{ 1133{
918 STRLEN textlen; 1134 STRLEN textlen;
919 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
920 1136
921 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
922} 1138}
923 1139
924void 1140void
925set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
926 CODE: 1142 CODE:
927{ 1143{
928 STRLEN textlen; 1144 STRLEN textlen;
929 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
930 1146
931 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
932} 1148}
933 1149
934void 1150void
935set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
936 CODE: 1152 CODE:
937{ 1153{
938 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
939 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
940 const char *pos = text; 1156 const char *pos = text;
975 if (attrs) 1191 if (attrs)
976 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
977} 1193}
978 1194
979void 1195void
980get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
981 PPCODE: 1197 PPCODE:
982{ 1198{
983 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
984 1200
985 do 1201 do
986 { 1202 {
987 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
988 1204
989 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
990 { 1206 {
991 PangoRectangle extents; 1207 PangoRectangle extents;
992 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
1000 1216
1001 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
1002} 1218}
1003 1219
1004int 1220int
1005has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
1006 CODE: 1222 CODE:
1007{ 1223{
1008 int lines = 1; 1224 int lines = 1;
1009 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
1010 1226
1015} 1231}
1016 OUTPUT: 1232 OUTPUT:
1017 RETVAL 1233 RETVAL
1018 1234
1019SV * 1235SV *
1020get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
1021 CODE: 1237 CODE:
1022 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1023 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
1024 OUTPUT: 1240 OUTPUT:
1025 RETVAL 1241 RETVAL
1026 1242
1027void 1243void
1028set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1244set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1029 CODE: 1245 CODE:
1030 self->r = r; 1246 self->r = r;
1031 self->g = g; 1247 self->g = g;
1032 self->b = b; 1248 self->b = b;
1033 self->a = a; 1249 self->a = a;
1034 1250
1035void 1251void
1036set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
1037 CODE: 1253 CODE:
1038 if (self->font != font) 1254 if (self->font != font)
1039 { 1255 {
1040 self->font = font; 1256 self->font = font;
1041 layout_update_font (self); 1257 layout_update_font (self);
1042 } 1258 }
1043 1259
1044void 1260void
1045set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
1046 CODE: 1262 CODE:
1047 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
1048 { 1264 {
1049 self->base_height = base_height; 1265 self->base_height = base_height;
1050 layout_update_font (self); 1266 layout_update_font (self);
1051 } 1267 }
1052 1268
1053void 1269void
1054set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
1055 CODE: 1271 CODE:
1056 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1272 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1057 1273
1058void 1274void
1059set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
1060 CODE: 1276 CODE:
1061 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1062 1278
1063void 1279void
1064set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
1065 CODE: 1281 CODE:
1066 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1067 1283
1068void 1284void
1069set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
1070 CODE: 1286 CODE:
1071 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
1072 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1073 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1074 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1075 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
1076 ); 1292 );
1077 1293
1078void 1294void
1079set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
1080 CODE: 1296 CODE:
1081 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1082 1298
1083void 1299void
1084size (CFPlus::Layout self) 1300size (DC::Layout self)
1085 PPCODE: 1301 PPCODE:
1086{ 1302{
1087 int w, h; 1303 int w, h;
1088 1304
1089 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
1092 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
1093 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1094} 1310}
1095 1311
1096int 1312int
1097descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1098 CODE: 1314 CODE:
1099{ 1315{
1100 PangoRectangle rect; 1316 PangoRectangle rect;
1101 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1102 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1103 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1104} 1320}
1105 OUTPUT: 1321 OUTPUT:
1106 RETVAL 1322 RETVAL
1107 1323
1108int 1324int
1109xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1110 CODE: 1326 CODE:
1111{ 1327{
1112 int index, trailing; 1328 int index, trailing;
1113 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1329 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1114 RETVAL = index + trailing; 1330 RETVAL = index + trailing;
1115} 1331}
1116 OUTPUT: 1332 OUTPUT:
1117 RETVAL 1333 RETVAL
1118 1334
1119void 1335void
1120cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1121 PPCODE: 1337 PPCODE:
1122{ 1338{
1123 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1124 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1125 1341
1126 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1127 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1128 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1129 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1130} 1346}
1131 1347
1132void 1348void
1133index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1134 PPCODE: 1350 PPCODE:
1135{ 1351{
1136 int line, x; 1352 int line, x;
1137 1353
1138 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1354 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1355#if !PANGO_VERSION_CHECK (1, 17, 3)
1139 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1140 1357 --line;
1358#endif
1141 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1142 PUSHs (sv_2mortal (newSViv (line - 1))); 1360 PUSHs (sv_2mortal (newSViv (line)));
1143 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1144} 1362}
1145 1363
1146void 1364void
1147line_x_to_index (CFPlus::Layout self, int line, int x) 1365line_x_to_index (DC::Layout self, int line, int x)
1148 PPCODE: 1366 PPCODE:
1149{ 1367{
1150 PangoLayoutLine *lp; 1368 PangoLayoutLine *lp;
1151 int index, trailing; 1369 int index, trailing;
1152 1370
1153 if (line < 0) 1371 if (line < 0)
1154 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1155 1373
1156 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1157 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1158 1376
1159 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1377 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1160 1378
1161 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
1167 PUSHs (sv_2mortal (newSViv (trailing))); 1385 PUSHs (sv_2mortal (newSViv (trailing)));
1168 } 1386 }
1169} 1387}
1170 1388
1171void 1389void
1172render (CFPlus::Layout self, float x, float y, int flags = 0) 1390render (DC::Layout self, float x, float y, int flags = 0)
1173 PPCODE: 1391 CODE:
1392 rc_clear (self->rc);
1174 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1175 self->pl, 1394 self->pl,
1395 self->rc,
1176 x * PANGO_SCALE, y * PANGO_SCALE, 1396 x * PANGO_SCALE, y * PANGO_SCALE,
1177 self->r, self->g, self->b, self->a, 1397 self->r, self->g, self->b, self->a,
1178 flags 1398 flags
1179 ); 1399 );
1400 // we assume that context_change actually clears/frees stuff
1401 // and does not do any recomputation...
1402 pango_layout_context_changed (self->pl);
1180 1403
1181MODULE = CFPlus PACKAGE = CFPlus::Texture
1182
1183void 1404void
1184pad2pot (SV *data_, SV *w_, SV *h_) 1405draw (DC::Layout self)
1185 CODE: 1406 CODE:
1186{ 1407{
1187 int ow = SvIV (w_); 1408 glEnable (GL_TEXTURE_2D);
1188 int oh = SvIV (h_); 1409 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1410 glEnable (GL_BLEND);
1411 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1412 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1413 glEnable (GL_ALPHA_TEST);
1414 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1189 1415
1190 if (ow && oh) 1416 rc_draw (self->rc);
1417
1418 glDisable (GL_ALPHA_TEST);
1419 glDisable (GL_BLEND);
1420 glDisable (GL_TEXTURE_2D);
1421}
1422
1423MODULE = Deliantra::Client PACKAGE = DC::Texture
1424
1425PROTOTYPES: ENABLE
1426
1427void
1428pad (SV *data_, int ow, int oh, int nw, int nh)
1429 CODE:
1430{
1431 if ((nw != ow || nh != oh) && SvOK (data_))
1191 { 1432 {
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; 1433 STRLEN datalen;
1200 char *data = SvPVbyte (data_, datalen); 1434 char *data = SvPVbyte (data_, datalen);
1201 int bpp = datalen / (ow * oh); 1435 int bpp = datalen / (ow * oh);
1202 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1436 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1203 1437
1204 SvPOK_only (result_); 1438 SvPOK_only (result_);
1205 SvCUR_set (result_, nw * nh * bpp); 1439 SvCUR_set (result_, nw * nh * bpp);
1206 1440
1207 memset (SvPVX (result_), 0, nw * nh * bpp); 1441 memset (SvPVX (result_), 0, nw * nh * bpp);
1208 while (oh--) 1442 while (oh--)
1209 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1443 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1210 1444
1211 sv_setsv (data_, result_); 1445 sv_setsv (data_, result_);
1212 }
1213
1214 sv_setiv (w_, nw);
1215 sv_setiv (h_, nh);
1216 }
1217 } 1446 }
1218} 1447}
1219 1448
1220void 1449void
1221draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1450draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1227{ 1456{
1228 HV *hv = (HV *)SvRV (self); 1457 HV *hv = (HV *)SvRV (self);
1229 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1458 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1230 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1459 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1231 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1460 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1461
1462 if (name <= 0)
1463 XSRETURN_EMPTY;
1232 1464
1233 if (items < 5) 1465 if (items < 5)
1234 { 1466 {
1235 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1467 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1236 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1468 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1264 glDisable (GL_ALPHA_TEST); 1496 glDisable (GL_ALPHA_TEST);
1265 glDisable (GL_BLEND); 1497 glDisable (GL_BLEND);
1266 } 1498 }
1267} 1499}
1268 1500
1269MODULE = CFPlus PACKAGE = CFPlus::Map 1501IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1502 CODE:
1503{
1504 GLint width;
1505 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1506 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1507 RETVAL = width > 0;
1508}
1509 OUTPUT:
1510 RETVAL
1270 1511
1271CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1513
1514PROTOTYPES: DISABLE
1515
1516DC::Map
1272new (SV *class) 1517new (SV *class)
1273 CODE: 1518 CODE:
1274 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1275 RETVAL->x = 0; 1520 RETVAL->x = 0;
1276 RETVAL->y = 0; 1521 RETVAL->y = 0;
1284 RETVAL->row = 0; 1529 RETVAL->row = 0;
1285 OUTPUT: 1530 OUTPUT:
1286 RETVAL 1531 RETVAL
1287 1532
1288void 1533void
1289DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1290 CODE: 1535 CODE:
1291{ 1536{
1292 map_clear (self); 1537 map_clear (self);
1293 Safefree (self->face2tile); 1538 Safefree (self->face2tile);
1294 Safefree (self->tex); 1539 Safefree (self->tex);
1295 Safefree (self); 1540 Safefree (self);
1296} 1541}
1297 1542
1298void 1543void
1299resize (CFPlus::Map self, int map_width, int map_height) 1544resize (DC::Map self, int map_width, int map_height)
1300 CODE: 1545 CODE:
1301 self->w = map_width; 1546 self->w = map_width;
1302 self->h = map_height; 1547 self->h = map_height;
1303 1548
1304void 1549void
1305clear (CFPlus::Map self) 1550clear (DC::Map self)
1306 CODE: 1551 CODE:
1307 map_clear (self); 1552 map_clear (self);
1308 1553
1309void 1554void
1310set_tileid (CFPlus::Map self, int face, int tile) 1555set_tileid (DC::Map self, int face, int tile)
1311 CODE: 1556 CODE:
1312{ 1557{
1313 need_facenum (self, face); self->face2tile [face] = tile; 1558 need_facenum (self, face); self->face2tile [face] = tile;
1314 need_texid (self, tile); 1559 need_texid (self, tile);
1315} 1560}
1316 1561
1317void 1562void
1318set_smooth (CFPlus::Map self, int face, int smooth, int level) 1563set_smooth (DC::Map self, int face, int smooth, int level)
1319 CODE: 1564 CODE:
1320{ 1565{
1321 tileid texid; 1566 tileid texid;
1322 maptex *tex; 1567 maptex *tex;
1323 1568
1336 tex->smoothtile = self->face2tile [smooth]; 1581 tex->smoothtile = self->face2tile [smooth];
1337 tex->smoothlevel = level; 1582 tex->smoothlevel = level;
1338} 1583}
1339 1584
1340void 1585void
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) 1586set_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: 1587 CODE:
1343{ 1588{
1344 need_texid (self, texid); 1589 need_texid (self, texid);
1345 1590
1346 { 1591 {
1366 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1367 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1368} 1613}
1369 1614
1370int 1615int
1371ox (CFPlus::Map self) 1616ox (DC::Map self)
1372 ALIAS: 1617 ALIAS:
1373 oy = 1 1618 oy = 1
1374 x = 2 1619 x = 2
1375 y = 3 1620 y = 3
1376 w = 4 1621 w = 4
1387 } 1632 }
1388 OUTPUT: 1633 OUTPUT:
1389 RETVAL 1634 RETVAL
1390 1635
1391void 1636void
1392scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1393 CODE: 1638 CODE:
1394{ 1639{
1395 if (dx > 0) 1640 if (dx > 0)
1396 map_blank (self, self->x, self->y, dx, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1397 else if (dx < 0) 1642 else if (dx < 0)
1398 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1643 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1399 1644
1400 if (dy > 0) 1645 if (dy > 0)
1401 map_blank (self, self->x, self->y, self->w, dy); 1646 map_blank (self, self->x, self->y, self->w, dy);
1402 else if (dy < 0) 1647 else if (dy < 0)
1403 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1648 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1404 1649
1405 self->ox += dx; self->x += dx; 1650 self->ox += dx; self->x += dx;
1406 self->oy += dy; self->y += dy; 1651 self->oy += dy; self->y += dy;
1407 1652
1408 while (self->y < 0) 1653 while (self->y < 0)
1412 self->rows += MAP_EXTEND_Y; 1657 self->rows += MAP_EXTEND_Y;
1413 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1414 } 1659 }
1415} 1660}
1416 1661
1417void 1662SV *
1418map1a_update (CFPlus::Map self, SV *data_, int extmap) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1419 CODE: 1664 CODE:
1420{ 1665{
1421 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1422 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1423 mapcell *cell; 1668 mapcell *cell;
1424 int x, y, flags; 1669 int x, y, z, flags;
1670 AV *missing = newAV ();
1671 RETVAL = newRV_noinc ((SV *)missing);
1425 1672
1426 while (data < data_end - 1) 1673 while (data < data_end - 1)
1427 { 1674 {
1428 flags = (data [0] << 8) + data [1]; data += 2; 1675 flags = (data [0] << 8) + data [1]; data += 2;
1429 1676
1449 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1450 1697
1451 do 1698 do
1452 { 1699 {
1453 ext = *data++; 1700 ext = *data++;
1454 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1455 1702
1456 if (cmd < 4) 1703 if (cmd < 4)
1457 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1458 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1459 { 1706 {
1462 } 1709 }
1463 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1466 { 1713 {
1467 if (*data == 8) 1714 if (*data == 1) cell->player = data [1];
1468 ; // decode player uuid 1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1469 1718
1470 data += *data + 1; 1719 data += *data + 1;
1471 } 1720 }
1472 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1473 cell->flags = *data++; 1722 cell->flags = *data++;
1480 } 1729 }
1481 else 1730 else
1482 cell->darkness = *data++ + 1; 1731 cell->darkness = *data++ + 1;
1483 } 1732 }
1484 1733
1734 for (z = 0; z <= 2; ++z)
1485 if (flags & 4) 1735 if (flags & (4 >> z))
1486 { 1736 {
1487 faceid face = (data [0] << 8) + data [1]; data += 2; 1737 faceid face = (data [0] << 8) + data [1]; data += 2;
1488 need_facenum (self, face); 1738 need_facenum (self, face);
1489 cell->tile [0] = self->face2tile [face]; 1739 cell->tile [z] = self->face2tile [face];
1740
1741 if (cell->tile [z])
1742 {
1743 maptex *tex = self->tex + cell->tile [z];
1744 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z]));
1746
1747 if (tex->smoothtile)
1748 {
1749 maptex *smooth = self->tex + tex->smoothtile;
1750 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile));
1752 }
1753 }
1490 } 1754 }
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 } 1755 }
1506 else 1756 else
1507 cell->darkness = 0; 1757 cell->darkness = 0;
1508 } 1758 }
1509} 1759}
1760 OUTPUT:
1761 RETVAL
1510 1762
1511SV * 1763SV *
1512mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1513 CODE: 1765 CODE:
1514{ 1766{
1515 int x1, x; 1767 int x1, x;
1516 int y1, y; 1768 int y1, y;
1517 int z; 1769 int z;
1562} 1814}
1563 OUTPUT: 1815 OUTPUT:
1564 RETVAL 1816 RETVAL
1565 1817
1566void 1818void
1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1568 CODE: 1820 CODE:
1569{ 1821{
1822 int x, y, z;
1823
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1571 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572 uint8_t smooth_max[256][256]; 1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1573 smooth_key skey; 1827 smooth_key skey;
1574 int x, y, z; 1828 int pl_x, pl_y;
1575 int last_name; 1829 maptex pl_tex;
1830
1831 pl_tex.name = 0;
1832
1833 rc_t *rc = rc_alloc ();
1834 rc_key_t key;
1835 rc_array_t *arr;
1576 1836
1577 // thats current max. sorry. 1837 // thats current max. sorry.
1578 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1579 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1580 1840
1581 // clear key, in case of extra padding 1841 // clear key, in case of extra padding
1582 memset (&skey, 0, sizeof (skey)); 1842 memset (&skey, 0, sizeof (skey));
1583 1843
1584 glColor4ub (255, 255, 255, 255); 1844 memset (&key, 0, sizeof (key));
1585 1845 key.r = 255;
1586 glEnable (GL_BLEND); 1846 key.g = 255;
1587 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1847 key.b = 255;
1588 glEnable (GL_TEXTURE_2D); 1848 key.a = 255;
1589 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1849 key.mode = GL_QUADS;
1590 1850 key.format = GL_T2F_V3F;
1591 glBegin (GL_QUADS); 1851 key.texname = -1;
1592
1593 last_name = 0;
1594 1852
1595 mx += self->x; 1853 mx += self->x;
1596 my += self->y; 1854 my += self->y;
1597 1855
1598 // first pass: determine smooth_max 1856 // first pass: determine smooth_max
1614 MAX (self->tex [cell->tile [0]].smoothlevel, 1872 MAX (self->tex [cell->tile [0]].smoothlevel,
1615 MAX (self->tex [cell->tile [1]].smoothlevel, 1873 MAX (self->tex [cell->tile [1]].smoothlevel,
1616 self->tex [cell->tile [2]].smoothlevel)); 1874 self->tex [cell->tile [2]].smoothlevel));
1617 } 1875 }
1618 } 1876 }
1877
1878 glEnable (GL_BLEND);
1879 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1880 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1619 1881
1620 for (z = 0; z <= 2; z++) 1882 for (z = 0; z <= 2; z++)
1621 { 1883 {
1622 memset (smooth_level, 0, sizeof (smooth_level)); 1884 memset (smooth_level, 0, sizeof (smooth_level));
1623 1885
1636 { 1898 {
1637 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1638 int px = (x + 1) * T - tex.w; 1900 int px = (x + 1) * T - tex.w;
1639 int py = (y + 1) * T - tex.h; 1901 int py = (y + 1) * T - tex.h;
1640 1902
1641 // suppressing texture state switches here
1642 // is only moderately effective, but worth the extra effort
1643 if (last_name != tex.name) 1903 if (key.texname != tex.name)
1644 { 1904 {
1645 if (!tex.name) 1905 if (!tex.name)
1646 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1647 1907
1648 glEnd (); 1908 key.texname = tex.name;
1649 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1909 arr = rc_array (rc, &key);
1650 glBegin (GL_QUADS);
1651 } 1910 }
1652 1911
1653 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1654 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1655 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1656 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1657
1658 if (cell->flags && z == 2)
1659 { 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1919
1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1924
1925 if (expect_false (cell->flags) && expect_false (z == 2))
1926 {
1927 // overlays such as the speech bubble, probably more to come
1660 if (cell->flags & 1) 1928 if (cell->flags & 1)
1661 { 1929 {
1662 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
1663 int px = x * T + T * 2 / 32; 1931 int px = x * T + T * 2 / 32;
1664 int py = y * T - T * 6 / 32; 1932 int py = y * T - T * 6 / 32;
1665 1933
1934 if (tex.name)
1666 glEnd (); 1935 {
1667 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1936 if (key.texname != tex.name)
1937 {
1938 key.texname = tex.name;
1939 arr = rc_array (rc, &key);
1940 }
1941
1942 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1668 glBegin (GL_QUADS); 1946 }
1669
1670 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1671 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1672 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1673 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1674 } 1947 }
1675 } 1948 }
1676 1949
1677 // update smooth hash 1950 // update smooth hash
1678 if (tex.smoothtile) 1951 if (tex.smoothtile)
1683 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1956 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1684 1957
1685 // add bits to current tile and all neighbours. skey.x|y is 1958 // add bits to current tile and all neighbours. skey.x|y is
1686 // shifted +1|+1 so we always stay positive. 1959 // shifted +1|+1 so we always stay positive.
1687 1960
1961 // bits is ___n cccc CCCC bbbb
1962 // n do not draw borders&corners
1963 // c draw these corners, but...
1964 // C ... not these
1965 // b draw these borders
1966
1967 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1968 // ┃· ·· ·┃ ━━
1969
1970 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1971 // ·· ·· ·┏ ┓·
1972
1688 // full tile 1973 // full tile
1689 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 1974 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1690 1975
1691 // borders 1976 // borders
1692 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 1977 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1693 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092); 1978 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1694 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 1979 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1695 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 1980 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1696 1981
1697 // corners 1982 // corners
1698 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 1983 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1702 } 1987 }
1703 } 1988 }
1704 } 1989 }
1705 } 1990 }
1706 1991
1992 rc_draw (rc);
1993 rc_clear (rc);
1994
1707 // go through all smoothlevels, lowest to highest, then draw 1995 // go through all smoothlevels, lowest to highest, then draw.
1708 // this is basically counting sort 1996 // this is basically counting sort
1709 { 1997 {
1710 int w, b; 1998 int w, b;
1711 1999
2000 glEnable (GL_TEXTURE_2D);
2001 glBegin (GL_QUADS);
1712 for (w = 0; w < 256 / 32; ++w) 2002 for (w = 0; w < 256 / 32; ++w)
1713 { 2003 {
1714 uint32_t smask = smooth_level [w]; 2004 uint32_t smask = smooth_level [w];
1715 if (smask) 2005 if (smask)
1716 for (b = 0; b < 32; ++b) 2006 for (b = 0; b < 32; ++b)
1723 while ((he = hv_iternext (smooth))) 2013 while ((he = hv_iternext (smooth)))
1724 { 2014 {
1725 smooth_key *skey = (smooth_key *)HeKEY (he); 2015 smooth_key *skey = (smooth_key *)HeKEY (he);
1726 IV bits = SvIVX (HeVAL (he)); 2016 IV bits = SvIVX (HeVAL (he));
1727 2017
1728 // bits is ___n cccc CCCC bbbb
1729 // n do not draw borders&corners
1730 // c draw these corners, but...
1731 // C ... not these
1732 // b draw these borders
1733
1734 if (!(bits & 0x1000) 2018 if (!(bits & 0x1000)
1735 && skey->level == level 2019 && skey->level == level
1736 && level >= smooth_max [skey->x][skey->y]) 2020 && level > smooth_max [skey->x][skey->y])
1737 { 2021 {
1738 maptex tex = self->tex [skey->tile]; 2022 maptex tex = self->tex [skey->tile];
1739 int px = (((int)skey->x) - 1) * T; 2023 int px = (((int)skey->x) - 1) * T;
1740 int py = (((int)skey->y) - 1) * T; 2024 int py = (((int)skey->y) - 1) * T;
1741 int border = bits & 15; 2025 int border = bits & 15;
1742 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2026 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1743 float dx = tex.s * .0625f; // 16 images/row 2027 float dx = tex.s * .0625f; // 16 images/row
1744 float dy = tex.t * .5f ; // 2 images/column 2028 float dy = tex.t * .5f ; // 2 images/column
1745 2029
1746 // this time naively avoiding texture state changes
1747 // save gobs of state changes.
1748 if (last_name != tex.name) 2030 if (tex.name)
1749 { 2031 {
2032 // this time avoiding texture state changes
2033 // save gobs of state changes.
1750 if (!tex.name) 2034 if (key.texname != tex.name)
1751 continue; // smoothing not yet available 2035 {
1752
1753 glEnd (); 2036 glEnd ();
1754 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1755 glBegin (GL_QUADS); 2038 glBegin (GL_QUADS);
1756 } 2039 }
1757 2040
1758 if (border) 2041 if (border)
1759 { 2042 {
1760 float ox = border * dx; 2043 float ox = border * dx;
1761 2044
1762 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2045 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1763 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2046 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1764 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2047 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1765 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2048 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1766 } 2049 }
1767 2050
1768 if (corner) 2051 if (corner)
1769 { 2052 {
1770 float ox = corner * dx; 2053 float ox = corner * dx;
1771 2054
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2055 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1773 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1774 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2057 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1775 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2059 }
1776 } 2060 }
1777 } 2061 }
1778 } 2062 }
1779 } 2063 }
1780 } 2064 }
2065
2066 glEnd ();
2067 glDisable (GL_TEXTURE_2D);
2068 key.texname = -1;
1781 } 2069 }
1782 2070
1783 hv_clear (smooth); 2071 hv_clear (smooth);
1784 } 2072 }
1785 2073
1786 glEnd (); 2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
1787 2079
1788 glDisable (GL_TEXTURE_2D); 2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
2088 rc_draw (rc);
2089 }
2090
1789 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2092 rc_free (rc);
1790 2093
1791 // top layer: overlays such as the health bar 2094 // top layer: overlays such as the health bar
1792 for (y = 0; y < sh; y++) 2095 for (y = 0; y < sh; y++)
1793 if (0 <= y + my && y + my < self->rows) 2096 if (0 <= y + my && y + my < self->rows)
1794 { 2097 {
1819 } 2122 }
1820 } 2123 }
1821} 2124}
1822 2125
1823void 2126void
1824draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1825 CODE: 2128 CODE:
1826{ 2129{
1827 static float color[16][3] = { 2130 static float color[16][3] = {
1828 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
1829 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
1879 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
1880 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
1881} 2184}
1882 2185
1883void 2186void
1884fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2187fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1885 PPCODE: 2188 PPCODE:
1886{ 2189{
1887 int x, y; 2190 int x, y;
2191 int sw1 = sw + 2;
2192 int sh1 = sh + 2;
2193 int sh3 = sh * 3;
1888 int sw4 = (sw + 3) & ~3; 2194 int sw34 = (sw * 3 + 3) & ~3;
2195 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1889 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2196 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1890 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2197 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1891 2198
1892 memset (darkness, 255, sw4 * sh);
1893 SvPOK_only (darkness_sv); 2199 SvPOK_only (darkness3_sv);
1894 SvCUR_set (darkness_sv, sw4 * sh); 2200 SvCUR_set (darkness3_sv, sw34 * sh3);
1895 2201
1896 mx += self->x; 2202 mx += self->x - 1;
1897 my += self->y; 2203 my += self->y - 1;
1898 2204
2205 memset (darkness1, 255, sw1 * sh1);
2206
1899 for (y = 0; y < sh; y++) 2207 for (y = 0; y < sh1; y++)
1900 if (0 <= y + my && y + my < self->rows) 2208 if (0 <= y + my && y + my < self->rows)
1901 { 2209 {
1902 maprow *row = self->row + (y + my); 2210 maprow *row = self->row + (y + my);
1903 2211
1904 for (x = 0; x < sw; x++) 2212 for (x = 0; x < sw1; x++)
1905 if (row->c0 <= x + mx && x + mx < row->c1) 2213 if (row->c0 <= x + mx && x + mx < row->c1)
1906 { 2214 {
1907 mapcell *cell = row->col + (x + mx - row->c0); 2215 mapcell *cell = row->col + (x + mx - row->c0);
1908 2216
1909 darkness[y * sw4 + x] = cell->darkness 2217 darkness1 [y * sw1 + x] = cell->darkness
1910 ? 255 - (cell->darkness - 1) 2218 ? 255 - (cell->darkness - 1)
1911 : 255 - FOW_DARKNESS; 2219 : 255 - FOW_DARKNESS;
1912 } 2220 }
1913 } 2221 }
1914 2222
2223 for (y = 0; y < sh; ++y)
2224 for (x = 0; x < sw; ++x)
2225 {
2226 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2227 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2228 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2229 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2230 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2231 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2232 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2233 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2234 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2235
2236 uint8_t r11 = (d11 + d21 + d12) / 3;
2237 uint8_t r21 = d21;
2238 uint8_t r31 = (d21 + d31 + d32) / 3;
2239
2240 uint8_t r12 = d12;
2241 uint8_t r22 = d22;
2242 uint8_t r32 = d32;
2243
2244 uint8_t r13 = (d13 + d23 + d12) / 3;
2245 uint8_t r23 = d23;
2246 uint8_t r33 = (d23 + d33 + d32) / 3;
2247
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2250 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2253 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2256 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2257 }
2258
2259 free (darkness1);
2260
1915 EXTEND (SP, 3); 2261 EXTEND (SP, 3);
1916 PUSHs (sv_2mortal (newSViv (sw4))); 2262 PUSHs (sv_2mortal (newSViv (sw34)));
1917 PUSHs (sv_2mortal (newSViv (sh))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
1918 PUSHs (darkness_sv); 2264 PUSHs (darkness3_sv);
1919} 2265}
1920 2266
1921SV * 2267SV *
1922get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2268get_rect (DC::Map self, int x0, int y0, int w, int h)
1923 CODE: 2269 CODE:
1924{ 2270{
1925 int x, y, x1, y1; 2271 int x, y, x1, y1;
1926 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
1927 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1984 else 2330 else
1985 *data++ = 0; 2331 *data++ = 0;
1986 } 2332 }
1987 } 2333 }
1988 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
1989 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
1990 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
1991 RETVAL = data_sv; 2342 RETVAL = data_sv;
1992} 2343}
1993 OUTPUT: 2344 OUTPUT:
1994 RETVAL 2345 RETVAL
1995 2346
1996void 2347void
1997set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1998 PPCODE: 2349 PPCODE:
1999{ 2350{
2000 int x, y, z; 2351 int x, y, z;
2001 int w, h; 2352 int w, h;
2002 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2003 2364
2004 if (*data++ != 0) 2365 if (*data++ != 0)
2005 return; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2006 2367
2007 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
2008 h = *data++ << 8; h |= *data++; 2369 h = *data++ << 8; h |= *data++;
2009 2370
2010 // we need to do this 'cause we don't keep an absolute coord system for rows 2371 // we need to do this 'cause we don't keep an absolute coord system for rows
2022 { 2383 {
2023 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2024 2385
2025 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2026 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2027 uint8_t flags = *data++; 2393 flags = *data++;
2028 2394
2029 if (flags) 2395 if (flags)
2030 { 2396 {
2031 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2032 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
2035 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2036 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2037 2403
2038 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2039 { 2405 {
2040 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2041 2408
2042 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2043 { 2410 {
2044 tileid t = tile [z]; 2411 tileid t = tile [z];
2045 2412
2046 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2047 { 2414 {
2048 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2049 need_texid (self, t); 2416 need_texid (self, t);
2050 } 2417 }
2051 2418
2052 cell->tile [z] = t; 2419 cell->tile [z] = t;
2053 } 2420 }
2055 } 2422 }
2056 } 2423 }
2057 } 2424 }
2058} 2425}
2059 2426
2060MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2427MODULE = Deliantra::Client PACKAGE = DC::RW
2061 2428
2062CFPlus::MixChunk 2429DC::RW
2063new_from_file (SV *class, char *path) 2430new (SV *class, SV *data_sv)
2064 CODE: 2431 CODE:
2065 RETVAL = Mix_LoadWAV (path); 2432{
2433 STRLEN datalen;
2434 char *data = SvPVbyte (data_sv, datalen);
2435
2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2437}
2066 OUTPUT: 2438 OUTPUT:
2067 RETVAL 2439 RETVAL
2068 2440
2441DC::RW
2442new_from_file (SV *class, const char *path, const char *mode = "rb")
2443 CODE:
2444 RETVAL = SDL_RWFromFile (path, mode);
2445 OUTPUT:
2446 RETVAL
2447
2448# fails on win32:
2449# dc.xs(2268) : error C2059: syntax error : '('
2069void 2450#void
2451#close (DC::RW self)
2452# CODE:
2453# (self->(close)) (self);
2454
2455MODULE = Deliantra::Client PACKAGE = DC::Channel
2456
2457PROTOTYPES: DISABLE
2458
2459DC::Channel
2460find ()
2461 CODE:
2462{
2463 RETVAL = Mix_GroupAvailable (-1);
2464
2465 if (RETVAL < 0)
2466 {
2467 RETVAL = Mix_GroupOldest (-1);
2468
2469 if (RETVAL < 0)
2470 XSRETURN_UNDEF;
2471
2472 Mix_HaltChannel (RETVAL);
2473 }
2474
2475 Mix_UnregisterAllEffects (RETVAL);
2476 Mix_Volume (RETVAL, 128);
2477}
2478 OUTPUT:
2479 RETVAL
2480
2481void
2482halt (DC::Channel self)
2483 CODE:
2484 Mix_HaltChannel (self);
2485
2486void
2487expire (DC::Channel self, int ticks = -1)
2488 CODE:
2489 Mix_ExpireChannel (self, ticks);
2490
2491void
2492fade_out (DC::Channel self, int ticks = -1)
2493 CODE:
2494 Mix_FadeOutChannel (self, ticks);
2495
2496int
2497volume (DC::Channel self, int volume)
2498 CODE:
2499 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2500 OUTPUT:
2501 RETVAL
2502
2503void
2504unregister_all_effects (DC::Channel self)
2505 CODE:
2506 Mix_UnregisterAllEffects (self);
2507
2508void
2509set_panning (DC::Channel self, int left, int right)
2510 CODE:
2511 left = CLAMP (left , 0, 255);
2512 right = CLAMP (right, 0, 255);
2513 Mix_SetPanning (self, left, right);
2514
2515void
2516set_distance (DC::Channel self, int distance)
2517 CODE:
2518 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2519
2520void
2521set_position (DC::Channel self, int angle, int distance)
2522 CODE:
2523
2524void
2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2526 CODE:
2527{
2528 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2531}
2532
2533void
2534set_reverse_stereo (DC::Channel self, int flip)
2535 CODE:
2536 Mix_SetReverseStereo (self, flip);
2537
2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2539
2540PROTOTYPES: DISABLE
2541
2542DC::MixChunk
2543new (SV *class, DC::RW rwops)
2544 CODE:
2545 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2546 OUTPUT:
2547 RETVAL
2548
2549void
2070DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
2071 CODE: 2551 CODE:
2072 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
2073 2553
2074int 2554int
2075volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
2076 CODE: 2556 CODE:
2557 if (items > 1)
2558 volume = CLAMP (volume, 0, 128);
2077 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
2078 OUTPUT: 2560 OUTPUT:
2079 RETVAL 2561 RETVAL
2080 2562
2081int 2563DC::Channel
2082play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2564play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2083 CODE: 2565 CODE:
2566{
2084 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2567 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2568
2569 if (RETVAL < 0)
2570 XSRETURN_UNDEF;
2571
2572 if (channel < 0)
2573 {
2574 Mix_UnregisterAllEffects (RETVAL);
2575 Mix_Volume (RETVAL, 128);
2576 }
2577}
2085 OUTPUT: 2578 OUTPUT:
2086 RETVAL 2579 RETVAL
2087 2580
2088MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2089 2582
2090int 2583int
2091volume (int volume = -1) 2584volume (int volume = -1)
2585 PROTOTYPE: ;$
2092 CODE: 2586 CODE:
2587 if (items > 0)
2588 volume = CLAMP (volume, 0, 128);
2093 RETVAL = Mix_VolumeMusic (volume); 2589 RETVAL = Mix_VolumeMusic (volume);
2094 OUTPUT: 2590 OUTPUT:
2095 RETVAL 2591 RETVAL
2096 2592
2593void
2594fade_out (int ms)
2595 CODE:
2596 Mix_FadeOutMusic (ms);
2597
2598void
2599halt ()
2600 CODE:
2601 Mix_HaltMusic ();
2602
2097CFPlus::MixMusic 2603DC::MixMusic
2098new_from_file (SV *class, char *path) 2604new (SV *class, DC::RW rwops)
2099 CODE: 2605 CODE:
2100 RETVAL = Mix_LoadMUS (path); 2606 RETVAL = Mix_LoadMUS_RW (rwops);
2101 OUTPUT: 2607 OUTPUT:
2102 RETVAL 2608 RETVAL
2103 2609
2104void 2610void
2105DESTROY (CFPlus::MixMusic self) 2611DESTROY (DC::MixMusic self)
2106 CODE: 2612 CODE:
2107 Mix_FreeMusic (self); 2613 Mix_FreeMusic (self);
2108 2614
2109int 2615int
2110play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
2111 CODE: 2617 CODE:
2112 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
2113 OUTPUT: 2619 OUTPUT:
2114 RETVAL 2620 RETVAL
2115 2621
2116MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2622void
2623fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2624 CODE:
2625 Mix_FadeInMusicPos (self, loops, ms, position);
2626
2627MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2628
2629PROTOTYPES: ENABLE
2117 2630
2118BOOT: 2631BOOT:
2119{ 2632{
2120 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2121 static const struct { 2634 static const struct {
2122 const char *name; 2635 const char *name;
2123 IV iv; 2636 IV iv;
2124 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
2125# define const_iv(name) { # name, (IV)name } 2638# define const_iv(name) { # name, (IV)name }
2639 const_iv (GL_VENDOR),
2640 const_iv (GL_VERSION),
2641 const_iv (GL_EXTENSIONS),
2126 const_iv (GL_COLOR_MATERIAL), 2642 const_iv (GL_COLOR_MATERIAL),
2127 const_iv (GL_SMOOTH), 2643 const_iv (GL_SMOOTH),
2128 const_iv (GL_FLAT), 2644 const_iv (GL_FLAT),
2129 const_iv (GL_DITHER), 2645 const_iv (GL_DITHER),
2130 const_iv (GL_BLEND), 2646 const_iv (GL_BLEND),
2134 const_iv (GL_ALPHA_TEST), 2650 const_iv (GL_ALPHA_TEST),
2135 const_iv (GL_NORMALIZE), 2651 const_iv (GL_NORMALIZE),
2136 const_iv (GL_RESCALE_NORMAL), 2652 const_iv (GL_RESCALE_NORMAL),
2137 const_iv (GL_FRONT), 2653 const_iv (GL_FRONT),
2138 const_iv (GL_BACK), 2654 const_iv (GL_BACK),
2655 const_iv (GL_AUX0),
2139 const_iv (GL_AND), 2656 const_iv (GL_AND),
2140 const_iv (GL_ONE), 2657 const_iv (GL_ONE),
2141 const_iv (GL_ZERO), 2658 const_iv (GL_ZERO),
2142 const_iv (GL_SRC_ALPHA), 2659 const_iv (GL_SRC_ALPHA),
2143 const_iv (GL_DST_ALPHA), 2660 const_iv (GL_DST_ALPHA),
2156 const_iv (GL_INTENSITY), 2673 const_iv (GL_INTENSITY),
2157 const_iv (GL_LUMINANCE), 2674 const_iv (GL_LUMINANCE),
2158 const_iv (GL_LUMINANCE_ALPHA), 2675 const_iv (GL_LUMINANCE_ALPHA),
2159 const_iv (GL_FLOAT), 2676 const_iv (GL_FLOAT),
2160 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2677 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2678 const_iv (GL_COMPRESSED_ALPHA_ARB),
2679 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2680 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2681 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2682 const_iv (GL_COMPRESSED_RGB_ARB),
2683 const_iv (GL_COMPRESSED_RGBA_ARB),
2161 const_iv (GL_COMPILE), 2684 const_iv (GL_COMPILE),
2685 const_iv (GL_PROXY_TEXTURE_1D),
2686 const_iv (GL_PROXY_TEXTURE_2D),
2162 const_iv (GL_TEXTURE_1D), 2687 const_iv (GL_TEXTURE_1D),
2163 const_iv (GL_TEXTURE_2D), 2688 const_iv (GL_TEXTURE_2D),
2164 const_iv (GL_TEXTURE_ENV), 2689 const_iv (GL_TEXTURE_ENV),
2165 const_iv (GL_TEXTURE_MAG_FILTER), 2690 const_iv (GL_TEXTURE_MAG_FILTER),
2166 const_iv (GL_TEXTURE_MIN_FILTER), 2691 const_iv (GL_TEXTURE_MIN_FILTER),
2187 const_iv (GL_COLOR_LOGIC_OP), 2712 const_iv (GL_COLOR_LOGIC_OP),
2188 const_iv (GL_SEPARABLE_2D), 2713 const_iv (GL_SEPARABLE_2D),
2189 const_iv (GL_CONVOLUTION_2D), 2714 const_iv (GL_CONVOLUTION_2D),
2190 const_iv (GL_CONVOLUTION_BORDER_MODE), 2715 const_iv (GL_CONVOLUTION_BORDER_MODE),
2191 const_iv (GL_CONSTANT_BORDER), 2716 const_iv (GL_CONSTANT_BORDER),
2717 const_iv (GL_POINTS),
2192 const_iv (GL_LINES), 2718 const_iv (GL_LINES),
2193 const_iv (GL_LINE_STRIP), 2719 const_iv (GL_LINE_STRIP),
2194 const_iv (GL_LINE_LOOP), 2720 const_iv (GL_LINE_LOOP),
2195 const_iv (GL_QUADS), 2721 const_iv (GL_QUADS),
2196 const_iv (GL_QUAD_STRIP), 2722 const_iv (GL_QUAD_STRIP),
2197 const_iv (GL_TRIANGLES), 2723 const_iv (GL_TRIANGLES),
2198 const_iv (GL_TRIANGLE_STRIP), 2724 const_iv (GL_TRIANGLE_STRIP),
2199 const_iv (GL_TRIANGLE_FAN), 2725 const_iv (GL_TRIANGLE_FAN),
2726 const_iv (GL_POLYGON),
2200 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2727 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2728 const_iv (GL_POINT_SMOOTH_HINT),
2729 const_iv (GL_LINE_SMOOTH_HINT),
2730 const_iv (GL_POLYGON_SMOOTH_HINT),
2731 const_iv (GL_GENERATE_MIPMAP_HINT),
2732 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2201 const_iv (GL_FASTEST), 2733 const_iv (GL_FASTEST),
2734 const_iv (GL_DONT_CARE),
2735 const_iv (GL_NICEST),
2202 const_iv (GL_V2F), 2736 const_iv (GL_V2F),
2203 const_iv (GL_V3F), 2737 const_iv (GL_V3F),
2204 const_iv (GL_T2F_V3F), 2738 const_iv (GL_T2F_V3F),
2205 const_iv (GL_T2F_N3F_V3F), 2739 const_iv (GL_T2F_N3F_V3F),
2206# undef const_iv 2740# undef const_iv
2207 }; 2741 };
2208 2742
2209 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2743 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2210 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2744 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2745
2746 texture_av = newAV ();
2747 AvREAL_off (texture_av);
2211} 2748}
2749
2750void
2751disable_GL_EXT_blend_func_separate ()
2752 CODE:
2753 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0;
2212 2755
2213char * 2756char *
2214gl_vendor () 2757gl_vendor ()
2215 CODE: 2758 CODE:
2216 RETVAL = (char *)glGetString (GL_VENDOR); 2759 RETVAL = (char *)glGetString (GL_VENDOR);
2229 CODE: 2772 CODE:
2230 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2773 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2231 OUTPUT: 2774 OUTPUT:
2232 RETVAL 2775 RETVAL
2233 2776
2777const char *glGetString (GLenum pname)
2778
2779GLint glGetInteger (GLenum pname)
2780 CODE:
2781 glGetIntegerv (pname, &RETVAL);
2782 OUTPUT:
2783 RETVAL
2784
2785GLdouble glGetDouble (GLenum pname)
2786 CODE:
2787 glGetDoublev (pname, &RETVAL);
2788 OUTPUT:
2789 RETVAL
2790
2234int glGetError () 2791int glGetError ()
2235 2792
2236void glFinish () 2793void glFinish ()
2237 2794
2238void glClear (int mask) 2795void glClear (int mask)
2275# near_ and far_ are due to microsofts buggy "c" compiler 2832# near_ and far_ are due to microsofts buggy "c" compiler
2276void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2833void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2277 2834
2278# near_ and far_ are due to microsofts buggy "c" compiler 2835# near_ and far_ are due to microsofts buggy "c" compiler
2279void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2836void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2837
2838PROTOTYPES: DISABLE
2280 2839
2281void glViewport (int x, int y, int width, int height) 2840void glViewport (int x, int y, int width, int height)
2282 2841
2283void glScissor (int x, int y, int width, int height) 2842void glScissor (int x, int y, int width, int height)
2284 2843
2292 2851
2293void glRotate (float angle, float x, float y, float z) 2852void glRotate (float angle, float x, float y, float z)
2294 CODE: 2853 CODE:
2295 glRotatef (angle, x, y, z); 2854 glRotatef (angle, x, y, z);
2296 2855
2297void glBegin (int mode)
2298
2299void glEnd ()
2300
2301void glColor (float r, float g, float b, float a = 1.0) 2856void glColor (float r, float g, float b, float a = 1.0)
2302 PROTOTYPE: @
2303 ALIAS: 2857 ALIAS:
2304 glColor_premultiply = 1 2858 glColor_premultiply = 1
2305 CODE: 2859 CODE:
2306 if (ix) 2860 if (ix)
2307 { 2861 {
2310 b *= a; 2864 b *= a;
2311 } 2865 }
2312 // microsoft visual "c" rounds instead of truncating... 2866 // microsoft visual "c" rounds instead of truncating...
2313 glColor4f (r, g, b, a); 2867 glColor4f (r, g, b, a);
2314 2868
2315void glInterleavedArrays (int format, int stride, char *data)
2316
2317void glDrawElements (int mode, int count, int type, char *indices)
2318
2319# 1.2 void glDrawRangeElements (int mode, int start, int end
2320
2321void glRasterPos (float x, float y, float z = 0.) 2869void glRasterPos (float x, float y, float z = 0.)
2322 CODE: 2870 CODE:
2323 glRasterPos3f (0, 0, z); 2871 glRasterPos3f (0, 0, z);
2324 glBitmap (0, 0, 0, 0, x, y, 0); 2872 glBitmap (0, 0, 0, 0, x, y, 0);
2325 2873
2329 2877
2330void glTexCoord (float s, float t) 2878void glTexCoord (float s, float t)
2331 CODE: 2879 CODE:
2332 glTexCoord2f (s, t); 2880 glTexCoord2f (s, t);
2333 2881
2882void glRect (float x1, float y1, float x2, float y2)
2883 CODE:
2884 glRectf (x1, y1, x2, y2);
2885
2886void glRect_lineloop (float x1, float y1, float x2, float y2)
2887 CODE:
2888 glBegin (GL_LINE_LOOP);
2889 glVertex2f (x1, y1);
2890 glVertex2f (x2, y1);
2891 glVertex2f (x2, y2);
2892 glVertex2f (x1, y2);
2893 glEnd ();
2894
2895PROTOTYPES: ENABLE
2896
2897void glBegin (int mode)
2898
2899void glEnd ()
2900
2901void glPointSize (GLfloat size)
2902
2903void glLineWidth (GLfloat width)
2904
2905void glInterleavedArrays (int format, int stride, char *data)
2906
2907void glDrawElements (int mode, int count, int type, char *indices)
2908
2909# 1.2 void glDrawRangeElements (int mode, int start, int end
2910
2334void glTexEnv (int target, int pname, float param) 2911void glTexEnv (int target, int pname, float param)
2335 CODE: 2912 CODE:
2336 glTexEnvf (target, pname, param); 2913 glTexEnvf (target, pname, param);
2337 2914
2338void glTexParameter (int target, int pname, float param) 2915void glTexParameter (int target, int pname, float param)
2354void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2931void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2355 CODE: 2932 CODE:
2356 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2357 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2358 2935
2359void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2936void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2360 2937
2361void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2938void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2362 2939
2363void glDrawPixels (int width, int height, int format, int type, char *pixels) 2940void glDrawPixels (int width, int height, int format, int type, char *pixels)
2941
2942void glPixelZoom (float x, float y)
2364 2943
2365void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2944void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2366 2945
2367int glGenTexture () 2946int glGenTexture ()
2368 CODE: 2947 CODE:
2369{ 2948 RETVAL = gen_texture ();
2370 GLuint name;
2371 glGenTextures (1, &name);
2372 RETVAL = name;
2373}
2374 OUTPUT: 2949 OUTPUT:
2375 RETVAL 2950 RETVAL
2376 2951
2377void glDeleteTexture (int name) 2952void glDeleteTexture (int name)
2378 CODE: 2953 CODE:
2379{
2380 GLuint name_ = name;
2381 glDeleteTextures (1, &name_); 2954 del_texture (name);
2382} 2955
2383
2384int glGenList () 2956int glGenList ()
2385 CODE: 2957 CODE:
2386 RETVAL = glGenLists (1); 2958 RETVAL = glGenLists (1);
2387 OUTPUT: 2959 OUTPUT:
2388 RETVAL 2960 RETVAL
2395 2967
2396void glEndList () 2968void glEndList ()
2397 2969
2398void glCallList (int list) 2970void glCallList (int list)
2399 2971
2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2973
2974PROTOTYPES: DISABLE
2975
2976void
2977find_widget (SV *self, NV x, NV y)
2978 PPCODE:
2979{
2980 if (within_widget (self, x, y))
2981 XPUSHs (self);
2982}
2983
2984BOOT:
2985{
2986 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2987
2988 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2989 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2990 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2991 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2992}
2993
2994void
2995draw (SV *self)
2996 CODE:
2997{
2998 HV *hv;
2999 SV **svp;
3000 NV x, y, w, h;
3001 SV *draw_x_sv = GvSV (draw_x_gv);
3002 SV *draw_y_sv = GvSV (draw_y_gv);
3003 SV *draw_w_sv = GvSV (draw_w_gv);
3004 SV *draw_h_sv = GvSV (draw_h_gv);
3005 double draw_x, draw_y;
3006
3007 if (!SvROK (self))
3008 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3009
3010 hv = (HV *)SvRV (self);
3011
3012 if (SvTYPE (hv) != SVt_PVHV)
3013 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3014
3015 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3016 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3017
3018 if (!h || !w)
3019 XSRETURN_EMPTY;
3020
3021 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3022 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3023
3024 draw_x = SvNV (draw_x_sv) + x;
3025 draw_y = SvNV (draw_y_sv) + y;
3026
3027 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3028 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3029 XSRETURN_EMPTY;
3030
3031 sv_setnv (draw_x_sv, draw_x);
3032 sv_setnv (draw_y_sv, draw_y);
3033
3034 glPushMatrix ();
3035 glTranslated (x, y, 0);
3036
3037 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3038 {
3039 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3040
3041 if (svp && SvTRUE (*svp))
3042 {
3043 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3044 glEnable (GL_BLEND);
3045 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3046 glBegin (GL_QUADS);
3047 glVertex2f (0, 0);
3048 glVertex2f (w, 0);
3049 glVertex2f (w, h);
3050 glVertex2f (0, h);
3051 glEnd ();
3052 glDisable (GL_BLEND);
3053 }
3054 }
3055#if 0
3056 // draw borders, for debugging
3057 glPushMatrix ();
3058 glColor4f (1., 1., 0., 1.);
3059 glTranslatef (.5, .5, 0.);
3060 glBegin (GL_LINE_LOOP);
3061 glVertex2f (0 , 0);
3062 glVertex2f (w - 1, 0);
3063 glVertex2f (w - 1, h - 1);
3064 glVertex2f (0 , h - 1);
3065 glEnd ();
3066 glPopMatrix ();
3067#endif
3068 PUSHMARK (SP);
3069 XPUSHs (self);
3070 PUTBACK;
3071 call_method ("_draw", G_VOID | G_DISCARD);
3072 SPAGAIN;
3073
3074 glPopMatrix ();
3075
3076 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3077 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3078}
3079

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines