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.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
33 38
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 40
36#include <SDL.h> 41#include <SDL.h>
37#include <SDL_thread.h> 42#include <SDL_thread.h>
41#include <SDL_opengl.h> 46#include <SDL_opengl.h>
42 47
43/* work around os x broken headers */ 48/* work around os x broken headers */
44#ifdef __MACOSX__ 49#ifdef __MACOSX__
45typedef 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);
46#endif 53#endif
47 54
48#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
50 57
51#include <glib/gmacros.h> 58#include <glib.h>
52 59
53#include <pango/pango.h> 60#include <pango/pango.h>
54 61
55#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
69# include <netinet/in.h> 76# include <netinet/in.h>
70# include <netinet/tcp.h> 77# include <netinet/tcp.h>
71# include <inttypes.h> 78# include <inttypes.h>
72#endif 79#endif
73 80
74#if __GNUC__ >= 4 81#include "ecb.h"
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82 82
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 84
85/* this is used as fow flag as well, so has to have a different value */ 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/* then anything that is computed by incoming darkness */
97 97
98#define KMOD_LRAM 0x10000 // our extension 98#define KMOD_LRAM 0x10000 // our extension
99 99
100#define TEXID_SPEECH 1 100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2 101#define TEXID_NOFACE 2
102#define TEXID_HIDDEN 3 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}
103 121
104static AV *texture_av; 122static AV *texture_av;
105 123
106static struct 124static struct
107{ 125{
164{ 182{
165 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
166 184
167 while (attrs) 185 while (attrs)
168 { 186 {
169 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
170 188
171 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
172 return 1; 190 return 1;
173 191
174 attrs = attrs->next; 192 attrs = attrs->next;
175 } 193 }
176 194
177 return 0; 195 return 0;
178} 196}
179 197
180typedef struct cf_layout { 198struct cf_layout {
181 PangoLayout *pl; 199 PangoLayout *pl;
182 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
183 int base_height; 201 int base_height;
184 DC__Font font; 202 DC__Font font;
185 rc_t *rc; 203 rc_t rc;
186} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
187 207
188static DC__Font default_font; 208static DC__Font default_font;
189static PangoContext *opengl_context; 209static PangoContext *opengl_context;
190static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
191 211
192static void 212static void
193substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
194{ 214{
195 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
196#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
197 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
198#endif 218#endif
199 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
200} 220}
201 221
202static void 222static void
229 249
230 *w = rect.width; 250 *w = rect.width;
231 *h = rect.height; 251 *h = rect.height;
232} 252}
233 253
254/////////////////////////////////////////////////////////////////////////////
255
234typedef uint16_t tileid; 256typedef uint16_t tileid;
235typedef uint16_t faceid; 257typedef uint16_t faceid;
236 258
237typedef struct { 259struct maptex
260{
238 GLuint name; 261 GLuint name;
239 int w, h; 262 int w, h;
240 float s, t; 263 float s, t;
241 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
242 tileid smoothtile; 265 tileid smoothtile;
243 uint8_t smoothlevel; 266 uint8_t smoothlevel;
244 uint8_t unused; /* set to zero on use */ 267 uint8_t unused; /* set to zero on use */
245} maptex; 268};
246 269
247typedef struct { 270struct mapcell
271{
248 uint32_t player; 272 uint32_t player;
249 tileid tile[3]; 273 tileid tile[3];
250 uint16_t darkness; 274 uint16_t darkness;
251 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
252} mapcell; 276};
253 277
254typedef struct { 278struct maprow
279{
255 int32_t c0, c1; 280 int32_t c0, c1;
256 mapcell *col; 281 mapcell *col;
257} maprow; 282};
258 283
259typedef struct map { 284struct mapgrid {
260 int x, y, w, h; 285 int x, y, w, h;
261 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
262 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
263 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
264 289
265 int32_t rows; 290 int32_t rows;
266 maprow *row; 291 maprow *row;
267} *DC__Map; 292};
268 293
269static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
270prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
271{ 299{
272 char *p; 300 T *p;
273 301
274 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
275 Zero (p, inc, char); 303 Zero (p, inc, T);
276 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
277 Safefree (ptr); 305 Safefree (ptr);
278 306
279 return p; 307 ptr = p;
280} 308}
281 309
282static char * 310template<typename T>
283append (char *ptr, int sze, int inc)
284{
285 Renew (ptr, sze + inc, char);
286 Zero (ptr + sze, inc, char);
287
288 return ptr;
289}
290
291#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
292#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293
294static 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
295need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
296{ 320{
297 while (self->faces <= face) 321 while (self->faces <= face)
298 { 322 {
299 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
300 self->faces *= 2; 324 self->faces *= 2;
301 } 325 }
302} 326}
303 327
304static void 328static void
305need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
306{ 330{
307 while (self->texs <= texid) 331 while (self->texs <= texid)
308 { 332 {
309 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
310 self->texs *= 2; 334 self->texs *= 2;
311 } 335 }
312} 336}
313 337
314static maprow * 338static maprow *
315map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
316{ 340{
317 if (0 > y) 341 if (0 > y)
318 { 342 {
319 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
320 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
321 345
322 self->rows += extend; 346 self->rows += extend;
323 self->y += extend; 347 self->y += extend;
324 y += extend; 348 y += extend;
325 } 349 }
326 else if (y >= self->rows) 350 else if (y >= self->rows)
327 { 351 {
328 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
329 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
330 self->rows += extend; 354 self->rows += extend;
331 } 355 }
332 356
333 return self->row + y; 357 return self->row + y;
334} 358}
344 } 368 }
345 369
346 if (row->c0 > x) 370 if (row->c0 > x)
347 { 371 {
348 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
349 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
350 row->c0 -= extend; 374 row->c0 -= extend;
351 } 375 }
352 else if (x >= row->c1) 376 else if (x >= row->c1)
353 { 377 {
354 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
355 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
356 row->c1 += extend; 380 row->c1 += extend;
357 } 381 }
358 382
359 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
360} 384}
361 385
362static mapcell * 386static mapcell *
363map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
364{ 388{
365 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
366} 390}
367 391
368static void 392static void
369map_clear (DC__Map self) 393map_clear (mapgrid *self)
370{ 394{
371 int r; 395 int r;
372 396
373 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
374 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
392 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
393 (cell)->player = 0; \ 417 (cell)->player = 0; \
394 } while (0) 418 } while (0)
395 419
396static void 420static void
397map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
398{ 422{
399 int x, y; 423 int x, y;
400 maprow *row; 424 maprow *row;
401 mapcell *cell; 425 mapcell *cell;
402 426
419 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
420 } 444 }
421 } 445 }
422} 446}
423 447
424typedef struct { 448struct smooth_key
449{
425 tileid tile; 450 tileid tile;
426 uint8_t x, y, level; 451 uint8_t x, y, level;
427} 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}
428 471
429static void 472static void
430smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
431{ 474{
432 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
433 476
434 if (SvIOK (*sv)) 477 if (it == h.end ())
435 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
436 else 479 else
437 sv_setiv (*sv, bits); 480 it->second |= bits;
438} 481}
439 482
440static void 483static void
441music_finished (void) 484music_finished (void)
442{ 485{
459 ev.code = 1; 502 ev.code = 1;
460 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
461 ev.data2 = 0; 504 ev.data2 = 0;
462 505
463 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;
464} 514}
465 515
466static unsigned int 516static unsigned int
467minpot (unsigned int n) 517minpot (unsigned int n)
468{ 518{
478 n |= n >> 16; 528 n |= n >> 16;
479 529
480 return n + 1; 530 return n + 1;
481} 531}
482 532
483static unsigned int
484popcount (unsigned int n)
485{
486 n -= (n >> 1) & 0x55555555U;
487 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
488 n = ((n >> 4) + n) & 0x0f0f0f0fU;
489 n *= 0x01010101U;
490
491 return n >> 24;
492}
493
494/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
495#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
496#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
497 536
498/******************************************************************************/ 537/******************************************************************************/
551 590
552 return mod; 591 return mod;
553} 592}
554 593
555static void 594static void
556deliantra_main () 595deliantra_main (SV *real_main)
557{ 596{
558 char *argv[] = { 0 }; 597 dSP;
559 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
560} 601}
561 602
562#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
563 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
564 * do some mind-boggling hack here: SDL requires a custom main() 607 * do some mind-boggling hack here: SDL requires a custom main()
565 * 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,
566 * 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,
567 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
568 */ 611 */
569 extern C_LINKAGE int 612 extern C_LINKAGE int
570 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
571 { 614 {
572 deliantra_main (); 615 deliantra_main (real_main);
573 } 616 }
574 617
575 #undef main 618 #undef main
576 619
577 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
578 621
579 static void 622 static void
580 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
581 { 624 {
625 real_main = real_main_;
626
582 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
583 (main) (1, argv); 628 (main) (1, argv);
584 } 629 }
585#else 630#else
586 static void 631 static void
587 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
588 { 633 {
589 deliantra_main (); 634 deliantra_main (real_main);
590 } 635 }
591#endif 636#endif
592 637
593MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
594 639
795 840
796 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
797# undef const_iv 842# undef const_iv
798 }; 843 };
799 844
800 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--)
801 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
802 847
803 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
804 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
805} 850}
806 851
822NV ceil (NV x) 867NV ceil (NV x)
823 868
824IV minpot (UV n) 869IV minpot (UV n)
825 870
826IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
827 876
828NV distance (NV dx, NV dy) 877NV distance (NV dx, NV dy)
829 CODE: 878 CODE:
830 RETVAL = pow (dx * dx + dy * dy, 0.5); 879 RETVAL = pow (dx * dx + dy * dy, 0.5);
831 OUTPUT: 880 OUTPUT:
845#endif 894#endif
846} 895}
847 896
848char *SDL_GetError () 897char *SDL_GetError ()
849 898
850void SDL_braino () 899void SDL_main_hack (SV *real_main)
900 PROTOTYPE: &
851 901
852int SDL_Init (U32 flags) 902int SDL_Init (U32 flags)
853 903
854int SDL_InitSubSystem (U32 flags) 904int SDL_InitSubSystem (U32 flags)
855 905
856void SDL_QuitSubSystem (U32 flags) 906void SDL_QuitSubSystem (U32 flags)
857 907
858void SDL_Quit () 908void SDL_Quit ()
859 909
860int SDL_GL_SetAttribute (int attr, int value) 910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
861 912
862int SDL_GL_GetAttribute (int attr) 913int SDL_GL_GetAttribute (int attr)
863 CODE: 914 CODE:
864 if (SDL_GL_GetAttribute (attr, &RETVAL)) 915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
865 XSRETURN_UNDEF; 916 XSRETURN_UNDEF;
866 OUTPUT: 917 OUTPUT:
867 RETVAL 918 RETVAL
868 919
869void 920void
924 ); 975 );
925 976
926 if (RETVAL) 977 if (RETVAL)
927 { 978 {
928 av_clear (texture_av); 979 av_clear (texture_av);
929
930 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
931#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
932#include "glfunc.h" 981#include "glfunc.h"
933#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
934 } 985 }
935} 986}
936 OUTPUT: 987 OUTPUT:
937 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
938 992
939void 993void
940SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
941 995
942char * 996char *
943SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
944 999
945int 1000int
946SDL_GetAppState () 1001SDL_GetAppState ()
947 1002
948int 1003int
949SDL_GetModState () 1004SDL_GetModState ()
950 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
951void 1010void
1011SDL_PumpEvents ()
1012
1013void
952poll_events () 1014peep_events ()
953 PPCODE: 1015 PPCODE:
954{ 1016{
955 SDL_Event ev; 1017 SDL_Event ev;
956 1018
957 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
1023 1085
1024 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1086 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1025 } 1087 }
1026} 1088}
1027 1089
1090char *
1091SDL_AudioDriverName ()
1092 CODE:
1093{
1094 char buf [256];
1095 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1096 XSRETURN_UNDEF;
1097
1098 RETVAL = buf;
1099}
1100 OUTPUT:
1101 RETVAL
1102
1028int 1103int
1029Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1030 POSTCALL: 1105 POSTCALL:
1031 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
1032 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
1033 1108
1034void 1109void
1035Mix_QuerySpec () 1110Mix_QuerySpec ()
1094add_font (char *file) 1169add_font (char *file)
1095 CODE: 1170 CODE:
1096 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1097 OUTPUT: 1172 OUTPUT:
1098 RETVAL 1173 RETVAL
1174
1175void
1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1099 1181
1100void 1182void
1101load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
1102 ALIAS: 1184 ALIAS:
1103 load_image_file = 1 1185 load_image_file = 1
1149 1231
1150 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
1151 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
1152 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
1153 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
1154 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1155 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1156 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1157 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1158 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
1159 1241
1231MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1232 1314
1233PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1234 1316
1235DC::Font 1317DC::Font
1236new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1237 CODE: 1319 CODE:
1238{ 1320{
1239 int count; 1321 int count;
1240 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1241 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1270 PROTOTYPE: 1352 PROTOTYPE:
1271 CODE: 1353 CODE:
1272 tc_restore (); 1354 tc_restore ();
1273 1355
1274DC::Layout 1356DC::Layout
1275new (SV *class) 1357new (SV *klass)
1276 CODE: 1358 CODE:
1277 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1278 1360
1279 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1280 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1281 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1282 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1283 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1284 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1285 RETVAL->font = 0; 1367 RETVAL->font = 0;
1286 RETVAL->rc = rc_alloc ();
1287 1368
1288 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1289 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1290 OUTPUT: 1371 OUTPUT:
1291 RETVAL 1372 RETVAL
1292 1373
1293void 1374void
1294DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1295 CODE: 1376 CODE:
1296 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1297 rc_free (self->rc);
1298 Safefree (self); 1378 delete self;
1299 1379
1300void 1380void
1301set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1302 CODE: 1382 CODE:
1303{ 1383{
1429 1509
1430void 1510void
1431set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1432 CODE: 1512 CODE:
1433 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1434 { 1514 {
1435 self->base_height = base_height; 1515 self->base_height = base_height;
1436 layout_update_font (self); 1516 layout_update_font (self);
1437 } 1517 }
1438 1518
1439void 1519void
1557} 1637}
1558 1638
1559void 1639void
1560render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1561 CODE: 1641 CODE:
1562 rc_clear (self->rc); 1642 self->rc.clear ();
1563 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1564 self->pl, 1644 self->pl,
1565 self->rc, 1645 &self->rc,
1566 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1567 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1568 flags 1648 flags
1569 ); 1649 );
1570 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1581 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1582 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1583 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1584 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1585 1665
1586 rc_draw (self->rc); 1666 self->rc.draw ();
1587 1667
1588 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1589 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1590 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1591} 1671}
1671void 1751void
1672draw_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) 1752draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1673 PROTOTYPE: @ 1753 PROTOTYPE: @
1674 CODE: 1754 CODE:
1675{ 1755{
1756 glEnable (GL_BLEND);
1757 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1676 glEnable (GL_TEXTURE_2D); 1758 glEnable (GL_TEXTURE_2D);
1677 glEnable (GL_BLEND);
1678 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679 glBindTexture (GL_TEXTURE_2D, name1); 1759 glBindTexture (GL_TEXTURE_2D, name1);
1680 1760
1681 glColor3f (intensity, intensity, intensity); 1761 glColor3f (intensity, intensity, intensity);
1682 glPushMatrix (); 1762 glPushMatrix ();
1683 glScalef (1./3, 1./3, 1.); 1763 glScalef (1./3, 1./3, 1.);
1698 glBindTexture (GL_TEXTURE_2D, name2); 1778 glBindTexture (GL_TEXTURE_2D, name2);
1699 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700 1780
1701 /* rgb == rgb(glcolor) */ 1781 /* rgb == rgb(glcolor) */
1702 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1782 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1783 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1784 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705 1785
1706 /* alpha = interpolate t0, t1 by env_alpha */ 1786 /* alpha = interpolate t0, t1 by env_alpha */
1707 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1787 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708 1788
1803MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1804 1884
1805PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1806 1886
1807DC::Map 1887DC::Map
1808new (SV *class) 1888new (SV *klass)
1809 CODE: 1889 CODE:
1810 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1811 RETVAL->x = 0; 1891 RETVAL->x = 0;
1812 RETVAL->y = 0; 1892 RETVAL->y = 0;
1813 RETVAL->w = 0; 1893 RETVAL->w = 0;
1814 RETVAL->h = 0; 1894 RETVAL->h = 0;
1815 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1852 1932
1853void 1933void
1854set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1855 CODE: 1935 CODE:
1856{ 1936{
1857 tileid texid; 1937 tileid texid;
1858 maptex *tex; 1938 maptex *tex;
1859 1939
1860 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1861 return; 1941 return;
1862 1942
1863 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1864 return; 1944 return;
1865 1945
1866 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1867 1947
1868 if (!texid) 1948 if (!texid)
1869 return; 1949 return;
1870 1950
1871 tex = self->tex + texid; 1951 tex = self->tex + texid;
1904} 1984}
1905 1985
1906void 1986void
1907expire_textures (DC::Map self, int texid, int count) 1987expire_textures (DC::Map self, int texid, int count)
1908 PPCODE: 1988 PPCODE:
1909 for (; texid < self->texs && count; ++texid, --count) 1989 for (; texid < self->texs && count; ++texid, --count)
1910 { 1990 {
1911 maptex *tex = self->tex + texid; 1991 maptex *tex = self->tex + texid;
1912 1992
1913 if (tex->name) 1993 if (tex->name)
1914 { 1994 {
1961 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1962 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1963 2043
1964 while (self->y < 0) 2044 while (self->y < 0)
1965 { 2045 {
1966 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1967 2047
1968 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1969 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1970 } 2050 }
1971} 2051}
1972 2052
1973SV * 2053SV *
1974map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1975 CODE: 2055 CODE:
1976{ 2056{
1977 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1978 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1979 mapcell *cell; 2059 mapcell *cell;
2000 2080
2001 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
2002 2082
2003 if (flags & 8) 2083 if (flags & 8)
2004 { 2084 {
2085 uint8_t ext, cmd;
2086
2005 if (extmap) 2087 do
2006 { 2088 {
2007 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
2008 2091
2009 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
2010 { 2095 {
2011 ext = *data++;
2012 cmd = ext & 0x7f;
2013
2014 if (cmd < 4)
2015 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2016 else if (cmd == 5) // health
2017 {
2018 cell->stat_width = 1; 2096 cell->stat_width = 1;
2019 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
2020 }
2021 else if (cmd == 6) // monster width
2022 cell->stat_width = *data++ + 1;
2023 else if (cmd == 0x47)
2024 {
2025 if (*data == 1) cell->player = data [1];
2026 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2027 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2028 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2029
2030 data += *data + 1;
2031 }
2032 else if (cmd == 8) // cell flags
2033 cell->flags = *data++;
2034 else if (ext & 0x40) // unknown, multibyte => skip
2035 data += *data + 1;
2036 else
2037 data++;
2038 } 2098 }
2039 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
2040 } 2116 }
2041 else 2117 while (ext & 0x80);
2042 cell->darkness = *data++ + 1;
2043 } 2118 }
2044 2119
2045 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
2046 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
2047 { 2122 {
2095 ? self->row + y 2170 ? self->row + y
2096 : 0; 2171 : 0;
2097 2172
2098 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
2099 { 2174 {
2100 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
2101 2176
2102 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
2103 { 2178 {
2104 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
2105 2180
2107 { 2182 {
2108 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
2109 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
2110 int a1 = tex.a; 2185 int a1 = tex.a;
2111 2186
2112 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
2113 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
2114 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
2115 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
2116 } 2191 }
2117 } 2192 }
2118 2193
2119 *map++ = (r ) 2194 *map++ = (r )
2120 | (g << 8) 2195 | (g << 8)
2121 | (b << 16) 2196 | (b << 16)
2122 | (a << 24); 2197 | (a << 24);
2123 } 2198 }
2124 } 2199 }
2125 2200
2126 RETVAL = map_sv; 2201 RETVAL = map_sv;
2127} 2202}
2128 OUTPUT: 2203 OUTPUT:
2129 RETVAL 2204 RETVAL
2130 2205
2131void 2206void
2132draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2207draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2133 CODE: 2208 CODE:
2134{ 2209{
2135 int x, y, z; 2210 int x, y, z;
2136 2211
2137 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2138 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2139 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2140 smooth_key skey;
2141 int pl_x, pl_y; 2213 int pl_x, pl_y;
2142 maptex pl_tex; 2214 maptex pl_tex;
2143 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2144 rc_t *rc_ov = rc_alloc (); 2216 rc_t rc_ov;
2145 rc_key_t key; 2217 rc_key_t key;
2146 rc_array_t *arr, *arr_hidden; 2218 rc_t::array_t *arr;
2147 2219
2148 pl_tex.name = 0; 2220 pl_tex.name = 0;
2149 2221
2150 // that's current max. sorry. 2222 // that's current max. sorry.
2151 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
2152 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
2153
2154 // clear key, in case of extra padding
2155 memset (&skey, 0, sizeof (skey));
2156 2225
2157 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
2158 key.r = 255; 2227 key.r = 255;
2159 key.g = 255; 2228 key.g = 255;
2160 key.b = 255; 2229 key.b = 255;
2166 my += self->y; 2235 my += self->y;
2167 2236
2168 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
2169 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
2170 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
2171 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2172 2241
2173 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2174 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
2175 { 2244 {
2176 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
2189 2258
2190 glEnable (GL_BLEND); 2259 glEnable (GL_BLEND);
2191 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2193 2262
2194 key.texname = self->tex [TEXID_HIDDEN].name;
2195 arr_hidden = rc_array (rc_ov, &key);
2196
2197 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
2198 { 2264 {
2199 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2200 key.texname = -1; 2268 key.texname = -1;
2201 2269
2202 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
2203 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
2204 { 2272 {
2221 2289
2222 if (!tex.name) 2290 if (!tex.name)
2223 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2224 2292
2225 key.texname = tex.name; 2293 key.texname = tex.name;
2226 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
2227 } 2295 }
2228 2296
2229 px = (x + 1) * T - tex.w; 2297 px = (x + 1) * Th - tex.w;
2230 py = (y + 1) * T - tex.h; 2298 py = (y + 1) * Tw - tex.h;
2231 2299
2232 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2233 { 2301 {
2234 pl_x = px; 2302 pl_x = px;
2235 pl_y = py; 2303 pl_y = py;
2236 pl_tex = tex; 2304 pl_tex = tex;
2237 continue; 2305 continue;
2238 } 2306 }
2239 2307
2240 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2241 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2242 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2243 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2244 2312
2245 // update smooth hash 2313 // update smooth hash
2246 if (tex.smoothtile) 2314 if (tex.smoothtile)
2247 { 2315 {
2248 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
2249 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
2250 2318
2251 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
2252 2320
2253 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
2254 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
2255 2323
2256 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
2264 2332
2265 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2266 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2267 2335
2268 // full tile 2336 // full tile
2269 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2270 2338
2271 // borders 2339 // borders
2272 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2273 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2341 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2274 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2342 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2275 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2276 2344
2277 // corners 2345 // corners
2278 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2279 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2347 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2280 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2348 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2281 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2282 } 2350 }
2283 } 2351 }
2284 2352
2285 if (expect_false (z == 2) && expect_false (cell->flags)) 2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2286 { 2354 {
2287 // overlays such as the speech bubble, probably more to come 2355 // overlays such as the speech bubble, probably more to come
2288 if (cell->flags & 1) 2356 if (cell->flags & 1)
2289 { 2357 {
2290 rc_key_t key_ov = key; 2358 rc_key_t key_ov = key;
2291 maptex tex = self->tex [TEXID_SPEECH]; 2359 maptex tex = self->tex[TEXID_SPEECH];
2292 rc_array_t *arr;
2293 int px = x * T + T * 2 / 32; 2360 int px = x * Tw + Tw * 2 / 32;
2294 int py = y * T - T * 6 / 32; 2361 int py = y * Th - Th * 6 / 32;
2295 2362
2296 key_ov.texname = tex.name; 2363 key_ov.texname = tex.name;
2297 arr = rc_array (rc_ov, &key_ov); 2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2298 2365
2299 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2300 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2301 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2302 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2303 } 2370 }
2304 } 2371 }
2305 } 2372 }
2306 } 2373 }
2307 2374
2308 rc_draw (rc); 2375 rc.draw ();
2309 rc_clear (rc); 2376 rc.clear ();
2310 2377
2311 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2312 // this is basically counting sort 2379 // this is basically counting sort
2313 { 2380 {
2314 int w, b; 2381 int w, b;
2315 2382
2316 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2317 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2318 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2319 { 2388 {
2320 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2321 if (smask) 2390 IV bits = it->second;
2322 for (b = 0; b < 32; ++b) 2391
2323 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2324 { 2395 {
2325 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
2326 HE *he; 2404 if (tex.name)
2327
2328 hv_iterinit (smooth);
2329 while ((he = hv_iternext (smooth)))
2330 { 2405 {
2331 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2332 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2333 2408 if (key.texname != tex.name)
2334 if (!(bits & 0x1000)
2335 && skey->level == level
2336 && level > smooth_max [skey->x][skey->y])
2337 { 2409 {
2338 maptex tex = self->tex [skey->tile];
2339 int px = (((int)skey->x) - 1) * T;
2340 int py = (((int)skey->y) - 1) * T;
2341 int border = bits & 15;
2342 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2343 float dx = tex.s * .0625f; // 16 images/row
2344 float dy = tex.t * .5f ; // 2 images/column
2345
2346 if (tex.name)
2347 {
2348 // this time avoiding texture state changes
2349 // save gobs of state changes.
2350 if (key.texname != tex.name)
2351 {
2352 self->tex [skey->tile].unused = 0; 2410 self->tex [skey.tile].unused = 0;
2353 2411
2354 glEnd (); 2412 glEnd ();
2355 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2356 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2357 } 2415 }
2358 2416
2359 if (border) 2417 if (border)
2360 { 2418 {
2361 float ox = border * dx; 2419 float ox = border * dx;
2362 2420
2363 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2364 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2365 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2366 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2367 } 2425 }
2368 2426
2369 if (corner) 2427 if (corner)
2370 { 2428 {
2371 float ox = corner * dx; 2429 float ox = corner * dx;
2372 2430
2373 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2374 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2375 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2376 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2377 }
2378 }
2379 } 2435 }
2380 } 2436 }
2381 } 2437 }
2382 } 2438 }
2383 2439
2384 glEnd (); 2440 glEnd ();
2385 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2386 key.texname = -1; 2442 key.texname = -1;
2387 } 2443 }
2388
2389 hv_clear (smooth);
2390 } 2444 }
2391 2445
2392 if (pl_tex.name) 2446 if (pl_tex.name)
2393 { 2447 {
2394 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2395 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2396 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2397 2451
2398 key.texname = tex.name; 2452 key.texname = tex.name;
2399 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2400 2454
2401 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2402 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2403 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2405 2459
2406 rc_draw (rc); 2460 rc.draw ();
2407 } 2461 }
2408 2462
2409 rc_draw (rc_ov); 2463 rc_ov.draw ();
2410 rc_clear (rc_ov); 2464 rc_ov.clear ();
2411 2465
2412 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2413 rc_free (rc);
2414 rc_free (rc_ov);
2415 2467
2416 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2417 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2418 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2419 { 2471 {
2422 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2423 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2424 { 2476 {
2425 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2426 2478
2427 int px = x * T; 2479 int px = x * Tw;
2428 int py = y * T; 2480 int py = y * Th;
2429 2481
2430 if (expect_false (cell->player == player)) 2482 if (ecb_expect_false (cell->player == player))
2431 { 2483 {
2432 px += sdx; 2484 px += sdx;
2433 py += sdy; 2485 py += sdy;
2434 } 2486 }
2435 2487
2436 if (cell->stat_hp) 2488 if (cell->stat_hp)
2437 { 2489 {
2438 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2439 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2440 2492
2441 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2442 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2443 px + width - 1, py); 2495 px + width - 1, py);
2444 2496
2524 int x, y; 2576 int x, y;
2525 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2526 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2527 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2528 int sw3 = sw * 3; 2580 int sw3 = sw * 3;
2529 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2530 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2531 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2584 memset (darkness1, 0, sw1*sh1);
2532 2585
2533 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2534 SvCUR_set (darkness3_sv, sw3 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2535 2588
2536 mx += self->x - 1; 2589 mx += self->x - 1;
2662 else 2715 else
2663 *data++ = 0; 2716 *data++ = 0;
2664 } 2717 }
2665 } 2718 }
2666 2719
2667 /* if size is w*h + 5 then no data has been found */ 2720 /* if size is w*h + 5 then no data has been found */
2668 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2669 { 2722 {
2670 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2671 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2672 } 2725 }
2673 2726
2674 RETVAL = data_sv; 2727 RETVAL = data_sv;
2675} 2728}
2676 OUTPUT: 2729 OUTPUT:
2677 RETVAL 2730 RETVAL
2678 2731
2679void 2732void
2686 STRLEN len; 2739 STRLEN len;
2687 uint8_t *data, *end; 2740 uint8_t *data, *end;
2688 2741
2689 len = SvLEN (data_sv); 2742 len = SvLEN (data_sv);
2690 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2691 data = SvPVbyte_nolen (data_sv); 2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2692 end = data + len + 8; 2745 end = data + len + 8;
2693 2746
2694 if (len < 5) 2747 if (len < 5)
2695 XSRETURN_EMPTY; 2748 XSRETURN_EMPTY;
2696 2749
2757} 2810}
2758 2811
2759MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2760 2813
2761DC::RW 2814DC::RW
2762new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2763 CODE: 2816 CODE:
2764{ 2817{
2765 STRLEN datalen; 2818 STRLEN datalen;
2766 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2767 2820
2769} 2822}
2770 OUTPUT: 2823 OUTPUT:
2771 RETVAL 2824 RETVAL
2772 2825
2773DC::RW 2826DC::RW
2774new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2775 CODE: 2828 CODE:
2776 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2777 OUTPUT: 2830 OUTPUT:
2778 RETVAL 2831 RETVAL
2779 2832
2797 if (RETVAL < 0) 2850 if (RETVAL < 0)
2798 { 2851 {
2799 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2800 2853
2801 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2802 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2803 2861 }
2862 else
2804 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2805 } 2864 }
2806 2865
2807 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2808 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2809} 2868}
2869 2928
2870MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2871 2930
2872PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2873 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2874DC::MixChunk 2945DC::MixChunk
2875new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2876 CODE: 2947 CODE:
2877 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2878 OUTPUT: 2949 OUTPUT:
2879 RETVAL 2950 RETVAL
2880 2951
2910 OUTPUT: 2981 OUTPUT:
2911 RETVAL 2982 RETVAL
2912 2983
2913MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2914 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2915int 2998int
2916volume (int volume = -1) 2999volume (int volume = -1)
2917 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2918 CODE: 3001 CODE:
2919 if (items > 0) 3002 if (items > 0)
2930void 3013void
2931halt () 3014halt ()
2932 CODE: 3015 CODE:
2933 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2934 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2935DC::MixMusic 3025DC::MixMusic
2936new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2937 CODE: 3027 CODE:
2938 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2939 OUTPUT: 3029 OUTPUT:
2940 RETVAL 3030 RETVAL
2941 3031
3078 const_iv (GL_FUNC_SUBTRACT), 3168 const_iv (GL_FUNC_SUBTRACT),
3079 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3080# undef const_iv 3170# undef const_iv
3081 }; 3171 };
3082 3172
3083 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3085 3175
3086 texture_av = newAV (); 3176 texture_av = newAV ();
3087 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
3088} 3178}
3089 3179
3094 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
3095 3185
3096void 3186void
3097apple_nvidia_bug (int enable) 3187apple_nvidia_bug (int enable)
3098 3188
3099char * 3189const char *
3100gl_vendor () 3190gl_vendor ()
3101 CODE: 3191 CODE:
3102 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
3103 OUTPUT: 3193 OUTPUT:
3104 RETVAL 3194 RETVAL
3105 3195
3106char * 3196const char *
3107gl_version () 3197gl_version ()
3108 CODE: 3198 CODE:
3109 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
3110 OUTPUT: 3200 OUTPUT:
3111 RETVAL 3201 RETVAL
3112 3202
3113char * 3203const char *
3114gl_extensions () 3204gl_extensions ()
3115 CODE: 3205 CODE:
3116 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3117 OUTPUT: 3207 OUTPUT:
3118 RETVAL 3208 RETVAL
3119 3209
3120const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
3121 3215
3122GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
3123 CODE: 3217 CODE:
3124 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
3125 OUTPUT: 3219 OUTPUT:
3132 RETVAL 3226 RETVAL
3133 3227
3134int glGetError () 3228int glGetError ()
3135 3229
3136void glFinish () 3230void glFinish ()
3231
3232void glFlush ()
3137 3233
3138void glClear (int mask) 3234void glClear (int mask)
3139 3235
3140void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
3141 PROTOTYPE: @ 3237 PROTOTYPE: @
3326 3422
3327void 3423void
3328find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
3329 PPCODE: 3425 PPCODE:
3330{ 3426{
3331 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
3332 XPUSHs (self); 3428 XPUSHs (self);
3333} 3429}
3334 3430
3335BOOT: 3431BOOT:
3336{ 3432{
3344 3440
3345void 3441void
3346draw (SV *self) 3442draw (SV *self)
3347 CODE: 3443 CODE:
3348{ 3444{
3349 HV *hv; 3445 HV *hv;
3350 SV **svp; 3446 SV **svp;
3351 NV x, y, w, h; 3447 NV x, y, w, h;
3352 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
3353 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
3354 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
3355 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines