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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines