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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines