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.160 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.243 by root, Thu Dec 27 06:54:36 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines