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.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>
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
796 866
797NV ceil (NV x) 867NV ceil (NV x)
798 868
799IV minpot (UV n) 869IV minpot (UV n)
800 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
801IV 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
802 888
803void 889void
804pango_init () 890pango_init ()
805 CODE: 891 CODE:
806{ 892{
814#endif 900#endif
815} 901}
816 902
817char *SDL_GetError () 903char *SDL_GetError ()
818 904
819void SDL_braino () 905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
820 907
821int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
822 909
823int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
824 911
825void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
826 913
827void SDL_Quit () 914void SDL_Quit ()
828 915
829int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
830 918
831int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
832 CODE: 920 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
835 OUTPUT: 923 OUTPUT:
836 RETVAL 924 RETVAL
837 925
838void 926void
893 ); 981 );
894 982
895 if (RETVAL) 983 if (RETVAL)
896 { 984 {
897 av_clear (texture_av); 985 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); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
901#include "glfunc.h" 987#include "glfunc.h"
902#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 991 }
904} 992}
905 OUTPUT: 993 OUTPUT:
906 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
907 998
908void 999void
909SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
910 1001
911char * 1002char *
912SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
913 1005
914int 1006int
915SDL_GetAppState () 1007SDL_GetAppState ()
916 1008
917int 1009int
918SDL_GetModState () 1010SDL_GetModState ()
919 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
920void 1016void
1017SDL_PumpEvents ()
1018
1019void
921poll_events () 1020peep_events ()
922 PPCODE: 1021 PPCODE:
923{ 1022{
924 SDL_Event ev; 1023 SDL_Event ev;
925 1024
926 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
933 { 1032 {
934 case SDL_KEYDOWN: 1033 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1034 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1035 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1036 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); 1037 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 */ 1038 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); 1039 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1040 break;
942 1041
943 case SDL_ACTIVEEVENT: 1042 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1043 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1061 x = ev.motion.x;
963 y = ev.motion.y; 1062 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1063 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1064 }
966 1065
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1066 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1067 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1068 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1069 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1070 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1071 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1091
993 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))));
994 } 1093 }
995} 1094}
996 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
997int 1109int
998Mix_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)
999 POSTCALL: 1111 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
1002 1114
1003void 1115void
1004Mix_QuerySpec () 1116Mix_QuerySpec ()
1063add_font (char *file) 1175add_font (char *file)
1064 CODE: 1176 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1178 OUTPUT:
1067 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)
1068 1187
1069void 1188void
1070load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
1071 ALIAS: 1190 ALIAS:
1072 load_image_file = 1 1191 load_image_file = 1
1118 1237
1119 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1120 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1121 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1122 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1123 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 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))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1125 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1128 1247
1188#if DEBUG 1307#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
1190#endif 1309#endif
1191} 1310}
1192 1311
1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1320
1195PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1196 1322
1197DC::Font 1323DC::Font
1198new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1199 CODE: 1325 CODE:
1200{ 1326{
1201 int count; 1327 int count;
1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1232 PROTOTYPE: 1358 PROTOTYPE:
1233 CODE: 1359 CODE:
1234 tc_restore (); 1360 tc_restore ();
1235 1361
1236DC::Layout 1362DC::Layout
1237new (SV *class) 1363new (SV *klass)
1238 CODE: 1364 CODE:
1239 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1240 1366
1241 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1242 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1243 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1244 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1245 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1246 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1247 RETVAL->font = 0; 1373 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1249 1374
1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1251 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1252 OUTPUT: 1377 OUTPUT:
1253 RETVAL 1378 RETVAL
1254 1379
1255void 1380void
1256DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1257 CODE: 1382 CODE:
1258 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1259 rc_free (self->rc);
1260 Safefree (self); 1384 delete self;
1261 1385
1262void 1386void
1263set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1264 CODE: 1388 CODE:
1265{ 1389{
1391 1515
1392void 1516void
1393set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1394 CODE: 1518 CODE:
1395 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1396 { 1520 {
1397 self->base_height = base_height; 1521 self->base_height = base_height;
1398 layout_update_font (self); 1522 layout_update_font (self);
1399 } 1523 }
1400 1524
1401void 1525void
1519} 1643}
1520 1644
1521void 1645void
1522render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1523 CODE: 1647 CODE:
1524 rc_clear (self->rc); 1648 self->rc.clear ();
1525 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1526 self->pl, 1650 self->pl,
1527 self->rc, 1651 &self->rc,
1528 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1529 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1530 flags 1654 flags
1531 ); 1655 );
1532 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1547 1671
1548 rc_draw (self->rc); 1672 self->rc.draw ();
1549 1673
1550 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1553} 1677}
1628 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1630 } 1754 }
1631} 1755}
1632 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
1633IV 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)
1634 CODE: 1879 CODE:
1635{ 1880{
1636 GLint width; 1881 GLint width;
1637 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);
1644MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1645 1890
1646PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1647 1892
1648DC::Map 1893DC::Map
1649new (SV *class) 1894new (SV *klass)
1650 CODE: 1895 CODE:
1651 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1652 RETVAL->x = 0; 1897 RETVAL->x = 0;
1653 RETVAL->y = 0; 1898 RETVAL->y = 0;
1654 RETVAL->w = 0; 1899 RETVAL->w = 0;
1655 RETVAL->h = 0; 1900 RETVAL->h = 0;
1656 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1693 1938
1694void 1939void
1695set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1696 CODE: 1941 CODE:
1697{ 1942{
1698 tileid texid; 1943 tileid texid;
1699 maptex *tex; 1944 maptex *tex;
1700 1945
1701 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1702 return; 1947 return;
1703 1948
1704 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1705 return; 1950 return;
1706 1951
1707 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1708 1953
1709 if (!texid) 1954 if (!texid)
1710 return; 1955 return;
1711 1956
1712 tex = self->tex + texid; 1957 tex = self->tex + texid;
1741 //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);
1742 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 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 }
1746 2011
1747int 2012int
1748ox (DC::Map self) 2013ox (DC::Map self)
1749 ALIAS: 2014 ALIAS:
1750 oy = 1 2015 oy = 1
1782 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1783 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1784 2049
1785 while (self->y < 0) 2050 while (self->y < 0)
1786 { 2051 {
1787 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1788 2053
1789 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1790 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1791 } 2056 }
1792} 2057}
1793 2058
1794SV * 2059SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1796 CODE: 2061 CODE:
1797{ 2062{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2065 mapcell *cell;
1821 2086
1822 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1823 2088
1824 if (flags & 8) 2089 if (flags & 8)
1825 { 2090 {
2091 uint8_t ext, cmd;
2092
1826 if (extmap) 2093 do
1827 { 2094 {
1828 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1829 2097
1830 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
1831 { 2101 {
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; 2102 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2103 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 } 2104 }
1860 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++;
1861 } 2122 }
1862 else 2123 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2124 }
1865 2125
1866 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1868 { 2128 {
1871 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1872 2132
1873 if (cell->tile [z]) 2133 if (cell->tile [z])
1874 { 2134 {
1875 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1876 if (!tex->name) 2137 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1878 2139
1879 if (tex->smoothtile) 2140 if (tex->smoothtile)
1880 { 2141 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1882 if (!smooth->name) 2144 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1884 } 2146 }
1885 } 2147 }
1886 } 2148 }
1914 ? self->row + y 2176 ? self->row + y
1915 : 0; 2177 : 0;
1916 2178
1917 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1918 { 2180 {
1919 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2182
1921 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1922 { 2184 {
1923 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1924 2186
1926 { 2188 {
1927 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2191 int a1 = tex.a;
1930 2192
1931 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1935 } 2197 }
1936 } 2198 }
1937 2199
1938 *map++ = (r ) 2200 *map++ = (r )
1939 | (g << 8) 2201 | (g << 8)
1940 | (b << 16) 2202 | (b << 16)
1941 | (a << 24); 2203 | (a << 24);
1942 } 2204 }
1943 } 2205 }
1944 2206
1945 RETVAL = map_sv; 2207 RETVAL = map_sv;
1946} 2208}
1947 OUTPUT: 2209 OUTPUT:
1948 RETVAL 2210 RETVAL
1949 2211
1950void 2212void
1951draw (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)
1952 CODE: 2214 CODE:
1953{ 2215{
1954 int x, y, z; 2216 int x, y, z;
1955 2217
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) 2218 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; 2219 int pl_x, pl_y;
1961 maptex pl_tex; 2220 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1963 rc_key_t key; 2223 rc_key_t key;
1964 rc_array_t *arr; 2224 rc_t::array_t *arr;
1965 2225
1966 pl_tex.name = 0; 2226 pl_tex.name = 0;
1967 2227
1968 // thats current max. sorry. 2228 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1971
1972 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey));
1974 2231
1975 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1976 key.r = 255; 2233 key.r = 255;
1977 key.g = 255; 2234 key.g = 255;
1978 key.b = 255; 2235 key.b = 255;
1979 key.a = 255; 2236 key.a = 255;
1980 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2239
1984 mx += self->x; 2240 mx += self->x;
1985 my += self->y; 2241 my += self->y;
1986 2242
1987 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
1988 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
1989 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
1990 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1991 2247
1992 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
1994 { 2250 {
1995 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2268
2013 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
2014 { 2270 {
2015 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;
2016 2275
2017 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
2019 { 2278 {
2020 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
2027 2286
2028 if (tile) 2287 if (tile)
2029 { 2288 {
2030 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2290 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2291
2034 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
2035 { 2293 {
2294 self->tex [tile].unused = 0;
2295
2036 if (!tex.name) 2296 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2298
2039 key.texname = tex.name; 2299 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
2041 } 2301 }
2042 2302
2303 px = (x + 1) * Th - tex.w;
2304 py = (y + 1) * Tw - tex.h;
2305
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2044 { 2307 {
2045 pl_x = px; 2308 pl_x = px;
2046 pl_y = py; 2309 pl_y = py;
2047 pl_tex = tex; 2310 pl_tex = tex;
2048 continue; 2311 continue;
2049 } 2312 }
2050 2313
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 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); 2316 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); 2317 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 2318
2081 // update smooth hash 2319 // update smooth hash
2082 if (tex.smoothtile) 2320 if (tex.smoothtile)
2083 { 2321 {
2084 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
2086 2324
2087 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
2088 2326
2089 // 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
2090 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
2091 2329
2092 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
2100 2338
2101 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2102 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
2103 2341
2104 // full tile 2342 // full tile
2105 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);
2106 2344
2107 // borders 2345 // borders
2108 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);
2109 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);
2110 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);
2111 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);
2112 2350
2113 // corners 2351 // corners
2114 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);
2115 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);
2116 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);
2117 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);
2118 } 2376 }
2119 } 2377 }
2120 } 2378 }
2121 } 2379 }
2122 2380
2123 rc_draw (rc); 2381 rc.draw ();
2124 rc_clear (rc); 2382 rc.clear ();
2125 2383
2126 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2127 // this is basically counting sort 2385 // this is basically counting sort
2128 { 2386 {
2129 int w, b; 2387 int w, b;
2130 2388
2131 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2133 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)
2134 { 2394 {
2135 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2136 if (smask) 2396 IV bits = it->second;
2137 for (b = 0; b < 32; ++b) 2397
2138 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2139 { 2401 {
2140 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
2141 HE *he; 2410 if (tex.name)
2142
2143 hv_iterinit (smooth);
2144 while ((he = hv_iternext (smooth)))
2145 { 2411 {
2146 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2147 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2148 2414 if (key.texname != tex.name)
2149 if (!(bits & 0x1000)
2150 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y])
2152 { 2415 {
2153 maptex tex = self->tex [skey->tile]; 2416 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 2417
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 (); 2418 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2170 } 2421 }
2171 2422
2172 if (border) 2423 if (border)
2173 { 2424 {
2174 float ox = border * dx; 2425 float ox = border * dx;
2175 2426
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2431 }
2181 2432
2182 if (corner) 2433 if (corner)
2183 { 2434 {
2184 float ox = corner * dx; 2435 float ox = corner * dx;
2185 2436
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 }
2191 }
2192 } 2441 }
2193 } 2442 }
2194 } 2443 }
2195 } 2444 }
2196 2445
2197 glEnd (); 2446 glEnd ();
2198 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1; 2448 key.texname = -1;
2200 } 2449 }
2201
2202 hv_clear (smooth);
2203 } 2450 }
2204 2451
2205 if (pl_tex.name) 2452 if (pl_tex.name)
2206 { 2453 {
2207 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2208 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2209 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2210 2457
2211 key.texname = tex.name; 2458 key.texname = tex.name;
2212 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2213 2460
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 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); 2463 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); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2218 2465
2219 rc_draw (rc); 2466 rc.draw ();
2220 } 2467 }
2221 2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
2222 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2223 rc_free (rc);
2224 2473
2225 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2228 { 2477 {
2231 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2482 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2235 2484
2236 int px = x * T; 2485 int px = x * Tw;
2237 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 }
2238 2493
2239 if (cell->stat_hp) 2494 if (cell->stat_hp)
2240 { 2495 {
2241 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2498
2244 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2501 px + width - 1, py);
2247 2502
2253 } 2508 }
2254 } 2509 }
2255} 2510}
2256 2511
2257void 2512void
2258draw_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)
2259 CODE: 2514 CODE:
2260{ 2515{
2261 static float color[16][3] = { 2516 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2266 2521
2267 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2271 2526
2272 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2276 2531
2277 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2278 2533
2279 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2282 }; 2537 };
2283 2538
2284 int x, y; 2539 int x, y;
2285 2540
2286 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 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2291 2552
2292 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2296 2557
2297 if (m) 2558 if (m)
2298 { 2559 {
2299 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2300 2561
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2303 2564
2304 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2570 }
2317void 2578void
2318fow_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)
2319 PPCODE: 2580 PPCODE:
2320{ 2581{
2321 int x, y; 2582 int x, y;
2322 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2325 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);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2591
2330 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2594
2333 mx += self->x - 1; 2595 mx += self->x - 1;
2334 my += self->y - 1; 2596 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2597
2338 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2340 { 2600 {
2341 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2605 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2347 2607
2348 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2611 }
2352 } 2612 }
2353 2613
2354 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2374 2634
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2638
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 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 */
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2648 }
2389 2649
2390 free (darkness1); 2650 free (darkness1);
2391 2651
2392 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2396} 2656}
2397 2657
2398SV * 2658SV *
2461 else 2721 else
2462 *data++ = 0; 2722 *data++ = 0;
2463 } 2723 }
2464 } 2724 }
2465 2725
2466 /* 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 */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 { 2728 {
2469 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 } 2731 }
2472 2732
2473 RETVAL = data_sv; 2733 RETVAL = data_sv;
2474} 2734}
2475 OUTPUT: 2735 OUTPUT:
2476 RETVAL 2736 RETVAL
2477 2737
2478void 2738void
2485 STRLEN len; 2745 STRLEN len;
2486 uint8_t *data, *end; 2746 uint8_t *data, *end;
2487 2747
2488 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491 end = data + len + 8; 2751 end = data + len + 8;
2492 2752
2493 if (len < 5) 2753 if (len < 5)
2494 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2495 2755
2556} 2816}
2557 2817
2558MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2559 2819
2560DC::RW 2820DC::RW
2561new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2562 CODE: 2822 CODE:
2563{ 2823{
2564 STRLEN datalen; 2824 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2566 2826
2568} 2828}
2569 OUTPUT: 2829 OUTPUT:
2570 RETVAL 2830 RETVAL
2571 2831
2572DC::RW 2832DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574 CODE: 2834 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT: 2836 OUTPUT:
2577 RETVAL 2837 RETVAL
2578 2838
2596 if (RETVAL < 0) 2856 if (RETVAL < 0)
2597 { 2857 {
2598 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2599 2859
2600 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)
2601 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2602 2867 }
2868 else
2603 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2604 } 2870 }
2605 2871
2606 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2608} 2874}
2655void 2921void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2923 CODE:
2658{ 2924{
2659 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));
2660 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;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2928}
2663 2929
2664void 2930void
2665set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2668 2934
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2936
2671PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2672 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
2673DC::MixChunk 2951DC::MixChunk
2674new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2675 CODE: 2953 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT: 2955 OUTPUT:
2678 RETVAL 2956 RETVAL
2679 2957
2709 OUTPUT: 2987 OUTPUT:
2710 RETVAL 2988 RETVAL
2711 2989
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 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
2714int 3004int
2715volume (int volume = -1) 3005volume (int volume = -1)
2716 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2717 CODE: 3007 CODE:
2718 if (items > 0) 3008 if (items > 0)
2729void 3019void
2730halt () 3020halt ()
2731 CODE: 3021 CODE:
2732 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2733 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2734DC::MixMusic 3031DC::MixMusic
2735new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2736 CODE: 3033 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2738 OUTPUT: 3035 OUTPUT:
2739 RETVAL 3036 RETVAL
2740 3037
2768 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 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),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2870 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),
2871# undef const_iv 3176# undef const_iv
2872 }; 3177 };
2873 3178
2874 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--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3181
2877 texture_av = newAV (); 3182 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2879} 3184}
2880 3185
2882disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2883 CODE: 3188 CODE:
2884 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2886 3191
2887char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2888gl_vendor () 3196gl_vendor ()
2889 CODE: 3197 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3199 OUTPUT:
2892 RETVAL 3200 RETVAL
2893 3201
2894char * 3202const char *
2895gl_version () 3203gl_version ()
2896 CODE: 3204 CODE:
2897 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2898 OUTPUT: 3206 OUTPUT:
2899 RETVAL 3207 RETVAL
2900 3208
2901char * 3209const char *
2902gl_extensions () 3210gl_extensions ()
2903 CODE: 3211 CODE:
2904 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905 OUTPUT: 3213 OUTPUT:
2906 RETVAL 3214 RETVAL
2907 3215
2908const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2909 3221
2910GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2911 CODE: 3223 CODE:
2912 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT: 3225 OUTPUT:
2921 3233
2922int glGetError () 3234int glGetError ()
2923 3235
2924void glFinish () 3236void glFinish ()
2925 3237
3238void glFlush ()
3239
2926void glClear (int mask) 3240void glClear (int mask)
2927 3241
2928void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3243 PROTOTYPE: @
2930 3244
2939void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2940 3254
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3256 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2944 3260
2945void glDepthMask (int flag) 3261void glDepthMask (int flag)
2946 3262
2947void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2948 3264
2983void glRotate (float angle, float x, float y, float z) 3299void glRotate (float angle, float x, float y, float z)
2984 CODE: 3300 CODE:
2985 glRotatef (angle, x, y, z); 3301 glRotatef (angle, x, y, z);
2986 3302
2987void 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: @
2988 ALIAS: 3305 ALIAS:
2989 glColor_premultiply = 1 3306 glColor_premultiply = 1
2990 CODE: 3307 CODE:
2991 if (ix) 3308 if (ix)
2992 { 3309 {
3098 3415
3099void glEndList () 3416void glEndList ()
3100 3417
3101void glCallList (int list) 3418void glCallList (int list)
3102 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3426
3105PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3106 3428
3107void 3429void
3108find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3109 PPCODE: 3431 PPCODE:
3110{ 3432{
3111 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3112 XPUSHs (self); 3434 XPUSHs (self);
3113} 3435}
3114 3436
3115BOOT: 3437BOOT:
3116{ 3438{
3124 3446
3125void 3447void
3126draw (SV *self) 3448draw (SV *self)
3127 CODE: 3449 CODE:
3128{ 3450{
3129 HV *hv; 3451 HV *hv;
3130 SV **svp; 3452 SV **svp;
3131 NV x, y, w, h; 3453 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3135 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