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.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define 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)) 82#include "salloc.h"
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 83
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 85
85/* this is used as fow flag as well, so has to have a different value */ 86/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */ 87/* then anything that is computed by incoming darkness */
97 98
98#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
99 100
100#define TEXID_SPEECH 1 101#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2 102#define TEXID_NOFACE 2
103
104// approximately divide by 255
105static unsigned int
106div255 (unsigned int n)
107{
108 return (n + (n >> 8)) >> 8;
109}
110
111static unsigned int
112minpot (unsigned int n)
113{
114 if (!n)
115 return 0;
116
117 --n;
118
119 n |= n >> 1;
120 n |= n >> 2;
121 n |= n >> 4;
122 n |= n >> 8;
123 n |= n >> 16;
124
125 return n + 1;
126}
127
128static char *
129fast_sv_grow (SV *sv, STRLEN need)
130{
131 STRLEN len = SvLEN (sv);
132 STRLEN want = SvCUR (sv) + need;
133
134 if (ecb_expect_false (len < want))
135 {
136 do
137 len *= 2;
138 while (len < want);
139
140 sv_grow (sv, len);
141 }
142
143 SvCUR_set (sv, want);
144 return SvEND (sv) - need;
145}
102 146
103static AV *texture_av; 147static AV *texture_av;
104 148
105static struct 149static struct
106{ 150{
163{ 207{
164 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
165 209
166 while (attrs) 210 while (attrs)
167 { 211 {
168 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
169 213
170 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
171 return 1; 215 return 1;
172 216
173 attrs = attrs->next; 217 attrs = attrs->next;
174 } 218 }
175 219
176 return 0; 220 return 0;
177} 221}
178 222
179typedef struct cf_layout { 223struct cf_layout {
180 PangoLayout *pl; 224 PangoLayout *pl;
181 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
182 int base_height; 226 int base_height;
183 DC__Font font; 227 DC__Font font;
184 rc_t *rc; 228 rc_t rc;
185} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
186 232
187static DC__Font default_font; 233static DC__Font default_font;
188static PangoContext *opengl_context; 234static PangoContext *opengl_context;
189static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
190 236
191static void 237static void
192substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
193{ 239{
194 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
195#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
196 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197#endif 243#endif
198 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199} 245}
200 246
201static void 247static void
228 274
229 *w = rect.width; 275 *w = rect.width;
230 *h = rect.height; 276 *h = rect.height;
231} 277}
232 278
279/////////////////////////////////////////////////////////////////////////////
280
233typedef uint16_t tileid; 281typedef uint16_t tileid;
234typedef uint16_t faceid; 282typedef uint16_t faceid;
235 283
236typedef struct { 284struct maptex
285{
237 GLuint name; 286 GLuint name;
238 int w, h; 287 int w, h;
239 float s, t; 288 float s, t;
240 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
241 tileid smoothtile; 290 tileid smoothtile;
242 uint8_t smoothlevel; 291 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */ 292 uint8_t unused; /* set to zero on use */
244} maptex; 293};
245 294
246typedef struct { 295struct mapcell
296{
247 uint32_t player; 297 uint32_t player;
248 tileid tile[3]; 298 tileid tile[3];
249 uint16_t darkness; 299 uint16_t darkness;
250 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
251} mapcell; 301};
252 302
253typedef struct { 303struct maprow
304{
254 int32_t c0, c1; 305 int32_t c0, c1;
255 mapcell *col; 306 mapcell *col;
256} maprow; 307};
257 308
258typedef struct map { 309struct mapgrid {
259 int x, y, w, h; 310 int x, y, w, h;
260 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
261 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
262 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
263 314
264 int32_t rows; 315 int32_t rows;
265 maprow *row; 316 maprow *row;
266} *DC__Map; 317};
267 318
268static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
269prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
270{ 324{
271 char *p; 325 T *p;
272 326
273 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
274 Zero (p, inc, char); 328 Zero (p, inc, T);
275 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
276 Safefree (ptr); 330 Safefree (ptr);
277 331
278 return p; 332 ptr = p;
279} 333}
280 334
281static char * 335template<typename T>
336ecb_cold static void
282append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
283{ 338{
284 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
285 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
286
287 return ptr;
288} 341}
289
290#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
292 342
293static void 343static void
294need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
295{ 345{
296 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
297 { 347 return;
348
349 size_t newsize = minpot (face + 1);
298 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
299 self->faces *= 2; 351 self->faces = newsize;
300 }
301} 352}
302 353
303static void 354static void
304need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
305{ 356{
306 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
307 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
308 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
309 self->texs *= 2; 362 self->texs = newsize;
310 }
311} 363}
312 364
313static maprow * 365static maprow *
314map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
315{ 367{
316 if (0 > y) 368 if (0 > y)
317 { 369 {
318 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
319 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
320 372
321 self->rows += extend; 373 self->rows += extend;
322 self->y += extend; 374 self->y += extend;
323 y += extend; 375 y += extend;
324 } 376 }
325 else if (y >= self->rows) 377 else if (y >= self->rows)
326 { 378 {
327 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
328 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
329 self->rows += extend; 381 self->rows += extend;
330 } 382 }
331 383
332 return self->row + y; 384 return self->row + y;
333} 385}
343 } 395 }
344 396
345 if (row->c0 > x) 397 if (row->c0 > x)
346 { 398 {
347 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
348 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
349 row->c0 -= extend; 401 row->c0 -= extend;
350 } 402 }
351 else if (x >= row->c1) 403 else if (x >= row->c1)
352 { 404 {
353 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
354 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
355 row->c1 += extend; 407 row->c1 += extend;
356 } 408 }
357 409
358 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
359} 411}
360 412
361static mapcell * 413static mapcell *
362map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
363{ 415{
364 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
365} 417}
366 418
367static void 419static void
368map_clear (DC__Map self) 420map_clear (mapgrid *self)
369{ 421{
370 int r; 422 int r;
371 423
372 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
373 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
391 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
392 (cell)->player = 0; \ 444 (cell)->player = 0; \
393 } while (0) 445 } while (0)
394 446
395static void 447static void
396map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
397{ 449{
398 int x, y; 450 int x, y;
399 maprow *row; 451 maprow *row;
400 mapcell *cell; 452 mapcell *cell;
401 453
418 CELL_CLEAR (cell); 470 CELL_CLEAR (cell);
419 } 471 }
420 } 472 }
421} 473}
422 474
423typedef struct { 475struct smooth_key
476{
424 tileid tile; 477 tileid tile;
425 uint8_t x, y, level; 478 uint8_t x, y, level;
426} smooth_key; 479
480 bool operator == (const smooth_key &o) const
481 {
482 return tile == o.tile && x == o.x && y == o.y && level == o.level;
483 }
484};
485
486typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
487
488namespace std {
489 template <>
490 struct hash<smooth_key>
491 {
492 size_t operator () (const smooth_key &v) const
493 {
494 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
495 }
496 };
497}
427 498
428static void 499static void
429smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
430{ 501{
431 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
432 503
433 if (SvIOK (*sv)) 504 if (it == h.end ())
434 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
435 else 506 else
436 sv_setiv (*sv, bits); 507 it->second |= bits;
437} 508}
438 509
439static void 510static void
440music_finished (void) 511music_finished (void)
441{ 512{
460 ev.data2 = 0; 531 ev.data2 = 0;
461 532
462 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
463} 534}
464 535
465static unsigned int
466minpot (unsigned int n)
467{
468 if (!n)
469 return 0;
470
471 --n;
472
473 n |= n >> 1;
474 n |= n >> 2;
475 n |= n >> 4;
476 n |= n >> 8;
477 n |= n >> 16;
478
479 return n + 1;
480}
481
482static unsigned int
483popcount (unsigned int n)
484{
485 n -= (n >> 1) & 0x55555555U;
486 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
487 n = ((n >> 4) + n) & 0x0f0f0f0fU;
488 n *= 0x01010101U;
489
490 return n >> 24;
491}
492
493/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
494#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
495#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
496 539
497/******************************************************************************/ 540/******************************************************************************/
550 593
551 return mod; 594 return mod;
552} 595}
553 596
554static void 597static void
555deliantra_main () 598deliantra_main (SV *real_main)
556{ 599{
557 char *argv[] = { 0 }; 600 dSP;
558 call_argv ("::main", G_DISCARD | G_VOID, argv); 601
602 PUSHMARK (SP);
603 call_sv (real_main, G_DISCARD | G_VOID);
559} 604}
560 605
561#ifdef __MACOSX__ 606#ifdef __MACOSX__
607 static SV *real_main;
608
562 /* to due surprising braindamage on the side of SDL design, we 609 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main() 610 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which, 611 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 612 * due to shared library magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back. 613 * and which calls our main (== SDL_main) back.
567 */ 614 */
568 extern C_LINKAGE int 615 extern C_LINKAGE int
569 main (int argc, char *argv[]) 616 main (int argc, char *argv[])
570 { 617 {
571 deliantra_main (); 618 deliantra_main (real_main);
572 } 619 }
573 620
574 #undef main 621 #undef main
575 622
576 extern C_LINKAGE int main (int argc, char *argv[]); 623 extern C_LINKAGE int main (int argc, char *argv[]);
577 624
578 static void 625 static void
579 SDL_braino (void) 626 SDL_main_hack (SV *real_main_)
580 { 627 {
628 real_main = real_main_;
629
581 char *argv[] = { "deliantra client", 0 }; 630 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv); 631 (main) (1, argv);
583 } 632 }
584#else 633#else
585 static void 634 static void
586 SDL_braino (void) 635 SDL_main_hack (SV *real_main)
587 { 636 {
588 deliantra_main (); 637 deliantra_main (real_main);
589 } 638 }
590#endif 639#endif
591 640
592MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
593 642
794 843
795 const_iv (FOW_DARKNESS) 844 const_iv (FOW_DARKNESS)
796# undef const_iv 845# undef const_iv
797 }; 846 };
798 847
799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 848 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 850
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 853}
805 854
820 869
821NV ceil (NV x) 870NV ceil (NV x)
822 871
823IV minpot (UV n) 872IV minpot (UV n)
824 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
825IV popcount (UV n) 880IV popcount (UV n)
881 CODE:
882 RETVAL = ecb_popcount32 (n);
883 OUTPUT:
884 RETVAL
826 885
827NV distance (NV dx, NV dy) 886NV distance (NV dx, NV dy)
828 CODE: 887 CODE:
829 RETVAL = pow (dx * dx + dy * dy, 0.5); 888 RETVAL = pow (dx * dx + dy * dy, 0.5);
830 OUTPUT: 889 OUTPUT:
844#endif 903#endif
845} 904}
846 905
847char *SDL_GetError () 906char *SDL_GetError ()
848 907
849void SDL_braino () 908void SDL_main_hack (SV *real_main)
909 PROTOTYPE: &
850 910
851int SDL_Init (U32 flags) 911int SDL_Init (U32 flags)
852 912
853int SDL_InitSubSystem (U32 flags) 913int SDL_InitSubSystem (U32 flags)
854 914
855void SDL_QuitSubSystem (U32 flags) 915void SDL_QuitSubSystem (U32 flags)
856 916
857void SDL_Quit () 917void SDL_Quit ()
858 918
859int SDL_GL_SetAttribute (int attr, int value) 919int SDL_GL_SetAttribute (int attr, int value)
920 C_ARGS: (SDL_GLattr)attr, value
860 921
861int SDL_GL_GetAttribute (int attr) 922int SDL_GL_GetAttribute (int attr)
862 CODE: 923 CODE:
863 if (SDL_GL_GetAttribute (attr, &RETVAL)) 924 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
864 XSRETURN_UNDEF; 925 XSRETURN_UNDEF;
865 OUTPUT: 926 OUTPUT:
866 RETVAL 927 RETVAL
867 928
868void 929void
923 ); 984 );
924 985
925 if (RETVAL) 986 if (RETVAL)
926 { 987 {
927 av_clear (texture_av); 988 av_clear (texture_av);
928
929 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
930#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 989#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
931#include "glfunc.h" 990#include "glfunc.h"
932#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
933 } 994 }
934} 995}
935 OUTPUT: 996 OUTPUT:
936 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
937 1001
938void 1002void
939SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
940 1004
941char * 1005char *
942SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
943 1008
944int 1009int
945SDL_GetAppState () 1010SDL_GetAppState ()
946 1011
947int 1012int
948SDL_GetModState () 1013SDL_GetModState ()
949 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
950void 1019void
1020SDL_PumpEvents ()
1021
1022void
951poll_events () 1023peep_events ()
952 PPCODE: 1024 PPCODE:
953{ 1025{
954 SDL_Event ev; 1026 SDL_Event ev;
955 1027
956 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
1022 1094
1023 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1095 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1024 } 1096 }
1025} 1097}
1026 1098
1099char *
1100SDL_AudioDriverName ()
1101 CODE:
1102{
1103 char buf [256];
1104 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1105 XSRETURN_UNDEF;
1106
1107 RETVAL = buf;
1108}
1109 OUTPUT:
1110 RETVAL
1111
1027int 1112int
1028Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1113Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1029 POSTCALL: 1114 POSTCALL:
1030 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
1031 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
1032 1117
1033void 1118void
1034Mix_QuerySpec () 1119Mix_QuerySpec ()
1093add_font (char *file) 1178add_font (char *file)
1094 CODE: 1179 CODE:
1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT: 1181 OUTPUT:
1097 RETVAL 1182 RETVAL
1183
1184void
1185IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1186
1187# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1188void
1189Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1098 1190
1099void 1191void
1100load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
1101 ALIAS: 1193 ALIAS:
1102 load_image_file = 1 1194 load_image_file = 1
1148 1240
1149 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
1150 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
1151 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
1152 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
1153 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1154 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1246 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1155 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1156 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1157 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
1158 1250
1230MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1231 1323
1232PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1233 1325
1234DC::Font 1326DC::Font
1235new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1236 CODE: 1328 CODE:
1237{ 1329{
1238 int count; 1330 int count;
1239 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1240 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1269 PROTOTYPE: 1361 PROTOTYPE:
1270 CODE: 1362 CODE:
1271 tc_restore (); 1363 tc_restore ();
1272 1364
1273DC::Layout 1365DC::Layout
1274new (SV *class) 1366new (SV *klass)
1275 CODE: 1367 CODE:
1276 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1277 1369
1278 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1279 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1280 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1281 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1282 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1283 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1284 RETVAL->font = 0; 1376 RETVAL->font = 0;
1285 RETVAL->rc = rc_alloc ();
1286 1377
1287 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1288 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1289 OUTPUT: 1380 OUTPUT:
1290 RETVAL 1381 RETVAL
1291 1382
1292void 1383void
1293DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1294 CODE: 1385 CODE:
1295 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1296 rc_free (self->rc);
1297 Safefree (self); 1387 delete self;
1298 1388
1299void 1389void
1300set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1301 CODE: 1391 CODE:
1302{ 1392{
1428 1518
1429void 1519void
1430set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1431 CODE: 1521 CODE:
1432 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1433 { 1523 {
1434 self->base_height = base_height; 1524 self->base_height = base_height;
1435 layout_update_font (self); 1525 layout_update_font (self);
1436 } 1526 }
1437 1527
1438void 1528void
1556} 1646}
1557 1647
1558void 1648void
1559render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1560 CODE: 1650 CODE:
1561 rc_clear (self->rc); 1651 self->rc.clear ();
1562 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1563 self->pl, 1653 self->pl,
1564 self->rc, 1654 &self->rc,
1565 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1566 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1567 flags 1657 flags
1568 ); 1658 );
1569 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1580 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1581 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1582 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1583 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1584 1674
1585 rc_draw (self->rc); 1675 self->rc.draw ();
1586 1676
1587 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1588 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1589 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1590} 1680}
1670void 1760void
1671draw_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) 1761draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1672 PROTOTYPE: @ 1762 PROTOTYPE: @
1673 CODE: 1763 CODE:
1674{ 1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1675 glEnable (GL_TEXTURE_2D); 1767 glEnable (GL_TEXTURE_2D);
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678 glBindTexture (GL_TEXTURE_2D, name1); 1768 glBindTexture (GL_TEXTURE_2D, name1);
1679 1769
1680 glColor3f (intensity, intensity, intensity); 1770 glColor3f (intensity, intensity, intensity);
1681 glPushMatrix (); 1771 glPushMatrix ();
1682 glScalef (1./3, 1./3, 1.); 1772 glScalef (1./3, 1./3, 1.);
1697 glBindTexture (GL_TEXTURE_2D, name2); 1787 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1789
1700 /* rgb == rgb(glcolor) */ 1790 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1794
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1795 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1797
1802MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1803 1893
1804PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1805 1895
1806DC::Map 1896DC::Map
1807new (SV *class) 1897new (SV *klass)
1808 CODE: 1898 CODE:
1809 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1810 RETVAL->x = 0; 1900 RETVAL->x = 0;
1811 RETVAL->y = 0; 1901 RETVAL->y = 0;
1812 RETVAL->w = 0; 1902 RETVAL->w = 0;
1813 RETVAL->h = 0; 1903 RETVAL->h = 0;
1814 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1851 1941
1852void 1942void
1853set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1854 CODE: 1944 CODE:
1855{ 1945{
1856 tileid texid; 1946 tileid texid;
1857 maptex *tex; 1947 maptex *tex;
1858 1948
1859 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1860 return; 1950 return;
1861 1951
1862 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1863 return; 1953 return;
1864 1954
1865 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1866 1956
1867 if (!texid) 1957 if (!texid)
1868 return; 1958 return;
1869 1959
1870 tex = self->tex + texid; 1960 tex = self->tex + texid;
1903} 1993}
1904 1994
1905void 1995void
1906expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1907 PPCODE: 1997 PPCODE:
1908 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1909 { 1999 {
1910 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1911 2001
1912 if (tex->name) 2002 if (tex->name)
1913 { 2003 {
1960 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1961 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1962 2052
1963 while (self->y < 0) 2053 while (self->y < 0)
1964 { 2054 {
1965 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1966 2056
1967 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1968 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1969 } 2059 }
1970} 2060}
1971 2061
1972SV * 2062SV *
1973map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1974 CODE: 2064 CODE:
1975{ 2065{
1976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1977 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1978 mapcell *cell; 2068 mapcell *cell;
1999 2089
2000 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
2001 2091
2002 if (flags & 8) 2092 if (flags & 8)
2003 { 2093 {
2094 uint8_t ext, cmd;
2095
2004 if (extmap) 2096 do
2005 { 2097 {
2006 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
2007 2100
2008 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
2009 { 2104 {
2010 ext = *data++;
2011 cmd = ext & 0x7f;
2012
2013 if (cmd < 4)
2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2015 else if (cmd == 5) // health
2016 {
2017 cell->stat_width = 1; 2105 cell->stat_width = 1;
2018 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
2019 }
2020 else if (cmd == 6) // monster width
2021 cell->stat_width = *data++ + 1;
2022 else if (cmd == 0x47)
2023 {
2024 if (*data == 1) cell->player = data [1];
2025 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2026 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2027 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2028
2029 data += *data + 1;
2030 }
2031 else if (cmd == 8) // cell flags
2032 cell->flags = *data++;
2033 else if (ext & 0x40) // unknown, multibyte => skip
2034 data += *data + 1;
2035 else
2036 data++;
2037 } 2107 }
2038 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
2039 } 2125 }
2040 else 2126 while (ext & 0x80);
2041 cell->darkness = *data++ + 1;
2042 } 2127 }
2043 2128
2044 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
2045 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
2046 { 2131 {
2094 ? self->row + y 2179 ? self->row + y
2095 : 0; 2180 : 0;
2096 2181
2097 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
2098 { 2183 {
2099 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
2100 2185
2101 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
2102 { 2187 {
2103 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
2104 2189
2106 { 2191 {
2107 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
2108 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
2109 int a1 = tex.a; 2194 int a1 = tex.a;
2110 2195
2111 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
2112 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
2113 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
2114 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
2115 } 2200 }
2116 } 2201 }
2117 2202
2118 *map++ = (r ) 2203 *map++ = (r )
2119 | (g << 8) 2204 | (g << 8)
2120 | (b << 16) 2205 | (b << 16)
2121 | (a << 24); 2206 | (a << 24);
2122 } 2207 }
2123 } 2208 }
2124 2209
2125 RETVAL = map_sv; 2210 RETVAL = map_sv;
2126} 2211}
2127 OUTPUT: 2212 OUTPUT:
2128 RETVAL 2213 RETVAL
2129 2214
2130void 2215void
2131draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2132 CODE: 2217 CODE:
2133{ 2218{
2134 int x, y, z; 2219 int x, y, z;
2135 2220
2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2137 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2138 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2221 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2139 smooth_key skey;
2140 int pl_x, pl_y; 2222 int pl_x, pl_y;
2141 maptex pl_tex; 2223 maptex pl_tex;
2142 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2143 rc_t *rc_ov = rc_alloc (); 2225 rc_t rc_ov;
2144 rc_key_t key; 2226 rc_key_t key;
2145 rc_array_t *arr; 2227 rc_t::array_t *arr;
2146 2228
2147 pl_tex.name = 0; 2229 pl_tex.name = 0;
2148 2230
2149 // that's current max. sorry. 2231 // that's current max. sorry.
2150 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
2151 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
2152
2153 // clear key, in case of extra padding
2154 memset (&skey, 0, sizeof (skey));
2155 2234
2156 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
2157 key.r = 255; 2236 key.r = 255;
2158 key.g = 255; 2237 key.g = 255;
2159 key.b = 255; 2238 key.b = 255;
2165 my += self->y; 2244 my += self->y;
2166 2245
2167 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
2168 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
2169 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
2170 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2171 2250
2172 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
2173 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
2174 { 2253 {
2175 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2192 2271
2193 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
2194 { 2273 {
2195 memset (smooth_level, 0, sizeof (smooth_level)); 2274 std::bitset<256> smooth_level; // one bit for every possible smooth level
2275 smooth_key skey;
2276 smooth_hash smooth;
2196 key.texname = -1; 2277 key.texname = -1;
2197 2278
2198 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
2199 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
2200 { 2281 {
2217 2298
2218 if (!tex.name) 2299 if (!tex.name)
2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2220 2301
2221 key.texname = tex.name; 2302 key.texname = tex.name;
2222 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
2223 } 2304 }
2224 2305
2225 px = (x + 1) * T - tex.w; 2306 px = (x + 1) * Th - tex.w;
2226 py = (y + 1) * T - tex.h; 2307 py = (y + 1) * Tw - tex.h;
2227 2308
2228 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2229 { 2310 {
2230 pl_x = px; 2311 pl_x = px;
2231 pl_y = py; 2312 pl_y = py;
2232 pl_tex = tex; 2313 pl_tex = tex;
2233 continue; 2314 continue;
2234 } 2315 }
2235 2316
2236 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2237 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2238 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2319 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2239 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2240 2321
2241 // update smooth hash 2322 // update smooth hash
2242 if (tex.smoothtile) 2323 if (tex.smoothtile)
2243 { 2324 {
2244 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2245 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2246 2327
2247 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2248 2329
2249 // add bits to current tile and all neighbours. skey.x|y is 2330 // add bits to current tile and all neighbours. skey.x|y is
2250 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2251 2332
2252 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
2260 2341
2261 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2262 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2263 2344
2264 // full tile 2345 // full tile
2265 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2346 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2266 2347
2267 // borders 2348 // borders
2268 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2349 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2269 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2350 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2270 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2351 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2271 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2352 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2272 2353
2273 // corners 2354 // corners
2274 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2355 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2275 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2356 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2276 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2357 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2277 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2358 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2278 } 2359 }
2279 } 2360 }
2280 2361
2281 if (expect_false (z == 2) && expect_false (cell->flags)) 2362 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2282 { 2363 {
2283 // overlays such as the speech bubble, probably more to come 2364 // overlays such as the speech bubble, probably more to come
2284 if (cell->flags & 1) 2365 if (cell->flags & 1)
2285 { 2366 {
2286 rc_key_t key_ov = key; 2367 rc_key_t key_ov = key;
2287 maptex tex = self->tex [TEXID_SPEECH]; 2368 maptex tex = self->tex[TEXID_SPEECH];
2288 rc_array_t *arr;
2289 int px = x * T + T * 2 / 32; 2369 int px = x * Tw + Tw * 2 / 32;
2290 int py = y * T - T * 6 / 32; 2370 int py = y * Th - Th * 6 / 32;
2291 2371
2292 key_ov.texname = tex.name; 2372 key_ov.texname = tex.name;
2293 arr = rc_array (rc_ov, &key_ov); 2373 rc_t::array_t &arr = rc_ov.array (key_ov);
2294 2374
2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2375 arr.t2f_v3f (0 , 0 , px , py , 0);
2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2376 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2297 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2377 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2298 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2378 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2299 } 2379 }
2300 } 2380 }
2301 } 2381 }
2302 } 2382 }
2303 2383
2304 rc_draw (rc); 2384 rc.draw ();
2305 rc_clear (rc); 2385 rc.clear ();
2306 2386
2307 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2308 // this is basically counting sort 2388 // this is basically counting sort
2309 { 2389 {
2310 int w, b; 2390 int w, b;
2311 2391
2312 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2313 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2314 for (w = 0; w < 256 / 32; ++w) 2394 for (int level = 0; level < smooth_level.size (); ++level)
2395 if (smooth_level[level])
2396 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2315 { 2397 {
2316 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2317 if (smask) 2399 IV bits = it->second;
2318 for (b = 0; b < 32; ++b) 2400
2319 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2320 { 2404 {
2321 int level = (w << 5) | b; 2405 maptex tex = self->tex [skey.tile];
2406 int px = (((int)skey.x) - 1) * Tw;
2407 int py = (((int)skey.y) - 1) * Th;
2408 int border = bits & 15;
2409 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2410 float dx = tex.s * .0625f; // 16 images/row
2411 float dy = tex.t * .5f ; // 2 images/column
2412
2322 HE *he; 2413 if (tex.name)
2323
2324 hv_iterinit (smooth);
2325 while ((he = hv_iternext (smooth)))
2326 { 2414 {
2327 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2328 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2329 2417 if (key.texname != tex.name)
2330 if (!(bits & 0x1000)
2331 && skey->level == level
2332 && level > smooth_max [skey->x][skey->y])
2333 { 2418 {
2334 maptex tex = self->tex [skey->tile];
2335 int px = (((int)skey->x) - 1) * T;
2336 int py = (((int)skey->y) - 1) * T;
2337 int border = bits & 15;
2338 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2339 float dx = tex.s * .0625f; // 16 images/row
2340 float dy = tex.t * .5f ; // 2 images/column
2341
2342 if (tex.name)
2343 {
2344 // this time avoiding texture state changes
2345 // save gobs of state changes.
2346 if (key.texname != tex.name)
2347 {
2348 self->tex [skey->tile].unused = 0; 2419 self->tex [skey.tile].unused = 0;
2349 2420
2350 glEnd (); 2421 glEnd ();
2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2352 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2353 } 2424 }
2354 2425
2355 if (border) 2426 if (border)
2356 { 2427 {
2357 float ox = border * dx; 2428 float ox = border * dx;
2358 2429
2359 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2360 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2361 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2362 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2363 } 2434 }
2364 2435
2365 if (corner) 2436 if (corner)
2366 { 2437 {
2367 float ox = corner * dx; 2438 float ox = corner * dx;
2368 2439
2369 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2370 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2371 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2372 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2373 }
2374 }
2375 } 2444 }
2376 } 2445 }
2377 } 2446 }
2378 } 2447 }
2379 2448
2380 glEnd (); 2449 glEnd ();
2381 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2382 key.texname = -1; 2451 key.texname = -1;
2383 } 2452 }
2384
2385 hv_clear (smooth);
2386 } 2453 }
2387 2454
2388 if (pl_tex.name) 2455 if (pl_tex.name)
2389 { 2456 {
2390 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2391 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2392 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2393 2460
2394 key.texname = tex.name; 2461 key.texname = tex.name;
2395 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2396 2463
2397 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2398 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2399 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2466 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2400 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2401 2468
2402 rc_draw (rc); 2469 rc.draw ();
2403 } 2470 }
2404 2471
2405 rc_draw (rc_ov); 2472 rc_ov.draw ();
2406 rc_clear (rc_ov); 2473 rc_ov.clear ();
2407 2474
2408 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2409 rc_free (rc);
2410 rc_free (rc_ov);
2411 2476
2412 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2413 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2414 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2415 { 2480 {
2418 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2419 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2420 { 2485 {
2421 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2422 2487
2423 int px = x * T; 2488 int px = x * Tw;
2424 int py = y * T; 2489 int py = y * Th;
2425 2490
2426 if (expect_false (cell->player == player)) 2491 if (ecb_expect_false (cell->player == player))
2427 { 2492 {
2428 px += sdx; 2493 px += sdx;
2429 py += sdy; 2494 py += sdy;
2430 } 2495 }
2431 2496
2432 if (cell->stat_hp) 2497 if (cell->stat_hp)
2433 { 2498 {
2434 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2436 2501
2437 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2438 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2439 px + width - 1, py); 2504 px + width - 1, py);
2440 2505
2520 int x, y; 2585 int x, y;
2521 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2522 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2523 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2524 int sw3 = sw * 3; 2589 int sw3 = sw * 3;
2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2590 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2591 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2593 memset (darkness1, 0, sw1*sh1);
2528 2594
2529 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2530 SvCUR_set (darkness3_sv, sw3 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2531 2597
2532 mx += self->x - 1; 2598 mx += self->x - 1;
2658 else 2724 else
2659 *data++ = 0; 2725 *data++ = 0;
2660 } 2726 }
2661 } 2727 }
2662 2728
2663 /* if size is w*h + 5 then no data has been found */ 2729 /* if size is w*h + 5 then no data has been found */
2664 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2730 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2665 { 2731 {
2666 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2667 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668 } 2734 }
2669 2735
2670 RETVAL = data_sv; 2736 RETVAL = data_sv;
2671} 2737}
2672 OUTPUT: 2738 OUTPUT:
2673 RETVAL 2739 RETVAL
2674 2740
2675void 2741void
2682 STRLEN len; 2748 STRLEN len;
2683 uint8_t *data, *end; 2749 uint8_t *data, *end;
2684 2750
2685 len = SvLEN (data_sv); 2751 len = SvLEN (data_sv);
2686 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2752 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2687 data = SvPVbyte_nolen (data_sv); 2753 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2688 end = data + len + 8; 2754 end = data + len + 8;
2689 2755
2690 if (len < 5) 2756 if (len < 5)
2691 XSRETURN_EMPTY; 2757 XSRETURN_EMPTY;
2692 2758
2753} 2819}
2754 2820
2755MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2756 2822
2757DC::RW 2823DC::RW
2758new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2759 CODE: 2825 CODE:
2760{ 2826{
2761 STRLEN datalen; 2827 STRLEN datalen;
2762 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2763 2829
2765} 2831}
2766 OUTPUT: 2832 OUTPUT:
2767 RETVAL 2833 RETVAL
2768 2834
2769DC::RW 2835DC::RW
2770new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2771 CODE: 2837 CODE:
2772 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2773 OUTPUT: 2839 OUTPUT:
2774 RETVAL 2840 RETVAL
2775 2841
2793 if (RETVAL < 0) 2859 if (RETVAL < 0)
2794 { 2860 {
2795 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2796 2862
2797 if (RETVAL < 0) 2863 if (RETVAL < 0)
2864 {
2865 // happens sometimes, maybe it just stopped playing(?)
2866 RETVAL = Mix_GroupAvailable (-1);
2867
2868 if (RETVAL < 0)
2798 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2799 2870 }
2871 else
2800 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2801 } 2873 }
2802 2874
2803 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2804 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2805} 2877}
2865 2937
2866MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2867 2939
2868PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2869 2941
2942void
2943decoders ()
2944 PPCODE:
2945#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2946 int i, num = Mix_GetNumChunkDecoders ();
2947 EXTEND (SP, num);
2948 for (i = 0; i < num; ++i)
2949 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2950#else
2951 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2952#endif
2953
2870DC::MixChunk 2954DC::MixChunk
2871new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2872 CODE: 2956 CODE:
2873 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2874 OUTPUT: 2958 OUTPUT:
2875 RETVAL 2959 RETVAL
2876 2960
2906 OUTPUT: 2990 OUTPUT:
2907 RETVAL 2991 RETVAL
2908 2992
2909MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2910 2994
2995void
2996decoders ()
2997 PPCODE:
2998#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2999 int i, num = Mix_GetNumMusicDecoders ();
3000 EXTEND (SP, num);
3001 for (i = 0; i < num; ++i)
3002 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3003#else
3004 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3005#endif
3006
2911int 3007int
2912volume (int volume = -1) 3008volume (int volume = -1)
2913 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2914 CODE: 3010 CODE:
2915 if (items > 0) 3011 if (items > 0)
2926void 3022void
2927halt () 3023halt ()
2928 CODE: 3024 CODE:
2929 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2930 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2931DC::MixMusic 3034DC::MixMusic
2932new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2933 CODE: 3036 CODE:
2934 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2935 OUTPUT: 3038 OUTPUT:
2936 RETVAL 3039 RETVAL
2937 3040
3074 const_iv (GL_FUNC_SUBTRACT), 3177 const_iv (GL_FUNC_SUBTRACT),
3075 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3178 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3076# undef const_iv 3179# undef const_iv
3077 }; 3180 };
3078 3181
3079 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3182 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3081 3184
3082 texture_av = newAV (); 3185 texture_av = newAV ();
3083 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
3084} 3187}
3085 3188
3090 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
3091 3194
3092void 3195void
3093apple_nvidia_bug (int enable) 3196apple_nvidia_bug (int enable)
3094 3197
3095char * 3198const char *
3096gl_vendor () 3199gl_vendor ()
3097 CODE: 3200 CODE:
3098 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
3099 OUTPUT: 3202 OUTPUT:
3100 RETVAL 3203 RETVAL
3101 3204
3102char * 3205const char *
3103gl_version () 3206gl_version ()
3104 CODE: 3207 CODE:
3105 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
3106 OUTPUT: 3209 OUTPUT:
3107 RETVAL 3210 RETVAL
3108 3211
3109char * 3212const char *
3110gl_extensions () 3213gl_extensions ()
3111 CODE: 3214 CODE:
3112 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3113 OUTPUT: 3216 OUTPUT:
3114 RETVAL 3217 RETVAL
3115 3218
3116const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
3117 3224
3118GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
3119 CODE: 3226 CODE:
3120 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
3121 OUTPUT: 3228 OUTPUT:
3128 RETVAL 3235 RETVAL
3129 3236
3130int glGetError () 3237int glGetError ()
3131 3238
3132void glFinish () 3239void glFinish ()
3240
3241void glFlush ()
3133 3242
3134void glClear (int mask) 3243void glClear (int mask)
3135 3244
3136void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
3137 PROTOTYPE: @ 3246 PROTOTYPE: @
3322 3431
3323void 3432void
3324find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
3325 PPCODE: 3434 PPCODE:
3326{ 3435{
3327 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
3328 XPUSHs (self); 3437 XPUSHs (self);
3329} 3438}
3330 3439
3331BOOT: 3440BOOT:
3332{ 3441{
3340 3449
3341void 3450void
3342draw (SV *self) 3451draw (SV *self)
3343 CODE: 3452 CODE:
3344{ 3453{
3345 HV *hv; 3454 HV *hv;
3346 SV **svp; 3455 SV **svp;
3347 NV x, y, w, h; 3456 NV x, y, w, h;
3348 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
3349 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
3350 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
3351 SV *draw_h_sv = GvSV (draw_h_gv); 3460 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines