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.267 by root, Sun Jul 20 02:55:36 2008 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
65# include <netinet/in.h> 76# include <netinet/in.h>
66# include <netinet/tcp.h> 77# include <netinet/tcp.h>
67# include <inttypes.h> 78# include <inttypes.h>
68#endif 79#endif
69 80
70#if __GNUC__ >= 4 81#include "ecb.h"
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78 82
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
82 89
83#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
85 92
86#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
87 94
88/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
97
98#define KMOD_LRAM 0x10000 // our extension
99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
102
103static char *
104fast_sv_grow (SV *sv, STRLEN need)
105{
106 STRLEN len = SvLEN (sv);
107 STRLEN want = SvCUR (sv) + need;
108
109 if (ecb_expect_false (len < want))
110 {
111 do
112 len *= 2;
113 while (len < want);
114
115 sv_grow (sv, len);
116 }
117
118 SvCUR_set (sv, want);
119 return SvEND (sv) - need;
120}
90 121
91static AV *texture_av; 122static AV *texture_av;
92 123
93static struct 124static struct
94{ 125{
151{ 182{
152 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
153 184
154 while (attrs) 185 while (attrs)
155 { 186 {
156 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 188
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 190 return 1;
160 191
161 attrs = attrs->next; 192 attrs = attrs->next;
162 } 193 }
163 194
164 return 0; 195 return 0;
165} 196}
166 197
167typedef struct cf_layout { 198struct cf_layout {
168 PangoLayout *pl; 199 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
170 int base_height; 201 int base_height;
171 DC__Font font; 202 DC__Font font;
172 rc_t *rc; 203 rc_t rc;
173} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
174 207
175static DC__Font default_font; 208static DC__Font default_font;
176static PangoContext *opengl_context; 209static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
178 211
179static void 212static void
180substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
181{ 214{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 218#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 220}
188 221
189static void 222static void
216 249
217 *w = rect.width; 250 *w = rect.width;
218 *h = rect.height; 251 *h = rect.height;
219} 252}
220 253
254/////////////////////////////////////////////////////////////////////////////
255
221typedef uint16_t tileid; 256typedef uint16_t tileid;
222typedef uint16_t faceid; 257typedef uint16_t faceid;
223 258
224typedef struct { 259struct maptex
260{
225 GLuint name; 261 GLuint name;
226 int w, h; 262 int w, h;
227 float s, t; 263 float s, t;
228 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
229 tileid smoothtile; 265 tileid smoothtile;
230 uint8_t smoothlevel; 266 uint8_t smoothlevel;
231} maptex; 267 uint8_t unused; /* set to zero on use */
268};
232 269
233typedef struct { 270struct mapcell
271{
234 uint32_t player; 272 uint32_t player;
235 tileid tile[3]; 273 tileid tile[3];
236 uint16_t darkness; 274 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 276};
239 277
240typedef struct { 278struct maprow
279{
241 int32_t c0, c1; 280 int32_t c0, c1;
242 mapcell *col; 281 mapcell *col;
243} maprow; 282};
244 283
245typedef struct map { 284struct mapgrid {
246 int x, y, w, h; 285 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
250 289
251 int32_t rows; 290 int32_t rows;
252 maprow *row; 291 maprow *row;
253} *DC__Map; 292};
254 293
255static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
256prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
257{ 299{
258 char *p; 300 T *p;
259 301
260 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
261 Zero (p, inc, char); 303 Zero (p, inc, T);
262 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
263 Safefree (ptr); 305 Safefree (ptr);
264 306
265 return p; 307 ptr = p;
266} 308}
267 309
268static char * 310template<typename T>
269append (char *ptr, int sze, int inc)
270{
271 Renew (ptr, sze + inc, char);
272 Zero (ptr + sze, inc, char);
273
274 return ptr;
275}
276
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
278#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279
280static void 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
281need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
282{ 320{
283 while (self->faces <= face) 321 while (self->faces <= face)
284 { 322 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 324 self->faces *= 2;
287 } 325 }
288} 326}
289 327
290static void 328static void
291need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
292{ 330{
293 while (self->texs <= texid) 331 while (self->texs <= texid)
294 { 332 {
295 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
296 self->texs *= 2; 334 self->texs *= 2;
297 } 335 }
298} 336}
299 337
300static maprow * 338static maprow *
301map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
302{ 340{
303 if (0 > y) 341 if (0 > y)
304 { 342 {
305 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
307 345
308 self->rows += extend; 346 self->rows += extend;
309 self->y += extend; 347 self->y += extend;
310 y += extend; 348 y += extend;
311 } 349 }
312 else if (y >= self->rows) 350 else if (y >= self->rows)
313 { 351 {
314 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
315 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
316 self->rows += extend; 354 self->rows += extend;
317 } 355 }
318 356
319 return self->row + y; 357 return self->row + y;
320} 358}
330 } 368 }
331 369
332 if (row->c0 > x) 370 if (row->c0 > x)
333 { 371 {
334 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
335 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
336 row->c0 -= extend; 374 row->c0 -= extend;
337 } 375 }
338 else if (x >= row->c1) 376 else if (x >= row->c1)
339 { 377 {
340 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
341 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
342 row->c1 += extend; 380 row->c1 += extend;
343 } 381 }
344 382
345 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
346} 384}
347 385
348static mapcell * 386static mapcell *
349map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
350{ 388{
351 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
352} 390}
353 391
354static void 392static void
355map_clear (DC__Map self) 393map_clear (mapgrid *self)
356{ 394{
357 int r; 395 int r;
358 396
359 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
369 self->rows = 0; 407 self->rows = 0;
370} 408}
371 409
372#define CELL_CLEAR(cell) \ 410#define CELL_CLEAR(cell) \
373 do { \ 411 do { \
412 if ((cell)->player) \
413 (cell)->tile [2] = 0; \
374 (cell)->darkness = 0; \ 414 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \ 415 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
377 (cell)->player = 0; \ 417 (cell)->player = 0; \
378 } while (0) 418 } while (0)
379 419
380static void 420static void
381map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
382{ 422{
383 int x, y; 423 int x, y;
384 maprow *row; 424 maprow *row;
385 mapcell *cell; 425 mapcell *cell;
386 426
403 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
404 } 444 }
405 } 445 }
406} 446}
407 447
408typedef struct { 448struct smooth_key
449{
409 tileid tile; 450 tileid tile;
410 uint8_t x, y, level; 451 uint8_t x, y, level;
411} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
412 471
413static void 472static void
414smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
415{ 474{
416 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
417 476
418 if (SvIOK (*sv)) 477 if (it == h.end ())
419 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
420 else 479 else
421 sv_setiv (*sv, bits); 480 it->second |= bits;
422} 481}
423 482
424static void 483static void
425music_finished (void) 484music_finished (void)
426{ 485{
443 ev.code = 1; 502 ev.code = 1;
444 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
445 ev.data2 = 0; 504 ev.data2 = 0;
446 505
447 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
448} 514}
449 515
450static unsigned int 516static unsigned int
451minpot (unsigned int n) 517minpot (unsigned int n)
452{ 518{
462 n |= n >> 16; 528 n |= n >> 16;
463 529
464 return n + 1; 530 return n + 1;
465} 531}
466 532
467static unsigned int
468popcount (unsigned int n)
469{
470 n -= (n >> 1) & 0x55555555U;
471 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
472 n = ((n >> 4) + n) & 0x0f0f0f0fU;
473 n *= 0x01010101U;
474
475 return n >> 24;
476}
477
478/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
479#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
480#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
481 536
482/******************************************************************************/ 537/******************************************************************************/
519 if (!svp || !SvTRUE (*svp)) 574 if (!svp || !SvTRUE (*svp))
520 return 0; 575 return 0;
521 576
522 return 1; 577 return 1;
523} 578}
579
580/******************************************************************************/
581
582/* process keyboard modifiers */
583static int
584mod_munge (int mod)
585{
586 mod &= MOD_MASK;
587
588 if (mod & (KMOD_META | KMOD_ALT))
589 mod |= KMOD_LRAM;
590
591 return mod;
592}
593
594static void
595deliantra_main (SV *real_main)
596{
597 dSP;
598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
601}
602
603#ifdef __MACOSX__
604 static SV *real_main;
605
606 /* to due surprising braindamage on the side of SDL design, we
607 * do some mind-boggling hack here: SDL requires a custom main()
608 * on OS X, so... we provide one and call the original main(), which,
609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
610 * and which calls our main (== SDL_main) back.
611 */
612 extern C_LINKAGE int
613 main (int argc, char *argv[])
614 {
615 deliantra_main (real_main);
616 }
617
618 #undef main
619
620 extern C_LINKAGE int main (int argc, char *argv[]);
621
622 static void
623 SDL_main_hack (SV *real_main_)
624 {
625 real_main = real_main_;
626
627 char *argv[] = { "deliantra client", 0 };
628 (main) (1, argv);
629 }
630#else
631 static void
632 SDL_main_hack (SV *real_main)
633 {
634 deliantra_main (real_main);
635 }
636#endif
524 637
525MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
526 639
527PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
528 641
557 const_iv (SDL_USEREVENT), 670 const_iv (SDL_USEREVENT),
558 671
559 const_iv (SDL_APPINPUTFOCUS), 672 const_iv (SDL_APPINPUTFOCUS),
560 const_iv (SDL_APPMOUSEFOCUS), 673 const_iv (SDL_APPMOUSEFOCUS),
561 const_iv (SDL_APPACTIVE), 674 const_iv (SDL_APPACTIVE),
675
676
677 const_iv (SDLK_UNKNOWN),
678 const_iv (SDLK_FIRST),
679 const_iv (SDLK_BACKSPACE),
680 const_iv (SDLK_TAB),
681 const_iv (SDLK_CLEAR),
682 const_iv (SDLK_RETURN),
683 const_iv (SDLK_PAUSE),
684 const_iv (SDLK_ESCAPE),
685 const_iv (SDLK_SPACE),
686 const_iv (SDLK_EXCLAIM),
687 const_iv (SDLK_QUOTEDBL),
688 const_iv (SDLK_HASH),
689 const_iv (SDLK_DOLLAR),
690 const_iv (SDLK_AMPERSAND),
691 const_iv (SDLK_QUOTE),
692 const_iv (SDLK_LEFTPAREN),
693 const_iv (SDLK_RIGHTPAREN),
694 const_iv (SDLK_ASTERISK),
695 const_iv (SDLK_PLUS),
696 const_iv (SDLK_COMMA),
697 const_iv (SDLK_MINUS),
698 const_iv (SDLK_PERIOD),
699 const_iv (SDLK_SLASH),
700 const_iv (SDLK_0),
701 const_iv (SDLK_1),
702 const_iv (SDLK_2),
703 const_iv (SDLK_3),
704 const_iv (SDLK_4),
705 const_iv (SDLK_5),
706 const_iv (SDLK_6),
707 const_iv (SDLK_7),
708 const_iv (SDLK_8),
709 const_iv (SDLK_9),
710 const_iv (SDLK_COLON),
711 const_iv (SDLK_SEMICOLON),
712 const_iv (SDLK_LESS),
713 const_iv (SDLK_EQUALS),
714 const_iv (SDLK_GREATER),
715 const_iv (SDLK_QUESTION),
716 const_iv (SDLK_AT),
717
718 const_iv (SDLK_LEFTBRACKET),
719 const_iv (SDLK_BACKSLASH),
720 const_iv (SDLK_RIGHTBRACKET),
721 const_iv (SDLK_CARET),
722 const_iv (SDLK_UNDERSCORE),
723 const_iv (SDLK_BACKQUOTE),
724 const_iv (SDLK_DELETE),
562 725
563 const_iv (SDLK_FIRST), 726 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST), 727 const_iv (SDLK_LAST),
565 const_iv (SDLK_KP0), 728 const_iv (SDLK_KP0),
566 const_iv (SDLK_KP1), 729 const_iv (SDLK_KP1),
642 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
643 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
644 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
645 const_iv (KMOD_MODE), 808 const_iv (KMOD_MODE),
646 809
810 const_iv (KMOD_LRAM),
811
647 const_iv (MIX_DEFAULT_FORMAT), 812 const_iv (MIX_DEFAULT_FORMAT),
648 813
649 const_iv (SDL_INIT_TIMER), 814 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO), 815 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO), 816 const_iv (SDL_INIT_VIDEO),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 834 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO), 835 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 836 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES), 837 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL), 838 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL) 839 const_iv (SDL_GL_SWAP_CONTROL),
840
841 const_iv (FOW_DARKNESS)
675# undef const_iv 842# undef const_iv
676 }; 843 };
677 844
678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 845 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
680 847
681 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
682 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
683} 850}
684 851
699 866
700NV ceil (NV x) 867NV ceil (NV x)
701 868
702IV minpot (UV n) 869IV minpot (UV n)
703 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
704IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
705 888
706void 889void
707pango_init () 890pango_init ()
708 CODE: 891 CODE:
709{ 892{
717#endif 900#endif
718} 901}
719 902
720char *SDL_GetError () 903char *SDL_GetError ()
721 904
905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
907
722int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
723 909
724int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
725 911
726void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
727 913
728void SDL_Quit () 914void SDL_Quit ()
729 915
730int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
731 918
732int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
733 CODE: 920 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
735 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
736 OUTPUT: 923 OUTPUT:
737 RETVAL 924 RETVAL
738 925
739void 926void
794 ); 981 );
795 982
796 if (RETVAL) 983 if (RETVAL)
797 { 984 {
798 av_clear (texture_av); 985 av_clear (texture_av);
799
800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
802#include "glfunc.h" 987#include "glfunc.h"
803#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
804 } 991 }
805} 992}
806 OUTPUT: 993 OUTPUT:
807 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
808 998
809void 999void
810SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
811 1001
812char * 1002char *
813SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
814 1005
815int 1006int
816SDL_GetAppState () 1007SDL_GetAppState ()
817 1008
818int 1009int
819SDL_GetModState () 1010SDL_GetModState ()
820 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
821void 1016void
1017SDL_PumpEvents ()
1018
1019void
822poll_events () 1020peep_events ()
823 PPCODE: 1021 PPCODE:
824{ 1022{
825 SDL_Event ev; 1023 SDL_Event ev;
826 1024
827 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
834 { 1032 {
835 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
836 case SDL_KEYUP: 1034 case SDL_KEYUP:
837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
839 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1037 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
840 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1038 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
842 break; 1040 break;
843 1041
844 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
863 x = ev.motion.x; 1061 x = ev.motion.x;
864 y = ev.motion.y; 1062 y = ev.motion.y;
865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
866 } 1064 }
867 1065
868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
869 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
870 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
871 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
872 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
873 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
893 1091
894 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
895 } 1093 }
896} 1094}
897 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
898int 1109int
899Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
900 POSTCALL: 1111 POSTCALL:
901 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
902 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
903 1114
904void 1115void
905Mix_QuerySpec () 1116Mix_QuerySpec ()
964add_font (char *file) 1175add_font (char *file)
965 CODE: 1176 CODE:
966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT: 1178 OUTPUT:
968 RETVAL 1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
969 1187
970void 1188void
971load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
972 ALIAS: 1190 ALIAS:
973 load_image_file = 1 1191 load_image_file = 1
1019 1237
1020 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1021 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1022 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1023 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1024 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1025 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1026 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1027 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1028 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1029 1247
1089#if DEBUG 1307#if DEBUG
1090 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
1091#endif 1309#endif
1092} 1310}
1093 1311
1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1094MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1095 1320
1096PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1097 1322
1098DC::Font 1323DC::Font
1099new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1100 CODE: 1325 CODE:
1101{ 1326{
1102 int count; 1327 int count;
1103 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1104 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1133 PROTOTYPE: 1358 PROTOTYPE:
1134 CODE: 1359 CODE:
1135 tc_restore (); 1360 tc_restore ();
1136 1361
1137DC::Layout 1362DC::Layout
1138new (SV *class) 1363new (SV *klass)
1139 CODE: 1364 CODE:
1140 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1141 1366
1142 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1143 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1144 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1145 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1146 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1147 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1148 RETVAL->font = 0; 1373 RETVAL->font = 0;
1149 RETVAL->rc = rc_alloc ();
1150 1374
1151 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1152 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1153 OUTPUT: 1377 OUTPUT:
1154 RETVAL 1378 RETVAL
1155 1379
1156void 1380void
1157DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1158 CODE: 1382 CODE:
1159 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1160 rc_free (self->rc);
1161 Safefree (self); 1384 delete self;
1162 1385
1163void 1386void
1164set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1165 CODE: 1388 CODE:
1166{ 1389{
1292 1515
1293void 1516void
1294set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1295 CODE: 1518 CODE:
1296 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1297 { 1520 {
1298 self->base_height = base_height; 1521 self->base_height = base_height;
1299 layout_update_font (self); 1522 layout_update_font (self);
1300 } 1523 }
1301 1524
1302void 1525void
1420} 1643}
1421 1644
1422void 1645void
1423render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1424 CODE: 1647 CODE:
1425 rc_clear (self->rc); 1648 self->rc.clear ();
1426 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1427 self->pl, 1650 self->pl,
1428 self->rc, 1651 &self->rc,
1429 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1430 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1431 flags 1654 flags
1432 ); 1655 );
1433 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1444 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1445 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1446 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1447 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1448 1671
1449 rc_draw (self->rc); 1672 self->rc.draw ();
1450 1673
1451 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1452 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1453 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1454} 1677}
1529 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1530 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1531 } 1754 }
1532} 1755}
1533 1756
1757void
1758draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1534IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1535 CODE: 1879 CODE:
1536{ 1880{
1537 GLint width; 1881 GLint width;
1538 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1545MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1546 1890
1547PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1548 1892
1549DC::Map 1893DC::Map
1550new (SV *class) 1894new (SV *klass)
1551 CODE: 1895 CODE:
1552 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1553 RETVAL->x = 0; 1897 RETVAL->x = 0;
1554 RETVAL->y = 0; 1898 RETVAL->y = 0;
1555 RETVAL->w = 0; 1899 RETVAL->w = 0;
1556 RETVAL->h = 0; 1900 RETVAL->h = 0;
1557 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1594 1938
1595void 1939void
1596set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1597 CODE: 1941 CODE:
1598{ 1942{
1599 tileid texid; 1943 tileid texid;
1600 maptex *tex; 1944 maptex *tex;
1601 1945
1602 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1603 return; 1947 return;
1604 1948
1605 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1606 return; 1950 return;
1607 1951
1608 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1609 1953
1610 if (!texid) 1954 if (!texid)
1611 return; 1955 return;
1612 1956
1613 tex = self->tex + texid; 1957 tex = self->tex + texid;
1642 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1986 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1643 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1644 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1646} 1990}
1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
1647 2011
1648int 2012int
1649ox (DC::Map self) 2013ox (DC::Map self)
1650 ALIAS: 2014 ALIAS:
1651 oy = 1 2015 oy = 1
1683 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1684 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1685 2049
1686 while (self->y < 0) 2050 while (self->y < 0)
1687 { 2051 {
1688 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1689 2053
1690 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1691 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1692 } 2056 }
1693} 2057}
1694 2058
1695SV * 2059SV *
1696map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1697 CODE: 2061 CODE:
1698{ 2062{
1699 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1700 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1701 mapcell *cell; 2065 mapcell *cell;
1722 2086
1723 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1724 2088
1725 if (flags & 8) 2089 if (flags & 8)
1726 { 2090 {
2091 uint8_t ext, cmd;
2092
1727 if (extmap) 2093 do
1728 { 2094 {
1729 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1730 2097
1731 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1732 { 2101 {
1733 ext = *data++;
1734 cmd = ext & 0x7f;
1735
1736 if (cmd < 4)
1737 cell->darkness = 255 - ext * 64 + 1;
1738 else if (cmd == 5) // health
1739 {
1740 cell->stat_width = 1; 2102 cell->stat_width = 1;
1741 cell->stat_hp = *data++; 2103 cell->stat_hp = *data++;
1742 }
1743 else if (cmd == 6) // monster width
1744 cell->stat_width = *data++ + 1;
1745 else if (cmd == 0x47)
1746 {
1747 if (*data == 1) cell->player = data [1];
1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1751
1752 data += *data + 1;
1753 }
1754 else if (cmd == 8) // cell flags
1755 cell->flags = *data++;
1756 else if (ext & 0x40) // unknown, multibyte => skip
1757 data += *data + 1;
1758 else
1759 data++;
1760 } 2104 }
1761 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1762 } 2122 }
1763 else 2123 while (ext & 0x80);
1764 cell->darkness = *data++ + 1;
1765 } 2124 }
1766 2125
1767 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1768 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1769 { 2128 {
1772 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1773 2132
1774 if (cell->tile [z]) 2133 if (cell->tile [z])
1775 { 2134 {
1776 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1777 if (!tex->name) 2137 if (!tex->name)
1778 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1779 2139
1780 if (tex->smoothtile) 2140 if (tex->smoothtile)
1781 { 2141 {
1782 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1783 if (!smooth->name) 2144 if (!smooth->name)
1784 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1785 } 2146 }
1786 } 2147 }
1787 } 2148 }
1815 ? self->row + y 2176 ? self->row + y
1816 : 0; 2177 : 0;
1817 2178
1818 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1819 { 2180 {
1820 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1821 2182
1822 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1823 { 2184 {
1824 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1825 2186
1827 { 2188 {
1828 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1829 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1830 int a1 = tex.a; 2191 int a1 = tex.a;
1831 2192
1832 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1833 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1834 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1835 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1836 } 2197 }
1837 } 2198 }
1838 2199
1839 *map++ = (r ) 2200 *map++ = (r )
1840 | (g << 8) 2201 | (g << 8)
1841 | (b << 16) 2202 | (b << 16)
1842 | (a << 24); 2203 | (a << 24);
1843 } 2204 }
1844 } 2205 }
1845 2206
1846 RETVAL = map_sv; 2207 RETVAL = map_sv;
1847} 2208}
1848 OUTPUT: 2209 OUTPUT:
1849 RETVAL 2210 RETVAL
1850 2211
1851void 2212void
1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2213draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1853 CODE: 2214 CODE:
1854{ 2215{
1855 int x, y, z; 2216 int x, y, z;
1856 2217
1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1860 smooth_key skey;
1861 int pl_x, pl_y; 2219 int pl_x, pl_y;
1862 maptex pl_tex; 2220 maptex pl_tex;
1863 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1864 rc_key_t key; 2223 rc_key_t key;
1865 rc_array_t *arr; 2224 rc_t::array_t *arr;
1866 2225
1867 pl_tex.name = 0; 2226 pl_tex.name = 0;
1868 2227
1869 // thats current max. sorry. 2228 // that's current max. sorry.
1870 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1871 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1872
1873 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey));
1875 2231
1876 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1877 key.r = 255; 2233 key.r = 255;
1878 key.g = 255; 2234 key.g = 255;
1879 key.b = 255; 2235 key.b = 255;
1880 key.a = 255; 2236 key.a = 255;
1881 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884 2239
1885 mx += self->x; 2240 mx += self->x;
1886 my += self->y; 2241 my += self->y;
1887 2242
1888 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1889 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1890 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1891 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1892 2247
1893 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1894 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1895 { 2250 {
1896 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1913 2268
1914 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
1915 { 2270 {
1916 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
1917 2275
1918 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
1919 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
1920 { 2278 {
1921 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
1927 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
1928 2286
1929 if (tile) 2287 if (tile)
1930 { 2288 {
1931 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w; 2290 int px, py;
1933 int py = (y + 1) * T - tex.h;
1934 2291
1935 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
1936 { 2293 {
2294 self->tex [tile].unused = 0;
2295
1937 if (!tex.name) 2296 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1939 2298
1940 key.texname = tex.name; 2299 key.texname = tex.name;
1941 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
1942 } 2301 }
1943 2302
2303 px = (x + 1) * Th - tex.w;
2304 py = (y + 1) * Tw - tex.h;
2305
1944 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1945 { 2307 {
1946 pl_x = px; 2308 pl_x = px;
1947 pl_y = py; 2309 pl_y = py;
1948 pl_tex = tex; 2310 pl_tex = tex;
1949 continue; 2311 continue;
1950 } 2312 }
1951 2313
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1956
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981 2318
1982 // update smooth hash 2319 // update smooth hash
1983 if (tex.smoothtile) 2320 if (tex.smoothtile)
1984 { 2321 {
1985 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
1987 2324
1988 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
1989 2326
1990 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
1991 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
1992 2329
1993 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
2001 2338
2002 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2003 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
2004 2341
2005 // full tile 2342 // full tile
2006 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2007 2344
2008 // borders 2345 // borders
2009 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2010 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2011 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2012 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2013 2350
2014 // corners 2351 // corners
2015 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2016 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2017 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2018 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2019 } 2376 }
2020 } 2377 }
2021 } 2378 }
2022 } 2379 }
2023 2380
2024 rc_draw (rc); 2381 rc.draw ();
2025 rc_clear (rc); 2382 rc.clear ();
2026 2383
2027 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2028 // this is basically counting sort 2385 // this is basically counting sort
2029 { 2386 {
2030 int w, b; 2387 int w, b;
2031 2388
2032 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2034 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2035 { 2394 {
2036 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2037 if (smask) 2396 IV bits = it->second;
2038 for (b = 0; b < 32; ++b) 2397
2039 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2040 { 2401 {
2041 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2042 HE *he; 2410 if (tex.name)
2043
2044 hv_iterinit (smooth);
2045 while ((he = hv_iternext (smooth)))
2046 { 2411 {
2047 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2048 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2049 2414 if (key.texname != tex.name)
2050 if (!(bits & 0x1000)
2051 && skey->level == level
2052 && level > smooth_max [skey->x][skey->y])
2053 { 2415 {
2054 maptex tex = self->tex [skey->tile]; 2416 self->tex [skey.tile].unused = 0;
2055 int px = (((int)skey->x) - 1) * T;
2056 int py = (((int)skey->y) - 1) * T;
2057 int border = bits & 15;
2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059 float dx = tex.s * .0625f; // 16 images/row
2060 float dy = tex.t * .5f ; // 2 images/column
2061 2417
2062 if (tex.name)
2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
2066 if (key.texname != tex.name)
2067 {
2068 glEnd (); 2418 glEnd ();
2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2070 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2071 } 2421 }
2072 2422
2073 if (border) 2423 if (border)
2074 { 2424 {
2075 float ox = border * dx; 2425 float ox = border * dx;
2076 2426
2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2081 } 2431 }
2082 2432
2083 if (corner) 2433 if (corner)
2084 { 2434 {
2085 float ox = corner * dx; 2435 float ox = corner * dx;
2086 2436
2087 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2091 }
2092 }
2093 } 2441 }
2094 } 2442 }
2095 } 2443 }
2096 } 2444 }
2097 2445
2098 glEnd (); 2446 glEnd ();
2099 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1; 2448 key.texname = -1;
2101 } 2449 }
2102
2103 hv_clear (smooth);
2104 } 2450 }
2105 2451
2106 if (pl_tex.name) 2452 if (pl_tex.name)
2107 { 2453 {
2108 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2109 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2110 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2111 2457
2112 key.texname = tex.name; 2458 key.texname = tex.name;
2113 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2114 2460
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2119 2465
2120 rc_draw (rc); 2466 rc.draw ();
2121 } 2467 }
2122 2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
2123 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2124 rc_free (rc);
2125 2473
2126 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2127 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2128 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2129 { 2477 {
2132 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2133 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2134 { 2482 {
2135 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2136 2484
2137 int px = x * T; 2485 int px = x * Tw;
2138 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2139 2493
2140 if (cell->stat_hp) 2494 if (cell->stat_hp)
2141 { 2495 {
2142 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2144 2498
2145 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2146 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2147 px + width - 1, py); 2501 px + width - 1, py);
2148 2502
2154 } 2508 }
2155 } 2509 }
2156} 2510}
2157 2511
2158void 2512void
2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2160 CODE: 2514 CODE:
2161{ 2515{
2162 static float color[16][3] = { 2516 static float color[16][3] = {
2163 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2164 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2165 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2166 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2167 2521
2168 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2169 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2170 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2171 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2172 2526
2173 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2174 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2175 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2176 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2177 2531
2178 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2179 2533
2180 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2181 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2182 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2183 }; 2537 };
2184 2538
2185 int x, y; 2539 int x, y;
2186 2540
2187 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2188 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2189 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2192 2552
2193 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2197 2557
2198 if (m) 2558 if (m)
2199 { 2559 {
2200 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2201 2561
2202 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2203 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2204 2564
2205 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2206 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2207 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2208 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2209 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2210 } 2570 }
2218void 2578void
2219fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2220 PPCODE: 2580 PPCODE:
2221{ 2581{
2222 int x, y; 2582 int x, y;
2223 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2224 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2225 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2226 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2230 2591
2231 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2232 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2233 2594
2234 mx += self->x - 1; 2595 mx += self->x - 1;
2235 my += self->y - 1; 2596 my += self->y - 1;
2236
2237 memset (darkness1, 255, sw1 * sh1);
2238 2597
2239 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2240 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2241 { 2600 {
2242 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2245 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2246 { 2605 {
2247 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2248 2607
2249 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2250 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2251 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2252 } 2611 }
2253 } 2612 }
2254 2613
2255 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2275 2634
2276 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2279 2638
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2284 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2289 } 2648 }
2290 2649
2291 free (darkness1); 2650 free (darkness1);
2292 2651
2293 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2294 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2295 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2296 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2297} 2656}
2298 2657
2299SV * 2658SV *
2362 else 2721 else
2363 *data++ = 0; 2722 *data++ = 0;
2364 } 2723 }
2365 } 2724 }
2366 2725
2367 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 { 2728 {
2370 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 } 2731 }
2373 2732
2374 RETVAL = data_sv; 2733 RETVAL = data_sv;
2375} 2734}
2376 OUTPUT: 2735 OUTPUT:
2377 RETVAL 2736 RETVAL
2378 2737
2379void 2738void
2386 STRLEN len; 2745 STRLEN len;
2387 uint8_t *data, *end; 2746 uint8_t *data, *end;
2388 2747
2389 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2392 end = data + len + 8; 2751 end = data + len + 8;
2393 2752
2394 if (len < 5) 2753 if (len < 5)
2395 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2396 2755
2457} 2816}
2458 2817
2459MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2460 2819
2461DC::RW 2820DC::RW
2462new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2463 CODE: 2822 CODE:
2464{ 2823{
2465 STRLEN datalen; 2824 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2467 2826
2469} 2828}
2470 OUTPUT: 2829 OUTPUT:
2471 RETVAL 2830 RETVAL
2472 2831
2473DC::RW 2832DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2475 CODE: 2834 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT: 2836 OUTPUT:
2478 RETVAL 2837 RETVAL
2479 2838
2497 if (RETVAL < 0) 2856 if (RETVAL < 0)
2498 { 2857 {
2499 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2500 2859
2501 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2502 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2503 2867 }
2868 else
2504 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2505 } 2870 }
2506 2871
2507 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2509} 2874}
2556void 2921void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE: 2923 CODE:
2559{ 2924{
2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563} 2928}
2564 2929
2565void 2930void
2566set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2569 2934
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571 2936
2572PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2573 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2574DC::MixChunk 2951DC::MixChunk
2575new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2576 CODE: 2953 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT: 2955 OUTPUT:
2579 RETVAL 2956 RETVAL
2580 2957
2610 OUTPUT: 2987 OUTPUT:
2611 RETVAL 2988 RETVAL
2612 2989
2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2614 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2615int 3004int
2616volume (int volume = -1) 3005volume (int volume = -1)
2617 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2618 CODE: 3007 CODE:
2619 if (items > 0) 3008 if (items > 0)
2630void 3019void
2631halt () 3020halt ()
2632 CODE: 3021 CODE:
2633 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2634 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2635DC::MixMusic 3031DC::MixMusic
2636new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2637 CODE: 3033 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2639 OUTPUT: 3035 OUTPUT:
2640 RETVAL 3036 RETVAL
2641 3037
2669 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2670# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2674 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2675 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2676 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2677 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2678 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2690 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2691 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2692 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2693 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2694 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2695 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2696 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2697 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2698 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2699 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2767 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2768 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2769 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2770 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2771 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2772# undef const_iv 3176# undef const_iv
2773 }; 3177 };
2774 3178
2775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2777 3181
2778 texture_av = newAV (); 3182 texture_av = newAV ();
2779 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2780} 3184}
2781 3185
2783disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2784 CODE: 3188 CODE:
2785 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2787 3191
2788char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2789gl_vendor () 3196gl_vendor ()
2790 CODE: 3197 CODE:
2791 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2792 OUTPUT: 3199 OUTPUT:
2793 RETVAL 3200 RETVAL
2794 3201
2795char * 3202const char *
2796gl_version () 3203gl_version ()
2797 CODE: 3204 CODE:
2798 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2799 OUTPUT: 3206 OUTPUT:
2800 RETVAL 3207 RETVAL
2801 3208
2802char * 3209const char *
2803gl_extensions () 3210gl_extensions ()
2804 CODE: 3211 CODE:
2805 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2806 OUTPUT: 3213 OUTPUT:
2807 RETVAL 3214 RETVAL
2808 3215
2809const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2810 3221
2811GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2812 CODE: 3223 CODE:
2813 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT: 3225 OUTPUT:
2822 3233
2823int glGetError () 3234int glGetError ()
2824 3235
2825void glFinish () 3236void glFinish ()
2826 3237
3238void glFlush ()
3239
2827void glClear (int mask) 3240void glClear (int mask)
2828 3241
2829void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2830 PROTOTYPE: @ 3243 PROTOTYPE: @
2831 3244
2840void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2841 3254
2842void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2843 CODE: 3256 CODE:
2844 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2845 3260
2846void glDepthMask (int flag) 3261void glDepthMask (int flag)
2847 3262
2848void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2849 3264
2884void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2885 CODE: 3300 CODE:
2886 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2887 3302
2888void glColor (float r, float g, float b, float a = 1.0) 3303void glColor (float r, float g, float b, float a = 1.0)
3304 PROTOTYPE: @
2889 ALIAS: 3305 ALIAS:
2890 glColor_premultiply = 1 3306 glColor_premultiply = 1
2891 CODE: 3307 CODE:
2892 if (ix) 3308 if (ix)
2893 { 3309 {
2999 3415
3000void glEndList () 3416void glEndList ()
3001 3417
3002void glCallList (int list) 3418void glCallList (int list)
3003 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005 3426
3006PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3007 3428
3008void 3429void
3009find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3010 PPCODE: 3431 PPCODE:
3011{ 3432{
3012 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3013 XPUSHs (self); 3434 XPUSHs (self);
3014} 3435}
3015 3436
3016BOOT: 3437BOOT:
3017{ 3438{
3025 3446
3026void 3447void
3027draw (SV *self) 3448draw (SV *self)
3028 CODE: 3449 CODE:
3029{ 3450{
3030 HV *hv; 3451 HV *hv;
3031 SV **svp; 3452 SV **svp;
3032 NV x, y, w, h; 3453 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3036 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines