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.277 by root, Mon Sep 1 06:18:09 2008 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines