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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines