ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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