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.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
70# include <netinet/in.h> 76# include <netinet/in.h>
71# include <netinet/tcp.h> 77# include <netinet/tcp.h>
72# include <inttypes.h> 78# include <inttypes.h>
73#endif 79#endif
74 80
75#if __GNUC__ >= 4 81#include "ecb.h"
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83 82
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
87 89
88#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
90 92
91#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
92 94
93/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
94#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}
95 121
96static AV *texture_av; 122static AV *texture_av;
97 123
98static struct 124static struct
99{ 125{
156{ 182{
157 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
158 184
159 while (attrs) 185 while (attrs)
160 { 186 {
161 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 188
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 190 return 1;
165 191
166 attrs = attrs->next; 192 attrs = attrs->next;
167 } 193 }
168 194
169 return 0; 195 return 0;
170} 196}
171 197
172typedef struct cf_layout { 198struct cf_layout {
173 PangoLayout *pl; 199 PangoLayout *pl;
174 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
175 int base_height; 201 int base_height;
176 DC__Font font; 202 DC__Font font;
177 rc_t *rc; 203 rc_t rc;
178} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
179 207
180static DC__Font default_font; 208static DC__Font default_font;
181static PangoContext *opengl_context; 209static PangoContext *opengl_context;
182static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
183 211
184static void 212static void
185substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
186{ 214{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 218#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 220}
193 221
194static void 222static void
221 249
222 *w = rect.width; 250 *w = rect.width;
223 *h = rect.height; 251 *h = rect.height;
224} 252}
225 253
254/////////////////////////////////////////////////////////////////////////////
255
226typedef uint16_t tileid; 256typedef uint16_t tileid;
227typedef uint16_t faceid; 257typedef uint16_t faceid;
228 258
229typedef struct { 259struct maptex
260{
230 GLuint name; 261 GLuint name;
231 int w, h; 262 int w, h;
232 float s, t; 263 float s, t;
233 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
234 tileid smoothtile; 265 tileid smoothtile;
235 uint8_t smoothlevel; 266 uint8_t smoothlevel;
236} maptex; 267 uint8_t unused; /* set to zero on use */
268};
237 269
238typedef struct { 270struct mapcell
271{
239 uint32_t player; 272 uint32_t player;
240 tileid tile[3]; 273 tileid tile[3];
241 uint16_t darkness; 274 uint16_t darkness;
242 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
243} mapcell; 276};
244 277
245typedef struct { 278struct maprow
279{
246 int32_t c0, c1; 280 int32_t c0, c1;
247 mapcell *col; 281 mapcell *col;
248} maprow; 282};
249 283
250typedef struct map { 284struct mapgrid {
251 int x, y, w, h; 285 int x, y, w, h;
252 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
253 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
254 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
255 289
256 int32_t rows; 290 int32_t rows;
257 maprow *row; 291 maprow *row;
258} *DC__Map; 292};
259 293
260static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
261prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
262{ 299{
263 char *p; 300 T *p;
264 301
265 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
266 Zero (p, inc, char); 303 Zero (p, inc, T);
267 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
268 Safefree (ptr); 305 Safefree (ptr);
269 306
270 return p; 307 ptr = p;
271} 308}
272 309
273static char * 310template<typename T>
274append (char *ptr, int sze, int inc)
275{
276 Renew (ptr, sze + inc, char);
277 Zero (ptr + sze, inc, char);
278
279 return ptr;
280}
281
282#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
283#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
284
285static 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
286need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
287{ 320{
288 while (self->faces <= face) 321 while (self->faces <= face)
289 { 322 {
290 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
291 self->faces *= 2; 324 self->faces *= 2;
292 } 325 }
293} 326}
294 327
295static void 328static void
296need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
297{ 330{
298 while (self->texs <= texid) 331 while (self->texs <= texid)
299 { 332 {
300 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
301 self->texs *= 2; 334 self->texs *= 2;
302 } 335 }
303} 336}
304 337
305static maprow * 338static maprow *
306map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
307{ 340{
308 if (0 > y) 341 if (0 > y)
309 { 342 {
310 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
312 345
313 self->rows += extend; 346 self->rows += extend;
314 self->y += extend; 347 self->y += extend;
315 y += extend; 348 y += extend;
316 } 349 }
317 else if (y >= self->rows) 350 else if (y >= self->rows)
318 { 351 {
319 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
320 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
321 self->rows += extend; 354 self->rows += extend;
322 } 355 }
323 356
324 return self->row + y; 357 return self->row + y;
325} 358}
335 } 368 }
336 369
337 if (row->c0 > x) 370 if (row->c0 > x)
338 { 371 {
339 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
340 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
341 row->c0 -= extend; 374 row->c0 -= extend;
342 } 375 }
343 else if (x >= row->c1) 376 else if (x >= row->c1)
344 { 377 {
345 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
346 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
347 row->c1 += extend; 380 row->c1 += extend;
348 } 381 }
349 382
350 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
351} 384}
352 385
353static mapcell * 386static mapcell *
354map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
355{ 388{
356 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
357} 390}
358 391
359static void 392static void
360map_clear (DC__Map self) 393map_clear (mapgrid *self)
361{ 394{
362 int r; 395 int r;
363 396
364 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
384 (cell)->player = 0; \ 417 (cell)->player = 0; \
385 } while (0) 418 } while (0)
386 419
387static void 420static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 422{
390 int x, y; 423 int x, y;
391 maprow *row; 424 maprow *row;
392 mapcell *cell; 425 mapcell *cell;
393 426
410 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
411 } 444 }
412 } 445 }
413} 446}
414 447
415typedef struct { 448struct smooth_key
449{
416 tileid tile; 450 tileid tile;
417 uint8_t x, y, level; 451 uint8_t x, y, level;
418} 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}
419 471
420static void 472static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 474{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
424 476
425 if (SvIOK (*sv)) 477 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
427 else 479 else
428 sv_setiv (*sv, bits); 480 it->second |= bits;
429} 481}
430 482
431static void 483static void
432music_finished (void) 484music_finished (void)
433{ 485{
450 ev.code = 1; 502 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 504 ev.data2 = 0;
453 505
454 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;
455} 514}
456 515
457static unsigned int 516static unsigned int
458minpot (unsigned int n) 517minpot (unsigned int n)
459{ 518{
469 n |= n >> 16; 528 n |= n >> 16;
470 529
471 return n + 1; 530 return n + 1;
472} 531}
473 532
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
485/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
486#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
487#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
488 536
489/******************************************************************************/ 537/******************************************************************************/
527 return 0; 575 return 0;
528 576
529 return 1; 577 return 1;
530} 578}
531 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
532static void 594static void
533deliantra_main () 595deliantra_main (SV *real_main)
534{ 596{
535 char *argv[] = { 0 }; 597 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
537} 601}
538 602
539#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
540 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 607 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 608 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
545 */ 611 */
546 extern C_LINKAGE int 612 extern C_LINKAGE int
547 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
548 { 614 {
549 deliantra_main (); 615 deliantra_main (real_main);
550 } 616 }
551 617
552 #undef main 618 #undef main
553 619
554 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
555 621
556 static void 622 static void
557 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
558 { 624 {
625 real_main = real_main_;
626
559 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 628 (main) (1, argv);
561 } 629 }
562#else 630#else
563 static void 631 static void
564 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
565 { 633 {
566 deliantra_main (); 634 deliantra_main (real_main);
567 } 635 }
568#endif 636#endif
569 637
570MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
571 639
737 const_iv (KMOD_RMETA), 805 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 806 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 807 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 808 const_iv (KMOD_MODE),
741 809
810 const_iv (KMOD_LRAM),
811
742 const_iv (MIX_DEFAULT_FORMAT), 812 const_iv (MIX_DEFAULT_FORMAT),
743 813
744 const_iv (SDL_INIT_TIMER), 814 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 815 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 816 const_iv (SDL_INIT_VIDEO),
770 840
771 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
772# undef const_iv 842# undef const_iv
773 }; 843 };
774 844
775 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--)
776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777 847
778 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780} 850}
781 851
797NV ceil (NV x) 867NV ceil (NV x)
798 868
799IV minpot (UV n) 869IV minpot (UV n)
800 870
801IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
876
877NV distance (NV dx, NV dy)
878 CODE:
879 RETVAL = pow (dx * dx + dy * dy, 0.5);
880 OUTPUT:
881 RETVAL
802 882
803void 883void
804pango_init () 884pango_init ()
805 CODE: 885 CODE:
806{ 886{
814#endif 894#endif
815} 895}
816 896
817char *SDL_GetError () 897char *SDL_GetError ()
818 898
819void SDL_braino () 899void SDL_main_hack (SV *real_main)
900 PROTOTYPE: &
820 901
821int SDL_Init (U32 flags) 902int SDL_Init (U32 flags)
822 903
823int SDL_InitSubSystem (U32 flags) 904int SDL_InitSubSystem (U32 flags)
824 905
825void SDL_QuitSubSystem (U32 flags) 906void SDL_QuitSubSystem (U32 flags)
826 907
827void SDL_Quit () 908void SDL_Quit ()
828 909
829int SDL_GL_SetAttribute (int attr, int value) 910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
830 912
831int SDL_GL_GetAttribute (int attr) 913int SDL_GL_GetAttribute (int attr)
832 CODE: 914 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL)) 915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834 XSRETURN_UNDEF; 916 XSRETURN_UNDEF;
835 OUTPUT: 917 OUTPUT:
836 RETVAL 918 RETVAL
837 919
838void 920void
893 ); 975 );
894 976
895 if (RETVAL) 977 if (RETVAL)
896 { 978 {
897 av_clear (texture_av); 979 av_clear (texture_av);
898
899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
901#include "glfunc.h" 981#include "glfunc.h"
902#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 985 }
904} 986}
905 OUTPUT: 987 OUTPUT:
906 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
907 992
908void 993void
909SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
910 995
911char * 996char *
912SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
913 999
914int 1000int
915SDL_GetAppState () 1001SDL_GetAppState ()
916 1002
917int 1003int
918SDL_GetModState () 1004SDL_GetModState ()
919 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
920void 1010void
1011SDL_PumpEvents ()
1012
1013void
921poll_events () 1014peep_events ()
922 PPCODE: 1015 PPCODE:
923{ 1016{
924 SDL_Event ev; 1017 SDL_Event ev;
925 1018
926 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
933 { 1026 {
934 case SDL_KEYDOWN: 1027 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1028 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1029 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1030 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1031 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1032 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1033 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1034 break;
942 1035
943 case SDL_ACTIVEEVENT: 1036 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1037 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1055 x = ev.motion.x;
963 y = ev.motion.y; 1056 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1057 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1058 }
966 1059
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1060 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1061 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1062 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1063 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1064 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1065 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1085
993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1086 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
994 } 1087 }
995} 1088}
996 1089
1090char *
1091SDL_AudioDriverName ()
1092 CODE:
1093{
1094 char buf [256];
1095 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1096 XSRETURN_UNDEF;
1097
1098 RETVAL = buf;
1099}
1100 OUTPUT:
1101 RETVAL
1102
997int 1103int
998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
999 POSTCALL: 1105 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
1002 1108
1003void 1109void
1004Mix_QuerySpec () 1110Mix_QuerySpec ()
1063add_font (char *file) 1169add_font (char *file)
1064 CODE: 1170 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1172 OUTPUT:
1067 RETVAL 1173 RETVAL
1174
1175void
1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1068 1181
1069void 1182void
1070load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
1071 ALIAS: 1184 ALIAS:
1072 load_image_file = 1 1185 load_image_file = 1
1118 1231
1119 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
1120 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
1121 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
1122 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
1123 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1124 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1125 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
1128 1241
1188#if DEBUG 1301#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
1190#endif 1303#endif
1191} 1304}
1192 1305
1306int
1307SvREFCNT (SV *sv)
1308 CODE:
1309 RETVAL = SvREFCNT (sv);
1310 OUTPUT:
1311 RETVAL
1312
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1314
1195PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1196 1316
1197DC::Font 1317DC::Font
1198new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1199 CODE: 1319 CODE:
1200{ 1320{
1201 int count; 1321 int count;
1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1232 PROTOTYPE: 1352 PROTOTYPE:
1233 CODE: 1353 CODE:
1234 tc_restore (); 1354 tc_restore ();
1235 1355
1236DC::Layout 1356DC::Layout
1237new (SV *class) 1357new (SV *klass)
1238 CODE: 1358 CODE:
1239 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1240 1360
1241 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1242 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1243 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1244 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1245 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1246 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1247 RETVAL->font = 0; 1367 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1249 1368
1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1251 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1252 OUTPUT: 1371 OUTPUT:
1253 RETVAL 1372 RETVAL
1254 1373
1255void 1374void
1256DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1257 CODE: 1376 CODE:
1258 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1259 rc_free (self->rc);
1260 Safefree (self); 1378 delete self;
1261 1379
1262void 1380void
1263set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1264 CODE: 1382 CODE:
1265{ 1383{
1391 1509
1392void 1510void
1393set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1394 CODE: 1512 CODE:
1395 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1396 { 1514 {
1397 self->base_height = base_height; 1515 self->base_height = base_height;
1398 layout_update_font (self); 1516 layout_update_font (self);
1399 } 1517 }
1400 1518
1401void 1519void
1519} 1637}
1520 1638
1521void 1639void
1522render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1523 CODE: 1641 CODE:
1524 rc_clear (self->rc); 1642 self->rc.clear ();
1525 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1526 self->pl, 1644 self->pl,
1527 self->rc, 1645 &self->rc,
1528 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1529 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1530 flags 1648 flags
1531 ); 1649 );
1532 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1547 1665
1548 rc_draw (self->rc); 1666 self->rc.draw ();
1549 1667
1550 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1553} 1671}
1628 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1630 } 1748 }
1631} 1749}
1632 1750
1751void
1752draw_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)
1753 PROTOTYPE: @
1754 CODE:
1755{
1756 glEnable (GL_BLEND);
1757 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1758 glEnable (GL_TEXTURE_2D);
1759 glBindTexture (GL_TEXTURE_2D, name1);
1760
1761 glColor3f (intensity, intensity, intensity);
1762 glPushMatrix ();
1763 glScalef (1./3, 1./3, 1.);
1764
1765 if (blend > 0.f)
1766 {
1767 float dx3 = dx * -3.f / w;
1768 float dy3 = dy * -3.f / h;
1769 GLfloat env_color[4] = { 0., 0., 0., blend };
1770
1771 /* interpolate the two shadow textures */
1772 /* stage 0 == rgb(glcolor) + alpha(t0) */
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774
1775 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1776 gl.ActiveTexture (GL_TEXTURE1);
1777 glEnable (GL_TEXTURE_2D);
1778 glBindTexture (GL_TEXTURE_2D, name2);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1780
1781 /* rgb == rgb(glcolor) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1785
1786 /* alpha = interpolate t0, t1 by env_alpha */
1787 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1788
1789 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1798
1799 glBegin (GL_QUADS);
1800 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1804 glEnd ();
1805
1806 glDisable (GL_TEXTURE_2D);
1807 gl.ActiveTexture (GL_TEXTURE0);
1808 }
1809 else
1810 {
1811 /* simple blending of one texture, also opengl <1.3 path */
1812 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1813
1814 glBegin (GL_QUADS);
1815 glTexCoord2f (0, 0); glVertex2f (0, 0);
1816 glTexCoord2f (0, t); glVertex2f (0, h);
1817 glTexCoord2f (s, t); glVertex2f (w, h);
1818 glTexCoord2f (s, 0); glVertex2f (w, 0);
1819 glEnd ();
1820 }
1821
1822 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1823 {
1824 int x, y;
1825 int dx3 = dx * 3;
1826 int dy3 = dy * 3;
1827
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1829 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1830 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1831 glTranslatef (-1., -1., 0);
1832 glBegin (GL_QUADS);
1833
1834 for (y = 1; y < h; y += 3)
1835 {
1836 int y1 = y - dy3;
1837 int y1valid = y1 >= 0 && y1 < h;
1838
1839 for (x = 1; x < w; x += 3)
1840 {
1841 int x1 = x - dx3;
1842 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1843 uint8_t h2;
1844
1845 if (y1valid && x1 >= 0 && x1 < w)
1846 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1847 else
1848 h2 = 1; /* out of range == invisible */
1849
1850 if (h1 || h2)
1851 {
1852 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1853 glColor4f (1., 1., 1., alpha);
1854
1855 glTexCoord2f (0, 0.); glVertex2i (x , y );
1856 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1857 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1858 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1859 }
1860 }
1861 }
1862 }
1863
1864 glEnd ();
1865
1866 glPopMatrix ();
1867
1868 glDisable (GL_TEXTURE_2D);
1869 glDisable (GL_BLEND);
1870}
1871
1633IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1872IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1634 CODE: 1873 CODE:
1635{ 1874{
1636 GLint width; 1875 GLint width;
1637 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1876 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1644MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1645 1884
1646PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1647 1886
1648DC::Map 1887DC::Map
1649new (SV *class) 1888new (SV *klass)
1650 CODE: 1889 CODE:
1651 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1652 RETVAL->x = 0; 1891 RETVAL->x = 0;
1653 RETVAL->y = 0; 1892 RETVAL->y = 0;
1654 RETVAL->w = 0; 1893 RETVAL->w = 0;
1655 RETVAL->h = 0; 1894 RETVAL->h = 0;
1656 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1693 1932
1694void 1933void
1695set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1696 CODE: 1935 CODE:
1697{ 1936{
1698 tileid texid; 1937 tileid texid;
1699 maptex *tex; 1938 maptex *tex;
1700 1939
1701 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1702 return; 1941 return;
1703 1942
1704 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1705 return; 1944 return;
1706 1945
1707 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1708 1947
1709 if (!texid) 1948 if (!texid)
1710 return; 1949 return;
1711 1950
1712 tex = self->tex + texid; 1951 tex = self->tex + texid;
1741 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1980 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1742 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 1984}
1985
1986void
1987expire_textures (DC::Map self, int texid, int count)
1988 PPCODE:
1989 for (; texid < self->texs && count; ++texid, --count)
1990 {
1991 maptex *tex = self->tex + texid;
1992
1993 if (tex->name)
1994 {
1995 if (tex->unused)
1996 {
1997 tex->name = 0;
1998 tex->unused = 0;
1999 XPUSHs (sv_2mortal (newSViv (texid)));
2000 }
2001 else
2002 tex->unused = 1;
2003 }
2004 }
1746 2005
1747int 2006int
1748ox (DC::Map self) 2007ox (DC::Map self)
1749 ALIAS: 2008 ALIAS:
1750 oy = 1 2009 oy = 1
1782 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1783 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1784 2043
1785 while (self->y < 0) 2044 while (self->y < 0)
1786 { 2045 {
1787 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1788 2047
1789 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1790 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1791 } 2050 }
1792} 2051}
1793 2052
1794SV * 2053SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1796 CODE: 2055 CODE:
1797{ 2056{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2059 mapcell *cell;
1821 2080
1822 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1823 2082
1824 if (flags & 8) 2083 if (flags & 8)
1825 { 2084 {
2085 uint8_t ext, cmd;
2086
1826 if (extmap) 2087 do
1827 { 2088 {
1828 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1829 2091
1830 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
1831 { 2095 {
1832 ext = *data++;
1833 cmd = ext & 0x7f;
1834
1835 if (cmd < 4)
1836 cell->darkness = 255 - ext * 64 + 1;
1837 else if (cmd == 5) // health
1838 {
1839 cell->stat_width = 1; 2096 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1841 }
1842 else if (cmd == 6) // monster width
1843 cell->stat_width = *data++ + 1;
1844 else if (cmd == 0x47)
1845 {
1846 if (*data == 1) cell->player = data [1];
1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1850
1851 data += *data + 1;
1852 }
1853 else if (cmd == 8) // cell flags
1854 cell->flags = *data++;
1855 else if (ext & 0x40) // unknown, multibyte => skip
1856 data += *data + 1;
1857 else
1858 data++;
1859 } 2098 }
1860 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
1861 } 2116 }
1862 else 2117 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2118 }
1865 2119
1866 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1868 { 2122 {
1871 cell->tile [z] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
1872 2126
1873 if (cell->tile [z]) 2127 if (cell->tile [z])
1874 { 2128 {
1875 maptex *tex = self->tex + cell->tile [z]; 2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
1876 if (!tex->name) 2131 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 2132 av_push (missing, newSViv (cell->tile [z]));
1878 2133
1879 if (tex->smoothtile) 2134 if (tex->smoothtile)
1880 { 2135 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
1882 if (!smooth->name) 2138 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2139 av_push (missing, newSViv (tex->smoothtile));
1884 } 2140 }
1885 } 2141 }
1886 } 2142 }
1914 ? self->row + y 2170 ? self->row + y
1915 : 0; 2171 : 0;
1916 2172
1917 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1918 { 2174 {
1919 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2176
1921 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1922 { 2178 {
1923 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1924 2180
1926 { 2182 {
1927 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2185 int a1 = tex.a;
1930 2186
1931 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1935 } 2191 }
1936 } 2192 }
1937 2193
1938 *map++ = (r ) 2194 *map++ = (r )
1939 | (g << 8) 2195 | (g << 8)
1940 | (b << 16) 2196 | (b << 16)
1941 | (a << 24); 2197 | (a << 24);
1942 } 2198 }
1943 } 2199 }
1944 2200
1945 RETVAL = map_sv; 2201 RETVAL = map_sv;
1946} 2202}
1947 OUTPUT: 2203 OUTPUT:
1948 RETVAL 2204 RETVAL
1949 2205
1950void 2206void
1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2207draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1952 CODE: 2208 CODE:
1953{ 2209{
1954 int x, y, z; 2210 int x, y, z;
1955 2211
1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1959 smooth_key skey;
1960 int pl_x, pl_y; 2213 int pl_x, pl_y;
1961 maptex pl_tex; 2214 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
1963 rc_key_t key; 2217 rc_key_t key;
1964 rc_array_t *arr; 2218 rc_t::array_t *arr;
1965 2219
1966 pl_tex.name = 0; 2220 pl_tex.name = 0;
1967 2221
1968 // thats current max. sorry. 2222 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1971
1972 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey));
1974 2225
1975 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
1976 key.r = 255; 2227 key.r = 255;
1977 key.g = 255; 2228 key.g = 255;
1978 key.b = 255; 2229 key.b = 255;
1979 key.a = 255; 2230 key.a = 255;
1980 key.mode = GL_QUADS; 2231 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2232 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2233
1984 mx += self->x; 2234 mx += self->x;
1985 my += self->y; 2235 my += self->y;
1986 2236
1987 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
1988 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
1989 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
1990 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1991 2241
1992 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
1994 { 2244 {
1995 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2262
2013 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
2014 { 2264 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2268 key.texname = -1;
2016 2269
2017 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
2019 { 2272 {
2020 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2279 tileid tile = cell->tile [z];
2027 2280
2028 if (tile) 2281 if (tile)
2029 { 2282 {
2030 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2284 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2285
2034 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
2035 { 2287 {
2288 self->tex [tile].unused = 0;
2289
2036 if (!tex.name) 2290 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2292
2039 key.texname = tex.name; 2293 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
2041 } 2295 }
2042 2296
2297 px = (x + 1) * Th - tex.w;
2298 py = (y + 1) * Tw - tex.h;
2299
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2044 { 2301 {
2045 pl_x = px; 2302 pl_x = px;
2046 pl_y = py; 2303 pl_y = py;
2047 pl_tex = tex; 2304 pl_tex = tex;
2048 continue; 2305 continue;
2049 } 2306 }
2050 2307
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2055
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
2059 if (cell->flags & 1)
2060 {
2061 maptex tex = self->tex [1];
2062 int px = x * T + T * 2 / 32;
2063 int py = y * T - T * 6 / 32;
2064
2065 if (tex.name)
2066 {
2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077 }
2078 }
2079 }
2080 2312
2081 // update smooth hash 2313 // update smooth hash
2082 if (tex.smoothtile) 2314 if (tex.smoothtile)
2083 { 2315 {
2084 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
2086 2318
2087 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
2088 2320
2089 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
2090 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
2091 2323
2092 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
2100 2332
2101 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2102 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2103 2335
2104 // full tile 2336 // full tile
2105 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2106 2338
2107 // borders 2339 // borders
2108 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2109 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2341 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2110 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2342 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2111 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2112 2344
2113 // corners 2345 // corners
2114 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2115 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2347 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2116 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2348 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2117 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2350 }
2351 }
2352
2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2354 {
2355 // overlays such as the speech bubble, probably more to come
2356 if (cell->flags & 1)
2357 {
2358 rc_key_t key_ov = key;
2359 maptex tex = self->tex[TEXID_SPEECH];
2360 int px = x * Tw + Tw * 2 / 32;
2361 int py = y * Th - Th * 6 / 32;
2362
2363 key_ov.texname = tex.name;
2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2365
2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2118 } 2370 }
2119 } 2371 }
2120 } 2372 }
2121 } 2373 }
2122 2374
2123 rc_draw (rc); 2375 rc.draw ();
2124 rc_clear (rc); 2376 rc.clear ();
2125 2377
2126 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2127 // this is basically counting sort 2379 // this is basically counting sort
2128 { 2380 {
2129 int w, b; 2381 int w, b;
2130 2382
2131 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2133 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2134 { 2388 {
2135 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2136 if (smask) 2390 IV bits = it->second;
2137 for (b = 0; b < 32; ++b) 2391
2138 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2139 { 2395 {
2140 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
2141 HE *he; 2404 if (tex.name)
2142
2143 hv_iterinit (smooth);
2144 while ((he = hv_iternext (smooth)))
2145 { 2405 {
2146 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2147 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2148 2408 if (key.texname != tex.name)
2149 if (!(bits & 0x1000)
2150 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y])
2152 { 2409 {
2153 maptex tex = self->tex [skey->tile]; 2410 self->tex [skey.tile].unused = 0;
2154 int px = (((int)skey->x) - 1) * T;
2155 int py = (((int)skey->y) - 1) * T;
2156 int border = bits & 15;
2157 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2158 float dx = tex.s * .0625f; // 16 images/row
2159 float dy = tex.t * .5f ; // 2 images/column
2160 2411
2161 if (tex.name)
2162 {
2163 // this time avoiding texture state changes
2164 // save gobs of state changes.
2165 if (key.texname != tex.name)
2166 {
2167 glEnd (); 2412 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2170 } 2415 }
2171 2416
2172 if (border) 2417 if (border)
2173 { 2418 {
2174 float ox = border * dx; 2419 float ox = border * dx;
2175 2420
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2425 }
2181 2426
2182 if (corner) 2427 if (corner)
2183 { 2428 {
2184 float ox = corner * dx; 2429 float ox = corner * dx;
2185 2430
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 }
2191 }
2192 } 2435 }
2193 } 2436 }
2194 } 2437 }
2195 } 2438 }
2196 2439
2197 glEnd (); 2440 glEnd ();
2198 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1; 2442 key.texname = -1;
2200 } 2443 }
2201
2202 hv_clear (smooth);
2203 } 2444 }
2204 2445
2205 if (pl_tex.name) 2446 if (pl_tex.name)
2206 { 2447 {
2207 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2208 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2209 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2210 2451
2211 key.texname = tex.name; 2452 key.texname = tex.name;
2212 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2213 2454
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2218 2459
2219 rc_draw (rc); 2460 rc.draw ();
2220 } 2461 }
2221 2462
2463 rc_ov.draw ();
2464 rc_ov.clear ();
2465
2222 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2223 rc_free (rc);
2224 2467
2225 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2228 { 2471 {
2231 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2476 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2235 2478
2236 int px = x * T; 2479 int px = x * Tw;
2237 int py = y * T; 2480 int py = y * Th;
2481
2482 if (ecb_expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
2238 2487
2239 if (cell->stat_hp) 2488 if (cell->stat_hp)
2240 { 2489 {
2241 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2492
2244 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2495 px + width - 1, py);
2247 2496
2253 } 2502 }
2254 } 2503 }
2255} 2504}
2256 2505
2257void 2506void
2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2259 CODE: 2508 CODE:
2260{ 2509{
2261 static float color[16][3] = { 2510 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2266 2515
2267 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2271 2520
2272 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2276 2525
2277 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2278 2527
2279 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2282 }; 2531 };
2283 2532
2284 int x, y; 2533 int x, y;
2285 2534
2286 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2291 2546
2292 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2296 2551
2297 if (m) 2552 if (m)
2298 { 2553 {
2299 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2300 2555
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2303 2558
2304 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2564 }
2317void 2572void
2318fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2319 PPCODE: 2574 PPCODE:
2320{ 2575{
2321 int x, y; 2576 int x, y;
2322 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2325 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2585
2330 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2588
2333 mx += self->x - 1; 2589 mx += self->x - 1;
2334 my += self->y - 1; 2590 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2591
2338 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2340 { 2594 {
2341 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2599 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2347 2601
2348 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2605 }
2352 } 2606 }
2353 2607
2354 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2374 2628
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2632
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2642 }
2389 2643
2390 free (darkness1); 2644 free (darkness1);
2391 2645
2392 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2396} 2650}
2397 2651
2398SV * 2652SV *
2461 else 2715 else
2462 *data++ = 0; 2716 *data++ = 0;
2463 } 2717 }
2464 } 2718 }
2465 2719
2466 /* if size is w*h + 5 then no data has been found */ 2720 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 { 2722 {
2469 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 } 2725 }
2472 2726
2473 RETVAL = data_sv; 2727 RETVAL = data_sv;
2474} 2728}
2475 OUTPUT: 2729 OUTPUT:
2476 RETVAL 2730 RETVAL
2477 2731
2478void 2732void
2485 STRLEN len; 2739 STRLEN len;
2486 uint8_t *data, *end; 2740 uint8_t *data, *end;
2487 2741
2488 len = SvLEN (data_sv); 2742 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv); 2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491 end = data + len + 8; 2745 end = data + len + 8;
2492 2746
2493 if (len < 5) 2747 if (len < 5)
2494 XSRETURN_EMPTY; 2748 XSRETURN_EMPTY;
2495 2749
2556} 2810}
2557 2811
2558MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2559 2813
2560DC::RW 2814DC::RW
2561new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2562 CODE: 2816 CODE:
2563{ 2817{
2564 STRLEN datalen; 2818 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2566 2820
2568} 2822}
2569 OUTPUT: 2823 OUTPUT:
2570 RETVAL 2824 RETVAL
2571 2825
2572DC::RW 2826DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574 CODE: 2828 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT: 2830 OUTPUT:
2577 RETVAL 2831 RETVAL
2578 2832
2596 if (RETVAL < 0) 2850 if (RETVAL < 0)
2597 { 2851 {
2598 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2599 2853
2600 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2601 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2602 2861 }
2862 else
2603 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2604 } 2864 }
2605 2865
2606 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2608} 2868}
2655void 2915void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2917 CODE:
2658{ 2918{
2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2922}
2663 2923
2664void 2924void
2665set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2668 2928
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2930
2671PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2672 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2673DC::MixChunk 2945DC::MixChunk
2674new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2675 CODE: 2947 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT: 2949 OUTPUT:
2678 RETVAL 2950 RETVAL
2679 2951
2709 OUTPUT: 2981 OUTPUT:
2710 RETVAL 2982 RETVAL
2711 2983
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2714int 2998int
2715volume (int volume = -1) 2999volume (int volume = -1)
2716 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2717 CODE: 3001 CODE:
2718 if (items > 0) 3002 if (items > 0)
2729void 3013void
2730halt () 3014halt ()
2731 CODE: 3015 CODE:
2732 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2733 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2734DC::MixMusic 3025DC::MixMusic
2735new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2736 CODE: 3027 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2738 OUTPUT: 3029 OUTPUT:
2739 RETVAL 3030 RETVAL
2740 3031
2768 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2870 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2871# undef const_iv 3170# undef const_iv
2872 }; 3171 };
2873 3172
2874 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3175
2877 texture_av = newAV (); 3176 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2879} 3178}
2880 3179
2882disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2883 CODE: 3182 CODE:
2884 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2886 3185
2887char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2888gl_vendor () 3190gl_vendor ()
2889 CODE: 3191 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3193 OUTPUT:
2892 RETVAL 3194 RETVAL
2893 3195
2894char * 3196const char *
2895gl_version () 3197gl_version ()
2896 CODE: 3198 CODE:
2897 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2898 OUTPUT: 3200 OUTPUT:
2899 RETVAL 3201 RETVAL
2900 3202
2901char * 3203const char *
2902gl_extensions () 3204gl_extensions ()
2903 CODE: 3205 CODE:
2904 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905 OUTPUT: 3207 OUTPUT:
2906 RETVAL 3208 RETVAL
2907 3209
2908const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2909 3215
2910GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2911 CODE: 3217 CODE:
2912 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT: 3219 OUTPUT:
2921 3227
2922int glGetError () 3228int glGetError ()
2923 3229
2924void glFinish () 3230void glFinish ()
2925 3231
3232void glFlush ()
3233
2926void glClear (int mask) 3234void glClear (int mask)
2927 3235
2928void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3237 PROTOTYPE: @
2930 3238
2939void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2940 3248
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3250 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2944 3254
2945void glDepthMask (int flag) 3255void glDepthMask (int flag)
2946 3256
2947void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2948 3258
2983void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
2984 CODE: 3294 CODE:
2985 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
2986 3296
2987void glColor (float r, float g, float b, float a = 1.0) 3297void glColor (float r, float g, float b, float a = 1.0)
3298 PROTOTYPE: @
2988 ALIAS: 3299 ALIAS:
2989 glColor_premultiply = 1 3300 glColor_premultiply = 1
2990 CODE: 3301 CODE:
2991 if (ix) 3302 if (ix)
2992 { 3303 {
3098 3409
3099void glEndList () 3410void glEndList ()
3100 3411
3101void glCallList (int list) 3412void glCallList (int list)
3102 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3420
3105PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
3106 3422
3107void 3423void
3108find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
3109 PPCODE: 3425 PPCODE:
3110{ 3426{
3111 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
3112 XPUSHs (self); 3428 XPUSHs (self);
3113} 3429}
3114 3430
3115BOOT: 3431BOOT:
3116{ 3432{
3124 3440
3125void 3441void
3126draw (SV *self) 3442draw (SV *self)
3127 CODE: 3443 CODE:
3128{ 3444{
3129 HV *hv; 3445 HV *hv;
3130 SV **svp; 3446 SV **svp;
3131 NV x, y, w, h; 3447 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
3135 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines