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.331 by root, Mon Nov 19 00:10:34 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines