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.161 by root, Mon Oct 9 23:30:44 2006 UTC vs.
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
8#endif 14#endif
9 15
10#include "EXTERN.h" 16#include "EXTERN.h"
11#include "perl.h" 17#include "perl.h"
12#include "XSUB.h" 18#include "XSUB.h"
13 19
14#ifdef _WIN32 20#ifdef _WIN32
15# 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
16#endif 27#endif
17 28
29#include <assert.h>
18#include <math.h> 30#include <math.h>
19#include <string.h> 31#include <string.h>
20#include <stdio.h> 32#include <stdio.h>
21#include <stdlib.h> 33#include <stdlib.h>
22 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
23#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
24#include <SDL_endian.h> 39#include <SDL_endian.h>
25#include <SDL_image.h> 40#include <SDL_image.h>
26#include <SDL_mixer.h> 41#include <SDL_mixer.h>
27#include <SDL_opengl.h> 42#include <SDL_opengl.h>
28 43
37# include <sys/types.h> 52# include <sys/types.h>
38# include <sys/socket.h> 53# include <sys/socket.h>
39# include <netinet/in.h> 54# include <netinet/in.h>
40# include <netinet/tcp.h> 55# include <netinet/tcp.h>
41# include <inttypes.h> 56# include <inttypes.h>
42#else
43 typedef unsigned char uint8_t;
44 typedef unsigned short uint16_t;
45 typedef unsigned int uint32_t;
46 typedef signed char int8_t;
47 typedef signed short int16_t;
48 typedef signed int int32_t;
49#endif 57#endif
50 58
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 60
53#define FOW_DARKNESS 32 61#define FOW_DARKNESS 32
54 62
55#define MAP_EXTEND_X 32 63#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 64#define MAP_EXTEND_Y 512
61# define PARACHUTE SDL_INIT_NOPARACHUTE 69# define PARACHUTE SDL_INIT_NOPARACHUTE
62#else 70#else
63# define PARACHUTE 0 71# define PARACHUTE 0
64#endif 72#endif
65 73
74static AV *texture_av;
75
66static struct 76static struct
67{ 77{
68#define GL_FUNC(ptr,name) ptr name; 78#define GL_FUNC(ptr,name) ptr name;
69#include "glfunc.h" 79#include "glfunc.h"
70#undef GL_FUNC 80#undef GL_FUNC
71} gl; 81} gl;
72 82
83static void
73static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 84gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
74{ 85{
75 if (gl.BlendFuncSeparate) 86 if (gl.BlendFuncSeparate)
76 gl.BlendFuncSeparate (sa, da, saa, daa); 87 gl.BlendFuncSeparate (sa, da, saa, daa);
77 else if (gl.BlendFuncSeparateEXT) 88 else if (gl.BlendFuncSeparateEXT)
78 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 89 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
79 else 90 else
80 glBlendFunc (sa, da); 91 glBlendFunc (sa, da);
81} 92}
82 93
94static GLuint
95gen_texture ()
96{
97 GLuint name;
98
99 if (AvFILL (texture_av) >= 0)
100 name = (GLuint)(size_t)av_pop (texture_av);
101 else
102 glGenTextures (1, &name);
103
104 return name;
105}
106
107static void
108del_texture (GLuint name)
109{
110 /* make a half-assed attempt at returning the memory used by the texture */
111 /* textures are frequently being reused by cfplus anyway */
112 /*glBindTexture (GL_TEXTURE_2D, name);*/
113 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
114 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name);
116}
117
83#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
84 120
85#include "pango-font.c" 121#include "pango-font.c"
86#include "pango-fontmap.c" 122#include "pango-fontmap.c"
87#include "pango-render.c" 123#include "pango-render.c"
88 124
125typedef IV DC__Channel;
126typedef SDL_RWops *DC__RW;
89typedef Mix_Chunk *CFPlus__MixChunk; 127typedef Mix_Chunk *DC__MixChunk;
90typedef Mix_Music *CFPlus__MixMusic; 128typedef Mix_Music *DC__MixMusic;
91 129
92typedef PangoFontDescription *CFPlus__Font; 130typedef PangoFontDescription *DC__Font;
93 131
94static int 132static int
95shape_attr_p (PangoLayoutRun *run) 133shape_attr_p (PangoLayoutRun *run)
96{ 134{
97 GSList *attrs = run->item->analysis.extra_attrs; 135 GSList *attrs = run->item->analysis.extra_attrs;
111 149
112typedef struct cf_layout { 150typedef struct cf_layout {
113 PangoLayout *pl; 151 PangoLayout *pl;
114 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
115 int base_height; 153 int base_height;
116 CFPlus__Font font; 154 DC__Font font;
155 rc_t *rc;
117} *CFPlus__Layout; 156} *DC__Layout;
118 157
119static CFPlus__Font default_font; 158static DC__Font default_font;
120static PangoContext *opengl_context; 159static PangoContext *opengl_context;
121static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
122 161
123static void 162static void
124substitute_func (FcPattern *pattern, gpointer data) 163substitute_func (FcPattern *pattern, gpointer data)
129#endif 168#endif
130 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 169 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
131} 170}
132 171
133static void 172static void
134layout_update_font (CFPlus__Layout self) 173layout_update_font (DC__Layout self)
135{ 174{
136 /* use a random scale factor to account for unknown descenders, 0.8 works 175 /* use a random scale factor to account for unknown descenders, 0.8 works
137 * reasonably well with bitstream vera 176 * reasonably well with bitstream vera
138 */ 177 */
139 PangoFontDescription *font = self->font ? self->font : default_font; 178 PangoFontDescription *font = self->font ? self->font : default_font;
143 182
144 pango_layout_set_font_description (self->pl, font); 183 pango_layout_set_font_description (self->pl, font);
145} 184}
146 185
147static void 186static void
148layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 187layout_get_pixel_size (DC__Layout self, int *w, int *h)
149{ 188{
150 PangoRectangle rect; 189 PangoRectangle rect;
151 190
152 // get_pixel_* wrongly rounds down 191 // get_pixel_* wrongly rounds down
153 pango_layout_get_extents (self->pl, 0, &rect); 192 pango_layout_get_extents (self->pl, 0, &rect);
160 199
161 *w = rect.width; 200 *w = rect.width;
162 *h = rect.height; 201 *h = rect.height;
163} 202}
164 203
204typedef uint16_t tileid;
165typedef uint16_t mapface; 205typedef uint16_t faceid;
166 206
167typedef struct { 207typedef struct {
168 GLint name; 208 GLuint name;
169 int w, h; 209 int w, h;
170 float s, t; 210 float s, t;
171 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
212 tileid smoothtile;
213 uint8_t smoothlevel;
172} maptex; 214} maptex;
173 215
174typedef struct { 216typedef struct {
175 uint32_t player; 217 uint32_t player;
176 mapface face[3]; 218 tileid tile[3];
177 uint16_t darkness; 219 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags; 220 uint8_t stat_width, stat_hp, flags, smoothmax;
179} mapcell; 221} mapcell;
180 222
181typedef struct { 223typedef struct {
182 int32_t c0, c1; 224 int32_t c0, c1;
183 mapcell *col; 225 mapcell *col;
184} maprow; 226} maprow;
185 227
186typedef struct map { 228typedef struct map {
187 int x, y, w, h; 229 int x, y, w, h;
188 int ox, oy; /* offset to virtual global coordinate system */ 230 int ox, oy; /* offset to virtual global coordinate system */
189 int faces; 231 int faces; tileid *face2tile; // [faceid]
190 mapface *face; 232 int texs; maptex *tex; // [tileid]
191
192 int texs;
193 maptex *tex;
194 233
195 int32_t rows; 234 int32_t rows;
196 maprow *row; 235 maprow *row;
197} *CFPlus__Map; 236} *DC__Map;
198 237
199static char * 238static char *
200prepend (char *ptr, int sze, int inc) 239prepend (char *ptr, int sze, int inc)
201{ 240{
202 char *p; 241 char *p;
219} 258}
220 259
221#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 260#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
222#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 261#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
223 262
263static void
264need_facenum (struct map *self, faceid face)
265{
266 while (self->faces <= face)
267 {
268 Append (tileid, self->face2tile, self->faces, self->faces);
269 self->faces *= 2;
270 }
271}
272
273static void
274need_texid (struct map *self, int texid)
275{
276 while (self->texs <= texid)
277 {
278 Append (maptex, self->tex, self->texs, self->texs);
279 self->texs *= 2;
280 }
281}
282
224static maprow * 283static maprow *
225map_get_row (CFPlus__Map self, int y) 284map_get_row (DC__Map self, int y)
226{ 285{
227 if (0 > y) 286 if (0 > y)
228 { 287 {
229 int extend = - y + MAP_EXTEND_Y; 288 int extend = - y + MAP_EXTEND_Y;
230 Prepend (maprow, self->row, self->rows, extend); 289 Prepend (maprow, self->row, self->rows, extend);
268 327
269 return row->col + (x - row->c0); 328 return row->col + (x - row->c0);
270} 329}
271 330
272static mapcell * 331static mapcell *
273map_get_cell (CFPlus__Map self, int x, int y) 332map_get_cell (DC__Map self, int x, int y)
274{ 333{
275 return row_get_cell (map_get_row (self, y), x); 334 return row_get_cell (map_get_row (self, y), x);
276} 335}
277 336
278static void 337static void
279map_clear (CFPlus__Map self) 338map_clear (DC__Map self)
280{ 339{
281 int r; 340 int r;
282 341
283 for (r = 0; r < self->rows; r++) 342 for (r = 0; r < self->rows; r++)
284 Safefree (self->row[r].col); 343 Safefree (self->row[r].col);
292 self->row = 0; 351 self->row = 0;
293 self->rows = 0; 352 self->rows = 0;
294} 353}
295 354
296static void 355static void
297map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 356map_blank (DC__Map self, int x0, int y0, int w, int h)
298{ 357{
299 int x, y; 358 int x, y;
300 maprow *row; 359 maprow *row;
301 mapcell *cell; 360 mapcell *cell;
302 361
322 cell->player = 0; 381 cell->player = 0;
323 } 382 }
324 } 383 }
325} 384}
326 385
386typedef struct {
387 tileid tile;
388 uint8_t x, y, level;
389} smooth_key;
390
391static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits)
393{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
395
396 if (SvIOK (*sv))
397 SvIV_set (*sv, SvIVX (*sv) | bits);
398 else
399 sv_setiv (*sv, bits);
400}
401
327static void 402static void
328music_finished (void) 403music_finished (void)
329{ 404{
330 SDL_UserEvent ev; 405 SDL_UserEvent ev;
331 406
365 n |= n >> 16; 440 n |= n >> 16;
366 441
367 return n + 1; 442 return n + 1;
368} 443}
369 444
370MODULE = CFPlus PACKAGE = CFPlus 445static unsigned int
446popcount (unsigned int n)
447{
448 n -= (n >> 1) & 0x55555555U;
449 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
450 n = ((n >> 4) + n) & 0x0f0f0f0fU;
451 n *= 0x01010101U;
452
453 return n >> 24;
454}
455
456/* SDL should provide this, really. */
457#define SDLK_MODIFIER_MIN 300
458#define SDLK_MODIFIER_MAX 314
459
460/******************************************************************************/
461
462static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
463static GV *hover_gv;
464
465static int
466within_widget (SV *widget, NV x, NV y)
467{
468 HV *self;
469 SV **svp;
470 NV wx, ww, wy, wh;
471
472 if (!SvROK (widget))
473 return 0;
474
475 self = (HV *)SvRV (widget);
476
477 if (SvTYPE (self) != SVt_PVHV)
478 return 0;
479
480 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
481 if (y < wy)
482 return 0;
483
484 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
485 if (y >= wy + wh)
486 return 0;
487
488 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
489 if (x < wx)
490 return 0;
491
492 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
493 if (x >= wx + ww)
494 return 0;
495
496 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
497 if (!svp || !SvTRUE (*svp))
498 return 0;
499
500 return 1;
501}
502
503MODULE = Deliantra::Client PACKAGE = DC
371 504
372PROTOTYPES: ENABLE 505PROTOTYPES: ENABLE
373 506
374BOOT: 507BOOT:
375{ 508{
376 HV *stash = gv_stashpv ("CFPlus", 1); 509 HV *stash = gv_stashpv ("DC", 1);
377 static const struct { 510 static const struct {
378 const char *name; 511 const char *name;
379 IV iv; 512 IV iv;
380 } *civ, const_iv[] = { 513 } *civ, const_iv[] = {
381# define const_iv(name) { # name, (IV)name } 514# define const_iv(name) { # name, (IV)name }
515 const_iv (SDLK_MODIFIER_MIN),
516 const_iv (SDLK_MODIFIER_MAX),
517
382 const_iv (SDL_ACTIVEEVENT), 518 const_iv (SDL_ACTIVEEVENT),
383 const_iv (SDL_KEYDOWN), 519 const_iv (SDL_KEYDOWN),
384 const_iv (SDL_KEYUP), 520 const_iv (SDL_KEYUP),
385 const_iv (SDL_MOUSEMOTION), 521 const_iv (SDL_MOUSEMOTION),
386 const_iv (SDL_MOUSEBUTTONDOWN), 522 const_iv (SDL_MOUSEBUTTONDOWN),
395 const_iv (SDL_EVENT_RESERVEDA), 531 const_iv (SDL_EVENT_RESERVEDA),
396 const_iv (SDL_EVENT_RESERVEDB), 532 const_iv (SDL_EVENT_RESERVEDB),
397 const_iv (SDL_VIDEORESIZE), 533 const_iv (SDL_VIDEORESIZE),
398 const_iv (SDL_VIDEOEXPOSE), 534 const_iv (SDL_VIDEOEXPOSE),
399 const_iv (SDL_USEREVENT), 535 const_iv (SDL_USEREVENT),
536
537 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE),
540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
400 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
401 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
402 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
403 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
404 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
459 const_iv (SDLK_BREAK), 602 const_iv (SDLK_BREAK),
460 const_iv (SDLK_MENU), 603 const_iv (SDLK_MENU),
461 const_iv (SDLK_POWER), 604 const_iv (SDLK_POWER),
462 const_iv (SDLK_EURO), 605 const_iv (SDLK_EURO),
463 const_iv (SDLK_UNDO), 606 const_iv (SDLK_UNDO),
607
464 const_iv (KMOD_NONE), 608 const_iv (KMOD_NONE),
609 const_iv (KMOD_SHIFT),
465 const_iv (KMOD_LSHIFT), 610 const_iv (KMOD_LSHIFT),
466 const_iv (KMOD_RSHIFT), 611 const_iv (KMOD_RSHIFT),
612 const_iv (KMOD_CTRL),
467 const_iv (KMOD_LCTRL), 613 const_iv (KMOD_LCTRL),
468 const_iv (KMOD_RCTRL), 614 const_iv (KMOD_RCTRL),
615 const_iv (KMOD_ALT),
469 const_iv (KMOD_LALT), 616 const_iv (KMOD_LALT),
470 const_iv (KMOD_RALT), 617 const_iv (KMOD_RALT),
618 const_iv (KMOD_META),
471 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
472 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
473 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
474 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
475 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
476 const_iv (KMOD_CTRL), 624
477 const_iv (KMOD_SHIFT), 625 const_iv (MIX_DEFAULT_FORMAT),
478 const_iv (KMOD_ALT),
479 const_iv (KMOD_META)
480# undef const_iv 626# undef const_iv
481 }; 627 };
482 628
483 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
631
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
485} 634}
635
636void
637weaken (SV *rv)
638 PROTOTYPE: $
639 CODE:
640 sv_rvweaken (rv);
486 641
487int 642int
488in_destruct () 643in_destruct ()
489 CODE: 644 CODE:
490 RETVAL = PL_main_cv == Nullcv; 645 RETVAL = PL_main_cv == Nullcv;
492 RETVAL 647 RETVAL
493 648
494NV floor (NV x) 649NV floor (NV x)
495 650
496NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
497 656
498void 657void
499pango_init () 658pango_init ()
500 CODE: 659 CODE:
501{ 660{
502 opengl_fontmap = pango_opengl_font_map_new (); 661 opengl_fontmap = pango_opengl_font_map_new ();
503 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
504 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
505} 664}
506 665
666char *
667SDL_GetError ()
668
507int 669int
508SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
509 671
510void 672void
511SDL_Quit () 673SDL_Quit ()
512 674
513void 675void
514SDL_ListModes () 676SDL_ListModes (int rgb, int alpha)
515 PPCODE: 677 PPCODE:
516{ 678{
517 SDL_Rect **m; 679 SDL_Rect **m;
518 680
519 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 681 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
520 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 682 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
521 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 683 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
522 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 684 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
523 685
524 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 686 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
525 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 687 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
526 688
527 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 689 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
531 693
532 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
533#if SDL_VERSION_ATLEAST(1,2,10) 695#if SDL_VERSION_ATLEAST(1,2,10)
534 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
535 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
536#endif 698#endif
537 699
538 SDL_EnableUNICODE (1);
539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
540
541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
542 701
543 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
544 while (*m) 703 while (*m)
545 { 704 {
705 if ((*m)->w >= 800 && (*m)->h >= 480)
706 {
546 AV *av = newAV (); 707 AV *av = newAV ();
547 av_push (av, newSViv ((*m)->w)); 708 av_push (av, newSViv ((*m)->w));
548 av_push (av, newSViv ((*m)->h)); 709 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb));
711 av_push (av, newSViv (alpha));
549 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 712 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
713 }
550 714
551 ++m; 715 ++m;
552 } 716 }
553} 717}
554 718
555char *
556SDL_GetError ()
557
558int 719int
559SDL_SetVideoMode (int w, int h, int fullscreen) 720SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
560 CODE: 721 CODE:
722{
723 SDL_EnableUNICODE (1);
724 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
725
726 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
727 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
728 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
729 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
730
561 RETVAL = !!SDL_SetVideoMode ( 731 RETVAL = !!SDL_SetVideoMode (
562 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 732 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
563 ); 733 );
734
564 if (RETVAL) 735 if (RETVAL)
565 { 736 {
566 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 737 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
567# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
568# include "glfunc.h" 741#include "glfunc.h"
569# undef GL_FUNC 742#undef GL_FUNC
570 } 743 }
744}
571 OUTPUT: 745 OUTPUT:
572 RETVAL 746 RETVAL
573 747
574void 748void
575SDL_GL_SwapBuffers () 749SDL_GL_SwapBuffers ()
576 750
577char * 751char *
578SDL_GetKeyName (int sym) 752SDL_GetKeyName (int sym)
579 753
754int
755SDL_GetAppState ()
756
580void 757void
581SDL_PollEvent () 758poll_events ()
582 PPCODE: 759 PPCODE:
583{ 760{
584 SDL_Event ev; 761 SDL_Event ev;
585 762
586 while (SDL_PollEvent (&ev)) 763 SDL_PumpEvents ();
764 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
587 { 765 {
588 HV *hv = newHV (); 766 HV *hv = newHV ();
589 hv_store (hv, "type", 4, newSViv (ev.type), 0); 767 hv_store (hv, "type", 4, newSViv (ev.type), 0);
590 768
591 switch (ev.type) 769 switch (ev.type)
593 case SDL_KEYDOWN: 771 case SDL_KEYDOWN:
594 case SDL_KEYUP: 772 case SDL_KEYUP:
595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
598 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599 break; 778 break;
600 779
601 case SDL_ACTIVEEVENT: 780 case SDL_ACTIVEEVENT:
602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
603 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 782 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
604 break; 783 break;
605 784
606 case SDL_MOUSEMOTION: 785 case SDL_MOUSEMOTION:
786 {
787 int state = ev.motion.state;
788 int x = ev.motion.x;
789 int y = ev.motion.y;
790 int xrel = ev.motion.xrel;
791 int yrel = ev.motion.yrel;
792
793 /* do simplistic event compression */
794 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
795 && state == ev.motion.state)
796 {
797 xrel += ev.motion.xrel;
798 yrel += ev.motion.yrel;
799 x = ev.motion.x;
800 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 }
803
607 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
608
609 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 805 hv_store (hv, "state", 5, newSViv (state), 0);
610 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 806 hv_store (hv, "x", 1, newSViv (x), 0);
611 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 807 hv_store (hv, "y", 1, newSViv (y), 0);
612 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 808 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
613 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 809 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 }
614 break; 811 break;
615 812
616 case SDL_MOUSEBUTTONDOWN: 813 case SDL_MOUSEBUTTONDOWN:
617 case SDL_MOUSEBUTTONUP: 814 case SDL_MOUSEBUTTONUP:
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
628 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
629 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
630 break; 827 break;
631 } 828 }
632 829
633 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
634 } 831 }
635} 832}
636 833
637int 834int
638Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
639 POSTCALL: 836 POSTCALL:
640 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
641 Mix_ChannelFinished (channel_finished); 838 Mix_ChannelFinished (channel_finished);
642 839
643void 840void
841Mix_QuerySpec ()
842 PPCODE:
843{
844 int freq, channels;
845 Uint16 format;
846
847 if (Mix_QuerySpec (&freq, &format, &channels))
848 {
849 EXTEND (SP, 3);
850 PUSHs (sv_2mortal (newSViv (freq)));
851 PUSHs (sv_2mortal (newSViv (format)));
852 PUSHs (sv_2mortal (newSViv (channels)));
853 }
854}
855
856void
644Mix_CloseAudio () 857Mix_CloseAudio ()
645 858
646int 859int
647Mix_AllocateChannels (int numchans = -1) 860Mix_AllocateChannels (int numchans = -1)
648 861
862const char *
863Mix_GetError ()
864
649void 865void
650lowdelay (int fd, int val = 1) 866lowdelay (int fd, int val = 1)
651 CODE: 867 CODE:
652#ifndef _WIN32
653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 868 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
654#endif
655 869
656void 870void
657win32_proxy_info () 871win32_proxy_info ()
658 PPCODE: 872 PPCODE:
659{ 873{
696 STRLEN image_len; 910 STRLEN image_len;
697 char *image = (char *)SvPVbyte (image_, image_len); 911 char *image = (char *)SvPVbyte (image_, image_len);
698 SDL_Surface *surface, *surface2; 912 SDL_Surface *surface, *surface2;
699 SDL_PixelFormat fmt; 913 SDL_PixelFormat fmt;
700 SDL_RWops *rw = ix 914 SDL_RWops *rw = ix
701 ? SDL_RWFromFile (image, "r") 915 ? SDL_RWFromFile (image, "rb")
702 : SDL_RWFromConstMem (image, image_len); 916 : SDL_RWFromConstMem (image, image_len);
703 917
704 if (!rw) 918 if (!rw)
705 croak ("load_image: %s", SDL_GetError ()); 919 croak ("load_image: %s", SDL_GetError ());
706 920
779void 993void
780error (char *message) 994error (char *message)
781 CODE: 995 CODE:
782 fprintf (stderr, "ERROR: %s\n", message); 996 fprintf (stderr, "ERROR: %s\n", message);
783#ifdef _WIN32 997#ifdef _WIN32
784 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 998 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
785#endif 999#endif
786 1000
787void 1001void
788fatal (char *message) 1002fatal (char *message)
789 CODE: 1003 CODE:
790 fprintf (stderr, "FATAL: %s\n", message); 1004 fprintf (stderr, "FATAL: %s\n", message);
791#ifdef _WIN32 1005#ifdef _WIN32
792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1006 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
793#endif 1007#endif
794 _exit (1); 1008 _exit (1);
795 1009
796void 1010void
797_exit (int retval = 0) 1011_exit (int retval = 0)
800 ExitThread (retval); // unclean, please beam me up 1014 ExitThread (retval); // unclean, please beam me up
801#else 1015#else
802 _exit (retval); 1016 _exit (retval);
803#endif 1017#endif
804 1018
805MODULE = CFPlus PACKAGE = CFPlus::Font 1019void
1020debug ()
1021 CODE:
1022{
1023#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK;
1025#endif
1026}
806 1027
807CFPlus::Font 1028MODULE = Deliantra::Client PACKAGE = DC::Font
1029
1030PROTOTYPES: DISABLE
1031
1032DC::Font
808new_from_file (SV *class, char *path, int id = 0) 1033new_from_file (SV *class, char *path, int id = 0)
809 CODE: 1034 CODE:
810{ 1035{
811 int count; 1036 int count;
812 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
815} 1040}
816 OUTPUT: 1041 OUTPUT:
817 RETVAL 1042 RETVAL
818 1043
819void 1044void
820DESTROY (CFPlus::Font self) 1045DESTROY (DC::Font self)
821 CODE: 1046 CODE:
822 pango_font_description_free (self); 1047 pango_font_description_free (self);
823 1048
824void 1049void
825make_default (CFPlus::Font self) 1050make_default (DC::Font self)
1051 PROTOTYPE: $
826 CODE: 1052 CODE:
827 default_font = self; 1053 default_font = self;
828 1054
829MODULE = CFPlus PACKAGE = CFPlus::Layout 1055MODULE = Deliantra::Client PACKAGE = DC::Layout
830 1056
1057PROTOTYPES: DISABLE
1058
831void 1059void
832reset_glyph_cache () 1060glyph_cache_backup ()
1061 PROTOTYPE:
833 CODE: 1062 CODE:
1063 tc_backup ();
1064
1065void
1066glyph_cache_restore ()
1067 PROTOTYPE:
1068 CODE:
834 tc_clear (); 1069 tc_restore ();
835 1070
836CFPlus::Layout 1071DC::Layout
837new (SV *class) 1072new (SV *class)
838 CODE: 1073 CODE:
839 New (0, RETVAL, 1, struct cf_layout); 1074 New (0, RETVAL, 1, struct cf_layout);
840 1075
841 RETVAL->pl = pango_layout_new (opengl_context); 1076 RETVAL->pl = pango_layout_new (opengl_context);
843 RETVAL->g = 1.; 1078 RETVAL->g = 1.;
844 RETVAL->b = 1.; 1079 RETVAL->b = 1.;
845 RETVAL->a = 1.; 1080 RETVAL->a = 1.;
846 RETVAL->base_height = MIN_FONT_HEIGHT; 1081 RETVAL->base_height = MIN_FONT_HEIGHT;
847 RETVAL->font = 0; 1082 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
848 1084
849 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
850 layout_update_font (RETVAL); 1086 layout_update_font (RETVAL);
851 OUTPUT: 1087 OUTPUT:
852 RETVAL 1088 RETVAL
853 1089
854void 1090void
855DESTROY (CFPlus::Layout self) 1091DESTROY (DC::Layout self)
856 CODE: 1092 CODE:
857 g_object_unref (self->pl); 1093 g_object_unref (self->pl);
1094 rc_free (self->rc);
858 Safefree (self); 1095 Safefree (self);
859 1096
860void 1097void
861set_text (CFPlus::Layout self, SV *text_) 1098set_text (DC::Layout self, SV *text_)
862 CODE: 1099 CODE:
863{ 1100{
864 STRLEN textlen; 1101 STRLEN textlen;
865 char *text = SvPVutf8 (text_, textlen); 1102 char *text = SvPVutf8 (text_, textlen);
866 1103
867 pango_layout_set_text (self->pl, text, textlen); 1104 pango_layout_set_text (self->pl, text, textlen);
868} 1105}
869 1106
870void 1107void
871set_markup (CFPlus::Layout self, SV *text_) 1108set_markup (DC::Layout self, SV *text_)
872 CODE: 1109 CODE:
873{ 1110{
874 STRLEN textlen; 1111 STRLEN textlen;
875 char *text = SvPVutf8 (text_, textlen); 1112 char *text = SvPVutf8 (text_, textlen);
876 1113
877 pango_layout_set_markup (self->pl, text, textlen); 1114 pango_layout_set_markup (self->pl, text, textlen);
878} 1115}
879 1116
880void 1117void
881set_shapes (CFPlus::Layout self, ...) 1118set_shapes (DC::Layout self, ...)
882 CODE: 1119 CODE:
883{ 1120{
884 PangoAttrList *attrs = 0; 1121 PangoAttrList *attrs = 0;
885 const char *text = pango_layout_get_text (self->pl); 1122 const char *text = pango_layout_get_text (self->pl);
886 const char *pos = text; 1123 const char *pos = text;
921 if (attrs) 1158 if (attrs)
922 pango_layout_set_attributes (self->pl, attrs); 1159 pango_layout_set_attributes (self->pl, attrs);
923} 1160}
924 1161
925void 1162void
926get_shapes (CFPlus::Layout self) 1163get_shapes (DC::Layout self)
927 PPCODE: 1164 PPCODE:
928{ 1165{
929 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
930 1167
931 do 1168 do
946 1183
947 pango_layout_iter_free (iter); 1184 pango_layout_iter_free (iter);
948} 1185}
949 1186
950int 1187int
951has_wrapped (CFPlus::Layout self) 1188has_wrapped (DC::Layout self)
952 CODE: 1189 CODE:
953{ 1190{
954 int lines = 1; 1191 int lines = 1;
955 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
956 1193
961} 1198}
962 OUTPUT: 1199 OUTPUT:
963 RETVAL 1200 RETVAL
964 1201
965SV * 1202SV *
966get_text (CFPlus::Layout self) 1203get_text (DC::Layout self)
967 CODE: 1204 CODE:
968 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
969 sv_utf8_decode (RETVAL); 1206 sv_utf8_decode (RETVAL);
970 OUTPUT: 1207 OUTPUT:
971 RETVAL 1208 RETVAL
972 1209
973void 1210void
974set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1211set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
975 CODE: 1212 CODE:
976 self->r = r; 1213 self->r = r;
977 self->g = g; 1214 self->g = g;
978 self->b = b; 1215 self->b = b;
979 self->a = a; 1216 self->a = a;
980 1217
981void 1218void
982set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1219set_font (DC::Layout self, DC::Font font = 0)
983 CODE: 1220 CODE:
984 if (self->font != font) 1221 if (self->font != font)
985 { 1222 {
986 self->font = font; 1223 self->font = font;
987 layout_update_font (self); 1224 layout_update_font (self);
988 } 1225 }
989 1226
990void 1227void
991set_height (CFPlus::Layout self, int base_height) 1228set_height (DC::Layout self, int base_height)
992 CODE: 1229 CODE:
993 if (self->base_height != base_height) 1230 if (self->base_height != base_height)
994 { 1231 {
995 self->base_height = base_height; 1232 self->base_height = base_height;
996 layout_update_font (self); 1233 layout_update_font (self);
997 } 1234 }
998 1235
999void 1236void
1000set_width (CFPlus::Layout self, int max_width = -1) 1237set_width (DC::Layout self, int max_width = -1)
1001 CODE: 1238 CODE:
1002 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1003 1240
1004void 1241void
1005set_indent (CFPlus::Layout self, int indent) 1242set_indent (DC::Layout self, int indent)
1006 CODE: 1243 CODE:
1007 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1008 1245
1009void 1246void
1010set_spacing (CFPlus::Layout self, int spacing) 1247set_spacing (DC::Layout self, int spacing)
1011 CODE: 1248 CODE:
1012 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1013 1250
1014void 1251void
1015set_ellipsise (CFPlus::Layout self, int ellipsise) 1252set_ellipsise (DC::Layout self, int ellipsise)
1016 CODE: 1253 CODE:
1017 pango_layout_set_ellipsize (self->pl, 1254 pango_layout_set_ellipsize (self->pl,
1018 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1019 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1020 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1021 : PANGO_ELLIPSIZE_NONE 1258 : PANGO_ELLIPSIZE_NONE
1022 ); 1259 );
1023 1260
1024void 1261void
1025set_single_paragraph_mode (CFPlus::Layout self, int spm) 1262set_single_paragraph_mode (DC::Layout self, int spm)
1026 CODE: 1263 CODE:
1027 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1028 1265
1029void 1266void
1030size (CFPlus::Layout self) 1267size (DC::Layout self)
1031 PPCODE: 1268 PPCODE:
1032{ 1269{
1033 int w, h; 1270 int w, h;
1034 1271
1035 layout_get_pixel_size (self, &w, &h); 1272 layout_get_pixel_size (self, &w, &h);
1038 PUSHs (sv_2mortal (newSViv (w))); 1275 PUSHs (sv_2mortal (newSViv (w)));
1039 PUSHs (sv_2mortal (newSViv (h))); 1276 PUSHs (sv_2mortal (newSViv (h)));
1040} 1277}
1041 1278
1042int 1279int
1043descent (CFPlus::Layout self) 1280descent (DC::Layout self)
1044 CODE: 1281 CODE:
1045{ 1282{
1046 PangoRectangle rect; 1283 PangoRectangle rect;
1047 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1048 pango_layout_line_get_pixel_extents (line, 0, &rect); 1285 pango_layout_line_get_pixel_extents (line, 0, &rect);
1050} 1287}
1051 OUTPUT: 1288 OUTPUT:
1052 RETVAL 1289 RETVAL
1053 1290
1054int 1291int
1055xy_to_index (CFPlus::Layout self, int x, int y) 1292xy_to_index (DC::Layout self, int x, int y)
1056 CODE: 1293 CODE:
1057{ 1294{
1058 int index, trailing; 1295 int index, trailing;
1059 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1060 RETVAL = index; 1297 RETVAL = index + trailing;
1061} 1298}
1062 OUTPUT: 1299 OUTPUT:
1063 RETVAL 1300 RETVAL
1064 1301
1065void 1302void
1066cursor_pos (CFPlus::Layout self, int index) 1303cursor_pos (DC::Layout self, int index)
1067 PPCODE: 1304 PPCODE:
1068{ 1305{
1069 PangoRectangle strong_pos; 1306 PangoRectangle strong_pos;
1070 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1071 1308
1074 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1075 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1076} 1313}
1077 1314
1078void 1315void
1079render (CFPlus::Layout self, float x, float y, int flags = 0) 1316index_to_line_x (DC::Layout self, int index, int trailing = 0)
1080 PPCODE: 1317 PPCODE:
1318{
1319 int line, x;
1320
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322
1323#if !PANGO_VERSION_CHECK (1, 17. 3)
1324 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325 --line;
1326#endif
1327
1328 EXTEND (SP, 2);
1329 PUSHs (sv_2mortal (newSViv (line)));
1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1331}
1332
1333void
1334line_x_to_index (DC::Layout self, int line, int x)
1335 PPCODE:
1336{
1337 PangoLayoutLine *lp;
1338 int index, trailing;
1339
1340 if (line < 0)
1341 XSRETURN_EMPTY;
1342
1343 if (!(lp = pango_layout_get_line (self->pl, line)))
1344 XSRETURN_EMPTY; /* do better */
1345
1346 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1347
1348 EXTEND (SP, 2);
1349 if (GIMME_V == G_SCALAR)
1350 PUSHs (sv_2mortal (newSViv (index + trailing)));
1351 else
1352 {
1353 PUSHs (sv_2mortal (newSViv (index)));
1354 PUSHs (sv_2mortal (newSViv (trailing)));
1355 }
1356}
1357
1358void
1359render (DC::Layout self, float x, float y, int flags = 0)
1360 CODE:
1361 rc_clear (self->rc);
1081 pango_opengl_render_layout_subpixel ( 1362 pango_opengl_render_layout_subpixel (
1082 self->pl, 1363 self->pl,
1364 self->rc,
1083 x * PANGO_SCALE, y * PANGO_SCALE, 1365 x * PANGO_SCALE, y * PANGO_SCALE,
1084 self->r, self->g, self->b, self->a, 1366 self->r, self->g, self->b, self->a,
1085 flags 1367 flags
1086 ); 1368 );
1369 // we assume that context_change actually clears/frees stuff
1370 // and does not do any recomputation...
1371 pango_layout_context_changed (self->pl);
1087 1372
1088MODULE = CFPlus PACKAGE = CFPlus::Texture
1089
1090void 1373void
1091pad2pot (SV *data_, SV *w_, SV *h_) 1374draw (DC::Layout self)
1092 CODE: 1375 CODE:
1093{ 1376{
1094 int ow = SvIV (w_); 1377 glEnable (GL_TEXTURE_2D);
1095 int oh = SvIV (h_); 1378 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1379 glEnable (GL_BLEND);
1380 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1381 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1382 glEnable (GL_ALPHA_TEST);
1383 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1096 1384
1097 if (ow && oh) 1385 rc_draw (self->rc);
1386
1387 glDisable (GL_ALPHA_TEST);
1388 glDisable (GL_BLEND);
1389 glDisable (GL_TEXTURE_2D);
1390}
1391
1392MODULE = Deliantra::Client PACKAGE = DC::Texture
1393
1394PROTOTYPES: ENABLE
1395
1396void
1397pad (SV *data_, int ow, int oh, int nw, int nh)
1398 CODE:
1399{
1400 if ((nw != ow || nh != oh) && SvOK (data_))
1098 { 1401 {
1099 int nw = minpot (ow);
1100 int nh = minpot (oh);
1101
1102 if (nw != ow || nh != oh)
1103 {
1104 if (SvOK (data_))
1105 {
1106 STRLEN datalen; 1402 STRLEN datalen;
1107 char *data = SvPVbyte (data_, datalen); 1403 char *data = SvPVbyte (data_, datalen);
1108 int bpp = datalen / (ow * oh); 1404 int bpp = datalen / (ow * oh);
1109 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1405 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1110 1406
1111 SvPOK_only (result_); 1407 SvPOK_only (result_);
1112 SvCUR_set (result_, nw * nh * bpp); 1408 SvCUR_set (result_, nw * nh * bpp);
1113 1409
1114 memset (SvPVX (result_), 0, nw * nh * bpp); 1410 memset (SvPVX (result_), 0, nw * nh * bpp);
1115 while (oh--) 1411 while (oh--)
1116 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1412 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1117 1413
1118 sv_setsv (data_, result_); 1414 sv_setsv (data_, result_);
1119 }
1120
1121 sv_setiv (w_, nw);
1122 sv_setiv (h_, nh);
1123 }
1124 } 1415 }
1125} 1416}
1126 1417
1127void 1418void
1128draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1419draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1134{ 1425{
1135 HV *hv = (HV *)SvRV (self); 1426 HV *hv = (HV *)SvRV (self);
1136 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1427 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1137 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1428 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1138 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1429 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1430
1431 if (name <= 0)
1432 XSRETURN_EMPTY;
1139 1433
1140 if (items < 5) 1434 if (items < 5)
1141 { 1435 {
1142 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1436 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1143 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1437 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1171 glDisable (GL_ALPHA_TEST); 1465 glDisable (GL_ALPHA_TEST);
1172 glDisable (GL_BLEND); 1466 glDisable (GL_BLEND);
1173 } 1467 }
1174} 1468}
1175 1469
1176MODULE = CFPlus PACKAGE = CFPlus::Map 1470IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1471 CODE:
1472{
1473 GLint width;
1474 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1475 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1476 RETVAL = width > 0;
1477}
1478 OUTPUT:
1479 RETVAL
1177 1480
1178CFPlus::Map 1481MODULE = Deliantra::Client PACKAGE = DC::Map
1179new (SV *class, int map_width, int map_height) 1482
1483PROTOTYPES: DISABLE
1484
1485DC::Map
1486new (SV *class)
1180 CODE: 1487 CODE:
1181 New (0, RETVAL, 1, struct map); 1488 New (0, RETVAL, 1, struct map);
1182 RETVAL->x = 0; 1489 RETVAL->x = 0;
1183 RETVAL->y = 0; 1490 RETVAL->y = 0;
1184 RETVAL->w = map_width; 1491 RETVAL->w = 0;
1185 RETVAL->h = map_height; 1492 RETVAL->h = 0;
1186 RETVAL->ox = 0; 1493 RETVAL->ox = 0;
1187 RETVAL->oy = 0; 1494 RETVAL->oy = 0;
1188 RETVAL->faces = 8192; 1495 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1189 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1496 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1190 RETVAL->texs = 8192;
1191 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1192 RETVAL->rows = 0; 1497 RETVAL->rows = 0;
1193 RETVAL->row = 0; 1498 RETVAL->row = 0;
1194 OUTPUT: 1499 OUTPUT:
1195 RETVAL 1500 RETVAL
1196 1501
1197void 1502void
1198DESTROY (CFPlus::Map self) 1503DESTROY (DC::Map self)
1199 CODE: 1504 CODE:
1200{ 1505{
1201 map_clear (self); 1506 map_clear (self);
1202 Safefree (self->face); 1507 Safefree (self->face2tile);
1203 Safefree (self->tex); 1508 Safefree (self->tex);
1204 Safefree (self); 1509 Safefree (self);
1205} 1510}
1206 1511
1207void 1512void
1513resize (DC::Map self, int map_width, int map_height)
1514 CODE:
1515 self->w = map_width;
1516 self->h = map_height;
1517
1518void
1208clear (CFPlus::Map self) 1519clear (DC::Map self)
1209 CODE: 1520 CODE:
1210 map_clear (self); 1521 map_clear (self);
1211 1522
1212void 1523void
1213set_face (CFPlus::Map self, int face, int texid) 1524set_tileid (DC::Map self, int face, int tile)
1214 CODE: 1525 CODE:
1215{ 1526{
1216 while (self->faces <= face) 1527 need_facenum (self, face); self->face2tile [face] = tile;
1217 { 1528 need_texid (self, tile);
1218 Append (mapface, self->face, self->faces, self->faces);
1219 self->faces *= 2;
1220 }
1221
1222 self->face [face] = texid;
1223} 1529}
1224 1530
1225void 1531void
1532set_smooth (DC::Map self, int face, int smooth, int level)
1533 CODE:
1534{
1535 tileid texid;
1536 maptex *tex;
1537
1538 if (face < 0 || face >= self->faces)
1539 return;
1540
1541 if (smooth < 0 || smooth >= self->faces)
1542 return;
1543
1544 texid = self->face2tile [face];
1545
1546 if (!texid)
1547 return;
1548
1549 tex = self->tex + texid;
1550 tex->smoothtile = self->face2tile [smooth];
1551 tex->smoothlevel = level;
1552}
1553
1554void
1226set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1555set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1227 CODE: 1556 CODE:
1228{ 1557{
1229 while (self->texs <= texid) 1558 need_texid (self, texid);
1230 {
1231 Append (maptex, self->tex, self->texs, self->texs);
1232 self->texs *= 2;
1233 }
1234 1559
1235 { 1560 {
1236 maptex *tex = self->tex + texid; 1561 maptex *tex = self->tex + texid;
1237 1562
1238 tex->name = name; 1563 tex->name = name;
1255 // from transparent color bleeding and ugly wrapping effects. 1580 // from transparent color bleeding and ugly wrapping effects.
1256 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1581 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1257} 1582}
1258 1583
1259int 1584int
1260ox (CFPlus::Map self) 1585ox (DC::Map self)
1261 ALIAS: 1586 ALIAS:
1262 oy = 1 1587 oy = 1
1263 x = 2 1588 x = 2
1264 y = 3 1589 y = 3
1265 w = 4 1590 w = 4
1276 } 1601 }
1277 OUTPUT: 1602 OUTPUT:
1278 RETVAL 1603 RETVAL
1279 1604
1280void 1605void
1281scroll (CFPlus::Map self, int dx, int dy) 1606scroll (DC::Map self, int dx, int dy)
1282 CODE: 1607 CODE:
1283{ 1608{
1284 if (dx > 0) 1609 if (dx > 0)
1285 map_blank (self, self->x, self->y, dx, self->h); 1610 map_blank (self, self->x, self->y, dx, self->h);
1286 else if (dx < 0) 1611 else if (dx < 0)
1287 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1612 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1288 1613
1289 if (dy > 0) 1614 if (dy > 0)
1290 map_blank (self, self->x, self->y, self->w, dy); 1615 map_blank (self, self->x, self->y, self->w, dy);
1291 else if (dy < 0) 1616 else if (dy < 0)
1292 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1617 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1293 1618
1294 self->ox += dx; self->x += dx; 1619 self->ox += dx; self->x += dx;
1295 self->oy += dy; self->y += dy; 1620 self->oy += dy; self->y += dy;
1296 1621
1297 while (self->y < 0) 1622 while (self->y < 0)
1301 self->rows += MAP_EXTEND_Y; 1626 self->rows += MAP_EXTEND_Y;
1302 self->y += MAP_EXTEND_Y; 1627 self->y += MAP_EXTEND_Y;
1303 } 1628 }
1304} 1629}
1305 1630
1306void 1631SV *
1307map1a_update (CFPlus::Map self, SV *data_, int extmap) 1632map1a_update (DC::Map self, SV *data_, int extmap)
1308 CODE: 1633 CODE:
1309{ 1634{
1310 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1635 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1311 uint8_t *data_end = (uint8_t *)SvEND (data_); 1636 uint8_t *data_end = (uint8_t *)SvEND (data_);
1312 mapcell *cell; 1637 mapcell *cell;
1313 int x, y, flags; 1638 int x, y, z, flags;
1639 AV *missing = newAV ();
1640 RETVAL = newRV_noinc ((SV *)missing);
1314 1641
1315 while (data < data_end - 1) 1642 while (data < data_end - 1)
1316 { 1643 {
1317 flags = (data [0] << 8) + data [1]; data += 2; 1644 flags = (data [0] << 8) + data [1]; data += 2;
1318 1645
1349 cell->stat_width = 1; 1676 cell->stat_width = 1;
1350 cell->stat_hp = *data++; 1677 cell->stat_hp = *data++;
1351 } 1678 }
1352 else if (cmd == 6) // monster width 1679 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1; 1680 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width 1681 else if (cmd == 0x47)
1355 { 1682 {
1356 if (*data == 4) 1683 if (*data == 4)
1357 ; // decode player tag 1684 ; // decode player count
1358 1685
1359 data += *data + 1; 1686 data += *data + 1;
1360 } 1687 }
1361 else if (cmd == 8) // cell flags 1688 else if (cmd == 8) // cell flags
1362 cell->flags = *data++; 1689 cell->flags = *data++;
1369 } 1696 }
1370 else 1697 else
1371 cell->darkness = *data++ + 1; 1698 cell->darkness = *data++ + 1;
1372 } 1699 }
1373 1700
1701 for (z = 0; z <= 2; ++z)
1374 if (flags & 4) 1702 if (flags & (4 >> z))
1375 { 1703 {
1376 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1704 faceid face = (data [0] << 8) + data [1]; data += 2;
1705 need_facenum (self, face);
1706 cell->tile [z] = self->face2tile [face];
1707
1708 if (cell->tile [z])
1709 {
1710 maptex *tex = self->tex + cell->tile [z];
1711 if (!tex->name)
1712 av_push (missing, newSViv (cell->tile [z]));
1713
1714 if (tex->smoothtile)
1715 {
1716 maptex *smooth = self->tex + tex->smoothtile;
1717 if (!smooth->name)
1718 av_push (missing, newSViv (tex->smoothtile));
1719 }
1720 }
1377 } 1721 }
1378
1379 if (flags & 2)
1380 {
1381 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
1382 }
1383
1384 if (flags & 1)
1385 {
1386 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1387 }
1388 } 1722 }
1389 else 1723 else
1390 cell->darkness = 0; 1724 cell->darkness = 0;
1391 } 1725 }
1392} 1726}
1727 OUTPUT:
1728 RETVAL
1393 1729
1394SV * 1730SV *
1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1731mapmap (DC::Map self, int x0, int y0, int w, int h)
1396 CODE: 1732 CODE:
1397{ 1733{
1398 int x1, x; 1734 int x1, x;
1399 int y1, y; 1735 int y1, y;
1400 int z; 1736 int z;
1421 { 1757 {
1422 mapcell *cell = row->col + (x - row->c0); 1758 mapcell *cell = row->col + (x - row->c0);
1423 1759
1424 for (z = 0; z <= 0; z++) 1760 for (z = 0; z <= 0; z++)
1425 { 1761 {
1426 mapface face = cell->face [z];
1427
1428 if (face)
1429 {
1430 maptex tex = self->tex [face]; 1762 maptex tex = self->tex [cell->tile [z]];
1431 int a0 = 255 - tex.a; 1763 int a0 = 255 - tex.a;
1432 int a1 = tex.a; 1764 int a1 = tex.a;
1433 1765
1434 r = (r * a0 + tex.r * a1) / 255; 1766 r = (r * a0 + tex.r * a1) / 255;
1435 g = (g * a0 + tex.g * a1) / 255; 1767 g = (g * a0 + tex.g * a1) / 255;
1436 b = (b * a0 + tex.b * a1) / 255; 1768 b = (b * a0 + tex.b * a1) / 255;
1437 a = (a * a0 + tex.a * a1) / 255; 1769 a = (a * a0 + tex.a * a1) / 255;
1438 }
1439 } 1770 }
1440 } 1771 }
1441 1772
1442 *map++ = (r ) 1773 *map++ = (r )
1443 | (g << 8) 1774 | (g << 8)
1450} 1781}
1451 OUTPUT: 1782 OUTPUT:
1452 RETVAL 1783 RETVAL
1453 1784
1454void 1785void
1455draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1786draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1456 CODE: 1787 CODE:
1457{ 1788{
1458 int vx, vy;
1459 int x, y, z; 1789 int x, y, z;
1460 int last_name;
1461 mapface face;
1462 1790
1463 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1464 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1792 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1793 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1794 smooth_key skey;
1465 1795
1466 /* 1796 rc_t *rc = rc_alloc ();
1467 int vx = self->vx = self->w >= sw 1797 rc_key_t key;
1468 ? self->x + (self->w - sw) / 2 1798 rc_array_t *arr;
1469 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1470 1799
1471 int vy = self->vy = self->h >= sh 1800 // thats current max. sorry.
1472 ? self->y + (self->h - sh) / 2 1801 if (sw > 255) sw = 255;
1473 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1802 if (sh > 255) sh = 255;
1474 */
1475 1803
1476 glColor4ub (255, 255, 255, 255); 1804 // clear key, in case of extra padding
1805 memset (&skey, 0, sizeof (skey));
1806
1807 memset (&key, 0, sizeof (key));
1808 key.r = 255;
1809 key.g = 255;
1810 key.b = 255;
1811 key.a = 255;
1812 key.mode = GL_QUADS;
1813 key.format = GL_T2F_V3F;
1814 key.texname = -1;
1815
1816 mx += self->x;
1817 my += self->y;
1818
1819 // first pass: determine smooth_max
1820 // rather ugly, if you ask me
1821 // could also be stored inside mapcell and updated on change
1822 memset (smooth_max, 0, sizeof (smooth_max));
1823
1824 for (y = 0; y < sh; y++)
1825 if (0 <= y + my && y + my < self->rows)
1826 {
1827 maprow *row = self->row + (y + my);
1828
1829 for (x = 0; x < sw; x++)
1830 if (row->c0 <= x + mx && x + mx < row->c1)
1831 {
1832 mapcell *cell = row->col + (x + mx - row->c0);
1833
1834 smooth_max[x + 1][y + 1] =
1835 MAX (self->tex [cell->tile [0]].smoothlevel,
1836 MAX (self->tex [cell->tile [1]].smoothlevel,
1837 self->tex [cell->tile [2]].smoothlevel));
1838 }
1839 }
1477 1840
1478 glEnable (GL_BLEND); 1841 glEnable (GL_BLEND);
1479 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1842 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1480 glEnable (GL_TEXTURE_2D);
1481 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1482 1844
1483 glBegin (GL_QUADS);
1484
1485 last_name = 0;
1486
1487 for (z = 0; z < 3; z++) 1845 for (z = 0; z <= 2; z++)
1846 {
1847 memset (smooth_level, 0, sizeof (smooth_level));
1848
1488 for (y = 0; y < sh; y++) 1849 for (y = 0; y < sh; y++)
1489 if (0 <= y + vy && y + vy < self->rows) 1850 if (0 <= y + my && y + my < self->rows)
1490 { 1851 {
1491 maprow *row = self->row + (y + vy); 1852 maprow *row = self->row + (y + my);
1492 1853
1493 for (x = 0; x < sw; x++) 1854 for (x = 0; x < sw; x++)
1494 if (row->c0 <= x + vx && x + vx < row->c1) 1855 if (row->c0 <= x + mx && x + mx < row->c1)
1495 { 1856 {
1496 mapcell *cell = row->col + (x + vx - row->c0); 1857 mapcell *cell = row->col + (x + mx - row->c0);
1497
1498 face = cell->face [z]; 1858 tileid tile = cell->tile [z];
1859
1860 if (tile)
1861 {
1862 maptex tex = self->tex [tile];
1863 int px, py;
1499 1864
1500 if (face && face < self->texs) 1865 if (key.texname != tex.name)
1866 {
1867 if (!tex.name)
1868 tex = self->tex [2]; /* missing, replace by noface */
1869
1870 key.texname = tex.name;
1871 arr = rc_array (rc, &key);
1872 }
1873
1874 px = (x + 1) * T - tex.w;
1875 py = (y + 1) * T - tex.h;
1876
1877 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1878 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1879 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1880 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1881
1882 if (cell->flags && z == 2)
1883 {
1884 // overlays such as the speech bubble, probably more to come
1885 if (cell->flags & 1)
1886 {
1887 maptex tex = self->tex [1];
1888 int px = x * T + T * 2 / 32;
1889 int py = y * T - T * 6 / 32;
1890
1891 if (tex.name)
1892 {
1893 if (key.texname != tex.name)
1894 {
1895 key.texname = tex.name;
1896 arr = rc_array (rc, &key);
1897 }
1898
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1903 }
1904 }
1905 }
1906
1907 // update smooth hash
1908 if (tex.smoothtile)
1909 {
1910 skey.tile = tex.smoothtile;
1911 skey.level = tex.smoothlevel;
1912
1913 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1914
1915 // add bits to current tile and all neighbours. skey.x|y is
1916 // shifted +1|+1 so we always stay positive.
1917
1918 // bits is ___n cccc CCCC bbbb
1919 // n do not draw borders&corners
1920 // c draw these corners, but...
1921 // C ... not these
1922 // b draw these borders
1923
1924 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1925 // ┃· ·· ·┃ ━━
1926
1927 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1928 // ·· ·· ·┏ ┓·
1929
1930 // full tile
1931 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1932
1933 // borders
1934 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1935 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1936 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1937 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1938
1939 // corners
1940 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1941 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1942 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1943 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1944 }
1945 }
1946 }
1947 }
1948
1949 rc_draw (rc);
1950 rc_clear (rc);
1951
1952 // go through all smoothlevels, lowest to highest, then draw.
1953 // this is basically counting sort
1954 {
1955 int w, b;
1956
1957 glEnable (GL_TEXTURE_2D);
1958 glBegin (GL_QUADS);
1959 for (w = 0; w < 256 / 32; ++w)
1960 {
1961 uint32_t smask = smooth_level [w];
1962 if (smask)
1963 for (b = 0; b < 32; ++b)
1964 if (smask & (((uint32_t)1) << b))
1501 { 1965 {
1502 maptex tex = self->tex [face]; 1966 int level = (w << 5) | b;
1503 int px = (x + 1) * 32 - tex.w; 1967 HE *he;
1504 int py = (y + 1) * 32 - tex.h;
1505 1968
1506 if (last_name != tex.name) 1969 hv_iterinit (smooth);
1970 while ((he = hv_iternext (smooth)))
1507 { 1971 {
1508 glEnd (); 1972 smooth_key *skey = (smooth_key *)HeKEY (he);
1509 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1973 IV bits = SvIVX (HeVAL (he));
1510 glBegin (GL_QUADS);
1511 }
1512 1974
1513 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1514 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1515 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1516 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1517 }
1518
1519 if (cell->flags && z == 2)
1520 {
1521 if (cell->flags & 1) 1975 if (!(bits & 0x1000)
1976 && skey->level == level
1977 && level > smooth_max [skey->x][skey->y])
1522 { 1978 {
1523 maptex tex = self->tex [1]; 1979 maptex tex = self->tex [skey->tile];
1524 int px = (x + 1) * 32 - tex.w + 2; 1980 int px = (((int)skey->x) - 1) * T;
1525 int py = (y + 1) * 32 - tex.h - 6; 1981 int py = (((int)skey->y) - 1) * T;
1982 int border = bits & 15;
1983 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1984 float dx = tex.s * .0625f; // 16 images/row
1985 float dy = tex.t * .5f ; // 2 images/column
1526 1986
1987 if (tex.name)
1988 {
1989 // this time avoiding texture state changes
1990 // save gobs of state changes.
1991 if (key.texname != tex.name)
1992 {
1527 glEnd (); 1993 glEnd ();
1528 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1994 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1529 glBegin (GL_QUADS); 1995 glBegin (GL_QUADS);
1996 }
1530 1997
1998 if (border)
1999 {
2000 float ox = border * dx;
2001
2002 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2003 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2004 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2005 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2006 }
2007
2008 if (corner)
2009 {
2010 float ox = corner * dx;
2011
1531 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2012 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1532 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2013 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1533 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 2014 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1534 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 2015 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2016 }
2017 }
2018 }
1535 } 2019 }
1536 } 2020 }
1537 }
1538 } 2021 }
1539 2022
1540 glEnd (); 2023 glEnd ();
1541
1542 glDisable (GL_TEXTURE_2D); 2024 glDisable (GL_TEXTURE_2D);
2025 key.texname = -1;
2026 }
2027
2028 hv_clear (smooth);
2029 }
2030
1543 glDisable (GL_BLEND); 2031 glDisable (GL_BLEND);
2032 rc_free (rc);
1544 2033
1545 // top layer: overlays such as the health bar 2034 // top layer: overlays such as the health bar
1546 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh; y++)
1547 if (0 <= y + vy && y + vy < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1548 { 2037 {
1549 maprow *row = self->row + (y + vy); 2038 maprow *row = self->row + (y + my);
1550 2039
1551 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw; x++)
1552 if (row->c0 <= x + vx && x + vx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
1553 { 2042 {
1554 mapcell *cell = row->col + (x + vx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
1555 2044
1556 int px = x * 32; 2045 int px = x * T;
1557 int py = y * 32; 2046 int py = y * T;
1558 2047
1559 if (cell->stat_hp) 2048 if (cell->stat_hp)
1560 { 2049 {
1561 int width = cell->stat_width * 32; 2050 int width = cell->stat_width * T;
1562 int thick = sh / 28 + 1 + cell->stat_width; 2051 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1563 2052
1564 glColor3ub (0, 0, 0); 2053 glColor3ub (0, 0, 0);
1565 glRectf (px + 1, py - thick - 2, 2054 glRectf (px + 1, py - thick - 2,
1566 px + width - 1, py); 2055 px + width - 1, py);
1567 2056
1573 } 2062 }
1574 } 2063 }
1575} 2064}
1576 2065
1577void 2066void
1578draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2067draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1579 CODE: 2068 CODE:
1580{ 2069{
1581 static float color[16][3] = { 2070 static float color[16][3] = {
1582 { 0.00F, 0.00F, 0.00F }, 2071 { 0.00F, 0.00F, 0.00F },
1583 { 1.00F, 1.00F, 1.00F }, 2072 { 1.00F, 1.00F, 1.00F },
1633 glDisable (GL_BLEND); 2122 glDisable (GL_BLEND);
1634 glDisable (GL_TEXTURE_2D); 2123 glDisable (GL_TEXTURE_2D);
1635} 2124}
1636 2125
1637void 2126void
1638fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2127fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1639 PPCODE: 2128 PPCODE:
1640{ 2129{
1641 int vx, vy;
1642 int x, y; 2130 int x, y;
2131 int sw1 = sw + 2;
2132 int sh1 = sh + 2;
2133 int sh3 = sh * 3;
1643 int sw4 = (sw + 3) & ~3; 2134 int sw34 = (sw * 3 + 3) & ~3;
2135 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1644 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2136 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1645 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2137 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1646 2138
1647 memset (darkness, 255, sw4 * sh);
1648 SvPOK_only (darkness_sv); 2139 SvPOK_only (darkness3_sv);
1649 SvCUR_set (darkness_sv, sw4 * sh); 2140 SvCUR_set (darkness3_sv, sw34 * sh3);
1650 2141
1651 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2142 mx += self->x - 1;
1652 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2143 my += self->y - 1;
1653 2144
2145 memset (darkness1, 255, sw1 * sh1);
2146
1654 for (y = 0; y < sh; y++) 2147 for (y = 0; y < sh1; y++)
1655 if (0 <= y + vy && y + vy < self->rows) 2148 if (0 <= y + my && y + my < self->rows)
1656 { 2149 {
1657 maprow *row = self->row + (y + vy); 2150 maprow *row = self->row + (y + my);
1658 2151
1659 for (x = 0; x < sw; x++) 2152 for (x = 0; x < sw1; x++)
1660 if (row->c0 <= x + vx && x + vx < row->c1) 2153 if (row->c0 <= x + mx && x + mx < row->c1)
1661 { 2154 {
1662 mapcell *cell = row->col + (x + vx - row->c0); 2155 mapcell *cell = row->col + (x + mx - row->c0);
1663 2156
1664 darkness[y * sw4 + x] = cell->darkness 2157 darkness1 [y * sw1 + x] = cell->darkness
1665 ? 255 - (cell->darkness - 1) 2158 ? 255 - (cell->darkness - 1)
1666 : 255 - FOW_DARKNESS; 2159 : 255 - FOW_DARKNESS;
1667 } 2160 }
1668 } 2161 }
1669 2162
2163 for (y = 0; y < sh; ++y)
2164 for (x = 0; x < sw; ++x)
2165 {
2166 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2167 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2168 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2169 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2170 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2171 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2172 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2173 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2174 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2175
2176 uint8_t r11 = (d11 + d21 + d12) / 3;
2177 uint8_t r21 = d21;
2178 uint8_t r31 = (d21 + d31 + d32) / 3;
2179
2180 uint8_t r12 = d12;
2181 uint8_t r22 = d22;
2182 uint8_t r32 = d32;
2183
2184 uint8_t r13 = (d13 + d23 + d12) / 3;
2185 uint8_t r23 = d23;
2186 uint8_t r33 = (d23 + d33 + d32) / 3;
2187
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2189 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2190 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2191 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2192 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2193 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2195 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2196 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2197 }
2198
2199 free (darkness1);
2200
1670 EXTEND (SP, 3); 2201 EXTEND (SP, 3);
1671 PUSHs (sv_2mortal (newSViv (sw4))); 2202 PUSHs (sv_2mortal (newSViv (sw34)));
1672 PUSHs (sv_2mortal (newSViv (sh))); 2203 PUSHs (sv_2mortal (newSViv (sh3)));
1673 PUSHs (darkness_sv); 2204 PUSHs (darkness3_sv);
1674} 2205}
1675 2206
1676SV * 2207SV *
1677get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2208get_rect (DC::Map self, int x0, int y0, int w, int h)
1678 CODE: 2209 CODE:
1679{ 2210{
1680 int x, y, x1, y1; 2211 int x, y, x1, y1;
1681 SV *data_sv = newSV (w * h * 7 + 5); 2212 SV *data_sv = newSV (w * h * 7 + 5);
1682 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2213 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1707 if (row && row->c0 <= x && x < row->c1) 2238 if (row && row->c0 <= x && x < row->c1)
1708 { 2239 {
1709 mapcell *cell = row->col + (x - row->c0); 2240 mapcell *cell = row->col + (x - row->c0);
1710 uint8_t flags = 0; 2241 uint8_t flags = 0;
1711 2242
1712 if (cell->face [0]) flags |= 1; 2243 if (cell->tile [0]) flags |= 1;
1713 if (cell->face [1]) flags |= 2; 2244 if (cell->tile [1]) flags |= 2;
1714 if (cell->face [2]) flags |= 4; 2245 if (cell->tile [2]) flags |= 4;
1715 2246
1716 *data++ = flags; 2247 *data++ = flags;
1717 2248
1718 if (flags & 1) 2249 if (flags & 1)
1719 { 2250 {
2251 tileid tile = cell->tile [0];
1720 *data++ = cell->face [0] >> 8; 2252 *data++ = tile >> 8;
1721 *data++ = cell->face [0]; 2253 *data++ = tile;
1722 } 2254 }
1723 2255
1724 if (flags & 2) 2256 if (flags & 2)
1725 { 2257 {
2258 tileid tile = cell->tile [1];
1726 *data++ = cell->face [1] >> 8; 2259 *data++ = tile >> 8;
1727 *data++ = cell->face [1]; 2260 *data++ = tile;
1728 } 2261 }
1729 2262
1730 if (flags & 4) 2263 if (flags & 4)
1731 { 2264 {
2265 tileid tile = cell->tile [2];
1732 *data++ = cell->face [2] >> 8; 2266 *data++ = tile >> 8;
1733 *data++ = cell->face [2]; 2267 *data++ = tile;
1734 } 2268 }
1735 } 2269 }
1736 else 2270 else
1737 *data++ = 0; 2271 *data++ = 0;
1738 } 2272 }
1744} 2278}
1745 OUTPUT: 2279 OUTPUT:
1746 RETVAL 2280 RETVAL
1747 2281
1748void 2282void
1749set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2283set_rect (DC::Map self, int x0, int y0, uint8_t *data)
1750 PPCODE: 2284 PPCODE:
1751{ 2285{
1752 int x, y, z; 2286 int x, y, z;
1753 int w, h; 2287 int w, h;
1754 int x1, y1; 2288 int x1, y1;
1755 2289
1756 if (*data++ != 0) 2290 if (*data++ != 0)
1757 return; /* version mismatch */ 2291 XSRETURN_EMPTY; /* version mismatch */
1758 2292
1759 w = *data++ << 8; w |= *data++; 2293 w = *data++ << 8; w |= *data++;
1760 h = *data++ << 8; h |= *data++; 2294 h = *data++ << 8; h |= *data++;
1761 2295
1762 // we need to do this 'cause we don't keep an absolute coord system for rows 2296 // we need to do this 'cause we don't keep an absolute coord system for rows
1778 { 2312 {
1779 uint8_t flags = *data++; 2313 uint8_t flags = *data++;
1780 2314
1781 if (flags) 2315 if (flags)
1782 { 2316 {
1783 mapface face[3] = { 0, 0, 0 };
1784
1785 mapcell *cell = row_get_cell (row, x); 2317 mapcell *cell = row_get_cell (row, x);
2318 tileid tile[3] = { 0, 0, 0 };
1786 2319
1787 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2320 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1788 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2321 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1789 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2322 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1790 2323
1791 if (cell->darkness == 0) 2324 if (cell->darkness == 0)
1792 { 2325 {
1793 cell->darkness = 0; 2326 cell->darkness = 0;
1794 2327
1795 for (z = 0; z <= 2; z++) 2328 for (z = 0; z <= 2; z++)
1796 { 2329 {
1797 cell->face[z] = face[z]; 2330 tileid t = tile [z];
1798 2331
1799 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2332 if (t >= self->texs || (t && !self->tex [t].name))
2333 {
1800 XPUSHs (sv_2mortal (newSViv (face[z]))); 2334 XPUSHs (sv_2mortal (newSViv (t)));
2335 need_texid (self, t);
2336 }
2337
2338 cell->tile [z] = t;
1801 } 2339 }
1802 } 2340 }
1803 } 2341 }
1804 } 2342 }
1805 } 2343 }
1806} 2344}
1807 2345
1808MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2346MODULE = Deliantra::Client PACKAGE = DC::RW
1809 2347
1810CFPlus::MixChunk 2348DC::RW
1811new_from_file (SV *class, char *path) 2349new (SV *class, SV *data_sv)
1812 CODE: 2350 CODE:
1813 RETVAL = Mix_LoadWAV (path); 2351{
2352 STRLEN datalen;
2353 char *data = SvPVbyte (data_sv, datalen);
2354
2355 RETVAL = SDL_RWFromConstMem (data, datalen);
2356}
1814 OUTPUT: 2357 OUTPUT:
1815 RETVAL 2358 RETVAL
1816 2359
2360DC::RW
2361new_from_file (SV *class, const char *path, const char *mode = "rb")
2362 CODE:
2363 RETVAL = SDL_RWFromFile (path, mode);
2364 OUTPUT:
2365 RETVAL
2366
2367# fails on win32:
2368# dc.xs(2268) : error C2059: syntax error : '('
1817void 2369#void
2370#close (DC::RW self)
2371# CODE:
2372# (self->(close)) (self);
2373
2374MODULE = Deliantra::Client PACKAGE = DC::Channel
2375
2376PROTOTYPES: DISABLE
2377
2378DC::Channel
2379find ()
2380 CODE:
2381{
2382 RETVAL = Mix_GroupAvailable (-1);
2383
2384 if (RETVAL < 0)
2385 {
2386 RETVAL = Mix_GroupOldest (-1);
2387
2388 if (RETVAL < 0)
2389 XSRETURN_UNDEF;
2390
2391 Mix_HaltChannel (RETVAL);
2392 }
2393
2394 Mix_UnregisterAllEffects (RETVAL);
2395 Mix_Volume (RETVAL, 128);
2396}
2397 OUTPUT:
2398 RETVAL
2399
2400void
2401halt (DC::Channel self)
2402 CODE:
2403 Mix_HaltChannel (self);
2404
2405void
2406expire (DC::Channel self, int ticks = -1)
2407 CODE:
2408 Mix_ExpireChannel (self, ticks);
2409
2410void
2411fade_out (DC::Channel self, int ticks = -1)
2412 CODE:
2413 Mix_FadeOutChannel (self, ticks);
2414
2415int
2416volume (DC::Channel self, int volume)
2417 CODE:
2418 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2419 OUTPUT:
2420 RETVAL
2421
2422void
2423unregister_all_effects (DC::Channel self)
2424 CODE:
2425 Mix_UnregisterAllEffects (self);
2426
2427void
2428set_panning (DC::Channel self, int left, int right)
2429 CODE:
2430 left = CLAMP (left , 0, 255);
2431 right = CLAMP (right, 0, 255);
2432 Mix_SetPanning (self, left, right);
2433
2434void
2435set_distance (DC::Channel self, int distance)
2436 CODE:
2437 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2438
2439void
2440set_position (DC::Channel self, int angle, int distance)
2441 CODE:
2442
2443void
2444set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2445 CODE:
2446{
2447 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2448 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2449 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2450}
2451
2452void
2453set_reverse_stereo (DC::Channel self, int flip)
2454 CODE:
2455 Mix_SetReverseStereo (self, flip);
2456
2457MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2458
2459PROTOTYPES: DISABLE
2460
2461DC::MixChunk
2462new (SV *class, DC::RW rwops)
2463 CODE:
2464 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2465 OUTPUT:
2466 RETVAL
2467
2468void
1818DESTROY (CFPlus::MixChunk self) 2469DESTROY (DC::MixChunk self)
1819 CODE: 2470 CODE:
1820 Mix_FreeChunk (self); 2471 Mix_FreeChunk (self);
1821 2472
1822int 2473int
1823volume (CFPlus::MixChunk self, int volume = -1) 2474volume (DC::MixChunk self, int volume = -1)
1824 CODE: 2475 CODE:
2476 if (items > 1)
2477 volume = CLAMP (volume, 0, 128);
1825 RETVAL = Mix_VolumeChunk (self, volume); 2478 RETVAL = Mix_VolumeChunk (self, volume);
1826 OUTPUT: 2479 OUTPUT:
1827 RETVAL 2480 RETVAL
1828 2481
1829int 2482DC::Channel
1830play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2483play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1831 CODE: 2484 CODE:
2485{
1832 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2486 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2487
2488 if (RETVAL < 0)
2489 XSRETURN_UNDEF;
2490
2491 if (channel < 0)
2492 {
2493 Mix_UnregisterAllEffects (RETVAL);
2494 Mix_Volume (RETVAL, 128);
2495 }
2496}
1833 OUTPUT: 2497 OUTPUT:
1834 RETVAL 2498 RETVAL
1835 2499
1836MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2500MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1837 2501
1838int 2502int
1839volume (int volume = -1) 2503volume (int volume = -1)
2504 PROTOTYPE: ;$
1840 CODE: 2505 CODE:
2506 if (items > 0)
2507 volume = CLAMP (volume, 0, 128);
1841 RETVAL = Mix_VolumeMusic (volume); 2508 RETVAL = Mix_VolumeMusic (volume);
1842 OUTPUT: 2509 OUTPUT:
1843 RETVAL 2510 RETVAL
1844 2511
2512void
2513fade_out (int ms)
2514 CODE:
2515 Mix_FadeOutMusic (ms);
2516
2517void
2518halt ()
2519 CODE:
2520 Mix_HaltMusic ();
2521
1845CFPlus::MixMusic 2522DC::MixMusic
1846new_from_file (SV *class, char *path) 2523new (SV *class, DC::RW rwops)
1847 CODE: 2524 CODE:
1848 RETVAL = Mix_LoadMUS (path); 2525 RETVAL = Mix_LoadMUS_RW (rwops);
1849 OUTPUT: 2526 OUTPUT:
1850 RETVAL 2527 RETVAL
1851 2528
1852void 2529void
1853DESTROY (CFPlus::MixMusic self) 2530DESTROY (DC::MixMusic self)
1854 CODE: 2531 CODE:
1855 Mix_FreeMusic (self); 2532 Mix_FreeMusic (self);
1856 2533
1857int 2534int
1858play (CFPlus::MixMusic self, int loops = -1) 2535play (DC::MixMusic self, int loops = -1)
1859 CODE: 2536 CODE:
1860 RETVAL = Mix_PlayMusic (self, loops); 2537 RETVAL = Mix_PlayMusic (self, loops);
1861 OUTPUT: 2538 OUTPUT:
1862 RETVAL 2539 RETVAL
1863 2540
1864MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2541void
2542fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2543 CODE:
2544 Mix_FadeInMusicPos (self, loops, ms, position);
2545
2546MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2547
2548PROTOTYPES: ENABLE
1865 2549
1866BOOT: 2550BOOT:
1867{ 2551{
1868 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2552 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1869 static const struct { 2553 static const struct {
1870 const char *name; 2554 const char *name;
1871 IV iv; 2555 IV iv;
1872 } *civ, const_iv[] = { 2556 } *civ, const_iv[] = {
1873# define const_iv(name) { # name, (IV)name } 2557# define const_iv(name) { # name, (IV)name }
2558 const_iv (GL_VENDOR),
2559 const_iv (GL_VERSION),
2560 const_iv (GL_EXTENSIONS),
1874 const_iv (GL_COLOR_MATERIAL), 2561 const_iv (GL_COLOR_MATERIAL),
1875 const_iv (GL_SMOOTH), 2562 const_iv (GL_SMOOTH),
1876 const_iv (GL_FLAT), 2563 const_iv (GL_FLAT),
1877 const_iv (GL_DITHER), 2564 const_iv (GL_DITHER),
1878 const_iv (GL_BLEND), 2565 const_iv (GL_BLEND),
1882 const_iv (GL_ALPHA_TEST), 2569 const_iv (GL_ALPHA_TEST),
1883 const_iv (GL_NORMALIZE), 2570 const_iv (GL_NORMALIZE),
1884 const_iv (GL_RESCALE_NORMAL), 2571 const_iv (GL_RESCALE_NORMAL),
1885 const_iv (GL_FRONT), 2572 const_iv (GL_FRONT),
1886 const_iv (GL_BACK), 2573 const_iv (GL_BACK),
2574 const_iv (GL_AUX0),
1887 const_iv (GL_AND), 2575 const_iv (GL_AND),
1888 const_iv (GL_ONE), 2576 const_iv (GL_ONE),
1889 const_iv (GL_ZERO), 2577 const_iv (GL_ZERO),
1890 const_iv (GL_SRC_ALPHA), 2578 const_iv (GL_SRC_ALPHA),
1891 const_iv (GL_DST_ALPHA), 2579 const_iv (GL_DST_ALPHA),
1904 const_iv (GL_INTENSITY), 2592 const_iv (GL_INTENSITY),
1905 const_iv (GL_LUMINANCE), 2593 const_iv (GL_LUMINANCE),
1906 const_iv (GL_LUMINANCE_ALPHA), 2594 const_iv (GL_LUMINANCE_ALPHA),
1907 const_iv (GL_FLOAT), 2595 const_iv (GL_FLOAT),
1908 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2596 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2597 const_iv (GL_COMPRESSED_ALPHA_ARB),
2598 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2599 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2600 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2601 const_iv (GL_COMPRESSED_RGB_ARB),
2602 const_iv (GL_COMPRESSED_RGBA_ARB),
1909 const_iv (GL_COMPILE), 2603 const_iv (GL_COMPILE),
2604 const_iv (GL_PROXY_TEXTURE_1D),
2605 const_iv (GL_PROXY_TEXTURE_2D),
1910 const_iv (GL_TEXTURE_1D), 2606 const_iv (GL_TEXTURE_1D),
1911 const_iv (GL_TEXTURE_2D), 2607 const_iv (GL_TEXTURE_2D),
1912 const_iv (GL_TEXTURE_ENV), 2608 const_iv (GL_TEXTURE_ENV),
1913 const_iv (GL_TEXTURE_MAG_FILTER), 2609 const_iv (GL_TEXTURE_MAG_FILTER),
1914 const_iv (GL_TEXTURE_MIN_FILTER), 2610 const_iv (GL_TEXTURE_MIN_FILTER),
1935 const_iv (GL_COLOR_LOGIC_OP), 2631 const_iv (GL_COLOR_LOGIC_OP),
1936 const_iv (GL_SEPARABLE_2D), 2632 const_iv (GL_SEPARABLE_2D),
1937 const_iv (GL_CONVOLUTION_2D), 2633 const_iv (GL_CONVOLUTION_2D),
1938 const_iv (GL_CONVOLUTION_BORDER_MODE), 2634 const_iv (GL_CONVOLUTION_BORDER_MODE),
1939 const_iv (GL_CONSTANT_BORDER), 2635 const_iv (GL_CONSTANT_BORDER),
2636 const_iv (GL_POINTS),
1940 const_iv (GL_LINES), 2637 const_iv (GL_LINES),
1941 const_iv (GL_LINE_STRIP), 2638 const_iv (GL_LINE_STRIP),
1942 const_iv (GL_LINE_LOOP), 2639 const_iv (GL_LINE_LOOP),
1943 const_iv (GL_QUADS), 2640 const_iv (GL_QUADS),
1944 const_iv (GL_QUAD_STRIP), 2641 const_iv (GL_QUAD_STRIP),
1945 const_iv (GL_TRIANGLES), 2642 const_iv (GL_TRIANGLES),
1946 const_iv (GL_TRIANGLE_STRIP), 2643 const_iv (GL_TRIANGLE_STRIP),
1947 const_iv (GL_TRIANGLE_FAN), 2644 const_iv (GL_TRIANGLE_FAN),
2645 const_iv (GL_POLYGON),
1948 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2646 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2647 const_iv (GL_POINT_SMOOTH_HINT),
2648 const_iv (GL_LINE_SMOOTH_HINT),
2649 const_iv (GL_POLYGON_SMOOTH_HINT),
2650 const_iv (GL_GENERATE_MIPMAP_HINT),
2651 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1949 const_iv (GL_FASTEST), 2652 const_iv (GL_FASTEST),
2653 const_iv (GL_DONT_CARE),
2654 const_iv (GL_NICEST),
1950 const_iv (GL_V2F), 2655 const_iv (GL_V2F),
1951 const_iv (GL_V3F), 2656 const_iv (GL_V3F),
1952 const_iv (GL_T2F_V3F), 2657 const_iv (GL_T2F_V3F),
1953 const_iv (GL_T2F_N3F_V3F), 2658 const_iv (GL_T2F_N3F_V3F),
1954# undef const_iv 2659# undef const_iv
1955 }; 2660 };
1956 2661
1957 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2662 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1958 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2663 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2664
2665 texture_av = newAV ();
2666 AvREAL_off (texture_av);
1959} 2667}
2668
2669void
2670disable_GL_EXT_blend_func_separate ()
2671 CODE:
2672 gl.BlendFuncSeparate = 0;
2673 gl.BlendFuncSeparateEXT = 0;
1960 2674
1961char * 2675char *
1962gl_vendor () 2676gl_vendor ()
1963 CODE: 2677 CODE:
1964 RETVAL = (char *)glGetString (GL_VENDOR); 2678 RETVAL = (char *)glGetString (GL_VENDOR);
1977 CODE: 2691 CODE:
1978 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2692 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1979 OUTPUT: 2693 OUTPUT:
1980 RETVAL 2694 RETVAL
1981 2695
2696const char *glGetString (GLenum pname)
2697
2698GLint glGetInteger (GLenum pname)
2699 CODE:
2700 glGetIntegerv (pname, &RETVAL);
2701 OUTPUT:
2702 RETVAL
2703
2704GLdouble glGetDouble (GLenum pname)
2705 CODE:
2706 glGetDoublev (pname, &RETVAL);
2707 OUTPUT:
2708 RETVAL
2709
1982int glGetError () 2710int glGetError ()
1983 2711
1984void glFinish () 2712void glFinish ()
1985 2713
1986void glClear (int mask) 2714void glClear (int mask)
2023# near_ and far_ are due to microsofts buggy "c" compiler 2751# near_ and far_ are due to microsofts buggy "c" compiler
2024void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2752void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2025 2753
2026# near_ and far_ are due to microsofts buggy "c" compiler 2754# near_ and far_ are due to microsofts buggy "c" compiler
2027void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2755void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2756
2757PROTOTYPES: DISABLE
2028 2758
2029void glViewport (int x, int y, int width, int height) 2759void glViewport (int x, int y, int width, int height)
2030 2760
2031void glScissor (int x, int y, int width, int height) 2761void glScissor (int x, int y, int width, int height)
2032 2762
2040 2770
2041void glRotate (float angle, float x, float y, float z) 2771void glRotate (float angle, float x, float y, float z)
2042 CODE: 2772 CODE:
2043 glRotatef (angle, x, y, z); 2773 glRotatef (angle, x, y, z);
2044 2774
2045void glBegin (int mode)
2046
2047void glEnd ()
2048
2049void glColor (float r, float g, float b, float a = 1.0) 2775void glColor (float r, float g, float b, float a = 1.0)
2050 PROTOTYPE: @
2051 ALIAS: 2776 ALIAS:
2052 glColor_premultiply = 1 2777 glColor_premultiply = 1
2053 CODE: 2778 CODE:
2054 if (ix) 2779 if (ix)
2055 { 2780 {
2058 b *= a; 2783 b *= a;
2059 } 2784 }
2060 // microsoft visual "c" rounds instead of truncating... 2785 // microsoft visual "c" rounds instead of truncating...
2061 glColor4f (r, g, b, a); 2786 glColor4f (r, g, b, a);
2062 2787
2063void glInterleavedArrays (int format, int stride, char *data)
2064
2065void glDrawElements (int mode, int count, int type, char *indices)
2066
2067# 1.2 void glDrawRangeElements (int mode, int start, int end
2068
2069void glRasterPos (float x, float y, float z = 0.) 2788void glRasterPos (float x, float y, float z = 0.)
2070 CODE: 2789 CODE:
2071 glRasterPos3f (0, 0, z); 2790 glRasterPos3f (0, 0, z);
2072 glBitmap (0, 0, 0, 0, x, y, 0); 2791 glBitmap (0, 0, 0, 0, x, y, 0);
2073 2792
2077 2796
2078void glTexCoord (float s, float t) 2797void glTexCoord (float s, float t)
2079 CODE: 2798 CODE:
2080 glTexCoord2f (s, t); 2799 glTexCoord2f (s, t);
2081 2800
2801void glRect (float x1, float y1, float x2, float y2)
2802 CODE:
2803 glRectf (x1, y1, x2, y2);
2804
2805void glRect_lineloop (float x1, float y1, float x2, float y2)
2806 CODE:
2807 glBegin (GL_LINE_LOOP);
2808 glVertex2f (x1, y1);
2809 glVertex2f (x2, y1);
2810 glVertex2f (x2, y2);
2811 glVertex2f (x1, y2);
2812 glEnd ();
2813
2814PROTOTYPES: ENABLE
2815
2816void glBegin (int mode)
2817
2818void glEnd ()
2819
2820void glPointSize (GLfloat size)
2821
2822void glLineWidth (GLfloat width)
2823
2824void glInterleavedArrays (int format, int stride, char *data)
2825
2826void glDrawElements (int mode, int count, int type, char *indices)
2827
2828# 1.2 void glDrawRangeElements (int mode, int start, int end
2829
2082void glTexEnv (int target, int pname, float param) 2830void glTexEnv (int target, int pname, float param)
2083 CODE: 2831 CODE:
2084 glTexEnvf (target, pname, param); 2832 glTexEnvf (target, pname, param);
2085 2833
2086void glTexParameter (int target, int pname, float param) 2834void glTexParameter (int target, int pname, float param)
2102void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2850void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2103 CODE: 2851 CODE:
2104 if (gl.SeparableFilter2D) 2852 if (gl.SeparableFilter2D)
2105 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2853 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2106 2854
2107void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2855void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2108 2856
2109void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2857void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2110 2858
2111void glDrawPixels (int width, int height, int format, int type, char *pixels) 2859void glDrawPixels (int width, int height, int format, int type, char *pixels)
2860
2861void glPixelZoom (float x, float y)
2112 2862
2113void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2863void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2114 2864
2115int glGenTexture () 2865int glGenTexture ()
2116 CODE: 2866 CODE:
2117{ 2867 RETVAL = gen_texture ();
2118 GLuint name;
2119 glGenTextures (1, &name);
2120 RETVAL = name;
2121}
2122 OUTPUT: 2868 OUTPUT:
2123 RETVAL 2869 RETVAL
2124 2870
2125void glDeleteTexture (int name) 2871void glDeleteTexture (int name)
2126 CODE: 2872 CODE:
2127{
2128 GLuint name_ = name;
2129 glDeleteTextures (1, &name_); 2873 del_texture (name);
2130} 2874
2131
2132int glGenList () 2875int glGenList ()
2133 CODE: 2876 CODE:
2134 RETVAL = glGenLists (1); 2877 RETVAL = glGenLists (1);
2135 OUTPUT: 2878 OUTPUT:
2136 RETVAL 2879 RETVAL
2143 2886
2144void glEndList () 2887void glEndList ()
2145 2888
2146void glCallList (int list) 2889void glCallList (int list)
2147 2890
2891MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2892
2893PROTOTYPES: DISABLE
2894
2895void
2896find_widget (SV *self, NV x, NV y)
2897 PPCODE:
2898{
2899 if (within_widget (self, x, y))
2900 XPUSHs (self);
2901}
2902
2903BOOT:
2904{
2905 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2906
2907 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2908 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2909 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2910 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2911}
2912
2913void
2914draw (SV *self)
2915 CODE:
2916{
2917 HV *hv;
2918 SV **svp;
2919 NV x, y, w, h;
2920 SV *draw_x_sv = GvSV (draw_x_gv);
2921 SV *draw_y_sv = GvSV (draw_y_gv);
2922 SV *draw_w_sv = GvSV (draw_w_gv);
2923 SV *draw_h_sv = GvSV (draw_h_gv);
2924 double draw_x, draw_y;
2925
2926 if (!SvROK (self))
2927 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2928
2929 hv = (HV *)SvRV (self);
2930
2931 if (SvTYPE (hv) != SVt_PVHV)
2932 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2933
2934 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2935 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2936
2937 if (!h || !w)
2938 XSRETURN_EMPTY;
2939
2940 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2941 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2942
2943 draw_x = SvNV (draw_x_sv) + x;
2944 draw_y = SvNV (draw_y_sv) + y;
2945
2946 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2947 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2948 XSRETURN_EMPTY;
2949
2950 sv_setnv (draw_x_sv, draw_x);
2951 sv_setnv (draw_y_sv, draw_y);
2952
2953 glPushMatrix ();
2954 glTranslated (x, y, 0);
2955
2956 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2957 {
2958 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2959
2960 if (svp && SvTRUE (*svp))
2961 {
2962 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2963 glEnable (GL_BLEND);
2964 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2965 glBegin (GL_QUADS);
2966 glVertex2f (0, 0);
2967 glVertex2f (w, 0);
2968 glVertex2f (w, h);
2969 glVertex2f (0, h);
2970 glEnd ();
2971 glDisable (GL_BLEND);
2972 }
2973 }
2974#if 0
2975 // draw borders, for debugging
2976 glPushMatrix ();
2977 glColor4f (1., 1., 0., 1.);
2978 glTranslatef (.5, .5, 0.);
2979 glBegin (GL_LINE_LOOP);
2980 glVertex2f (0 , 0);
2981 glVertex2f (w - 1, 0);
2982 glVertex2f (w - 1, h - 1);
2983 glVertex2f (0 , h - 1);
2984 glEnd ();
2985 glPopMatrix ();
2986#endif
2987 PUSHMARK (SP);
2988 XPUSHs (self);
2989 PUTBACK;
2990 call_method ("_draw", G_VOID | G_DISCARD);
2991 SPAGAIN;
2992
2993 glPopMatrix ();
2994
2995 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2996 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2997}
2998

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines