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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines