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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines