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.146 by root, Sat Aug 19 02:49:53 2006 UTC vs.
Revision 1.214 by root, Sun Jul 29 18:56:02 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
30#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
31
22#include <SDL.h> 32#include <SDL.h>
33#include <SDL_thread.h>
23#include <SDL_endian.h> 34#include <SDL_endian.h>
24#include <SDL_image.h> 35#include <SDL_image.h>
25#include <SDL_mixer.h> 36#include <SDL_mixer.h>
26#include <SDL_opengl.h> 37#include <SDL_opengl.h>
27 38
36# include <sys/types.h> 47# include <sys/types.h>
37# include <sys/socket.h> 48# include <sys/socket.h>
38# include <netinet/in.h> 49# include <netinet/in.h>
39# include <netinet/tcp.h> 50# include <netinet/tcp.h>
40# include <inttypes.h> 51# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 52#endif
49 53
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 55
52#define FOW_DARKNESS 32 56#define FOW_DARKNESS 32
53 57
54#define MAP_EXTEND_X 32 58#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 59#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 64# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 65#else
62# define PARACHUTE 0 66# define PARACHUTE 0
63#endif 67#endif
64 68
69static AV *texture_av;
70
65static struct 71static struct
66{ 72{
67#define GL_FUNC(ptr,name) ptr name; 73#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 74#include "glfunc.h"
69#undef GL_FUNC 75#undef GL_FUNC
70} gl; 76} gl;
71 77
78static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 79gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 80{
74 if (gl.BlendFuncSeparate) 81 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 82 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 83 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 84 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 85 else
79 glBlendFunc (sa, da); 86 glBlendFunc (sa, da);
80} 87}
81 88
89static GLuint
90gen_texture ()
91{
92 GLuint name;
93
94 if (AvFILL (texture_av) >= 0)
95 name = (GLuint)(size_t)av_pop (texture_av);
96 else
97 glGenTextures (1, &name);
98
99 return name;
100}
101
102static void
103del_texture (GLuint name)
104{
105 /* make a half-assed attempt at returning the memory used by the texture */
106 /* textures are frequently being reused by cfplus anyway */
107 /*glBindTexture (GL_TEXTURE_2D, name);*/
108 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
109 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name);
111}
112
82#include "texcache.c" 113#include "texcache.c"
83 114
84#include "pango-font.c" 115#include "pango-font.c"
85#include "pango-fontmap.c" 116#include "pango-fontmap.c"
86#include "pango-render.c" 117#include "pango-render.c"
87 118
119typedef IV CFPlus__Channel;
120typedef SDL_RWops *CFPlus__RW;
88typedef Mix_Chunk *CFPlus__MixChunk; 121typedef Mix_Chunk *CFPlus__MixChunk;
89typedef Mix_Music *CFPlus__MixMusic; 122typedef Mix_Music *CFPlus__MixMusic;
90 123
91typedef PangoFontDescription *CFPlus__Font; 124typedef PangoFontDescription *CFPlus__Font;
92 125
159 192
160 *w = rect.width; 193 *w = rect.width;
161 *h = rect.height; 194 *h = rect.height;
162} 195}
163 196
197typedef uint16_t tileid;
164typedef uint16_t mapface; 198typedef uint16_t faceid;
165 199
166typedef struct { 200typedef struct {
167 GLint name; 201 int name;
168 int w, h; 202 int w, h;
169 float s, t; 203 float s, t;
170 uint8_t r, g, b, a; 204 uint8_t r, g, b, a;
205 tileid smoothtile;
206 uint8_t smoothlevel;
171} maptex; 207} maptex;
172 208
173typedef struct { 209typedef struct {
210 uint32_t player;
211 tileid tile[3];
174 uint16_t darkness; 212 uint16_t darkness;
175 mapface face[3]; 213 uint8_t stat_width, stat_hp, flags, smoothmax;
176 uint8_t stat_hp;
177} mapcell; 214} mapcell;
178 215
179typedef struct { 216typedef struct {
180 int32_t c0, c1; 217 int32_t c0, c1;
181 mapcell *col; 218 mapcell *col;
182} maprow; 219} maprow;
183 220
184typedef struct map { 221typedef struct map {
185 int x, y, w, h; 222 int x, y, w, h;
186 int ox, oy; /* offset to virtual global coordinate system */ 223 int ox, oy; /* offset to virtual global coordinate system */
187 int faces; 224 int faces; tileid *face2tile; // [faceid]
188 mapface *face; 225 int texs; maptex *tex; // [tileid]
189
190 int texs;
191 maptex *tex;
192 226
193 int32_t rows; 227 int32_t rows;
194 maprow *row; 228 maprow *row;
195} *CFPlus__Map; 229} *CFPlus__Map;
196 230
216 return ptr; 250 return ptr;
217} 251}
218 252
219#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 253#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 254#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
255
256static void
257need_facenum (struct map *self, faceid face)
258{
259 while (self->faces <= face)
260 {
261 Append (tileid, self->face2tile, self->faces, self->faces);
262 self->faces *= 2;
263 }
264}
265
266static void
267need_texid (struct map *self, int texid)
268{
269 while (self->texs <= texid)
270 {
271 Append (maptex, self->tex, self->texs, self->texs);
272 self->texs *= 2;
273 }
274}
221 275
222static maprow * 276static maprow *
223map_get_row (CFPlus__Map self, int y) 277map_get_row (CFPlus__Map self, int y)
224{ 278{
225 if (0 > y) 279 if (0 > y)
314 368
315 cell = row->col + x - row->c0; 369 cell = row->col + x - row->c0;
316 370
317 cell->darkness = 0; 371 cell->darkness = 0;
318 cell->stat_hp = 0; 372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
319 } 375 }
320 } 376 }
377}
378
379typedef struct {
380 tileid tile;
381 uint8_t x, y, level;
382} smooth_key;
383
384static void
385smooth_or_bits (HV *hv, smooth_key *key, IV bits)
386{
387 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
388
389 if (SvIOK (*sv))
390 SvIV_set (*sv, SvIVX (*sv) | bits);
391 else
392 sv_setiv (*sv, bits);
321} 393}
322 394
323static void 395static void
324music_finished (void) 396music_finished (void)
325{ 397{
359 n |= n >> 4; 431 n |= n >> 4;
360 n |= n >> 8; 432 n |= n >> 8;
361 n |= n >> 16; 433 n |= n >> 16;
362 434
363 return n + 1; 435 return n + 1;
436}
437
438/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314
441
442/******************************************************************************/
443
444static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
445static GV *hover_gv;
446
447static int
448within_widget (SV *widget, NV x, NV y)
449{
450 HV *self;
451 SV **svp;
452 NV wx, ww, wy, wh;
453
454 if (!SvROK (widget))
455 return 0;
456
457 self = (HV *)SvRV (widget);
458
459 if (SvTYPE (self) != SVt_PVHV)
460 return 0;
461
462 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
463 if (y < wy)
464 return 0;
465
466 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
467 if (y >= wy + wh)
468 return 0;
469
470 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
471 if (x < wx)
472 return 0;
473
474 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
475 if (x >= wx + ww)
476 return 0;
477
478 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
479 if (!svp || !SvTRUE (*svp))
480 return 0;
481
482 return 1;
364} 483}
365 484
366MODULE = CFPlus PACKAGE = CFPlus 485MODULE = CFPlus PACKAGE = CFPlus
367 486
368PROTOTYPES: ENABLE 487PROTOTYPES: ENABLE
373 static const struct { 492 static const struct {
374 const char *name; 493 const char *name;
375 IV iv; 494 IV iv;
376 } *civ, const_iv[] = { 495 } *civ, const_iv[] = {
377# define const_iv(name) { # name, (IV)name } 496# define const_iv(name) { # name, (IV)name }
497 const_iv (SDLK_MODIFIER_MIN),
498 const_iv (SDLK_MODIFIER_MAX),
499
378 const_iv (SDL_ACTIVEEVENT), 500 const_iv (SDL_ACTIVEEVENT),
379 const_iv (SDL_KEYDOWN), 501 const_iv (SDL_KEYDOWN),
380 const_iv (SDL_KEYUP), 502 const_iv (SDL_KEYUP),
381 const_iv (SDL_MOUSEMOTION), 503 const_iv (SDL_MOUSEMOTION),
382 const_iv (SDL_MOUSEBUTTONDOWN), 504 const_iv (SDL_MOUSEBUTTONDOWN),
391 const_iv (SDL_EVENT_RESERVEDA), 513 const_iv (SDL_EVENT_RESERVEDA),
392 const_iv (SDL_EVENT_RESERVEDB), 514 const_iv (SDL_EVENT_RESERVEDB),
393 const_iv (SDL_VIDEORESIZE), 515 const_iv (SDL_VIDEORESIZE),
394 const_iv (SDL_VIDEOEXPOSE), 516 const_iv (SDL_VIDEOEXPOSE),
395 const_iv (SDL_USEREVENT), 517 const_iv (SDL_USEREVENT),
518
519 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE),
522
396 const_iv (SDLK_KP0), 523 const_iv (SDLK_KP0),
397 const_iv (SDLK_KP1), 524 const_iv (SDLK_KP1),
398 const_iv (SDLK_KP2), 525 const_iv (SDLK_KP2),
399 const_iv (SDLK_KP3), 526 const_iv (SDLK_KP3),
400 const_iv (SDLK_KP4), 527 const_iv (SDLK_KP4),
455 const_iv (SDLK_BREAK), 582 const_iv (SDLK_BREAK),
456 const_iv (SDLK_MENU), 583 const_iv (SDLK_MENU),
457 const_iv (SDLK_POWER), 584 const_iv (SDLK_POWER),
458 const_iv (SDLK_EURO), 585 const_iv (SDLK_EURO),
459 const_iv (SDLK_UNDO), 586 const_iv (SDLK_UNDO),
587
460 const_iv (KMOD_NONE), 588 const_iv (KMOD_NONE),
589 const_iv (KMOD_SHIFT),
461 const_iv (KMOD_LSHIFT), 590 const_iv (KMOD_LSHIFT),
462 const_iv (KMOD_RSHIFT), 591 const_iv (KMOD_RSHIFT),
592 const_iv (KMOD_CTRL),
463 const_iv (KMOD_LCTRL), 593 const_iv (KMOD_LCTRL),
464 const_iv (KMOD_RCTRL), 594 const_iv (KMOD_RCTRL),
595 const_iv (KMOD_ALT),
465 const_iv (KMOD_LALT), 596 const_iv (KMOD_LALT),
466 const_iv (KMOD_RALT), 597 const_iv (KMOD_RALT),
598 const_iv (KMOD_META),
467 const_iv (KMOD_LMETA), 599 const_iv (KMOD_LMETA),
468 const_iv (KMOD_RMETA), 600 const_iv (KMOD_RMETA),
469 const_iv (KMOD_NUM), 601 const_iv (KMOD_NUM),
470 const_iv (KMOD_CAPS), 602 const_iv (KMOD_CAPS),
471 const_iv (KMOD_MODE), 603 const_iv (KMOD_MODE),
472 const_iv (KMOD_CTRL),
473 const_iv (KMOD_SHIFT),
474 const_iv (KMOD_ALT),
475 const_iv (KMOD_META)
476# undef const_iv 604# undef const_iv
477 }; 605 };
478 606
479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
480 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
609
610 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
611 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
481} 612}
613
614void
615weaken (SV *rv)
616 PROTOTYPE: $
617 CODE:
618 sv_rvweaken (rv);
482 619
483int 620int
484in_destruct () 621in_destruct ()
485 CODE: 622 CODE:
486 RETVAL = PL_main_cv == Nullcv; 623 RETVAL = PL_main_cv == Nullcv;
498 opengl_fontmap = pango_opengl_font_map_new (); 635 opengl_fontmap = pango_opengl_font_map_new ();
499 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
500 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
501} 638}
502 639
640char *
641SDL_GetError ()
642
503int 643int
504SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
505 645
506void 646void
507SDL_Quit () 647SDL_Quit ()
508 648
509void 649void
510SDL_ListModes () 650SDL_ListModes (int rgb, int alpha)
511 PPCODE: 651 PPCODE:
512{ 652{
513 SDL_Rect **m; 653 SDL_Rect **m;
514 654
515 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 655 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
516 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 656 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
517 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 657 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
518 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 658 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
519 659
520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 660 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
521 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 661 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
522 662
523 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 663 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
527 667
528 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
529#if SDL_VERSION_ATLEAST(1,2,10) 669#if SDL_VERSION_ATLEAST(1,2,10)
530 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
531 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
532#endif 672#endif
533 673
534 SDL_EnableUNICODE (1);
535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
536
537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
538 675
539 if (m && m != (SDL_Rect **)-1) 676 if (m && m != (SDL_Rect **)-1)
540 while (*m) 677 while (*m)
541 { 678 {
679 if ((*m)->w >= 640 && (*m)->h >= 480)
680 {
542 AV *av = newAV (); 681 AV *av = newAV ();
543 av_push (av, newSViv ((*m)->w)); 682 av_push (av, newSViv ((*m)->w));
544 av_push (av, newSViv ((*m)->h)); 683 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb));
685 av_push (av, newSViv (alpha));
545 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 686 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
687 }
546 688
547 ++m; 689 ++m;
548 } 690 }
549} 691}
550 692
551char *
552SDL_GetError ()
553
554int 693int
555SDL_SetVideoMode (int w, int h, int fullscreen) 694SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
556 CODE: 695 CODE:
696{
697 SDL_EnableUNICODE (1);
698 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
699
700 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
701 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
702 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
703 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
704
557 RETVAL = !!SDL_SetVideoMode ( 705 RETVAL = !!SDL_SetVideoMode (
558 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 706 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
559 ); 707 );
708
560 if (RETVAL) 709 if (RETVAL)
561 { 710 {
711 av_clear (texture_av);
712
562 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
563# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
564# include "glfunc.h" 715#include "glfunc.h"
565# undef GL_FUNC 716#undef GL_FUNC
566 } 717 }
718}
567 OUTPUT: 719 OUTPUT:
568 RETVAL 720 RETVAL
569 721
570void 722void
571SDL_GL_SwapBuffers () 723SDL_GL_SwapBuffers ()
572 724
573char * 725char *
574SDL_GetKeyName (int sym) 726SDL_GetKeyName (int sym)
575 727
728int
729SDL_GetAppState ()
730
576void 731void
577SDL_PollEvent () 732poll_events ()
578 PPCODE: 733 PPCODE:
579{ 734{
580 SDL_Event ev; 735 SDL_Event ev;
581 736
582 while (SDL_PollEvent (&ev)) 737 SDL_PumpEvents ();
738 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
583 { 739 {
584 HV *hv = newHV (); 740 HV *hv = newHV ();
585 hv_store (hv, "type", 4, newSViv (ev.type), 0); 741 hv_store (hv, "type", 4, newSViv (ev.type), 0);
586 742
587 switch (ev.type) 743 switch (ev.type)
589 case SDL_KEYDOWN: 745 case SDL_KEYDOWN:
590 case SDL_KEYUP: 746 case SDL_KEYUP:
591 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
592 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
593 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
594 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
595 break; 752 break;
596 753
597 case SDL_ACTIVEEVENT: 754 case SDL_ACTIVEEVENT:
598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
599 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 756 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
600 break; 757 break;
601 758
602 case SDL_MOUSEMOTION: 759 case SDL_MOUSEMOTION:
760 {
761 int state = ev.motion.state;
762 int x = ev.motion.x;
763 int y = ev.motion.y;
764 int xrel = ev.motion.xrel;
765 int yrel = ev.motion.yrel;
766
767 /* do simplistic event compression */
768 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
769 && state == ev.motion.state)
770 {
771 xrel += ev.motion.xrel;
772 yrel += ev.motion.yrel;
773 x = ev.motion.x;
774 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 }
777
603 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
604
605 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 779 hv_store (hv, "state", 5, newSViv (state), 0);
606 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 780 hv_store (hv, "x", 1, newSViv (x), 0);
607 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 781 hv_store (hv, "y", 1, newSViv (y), 0);
608 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 782 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
609 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 783 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 }
610 break; 785 break;
611 786
612 case SDL_MOUSEBUTTONDOWN: 787 case SDL_MOUSEBUTTONDOWN:
613 case SDL_MOUSEBUTTONUP: 788 case SDL_MOUSEBUTTONUP:
614 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
629 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
630 } 805 }
631} 806}
632 807
633int 808int
634Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
635 POSTCALL: 810 POSTCALL:
636 Mix_HookMusicFinished (music_finished); 811 Mix_HookMusicFinished (music_finished);
637 Mix_ChannelFinished (channel_finished); 812 Mix_ChannelFinished (channel_finished);
638 813
639void 814void
640Mix_CloseAudio () 815Mix_CloseAudio ()
641 816
642int 817int
643Mix_AllocateChannels (int numchans = -1) 818Mix_AllocateChannels (int numchans = -1)
644 819
820const char *
821Mix_GetError ()
822
645void 823void
646lowdelay (int fd, int val = 1) 824lowdelay (int fd, int val = 1)
647 CODE: 825 CODE:
826 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
827
828void
829win32_proxy_info ()
830 PPCODE:
831{
648#ifndef _WIN32 832#ifdef _WIN32
649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 833 char buffer[2048];
834 DWORD buflen;
835
836 EXTEND (SP, 3);
837
838 buflen = sizeof (buffer);
839 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
840 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
841 {
842 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
843
844 buflen = sizeof (buffer);
845 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
846 {
847 PUSHs (newSVpv (buffer, 0));
848
849 buflen = sizeof (buffer);
850 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
851 PUSHs (newSVpv (buffer, 0));
852 }
853 }
650#endif 854#endif
855}
651 856
652void 857void
653add_font (char *file) 858add_font (char *file)
654 CODE: 859 CODE:
655 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 860 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
663 STRLEN image_len; 868 STRLEN image_len;
664 char *image = (char *)SvPVbyte (image_, image_len); 869 char *image = (char *)SvPVbyte (image_, image_len);
665 SDL_Surface *surface, *surface2; 870 SDL_Surface *surface, *surface2;
666 SDL_PixelFormat fmt; 871 SDL_PixelFormat fmt;
667 SDL_RWops *rw = ix 872 SDL_RWops *rw = ix
668 ? SDL_RWFromFile (image, "r") 873 ? SDL_RWFromFile (image, "rb")
669 : SDL_RWFromConstMem (image, image_len); 874 : SDL_RWFromConstMem (image, image_len);
670 875
671 if (!rw) 876 if (!rw)
672 croak ("load_image: %s", SDL_GetError ()); 877 croak ("load_image: %s", SDL_GetError ());
673 878
759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
760#endif 965#endif
761 _exit (1); 966 _exit (1);
762 967
763void 968void
764_exit (int retval) 969_exit (int retval = 0)
765 CODE: 970 CODE:
971#ifdef WIN32
972 ExitThread (retval); // unclean, please beam me up
973#else
766 _exit (retval); 974 _exit (retval);
975#endif
976
977void
978debug ()
979 CODE:
980{
981#if DEBUG
982 VALGRIND_DO_LEAK_CHECK;
983#endif
984}
767 985
768MODULE = CFPlus PACKAGE = CFPlus::Font 986MODULE = CFPlus PACKAGE = CFPlus::Font
987
988PROTOTYPES: DISABLE
769 989
770CFPlus::Font 990CFPlus::Font
771new_from_file (SV *class, char *path, int id = 0) 991new_from_file (SV *class, char *path, int id = 0)
772 CODE: 992 CODE:
773{ 993{
784 CODE: 1004 CODE:
785 pango_font_description_free (self); 1005 pango_font_description_free (self);
786 1006
787void 1007void
788make_default (CFPlus::Font self) 1008make_default (CFPlus::Font self)
1009 PROTOTYPE: $
789 CODE: 1010 CODE:
790 default_font = self; 1011 default_font = self;
791 1012
792MODULE = CFPlus PACKAGE = CFPlus::Layout 1013MODULE = CFPlus PACKAGE = CFPlus::Layout
793 1014
1015PROTOTYPES: DISABLE
1016
794void 1017void
795reset_glyph_cache () 1018reset_glyph_cache ()
1019 PROTOTYPE:
796 CODE: 1020 CODE:
797 tc_clear (); 1021 tc_clear ();
798 1022
799CFPlus::Layout 1023CFPlus::Layout
800new (SV *class) 1024new (SV *class)
1018xy_to_index (CFPlus::Layout self, int x, int y) 1242xy_to_index (CFPlus::Layout self, int x, int y)
1019 CODE: 1243 CODE:
1020{ 1244{
1021 int index, trailing; 1245 int index, trailing;
1022 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1023 RETVAL = index; 1247 RETVAL = index + trailing;
1024} 1248}
1025 OUTPUT: 1249 OUTPUT:
1026 RETVAL 1250 RETVAL
1027 1251
1028void 1252void
1034 1258
1035 EXTEND (SP, 3); 1259 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1263}
1264
1265void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1267 PPCODE:
1268{
1269 int line, x;
1270
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273
1274 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277}
1278
1279void
1280line_x_to_index (CFPlus::Layout self, int line, int x)
1281 PPCODE:
1282{
1283 PangoLayoutLine *lp;
1284 int index, trailing;
1285
1286 if (line < 0)
1287 XSRETURN_EMPTY;
1288
1289 if (!(lp = pango_layout_get_line (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */
1291
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293
1294 EXTEND (SP, 2);
1295 if (GIMME_V == G_SCALAR)
1296 PUSHs (sv_2mortal (newSViv (index + trailing)));
1297 else
1298 {
1299 PUSHs (sv_2mortal (newSViv (index)));
1300 PUSHs (sv_2mortal (newSViv (trailing)));
1301 }
1039} 1302}
1040 1303
1041void 1304void
1042render (CFPlus::Layout self, float x, float y, int flags = 0) 1305render (CFPlus::Layout self, float x, float y, int flags = 0)
1043 PPCODE: 1306 PPCODE:
1048 flags 1311 flags
1049 ); 1312 );
1050 1313
1051MODULE = CFPlus PACKAGE = CFPlus::Texture 1314MODULE = CFPlus PACKAGE = CFPlus::Texture
1052 1315
1053void 1316PROTOTYPES: ENABLE
1054pad2pot (SV *data_, SV *w_, SV *h_)
1055 CODE:
1056{
1057 int ow = SvIV (w_);
1058 int oh = SvIV (h_);
1059 1317
1060 if (ow && oh) 1318int minpot (int n)
1319
1320void
1321pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE:
1323{
1324 if ((nw != ow || nh != oh) && SvOK (data_))
1061 { 1325 {
1062 int nw = minpot (ow);
1063 int nh = minpot (oh);
1064
1065 if (nw != ow || nh != oh)
1066 {
1067 if (SvOK (data_))
1068 {
1069 STRLEN datalen; 1326 STRLEN datalen;
1070 char *data = SvPVbyte (data_, datalen); 1327 char *data = SvPVbyte (data_, datalen);
1071 int bpp = datalen / (ow * oh); 1328 int bpp = datalen / (ow * oh);
1072 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1329 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1073 1330
1074 SvPOK_only (result_); 1331 SvPOK_only (result_);
1075 SvCUR_set (result_, nw * nh * bpp); 1332 SvCUR_set (result_, nw * nh * bpp);
1076 1333
1077 memset (SvPVX (result_), 0, nw * nh * bpp); 1334 memset (SvPVX (result_), 0, nw * nh * bpp);
1078 while (oh--) 1335 while (oh--)
1079 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1336 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1080 1337
1081 sv_setsv (data_, result_); 1338 sv_setsv (data_, result_);
1082 }
1083
1084 sv_setiv (w_, nw);
1085 sv_setiv (h_, nh);
1086 }
1087 } 1339 }
1088} 1340}
1089 1341
1090void 1342void
1091draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1343draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1134 glDisable (GL_ALPHA_TEST); 1386 glDisable (GL_ALPHA_TEST);
1135 glDisable (GL_BLEND); 1387 glDisable (GL_BLEND);
1136 } 1388 }
1137} 1389}
1138 1390
1391IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1392 CODE:
1393{
1394 GLint width;
1395 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1396 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1397 RETVAL = width > 0;
1398}
1399 OUTPUT:
1400 RETVAL
1401
1139MODULE = CFPlus PACKAGE = CFPlus::Map 1402MODULE = CFPlus PACKAGE = CFPlus::Map
1140 1403
1404PROTOTYPES: DISABLE
1405
1141CFPlus::Map 1406CFPlus::Map
1142new (SV *class, int map_width, int map_height) 1407new (SV *class)
1143 CODE: 1408 CODE:
1144 New (0, RETVAL, 1, struct map); 1409 New (0, RETVAL, 1, struct map);
1145 RETVAL->x = 0; 1410 RETVAL->x = 0;
1146 RETVAL->y = 0; 1411 RETVAL->y = 0;
1147 RETVAL->w = map_width; 1412 RETVAL->w = 0;
1148 RETVAL->h = map_height; 1413 RETVAL->h = 0;
1149 RETVAL->ox = 0; 1414 RETVAL->ox = 0;
1150 RETVAL->oy = 0; 1415 RETVAL->oy = 0;
1151 RETVAL->faces = 8192; 1416 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1152 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1417 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1153 RETVAL->texs = 8192;
1154 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1155 RETVAL->rows = 0; 1418 RETVAL->rows = 0;
1156 RETVAL->row = 0; 1419 RETVAL->row = 0;
1157 OUTPUT: 1420 OUTPUT:
1158 RETVAL 1421 RETVAL
1159 1422
1160void 1423void
1161DESTROY (CFPlus::Map self) 1424DESTROY (CFPlus::Map self)
1162 CODE: 1425 CODE:
1163{ 1426{
1164 map_clear (self); 1427 map_clear (self);
1165 Safefree (self->face); 1428 Safefree (self->face2tile);
1166 Safefree (self->tex); 1429 Safefree (self->tex);
1167 Safefree (self); 1430 Safefree (self);
1168} 1431}
1169 1432
1170void 1433void
1434resize (CFPlus::Map self, int map_width, int map_height)
1435 CODE:
1436 self->w = map_width;
1437 self->h = map_height;
1438
1439void
1171clear (CFPlus::Map self) 1440clear (CFPlus::Map self)
1172 CODE: 1441 CODE:
1173 map_clear (self); 1442 map_clear (self);
1174 1443
1175void 1444void
1176set_face (CFPlus::Map self, int face, int texid) 1445set_tileid (CFPlus::Map self, int face, int tile)
1177 CODE: 1446 CODE:
1178{ 1447{
1179 while (self->faces <= face) 1448 need_facenum (self, face); self->face2tile [face] = tile;
1180 { 1449 need_texid (self, tile);
1181 Append (mapface, self->face, self->faces, self->faces); 1450}
1182 self->faces *= 2;
1183 }
1184 1451
1185 self->face [face] = texid; 1452void
1453set_smooth (CFPlus::Map self, int face, int smooth, int level)
1454 CODE:
1455{
1456 tileid texid;
1457 maptex *tex;
1458
1459 if (face < 0 || face >= self->faces)
1460 return;
1461
1462 if (smooth < 0 || smooth >= self->faces)
1463 return;
1464
1465 texid = self->face2tile [face];
1466
1467 if (!texid)
1468 return;
1469
1470 tex = self->tex + texid;
1471 tex->smoothtile = self->face2tile [smooth];
1472 tex->smoothlevel = level;
1186} 1473}
1187 1474
1188void 1475void
1189set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1476set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1190 CODE: 1477 CODE:
1191{ 1478{
1192 while (self->texs <= texid) 1479 need_texid (self, texid);
1193 {
1194 Append (maptex, self->tex, self->texs, self->texs);
1195 self->texs *= 2;
1196 }
1197 1480
1198 { 1481 {
1199 maptex *tex = self->tex + texid; 1482 maptex *tex = self->tex + texid;
1200 1483
1201 tex->name = name; 1484 tex->name = name;
1243void 1526void
1244scroll (CFPlus::Map self, int dx, int dy) 1527scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1528 CODE:
1246{ 1529{
1247 if (dx > 0) 1530 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1531 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1532 else if (dx < 0)
1250 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1533 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1251 1534
1252 if (dy > 0) 1535 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1536 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1537 else if (dy < 0)
1255 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1538 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1256 1539
1257 self->ox += dx; self->x += dx; 1540 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1541 self->oy += dy; self->y += dy;
1259 1542
1260 while (self->y < 0) 1543 while (self->y < 0)
1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1274 uint8_t *data_end = (uint8_t *)SvEND (data_); 1557 uint8_t *data_end = (uint8_t *)SvEND (data_);
1275 mapcell *cell; 1558 mapcell *cell;
1276 int x, y, flags; 1559 int x, y, flags;
1277 1560
1278 while (data < data_end) 1561 while (data < data_end - 1)
1279 { 1562 {
1280 flags = (data [0] << 8) + data [1]; data += 2; 1563 flags = (data [0] << 8) + data [1]; data += 2;
1281 1564
1282 x = self->x + ((flags >> 10) & 63); 1565 x = self->x + ((flags >> 10) & 63);
1283 y = self->y + ((flags >> 4) & 63); 1566 y = self->y + ((flags >> 4) & 63);
1286 1569
1287 if (flags & 15) 1570 if (flags & 15)
1288 { 1571 {
1289 if (!cell->darkness) 1572 if (!cell->darkness)
1290 { 1573 {
1574 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1575 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1576 }
1296 1577
1297 //TODO: don't trust server data to be in-range(!) 1578 //TODO: don't trust server data to be in-range(!)
1298 1579
1299 if (flags & 8) 1580 if (flags & 8)
1305 do 1586 do
1306 { 1587 {
1307 ext = *data++; 1588 ext = *data++;
1308 cmd = ext & 0x3f; 1589 cmd = ext & 0x3f;
1309 1590
1310 if (ext < 4) 1591 if (cmd < 4)
1311 cell->darkness = 255 - ext * 64 + 1; 1592 cell->darkness = 255 - ext * 64 + 1;
1312 else if (ext == 5) // health 1593 else if (cmd == 5) // health
1594 {
1595 cell->stat_width = 1;
1313 cell->stat_hp = *data++; 1596 cell->stat_hp = *data++;
1597 }
1598 else if (cmd == 6) // monster width
1599 cell->stat_width = *data++ + 1;
1600 else if (cmd == 0x47)
1601 {
1602 if (*data == 4)
1603 ; // decode player count
1604
1605 data += *data + 1;
1606 }
1607 else if (cmd == 8) // cell flags
1608 cell->flags = *data++;
1314 else if (ext & 0x40) // unknown, multibyte => skip 1609 else if (ext & 0x40) // unknown, multibyte => skip
1315 data += *data + 1; 1610 data += *data + 1;
1611 else
1612 data++;
1316 } 1613 }
1317 while (cmd & 0x80); 1614 while (ext & 0x80);
1318 } 1615 }
1319 else 1616 else
1320 cell->darkness = *data++ + 1; 1617 cell->darkness = *data++ + 1;
1321 } 1618 }
1322 1619
1323 if (flags & 4) 1620 if (flags & 4)
1324 { 1621 {
1325 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face];
1326 } 1625 }
1327 1626
1328 if (flags & 2) 1627 if (flags & 2)
1329 { 1628 {
1330 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1331 } 1632 }
1332 1633
1333 if (flags & 1) 1634 if (flags & 1)
1334 { 1635 {
1335 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1336 } 1639 }
1337 } 1640 }
1338 else 1641 else
1339 {
1340 cell->darkness = 0; 1642 cell->darkness = 0;
1341 cell->stat_hp = 0;
1342 }
1343 } 1643 }
1344} 1644}
1345 1645
1346SV * 1646SV *
1347mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1373 { 1673 {
1374 mapcell *cell = row->col + (x - row->c0); 1674 mapcell *cell = row->col + (x - row->c0);
1375 1675
1376 for (z = 0; z <= 0; z++) 1676 for (z = 0; z <= 0; z++)
1377 { 1677 {
1378 mapface face = cell->face [z];
1379
1380 if (face)
1381 {
1382 maptex tex = self->tex [face]; 1678 maptex tex = self->tex [cell->tile [z]];
1383 int a0 = 255 - tex.a; 1679 int a0 = 255 - tex.a;
1384 int a1 = tex.a; 1680 int a1 = tex.a;
1385 1681
1386 r = (r * a0 + tex.r * a1) / 255; 1682 r = (r * a0 + tex.r * a1) / 255;
1387 g = (g * a0 + tex.g * a1) / 255; 1683 g = (g * a0 + tex.g * a1) / 255;
1388 b = (b * a0 + tex.b * a1) / 255; 1684 b = (b * a0 + tex.b * a1) / 255;
1389 a = (a * a0 + tex.a * a1) / 255; 1685 a = (a * a0 + tex.a * a1) / 255;
1390 }
1391 } 1686 }
1392 } 1687 }
1393 1688
1394 *map++ = (r ) 1689 *map++ = (r )
1395 | (g << 8) 1690 | (g << 8)
1402} 1697}
1403 OUTPUT: 1698 OUTPUT:
1404 RETVAL 1699 RETVAL
1405 1700
1406void 1701void
1407draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1702draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1408 CODE: 1703 CODE:
1409{ 1704{
1410 int vx, vy; 1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1708 smooth_key skey;
1411 int x, y, z; 1709 int x, y, z;
1412 int last_name; 1710 int last_name;
1413 mapface face;
1414 1711
1415 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1712 // thats current max. sorry.
1416 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1713 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255;
1417 1715
1418 /* 1716 // clear key, in case of extra padding
1419 int vx = self->vx = self->w >= sw 1717 memset (&skey, 0, sizeof (skey));
1420 ? self->x + (self->w - sw) / 2
1421 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1422
1423 int vy = self->vy = self->h >= sh
1424 ? self->y + (self->h - sh) / 2
1425 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1426 */
1427 1718
1428 glColor4ub (255, 255, 255, 255); 1719 glColor4ub (255, 255, 255, 255);
1429 1720
1430 glEnable (GL_BLEND); 1721 glEnable (GL_BLEND);
1431 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1434 1725
1435 glBegin (GL_QUADS); 1726 glBegin (GL_QUADS);
1436 1727
1437 last_name = 0; 1728 last_name = 0;
1438 1729
1730 mx += self->x;
1731 my += self->y;
1732
1733 // first pass: determine smooth_max
1734 // rather ugly, if you ask me
1735 // could also be stored inside mapcell and updated on change
1736 memset (smooth_max, 0, sizeof (smooth_max));
1737
1738 for (y = 0; y < sh; y++)
1739 if (0 <= y + my && y + my < self->rows)
1740 {
1741 maprow *row = self->row + (y + my);
1742
1743 for (x = 0; x < sw; x++)
1744 if (row->c0 <= x + mx && x + mx < row->c1)
1745 {
1746 mapcell *cell = row->col + (x + mx - row->c0);
1747
1748 smooth_max[x + 1][y + 1] =
1749 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel));
1752 }
1753 }
1754
1439 for (z = 0; z < 3; z++) 1755 for (z = 0; z <= 2; z++)
1756 {
1757 memset (smooth_level, 0, sizeof (smooth_level));
1758
1440 for (y = 0; y < sh; y++) 1759 for (y = 0; y < sh; y++)
1441 if (0 <= y + vy && y + vy < self->rows) 1760 if (0 <= y + my && y + my < self->rows)
1442 { 1761 {
1443 maprow *row = self->row + (y + vy); 1762 maprow *row = self->row + (y + my);
1444 1763
1445 for (x = 0; x < sw; x++) 1764 for (x = 0; x < sw; x++)
1446 if (row->c0 <= x + vx && x + vx < row->c1) 1765 if (row->c0 <= x + mx && x + mx < row->c1)
1447 { 1766 {
1448 mapcell *cell = row->col + (x + vx - row->c0); 1767 mapcell *cell = row->col + (x + mx - row->c0);
1449
1450 face = cell->face [z]; 1768 tileid tile = cell->tile [z];
1769
1770 if (tile)
1771 {
1772 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w;
1774 int py = (y + 1) * T - tex.h;
1451 1775
1452 if (face && face < self->texs) 1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name)
1779 {
1780 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */
1782
1783 glEnd ();
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1785 glBegin (GL_QUADS);
1786 }
1787
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793 if (cell->flags && z == 2)
1794 {
1795 if (cell->flags & 1)
1796 {
1797 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32;
1800
1801 glEnd ();
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1803 glBegin (GL_QUADS);
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 }
1810 }
1811
1812 // update smooth hash
1813 if (tex.smoothtile)
1814 {
1815 skey.tile = tex.smoothtile;
1816 skey.level = tex.smoothlevel;
1817
1818 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1819
1820 // add bits to current tile and all neighbours. skey.x|y is
1821 // shifted +1|+1 so we always stay positive.
1822
1823 // bits is ___n cccc CCCC bbbb
1824 // n do not draw borders&corners
1825 // c draw these corners, but...
1826 // C ... not these
1827 // b draw these borders
1828
1829 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1830 // ┃· ·· ·┃ ━━
1831
1832 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1833 // ·· ·· ·┏ ┓·
1834
1835 // full tile
1836 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1837
1838 // borders
1839 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1840 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1841 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1842 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1843
1844 // corners
1845 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1846 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1847 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1848 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1849 }
1850 }
1851 }
1852 }
1853
1854 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort
1856 {
1857 int w, b;
1858
1859 for (w = 0; w < 256 / 32; ++w)
1860 {
1861 uint32_t smask = smooth_level [w];
1862 if (smask)
1863 for (b = 0; b < 32; ++b)
1864 if (smask & (((uint32_t)1) << b))
1453 { 1865 {
1454 maptex tex = self->tex [face]; 1866 int level = (w << 5) | b;
1867 HE *he;
1455 1868
1456 int px = (x + 1) * 32 - tex.w; 1869 hv_iterinit (smooth);
1457 int py = (y + 1) * 32 - tex.h; 1870 while ((he = hv_iternext (smooth)))
1458
1459 if (last_name != tex.name)
1460 { 1871 {
1872 smooth_key *skey = (smooth_key *)HeKEY (he);
1873 IV bits = SvIVX (HeVAL (he));
1874
1875 if (!(bits & 0x1000)
1876 && skey->level == level
1877 && level > smooth_max [skey->x][skey->y])
1878 {
1879 maptex tex = self->tex [skey->tile];
1880 int px = (((int)skey->x) - 1) * T;
1881 int py = (((int)skey->y) - 1) * T;
1882 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column
1886
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name)
1890 {
1891 if (!tex.name)
1892 continue; // smoothing not yet available
1893
1461 glEnd (); 1894 glEnd ();
1462 last_name = tex.name;
1463 glBindTexture (GL_TEXTURE_2D, last_name); 1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1464 glBegin (GL_QUADS); 1896 glBegin (GL_QUADS);
1897 }
1898
1899 if (border)
1900 {
1901 float ox = border * dx;
1902
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1907 }
1908
1909 if (corner)
1910 {
1911 float ox = corner * dx;
1912
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1917 }
1918 }
1465 } 1919 }
1466
1467 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1468 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1469 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1470 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1471 } 1920 }
1472 }
1473 } 1921 }
1922 }
1923
1924 hv_clear (smooth);
1925 }
1474 1926
1475 glEnd (); 1927 glEnd ();
1476 1928
1477 glDisable (GL_TEXTURE_2D); 1929 glDisable (GL_TEXTURE_2D);
1478 glDisable (GL_BLEND); 1930 glDisable (GL_BLEND);
1479 1931
1480 // top layer: overlays such as the health bar 1932 // top layer: overlays such as the health bar
1481 for (y = 0; y < sh; y++) 1933 for (y = 0; y < sh; y++)
1482 if (0 <= y + vy && y + vy < self->rows) 1934 if (0 <= y + my && y + my < self->rows)
1483 { 1935 {
1484 maprow *row = self->row + (y + vy); 1936 maprow *row = self->row + (y + my);
1485 1937
1486 for (x = 0; x < sw; x++) 1938 for (x = 0; x < sw; x++)
1487 if (row->c0 <= x + vx && x + vx < row->c1) 1939 if (row->c0 <= x + mx && x + mx < row->c1)
1488 { 1940 {
1489 mapcell *cell = row->col + (x + vx - row->c0); 1941 mapcell *cell = row->col + (x + mx - row->c0);
1490 1942
1491 int px = x * 32; 1943 int px = x * T;
1492 int py = y * 32; 1944 int py = y * T;
1493 1945
1494 if (cell->stat_hp) 1946 if (cell->stat_hp)
1495 { 1947 {
1496 int width = sh / 28 + 1; 1948 int width = cell->stat_width * T;
1949 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1497 1950
1498 glColor3ub (0, 0, 0); 1951 glColor3ub (0, 0, 0);
1499 glRectf (px + 1, py, px + 31, py + width + 2); 1952 glRectf (px + 1, py - thick - 2,
1953 px + width - 1, py);
1500 1954
1501 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1955 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1502 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1); 1956 glRectf (px + 2,
1957 py - thick - 1,
1958 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1503 } 1959 }
1504 } 1960 }
1505 } 1961 }
1506} 1962}
1507 1963
1564 glDisable (GL_BLEND); 2020 glDisable (GL_BLEND);
1565 glDisable (GL_TEXTURE_2D); 2021 glDisable (GL_TEXTURE_2D);
1566} 2022}
1567 2023
1568void 2024void
1569fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2025fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1570 PPCODE: 2026 PPCODE:
1571{ 2027{
1572 int vx, vy;
1573 int x, y; 2028 int x, y;
2029 int sw1 = sw + 2;
2030 int sh1 = sh + 2;
2031 int sh3 = sh * 3;
1574 int sw4 = (sw + 3) & ~3; 2032 int sw34 = (sw * 3 + 3) & ~3;
2033 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1575 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2034 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1576 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2035 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1577 2036
1578 memset (darkness, 255, sw4 * sh);
1579 SvPOK_only (darkness_sv); 2037 SvPOK_only (darkness3_sv);
1580 SvCUR_set (darkness_sv, sw4 * sh); 2038 SvCUR_set (darkness3_sv, sw34 * sh3);
1581 2039
1582 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2040 mx += self->x - 1;
1583 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2041 my += self->y - 1;
1584 2042
2043 memset (darkness1, 255, sw1 * sh1);
2044
1585 for (y = 0; y < sh; y++) 2045 for (y = 0; y < sh1; y++)
1586 if (0 <= y + vy && y + vy < self->rows) 2046 if (0 <= y + my && y + my < self->rows)
1587 { 2047 {
1588 maprow *row = self->row + (y + vy); 2048 maprow *row = self->row + (y + my);
1589 2049
1590 for (x = 0; x < sw; x++) 2050 for (x = 0; x < sw1; x++)
1591 if (row->c0 <= x + vx && x + vx < row->c1) 2051 if (row->c0 <= x + mx && x + mx < row->c1)
1592 { 2052 {
1593 mapcell *cell = row->col + (x + vx - row->c0); 2053 mapcell *cell = row->col + (x + mx - row->c0);
1594 2054
1595 darkness[y * sw4 + x] = cell->darkness 2055 darkness1 [y * sw1 + x] = cell->darkness
1596 ? 255 - (cell->darkness - 1) 2056 ? 255 - (cell->darkness - 1)
1597 : 255 - FOW_DARKNESS; 2057 : 255 - FOW_DARKNESS;
1598 } 2058 }
1599 } 2059 }
1600 2060
2061 for (y = 0; y < sh; ++y)
2062 for (x = 0; x < sw; ++x)
2063 {
2064 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2065 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2066 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2067 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2068 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2069 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2070 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2071 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2072 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2073
2074 uint8_t r11 = (d11 + d21 + d12) / 3;
2075 uint8_t r21 = d21;
2076 uint8_t r31 = (d21 + d31 + d32) / 3;
2077
2078 uint8_t r12 = d12;
2079 uint8_t r22 = d22;
2080 uint8_t r32 = d32;
2081
2082 uint8_t r13 = (d13 + d23 + d12) / 3;
2083 uint8_t r23 = d23;
2084 uint8_t r33 = (d23 + d33 + d32) / 3;
2085
2086 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2087 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2088 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2089 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2090 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2091 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2092 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2093 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2094 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2095 }
2096
2097 free (darkness1);
2098
1601 EXTEND (SP, 3); 2099 EXTEND (SP, 3);
1602 PUSHs (sv_2mortal (newSViv (sw4))); 2100 PUSHs (sv_2mortal (newSViv (sw34)));
1603 PUSHs (sv_2mortal (newSViv (sh))); 2101 PUSHs (sv_2mortal (newSViv (sh3)));
1604 PUSHs (darkness_sv); 2102 PUSHs (darkness3_sv);
1605} 2103}
1606 2104
1607SV * 2105SV *
1608get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2106get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1609 CODE: 2107 CODE:
1638 if (row && row->c0 <= x && x < row->c1) 2136 if (row && row->c0 <= x && x < row->c1)
1639 { 2137 {
1640 mapcell *cell = row->col + (x - row->c0); 2138 mapcell *cell = row->col + (x - row->c0);
1641 uint8_t flags = 0; 2139 uint8_t flags = 0;
1642 2140
1643 if (cell->face [0]) flags |= 1; 2141 if (cell->tile [0]) flags |= 1;
1644 if (cell->face [1]) flags |= 2; 2142 if (cell->tile [1]) flags |= 2;
1645 if (cell->face [2]) flags |= 4; 2143 if (cell->tile [2]) flags |= 4;
1646 2144
1647 *data++ = flags; 2145 *data++ = flags;
1648 2146
1649 if (flags & 1) 2147 if (flags & 1)
1650 { 2148 {
2149 tileid tile = cell->tile [0];
1651 *data++ = cell->face [0] >> 8; 2150 *data++ = tile >> 8;
1652 *data++ = cell->face [0]; 2151 *data++ = tile;
1653 } 2152 }
1654 2153
1655 if (flags & 2) 2154 if (flags & 2)
1656 { 2155 {
2156 tileid tile = cell->tile [1];
1657 *data++ = cell->face [1] >> 8; 2157 *data++ = tile >> 8;
1658 *data++ = cell->face [1]; 2158 *data++ = tile;
1659 } 2159 }
1660 2160
1661 if (flags & 4) 2161 if (flags & 4)
1662 { 2162 {
2163 tileid tile = cell->tile [2];
1663 *data++ = cell->face [2] >> 8; 2164 *data++ = tile >> 8;
1664 *data++ = cell->face [2]; 2165 *data++ = tile;
1665 } 2166 }
1666 } 2167 }
1667 else 2168 else
1668 *data++ = 0; 2169 *data++ = 0;
1669 } 2170 }
1709 { 2210 {
1710 uint8_t flags = *data++; 2211 uint8_t flags = *data++;
1711 2212
1712 if (flags) 2213 if (flags)
1713 { 2214 {
1714 mapface face[3] = { 0, 0, 0 };
1715
1716 mapcell *cell = row_get_cell (row, x); 2215 mapcell *cell = row_get_cell (row, x);
2216 tileid tile[3] = { 0, 0, 0 };
1717 2217
1718 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2218 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1719 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2219 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1720 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2220 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1721 2221
1722 if (cell->darkness == 0) 2222 if (cell->darkness == 0)
1723 { 2223 {
1724 cell->darkness = 0; 2224 cell->darkness = 0;
1725 2225
1726 for (z = 0; z <= 2; z++) 2226 for (z = 0; z <= 2; z++)
1727 { 2227 {
1728 cell->face[z] = face[z]; 2228 tileid t = tile [z];
1729 2229
1730 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2230 if (t >= self->texs || (t && !self->tex [t].name))
2231 {
1731 XPUSHs (sv_2mortal (newSViv (face[z]))); 2232 XPUSHs (sv_2mortal (newSViv (t)));
2233 need_texid (self, t);
2234 }
2235
2236 cell->tile [z] = t;
1732 } 2237 }
1733 } 2238 }
1734 } 2239 }
1735 } 2240 }
1736 } 2241 }
1737} 2242}
1738 2243
2244MODULE = CFPlus PACKAGE = CFPlus::RW
2245
2246CFPlus::RW
2247new (SV *class, SV *data_sv)
2248 CODE:
2249{
2250 STRLEN datalen;
2251 char *data = SvPVbyte (data_sv, datalen);
2252
2253 RETVAL = SDL_RWFromConstMem (data, datalen);
2254}
2255 OUTPUT:
2256 RETVAL
2257
2258CFPlus::RW
2259new_from_file (SV *class, const char *path, const char *mode = "rb")
2260 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT:
2263 RETVAL
2264
2265void
2266close (CFPlus::RW self)
2267 CODE:
2268 SDL_RWclose (self);
2269
2270MODULE = CFPlus PACKAGE = CFPlus::Channel
2271
2272PROTOTYPES: DISABLE
2273
2274void
2275halt (CFPlus::Channel self)
2276 CODE:
2277 Mix_HaltChannel (self);
2278
2279void
2280expire (CFPlus::Channel self, int ticks = -1)
2281 CODE:
2282 Mix_ExpireChannel (self, ticks);
2283
2284void
2285fade_out (CFPlus::Channel self, int ticks = -1)
2286 CODE:
2287 Mix_FadeOutChannel (self, ticks);
2288
2289int
2290volume (CFPlus::Channel self, int volume)
2291 CODE:
2292 RETVAL = Mix_Volume (self, volume);
2293 OUTPUT:
2294 RETVAL
2295
2296void
2297unregister_all_effects (CFPlus::Channel self)
2298 CODE:
2299 Mix_UnregisterAllEffects (self);
2300
2301void
2302set_panning (CFPlus::Channel self, int left, int right)
2303 CODE:
2304 Mix_SetPanning (self, left, right);
2305
2306void
2307set_distance (CFPlus::Channel self, int distance)
2308 CODE:
2309 Mix_SetDistance (self, distance);
2310
2311void
2312set_position (CFPlus::Channel self, int angle, int distance)
2313 CODE:
2314 Mix_SetPosition (self, angle, distance);
2315
2316void
2317set_reverse_stereo (CFPlus::Channel self, int flip)
2318 CODE:
2319 Mix_SetReverseStereo (self, flip);
2320
1739MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2321MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1740 2322
2323PROTOTYPES: DISABLE
2324
1741CFPlus::MixChunk 2325CFPlus::MixChunk
1742new_from_file (SV *class, char *path) 2326new (SV *class, CFPlus::RW rwops)
1743 CODE: 2327 CODE:
1744 RETVAL = Mix_LoadWAV (path); 2328 RETVAL = Mix_LoadWAV_RW (rwops, 1);
1745 OUTPUT: 2329 OUTPUT:
1746 RETVAL 2330 RETVAL
1747 2331
1748void 2332void
1749DESTROY (CFPlus::MixChunk self) 2333DESTROY (CFPlus::MixChunk self)
1755 CODE: 2339 CODE:
1756 RETVAL = Mix_VolumeChunk (self, volume); 2340 RETVAL = Mix_VolumeChunk (self, volume);
1757 OUTPUT: 2341 OUTPUT:
1758 RETVAL 2342 RETVAL
1759 2343
1760int 2344CFPlus::Channel
1761play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2345play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1762 CODE: 2346 CODE:
1763 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2347 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2348 Mix_UnregisterAllEffects (RETVAL);
1764 OUTPUT: 2349 OUTPUT:
1765 RETVAL 2350 RETVAL
1766 2351
1767MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2352MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1768 2353
1769int 2354int
1770volume (int volume = -1) 2355volume (int volume = -1)
2356 PROTOTYPE: ;$
1771 CODE: 2357 CODE:
1772 RETVAL = Mix_VolumeMusic (volume); 2358 RETVAL = Mix_VolumeMusic (volume);
1773 OUTPUT: 2359 OUTPUT:
1774 RETVAL 2360 RETVAL
1775 2361
2362void
2363fade_out (int ms)
2364 CODE:
2365 Mix_FadeOutMusic (ms);
2366
2367void
2368halt ()
2369 CODE:
2370 Mix_HaltMusic ();
2371
1776CFPlus::MixMusic 2372CFPlus::MixMusic
1777new_from_file (SV *class, char *path) 2373new (SV *class, CFPlus::RW rwops)
1778 CODE: 2374 CODE:
1779 RETVAL = Mix_LoadMUS (path); 2375 RETVAL = Mix_LoadMUS_RW (rwops);
1780 OUTPUT: 2376 OUTPUT:
1781 RETVAL 2377 RETVAL
1782 2378
1783void 2379void
1784DESTROY (CFPlus::MixMusic self) 2380DESTROY (CFPlus::MixMusic self)
1790 CODE: 2386 CODE:
1791 RETVAL = Mix_PlayMusic (self, loops); 2387 RETVAL = Mix_PlayMusic (self, loops);
1792 OUTPUT: 2388 OUTPUT:
1793 RETVAL 2389 RETVAL
1794 2390
2391void
2392fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2393 CODE:
2394 Mix_FadeInMusicPos (self, loops, ms, position);
2395
1795MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2396MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2397
2398PROTOTYPES: ENABLE
1796 2399
1797BOOT: 2400BOOT:
1798{ 2401{
1799 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2402 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1800 static const struct { 2403 static const struct {
1801 const char *name; 2404 const char *name;
1802 IV iv; 2405 IV iv;
1803 } *civ, const_iv[] = { 2406 } *civ, const_iv[] = {
1804# define const_iv(name) { # name, (IV)name } 2407# define const_iv(name) { # name, (IV)name }
2408 const_iv (GL_VENDOR),
2409 const_iv (GL_VERSION),
2410 const_iv (GL_EXTENSIONS),
1805 const_iv (GL_COLOR_MATERIAL), 2411 const_iv (GL_COLOR_MATERIAL),
1806 const_iv (GL_SMOOTH), 2412 const_iv (GL_SMOOTH),
1807 const_iv (GL_FLAT), 2413 const_iv (GL_FLAT),
1808 const_iv (GL_DITHER), 2414 const_iv (GL_DITHER),
1809 const_iv (GL_BLEND), 2415 const_iv (GL_BLEND),
1813 const_iv (GL_ALPHA_TEST), 2419 const_iv (GL_ALPHA_TEST),
1814 const_iv (GL_NORMALIZE), 2420 const_iv (GL_NORMALIZE),
1815 const_iv (GL_RESCALE_NORMAL), 2421 const_iv (GL_RESCALE_NORMAL),
1816 const_iv (GL_FRONT), 2422 const_iv (GL_FRONT),
1817 const_iv (GL_BACK), 2423 const_iv (GL_BACK),
2424 const_iv (GL_AUX0),
1818 const_iv (GL_AND), 2425 const_iv (GL_AND),
1819 const_iv (GL_ONE), 2426 const_iv (GL_ONE),
1820 const_iv (GL_ZERO), 2427 const_iv (GL_ZERO),
1821 const_iv (GL_SRC_ALPHA), 2428 const_iv (GL_SRC_ALPHA),
1822 const_iv (GL_DST_ALPHA), 2429 const_iv (GL_DST_ALPHA),
1836 const_iv (GL_LUMINANCE), 2443 const_iv (GL_LUMINANCE),
1837 const_iv (GL_LUMINANCE_ALPHA), 2444 const_iv (GL_LUMINANCE_ALPHA),
1838 const_iv (GL_FLOAT), 2445 const_iv (GL_FLOAT),
1839 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2446 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1840 const_iv (GL_COMPILE), 2447 const_iv (GL_COMPILE),
2448 const_iv (GL_PROXY_TEXTURE_1D),
2449 const_iv (GL_PROXY_TEXTURE_2D),
1841 const_iv (GL_TEXTURE_1D), 2450 const_iv (GL_TEXTURE_1D),
1842 const_iv (GL_TEXTURE_2D), 2451 const_iv (GL_TEXTURE_2D),
1843 const_iv (GL_TEXTURE_ENV), 2452 const_iv (GL_TEXTURE_ENV),
1844 const_iv (GL_TEXTURE_MAG_FILTER), 2453 const_iv (GL_TEXTURE_MAG_FILTER),
1845 const_iv (GL_TEXTURE_MIN_FILTER), 2454 const_iv (GL_TEXTURE_MIN_FILTER),
1866 const_iv (GL_COLOR_LOGIC_OP), 2475 const_iv (GL_COLOR_LOGIC_OP),
1867 const_iv (GL_SEPARABLE_2D), 2476 const_iv (GL_SEPARABLE_2D),
1868 const_iv (GL_CONVOLUTION_2D), 2477 const_iv (GL_CONVOLUTION_2D),
1869 const_iv (GL_CONVOLUTION_BORDER_MODE), 2478 const_iv (GL_CONVOLUTION_BORDER_MODE),
1870 const_iv (GL_CONSTANT_BORDER), 2479 const_iv (GL_CONSTANT_BORDER),
2480 const_iv (GL_POINTS),
1871 const_iv (GL_LINES), 2481 const_iv (GL_LINES),
1872 const_iv (GL_LINE_STRIP), 2482 const_iv (GL_LINE_STRIP),
1873 const_iv (GL_LINE_LOOP), 2483 const_iv (GL_LINE_LOOP),
1874 const_iv (GL_QUADS), 2484 const_iv (GL_QUADS),
1875 const_iv (GL_QUAD_STRIP), 2485 const_iv (GL_QUAD_STRIP),
1876 const_iv (GL_TRIANGLES), 2486 const_iv (GL_TRIANGLES),
1877 const_iv (GL_TRIANGLE_STRIP), 2487 const_iv (GL_TRIANGLE_STRIP),
1878 const_iv (GL_TRIANGLE_FAN), 2488 const_iv (GL_TRIANGLE_FAN),
2489 const_iv (GL_POLYGON),
1879 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2490 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2491 const_iv (GL_POINT_SMOOTH_HINT),
2492 const_iv (GL_LINE_SMOOTH_HINT),
2493 const_iv (GL_POLYGON_SMOOTH_HINT),
2494 const_iv (GL_GENERATE_MIPMAP_HINT),
1880 const_iv (GL_FASTEST), 2495 const_iv (GL_FASTEST),
2496 const_iv (GL_DONT_CARE),
2497 const_iv (GL_NICEST),
1881 const_iv (GL_V2F), 2498 const_iv (GL_V2F),
1882 const_iv (GL_V3F), 2499 const_iv (GL_V3F),
1883 const_iv (GL_T2F_V3F), 2500 const_iv (GL_T2F_V3F),
1884 const_iv (GL_T2F_N3F_V3F), 2501 const_iv (GL_T2F_N3F_V3F),
1885# undef const_iv 2502# undef const_iv
1886 }; 2503 };
1887 2504
1888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2505 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2506 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2507
2508 texture_av = newAV ();
2509 AvREAL_off (texture_av);
1890} 2510}
1891 2511
1892char * 2512char *
1893gl_vendor () 2513gl_vendor ()
1894 CODE: 2514 CODE:
1908 CODE: 2528 CODE:
1909 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2529 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1910 OUTPUT: 2530 OUTPUT:
1911 RETVAL 2531 RETVAL
1912 2532
2533const char *glGetString (GLenum pname)
2534
2535GLint glGetInteger (GLenum pname)
2536 CODE:
2537 glGetIntegerv (pname, &RETVAL);
2538 OUTPUT:
2539 RETVAL
2540
2541GLdouble glGetDouble (GLenum pname)
2542 CODE:
2543 glGetDoublev (pname, &RETVAL);
2544 OUTPUT:
2545 RETVAL
2546
1913int glGetError () 2547int glGetError ()
1914 2548
1915void glFinish () 2549void glFinish ()
1916 2550
1917void glClear (int mask) 2551void glClear (int mask)
1954# near_ and far_ are due to microsofts buggy "c" compiler 2588# near_ and far_ are due to microsofts buggy "c" compiler
1955void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2589void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1956 2590
1957# near_ and far_ are due to microsofts buggy "c" compiler 2591# near_ and far_ are due to microsofts buggy "c" compiler
1958void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2592void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2593
2594PROTOTYPES: DISABLE
1959 2595
1960void glViewport (int x, int y, int width, int height) 2596void glViewport (int x, int y, int width, int height)
1961 2597
1962void glScissor (int x, int y, int width, int height) 2598void glScissor (int x, int y, int width, int height)
1963 2599
1971 2607
1972void glRotate (float angle, float x, float y, float z) 2608void glRotate (float angle, float x, float y, float z)
1973 CODE: 2609 CODE:
1974 glRotatef (angle, x, y, z); 2610 glRotatef (angle, x, y, z);
1975 2611
1976void glBegin (int mode)
1977
1978void glEnd ()
1979
1980void glColor (float r, float g, float b, float a = 1.0) 2612void glColor (float r, float g, float b, float a = 1.0)
1981 PROTOTYPE: @
1982 ALIAS: 2613 ALIAS:
1983 glColor_premultiply = 1 2614 glColor_premultiply = 1
1984 CODE: 2615 CODE:
1985 if (ix) 2616 if (ix)
1986 { 2617 {
1989 b *= a; 2620 b *= a;
1990 } 2621 }
1991 // microsoft visual "c" rounds instead of truncating... 2622 // microsoft visual "c" rounds instead of truncating...
1992 glColor4f (r, g, b, a); 2623 glColor4f (r, g, b, a);
1993 2624
1994void glInterleavedArrays (int format, int stride, char *data)
1995
1996void glDrawElements (int mode, int count, int type, char *indices)
1997
1998# 1.2 void glDrawRangeElements (int mode, int start, int end
1999
2000void glRasterPos (float x, float y, float z = 0.) 2625void glRasterPos (float x, float y, float z = 0.)
2001 CODE: 2626 CODE:
2002 glRasterPos3f (0, 0, z); 2627 glRasterPos3f (0, 0, z);
2003 glBitmap (0, 0, 0, 0, x, y, 0); 2628 glBitmap (0, 0, 0, 0, x, y, 0);
2004 2629
2008 2633
2009void glTexCoord (float s, float t) 2634void glTexCoord (float s, float t)
2010 CODE: 2635 CODE:
2011 glTexCoord2f (s, t); 2636 glTexCoord2f (s, t);
2012 2637
2638void glRect (float x1, float y1, float x2, float y2)
2639 CODE:
2640 glRectf (x1, y1, x2, y2);
2641
2642PROTOTYPES: ENABLE
2643
2644void glBegin (int mode)
2645
2646void glEnd ()
2647
2648void glPointSize (GLfloat size)
2649
2650void glLineWidth (GLfloat width)
2651
2652void glInterleavedArrays (int format, int stride, char *data)
2653
2654void glDrawElements (int mode, int count, int type, char *indices)
2655
2656# 1.2 void glDrawRangeElements (int mode, int start, int end
2657
2013void glTexEnv (int target, int pname, float param) 2658void glTexEnv (int target, int pname, float param)
2014 CODE: 2659 CODE:
2015 glTexEnvf (target, pname, param); 2660 glTexEnvf (target, pname, param);
2016 2661
2017void glTexParameter (int target, int pname, float param) 2662void glTexParameter (int target, int pname, float param)
2039 2684
2040void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2685void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2041 2686
2042void glDrawPixels (int width, int height, int format, int type, char *pixels) 2687void glDrawPixels (int width, int height, int format, int type, char *pixels)
2043 2688
2689void glPixelZoom (float x, float y)
2690
2044void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2691void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2045 2692
2046int glGenTexture () 2693int glGenTexture ()
2047 CODE: 2694 CODE:
2048{ 2695 RETVAL = gen_texture ();
2049 GLuint name;
2050 glGenTextures (1, &name);
2051 RETVAL = name;
2052}
2053 OUTPUT: 2696 OUTPUT:
2054 RETVAL 2697 RETVAL
2055 2698
2056void glDeleteTexture (int name) 2699void glDeleteTexture (int name)
2057 CODE: 2700 CODE:
2058{
2059 GLuint name_ = name;
2060 glDeleteTextures (1, &name_); 2701 del_texture (name);
2061} 2702
2062
2063int glGenList () 2703int glGenList ()
2064 CODE: 2704 CODE:
2065 RETVAL = glGenLists (1); 2705 RETVAL = glGenLists (1);
2066 OUTPUT: 2706 OUTPUT:
2067 RETVAL 2707 RETVAL
2074 2714
2075void glEndList () 2715void glEndList ()
2076 2716
2077void glCallList (int list) 2717void glCallList (int list)
2078 2718
2719MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2720
2721PROTOTYPES: DISABLE
2722
2723void
2724find_widget (SV *self, NV x, NV y)
2725 PPCODE:
2726{
2727 if (within_widget (self, x, y))
2728 XPUSHs (self);
2729}
2730
2731BOOT:
2732{
2733 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2734
2735 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2736 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2737 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2738 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2739}
2740
2741void
2742draw (SV *self)
2743 CODE:
2744{
2745 HV *hv;
2746 SV **svp;
2747 NV x, y, w, h;
2748 SV *draw_x_sv = GvSV (draw_x_gv);
2749 SV *draw_y_sv = GvSV (draw_y_gv);
2750 SV *draw_w_sv = GvSV (draw_w_gv);
2751 SV *draw_h_sv = GvSV (draw_h_gv);
2752 SV *hover;
2753 double draw_x, draw_y, draw_w, draw_h;
2754
2755 if (!SvROK (self))
2756 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2757
2758 hv = (HV *)SvRV (self);
2759
2760 if (SvTYPE (hv) != SVt_PVHV)
2761 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2762
2763 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2764 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2765
2766 if (!h || !w)
2767 XSRETURN_EMPTY;
2768
2769 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2770 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2771
2772 draw_x = SvNV (draw_x_sv) + x;
2773 draw_y = SvNV (draw_y_sv) + y;
2774
2775 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2776 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2777 XSRETURN_EMPTY;
2778
2779 sv_setnv (draw_x_sv, draw_x);
2780 sv_setnv (draw_y_sv, draw_y);
2781
2782 glPushMatrix ();
2783 glTranslated (x, y, 0);
2784
2785 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2786 {
2787 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2788
2789 if (svp && SvTRUE (*svp))
2790 {
2791 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2792 glEnable (GL_BLEND);
2793 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2794 glBegin (GL_QUADS);
2795 glVertex2f (0, 0);
2796 glVertex2f (w, 0);
2797 glVertex2f (w, h);
2798 glVertex2f (0, h);
2799 glEnd ();
2800 glDisable (GL_BLEND);
2801 }
2802 }
2803#if 0
2804 if ($ENV{CFPLUS_DEBUG} & 1) {
2805 glPushMatrix;
2806 glColor 1, 1, 0, 1;
2807 glTranslate 0.375, 0.375;
2808 glBegin GL_LINE_LOOP;
2809 glVertex 0 , 0;
2810 glVertex $self->{w} - 1, 0;
2811 glVertex $self->{w} - 1, $self->{h} - 1;
2812 glVertex 0 , $self->{h} - 1;
2813 glEnd;
2814 glPopMatrix;
2815 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2816 }
2817#endif
2818 PUSHMARK (SP);
2819 XPUSHs (self);
2820 PUTBACK;
2821 call_method ("_draw", G_VOID | G_DISCARD);
2822 SPAGAIN;
2823
2824 glPopMatrix ();
2825
2826 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2827 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2828}
2829

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines