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.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 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>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
39#include <SDL_endian.h> 42#include <SDL_endian.h>
40#include <SDL_image.h> 43#include <SDL_image.h>
41#include <SDL_mixer.h> 44#include <SDL_mixer.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
52#endif
53
44#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
46 56
47#include <glib/gmacros.h> 57#include <glib.h>
48 58
49#include <pango/pango.h> 59#include <pango/pango.h>
60
61#ifndef PANGO_VERSION_CHECK
62# define PANGO_VERSION_CHECK(a,b,c) 0
63#endif
64
65#if !PANGO_VERSION_CHECK (1, 15, 2)
66# define pango_layout_get_line_readonly pango_layout_get_line
67# define pango_layout_get_lines_readonly pango_layout_get_lines
68# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
69# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
70#endif
50 71
51#ifndef _WIN32 72#ifndef _WIN32
52# include <sys/types.h> 73# include <sys/types.h>
53# include <sys/socket.h> 74# include <sys/socket.h>
54# include <netinet/in.h> 75# include <netinet/in.h>
55# include <netinet/tcp.h> 76# include <netinet/tcp.h>
56# include <inttypes.h> 77# include <inttypes.h>
57#endif 78#endif
58 79
80#if __GNUC__ >= 4
81# define expect(expr,value) __builtin_expect ((expr),(value))
82#else
83# define expect(expr,value) (expr)
84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
88
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
62 95
63#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
65 98
66#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
67 100
68#if 0 101/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 103
71# define PARACHUTE 0 104#define KMOD_LRAM 0x10000 // our extension
72#endif 105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
73 127
74static AV *texture_av; 128static AV *texture_av;
75 129
76static struct 130static struct
77{ 131{
… …
120 174
121#include "pango-font.c" 175#include "pango-font.c"
122#include "pango-fontmap.c" 176#include "pango-fontmap.c"
123#include "pango-render.c" 177#include "pango-render.c"
124 178
125typedef IV CFPlus__Channel; 179typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 180typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 181typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 182typedef Mix_Music *DC__MixMusic;
129 183
130typedef PangoFontDescription *CFPlus__Font; 184typedef PangoFontDescription *DC__Font;
131 185
132static int 186static int
133shape_attr_p (PangoLayoutRun *run) 187shape_attr_p (PangoLayoutRun *run)
134{ 188{
135 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
136 190
137 while (attrs) 191 while (attrs)
138 { 192 {
139 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 194
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 196 return 1;
143 197
144 attrs = attrs->next; 198 attrs = attrs->next;
145 } 199 }
146 200
147 return 0; 201 return 0;
148} 202}
149 203
150typedef struct cf_layout { 204struct cf_layout {
151 PangoLayout *pl; 205 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
153 int base_height; 207 int base_height;
154 CFPlus__Font font; 208 DC__Font font;
155 rc_t *rc; 209 rc_t *rc;
156} *CFPlus__Layout; 210};
157 211
212typedef cf_layout *DC__Layout;
213
158static CFPlus__Font default_font; 214static DC__Font default_font;
159static PangoContext *opengl_context; 215static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
161 217
162static void 218static void
163substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
164{ 220{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 224#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 226}
171 227
172static void 228static void
173layout_update_font (CFPlus__Layout self) 229layout_update_font (DC__Layout self)
174{ 230{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 231 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 232 * reasonably well with dejavu/bistream fonts
177 */ 233 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 234 PangoFontDescription *font = self->font ? self->font : default_font;
179 235
180 pango_font_description_set_absolute_size (font, 236 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 237 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 238
183 pango_layout_set_font_description (self->pl, font); 239 pango_layout_set_font_description (self->pl, font);
184} 240}
185 241
186static void 242static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 243layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 244{
189 PangoRectangle rect; 245 PangoRectangle rect;
190 246
191 // get_pixel_* wrongly rounds down 247 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 248 pango_layout_get_extents (self->pl, 0, &rect);
… …
202} 258}
203 259
204typedef uint16_t tileid; 260typedef uint16_t tileid;
205typedef uint16_t faceid; 261typedef uint16_t faceid;
206 262
207typedef struct { 263struct maptex
264{
208 GLuint name; 265 GLuint name;
209 int w, h; 266 int w, h;
210 float s, t; 267 float s, t;
211 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
212 tileid smoothtile; 269 tileid smoothtile;
213 uint8_t smoothlevel; 270 uint8_t smoothlevel;
214} maptex; 271 uint8_t unused; /* set to zero on use */
272};
215 273
216typedef struct { 274struct mapcell
275{
217 uint32_t player; 276 uint32_t player;
218 tileid tile[3]; 277 tileid tile[3];
219 uint16_t darkness; 278 uint16_t darkness;
220 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
221} mapcell; 280};
222 281
223typedef struct { 282struct maprow
283{
224 int32_t c0, c1; 284 int32_t c0, c1;
225 mapcell *col; 285 mapcell *col;
226} maprow; 286};
227 287
228typedef struct map { 288struct mapgrid {
229 int x, y, w, h; 289 int x, y, w, h;
230 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
231 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
233 293
234 int32_t rows; 294 int32_t rows;
235 maprow *row; 295 maprow *row;
236} *CFPlus__Map; 296};
297
298typedef mapgrid *DC__Map;
237 299
238static char * 300static char *
239prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
240{ 302{
241 char *p; 303 char *p;
… …
259 321
260#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
261#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
262 324
263static void 325static void
264need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
265{ 327{
266 while (self->faces <= face) 328 while (self->faces <= face)
267 { 329 {
268 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
269 self->faces *= 2; 331 self->faces *= 2;
270 } 332 }
271} 333}
272 334
273static void 335static void
274need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
275{ 337{
276 while (self->texs <= texid) 338 while (self->texs <= texid)
277 { 339 {
278 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
279 self->texs *= 2; 341 self->texs *= 2;
280 } 342 }
281} 343}
282 344
283static maprow * 345static maprow *
284map_get_row (CFPlus__Map self, int y) 346map_get_row (mapgrid *self, int y)
285{ 347{
286 if (0 > y) 348 if (0 > y)
287 { 349 {
288 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
… …
327 389
328 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
329} 391}
330 392
331static mapcell * 393static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
333{ 395{
334 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
335} 397}
336 398
337static void 399static void
338map_clear (CFPlus__Map self) 400map_clear (mapgrid *self)
339{ 401{
340 int r; 402 int r;
341 403
342 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
… …
350 self->oy = 0; 412 self->oy = 0;
351 self->row = 0; 413 self->row = 0;
352 self->rows = 0; 414 self->rows = 0;
353} 415}
354 416
417#define CELL_CLEAR(cell) \
418 do { \
419 if ((cell)->player) \
420 (cell)->tile [2] = 0; \
421 (cell)->darkness = 0; \
422 (cell)->stat_hp = 0; \
423 (cell)->flags = 0; \
424 (cell)->player = 0; \
425 } while (0)
426
355static void 427static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
357{ 429{
358 int x, y; 430 int x, y;
359 maprow *row; 431 maprow *row;
360 mapcell *cell; 432 mapcell *cell;
361 433
… …
373 if (x >= row->c1) 445 if (x >= row->c1)
374 break; 446 break;
375 447
376 cell = row->col + x - row->c0; 448 cell = row->col + x - row->c0;
377 449
378 cell->darkness = 0; 450 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 451 }
383 } 452 }
384} 453}
385 454
386typedef struct { 455struct smooth_key
456{
387 tileid tile; 457 tileid tile;
388 uint8_t x, y, level; 458 uint8_t x, y, level;
389} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
390 478
391static void 479static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 481{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
395 483
396 if (SvIOK (*sv)) 484 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
398 else 486 else
399 sv_setiv (*sv, bits); 487 it->second |= bits;
400} 488}
401 489
402static void 490static void
403music_finished (void) 491music_finished (void)
404{ 492{
… …
421 ev.code = 1; 509 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 511 ev.data2 = 0;
424 512
425 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
514}
515
516// approximately divide by 255
517static unsigned int
518div255 (unsigned int n)
519{
520 return (n + (n >> 8)) >> 8;
426} 521}
427 522
428static unsigned int 523static unsigned int
429minpot (unsigned int n) 524minpot (unsigned int n)
430{ 525{
… …
498 return 0; 593 return 0;
499 594
500 return 1; 595 return 1;
501} 596}
502 597
503MODULE = CFPlus PACKAGE = CFPlus 598/******************************************************************************/
599
600/* process keyboard modifiers */
601static int
602mod_munge (int mod)
603{
604 mod &= MOD_MASK;
605
606 if (mod & (KMOD_META | KMOD_ALT))
607 mod |= KMOD_LRAM;
608
609 return mod;
610}
611
612static void
613deliantra_main (SV *real_main)
614{
615 dSP;
616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
619}
620
621#ifdef __MACOSX__
622 static SV *real_main;
623
624 /* to due surprising braindamage on the side of SDL design, we
625 * do some mind-boggling hack here: SDL requires a custom main()
626 * on OS X, so... we provide one and call the original main(), which,
627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
628 * and which calls our main (== SDL_main) back.
629 */
630 extern C_LINKAGE int
631 main (int argc, char *argv[])
632 {
633 deliantra_main (real_main);
634 }
635
636 #undef main
637
638 extern C_LINKAGE int main (int argc, char *argv[]);
639
640 static void
641 SDL_main_hack (SV *real_main_)
642 {
643 real_main = real_main_;
644
645 char *argv[] = { "deliantra client", 0 };
646 (main) (1, argv);
647 }
648#else
649 static void
650 SDL_main_hack (SV *real_main)
651 {
652 deliantra_main (real_main);
653 }
654#endif
655
656MODULE = Deliantra::Client PACKAGE = DC
504 657
505PROTOTYPES: ENABLE 658PROTOTYPES: ENABLE
506 659
507BOOT: 660BOOT:
508{ 661{
509 HV *stash = gv_stashpv ("CFPlus", 1); 662 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 663 static const struct {
511 const char *name; 664 const char *name;
512 IV iv; 665 IV iv;
513 } *civ, const_iv[] = { 666 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 667# define const_iv(name) { # name, (IV)name }
… …
535 const_iv (SDL_USEREVENT), 688 const_iv (SDL_USEREVENT),
536 689
537 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 692 const_iv (SDL_APPACTIVE),
693
694
695 const_iv (SDLK_UNKNOWN),
696 const_iv (SDLK_FIRST),
697 const_iv (SDLK_BACKSPACE),
698 const_iv (SDLK_TAB),
699 const_iv (SDLK_CLEAR),
700 const_iv (SDLK_RETURN),
701 const_iv (SDLK_PAUSE),
702 const_iv (SDLK_ESCAPE),
703 const_iv (SDLK_SPACE),
704 const_iv (SDLK_EXCLAIM),
705 const_iv (SDLK_QUOTEDBL),
706 const_iv (SDLK_HASH),
707 const_iv (SDLK_DOLLAR),
708 const_iv (SDLK_AMPERSAND),
709 const_iv (SDLK_QUOTE),
710 const_iv (SDLK_LEFTPAREN),
711 const_iv (SDLK_RIGHTPAREN),
712 const_iv (SDLK_ASTERISK),
713 const_iv (SDLK_PLUS),
714 const_iv (SDLK_COMMA),
715 const_iv (SDLK_MINUS),
716 const_iv (SDLK_PERIOD),
717 const_iv (SDLK_SLASH),
718 const_iv (SDLK_0),
719 const_iv (SDLK_1),
720 const_iv (SDLK_2),
721 const_iv (SDLK_3),
722 const_iv (SDLK_4),
723 const_iv (SDLK_5),
724 const_iv (SDLK_6),
725 const_iv (SDLK_7),
726 const_iv (SDLK_8),
727 const_iv (SDLK_9),
728 const_iv (SDLK_COLON),
729 const_iv (SDLK_SEMICOLON),
730 const_iv (SDLK_LESS),
731 const_iv (SDLK_EQUALS),
732 const_iv (SDLK_GREATER),
733 const_iv (SDLK_QUESTION),
734 const_iv (SDLK_AT),
735
736 const_iv (SDLK_LEFTBRACKET),
737 const_iv (SDLK_BACKSLASH),
738 const_iv (SDLK_RIGHTBRACKET),
739 const_iv (SDLK_CARET),
740 const_iv (SDLK_UNDERSCORE),
741 const_iv (SDLK_BACKQUOTE),
742 const_iv (SDLK_DELETE),
540 743
541 const_iv (SDLK_FIRST), 744 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 745 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 826 const_iv (KMOD_MODE),
624 827
828 const_iv (KMOD_LRAM),
829
625 const_iv (MIX_DEFAULT_FORMAT), 830 const_iv (MIX_DEFAULT_FORMAT),
831
832 const_iv (SDL_INIT_TIMER),
833 const_iv (SDL_INIT_AUDIO),
834 const_iv (SDL_INIT_VIDEO),
835 const_iv (SDL_INIT_CDROM),
836 const_iv (SDL_INIT_JOYSTICK),
837 const_iv (SDL_INIT_EVERYTHING),
838 const_iv (SDL_INIT_NOPARACHUTE),
839 const_iv (SDL_INIT_EVENTTHREAD),
840
841 const_iv (SDL_GL_RED_SIZE),
842 const_iv (SDL_GL_GREEN_SIZE),
843 const_iv (SDL_GL_BLUE_SIZE),
844 const_iv (SDL_GL_ALPHA_SIZE),
845 const_iv (SDL_GL_DOUBLEBUFFER),
846 const_iv (SDL_GL_BUFFER_SIZE),
847 const_iv (SDL_GL_DEPTH_SIZE),
848 const_iv (SDL_GL_STENCIL_SIZE),
849 const_iv (SDL_GL_ACCUM_RED_SIZE),
850 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
851 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
852 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
853 const_iv (SDL_GL_STEREO),
854 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
855 const_iv (SDL_GL_MULTISAMPLESAMPLES),
856 const_iv (SDL_GL_ACCELERATED_VISUAL),
857 const_iv (SDL_GL_SWAP_CONTROL),
858
859 const_iv (FOW_DARKNESS)
626# undef const_iv 860# undef const_iv
627 }; 861 };
628 862
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 863 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 865
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 868}
635 869
… …
651NV ceil (NV x) 885NV ceil (NV x)
652 886
653IV minpot (UV n) 887IV minpot (UV n)
654 888
655IV popcount (UV n) 889IV popcount (UV n)
890
891NV distance (NV dx, NV dy)
892 CODE:
893 RETVAL = pow (dx * dx + dy * dy, 0.5);
894 OUTPUT:
895 RETVAL
656 896
657void 897void
658pango_init () 898pango_init ()
659 CODE: 899 CODE:
660{ 900{
661 opengl_fontmap = pango_opengl_font_map_new (); 901 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 902 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 903 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
904 /*pango_context_set_font_description (opengl_context, default_font);*/
905#if PANGO_VERSION_CHECK (1, 15, 2)
906 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
907 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
908#endif
664} 909}
665 910
666char *
667SDL_GetError () 911char *SDL_GetError ()
668 912
669int 913void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 914 PROTOTYPE: &
671 915
672void 916int SDL_Init (U32 flags)
917
918int SDL_InitSubSystem (U32 flags)
919
920void SDL_QuitSubSystem (U32 flags)
921
673SDL_Quit () 922void SDL_Quit ()
923
924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
926
927int SDL_GL_GetAttribute (int attr)
928 CODE:
929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
930 XSRETURN_UNDEF;
931 OUTPUT:
932 RETVAL
674 933
675void 934void
676SDL_ListModes (int rgb, int alpha) 935SDL_ListModes (int rgb, int alpha)
677 PPCODE: 936 PPCODE:
678{ 937{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 952
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 953 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 954 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 955
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 956 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 957
702 if (m && m != (SDL_Rect **)-1) 958 if (m && m != (SDL_Rect **)-1)
703 while (*m) 959 while (*m)
704 { 960 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 961 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 962 {
707 AV *av = newAV (); 963 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 964 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 965 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 966 av_push (av, newSViv (rgb));
… …
733 ); 989 );
734 990
735 if (RETVAL) 991 if (RETVAL)
736 { 992 {
737 av_clear (texture_av); 993 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 995#include "glfunc.h"
742#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 999 }
744} 1000}
745 OUTPUT: 1001 OUTPUT:
746 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
747 1006
748void 1007void
749SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
750 1009
751char * 1010char *
752SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
753 1013
754int 1014int
755SDL_GetAppState () 1015SDL_GetAppState ()
756 1016
1017int
1018SDL_GetModState ()
1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
757void 1024void
1025SDL_PumpEvents ()
1026
1027void
758poll_events () 1028peep_events ()
759 PPCODE: 1029 PPCODE:
760{ 1030{
761 SDL_Event ev; 1031 SDL_Event ev;
762 1032
763 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
… …
770 { 1040 {
771 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1042 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1045 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1046 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1048 break;
779 1049
780 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 1069 x = ev.motion.x;
800 y = ev.motion.y; 1070 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1072 }
803 1073
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1080 }
811 break; 1081 break;
812 1082
813 case SDL_MOUSEBUTTONDOWN: 1083 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1084 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1085 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1086
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1087 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1088 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1089 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1090 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1095 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1096 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1097 break;
828 } 1098 }
829 1099
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1100 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1101 }
832} 1102}
1103
1104char *
1105SDL_AudioDriverName ()
1106 CODE:
1107{
1108 char buf [256];
1109 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1110 XSRETURN_UNDEF;
1111
1112 RETVAL = buf;
1113}
1114 OUTPUT:
1115 RETVAL
833 1116
834int 1117int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1119 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
838 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
839 1122
840void 1123void
841Mix_QuerySpec () 1124Mix_QuerySpec ()
… …
894 } 1177 }
895 } 1178 }
896#endif 1179#endif
897} 1180}
898 1181
899void 1182int
900add_font (char *file) 1183add_font (char *file)
901 CODE: 1184 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1186 OUTPUT:
1187 RETVAL
1188
1189void
1190IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1191
1192# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1193void
1194Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
903 1195
904void 1196void
905load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
906 ALIAS: 1198 ALIAS:
907 load_image_file = 1 1199 load_image_file = 1
… …
953 1245
954 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
959 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
963 1255
… …
993void 1285void
994error (char *message) 1286error (char *message)
995 CODE: 1287 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1288 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1289#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1290 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1291#endif
1000 1292
1001void 1293void
1002fatal (char *message) 1294fatal (char *message)
1003 CODE: 1295 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1296 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1297#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1298 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1299#endif
1008 _exit (1); 1300 _exit (1);
1009 1301
1010void 1302void
1011_exit (int retval = 0) 1303_exit (int retval = 0)
… …
1023#if DEBUG 1315#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1316 VALGRIND_DO_LEAK_CHECK;
1025#endif 1317#endif
1026} 1318}
1027 1319
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1320int
1321SvREFCNT (SV *sv)
1322 CODE:
1323 RETVAL = SvREFCNT (sv);
1324 OUTPUT:
1325 RETVAL
1326
1327MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1328
1030PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1031 1330
1032CFPlus::Font 1331DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1333 CODE:
1035{ 1334{
1036 int count; 1335 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1040} 1339}
1041 OUTPUT: 1340 OUTPUT:
1042 RETVAL 1341 RETVAL
1043 1342
1044void 1343void
1045DESTROY (CFPlus::Font self) 1344DESTROY (DC::Font self)
1046 CODE: 1345 CODE:
1047 pango_font_description_free (self); 1346 pango_font_description_free (self);
1048 1347
1049void 1348void
1050make_default (CFPlus::Font self) 1349make_default (DC::Font self)
1051 PROTOTYPE: $ 1350 PROTOTYPE: $
1052 CODE: 1351 CODE:
1053 default_font = self; 1352 default_font = self;
1054 1353
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1354MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1355
1057PROTOTYPES: DISABLE 1356PROTOTYPES: DISABLE
1058 1357
1059void 1358void
1060glyph_cache_backup () 1359glyph_cache_backup ()
… …
1066glyph_cache_restore () 1365glyph_cache_restore ()
1067 PROTOTYPE: 1366 PROTOTYPE:
1068 CODE: 1367 CODE:
1069 tc_restore (); 1368 tc_restore ();
1070 1369
1071CFPlus::Layout 1370DC::Layout
1072new (SV *class) 1371new (SV *klass)
1073 CODE: 1372 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1075 1374
1076 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1077 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
… …
1086 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1087 OUTPUT: 1386 OUTPUT:
1088 RETVAL 1387 RETVAL
1089 1388
1090void 1389void
1091DESTROY (CFPlus::Layout self) 1390DESTROY (DC::Layout self)
1092 CODE: 1391 CODE:
1093 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1094 rc_free (self->rc); 1393 rc_free (self->rc);
1095 Safefree (self); 1394 Safefree (self);
1096 1395
1097void 1396void
1098set_text (CFPlus::Layout self, SV *text_) 1397set_text (DC::Layout self, SV *text_)
1099 CODE: 1398 CODE:
1100{ 1399{
1101 STRLEN textlen; 1400 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1401 char *text = SvPVutf8 (text_, textlen);
1103 1402
1104 pango_layout_set_text (self->pl, text, textlen); 1403 pango_layout_set_text (self->pl, text, textlen);
1105} 1404}
1106 1405
1107void 1406void
1108set_markup (CFPlus::Layout self, SV *text_) 1407set_markup (DC::Layout self, SV *text_)
1109 CODE: 1408 CODE:
1110{ 1409{
1111 STRLEN textlen; 1410 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1411 char *text = SvPVutf8 (text_, textlen);
1113 1412
1114 pango_layout_set_markup (self->pl, text, textlen); 1413 pango_layout_set_markup (self->pl, text, textlen);
1115} 1414}
1116 1415
1117void 1416void
1118set_shapes (CFPlus::Layout self, ...) 1417set_shapes (DC::Layout self, ...)
1119 CODE: 1418 CODE:
1120{ 1419{
1121 PangoAttrList *attrs = 0; 1420 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1421 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1422 const char *pos = text;
… …
1158 if (attrs) 1457 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1458 pango_layout_set_attributes (self->pl, attrs);
1160} 1459}
1161 1460
1162void 1461void
1163get_shapes (CFPlus::Layout self) 1462get_shapes (DC::Layout self)
1164 PPCODE: 1463 PPCODE:
1165{ 1464{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1465 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1466
1168 do 1467 do
1169 { 1468 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1469 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1470
1172 if (run && shape_attr_p (run)) 1471 if (run && shape_attr_p (run))
1173 { 1472 {
1174 PangoRectangle extents; 1473 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1474 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1183 1482
1184 pango_layout_iter_free (iter); 1483 pango_layout_iter_free (iter);
1185} 1484}
1186 1485
1187int 1486int
1188has_wrapped (CFPlus::Layout self) 1487has_wrapped (DC::Layout self)
1189 CODE: 1488 CODE:
1190{ 1489{
1191 int lines = 1; 1490 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1491 const char *text = pango_layout_get_text (self->pl);
1193 1492
… …
1198} 1497}
1199 OUTPUT: 1498 OUTPUT:
1200 RETVAL 1499 RETVAL
1201 1500
1202SV * 1501SV *
1203get_text (CFPlus::Layout self) 1502get_text (DC::Layout self)
1204 CODE: 1503 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1504 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1505 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1506 OUTPUT:
1208 RETVAL 1507 RETVAL
1209 1508
1210void 1509void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1510set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1511 CODE:
1213 self->r = r; 1512 self->r = r;
1214 self->g = g; 1513 self->g = g;
1215 self->b = b; 1514 self->b = b;
1216 self->a = a; 1515 self->a = a;
1217 1516
1218void 1517void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1518set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1519 CODE:
1221 if (self->font != font) 1520 if (self->font != font)
1222 { 1521 {
1223 self->font = font; 1522 self->font = font;
1224 layout_update_font (self); 1523 layout_update_font (self);
1225 } 1524 }
1226 1525
1227void 1526void
1228set_height (CFPlus::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1229 CODE: 1528 CODE:
1230 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1231 { 1530 {
1232 self->base_height = base_height; 1531 self->base_height = base_height;
1233 layout_update_font (self); 1532 layout_update_font (self);
1234 } 1533 }
1235 1534
1236void 1535void
1237set_width (CFPlus::Layout self, int max_width = -1) 1536set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1537 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1538 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1539
1241void 1540void
1242set_indent (CFPlus::Layout self, int indent) 1541set_indent (DC::Layout self, int indent)
1243 CODE: 1542 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1543 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1544
1246void 1545void
1247set_spacing (CFPlus::Layout self, int spacing) 1546set_spacing (DC::Layout self, int spacing)
1248 CODE: 1547 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1548 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1549
1251void 1550void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1551set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1552 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1553 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1554 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1555 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1556 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1557 : PANGO_ELLIPSIZE_NONE
1259 ); 1558 );
1260 1559
1261void 1560void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1561set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1562 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1563 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1564
1266void 1565void
1267size (CFPlus::Layout self) 1566size (DC::Layout self)
1268 PPCODE: 1567 PPCODE:
1269{ 1568{
1270 int w, h; 1569 int w, h;
1271 1570
1272 layout_get_pixel_size (self, &w, &h); 1571 layout_get_pixel_size (self, &w, &h);
… …
1275 PUSHs (sv_2mortal (newSViv (w))); 1574 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1575 PUSHs (sv_2mortal (newSViv (h)));
1277} 1576}
1278 1577
1279int 1578int
1280descent (CFPlus::Layout self) 1579descent (DC::Layout self)
1281 CODE: 1580 CODE:
1282{ 1581{
1283 PangoRectangle rect; 1582 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1583 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1584 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1585 RETVAL = PANGO_DESCENT (rect);
1287} 1586}
1288 OUTPUT: 1587 OUTPUT:
1289 RETVAL 1588 RETVAL
1290 1589
1291int 1590int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1591xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1592 CODE:
1294{ 1593{
1295 int index, trailing; 1594 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1595 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1596 RETVAL = index + trailing;
1298} 1597}
1299 OUTPUT: 1598 OUTPUT:
1300 RETVAL 1599 RETVAL
1301 1600
1302void 1601void
1303cursor_pos (CFPlus::Layout self, int index) 1602cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1603 PPCODE:
1305{ 1604{
1306 PangoRectangle strong_pos; 1605 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1606 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1607
1309 EXTEND (SP, 3); 1608 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1609 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1612}
1314 1613
1315void 1614void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1615index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1616 PPCODE:
1318{ 1617{
1319 int line, x; 1618 int line, x;
1320 1619
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1620 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1621#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1622 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1623 --line;
1624#endif
1324 EXTEND (SP, 2); 1625 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1626 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1627 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1628}
1328 1629
1329void 1630void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1631line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1632 PPCODE:
1332{ 1633{
1333 PangoLayoutLine *lp; 1634 PangoLayoutLine *lp;
1334 int index, trailing; 1635 int index, trailing;
1335 1636
1336 if (line < 0) 1637 if (line < 0)
1337 XSRETURN_EMPTY; 1638 XSRETURN_EMPTY;
1338 1639
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1640 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1641 XSRETURN_EMPTY; /* do better */
1341 1642
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1643 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1644
1344 EXTEND (SP, 2); 1645 EXTEND (SP, 2);
… …
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1651 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1652 }
1352} 1653}
1353 1654
1354void 1655void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1656render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1657 CODE:
1357 rc_clear (self->rc); 1658 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1659 pango_opengl_render_layout_subpixel (
1359 self->pl, 1660 self->pl,
1360 self->rc, 1661 self->rc,
… …
1365 // we assume that context_change actually clears/frees stuff 1666 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1667 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1668 pango_layout_context_changed (self->pl);
1368 1669
1369void 1670void
1370draw (CFPlus::Layout self) 1671draw (DC::Layout self)
1371 CODE: 1672 CODE:
1372{ 1673{
1373 glEnable (GL_TEXTURE_2D); 1674 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1675 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1676 glEnable (GL_BLEND);
… …
1383 glDisable (GL_ALPHA_TEST); 1684 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1685 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1686 glDisable (GL_TEXTURE_2D);
1386} 1687}
1387 1688
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1689MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1690
1390PROTOTYPES: ENABLE 1691PROTOTYPES: ENABLE
1391 1692
1392void 1693void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1694pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1461 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1463 } 1764 }
1464} 1765}
1465 1766
1767void
1768draw_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)
1769 PROTOTYPE: @
1770 CODE:
1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1774 glEnable (GL_TEXTURE_2D);
1775 glBindTexture (GL_TEXTURE_2D, name1);
1776
1777 glColor3f (intensity, intensity, intensity);
1778 glPushMatrix ();
1779 glScalef (1./3, 1./3, 1.);
1780
1781 if (blend > 0.f)
1782 {
1783 float dx3 = dx * -3.f / w;
1784 float dy3 = dy * -3.f / h;
1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1786
1787 /* interpolate the two shadow textures */
1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1790
1791 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1792 gl.ActiveTexture (GL_TEXTURE1);
1793 glEnable (GL_TEXTURE_2D);
1794 glBindTexture (GL_TEXTURE_2D, name2);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1796
1797 /* rgb == rgb(glcolor) */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1801
1802 /* alpha = interpolate t0, t1 by env_alpha */
1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1808
1809 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1811
1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1814
1815 glBegin (GL_QUADS);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 gl.ActiveTexture (GL_TEXTURE0);
1824 }
1825 else
1826 {
1827 /* simple blending of one texture, also opengl <1.3 path */
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1829
1830 glBegin (GL_QUADS);
1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1832 glTexCoord2f (0, t); glVertex2f (0, h);
1833 glTexCoord2f (s, t); glVertex2f (w, h);
1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1835 glEnd ();
1836 }
1837
1838 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1839 {
1840 int x, y;
1841 int dx3 = dx * 3;
1842 int dy3 = dy * 3;
1843
1844 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1845 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1846 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1847 glTranslatef (-1., -1., 0);
1848 glBegin (GL_QUADS);
1849
1850 for (y = 1; y < h; y += 3)
1851 {
1852 int y1 = y - dy3;
1853 int y1valid = y1 >= 0 && y1 < h;
1854
1855 for (x = 1; x < w; x += 3)
1856 {
1857 int x1 = x - dx3;
1858 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 uint8_t h2;
1860
1861 if (y1valid && x1 >= 0 && x1 < w)
1862 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1863 else
1864 h2 = 1; /* out of range == invisible */
1865
1866 if (h1 || h2)
1867 {
1868 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1869 glColor4f (1., 1., 1., alpha);
1870
1871 glTexCoord2f (0, 0.); glVertex2i (x , y );
1872 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1873 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1874 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1875 }
1876 }
1877 }
1878 }
1879
1880 glEnd ();
1881
1882 glPopMatrix ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886}
1887
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1888IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1889 CODE:
1468{ 1890{
1469 GLint width; 1891 GLint width;
1470 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1892 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1472 RETVAL = width > 0; 1894 RETVAL = width > 0;
1473} 1895}
1474 OUTPUT: 1896 OUTPUT:
1475 RETVAL 1897 RETVAL
1476 1898
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1900
1479PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1480 1902
1481CFPlus::Map 1903DC::Map
1482new (SV *class) 1904new (SV *klass)
1483 CODE: 1905 CODE:
1484 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1485 RETVAL->x = 0; 1907 RETVAL->x = 0;
1486 RETVAL->y = 0; 1908 RETVAL->y = 0;
1487 RETVAL->w = 0; 1909 RETVAL->w = 0;
1488 RETVAL->h = 0; 1910 RETVAL->h = 0;
1489 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
… …
1494 RETVAL->row = 0; 1916 RETVAL->row = 0;
1495 OUTPUT: 1917 OUTPUT:
1496 RETVAL 1918 RETVAL
1497 1919
1498void 1920void
1499DESTROY (CFPlus::Map self) 1921DESTROY (DC::Map self)
1500 CODE: 1922 CODE:
1501{ 1923{
1502 map_clear (self); 1924 map_clear (self);
1503 Safefree (self->face2tile); 1925 Safefree (self->face2tile);
1504 Safefree (self->tex); 1926 Safefree (self->tex);
1505 Safefree (self); 1927 Safefree (self);
1506} 1928}
1507 1929
1508void 1930void
1509resize (CFPlus::Map self, int map_width, int map_height) 1931resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1932 CODE:
1511 self->w = map_width; 1933 self->w = map_width;
1512 self->h = map_height; 1934 self->h = map_height;
1513 1935
1514void 1936void
1515clear (CFPlus::Map self) 1937clear (DC::Map self)
1516 CODE: 1938 CODE:
1517 map_clear (self); 1939 map_clear (self);
1518 1940
1519void 1941void
1520set_tileid (CFPlus::Map self, int face, int tile) 1942set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1943 CODE:
1522{ 1944{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1945 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1946 need_texid (self, tile);
1525} 1947}
1526 1948
1527void 1949void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1951 CODE:
1530{ 1952{
1531 tileid texid; 1953 tileid texid;
1532 maptex *tex; 1954 maptex *tex;
1533 1955
1534 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1535 return; 1957 return;
1536 1958
1537 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1538 return; 1960 return;
1539 1961
1540 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1541 1963
1542 if (!texid) 1964 if (!texid)
1543 return; 1965 return;
1544 1966
1545 tex = self->tex + texid; 1967 tex = self->tex + texid;
1546 tex->smoothtile = self->face2tile [smooth]; 1968 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1969 tex->smoothlevel = level;
1548} 1970}
1549 1971
1550void 1972void
1551set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1973set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1552 CODE: 1974 CODE:
1553{ 1975{
1554 need_texid (self, texid); 1976 need_texid (self, texid);
1555 1977
1556 { 1978 {
… …
1575 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 2000}
1579 2001
2002void
2003expire_textures (DC::Map self, int texid, int count)
2004 PPCODE:
2005 for (; texid < self->texs && count; ++texid, --count)
2006 {
2007 maptex *tex = self->tex + texid;
2008
2009 if (tex->name)
2010 {
2011 if (tex->unused)
2012 {
2013 tex->name = 0;
2014 tex->unused = 0;
2015 XPUSHs (sv_2mortal (newSViv (texid)));
2016 }
2017 else
2018 tex->unused = 1;
2019 }
2020 }
2021
1580int 2022int
1581ox (CFPlus::Map self) 2023ox (DC::Map self)
1582 ALIAS: 2024 ALIAS:
1583 oy = 1 2025 oy = 1
1584 x = 2 2026 x = 2
1585 y = 3 2027 y = 3
1586 w = 4 2028 w = 4
… …
1597 } 2039 }
1598 OUTPUT: 2040 OUTPUT:
1599 RETVAL 2041 RETVAL
1600 2042
1601void 2043void
1602scroll (CFPlus::Map self, int dx, int dy) 2044scroll (DC::Map self, int dx, int dy)
1603 CODE: 2045 CODE:
1604{ 2046{
1605 if (dx > 0) 2047 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 2048 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 2049 else if (dx < 0)
… …
1623 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1624 } 2066 }
1625} 2067}
1626 2068
1627SV * 2069SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1629 CODE: 2071 CODE:
1630{ 2072{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 2075 mapcell *cell;
… …
1654 2096
1655 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1656 2098
1657 if (flags & 8) 2099 if (flags & 8)
1658 { 2100 {
2101 uint8_t ext, cmd;
2102
1659 if (extmap) 2103 do
1660 { 2104 {
1661 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1662 2107
1663 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
1664 { 2111 {
1665 ext = *data++;
1666 cmd = ext & 0x3f;
1667
1668 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health
1671 {
1672 cell->stat_width = 1; 2112 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1674 }
1675 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47)
1678 {
1679 if (*data == 4)
1680 ; // decode player count
1681
1682 data += *data + 1;
1683 }
1684 else if (cmd == 8) // cell flags
1685 cell->flags = *data++;
1686 else if (ext & 0x40) // unknown, multibyte => skip
1687 data += *data + 1;
1688 else
1689 data++;
1690 } 2114 }
1691 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
1692 } 2132 }
1693 else 2133 while (ext & 0x80);
1694 cell->darkness = *data++ + 1;
1695 } 2134 }
1696 2135
1697 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
1698 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
1699 { 2138 {
… …
1702 cell->tile [z] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
1703 2142
1704 if (cell->tile [z]) 2143 if (cell->tile [z])
1705 { 2144 {
1706 maptex *tex = self->tex + cell->tile [z]; 2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
1707 if (!tex->name) 2147 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2148 av_push (missing, newSViv (cell->tile [z]));
1709 2149
1710 if (tex->smoothtile) 2150 if (tex->smoothtile)
1711 { 2151 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
1713 if (!smooth->name) 2154 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2155 av_push (missing, newSViv (tex->smoothtile));
1715 } 2156 }
1716 } 2157 }
1717 } 2158 }
1718 } 2159 }
1719 else 2160 else
1720 cell->darkness = 0; 2161 CELL_CLEAR (cell);
1721 } 2162 }
1722} 2163}
1723 OUTPUT: 2164 OUTPUT:
1724 RETVAL 2165 RETVAL
1725 2166
1726SV * 2167SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2168mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2169 CODE:
1729{ 2170{
1730 int x1, x; 2171 int x1, x;
1731 int y1, y; 2172 int y1, y;
1732 int z; 2173 int z;
… …
1745 ? self->row + y 2186 ? self->row + y
1746 : 0; 2187 : 0;
1747 2188
1748 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1749 { 2190 {
1750 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1751 2192
1752 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1753 { 2194 {
1754 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1755 2196
… …
1757 { 2198 {
1758 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1759 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1760 int a1 = tex.a; 2201 int a1 = tex.a;
1761 2202
1762 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1763 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1764 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1765 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1766 } 2207 }
1767 } 2208 }
1768 2209
1769 *map++ = (r ) 2210 *map++ = (r )
1770 | (g << 8) 2211 | (g << 8)
1771 | (b << 16) 2212 | (b << 16)
1772 | (a << 24); 2213 | (a << 24);
1773 } 2214 }
1774 } 2215 }
1775 2216
1776 RETVAL = map_sv; 2217 RETVAL = map_sv;
1777} 2218}
1778 OUTPUT: 2219 OUTPUT:
1779 RETVAL 2220 RETVAL
1780 2221
1781void 2222void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 2224 CODE:
1784{ 2225{
1785 int x, y, z; 2226 int x, y, z;
1786 2227
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 2230 smooth_key skey;
1791 2231 int pl_x, pl_y;
2232 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2235 rc_key_t key;
1794 rc_array_t *arr; 2236 rc_array_t *arr;
1795 2237
2238 pl_tex.name = 0;
2239
1796 // thats current max. sorry. 2240 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1799 2243
1800 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
… …
1805 key.g = 255; 2249 key.g = 255;
1806 key.b = 255; 2250 key.b = 255;
1807 key.a = 255; 2251 key.a = 255;
1808 key.mode = GL_QUADS; 2252 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2253 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2254
1812 mx += self->x; 2255 mx += self->x;
1813 my += self->y; 2256 my += self->y;
1814 2257
1815 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
… …
1838 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2283
1841 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1842 { 2285 {
2286 smooth_hash smooth;
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1844 2289
1845 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1847 { 2292 {
1848 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
… …
1858 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1859 int px, py; 2304 int px, py;
1860 2305
1861 if (key.texname != tex.name) 2306 if (key.texname != tex.name)
1862 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1863 if (!tex.name) 2310 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2312
1866 key.texname = tex.name; 2313 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
1868 } 2315 }
1869 2316
1870 px = (x + 1) * T - tex.w; 2317 px = (x + 1) * Th - tex.w;
1871 py = (y + 1) * T - tex.h; 2318 py = (y + 1) * Tw - tex.h;
2319
2320 if (expect_false (cell->player == player) && expect_false (z == 2))
2321 {
2322 pl_x = px;
2323 pl_y = py;
2324 pl_tex = tex;
2325 continue;
2326 }
1872 2327
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2332
1903 // update smooth hash 2333 // update smooth hash
1904 if (tex.smoothtile) 2334 if (tex.smoothtile)
1905 { 2335 {
1906 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
… …
1922 2352
1923 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1924 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
1925 2355
1926 // full tile 2356 // full tile
1927 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1928 2358
1929 // borders 2359 // borders
1930 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1931 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1932 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1933 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1934 2364
1935 // corners 2365 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1937 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1938 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1939 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2370 }
2371 }
2372
2373 if (expect_false (z == 2) && expect_false (cell->flags))
2374 {
2375 // overlays such as the speech bubble, probably more to come
2376 if (cell->flags & 1)
2377 {
2378 rc_key_t key_ov = key;
2379 maptex tex = self->tex [TEXID_SPEECH];
2380 rc_array_t *arr;
2381 int px = x * Tw + Tw * 2 / 32;
2382 int py = y * Th - Th * 6 / 32;
2383
2384 key_ov.texname = tex.name;
2385 arr = rc_array (rc_ov, &key_ov);
2386
2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1940 } 2391 }
1941 } 2392 }
1942 } 2393 }
1943 } 2394 }
1944 2395
… …
1960 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
1961 { 2412 {
1962 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
1963 HE *he; 2414 HE *he;
1964 2415
1965 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1966 while ((he = hv_iternext (smooth)))
1967 { 2417 {
1968 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
1969 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
1970 2420
1971 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
1972 && skey->level == level 2422 && skey.level == level
1973 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
1974 { 2424 {
1975 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
1976 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
1977 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
1978 int border = bits & 15; 2428 int border = bits & 15;
1979 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1980 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
1981 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
1982 2432
… …
1984 { 2434 {
1985 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
1986 // save gobs of state changes. 2436 // save gobs of state changes.
1987 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
1988 { 2438 {
2439 self->tex [skey.tile].unused = 0;
2440
1989 glEnd (); 2441 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
1992 } 2444 }
1993 2445
1994 if (border) 2446 if (border)
1995 { 2447 {
1996 float ox = border * dx; 2448 float ox = border * dx;
1997 2449
1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2002 } 2454 }
2003 2455
2004 if (corner) 2456 if (corner)
2005 { 2457 {
2006 float ox = corner * dx; 2458 float ox = corner * dx;
2007 2459
2008 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2012 } 2464 }
2013 } 2465 }
2014 } 2466 }
2015 } 2467 }
2016 } 2468 }
… …
2018 2470
2019 glEnd (); 2471 glEnd ();
2020 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2021 key.texname = -1; 2473 key.texname = -1;
2022 } 2474 }
2023
2024 hv_clear (smooth);
2025 } 2475 }
2476
2477 if (pl_tex.name)
2478 {
2479 maptex tex = pl_tex;
2480 int px = pl_x + sdx;
2481 int py = pl_y + sdy;
2482
2483 key.texname = tex.name;
2484 arr = rc_array (rc, &key);
2485
2486 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2487 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2488 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2490
2491 rc_draw (rc);
2492 }
2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
2026 2496
2027 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2028 rc_free (rc); 2498 rc_free (rc);
2499 rc_free (rc_ov);
2029 2500
2030 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
2033 { 2504 {
… …
2036 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2037 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2038 { 2509 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2040 2511
2041 int px = x * T; 2512 int px = x * Tw;
2042 int py = y * T; 2513 int py = y * Th;
2514
2515 if (expect_false (cell->player == player))
2516 {
2517 px += sdx;
2518 py += sdy;
2519 }
2043 2520
2044 if (cell->stat_hp) 2521 if (cell->stat_hp)
2045 { 2522 {
2046 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2048 2525
2049 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2050 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2051 px + width - 1, py); 2528 px + width - 1, py);
2052 2529
… …
2058 } 2535 }
2059 } 2536 }
2060} 2537}
2061 2538
2062void 2539void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2540draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064 CODE: 2541 CODE:
2065{ 2542{
2066 static float color[16][3] = { 2543 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
2071 2548
2072 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
2076 2553
2077 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
2081 2558
2082 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
2083 2560
2084 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
2087 }; 2564 };
2088 2565
2089 int x, y; 2566 int x, y;
2090 2567
2091 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2569 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2571 * and takes the colour from god knows where instead of using
2572 * Cp. MODULATE results in the same colour, but slightly different
2573 * alpha, but atcually gives us the correct colour with nvidia.
2574 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
2096 2579
2097 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
… …
2101 2584
2102 if (m) 2585 if (m)
2103 { 2586 {
2104 float *c = color [m & 15]; 2587 float *c = color [m & 15];
2105 2588
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
2108 2591
2109 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2597 }
… …
2118 glDisable (GL_BLEND); 2601 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2602 glDisable (GL_TEXTURE_2D);
2120} 2603}
2121 2604
2122void 2605void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2606fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2607 PPCODE:
2125{ 2608{
2126 int x, y; 2609 int x, y;
2127 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2613 int sw3 = sw * 3;
2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2618
2135 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2621
2138 mx += self->x - 1; 2622 mx += self->x - 1;
2139 my += self->y - 1; 2623 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2624
2143 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2145 { 2627 {
2146 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
… …
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2632 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
2152 2634
2153 darkness1 [y * sw1 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2638 }
2157 } 2639 }
2158 2640
2159 for (y = 0; y < sh; ++y) 2641 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2642 for (x = 0; x < sw; ++x)
… …
2179 2661
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2665
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2670 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2675 }
2194 2676
2195 free (darkness1); 2677 free (darkness1);
2196 2678
2197 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2201} 2683}
2202 2684
2203SV * 2685SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2686get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2687 CODE:
2206{ 2688{
2207 int x, y, x1, y1; 2689 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2690 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2691 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2266 else 2748 else
2267 *data++ = 0; 2749 *data++ = 0;
2268 } 2750 }
2269 } 2751 }
2270 2752
2753 /* if size is w*h + 5 then no data has been found */
2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2755 {
2271 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2758 }
2759
2273 RETVAL = data_sv; 2760 RETVAL = data_sv;
2274} 2761}
2275 OUTPUT: 2762 OUTPUT:
2276 RETVAL 2763 RETVAL
2277 2764
2278void 2765void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2766set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2767 PPCODE:
2281{ 2768{
2282 int x, y, z; 2769 int x, y, z;
2283 int w, h; 2770 int w, h;
2284 int x1, y1; 2771 int x1, y1;
2772 STRLEN len;
2773 uint8_t *data, *end;
2774
2775 len = SvLEN (data_sv);
2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2778 end = data + len + 8;
2779
2780 if (len < 5)
2781 XSRETURN_EMPTY;
2285 2782
2286 if (*data++ != 0) 2783 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2784 XSRETURN_EMPTY; /* version mismatch */
2288 2785
2289 w = *data++ << 8; w |= *data++; 2786 w = *data++ << 8; w |= *data++;
… …
2304 { 2801 {
2305 maprow *row = map_get_row (self, y); 2802 maprow *row = map_get_row (self, y);
2306 2803
2307 for (x = x0; x < x1; x++) 2804 for (x = x0; x < x1; x++)
2308 { 2805 {
2806 uint8_t flags;
2807
2808 if (data + 7 >= end)
2809 XSRETURN_EMPTY;
2810
2309 uint8_t flags = *data++; 2811 flags = *data++;
2310 2812
2311 if (flags) 2813 if (flags)
2312 { 2814 {
2313 mapcell *cell = row_get_cell (row, x); 2815 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2816 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2819 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2820 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2821
2320 if (cell->darkness == 0) 2822 if (cell->darkness == 0)
2321 { 2823 {
2322 cell->darkness = 0; 2824 /*cell->darkness = 0;*/
2825 EXTEND (SP, 3);
2323 2826
2324 for (z = 0; z <= 2; z++) 2827 for (z = 0; z <= 2; z++)
2325 { 2828 {
2326 tileid t = tile [z]; 2829 tileid t = tile [z];
2327 2830
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2831 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2832 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2833 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2834 need_texid (self, t);
2332 } 2835 }
2333 2836
2334 cell->tile [z] = t; 2837 cell->tile [z] = t;
2335 } 2838 }
… …
2337 } 2840 }
2338 } 2841 }
2339 } 2842 }
2340} 2843}
2341 2844
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2846
2344CFPlus::RW 2847DC::RW
2345new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2346 CODE: 2849 CODE:
2347{ 2850{
2348 STRLEN datalen; 2851 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2350 2853
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2854 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2855}
2353 OUTPUT: 2856 OUTPUT:
2354 RETVAL 2857 RETVAL
2355 2858
2356CFPlus::RW 2859DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2358 CODE: 2861 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2863 OUTPUT:
2361 RETVAL 2864 RETVAL
2362 2865
2363# fails on win32: 2866# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2867# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2868#void
2366#close (CFPlus::RW self) 2869#close (DC::RW self)
2367# CODE: 2870# CODE:
2368# (self->(close)) (self); 2871# (self->(close)) (self);
2369 2872
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2873MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2874
2372PROTOTYPES: DISABLE 2875PROTOTYPES: DISABLE
2373 2876
2374CFPlus::Channel 2877DC::Channel
2375find () 2878find ()
2376 CODE: 2879 CODE:
2377{ 2880{
2378 RETVAL = Mix_GroupAvailable (-1); 2881 RETVAL = Mix_GroupAvailable (-1);
2379 2882
2380 if (RETVAL < 0) 2883 if (RETVAL < 0)
2381 { 2884 {
2382 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2383 2886
2384 if (RETVAL < 0) 2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2385 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2386 2894 }
2895 else
2387 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2388 } 2897 }
2389 2898
2390 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2392} 2901}
2393 OUTPUT: 2902 OUTPUT:
2394 RETVAL 2903 RETVAL
2395 2904
2396void 2905void
2397halt (CFPlus::Channel self) 2906halt (DC::Channel self)
2398 CODE: 2907 CODE:
2399 Mix_HaltChannel (self); 2908 Mix_HaltChannel (self);
2400 2909
2401void 2910void
2402expire (CFPlus::Channel self, int ticks = -1) 2911expire (DC::Channel self, int ticks = -1)
2403 CODE: 2912 CODE:
2404 Mix_ExpireChannel (self, ticks); 2913 Mix_ExpireChannel (self, ticks);
2405 2914
2406void 2915void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2916fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2917 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2918 Mix_FadeOutChannel (self, ticks);
2410 2919
2411int 2920int
2412volume (CFPlus::Channel self, int volume) 2921volume (DC::Channel self, int volume)
2413 CODE: 2922 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2923 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2924 OUTPUT:
2416 RETVAL 2925 RETVAL
2417 2926
2418void 2927void
2419unregister_all_effects (CFPlus::Channel self) 2928unregister_all_effects (DC::Channel self)
2420 CODE: 2929 CODE:
2421 Mix_UnregisterAllEffects (self); 2930 Mix_UnregisterAllEffects (self);
2422 2931
2423void 2932void
2424set_panning (CFPlus::Channel self, int left, int right) 2933set_panning (DC::Channel self, int left, int right)
2425 CODE: 2934 CODE:
2426 left = CLAMP (left , 0, 255); 2935 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2936 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2937 Mix_SetPanning (self, left, right);
2429 2938
2430void 2939void
2431set_distance (CFPlus::Channel self, int distance) 2940set_distance (DC::Channel self, int distance)
2432 CODE: 2941 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2942 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2943
2435void 2944void
2436set_position (CFPlus::Channel self, int angle, int distance) 2945set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2946 CODE:
2438 2947
2439void 2948void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2950 CODE:
2442{ 2951{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2952 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2953 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2955}
2447 2956
2448void 2957void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2958set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2959 CODE:
2451 Mix_SetReverseStereo (self, flip); 2960 Mix_SetReverseStereo (self, flip);
2452 2961
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2963
2455PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2456 2965
2966void
2967decoders ()
2968 PPCODE:
2969#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2970 int i, num = Mix_GetNumChunkDecoders ();
2971 EXTEND (SP, num);
2972 for (i = 0; i < num; ++i)
2973 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2974#else
2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2976#endif
2977
2457CFPlus::MixChunk 2978DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2979new (SV *klass, DC::RW rwops)
2459 CODE: 2980 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2982 OUTPUT:
2462 RETVAL 2983 RETVAL
2463 2984
2464void 2985void
2465DESTROY (CFPlus::MixChunk self) 2986DESTROY (DC::MixChunk self)
2466 CODE: 2987 CODE:
2467 Mix_FreeChunk (self); 2988 Mix_FreeChunk (self);
2468 2989
2469int 2990int
2470volume (CFPlus::MixChunk self, int volume = -1) 2991volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2992 CODE:
2472 if (items > 1) 2993 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2994 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2995 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2996 OUTPUT:
2476 RETVAL 2997 RETVAL
2477 2998
2478CFPlus::Channel 2999DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 3000play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 3001 CODE:
2481{ 3002{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 3003 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 3004
2484 if (RETVAL < 0) 3005 if (RETVAL < 0)
… …
2491 } 3012 }
2492} 3013}
2493 OUTPUT: 3014 OUTPUT:
2494 RETVAL 3015 RETVAL
2495 3016
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
3018
3019void
3020decoders ()
3021 PPCODE:
3022#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3023 int i, num = Mix_GetNumMusicDecoders ();
3024 EXTEND (SP, num);
3025 for (i = 0; i < num; ++i)
3026 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3027#else
3028 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3029#endif
2497 3030
2498int 3031int
2499volume (int volume = -1) 3032volume (int volume = -1)
2500 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2501 CODE: 3034 CODE:
… …
2513void 3046void
2514halt () 3047halt ()
2515 CODE: 3048 CODE:
2516 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2517 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2518CFPlus::MixMusic 3058DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 3059new (SV *klass, DC::RW rwops)
2520 CODE: 3060 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 3062 OUTPUT:
2523 RETVAL 3063 RETVAL
2524 3064
2525void 3065void
2526DESTROY (CFPlus::MixMusic self) 3066DESTROY (DC::MixMusic self)
2527 CODE: 3067 CODE:
2528 Mix_FreeMusic (self); 3068 Mix_FreeMusic (self);
2529 3069
2530int 3070int
2531play (CFPlus::MixMusic self, int loops = -1) 3071play (DC::MixMusic self, int loops = -1)
2532 CODE: 3072 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 3073 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 3074 OUTPUT:
2535 RETVAL 3075 RETVAL
2536 3076
2537void 3077void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3078fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 3079 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 3080 Mix_FadeInMusicPos (self, loops, ms, position);
2541 3081
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3082MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 3083
2544PROTOTYPES: ENABLE 3084PROTOTYPES: ENABLE
2545 3085
2546BOOT: 3086BOOT:
2547{ 3087{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3088 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 3089 static const struct {
2550 const char *name; 3090 const char *name;
2551 IV iv; 3091 IV iv;
2552 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 3094 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 3095 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
… …
2573 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 3118 const_iv (GL_ONE_MINUS_DST_ALPHA),
3119 const_iv (GL_SRC_COLOR),
3120 const_iv (GL_DST_COLOR),
3121 const_iv (GL_ONE_MINUS_SRC_COLOR),
3122 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
… …
2650 const_iv (GL_NICEST), 3195 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3199 const_iv (GL_T2F_N3F_V3F),
3200 const_iv (GL_FUNC_ADD),
3201 const_iv (GL_FUNC_SUBTRACT),
3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3203# undef const_iv
2656 }; 3204 };
2657 3205
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3206 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2660 3208
2661 texture_av = newAV (); 3209 texture_av = newAV ();
2662 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
2663} 3211}
2664 3212
… …
2666disable_GL_EXT_blend_func_separate () 3214disable_GL_EXT_blend_func_separate ()
2667 CODE: 3215 CODE:
2668 gl.BlendFuncSeparate = 0; 3216 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
2670 3218
2671char * 3219void
3220apple_nvidia_bug (int enable)
3221
3222const char *
2672gl_vendor () 3223gl_vendor ()
2673 CODE: 3224 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3226 OUTPUT:
2676 RETVAL 3227 RETVAL
2677 3228
2678char * 3229const char *
2679gl_version () 3230gl_version ()
2680 CODE: 3231 CODE:
2681 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2682 OUTPUT: 3233 OUTPUT:
2683 RETVAL 3234 RETVAL
2684 3235
2685char * 3236const char *
2686gl_extensions () 3237gl_extensions ()
2687 CODE: 3238 CODE:
2688 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2689 OUTPUT: 3240 OUTPUT:
2690 RETVAL 3241 RETVAL
2691 3242
2692const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
2693 3248
2694GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
2695 CODE: 3250 CODE:
2696 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
2697 OUTPUT: 3252 OUTPUT:
… …
2705 3260
2706int glGetError () 3261int glGetError ()
2707 3262
2708void glFinish () 3263void glFinish ()
2709 3264
3265void glFlush ()
3266
2710void glClear (int mask) 3267void glClear (int mask)
2711 3268
2712void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2713 PROTOTYPE: @ 3270 PROTOTYPE: @
2714 3271
… …
2723void glBlendFunc (int sfactor, int dfactor) 3280void glBlendFunc (int sfactor, int dfactor)
2724 3281
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3283 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
3285
3286# void glBlendEquation (int se)
2728 3287
2729void glDepthMask (int flag) 3288void glDepthMask (int flag)
2730 3289
2731void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2732 3291
… …
2767void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2768 CODE: 3327 CODE:
2769 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2770 3329
2771void glColor (float r, float g, float b, float a = 1.0) 3330void glColor (float r, float g, float b, float a = 1.0)
3331 PROTOTYPE: @
2772 ALIAS: 3332 ALIAS:
2773 glColor_premultiply = 1 3333 glColor_premultiply = 1
2774 CODE: 3334 CODE:
2775 if (ix) 3335 if (ix)
2776 { 3336 {
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3406void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3407 CODE:
2848 if (gl.SeparableFilter2D) 3408 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3409 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3410
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3411void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3412
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3413void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3414
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3415void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3416
… …
2882 3442
2883void glEndList () 3443void glEndList ()
2884 3444
2885void glCallList (int list) 3445void glCallList (int list)
2886 3446
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3453
2889PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
2890 3455
2891void 3456void
2892find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
2893 PPCODE: 3458 PPCODE:
2894{ 3459{
2895 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
2896 XPUSHs (self); 3461 XPUSHs (self);
2897} 3462}
2898 3463
2899BOOT: 3464BOOT:
2900{ 3465{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3466 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3467
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3468 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3469 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3470 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3471 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3472}
2908 3473
2909void 3474void
2910draw (SV *self) 3475draw (SV *self)
2911 CODE: 3476 CODE:
2912{ 3477{
2913 HV *hv; 3478 HV *hv;
2914 SV **svp; 3479 SV **svp;
2915 NV x, y, w, h; 3480 NV x, y, w, h;
2916 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
2917 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3485 double draw_x, draw_y;
2921 3486
2922 if (!SvROK (self)) 3487 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3488 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3489
2925 hv = (HV *)SvRV (self); 3490 hv = (HV *)SvRV (self);
2926 3491
2927 if (SvTYPE (hv) != SVt_PVHV) 3492 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3493 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3494
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3495 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3496 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3497
2933 if (!h || !w) 3498 if (!h || !w)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines