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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines