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.287 by root, Sun Dec 21 21:54:27 2008 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
70# include <netinet/in.h> 76# include <netinet/in.h>
71# include <netinet/tcp.h> 77# include <netinet/tcp.h>
72# include <inttypes.h> 78# include <inttypes.h>
73#endif 79#endif
74 80
75#if __GNUC__ >= 4 81#include "ecb.h"
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83 82
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 64 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
87 89
88#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
90 92
91#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
95 97
96#define KMOD_LRAM 0x10000 // our extension 98#define KMOD_LRAM 0x10000 // our extension
97 99
98#define TEXID_SPEECH 1 100#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 101#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 102
103static char *
104fast_sv_grow (SV *sv, STRLEN need)
105{
106 STRLEN len = SvLEN (sv);
107 STRLEN want = SvCUR (sv) + need;
108
109 if (ecb_expect_false (len < want))
110 {
111 do
112 len *= 2;
113 while (len < want);
114
115 sv_grow (sv, len);
116 }
117
118 SvCUR_set (sv, want);
119 return SvEND (sv) - need;
120}
101 121
102static AV *texture_av; 122static AV *texture_av;
103 123
104static struct 124static struct
105{ 125{
162{ 182{
163 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
164 184
165 while (attrs) 185 while (attrs)
166 { 186 {
167 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 188
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 190 return 1;
171 191
172 attrs = attrs->next; 192 attrs = attrs->next;
173 } 193 }
174 194
175 return 0; 195 return 0;
176} 196}
177 197
178typedef struct cf_layout { 198struct cf_layout {
179 PangoLayout *pl; 199 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
181 int base_height; 201 int base_height;
182 DC__Font font; 202 DC__Font font;
183 rc_t *rc; 203 rc_t rc;
184} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
185 207
186static DC__Font default_font; 208static DC__Font default_font;
187static PangoContext *opengl_context; 209static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
189 211
190static void 212static void
191substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
192{ 214{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 218#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 220}
199 221
200static void 222static void
227 249
228 *w = rect.width; 250 *w = rect.width;
229 *h = rect.height; 251 *h = rect.height;
230} 252}
231 253
254/////////////////////////////////////////////////////////////////////////////
255
232typedef uint16_t tileid; 256typedef uint16_t tileid;
233typedef uint16_t faceid; 257typedef uint16_t faceid;
234 258
235typedef struct { 259struct maptex
260{
236 GLuint name; 261 GLuint name;
237 int w, h; 262 int w, h;
238 float s, t; 263 float s, t;
239 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
240 tileid smoothtile; 265 tileid smoothtile;
241 uint8_t smoothlevel; 266 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 267 uint8_t unused; /* set to zero on use */
243} maptex; 268};
244 269
245typedef struct { 270struct mapcell
271{
246 uint32_t player; 272 uint32_t player;
247 tileid tile[3]; 273 tileid tile[3];
248 uint16_t darkness; 274 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 276};
251 277
252typedef struct { 278struct maprow
279{
253 int32_t c0, c1; 280 int32_t c0, c1;
254 mapcell *col; 281 mapcell *col;
255} maprow; 282};
256 283
257typedef struct map { 284struct mapgrid {
258 int x, y, w, h; 285 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
261 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
262 289
263 int32_t rows; 290 int32_t rows;
264 maprow *row; 291 maprow *row;
265} *DC__Map; 292};
266 293
267static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
268prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
269{ 299{
270 char *p; 300 T *p;
271 301
272 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
273 Zero (p, inc, char); 303 Zero (p, inc, T);
274 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
275 Safefree (ptr); 305 Safefree (ptr);
276 306
277 return p; 307 ptr = p;
278} 308}
279 309
280static char * 310template<typename T>
281append (char *ptr, int sze, int inc)
282{
283 Renew (ptr, sze + inc, char);
284 Zero (ptr + sze, inc, char);
285
286 return ptr;
287}
288
289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291
292static void 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
293need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
294{ 320{
295 while (self->faces <= face) 321 while (self->faces <= face)
296 { 322 {
297 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
298 self->faces *= 2; 324 self->faces *= 2;
299 } 325 }
300} 326}
301 327
302static void 328static void
303need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
304{ 330{
305 while (self->texs <= texid) 331 while (self->texs <= texid)
306 { 332 {
307 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
308 self->texs *= 2; 334 self->texs *= 2;
309 } 335 }
310} 336}
311 337
312static maprow * 338static maprow *
313map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
314{ 340{
315 if (0 > y) 341 if (0 > y)
316 { 342 {
317 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
319 345
320 self->rows += extend; 346 self->rows += extend;
321 self->y += extend; 347 self->y += extend;
322 y += extend; 348 y += extend;
323 } 349 }
324 else if (y >= self->rows) 350 else if (y >= self->rows)
325 { 351 {
326 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
327 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
328 self->rows += extend; 354 self->rows += extend;
329 } 355 }
330 356
331 return self->row + y; 357 return self->row + y;
332} 358}
342 } 368 }
343 369
344 if (row->c0 > x) 370 if (row->c0 > x)
345 { 371 {
346 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
347 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
348 row->c0 -= extend; 374 row->c0 -= extend;
349 } 375 }
350 else if (x >= row->c1) 376 else if (x >= row->c1)
351 { 377 {
352 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
353 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
354 row->c1 += extend; 380 row->c1 += extend;
355 } 381 }
356 382
357 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
358} 384}
359 385
360static mapcell * 386static mapcell *
361map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
362{ 388{
363 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
364} 390}
365 391
366static void 392static void
367map_clear (DC__Map self) 393map_clear (mapgrid *self)
368{ 394{
369 int r; 395 int r;
370 396
371 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
372 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
390 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
391 (cell)->player = 0; \ 417 (cell)->player = 0; \
392 } while (0) 418 } while (0)
393 419
394static void 420static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 422{
397 int x, y; 423 int x, y;
398 maprow *row; 424 maprow *row;
399 mapcell *cell; 425 mapcell *cell;
400 426
417 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
418 } 444 }
419 } 445 }
420} 446}
421 447
422typedef struct { 448struct smooth_key
449{
423 tileid tile; 450 tileid tile;
424 uint8_t x, y, level; 451 uint8_t x, y, level;
425} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
426 471
427static void 472static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 474{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
431 476
432 if (SvIOK (*sv)) 477 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
434 else 479 else
435 sv_setiv (*sv, bits); 480 it->second |= bits;
436} 481}
437 482
438static void 483static void
439music_finished (void) 484music_finished (void)
440{ 485{
457 ev.code = 1; 502 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 504 ev.data2 = 0;
460 505
461 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
462} 514}
463 515
464static unsigned int 516static unsigned int
465minpot (unsigned int n) 517minpot (unsigned int n)
466{ 518{
476 n |= n >> 16; 528 n |= n >> 16;
477 529
478 return n + 1; 530 return n + 1;
479} 531}
480 532
481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
492/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
493#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
494#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
495 536
496/******************************************************************************/ 537/******************************************************************************/
549 590
550 return mod; 591 return mod;
551} 592}
552 593
553static void 594static void
554deliantra_main () 595deliantra_main (SV *real_main)
555{ 596{
556 char *argv[] = { 0 }; 597 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
558} 601}
559 602
560#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
561 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 607 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which, 608 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
566 */ 611 */
567 extern C_LINKAGE int 612 extern C_LINKAGE int
568 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
569 { 614 {
570 deliantra_main (); 615 deliantra_main (real_main);
571 } 616 }
572 617
573 #undef main 618 #undef main
574 619
575 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
576 621
577 static void 622 static void
578 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
579 { 624 {
625 real_main = real_main_;
626
580 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 628 (main) (1, argv);
582 } 629 }
583#else 630#else
584 static void 631 static void
585 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
586 { 633 {
587 deliantra_main (); 634 deliantra_main (real_main);
588 } 635 }
589#endif 636#endif
590 637
591MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
592 639
793 840
794 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
795# undef const_iv 842# undef const_iv
796 }; 843 };
797 844
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 845 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 847
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 850}
804 851
819 866
820NV ceil (NV x) 867NV ceil (NV x)
821 868
822IV minpot (UV n) 869IV minpot (UV n)
823 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
824IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
825 888
826void 889void
827pango_init () 890pango_init ()
828 CODE: 891 CODE:
829{ 892{
837#endif 900#endif
838} 901}
839 902
840char *SDL_GetError () 903char *SDL_GetError ()
841 904
842void SDL_braino () 905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
843 907
844int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
845 909
846int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
847 911
848void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
849 913
850void SDL_Quit () 914void SDL_Quit ()
851 915
852int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
853 918
854int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
855 CODE: 920 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
858 OUTPUT: 923 OUTPUT:
859 RETVAL 924 RETVAL
860 925
861void 926void
916 ); 981 );
917 982
918 if (RETVAL) 983 if (RETVAL)
919 { 984 {
920 av_clear (texture_av); 985 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924#include "glfunc.h" 987#include "glfunc.h"
925#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 991 }
927} 992}
928 OUTPUT: 993 OUTPUT:
929 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
930 998
931void 999void
932SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
933 1001
934char * 1002char *
935SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
936 1005
937int 1006int
938SDL_GetAppState () 1007SDL_GetAppState ()
939 1008
940int 1009int
941SDL_GetModState () 1010SDL_GetModState ()
942 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
943void 1016void
1017SDL_PumpEvents ()
1018
1019void
944poll_events () 1020peep_events ()
945 PPCODE: 1021 PPCODE:
946{ 1022{
947 SDL_Event ev; 1023 SDL_Event ev;
948 1024
949 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
1015 1091
1016 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017 } 1093 }
1018} 1094}
1019 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
1020int 1109int
1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022 POSTCALL: 1111 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
1025 1114
1026void 1115void
1027Mix_QuerySpec () 1116Mix_QuerySpec ()
1086add_font (char *file) 1175add_font (char *file)
1087 CODE: 1176 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1178 OUTPUT:
1090 RETVAL 1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1091 1187
1092void 1188void
1093load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
1094 ALIAS: 1190 ALIAS:
1095 load_image_file = 1 1191 load_image_file = 1
1141 1237
1142 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1147 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1151 1247
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1320
1225PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1226 1322
1227DC::Font 1323DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1325 CODE:
1230{ 1326{
1231 int count; 1327 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1358 PROTOTYPE:
1263 CODE: 1359 CODE:
1264 tc_restore (); 1360 tc_restore ();
1265 1361
1266DC::Layout 1362DC::Layout
1267new (SV *class) 1363new (SV *klass)
1268 CODE: 1364 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1270 1366
1271 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1273 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1274 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1275 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1276 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1277 RETVAL->font = 0; 1373 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1279 1374
1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1281 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1282 OUTPUT: 1377 OUTPUT:
1283 RETVAL 1378 RETVAL
1284 1379
1285void 1380void
1286DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1287 CODE: 1382 CODE:
1288 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1289 rc_free (self->rc);
1290 Safefree (self); 1384 delete self;
1291 1385
1292void 1386void
1293set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1294 CODE: 1388 CODE:
1295{ 1389{
1421 1515
1422void 1516void
1423set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1424 CODE: 1518 CODE:
1425 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1426 { 1520 {
1427 self->base_height = base_height; 1521 self->base_height = base_height;
1428 layout_update_font (self); 1522 layout_update_font (self);
1429 } 1523 }
1430 1524
1431void 1525void
1549} 1643}
1550 1644
1551void 1645void
1552render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1553 CODE: 1647 CODE:
1554 rc_clear (self->rc); 1648 self->rc.clear ();
1555 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1556 self->pl, 1650 self->pl,
1557 self->rc, 1651 &self->rc,
1558 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1559 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1560 flags 1654 flags
1561 ); 1655 );
1562 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1577 1671
1578 rc_draw (self->rc); 1672 self->rc.draw ();
1579 1673
1580 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1583} 1677}
1658 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1659 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1660 } 1754 }
1661} 1755}
1662 1756
1757void
1758draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1663IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664 CODE: 1879 CODE:
1665{ 1880{
1666 GLint width; 1881 GLint width;
1667 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1674MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1675 1890
1676PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1677 1892
1678DC::Map 1893DC::Map
1679new (SV *class) 1894new (SV *klass)
1680 CODE: 1895 CODE:
1681 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1682 RETVAL->x = 0; 1897 RETVAL->x = 0;
1683 RETVAL->y = 0; 1898 RETVAL->y = 0;
1684 RETVAL->w = 0; 1899 RETVAL->w = 0;
1685 RETVAL->h = 0; 1900 RETVAL->h = 0;
1686 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1723 1938
1724void 1939void
1725set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1726 CODE: 1941 CODE:
1727{ 1942{
1728 tileid texid; 1943 tileid texid;
1729 maptex *tex; 1944 maptex *tex;
1730 1945
1731 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1732 return; 1947 return;
1733 1948
1734 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1735 return; 1950 return;
1736 1951
1737 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1738 1953
1739 if (!texid) 1954 if (!texid)
1740 return; 1955 return;
1741 1956
1742 tex = self->tex + texid; 1957 tex = self->tex + texid;
1775} 1990}
1776 1991
1777void 1992void
1778expire_textures (DC::Map self, int texid, int count) 1993expire_textures (DC::Map self, int texid, int count)
1779 PPCODE: 1994 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count) 1995 for (; texid < self->texs && count; ++texid, --count)
1781 { 1996 {
1782 maptex *tex = self->tex + texid; 1997 maptex *tex = self->tex + texid;
1783 1998
1784 if (tex->name) 1999 if (tex->name)
1785 { 2000 {
1832 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1833 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1834 2049
1835 while (self->y < 0) 2050 while (self->y < 0)
1836 { 2051 {
1837 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1838 2053
1839 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1840 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1841 } 2056 }
1842} 2057}
1843 2058
1844SV * 2059SV *
1845map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1846 CODE: 2061 CODE:
1847{ 2062{
1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1849 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1850 mapcell *cell; 2065 mapcell *cell;
1871 2086
1872 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1873 2088
1874 if (flags & 8) 2089 if (flags & 8)
1875 { 2090 {
2091 uint8_t ext, cmd;
2092
1876 if (extmap) 2093 do
1877 { 2094 {
1878 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1879 2097
1880 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1881 { 2101 {
1882 ext = *data++;
1883 cmd = ext & 0x7f;
1884
1885 if (cmd < 4)
1886 cell->darkness = 255 - ext * 64 + 1;
1887 else if (cmd == 5) // health
1888 {
1889 cell->stat_width = 1; 2102 cell->stat_width = 1;
1890 cell->stat_hp = *data++; 2103 cell->stat_hp = *data++;
1891 }
1892 else if (cmd == 6) // monster width
1893 cell->stat_width = *data++ + 1;
1894 else if (cmd == 0x47)
1895 {
1896 if (*data == 1) cell->player = data [1];
1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1900
1901 data += *data + 1;
1902 }
1903 else if (cmd == 8) // cell flags
1904 cell->flags = *data++;
1905 else if (ext & 0x40) // unknown, multibyte => skip
1906 data += *data + 1;
1907 else
1908 data++;
1909 } 2104 }
1910 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1911 } 2122 }
1912 else 2123 while (ext & 0x80);
1913 cell->darkness = *data++ + 1;
1914 } 2124 }
1915 2125
1916 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1917 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1918 { 2128 {
1966 ? self->row + y 2176 ? self->row + y
1967 : 0; 2177 : 0;
1968 2178
1969 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1970 { 2180 {
1971 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1972 2182
1973 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1974 { 2184 {
1975 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1976 2186
1978 { 2188 {
1979 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1980 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1981 int a1 = tex.a; 2191 int a1 = tex.a;
1982 2192
1983 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1984 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1985 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1986 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1987 } 2197 }
1988 } 2198 }
1989 2199
1990 *map++ = (r ) 2200 *map++ = (r )
1991 | (g << 8) 2201 | (g << 8)
1992 | (b << 16) 2202 | (b << 16)
1993 | (a << 24); 2203 | (a << 24);
1994 } 2204 }
1995 } 2205 }
1996 2206
1997 RETVAL = map_sv; 2207 RETVAL = map_sv;
1998} 2208}
1999 OUTPUT: 2209 OUTPUT:
2000 RETVAL 2210 RETVAL
2001 2211
2002void 2212void
2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2213draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2004 CODE: 2214 CODE:
2005{ 2215{
2006 int x, y, z; 2216 int x, y, z;
2007 2217
2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2011 smooth_key skey;
2012 int pl_x, pl_y; 2219 int pl_x, pl_y;
2013 maptex pl_tex; 2220 maptex pl_tex;
2014 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2015 rc_t *rc_ov = rc_alloc (); 2222 rc_t rc_ov;
2016 rc_key_t key; 2223 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden; 2224 rc_t::array_t *arr;
2018 2225
2019 pl_tex.name = 0; 2226 pl_tex.name = 0;
2020 2227
2021 // thats current max. sorry. 2228 // that's current max. sorry.
2022 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
2023 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
2024
2025 // clear key, in case of extra padding
2026 memset (&skey, 0, sizeof (skey));
2027 2231
2028 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
2029 key.r = 255; 2233 key.r = 255;
2030 key.g = 255; 2234 key.g = 255;
2031 key.b = 255; 2235 key.b = 255;
2037 my += self->y; 2241 my += self->y;
2038 2242
2039 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
2040 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
2041 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
2042 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2043 2247
2044 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
2046 { 2250 {
2047 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
2060 2264
2061 glEnable (GL_BLEND); 2265 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064 2268
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
2068 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
2069 { 2270 {
2070 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2071 key.texname = -1; 2274 key.texname = -1;
2072 2275
2073 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
2075 { 2278 {
2092 2295
2093 if (!tex.name) 2296 if (!tex.name)
2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2095 2298
2096 key.texname = tex.name; 2299 key.texname = tex.name;
2097 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
2098 } 2301 }
2099 2302
2100 px = (x + 1) * T - tex.w; 2303 px = (x + 1) * Th - tex.w;
2101 py = (y + 1) * T - tex.h; 2304 py = (y + 1) * Tw - tex.h;
2102 2305
2103 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2104 { 2307 {
2105 pl_x = px; 2308 pl_x = px;
2106 pl_y = py; 2309 pl_y = py;
2107 pl_tex = tex; 2310 pl_tex = tex;
2108 continue; 2311 continue;
2109 } 2312 }
2110 2313
2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2112 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2115 2318
2116 // update smooth hash 2319 // update smooth hash
2117 if (tex.smoothtile) 2320 if (tex.smoothtile)
2118 { 2321 {
2119 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
2120 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
2121 2324
2122 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
2123 2326
2124 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
2125 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
2126 2329
2127 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
2135 2338
2136 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2137 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
2138 2341
2139 // full tile 2342 // full tile
2140 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2141 2344
2142 // borders 2345 // borders
2143 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2144 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2145 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2146 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2147 2350
2148 // corners 2351 // corners
2149 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2150 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2151 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2153 } 2356 }
2154 } 2357 }
2155 2358
2156 if (expect_false (z == 2)) 2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2157 { 2360 {
2158 /* draw question marks on top of hidden spaces */ 2361 // overlays such as the speech bubble, probably more to come
2159 if (!cell->darkness) 2362 if (cell->flags & 1)
2160 { 2363 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key; 2364 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH]; 2365 maptex tex = self->tex[TEXID_SPEECH];
2178 rc_array_t *arr; 2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2179 2368
2180 key_ov.texname = tex.name; 2369 key_ov.texname = tex.name;
2181 arr = rc_array (rc_ov, &key_ov); 2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2182 2371
2183 int px = x * T + T * 2 / 32;
2184 int py = y * T - T * 6 / 32;
2185
2186 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2187 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2188 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2189 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2190 }
2191 } 2376 }
2192 } 2377 }
2193 } 2378 }
2194 } 2379 }
2195 2380
2196 rc_draw (rc); 2381 rc.draw ();
2197 rc_clear (rc); 2382 rc.clear ();
2198 2383
2199 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2200 // this is basically counting sort 2385 // this is basically counting sort
2201 { 2386 {
2202 int w, b; 2387 int w, b;
2203 2388
2204 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2205 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2206 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2207 { 2394 {
2208 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2209 if (smask) 2396 IV bits = it->second;
2210 for (b = 0; b < 32; ++b) 2397
2211 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2212 { 2401 {
2213 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2214 HE *he; 2410 if (tex.name)
2215
2216 hv_iterinit (smooth);
2217 while ((he = hv_iternext (smooth)))
2218 { 2411 {
2219 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2220 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2221 2414 if (key.texname != tex.name)
2222 if (!(bits & 0x1000)
2223 && skey->level == level
2224 && level > smooth_max [skey->x][skey->y])
2225 { 2415 {
2226 maptex tex = self->tex [skey->tile];
2227 int px = (((int)skey->x) - 1) * T;
2228 int py = (((int)skey->y) - 1) * T;
2229 int border = bits & 15;
2230 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2231 float dx = tex.s * .0625f; // 16 images/row
2232 float dy = tex.t * .5f ; // 2 images/column
2233
2234 if (tex.name)
2235 {
2236 // this time avoiding texture state changes
2237 // save gobs of state changes.
2238 if (key.texname != tex.name)
2239 {
2240 self->tex [skey->tile].unused = 0; 2416 self->tex [skey.tile].unused = 0;
2241 2417
2242 glEnd (); 2418 glEnd ();
2243 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2244 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2245 } 2421 }
2246 2422
2247 if (border) 2423 if (border)
2248 { 2424 {
2249 float ox = border * dx; 2425 float ox = border * dx;
2250 2426
2251 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2252 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2253 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2254 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2255 } 2431 }
2256 2432
2257 if (corner) 2433 if (corner)
2258 { 2434 {
2259 float ox = corner * dx; 2435 float ox = corner * dx;
2260 2436
2261 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2262 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2263 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2264 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2265 }
2266 }
2267 } 2441 }
2268 } 2442 }
2269 } 2443 }
2270 } 2444 }
2271 2445
2272 glEnd (); 2446 glEnd ();
2273 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2274 key.texname = -1; 2448 key.texname = -1;
2275 } 2449 }
2276
2277 hv_clear (smooth);
2278 } 2450 }
2279 2451
2280 if (pl_tex.name) 2452 if (pl_tex.name)
2281 { 2453 {
2282 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2283 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2284 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2285 2457
2286 key.texname = tex.name; 2458 key.texname = tex.name;
2287 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2288 2460
2289 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2290 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2292 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2293 2465
2294 rc_draw (rc); 2466 rc.draw ();
2295 } 2467 }
2296 2468
2297 rc_draw (rc_ov); 2469 rc_ov.draw ();
2298 rc_clear (rc_ov); 2470 rc_ov.clear ();
2299 2471
2300 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2301 rc_free (rc);
2302 rc_free (rc_ov);
2303 2473
2304 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2305 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2306 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2307 { 2477 {
2310 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2311 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2312 { 2482 {
2313 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2314 2484
2315 int px = x * T; 2485 int px = x * Tw;
2316 int py = y * T; 2486 int py = y * Th;
2317 2487
2318 if (expect_false (cell->player == player)) 2488 if (ecb_expect_false (cell->player == player))
2319 { 2489 {
2320 px += sdx; 2490 px += sdx;
2321 py += sdy; 2491 py += sdy;
2322 } 2492 }
2323 2493
2324 if (cell->stat_hp) 2494 if (cell->stat_hp)
2325 { 2495 {
2326 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2327 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2328 2498
2329 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2330 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2331 px + width - 1, py); 2501 px + width - 1, py);
2332 2502
2338 } 2508 }
2339 } 2509 }
2340} 2510}
2341 2511
2342void 2512void
2343draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2344 CODE: 2514 CODE:
2345{ 2515{
2346 static float color[16][3] = { 2516 static float color[16][3] = {
2347 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2348 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2349 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2350 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2351 2521
2352 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2353 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2354 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2355 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2356 2526
2357 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2358 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2359 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2360 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2361 2531
2362 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2363 2533
2364 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2365 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2366 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2367 }; 2537 };
2368 2538
2369 int x, y; 2539 int x, y;
2370 2540
2371 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2372 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2373 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2374 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2375 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2376 2552
2377 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2381 2557
2382 if (m) 2558 if (m)
2383 { 2559 {
2384 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2385 2561
2386 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2387 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2388 2564
2389 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2390 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2391 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2392 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2393 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2394 } 2570 }
2402void 2578void
2403fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2404 PPCODE: 2580 PPCODE:
2405{ 2581{
2406 int x, y; 2582 int x, y;
2407 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2408 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2409 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2410 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2411 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2412 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2413 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2414 2591
2415 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2416 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2417 2594
2418 mx += self->x - 1; 2595 mx += self->x - 1;
2419 my += self->y - 1; 2596 my += self->y - 1;
2420
2421 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2422 2597
2423 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2424 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2425 { 2600 {
2426 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2429 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2430 { 2605 {
2431 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2432 2607
2433 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2434 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2435 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2436 } 2611 }
2437 } 2612 }
2438 2613
2439 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2440 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2459 2634
2460 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2461 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2462 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2463 2638
2464 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2465 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2466 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2467 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2468 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2469 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2470 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2471 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2472 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2473 } 2648 }
2474 2649
2475 free (darkness1); 2650 free (darkness1);
2476 2651
2477 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2478 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2479 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2480 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2481} 2656}
2482 2657
2483SV * 2658SV *
2546 else 2721 else
2547 *data++ = 0; 2722 *data++ = 0;
2548 } 2723 }
2549 } 2724 }
2550 2725
2551 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2552 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2553 { 2728 {
2554 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2555 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2556 } 2731 }
2557 2732
2558 RETVAL = data_sv; 2733 RETVAL = data_sv;
2559} 2734}
2560 OUTPUT: 2735 OUTPUT:
2561 RETVAL 2736 RETVAL
2562 2737
2563void 2738void
2570 STRLEN len; 2745 STRLEN len;
2571 uint8_t *data, *end; 2746 uint8_t *data, *end;
2572 2747
2573 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2574 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2575 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2576 end = data + len + 8; 2751 end = data + len + 8;
2577 2752
2578 if (len < 5) 2753 if (len < 5)
2579 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2580 2755
2641} 2816}
2642 2817
2643MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2644 2819
2645DC::RW 2820DC::RW
2646new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2647 CODE: 2822 CODE:
2648{ 2823{
2649 STRLEN datalen; 2824 STRLEN datalen;
2650 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2651 2826
2653} 2828}
2654 OUTPUT: 2829 OUTPUT:
2655 RETVAL 2830 RETVAL
2656 2831
2657DC::RW 2832DC::RW
2658new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2659 CODE: 2834 CODE:
2660 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2661 OUTPUT: 2836 OUTPUT:
2662 RETVAL 2837 RETVAL
2663 2838
2681 if (RETVAL < 0) 2856 if (RETVAL < 0)
2682 { 2857 {
2683 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2684 2859
2685 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2686 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2687 2867 }
2868 else
2688 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2689 } 2870 }
2690 2871
2691 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2692 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2693} 2874}
2740void 2921void
2741set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2742 CODE: 2923 CODE:
2743{ 2924{
2744 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2745 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2746 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2747} 2928}
2748 2929
2749void 2930void
2750set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2753 2934
2754MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2755 2936
2756PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2757 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2758DC::MixChunk 2951DC::MixChunk
2759new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2760 CODE: 2953 CODE:
2761 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2762 OUTPUT: 2955 OUTPUT:
2763 RETVAL 2956 RETVAL
2764 2957
2794 OUTPUT: 2987 OUTPUT:
2795 RETVAL 2988 RETVAL
2796 2989
2797MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2798 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2799int 3004int
2800volume (int volume = -1) 3005volume (int volume = -1)
2801 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2802 CODE: 3007 CODE:
2803 if (items > 0) 3008 if (items > 0)
2814void 3019void
2815halt () 3020halt ()
2816 CODE: 3021 CODE:
2817 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2818 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2819DC::MixMusic 3031DC::MixMusic
2820new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2821 CODE: 3033 CODE:
2822 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2823 OUTPUT: 3035 OUTPUT:
2824 RETVAL 3036 RETVAL
2825 3037
2853 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2854# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2855 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2856 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2857 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2858 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2859 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2860 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2861 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2862 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2874 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2875 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2876 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2877 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2878 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2879 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2880 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2881 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2882 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2883 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2951 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2952 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2953 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2954 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2955 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2956# undef const_iv 3176# undef const_iv
2957 }; 3177 };
2958 3178
2959 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2960 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2961 3181
2962 texture_av = newAV (); 3182 texture_av = newAV ();
2963 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2964} 3184}
2965 3185
2967disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2968 CODE: 3188 CODE:
2969 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2970 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2971 3191
2972char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2973gl_vendor () 3196gl_vendor ()
2974 CODE: 3197 CODE:
2975 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2976 OUTPUT: 3199 OUTPUT:
2977 RETVAL 3200 RETVAL
2978 3201
2979char * 3202const char *
2980gl_version () 3203gl_version ()
2981 CODE: 3204 CODE:
2982 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2983 OUTPUT: 3206 OUTPUT:
2984 RETVAL 3207 RETVAL
2985 3208
2986char * 3209const char *
2987gl_extensions () 3210gl_extensions ()
2988 CODE: 3211 CODE:
2989 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2990 OUTPUT: 3213 OUTPUT:
2991 RETVAL 3214 RETVAL
2992 3215
2993const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2994 3221
2995GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2996 CODE: 3223 CODE:
2997 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2998 OUTPUT: 3225 OUTPUT:
3006 3233
3007int glGetError () 3234int glGetError ()
3008 3235
3009void glFinish () 3236void glFinish ()
3010 3237
3238void glFlush ()
3239
3011void glClear (int mask) 3240void glClear (int mask)
3012 3241
3013void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
3014 PROTOTYPE: @ 3243 PROTOTYPE: @
3015 3244
3024void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
3025 3254
3026void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3027 CODE: 3256 CODE:
3028 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
3029 3260
3030void glDepthMask (int flag) 3261void glDepthMask (int flag)
3031 3262
3032void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
3033 3264
3184 3415
3185void glEndList () 3416void glEndList ()
3186 3417
3187void glCallList (int list) 3418void glCallList (int list)
3188 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3189MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3190 3426
3191PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3192 3428
3193void 3429void
3194find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3195 PPCODE: 3431 PPCODE:
3196{ 3432{
3197 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3198 XPUSHs (self); 3434 XPUSHs (self);
3199} 3435}
3200 3436
3201BOOT: 3437BOOT:
3202{ 3438{
3210 3446
3211void 3447void
3212draw (SV *self) 3448draw (SV *self)
3213 CODE: 3449 CODE:
3214{ 3450{
3215 HV *hv; 3451 HV *hv;
3216 SV **svp; 3452 SV **svp;
3217 NV x, y, w, h; 3453 NV x, y, w, h;
3218 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3219 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3220 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3221 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines