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.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 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)) 82#include "salloc.h"
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 83
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 85
86/* this is used as fow flag as well, so has to have a different value */
87/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 88#define FOW_DARKNESS 50
89#define DARKNESS_ADJUST(n) (n)
87 90
88#define MAP_EXTEND_X 32 91#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 92#define MAP_EXTEND_Y 512
90 93
91#define MIN_FONT_HEIGHT 10 94#define MIN_FONT_HEIGHT 10
92 95
93/* mask out modifiers we are not interested in */ 96/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 97#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 98
96#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
100
101#define TEXID_SPEECH 1
102#define TEXID_NOFACE 2
103
104// approximately divide by 255
105static unsigned int
106div255 (unsigned int n)
107{
108 return (n + (n >> 8)) >> 8;
109}
110
111static unsigned int
112minpot (unsigned int n)
113{
114 if (!n)
115 return 0;
116
117 --n;
118
119 n |= n >> 1;
120 n |= n >> 2;
121 n |= n >> 4;
122 n |= n >> 8;
123 n |= n >> 16;
124
125 return n + 1;
126}
127
128static char *
129fast_sv_grow (SV *sv, STRLEN need)
130{
131 STRLEN len = SvLEN (sv);
132 STRLEN want = SvCUR (sv) + need;
133
134 if (ecb_expect_false (len < want))
135 {
136 do
137 len *= 2;
138 while (len < want);
139
140 sv_grow (sv, len);
141 }
142
143 SvCUR_set (sv, want);
144 return SvEND (sv) - need;
145}
97 146
98static AV *texture_av; 147static AV *texture_av;
99 148
100static struct 149static struct
101{ 150{
158{ 207{
159 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
160 209
161 while (attrs) 210 while (attrs)
162 { 211 {
163 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 213
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 215 return 1;
167 216
168 attrs = attrs->next; 217 attrs = attrs->next;
169 } 218 }
170 219
171 return 0; 220 return 0;
172} 221}
173 222
174typedef struct cf_layout { 223struct cf_layout {
175 PangoLayout *pl; 224 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
177 int base_height; 226 int base_height;
178 DC__Font font; 227 DC__Font font;
179 rc_t *rc; 228 rc_t rc;
180} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
181 232
182static DC__Font default_font; 233static DC__Font default_font;
183static PangoContext *opengl_context; 234static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
185 236
186static void 237static void
187substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
188{ 239{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 243#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 245}
195 246
196static void 247static void
223 274
224 *w = rect.width; 275 *w = rect.width;
225 *h = rect.height; 276 *h = rect.height;
226} 277}
227 278
279/////////////////////////////////////////////////////////////////////////////
280
228typedef uint16_t tileid; 281typedef uint16_t tileid;
229typedef uint16_t faceid; 282typedef uint16_t faceid;
230 283
231typedef struct { 284struct maptex
285{
232 GLuint name; 286 GLuint name;
233 int w, h; 287 int w, h;
234 float s, t; 288 float s, t;
235 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
236 tileid smoothtile; 290 tileid smoothtile;
237 uint8_t smoothlevel; 291 uint8_t smoothlevel;
238} maptex; 292 uint8_t unused; /* set to zero on use */
293};
239 294
240typedef struct { 295struct mapcell
296{
241 uint32_t player; 297 uint32_t player;
242 tileid tile[3]; 298 tileid tile[3];
243 uint16_t darkness; 299 uint16_t darkness;
244 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
245} mapcell; 301};
246 302
247typedef struct { 303struct maprow
304{
248 int32_t c0, c1; 305 int32_t c0, c1;
249 mapcell *col; 306 mapcell *col;
250} maprow; 307};
251 308
252typedef struct map { 309struct mapgrid {
253 int x, y, w, h; 310 int x, y, w, h;
254 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
255 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
256 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
257 314
258 int32_t rows; 315 int32_t rows;
259 maprow *row; 316 maprow *row;
260} *DC__Map; 317};
261 318
262static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
263prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
264{ 324{
265 char *p; 325 T *p;
266 326
267 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
268 Zero (p, inc, char); 328 Zero (p, inc, T);
269 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
270 Safefree (ptr); 330 Safefree (ptr);
271 331
272 return p; 332 ptr = p;
273} 333}
274 334
275static char * 335template<typename T>
336ecb_cold static void
276append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
277{ 338{
278 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
279 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
280
281 return ptr;
282} 341}
283
284#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
285#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
286 342
287static void 343static void
288need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
289{ 345{
290 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
291 { 347 return;
348
349 size_t newsize = minpot (face + 1);
292 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
293 self->faces *= 2; 351 self->faces = newsize;
294 }
295} 352}
296 353
297static void 354static void
298need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
299{ 356{
300 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
301 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
302 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
303 self->texs *= 2; 362 self->texs = newsize;
304 }
305} 363}
306 364
307static maprow * 365static maprow *
308map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
309{ 367{
310 if (0 > y) 368 if (0 > y)
311 { 369 {
312 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
313 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
314 372
315 self->rows += extend; 373 self->rows += extend;
316 self->y += extend; 374 self->y += extend;
317 y += extend; 375 y += extend;
318 } 376 }
319 else if (y >= self->rows) 377 else if (y >= self->rows)
320 { 378 {
321 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
322 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
323 self->rows += extend; 381 self->rows += extend;
324 } 382 }
325 383
326 return self->row + y; 384 return self->row + y;
327} 385}
337 } 395 }
338 396
339 if (row->c0 > x) 397 if (row->c0 > x)
340 { 398 {
341 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
342 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
343 row->c0 -= extend; 401 row->c0 -= extend;
344 } 402 }
345 else if (x >= row->c1) 403 else if (x >= row->c1)
346 { 404 {
347 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
348 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
349 row->c1 += extend; 407 row->c1 += extend;
350 } 408 }
351 409
352 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
353} 411}
354 412
355static mapcell * 413static mapcell *
356map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
357{ 415{
358 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
359} 417}
360 418
361static void 419static void
362map_clear (DC__Map self) 420map_clear (mapgrid *self)
363{ 421{
364 int r; 422 int r;
365 423
366 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
367 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
385 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
386 (cell)->player = 0; \ 444 (cell)->player = 0; \
387 } while (0) 445 } while (0)
388 446
389static void 447static void
390map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
391{ 449{
392 int x, y; 450 int x, y;
393 maprow *row; 451 maprow *row;
394 mapcell *cell; 452 mapcell *cell;
395 453
412 CELL_CLEAR (cell); 470 CELL_CLEAR (cell);
413 } 471 }
414 } 472 }
415} 473}
416 474
417typedef struct { 475struct smooth_key
476{
418 tileid tile; 477 tileid tile;
419 uint8_t x, y, level; 478 uint8_t x, y, level;
420} smooth_key; 479
480 bool operator == (const smooth_key &o) const
481 {
482 return tile == o.tile && x == o.x && y == o.y && level == o.level;
483 }
484};
485
486typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
487
488namespace std {
489 template <>
490 struct hash<smooth_key>
491 {
492 size_t operator () (const smooth_key &v) const
493 {
494 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
495 }
496 };
497}
421 498
422static void 499static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
424{ 501{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
426 503
427 if (SvIOK (*sv)) 504 if (it == h.end ())
428 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
429 else 506 else
430 sv_setiv (*sv, bits); 507 it->second |= bits;
431} 508}
432 509
433static void 510static void
434music_finished (void) 511music_finished (void)
435{ 512{
454 ev.data2 = 0; 531 ev.data2 = 0;
455 532
456 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
457} 534}
458 535
459static unsigned int
460minpot (unsigned int n)
461{
462 if (!n)
463 return 0;
464
465 --n;
466
467 n |= n >> 1;
468 n |= n >> 2;
469 n |= n >> 4;
470 n |= n >> 8;
471 n |= n >> 16;
472
473 return n + 1;
474}
475
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
487/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
488#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
489#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
490 539
491/******************************************************************************/ 540/******************************************************************************/
529 return 0; 578 return 0;
530 579
531 return 1; 580 return 1;
532} 581}
533 582
583/******************************************************************************/
584
534/* process keyboard modifiers */ 585/* process keyboard modifiers */
535static int 586static int
536mod_munge (int mod) 587mod_munge (int mod)
537{ 588{
538 mod &= MOD_MASK; 589 mod &= MOD_MASK;
542 593
543 return mod; 594 return mod;
544} 595}
545 596
546static void 597static void
547deliantra_main () 598deliantra_main (SV *real_main)
548{ 599{
549 char *argv[] = { 0 }; 600 dSP;
550 call_argv ("::main", G_DISCARD | G_VOID, argv); 601
602 PUSHMARK (SP);
603 call_sv (real_main, G_DISCARD | G_VOID);
551} 604}
552 605
553#ifdef __MACOSX__ 606#ifdef __MACOSX__
607 static SV *real_main;
608
554 /* to due surprising braindamage on the side of SDL design, we 609 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main() 610 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which, 611 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 612 * due to shared library magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back. 613 * and which calls our main (== SDL_main) back.
559 */ 614 */
560 extern C_LINKAGE int 615 extern C_LINKAGE int
561 main (int argc, char *argv[]) 616 main (int argc, char *argv[])
562 { 617 {
563 deliantra_main (); 618 deliantra_main (real_main);
564 } 619 }
565 620
566 #undef main 621 #undef main
567 622
568 extern C_LINKAGE int main (int argc, char *argv[]); 623 extern C_LINKAGE int main (int argc, char *argv[]);
569 624
570 static void 625 static void
571 SDL_braino (void) 626 SDL_main_hack (SV *real_main_)
572 { 627 {
628 real_main = real_main_;
629
573 char *argv[] = { "deliantra client", 0 }; 630 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv); 631 (main) (1, argv);
575 } 632 }
576#else 633#else
577 static void 634 static void
578 SDL_braino (void) 635 SDL_main_hack (SV *real_main)
579 { 636 {
580 deliantra_main (); 637 deliantra_main (real_main);
581 } 638 }
582#endif 639#endif
583 640
584MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
585 642
786 843
787 const_iv (FOW_DARKNESS) 844 const_iv (FOW_DARKNESS)
788# undef const_iv 845# undef const_iv
789 }; 846 };
790 847
791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 848 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793 850
794 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796} 853}
797 854
812 869
813NV ceil (NV x) 870NV ceil (NV x)
814 871
815IV minpot (UV n) 872IV minpot (UV n)
816 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
817IV popcount (UV n) 880IV popcount (UV n)
881 CODE:
882 RETVAL = ecb_popcount32 (n);
883 OUTPUT:
884 RETVAL
885
886NV distance (NV dx, NV dy)
887 CODE:
888 RETVAL = pow (dx * dx + dy * dy, 0.5);
889 OUTPUT:
890 RETVAL
818 891
819void 892void
820pango_init () 893pango_init ()
821 CODE: 894 CODE:
822{ 895{
830#endif 903#endif
831} 904}
832 905
833char *SDL_GetError () 906char *SDL_GetError ()
834 907
835void SDL_braino () 908void SDL_main_hack (SV *real_main)
909 PROTOTYPE: &
836 910
837int SDL_Init (U32 flags) 911int SDL_Init (U32 flags)
838 912
839int SDL_InitSubSystem (U32 flags) 913int SDL_InitSubSystem (U32 flags)
840 914
841void SDL_QuitSubSystem (U32 flags) 915void SDL_QuitSubSystem (U32 flags)
842 916
843void SDL_Quit () 917void SDL_Quit ()
844 918
845int SDL_GL_SetAttribute (int attr, int value) 919int SDL_GL_SetAttribute (int attr, int value)
920 C_ARGS: (SDL_GLattr)attr, value
846 921
847int SDL_GL_GetAttribute (int attr) 922int SDL_GL_GetAttribute (int attr)
848 CODE: 923 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL)) 924 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
850 XSRETURN_UNDEF; 925 XSRETURN_UNDEF;
851 OUTPUT: 926 OUTPUT:
852 RETVAL 927 RETVAL
853 928
854void 929void
909 ); 984 );
910 985
911 if (RETVAL) 986 if (RETVAL)
912 { 987 {
913 av_clear (texture_av); 988 av_clear (texture_av);
914
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 989#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
917#include "glfunc.h" 990#include "glfunc.h"
918#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919 } 994 }
920} 995}
921 OUTPUT: 996 OUTPUT:
922 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
923 1001
924void 1002void
925SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
926 1004
927char * 1005char *
928SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
929 1008
930int 1009int
931SDL_GetAppState () 1010SDL_GetAppState ()
932 1011
933int 1012int
934SDL_GetModState () 1013SDL_GetModState ()
935 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
936void 1019void
1020SDL_PumpEvents ()
1021
1022void
937poll_events () 1023peep_events ()
938 PPCODE: 1024 PPCODE:
939{ 1025{
940 SDL_Event ev; 1026 SDL_Event ev;
941 1027
942 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
1008 1094
1009 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1095 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1010 } 1096 }
1011} 1097}
1012 1098
1099char *
1100SDL_AudioDriverName ()
1101 CODE:
1102{
1103 char buf [256];
1104 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1105 XSRETURN_UNDEF;
1106
1107 RETVAL = buf;
1108}
1109 OUTPUT:
1110 RETVAL
1111
1013int 1112int
1014Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1113Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1015 POSTCALL: 1114 POSTCALL:
1016 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
1017 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
1018 1117
1019void 1118void
1020Mix_QuerySpec () 1119Mix_QuerySpec ()
1079add_font (char *file) 1178add_font (char *file)
1080 CODE: 1179 CODE:
1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT: 1181 OUTPUT:
1083 RETVAL 1182 RETVAL
1183
1184void
1185IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1186
1187# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1188void
1189Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1084 1190
1085void 1191void
1086load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
1087 ALIAS: 1193 ALIAS:
1088 load_image_file = 1 1194 load_image_file = 1
1134 1240
1135 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
1136 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
1137 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
1138 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
1139 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1140 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1246 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1141 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1142 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1143 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
1144 1250
1204#if DEBUG 1310#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK; 1311 VALGRIND_DO_LEAK_CHECK;
1206#endif 1312#endif
1207} 1313}
1208 1314
1315int
1316SvREFCNT (SV *sv)
1317 CODE:
1318 RETVAL = SvREFCNT (sv);
1319 OUTPUT:
1320 RETVAL
1321
1209MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1210 1323
1211PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1212 1325
1213DC::Font 1326DC::Font
1214new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1215 CODE: 1328 CODE:
1216{ 1329{
1217 int count; 1330 int count;
1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1219 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1248 PROTOTYPE: 1361 PROTOTYPE:
1249 CODE: 1362 CODE:
1250 tc_restore (); 1363 tc_restore ();
1251 1364
1252DC::Layout 1365DC::Layout
1253new (SV *class) 1366new (SV *klass)
1254 CODE: 1367 CODE:
1255 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1256 1369
1257 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1258 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1259 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1260 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1261 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1262 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1263 RETVAL->font = 0; 1376 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
1265 1377
1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1267 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1268 OUTPUT: 1380 OUTPUT:
1269 RETVAL 1381 RETVAL
1270 1382
1271void 1383void
1272DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1273 CODE: 1385 CODE:
1274 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1275 rc_free (self->rc);
1276 Safefree (self); 1387 delete self;
1277 1388
1278void 1389void
1279set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1280 CODE: 1391 CODE:
1281{ 1392{
1407 1518
1408void 1519void
1409set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1410 CODE: 1521 CODE:
1411 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1412 { 1523 {
1413 self->base_height = base_height; 1524 self->base_height = base_height;
1414 layout_update_font (self); 1525 layout_update_font (self);
1415 } 1526 }
1416 1527
1417void 1528void
1535} 1646}
1536 1647
1537void 1648void
1538render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1539 CODE: 1650 CODE:
1540 rc_clear (self->rc); 1651 self->rc.clear ();
1541 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1542 self->pl, 1653 self->pl,
1543 self->rc, 1654 &self->rc,
1544 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1545 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1546 flags 1657 flags
1547 ); 1658 );
1548 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1559 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1560 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1561 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1562 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1563 1674
1564 rc_draw (self->rc); 1675 self->rc.draw ();
1565 1676
1566 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1567 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1568 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1569} 1680}
1644 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1645 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1646 } 1757 }
1647} 1758}
1648 1759
1760void
1761draw_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)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1649IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1650 CODE: 1882 CODE:
1651{ 1883{
1652 GLint width; 1884 GLint width;
1653 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1660MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1661 1893
1662PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1663 1895
1664DC::Map 1896DC::Map
1665new (SV *class) 1897new (SV *klass)
1666 CODE: 1898 CODE:
1667 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1668 RETVAL->x = 0; 1900 RETVAL->x = 0;
1669 RETVAL->y = 0; 1901 RETVAL->y = 0;
1670 RETVAL->w = 0; 1902 RETVAL->w = 0;
1671 RETVAL->h = 0; 1903 RETVAL->h = 0;
1672 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1709 1941
1710void 1942void
1711set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1712 CODE: 1944 CODE:
1713{ 1945{
1714 tileid texid; 1946 tileid texid;
1715 maptex *tex; 1947 maptex *tex;
1716 1948
1717 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1718 return; 1950 return;
1719 1951
1720 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1721 return; 1953 return;
1722 1954
1723 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1724 1956
1725 if (!texid) 1957 if (!texid)
1726 return; 1958 return;
1727 1959
1728 tex = self->tex + texid; 1960 tex = self->tex + texid;
1757 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1989 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1758 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1759 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761} 1993}
1994
1995void
1996expire_textures (DC::Map self, int texid, int count)
1997 PPCODE:
1998 for (; texid < self->texs && count; ++texid, --count)
1999 {
2000 maptex *tex = self->tex + texid;
2001
2002 if (tex->name)
2003 {
2004 if (tex->unused)
2005 {
2006 tex->name = 0;
2007 tex->unused = 0;
2008 XPUSHs (sv_2mortal (newSViv (texid)));
2009 }
2010 else
2011 tex->unused = 1;
2012 }
2013 }
1762 2014
1763int 2015int
1764ox (DC::Map self) 2016ox (DC::Map self)
1765 ALIAS: 2017 ALIAS:
1766 oy = 1 2018 oy = 1
1798 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1799 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1800 2052
1801 while (self->y < 0) 2053 while (self->y < 0)
1802 { 2054 {
1803 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1804 2056
1805 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1806 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1807 } 2059 }
1808} 2060}
1809 2061
1810SV * 2062SV *
1811map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1812 CODE: 2064 CODE:
1813{ 2065{
1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1815 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1816 mapcell *cell; 2068 mapcell *cell;
1837 2089
1838 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1839 2091
1840 if (flags & 8) 2092 if (flags & 8)
1841 { 2093 {
2094 uint8_t ext, cmd;
2095
1842 if (extmap) 2096 do
1843 { 2097 {
1844 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1845 2100
1846 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1847 { 2104 {
1848 ext = *data++;
1849 cmd = ext & 0x7f;
1850
1851 if (cmd < 4)
1852 cell->darkness = 255 - ext * 64 + 1;
1853 else if (cmd == 5) // health
1854 {
1855 cell->stat_width = 1; 2105 cell->stat_width = 1;
1856 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1857 }
1858 else if (cmd == 6) // monster width
1859 cell->stat_width = *data++ + 1;
1860 else if (cmd == 0x47)
1861 {
1862 if (*data == 1) cell->player = data [1];
1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1866
1867 data += *data + 1;
1868 }
1869 else if (cmd == 8) // cell flags
1870 cell->flags = *data++;
1871 else if (ext & 0x40) // unknown, multibyte => skip
1872 data += *data + 1;
1873 else
1874 data++;
1875 } 2107 }
1876 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1877 } 2125 }
1878 else 2126 while (ext & 0x80);
1879 cell->darkness = *data++ + 1;
1880 } 2127 }
1881 2128
1882 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1883 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1884 { 2131 {
1887 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1888 2135
1889 if (cell->tile [z]) 2136 if (cell->tile [z])
1890 { 2137 {
1891 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1892 if (!tex->name) 2140 if (!tex->name)
1893 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1894 2142
1895 if (tex->smoothtile) 2143 if (tex->smoothtile)
1896 { 2144 {
1897 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1898 if (!smooth->name) 2147 if (!smooth->name)
1899 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1900 } 2149 }
1901 } 2150 }
1902 } 2151 }
1930 ? self->row + y 2179 ? self->row + y
1931 : 0; 2180 : 0;
1932 2181
1933 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1934 { 2183 {
1935 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1936 2185
1937 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1938 { 2187 {
1939 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1940 2189
1942 { 2191 {
1943 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1944 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1945 int a1 = tex.a; 2194 int a1 = tex.a;
1946 2195
1947 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1948 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1949 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1950 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1951 } 2200 }
1952 } 2201 }
1953 2202
1954 *map++ = (r ) 2203 *map++ = (r )
1955 | (g << 8) 2204 | (g << 8)
1956 | (b << 16) 2205 | (b << 16)
1957 | (a << 24); 2206 | (a << 24);
1958 } 2207 }
1959 } 2208 }
1960 2209
1961 RETVAL = map_sv; 2210 RETVAL = map_sv;
1962} 2211}
1963 OUTPUT: 2212 OUTPUT:
1964 RETVAL 2213 RETVAL
1965 2214
1966void 2215void
1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1968 CODE: 2217 CODE:
1969{ 2218{
1970 int x, y, z; 2219 int x, y, z;
1971 2220
1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2221 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1975 smooth_key skey;
1976 int pl_x, pl_y; 2222 int pl_x, pl_y;
1977 maptex pl_tex; 2223 maptex pl_tex;
1978 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
1979 rc_key_t key; 2226 rc_key_t key;
1980 rc_array_t *arr; 2227 rc_t::array_t *arr;
1981 2228
1982 pl_tex.name = 0; 2229 pl_tex.name = 0;
1983 2230
1984 // thats current max. sorry. 2231 // that's current max. sorry.
1985 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
1986 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
1987
1988 // clear key, in case of extra padding
1989 memset (&skey, 0, sizeof (skey));
1990 2234
1991 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
1992 key.r = 255; 2236 key.r = 255;
1993 key.g = 255; 2237 key.g = 255;
1994 key.b = 255; 2238 key.b = 255;
1995 key.a = 255; 2239 key.a = 255;
1996 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
1997 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
1998 key.texname = -1;
1999 2242
2000 mx += self->x; 2243 mx += self->x;
2001 my += self->y; 2244 my += self->y;
2002 2245
2003 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
2004 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
2005 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
2006 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2007 2250
2008 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
2009 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
2010 { 2253 {
2011 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028 2271
2029 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
2030 { 2273 {
2031 memset (smooth_level, 0, sizeof (smooth_level)); 2274 std::bitset<256> smooth_level; // one bit for every possible smooth level
2275 smooth_key skey;
2276 smooth_hash smooth;
2277 key.texname = -1;
2032 2278
2033 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
2035 { 2281 {
2036 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
2042 tileid tile = cell->tile [z]; 2288 tileid tile = cell->tile [z];
2043 2289
2044 if (tile) 2290 if (tile)
2045 { 2291 {
2046 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
2047 int px = (x + 1) * T - tex.w; 2293 int px, py;
2048 int py = (y + 1) * T - tex.h;
2049 2294
2050 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
2051 { 2296 {
2297 self->tex [tile].unused = 0;
2298
2052 if (!tex.name) 2299 if (!tex.name)
2053 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054 2301
2055 key.texname = tex.name; 2302 key.texname = tex.name;
2056 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
2057 } 2304 }
2058 2305
2306 px = (x + 1) * Th - tex.w;
2307 py = (y + 1) * Tw - tex.h;
2308
2059 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2060 { 2310 {
2061 pl_x = px; 2311 pl_x = px;
2062 pl_y = py; 2312 pl_y = py;
2063 pl_tex = tex; 2313 pl_tex = tex;
2064 continue; 2314 continue;
2065 } 2315 }
2066 2316
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2319 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2071
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
2075 if (cell->flags & 1)
2076 {
2077 maptex tex = self->tex [1];
2078 int px = x * T + T * 2 / 32;
2079 int py = y * T - T * 6 / 32;
2080
2081 if (tex.name)
2082 {
2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093 }
2094 }
2095 }
2096 2321
2097 // update smooth hash 2322 // update smooth hash
2098 if (tex.smoothtile) 2323 if (tex.smoothtile)
2099 { 2324 {
2100 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2101 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2102 2327
2103 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2104 2329
2105 // add bits to current tile and all neighbours. skey.x|y is 2330 // add bits to current tile and all neighbours. skey.x|y is
2106 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2107 2332
2108 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
2116 2341
2117 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2118 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2119 2344
2120 // full tile 2345 // full tile
2121 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2346 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2122 2347
2123 // borders 2348 // borders
2124 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2349 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2125 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2350 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2126 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2351 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2127 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2352 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2128 2353
2129 // corners 2354 // corners
2130 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2355 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2131 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2356 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2132 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2357 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2133 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2358 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2359 }
2360 }
2361
2362 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2363 {
2364 // overlays such as the speech bubble, probably more to come
2365 if (cell->flags & 1)
2366 {
2367 rc_key_t key_ov = key;
2368 maptex tex = self->tex[TEXID_SPEECH];
2369 int px = x * Tw + Tw * 2 / 32;
2370 int py = y * Th - Th * 6 / 32;
2371
2372 key_ov.texname = tex.name;
2373 rc_t::array_t &arr = rc_ov.array (key_ov);
2374
2375 arr.t2f_v3f (0 , 0 , px , py , 0);
2376 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2377 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2378 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2134 } 2379 }
2135 } 2380 }
2136 } 2381 }
2137 } 2382 }
2138 2383
2139 rc_draw (rc); 2384 rc.draw ();
2140 rc_clear (rc); 2385 rc.clear ();
2141 2386
2142 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2143 // this is basically counting sort 2388 // this is basically counting sort
2144 { 2389 {
2145 int w, b; 2390 int w, b;
2146 2391
2147 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2149 for (w = 0; w < 256 / 32; ++w) 2394 for (int level = 0; level < smooth_level.size (); ++level)
2395 if (smooth_level[level])
2396 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2150 { 2397 {
2151 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2152 if (smask) 2399 IV bits = it->second;
2153 for (b = 0; b < 32; ++b) 2400
2154 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2155 { 2404 {
2156 int level = (w << 5) | b; 2405 maptex tex = self->tex [skey.tile];
2406 int px = (((int)skey.x) - 1) * Tw;
2407 int py = (((int)skey.y) - 1) * Th;
2408 int border = bits & 15;
2409 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2410 float dx = tex.s * .0625f; // 16 images/row
2411 float dy = tex.t * .5f ; // 2 images/column
2412
2157 HE *he; 2413 if (tex.name)
2158
2159 hv_iterinit (smooth);
2160 while ((he = hv_iternext (smooth)))
2161 { 2414 {
2162 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2163 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2164 2417 if (key.texname != tex.name)
2165 if (!(bits & 0x1000)
2166 && skey->level == level
2167 && level > smooth_max [skey->x][skey->y])
2168 { 2418 {
2169 maptex tex = self->tex [skey->tile]; 2419 self->tex [skey.tile].unused = 0;
2170 int px = (((int)skey->x) - 1) * T;
2171 int py = (((int)skey->y) - 1) * T;
2172 int border = bits & 15;
2173 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174 float dx = tex.s * .0625f; // 16 images/row
2175 float dy = tex.t * .5f ; // 2 images/column
2176 2420
2177 if (tex.name)
2178 {
2179 // this time avoiding texture state changes
2180 // save gobs of state changes.
2181 if (key.texname != tex.name)
2182 {
2183 glEnd (); 2421 glEnd ();
2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2186 } 2424 }
2187 2425
2188 if (border) 2426 if (border)
2189 { 2427 {
2190 float ox = border * dx; 2428 float ox = border * dx;
2191 2429
2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196 } 2434 }
2197 2435
2198 if (corner) 2436 if (corner)
2199 { 2437 {
2200 float ox = corner * dx; 2438 float ox = corner * dx;
2201 2439
2202 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206 }
2207 }
2208 } 2444 }
2209 } 2445 }
2210 } 2446 }
2211 } 2447 }
2212 2448
2213 glEnd (); 2449 glEnd ();
2214 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1; 2451 key.texname = -1;
2216 } 2452 }
2217
2218 hv_clear (smooth);
2219 } 2453 }
2220 2454
2221 if (pl_tex.name) 2455 if (pl_tex.name)
2222 { 2456 {
2223 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2224 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2225 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2226 2460
2227 key.texname = tex.name; 2461 key.texname = tex.name;
2228 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2229 2463
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2232 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2466 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2234 2468
2235 rc_draw (rc); 2469 rc.draw ();
2236 } 2470 }
2237 2471
2472 rc_ov.draw ();
2473 rc_ov.clear ();
2474
2238 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2239 rc_free (rc);
2240 2476
2241 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2242 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2243 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2244 { 2480 {
2247 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2248 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2249 { 2485 {
2250 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2251 2487
2252 int px = x * T; 2488 int px = x * Tw;
2253 int py = y * T; 2489 int py = y * Th;
2490
2491 if (ecb_expect_false (cell->player == player))
2492 {
2493 px += sdx;
2494 py += sdy;
2495 }
2254 2496
2255 if (cell->stat_hp) 2497 if (cell->stat_hp)
2256 { 2498 {
2257 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259 2501
2260 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2261 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2262 px + width - 1, py); 2504 px + width - 1, py);
2263 2505
2269 } 2511 }
2270 } 2512 }
2271} 2513}
2272 2514
2273void 2515void
2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2516draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2275 CODE: 2517 CODE:
2276{ 2518{
2277 static float color[16][3] = { 2519 static float color[16][3] = {
2278 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2279 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2280 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2281 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2282 2524
2283 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2284 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2285 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2286 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2287 2529
2288 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2289 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2290 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2291 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2292 2534
2293 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2294 2536
2295 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2296 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2297 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2298 }; 2540 };
2299 2541
2300 int x, y; 2542 int x, y;
2301 2543
2302 glEnable (GL_TEXTURE_2D); 2544 glEnable (GL_TEXTURE_2D);
2545 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2546 * but the nvidia driver (185.18.14) mishandles alpha textures
2547 * and takes the colour from god knows where instead of using
2548 * Cp. MODULATE results in the same colour, but slightly different
2549 * alpha, but atcually gives us the correct colour with nvidia.
2550 */
2303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2305 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2307 2555
2308 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
2312 2560
2313 if (m) 2561 if (m)
2314 { 2562 {
2315 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2316 2564
2317 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2318 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2319 2567
2320 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2321 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325 } 2573 }
2333void 2581void
2334fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2582fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2335 PPCODE: 2583 PPCODE:
2336{ 2584{
2337 int x, y; 2585 int x, y;
2338 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2339 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2340 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2341 int sw34 = (sw * 3 + 3) & ~3; 2589 int sw3 = sw * 3;
2590 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2591 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2345 2594
2346 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2347 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2348 2597
2349 mx += self->x - 1; 2598 mx += self->x - 1;
2350 my += self->y - 1; 2599 my += self->y - 1;
2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353 2600
2354 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2355 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2356 { 2603 {
2357 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2360 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2361 { 2608 {
2362 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2363 2610
2364 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2365 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367 } 2614 }
2368 } 2615 }
2369 2616
2370 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2371 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2390 2637
2391 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2392 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2393 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2394 2641
2395 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404 } 2651 }
2405 2652
2406 free (darkness1); 2653 free (darkness1);
2407 2654
2408 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2409 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2410 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2411 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2412} 2659}
2413 2660
2414SV * 2661SV *
2477 else 2724 else
2478 *data++ = 0; 2725 *data++ = 0;
2479 } 2726 }
2480 } 2727 }
2481 2728
2482 /* if size is w*h + 5 then no data has been found */ 2729 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2730 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 { 2731 {
2485 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 } 2734 }
2488 2735
2489 RETVAL = data_sv; 2736 RETVAL = data_sv;
2490} 2737}
2491 OUTPUT: 2738 OUTPUT:
2492 RETVAL 2739 RETVAL
2493 2740
2494void 2741void
2501 STRLEN len; 2748 STRLEN len;
2502 uint8_t *data, *end; 2749 uint8_t *data, *end;
2503 2750
2504 len = SvLEN (data_sv); 2751 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2752 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv); 2753 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2507 end = data + len + 8; 2754 end = data + len + 8;
2508 2755
2509 if (len < 5) 2756 if (len < 5)
2510 XSRETURN_EMPTY; 2757 XSRETURN_EMPTY;
2511 2758
2572} 2819}
2573 2820
2574MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2575 2822
2576DC::RW 2823DC::RW
2577new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2578 CODE: 2825 CODE:
2579{ 2826{
2580 STRLEN datalen; 2827 STRLEN datalen;
2581 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2582 2829
2584} 2831}
2585 OUTPUT: 2832 OUTPUT:
2586 RETVAL 2833 RETVAL
2587 2834
2588DC::RW 2835DC::RW
2589new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2590 CODE: 2837 CODE:
2591 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2592 OUTPUT: 2839 OUTPUT:
2593 RETVAL 2840 RETVAL
2594 2841
2612 if (RETVAL < 0) 2859 if (RETVAL < 0)
2613 { 2860 {
2614 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2615 2862
2616 if (RETVAL < 0) 2863 if (RETVAL < 0)
2864 {
2865 // happens sometimes, maybe it just stopped playing(?)
2866 RETVAL = Mix_GroupAvailable (-1);
2867
2868 if (RETVAL < 0)
2617 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2618 2870 }
2871 else
2619 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2620 } 2873 }
2621 2874
2622 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2624} 2877}
2671void 2924void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE: 2926 CODE:
2674{ 2927{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2928 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2929 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678} 2931}
2679 2932
2680void 2933void
2681set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2684 2937
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686 2939
2687PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2688 2941
2942void
2943decoders ()
2944 PPCODE:
2945#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2946 int i, num = Mix_GetNumChunkDecoders ();
2947 EXTEND (SP, num);
2948 for (i = 0; i < num; ++i)
2949 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2950#else
2951 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2952#endif
2953
2689DC::MixChunk 2954DC::MixChunk
2690new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2691 CODE: 2956 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2693 OUTPUT: 2958 OUTPUT:
2694 RETVAL 2959 RETVAL
2695 2960
2725 OUTPUT: 2990 OUTPUT:
2726 RETVAL 2991 RETVAL
2727 2992
2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729 2994
2995void
2996decoders ()
2997 PPCODE:
2998#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2999 int i, num = Mix_GetNumMusicDecoders ();
3000 EXTEND (SP, num);
3001 for (i = 0; i < num; ++i)
3002 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3003#else
3004 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3005#endif
3006
2730int 3007int
2731volume (int volume = -1) 3008volume (int volume = -1)
2732 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2733 CODE: 3010 CODE:
2734 if (items > 0) 3011 if (items > 0)
2745void 3022void
2746halt () 3023halt ()
2747 CODE: 3024 CODE:
2748 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2749 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2750DC::MixMusic 3034DC::MixMusic
2751new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2752 CODE: 3036 CODE:
2753 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2754 OUTPUT: 3038 OUTPUT:
2755 RETVAL 3039 RETVAL
2756 3040
2784 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2785# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2786 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2787 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2788 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2789 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2790 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2791 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2792 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2793 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
2805 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2806 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2807 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2808 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809 const_iv (GL_ONE_MINUS_DST_ALPHA), 3094 const_iv (GL_ONE_MINUS_DST_ALPHA),
3095 const_iv (GL_SRC_COLOR),
3096 const_iv (GL_DST_COLOR),
3097 const_iv (GL_ONE_MINUS_SRC_COLOR),
3098 const_iv (GL_ONE_MINUS_DST_COLOR),
2810 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2811 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2812 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2813 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2814 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
2882 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2883 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2884 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2885 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2886 const_iv (GL_T2F_N3F_V3F), 3175 const_iv (GL_T2F_N3F_V3F),
3176 const_iv (GL_FUNC_ADD),
3177 const_iv (GL_FUNC_SUBTRACT),
3178 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2887# undef const_iv 3179# undef const_iv
2888 }; 3180 };
2889 3181
2890 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3182 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892 3184
2893 texture_av = newAV (); 3185 texture_av = newAV ();
2894 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2895} 3187}
2896 3188
2898disable_GL_EXT_blend_func_separate () 3190disable_GL_EXT_blend_func_separate ()
2899 CODE: 3191 CODE:
2900 gl.BlendFuncSeparate = 0; 3192 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
2902 3194
2903char * 3195void
3196apple_nvidia_bug (int enable)
3197
3198const char *
2904gl_vendor () 3199gl_vendor ()
2905 CODE: 3200 CODE:
2906 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2907 OUTPUT: 3202 OUTPUT:
2908 RETVAL 3203 RETVAL
2909 3204
2910char * 3205const char *
2911gl_version () 3206gl_version ()
2912 CODE: 3207 CODE:
2913 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2914 OUTPUT: 3209 OUTPUT:
2915 RETVAL 3210 RETVAL
2916 3211
2917char * 3212const char *
2918gl_extensions () 3213gl_extensions ()
2919 CODE: 3214 CODE:
2920 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2921 OUTPUT: 3216 OUTPUT:
2922 RETVAL 3217 RETVAL
2923 3218
2924const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2925 3224
2926GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2927 CODE: 3226 CODE:
2928 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2929 OUTPUT: 3228 OUTPUT:
2937 3236
2938int glGetError () 3237int glGetError ()
2939 3238
2940void glFinish () 3239void glFinish ()
2941 3240
3241void glFlush ()
3242
2942void glClear (int mask) 3243void glClear (int mask)
2943 3244
2944void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2945 PROTOTYPE: @ 3246 PROTOTYPE: @
2946 3247
2955void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2956 3257
2957void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958 CODE: 3259 CODE:
2959 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
2960 3263
2961void glDepthMask (int flag) 3264void glDepthMask (int flag)
2962 3265
2963void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
2964 3267
2999void glRotate (float angle, float x, float y, float z) 3302void glRotate (float angle, float x, float y, float z)
3000 CODE: 3303 CODE:
3001 glRotatef (angle, x, y, z); 3304 glRotatef (angle, x, y, z);
3002 3305
3003void glColor (float r, float g, float b, float a = 1.0) 3306void glColor (float r, float g, float b, float a = 1.0)
3307 PROTOTYPE: @
3004 ALIAS: 3308 ALIAS:
3005 glColor_premultiply = 1 3309 glColor_premultiply = 1
3006 CODE: 3310 CODE:
3007 if (ix) 3311 if (ix)
3008 { 3312 {
3114 3418
3115void glEndList () 3419void glEndList ()
3116 3420
3117void glCallList (int list) 3421void glCallList (int list)
3118 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120 3429
3121PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
3122 3431
3123void 3432void
3124find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
3125 PPCODE: 3434 PPCODE:
3126{ 3435{
3127 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
3128 XPUSHs (self); 3437 XPUSHs (self);
3129} 3438}
3130 3439
3131BOOT: 3440BOOT:
3132{ 3441{
3140 3449
3141void 3450void
3142draw (SV *self) 3451draw (SV *self)
3143 CODE: 3452 CODE:
3144{ 3453{
3145 HV *hv; 3454 HV *hv;
3146 SV **svp; 3455 SV **svp;
3147 NV x, y, w, h; 3456 NV x, y, w, h;
3148 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
3149 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
3150 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
3151 SV *draw_h_sv = GvSV (draw_h_gv); 3460 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines