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.278 by root, Wed Sep 3 10:36:25 2008 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
70# include <netinet/in.h> 76# include <netinet/in.h>
71# include <netinet/tcp.h> 77# include <netinet/tcp.h>
72# include <inttypes.h> 78# include <inttypes.h>
73#endif 79#endif
74 80
75#if __GNUC__ >= 4 81#include "ecb.h"
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83 82
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
87 89
88#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
90 92
91#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
92 94
93/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
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/******************************************************************************/
544 590
545 return mod; 591 return mod;
546} 592}
547 593
548static void 594static void
549deliantra_main () 595deliantra_main (SV *real_main)
550{ 596{
551 char *argv[] = { 0 }; 597 dSP;
552 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
553} 601}
554 602
555#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
556 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main() 607 * 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, 608 * 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, 609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
561 */ 611 */
562 extern C_LINKAGE int 612 extern C_LINKAGE int
563 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
564 { 614 {
565 deliantra_main (); 615 deliantra_main (real_main);
566 } 616 }
567 617
568 #undef main 618 #undef main
569 619
570 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
571 621
572 static void 622 static void
573 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
574 { 624 {
625 real_main = real_main_;
626
575 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv); 628 (main) (1, argv);
577 } 629 }
578#else 630#else
579 static void 631 static void
580 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
581 { 633 {
582 deliantra_main (); 634 deliantra_main (real_main);
583 } 635 }
584#endif 636#endif
585 637
586MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
587 639
788 840
789 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
790# undef const_iv 842# undef const_iv
791 }; 843 };
792 844
793 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--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795 847
796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798} 850}
799 851
814 866
815NV ceil (NV x) 867NV ceil (NV x)
816 868
817IV minpot (UV n) 869IV minpot (UV n)
818 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
819IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
882
883NV distance (NV dx, NV dy)
884 CODE:
885 RETVAL = pow (dx * dx + dy * dy, 0.5);
886 OUTPUT:
887 RETVAL
820 888
821void 889void
822pango_init () 890pango_init ()
823 CODE: 891 CODE:
824{ 892{
832#endif 900#endif
833} 901}
834 902
835char *SDL_GetError () 903char *SDL_GetError ()
836 904
837void SDL_braino () 905void SDL_main_hack (SV *real_main)
906 PROTOTYPE: &
838 907
839int SDL_Init (U32 flags) 908int SDL_Init (U32 flags)
840 909
841int SDL_InitSubSystem (U32 flags) 910int SDL_InitSubSystem (U32 flags)
842 911
843void SDL_QuitSubSystem (U32 flags) 912void SDL_QuitSubSystem (U32 flags)
844 913
845void SDL_Quit () 914void SDL_Quit ()
846 915
847int SDL_GL_SetAttribute (int attr, int value) 916int SDL_GL_SetAttribute (int attr, int value)
917 C_ARGS: (SDL_GLattr)attr, value
848 918
849int SDL_GL_GetAttribute (int attr) 919int SDL_GL_GetAttribute (int attr)
850 CODE: 920 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL)) 921 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
852 XSRETURN_UNDEF; 922 XSRETURN_UNDEF;
853 OUTPUT: 923 OUTPUT:
854 RETVAL 924 RETVAL
855 925
856void 926void
911 ); 981 );
912 982
913 if (RETVAL) 983 if (RETVAL)
914 { 984 {
915 av_clear (texture_av); 985 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); 986#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
919#include "glfunc.h" 987#include "glfunc.h"
920#undef GL_FUNC 988#undef GL_FUNC
989 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
990 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921 } 991 }
922} 992}
923 OUTPUT: 993 OUTPUT:
924 RETVAL 994 RETVAL
995
996void
997SDL_WM_SetCaption (const char *title, const char *icon)
925 998
926void 999void
927SDL_GL_SwapBuffers () 1000SDL_GL_SwapBuffers ()
928 1001
929char * 1002char *
930SDL_GetKeyName (int sym) 1003SDL_GetKeyName (int sym)
1004 C_ARGS: (SDLKey)sym
931 1005
932int 1006int
933SDL_GetAppState () 1007SDL_GetAppState ()
934 1008
935int 1009int
936SDL_GetModState () 1010SDL_GetModState ()
937 1011
1012int
1013SDL_WaitEvent ()
1014 C_ARGS: 0
1015
938void 1016void
1017SDL_PumpEvents ()
1018
1019void
939poll_events () 1020peep_events ()
940 PPCODE: 1021 PPCODE:
941{ 1022{
942 SDL_Event ev; 1023 SDL_Event ev;
943 1024
944 SDL_PumpEvents (); 1025 SDL_PumpEvents ();
1010 1091
1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1092 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1012 } 1093 }
1013} 1094}
1014 1095
1096char *
1097SDL_AudioDriverName ()
1098 CODE:
1099{
1100 char buf [256];
1101 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1102 XSRETURN_UNDEF;
1103
1104 RETVAL = buf;
1105}
1106 OUTPUT:
1107 RETVAL
1108
1015int 1109int
1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1110Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1017 POSTCALL: 1111 POSTCALL:
1018 Mix_HookMusicFinished (music_finished); 1112 Mix_HookMusicFinished (music_finished);
1019 Mix_ChannelFinished (channel_finished); 1113 Mix_ChannelFinished (channel_finished);
1020 1114
1021void 1115void
1022Mix_QuerySpec () 1116Mix_QuerySpec ()
1081add_font (char *file) 1175add_font (char *file)
1082 CODE: 1176 CODE:
1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1177 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT: 1178 OUTPUT:
1085 RETVAL 1179 RETVAL
1180
1181void
1182IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1183
1184# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1185void
1186Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1086 1187
1087void 1188void
1088load_image_inline (SV *image_) 1189load_image_inline (SV *image_)
1089 ALIAS: 1190 ALIAS:
1090 load_image_file = 1 1191 load_image_file = 1
1136 1237
1137 SDL_LockSurface (surface2); 1238 SDL_LockSurface (surface2);
1138 EXTEND (SP, 6); 1239 EXTEND (SP, 6);
1139 PUSHs (sv_2mortal (newSViv (surface2->w))); 1240 PUSHs (sv_2mortal (newSViv (surface2->w)));
1140 PUSHs (sv_2mortal (newSViv (surface2->h))); 1241 PUSHs (sv_2mortal (newSViv (surface2->h)));
1141 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1242 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))); 1243 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1143 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1244 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1144 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1245 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1145 SDL_UnlockSurface (surface2); 1246 SDL_UnlockSurface (surface2);
1146 1247
1206#if DEBUG 1307#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1308 VALGRIND_DO_LEAK_CHECK;
1208#endif 1309#endif
1209} 1310}
1210 1311
1312int
1313SvREFCNT (SV *sv)
1314 CODE:
1315 RETVAL = SvREFCNT (sv);
1316 OUTPUT:
1317 RETVAL
1318
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1319MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1320
1213PROTOTYPES: DISABLE 1321PROTOTYPES: DISABLE
1214 1322
1215DC::Font 1323DC::Font
1216new_from_file (SV *class, char *path, int id = 0) 1324new_from_file (SV *klass, char *path, int id = 0)
1217 CODE: 1325 CODE:
1218{ 1326{
1219 int count; 1327 int count;
1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1328 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1221 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1329 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1250 PROTOTYPE: 1358 PROTOTYPE:
1251 CODE: 1359 CODE:
1252 tc_restore (); 1360 tc_restore ();
1253 1361
1254DC::Layout 1362DC::Layout
1255new (SV *class) 1363new (SV *klass)
1256 CODE: 1364 CODE:
1257 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1258 1366
1259 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1260 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1261 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1262 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1263 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1264 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1265 RETVAL->font = 0; 1373 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
1267 1374
1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1269 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1270 OUTPUT: 1377 OUTPUT:
1271 RETVAL 1378 RETVAL
1272 1379
1273void 1380void
1274DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1275 CODE: 1382 CODE:
1276 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1277 rc_free (self->rc);
1278 Safefree (self); 1384 delete self;
1279 1385
1280void 1386void
1281set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1282 CODE: 1388 CODE:
1283{ 1389{
1409 1515
1410void 1516void
1411set_height (DC::Layout self, int base_height) 1517set_height (DC::Layout self, int base_height)
1412 CODE: 1518 CODE:
1413 if (self->base_height != base_height) 1519 if (self->base_height != base_height)
1414 { 1520 {
1415 self->base_height = base_height; 1521 self->base_height = base_height;
1416 layout_update_font (self); 1522 layout_update_font (self);
1417 } 1523 }
1418 1524
1419void 1525void
1537} 1643}
1538 1644
1539void 1645void
1540render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1541 CODE: 1647 CODE:
1542 rc_clear (self->rc); 1648 self->rc.clear ();
1543 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1544 self->pl, 1650 self->pl,
1545 self->rc, 1651 &self->rc,
1546 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1547 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1548 flags 1654 flags
1549 ); 1655 );
1550 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1565 1671
1566 rc_draw (self->rc); 1672 self->rc.draw ();
1567 1673
1568 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1571} 1677}
1646 glDisable (GL_ALPHA_TEST); 1752 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1753 glDisable (GL_BLEND);
1648 } 1754 }
1649} 1755}
1650 1756
1757void
1758draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1759 PROTOTYPE: @
1760 CODE:
1761{
1762 glEnable (GL_BLEND);
1763 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1764 glEnable (GL_TEXTURE_2D);
1765 glBindTexture (GL_TEXTURE_2D, name1);
1766
1767 glColor3f (intensity, intensity, intensity);
1768 glPushMatrix ();
1769 glScalef (1./3, 1./3, 1.);
1770
1771 if (blend > 0.f)
1772 {
1773 float dx3 = dx * -3.f / w;
1774 float dy3 = dy * -3.f / h;
1775 GLfloat env_color[4] = { 0., 0., 0., blend };
1776
1777 /* interpolate the two shadow textures */
1778 /* stage 0 == rgb(glcolor) + alpha(t0) */
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1780
1781 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1782 gl.ActiveTexture (GL_TEXTURE1);
1783 glEnable (GL_TEXTURE_2D);
1784 glBindTexture (GL_TEXTURE_2D, name2);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1786
1787 /* rgb == rgb(glcolor) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1789 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1791
1792 /* alpha = interpolate t0, t1 by env_alpha */
1793 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1794
1795 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1798
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1804
1805 glBegin (GL_QUADS);
1806 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1810 glEnd ();
1811
1812 glDisable (GL_TEXTURE_2D);
1813 gl.ActiveTexture (GL_TEXTURE0);
1814 }
1815 else
1816 {
1817 /* simple blending of one texture, also opengl <1.3 path */
1818 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1819
1820 glBegin (GL_QUADS);
1821 glTexCoord2f (0, 0); glVertex2f (0, 0);
1822 glTexCoord2f (0, t); glVertex2f (0, h);
1823 glTexCoord2f (s, t); glVertex2f (w, h);
1824 glTexCoord2f (s, 0); glVertex2f (w, 0);
1825 glEnd ();
1826 }
1827
1828 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1829 {
1830 int x, y;
1831 int dx3 = dx * 3;
1832 int dy3 = dy * 3;
1833
1834 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1835 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1836 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1837 glTranslatef (-1., -1., 0);
1838 glBegin (GL_QUADS);
1839
1840 for (y = 1; y < h; y += 3)
1841 {
1842 int y1 = y - dy3;
1843 int y1valid = y1 >= 0 && y1 < h;
1844
1845 for (x = 1; x < w; x += 3)
1846 {
1847 int x1 = x - dx3;
1848 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1849 uint8_t h2;
1850
1851 if (y1valid && x1 >= 0 && x1 < w)
1852 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1853 else
1854 h2 = 1; /* out of range == invisible */
1855
1856 if (h1 || h2)
1857 {
1858 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1859 glColor4f (1., 1., 1., alpha);
1860
1861 glTexCoord2f (0, 0.); glVertex2i (x , y );
1862 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1863 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1864 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1865 }
1866 }
1867 }
1868 }
1869
1870 glEnd ();
1871
1872 glPopMatrix ();
1873
1874 glDisable (GL_TEXTURE_2D);
1875 glDisable (GL_BLEND);
1876}
1877
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1878IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1879 CODE:
1653{ 1880{
1654 GLint width; 1881 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1882 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1662MODULE = Deliantra::Client PACKAGE = DC::Map 1889MODULE = Deliantra::Client PACKAGE = DC::Map
1663 1890
1664PROTOTYPES: DISABLE 1891PROTOTYPES: DISABLE
1665 1892
1666DC::Map 1893DC::Map
1667new (SV *class) 1894new (SV *klass)
1668 CODE: 1895 CODE:
1669 New (0, RETVAL, 1, struct map); 1896 New (0, RETVAL, 1, mapgrid);
1670 RETVAL->x = 0; 1897 RETVAL->x = 0;
1671 RETVAL->y = 0; 1898 RETVAL->y = 0;
1672 RETVAL->w = 0; 1899 RETVAL->w = 0;
1673 RETVAL->h = 0; 1900 RETVAL->h = 0;
1674 RETVAL->ox = 0; 1901 RETVAL->ox = 0;
1711 1938
1712void 1939void
1713set_smooth (DC::Map self, int face, int smooth, int level) 1940set_smooth (DC::Map self, int face, int smooth, int level)
1714 CODE: 1941 CODE:
1715{ 1942{
1716 tileid texid; 1943 tileid texid;
1717 maptex *tex; 1944 maptex *tex;
1718 1945
1719 if (face < 0 || face >= self->faces) 1946 if (face < 0 || face >= self->faces)
1720 return; 1947 return;
1721 1948
1722 if (smooth < 0 || smooth >= self->faces) 1949 if (smooth < 0 || smooth >= self->faces)
1723 return; 1950 return;
1724 1951
1725 texid = self->face2tile [face]; 1952 texid = self->face2tile [face];
1726 1953
1727 if (!texid) 1954 if (!texid)
1728 return; 1955 return;
1729 1956
1730 tex = self->tex + texid; 1957 tex = self->tex + texid;
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1986 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1987 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1988 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1989 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1990}
1991
1992void
1993expire_textures (DC::Map self, int texid, int count)
1994 PPCODE:
1995 for (; texid < self->texs && count; ++texid, --count)
1996 {
1997 maptex *tex = self->tex + texid;
1998
1999 if (tex->name)
2000 {
2001 if (tex->unused)
2002 {
2003 tex->name = 0;
2004 tex->unused = 0;
2005 XPUSHs (sv_2mortal (newSViv (texid)));
2006 }
2007 else
2008 tex->unused = 1;
2009 }
2010 }
1764 2011
1765int 2012int
1766ox (DC::Map self) 2013ox (DC::Map self)
1767 ALIAS: 2014 ALIAS:
1768 oy = 1 2015 oy = 1
1800 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
1801 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
1802 2049
1803 while (self->y < 0) 2050 while (self->y < 0)
1804 { 2051 {
1805 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
1806 2053
1807 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
1808 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
1809 } 2056 }
1810} 2057}
1811 2058
1812SV * 2059SV *
1813map1a_update (DC::Map self, SV *data_, int extmap) 2060map1a_update (DC::Map self, SV *data_)
1814 CODE: 2061 CODE:
1815{ 2062{
1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2063 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1817 uint8_t *data_end = (uint8_t *)SvEND (data_); 2064 uint8_t *data_end = (uint8_t *)SvEND (data_);
1818 mapcell *cell; 2065 mapcell *cell;
1839 2086
1840 //TODO: don't trust server data to be in-range(!) 2087 //TODO: don't trust server data to be in-range(!)
1841 2088
1842 if (flags & 8) 2089 if (flags & 8)
1843 { 2090 {
2091 uint8_t ext, cmd;
2092
1844 if (extmap) 2093 do
1845 { 2094 {
1846 uint8_t ext, cmd; 2095 ext = *data++;
2096 cmd = ext & 0x7f;
1847 2097
1848 do 2098 if (cmd < 4)
2099 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2100 else if (cmd == 5) // health
1849 { 2101 {
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; 2102 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2103 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 } 2104 }
1878 while (ext & 0x80); 2105 else if (cmd == 6) // monster width
2106 cell->stat_width = *data++ + 1;
2107 else if (cmd == 0x47)
2108 {
2109 if (*data == 1) cell->player = data [1];
2110 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2111 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2112 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2113
2114 data += *data + 1;
2115 }
2116 else if (cmd == 8) // cell flags
2117 cell->flags = *data++;
2118 else if (ext & 0x40) // unknown, multibyte => skip
2119 data += *data + 1;
2120 else
2121 data++;
1879 } 2122 }
1880 else 2123 while (ext & 0x80);
1881 cell->darkness = *data++ + 1;
1882 } 2124 }
1883 2125
1884 for (z = 0; z <= 2; ++z) 2126 for (z = 0; z <= 2; ++z)
1885 if (flags & (4 >> z)) 2127 if (flags & (4 >> z))
1886 { 2128 {
1889 cell->tile [z] = self->face2tile [face]; 2131 cell->tile [z] = self->face2tile [face];
1890 2132
1891 if (cell->tile [z]) 2133 if (cell->tile [z])
1892 { 2134 {
1893 maptex *tex = self->tex + cell->tile [z]; 2135 maptex *tex = self->tex + cell->tile [z];
2136 tex->unused = 0;
1894 if (!tex->name) 2137 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2138 av_push (missing, newSViv (cell->tile [z]));
1896 2139
1897 if (tex->smoothtile) 2140 if (tex->smoothtile)
1898 { 2141 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2142 maptex *smooth = self->tex + tex->smoothtile;
2143 smooth->unused = 0;
1900 if (!smooth->name) 2144 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2145 av_push (missing, newSViv (tex->smoothtile));
1902 } 2146 }
1903 } 2147 }
1904 } 2148 }
1932 ? self->row + y 2176 ? self->row + y
1933 : 0; 2177 : 0;
1934 2178
1935 for (x = x0; x < x1; x++) 2179 for (x = x0; x < x1; x++)
1936 { 2180 {
1937 int r = 32, g = 32, b = 32, a = 192; 2181 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2182
1939 if (row && row->c0 <= x && x < row->c1) 2183 if (row && row->c0 <= x && x < row->c1)
1940 { 2184 {
1941 mapcell *cell = row->col + (x - row->c0); 2185 mapcell *cell = row->col + (x - row->c0);
1942 2186
1944 { 2188 {
1945 maptex tex = self->tex [cell->tile [z]]; 2189 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2190 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2191 int a1 = tex.a;
1948 2192
1949 r = (r * a0 + tex.r * a1) / 255; 2193 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2194 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2195 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2196 a = div255 (a * a0 + tex.a * a1);
1953 } 2197 }
1954 } 2198 }
1955 2199
1956 *map++ = (r ) 2200 *map++ = (r )
1957 | (g << 8) 2201 | (g << 8)
1958 | (b << 16) 2202 | (b << 16)
1959 | (a << 24); 2203 | (a << 24);
1960 } 2204 }
1961 } 2205 }
1962 2206
1963 RETVAL = map_sv; 2207 RETVAL = map_sv;
1964} 2208}
1965 OUTPUT: 2209 OUTPUT:
1966 RETVAL 2210 RETVAL
1967 2211
1968void 2212void
1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2213draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1970 CODE: 2214 CODE:
1971{ 2215{
1972 int x, y, z; 2216 int x, y, z;
1973 2217
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) 2218 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; 2219 int pl_x, pl_y;
1979 maptex pl_tex; 2220 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2222 rc_t rc_ov;
1981 rc_key_t key; 2223 rc_key_t key;
1982 rc_array_t *arr; 2224 rc_t::array_t *arr;
1983 2225
1984 pl_tex.name = 0; 2226 pl_tex.name = 0;
1985 2227
1986 // thats current max. sorry. 2228 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2230 if (sh > 255) sh = 255;
1989
1990 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey));
1992 2231
1993 memset (&key, 0, sizeof (key)); 2232 memset (&key, 0, sizeof (key));
1994 key.r = 255; 2233 key.r = 255;
1995 key.g = 255; 2234 key.g = 255;
1996 key.b = 255; 2235 key.b = 255;
1997 key.a = 255; 2236 key.a = 255;
1998 key.mode = GL_QUADS; 2237 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2238 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2239
2002 mx += self->x; 2240 mx += self->x;
2003 my += self->y; 2241 my += self->y;
2004 2242
2005 // first pass: determine smooth_max 2243 // first pass: determine smooth_max
2006 // rather ugly, if you ask me 2244 // rather ugly, if you ask me
2007 // could also be stored inside mapcell and updated on change 2245 // could also be stored inside mapcell and updated on change
2008 memset (smooth_max, 0, sizeof (smooth_max)); 2246 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2009 2247
2010 for (y = 0; y < sh; y++) 2248 for (y = 0; y < sh; y++)
2011 if (0 <= y + my && y + my < self->rows) 2249 if (0 <= y + my && y + my < self->rows)
2012 { 2250 {
2013 maprow *row = self->row + (y + my); 2251 maprow *row = self->row + (y + my);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2268
2031 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
2032 { 2270 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2272 smooth_key skey;
2273 smooth_hash smooth;
2274 key.texname = -1;
2034 2275
2035 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
2037 { 2278 {
2038 maprow *row = self->row + (y + my); 2279 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2285 tileid tile = cell->tile [z];
2045 2286
2046 if (tile) 2287 if (tile)
2047 { 2288 {
2048 maptex tex = self->tex [tile]; 2289 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2290 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2291
2052 if (key.texname != tex.name) 2292 if (key.texname != tex.name)
2053 { 2293 {
2294 self->tex [tile].unused = 0;
2295
2054 if (!tex.name) 2296 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2298
2057 key.texname = tex.name; 2299 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
2059 } 2301 }
2060 2302
2303 px = (x + 1) * Th - tex.w;
2304 py = (y + 1) * Tw - tex.h;
2305
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2062 { 2307 {
2063 pl_x = px; 2308 pl_x = px;
2064 pl_y = py; 2309 pl_y = py;
2065 pl_tex = tex; 2310 pl_tex = tex;
2066 continue; 2311 continue;
2067 } 2312 }
2068 2313
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 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); 2316 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); 2317 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 2318
2099 // update smooth hash 2319 // update smooth hash
2100 if (tex.smoothtile) 2320 if (tex.smoothtile)
2101 { 2321 {
2102 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
2104 2324
2105 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
2106 2326
2107 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
2108 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
2109 2329
2110 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
2118 2338
2119 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2339 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2120 // ·· ·· ·┏ ┓· 2340 // ·· ·· ·┏ ┓·
2121 2341
2122 // full tile 2342 // full tile
2123 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2343 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2124 2344
2125 // borders 2345 // borders
2126 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2346 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2127 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2347 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2128 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2348 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2129 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2349 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2130 2350
2131 // corners 2351 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2352 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2133 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2353 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2134 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2135 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2356 }
2357 }
2358
2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2360 {
2361 // overlays such as the speech bubble, probably more to come
2362 if (cell->flags & 1)
2363 {
2364 rc_key_t key_ov = key;
2365 maptex tex = self->tex[TEXID_SPEECH];
2366 int px = x * Tw + Tw * 2 / 32;
2367 int py = y * Th - Th * 6 / 32;
2368
2369 key_ov.texname = tex.name;
2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2371
2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2136 } 2376 }
2137 } 2377 }
2138 } 2378 }
2139 } 2379 }
2140 2380
2141 rc_draw (rc); 2381 rc.draw ();
2142 rc_clear (rc); 2382 rc.clear ();
2143 2383
2144 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2145 // this is basically counting sort 2385 // this is basically counting sort
2146 { 2386 {
2147 int w, b; 2387 int w, b;
2148 2388
2149 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2151 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2152 { 2394 {
2153 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2154 if (smask) 2396 IV bits = it->second;
2155 for (b = 0; b < 32; ++b) 2397
2156 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2157 { 2401 {
2158 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2159 HE *he; 2410 if (tex.name)
2160
2161 hv_iterinit (smooth);
2162 while ((he = hv_iternext (smooth)))
2163 { 2411 {
2164 smooth_key *skey = (smooth_key *)HeKEY (he); 2412 // this time avoiding texture state changes
2165 IV bits = SvIVX (HeVAL (he)); 2413 // save gobs of state changes.
2166 2414 if (key.texname != tex.name)
2167 if (!(bits & 0x1000)
2168 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y])
2170 { 2415 {
2171 maptex tex = self->tex [skey->tile]; 2416 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 2417
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 (); 2418 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2188 } 2421 }
2189 2422
2190 if (border) 2423 if (border)
2191 { 2424 {
2192 float ox = border * dx; 2425 float ox = border * dx;
2193 2426
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2431 }
2199 2432
2200 if (corner) 2433 if (corner)
2201 { 2434 {
2202 float ox = corner * dx; 2435 float ox = corner * dx;
2203 2436
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 }
2209 }
2210 } 2441 }
2211 } 2442 }
2212 } 2443 }
2213 } 2444 }
2214 2445
2215 glEnd (); 2446 glEnd ();
2216 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1; 2448 key.texname = -1;
2218 } 2449 }
2219
2220 hv_clear (smooth);
2221 } 2450 }
2222 2451
2223 if (pl_tex.name) 2452 if (pl_tex.name)
2224 { 2453 {
2225 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2226 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2227 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2228 2457
2229 key.texname = tex.name; 2458 key.texname = tex.name;
2230 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2231 2460
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 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); 2463 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); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2236 2465
2237 rc_draw (rc); 2466 rc.draw ();
2238 } 2467 }
2239 2468
2469 rc_ov.draw ();
2470 rc_ov.clear ();
2471
2240 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2241 rc_free (rc);
2242 2473
2243 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2246 { 2477 {
2249 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2482 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2253 2484
2254 int px = x * T; 2485 int px = x * Tw;
2255 int py = y * T; 2486 int py = y * Th;
2487
2488 if (ecb_expect_false (cell->player == player))
2489 {
2490 px += sdx;
2491 py += sdy;
2492 }
2256 2493
2257 if (cell->stat_hp) 2494 if (cell->stat_hp)
2258 { 2495 {
2259 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2260 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2261 2498
2262 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2263 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2264 px + width - 1, py); 2501 px + width - 1, py);
2265 2502
2271 } 2508 }
2272 } 2509 }
2273} 2510}
2274 2511
2275void 2512void
2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2513draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2277 CODE: 2514 CODE:
2278{ 2515{
2279 static float color[16][3] = { 2516 static float color[16][3] = {
2280 { 0.00F, 0.00F, 0.00F }, 2517 { 0.00f, 0.00f, 0.00f },
2281 { 1.00F, 1.00F, 1.00F }, 2518 { 1.00f, 1.00f, 1.00f },
2282 { 0.00F, 0.00F, 0.55F }, 2519 { 0.00f, 0.00f, 0.55f },
2283 { 1.00F, 0.00F, 0.00F }, 2520 { 1.00f, 0.00f, 0.00f },
2284 2521
2285 { 1.00F, 0.54F, 0.00F }, 2522 { 1.00f, 0.54f, 0.00f },
2286 { 0.11F, 0.56F, 1.00F }, 2523 { 0.11f, 0.56f, 1.00f },
2287 { 0.93F, 0.46F, 0.00F }, 2524 { 0.93f, 0.46f, 0.00f },
2288 { 0.18F, 0.54F, 0.34F }, 2525 { 0.18f, 0.54f, 0.34f },
2289 2526
2290 { 0.56F, 0.73F, 0.56F }, 2527 { 0.56f, 0.73f, 0.56f },
2291 { 0.80F, 0.80F, 0.80F }, 2528 { 0.80f, 0.80f, 0.80f },
2292 { 0.55F, 0.41F, 0.13F }, 2529 { 0.55f, 0.41f, 0.13f },
2293 { 0.99F, 0.77F, 0.26F }, 2530 { 0.99f, 0.77f, 0.26f },
2294 2531
2295 { 0.74F, 0.65F, 0.41F }, 2532 { 0.74f, 0.65f, 0.41f },
2296 2533
2297 { 0.00F, 1.00F, 1.00F }, 2534 { 0.00f, 1.00f, 1.00f },
2298 { 1.00F, 0.00F, 1.00F }, 2535 { 1.00f, 0.00f, 1.00f },
2299 { 1.00F, 1.00F, 0.00F }, 2536 { 1.00f, 1.00f, 0.00f },
2300 }; 2537 };
2301 2538
2302 int x, y; 2539 int x, y;
2303 2540
2304 glEnable (GL_TEXTURE_2D); 2541 glEnable (GL_TEXTURE_2D);
2542 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2543 * but the nvidia driver (185.18.14) mishandles alpha textures
2544 * and takes the colour from god knows where instead of using
2545 * Cp. MODULATE results in the same colour, but slightly different
2546 * alpha, but atcually gives us the correct colour with nvidia.
2547 */
2305 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2548 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2306 glEnable (GL_BLEND); 2549 glEnable (GL_BLEND);
2307 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2550 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2308 glBegin (GL_QUADS); 2551 glBegin (GL_QUADS);
2309 2552
2310 for (y = 0; y < h; y++) 2553 for (y = 0; y < h; y++)
2314 2557
2315 if (m) 2558 if (m)
2316 { 2559 {
2317 float *c = color [m & 15]; 2560 float *c = color [m & 15];
2318 2561
2319 float tx1 = m & 0x40 ? 0.5 : 0.; 2562 float tx1 = m & 0x40 ? 0.5f : 0.f;
2320 float tx2 = tx1 + 0.5; 2563 float tx2 = tx1 + 0.5f;
2321 2564
2322 glColor4f (c[0], c[1], c[2], 0.75); 2565 glColor4f (c[0], c[1], c[2], 1);
2323 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2566 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2324 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2567 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2325 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2568 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2326 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2569 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2327 } 2570 }
2335void 2578void
2336fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2579fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2337 PPCODE: 2580 PPCODE:
2338{ 2581{
2339 int x, y; 2582 int x, y;
2340 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2341 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2342 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2343 int sw34 = (sw * 3 + 3) & ~3; 2586 int sw3 = sw * 3;
2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2344 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2345 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2590 memset (darkness1, 0, sw1*sh1);
2346 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2347 2591
2348 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2349 SvCUR_set (darkness3_sv, sw34 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2350 2594
2351 mx += self->x - 1; 2595 mx += self->x - 1;
2352 my += self->y - 1; 2596 my += self->y - 1;
2353
2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355 2597
2356 for (y = 0; y < sh1; y++) 2598 for (y = 0; y < sh1; y++)
2357 if (0 <= y + my && y + my < self->rows) 2599 if (0 <= y + my && y + my < self->rows)
2358 { 2600 {
2359 maprow *row = self->row + (y + my); 2601 maprow *row = self->row + (y + my);
2362 if (row->c0 <= x + mx && x + mx < row->c1) 2604 if (row->c0 <= x + mx && x + mx < row->c1)
2363 { 2605 {
2364 mapcell *cell = row->col + (x + mx - row->c0); 2606 mapcell *cell = row->col + (x + mx - row->c0);
2365 2607
2366 darkness1 [y * sw1 + x] = cell->darkness 2608 darkness1 [y * sw1 + x] = cell->darkness
2367 ? 255 - (cell->darkness - 1) 2609 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2368 : 255 - FOW_DARKNESS; 2610 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2369 } 2611 }
2370 } 2612 }
2371 2613
2372 for (y = 0; y < sh; ++y) 2614 for (y = 0; y < sh; ++y)
2373 for (x = 0; x < sw; ++x) 2615 for (x = 0; x < sw; ++x)
2392 2634
2393 uint8_t r13 = (d13 + d23 + d12) / 3; 2635 uint8_t r13 = (d13 + d23 + d12) / 3;
2394 uint8_t r23 = d23; 2636 uint8_t r23 = d23;
2395 uint8_t r33 = (d23 + d33 + d32) / 3; 2637 uint8_t r33 = (d23 + d33 + d32) / 3;
2396 2638
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2398 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2399 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2401 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2402 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2404 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2405 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2406 } 2648 }
2407 2649
2408 free (darkness1); 2650 free (darkness1);
2409 2651
2410 EXTEND (SP, 3); 2652 EXTEND (SP, 3);
2411 PUSHs (sv_2mortal (newSViv (sw34))); 2653 PUSHs (sv_2mortal (newSViv (sw3)));
2412 PUSHs (sv_2mortal (newSViv (sh3))); 2654 PUSHs (sv_2mortal (newSViv (sh3)));
2413 PUSHs (darkness3_sv); 2655 PUSHs (darkness3_sv);
2414} 2656}
2415 2657
2416SV * 2658SV *
2479 else 2721 else
2480 *data++ = 0; 2722 *data++ = 0;
2481 } 2723 }
2482 } 2724 }
2483 2725
2484 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 { 2728 {
2487 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 } 2731 }
2490 2732
2491 RETVAL = data_sv; 2733 RETVAL = data_sv;
2492} 2734}
2493 OUTPUT: 2735 OUTPUT:
2494 RETVAL 2736 RETVAL
2495 2737
2496void 2738void
2503 STRLEN len; 2745 STRLEN len;
2504 uint8_t *data, *end; 2746 uint8_t *data, *end;
2505 2747
2506 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2509 end = data + len + 8; 2751 end = data + len + 8;
2510 2752
2511 if (len < 5) 2753 if (len < 5)
2512 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2513 2755
2574} 2816}
2575 2817
2576MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2577 2819
2578DC::RW 2820DC::RW
2579new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2580 CODE: 2822 CODE:
2581{ 2823{
2582 STRLEN datalen; 2824 STRLEN datalen;
2583 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2584 2826
2586} 2828}
2587 OUTPUT: 2829 OUTPUT:
2588 RETVAL 2830 RETVAL
2589 2831
2590DC::RW 2832DC::RW
2591new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2592 CODE: 2834 CODE:
2593 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2594 OUTPUT: 2836 OUTPUT:
2595 RETVAL 2837 RETVAL
2596 2838
2614 if (RETVAL < 0) 2856 if (RETVAL < 0)
2615 { 2857 {
2616 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2617 2859
2618 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2619 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2620 2867 }
2868 else
2621 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2622 } 2870 }
2623 2871
2624 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2625 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2626} 2874}
2673void 2921void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2922set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE: 2923 CODE:
2676{ 2924{
2677 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2925 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2926 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2927 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680} 2928}
2681 2929
2682void 2930void
2683set_reverse_stereo (DC::Channel self, int flip) 2931set_reverse_stereo (DC::Channel self, int flip)
2686 2934
2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688 2936
2689PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2690 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2691DC::MixChunk 2951DC::MixChunk
2692new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2693 CODE: 2953 CODE:
2694 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2695 OUTPUT: 2955 OUTPUT:
2696 RETVAL 2956 RETVAL
2697 2957
2727 OUTPUT: 2987 OUTPUT:
2728 RETVAL 2988 RETVAL
2729 2989
2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2731 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2732int 3004int
2733volume (int volume = -1) 3005volume (int volume = -1)
2734 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2735 CODE: 3007 CODE:
2736 if (items > 0) 3008 if (items > 0)
2747void 3019void
2748halt () 3020halt ()
2749 CODE: 3021 CODE:
2750 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2751 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2752DC::MixMusic 3031DC::MixMusic
2753new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2754 CODE: 3033 CODE:
2755 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2756 OUTPUT: 3035 OUTPUT:
2757 RETVAL 3036 RETVAL
2758 3037
2786 } *civ, const_iv[] = { 3065 } *civ, const_iv[] = {
2787# define const_iv(name) { # name, (IV)name } 3066# define const_iv(name) { # name, (IV)name }
2788 const_iv (GL_VENDOR), 3067 const_iv (GL_VENDOR),
2789 const_iv (GL_VERSION), 3068 const_iv (GL_VERSION),
2790 const_iv (GL_EXTENSIONS), 3069 const_iv (GL_EXTENSIONS),
3070 const_iv (GL_MAX_TEXTURE_UNITS),
2791 const_iv (GL_COLOR_MATERIAL), 3071 const_iv (GL_COLOR_MATERIAL),
2792 const_iv (GL_SMOOTH), 3072 const_iv (GL_SMOOTH),
2793 const_iv (GL_FLAT), 3073 const_iv (GL_FLAT),
2794 const_iv (GL_DITHER), 3074 const_iv (GL_DITHER),
2795 const_iv (GL_BLEND), 3075 const_iv (GL_BLEND),
2807 const_iv (GL_ZERO), 3087 const_iv (GL_ZERO),
2808 const_iv (GL_SRC_ALPHA), 3088 const_iv (GL_SRC_ALPHA),
2809 const_iv (GL_DST_ALPHA), 3089 const_iv (GL_DST_ALPHA),
2810 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3090 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2811 const_iv (GL_ONE_MINUS_DST_ALPHA), 3091 const_iv (GL_ONE_MINUS_DST_ALPHA),
3092 const_iv (GL_SRC_COLOR),
3093 const_iv (GL_DST_COLOR),
3094 const_iv (GL_ONE_MINUS_SRC_COLOR),
3095 const_iv (GL_ONE_MINUS_DST_COLOR),
2812 const_iv (GL_SRC_ALPHA_SATURATE), 3096 const_iv (GL_SRC_ALPHA_SATURATE),
2813 const_iv (GL_RGB), 3097 const_iv (GL_RGB),
2814 const_iv (GL_RGBA), 3098 const_iv (GL_RGBA),
2815 const_iv (GL_RGBA4), 3099 const_iv (GL_RGBA4),
2816 const_iv (GL_RGBA8), 3100 const_iv (GL_RGBA8),
2884 const_iv (GL_NICEST), 3168 const_iv (GL_NICEST),
2885 const_iv (GL_V2F), 3169 const_iv (GL_V2F),
2886 const_iv (GL_V3F), 3170 const_iv (GL_V3F),
2887 const_iv (GL_T2F_V3F), 3171 const_iv (GL_T2F_V3F),
2888 const_iv (GL_T2F_N3F_V3F), 3172 const_iv (GL_T2F_N3F_V3F),
3173 const_iv (GL_FUNC_ADD),
3174 const_iv (GL_FUNC_SUBTRACT),
3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2889# undef const_iv 3176# undef const_iv
2890 }; 3177 };
2891 3178
2892 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2893 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2894 3181
2895 texture_av = newAV (); 3182 texture_av = newAV ();
2896 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
2897} 3184}
2898 3185
2900disable_GL_EXT_blend_func_separate () 3187disable_GL_EXT_blend_func_separate ()
2901 CODE: 3188 CODE:
2902 gl.BlendFuncSeparate = 0; 3189 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
2904 3191
2905char * 3192void
3193apple_nvidia_bug (int enable)
3194
3195const char *
2906gl_vendor () 3196gl_vendor ()
2907 CODE: 3197 CODE:
2908 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
2909 OUTPUT: 3199 OUTPUT:
2910 RETVAL 3200 RETVAL
2911 3201
2912char * 3202const char *
2913gl_version () 3203gl_version ()
2914 CODE: 3204 CODE:
2915 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
2916 OUTPUT: 3206 OUTPUT:
2917 RETVAL 3207 RETVAL
2918 3208
2919char * 3209const char *
2920gl_extensions () 3210gl_extensions ()
2921 CODE: 3211 CODE:
2922 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2923 OUTPUT: 3213 OUTPUT:
2924 RETVAL 3214 RETVAL
2925 3215
2926const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
2927 3221
2928GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
2929 CODE: 3223 CODE:
2930 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
2931 OUTPUT: 3225 OUTPUT:
2939 3233
2940int glGetError () 3234int glGetError ()
2941 3235
2942void glFinish () 3236void glFinish ()
2943 3237
3238void glFlush ()
3239
2944void glClear (int mask) 3240void glClear (int mask)
2945 3241
2946void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
2947 PROTOTYPE: @ 3243 PROTOTYPE: @
2948 3244
2957void glBlendFunc (int sfactor, int dfactor) 3253void glBlendFunc (int sfactor, int dfactor)
2958 3254
2959void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3255void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2960 CODE: 3256 CODE:
2961 gl_BlendFuncSeparate (sa, da, saa, daa); 3257 gl_BlendFuncSeparate (sa, da, saa, daa);
3258
3259# void glBlendEquation (int se)
2962 3260
2963void glDepthMask (int flag) 3261void glDepthMask (int flag)
2964 3262
2965void glLogicOp (int opcode) 3263void glLogicOp (int opcode)
2966 3264
3117 3415
3118void glEndList () 3416void glEndList ()
3119 3417
3120void glCallList (int list) 3418void glCallList (int list)
3121 3419
3420void c_init ()
3421 CODE:
3422 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3423 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3424
3122MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3425MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3123 3426
3124PROTOTYPES: DISABLE 3427PROTOTYPES: DISABLE
3125 3428
3126void 3429void
3127find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3128 PPCODE: 3431 PPCODE:
3129{ 3432{
3130 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3131 XPUSHs (self); 3434 XPUSHs (self);
3132} 3435}
3133 3436
3134BOOT: 3437BOOT:
3135{ 3438{
3143 3446
3144void 3447void
3145draw (SV *self) 3448draw (SV *self)
3146 CODE: 3449 CODE:
3147{ 3450{
3148 HV *hv; 3451 HV *hv;
3149 SV **svp; 3452 SV **svp;
3150 NV x, y, w, h; 3453 NV x, y, w, h;
3151 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3152 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3153 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3154 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines