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.277 by root, Mon Sep 1 06:18:09 2008 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 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 roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef 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);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
70# include <netinet/in.h> 76# include <netinet/in.h>
71# include <netinet/tcp.h> 77# include <netinet/tcp.h>
72# include <inttypes.h> 78# include <inttypes.h>
73#endif 79#endif
74 80
75#if __GNUC__ >= 4 81#include "ecb.h"
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83 82
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
87 89
88#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
90 92
91#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
92 94
93/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 97
96#define KMOD_LRAM 0x10000 // our extension 98#define KMOD_LRAM 0x10000 // our extension
99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
102
103static char *
104fast_sv_grow (SV *sv, STRLEN need)
105{
106 STRLEN len = SvLEN (sv);
107 STRLEN want = SvCUR (sv) + need;
108
109 if (ecb_expect_false (len < want))
110 {
111 do
112 len *= 2;
113 while (len < want);
114
115 sv_grow (sv, len);
116 }
117
118 SvCUR_set (sv, want);
119 return SvEND (sv) - need;
120}
97 121
98static AV *texture_av; 122static AV *texture_av;
99 123
100static struct 124static struct
101{ 125{
158{ 182{
159 GSList *attrs = run->item->analysis.extra_attrs; 183 GSList *attrs = run->item->analysis.extra_attrs;
160 184
161 while (attrs) 185 while (attrs)
162 { 186 {
163 PangoAttribute *attr = attrs->data; 187 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 188
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 189 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 190 return 1;
167 191
168 attrs = attrs->next; 192 attrs = attrs->next;
169 } 193 }
170 194
171 return 0; 195 return 0;
172} 196}
173 197
174typedef struct cf_layout { 198struct cf_layout {
175 PangoLayout *pl; 199 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
177 int base_height; 201 int base_height;
178 DC__Font font; 202 DC__Font font;
179 rc_t *rc; 203 rc_t rc;
180} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
181 207
182static DC__Font default_font; 208static DC__Font default_font;
183static PangoContext *opengl_context; 209static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
185 211
186static void 212static void
187substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
188{ 214{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 218#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 220}
195 221
196static void 222static void
223 249
224 *w = rect.width; 250 *w = rect.width;
225 *h = rect.height; 251 *h = rect.height;
226} 252}
227 253
254/////////////////////////////////////////////////////////////////////////////
255
228typedef uint16_t tileid; 256typedef uint16_t tileid;
229typedef uint16_t faceid; 257typedef uint16_t faceid;
230 258
231typedef struct { 259struct maptex
260{
232 GLuint name; 261 GLuint name;
233 int w, h; 262 int w, h;
234 float s, t; 263 float s, t;
235 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
236 tileid smoothtile; 265 tileid smoothtile;
237 uint8_t smoothlevel; 266 uint8_t smoothlevel;
238} maptex; 267 uint8_t unused; /* set to zero on use */
268};
239 269
240typedef struct { 270struct mapcell
271{
241 uint32_t player; 272 uint32_t player;
242 tileid tile[3]; 273 tileid tile[3];
243 uint16_t darkness; 274 uint16_t darkness;
244 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
245} mapcell; 276};
246 277
247typedef struct { 278struct maprow
279{
248 int32_t c0, c1; 280 int32_t c0, c1;
249 mapcell *col; 281 mapcell *col;
250} maprow; 282};
251 283
252typedef struct map { 284struct mapgrid {
253 int x, y, w, h; 285 int x, y, w, h;
254 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
255 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
256 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
257 289
258 int32_t rows; 290 int32_t rows;
259 maprow *row; 291 maprow *row;
260} *DC__Map; 292};
261 293
262static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
263prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
264{ 299{
265 char *p; 300 T *p;
266 301
267 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
268 Zero (p, inc, char); 303 Zero (p, inc, T);
269 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
270 Safefree (ptr); 305 Safefree (ptr);
271 306
272 return p; 307 ptr = p;
273} 308}
274 309
275static char * 310template<typename T>
276append (char *ptr, int sze, int inc)
277{
278 Renew (ptr, sze + inc, char);
279 Zero (ptr + sze, inc, char);
280
281 return ptr;
282}
283
284#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
285#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
286
287static void 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
288need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
289{ 320{
290 while (self->faces <= face) 321 while (self->faces <= face)
291 { 322 {
292 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
293 self->faces *= 2; 324 self->faces *= 2;
294 } 325 }
295} 326}
296 327
297static void 328static void
298need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
299{ 330{
300 while (self->texs <= texid) 331 while (self->texs <= texid)
301 { 332 {
302 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
303 self->texs *= 2; 334 self->texs *= 2;
304 } 335 }
305} 336}
306 337
307static maprow * 338static maprow *
308map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
309{ 340{
310 if (0 > y) 341 if (0 > y)
311 { 342 {
312 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
313 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
314 345
315 self->rows += extend; 346 self->rows += extend;
316 self->y += extend; 347 self->y += extend;
317 y += extend; 348 y += extend;
318 } 349 }
319 else if (y >= self->rows) 350 else if (y >= self->rows)
320 { 351 {
321 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
322 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
323 self->rows += extend; 354 self->rows += extend;
324 } 355 }
325 356
326 return self->row + y; 357 return self->row + y;
327} 358}
337 } 368 }
338 369
339 if (row->c0 > x) 370 if (row->c0 > x)
340 { 371 {
341 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
342 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
343 row->c0 -= extend; 374 row->c0 -= extend;
344 } 375 }
345 else if (x >= row->c1) 376 else if (x >= row->c1)
346 { 377 {
347 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
348 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
349 row->c1 += extend; 380 row->c1 += extend;
350 } 381 }
351 382
352 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
353} 384}
354 385
355static mapcell * 386static mapcell *
356map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
357{ 388{
358 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
359} 390}
360 391
361static void 392static void
362map_clear (DC__Map self) 393map_clear (mapgrid *self)
363{ 394{
364 int r; 395 int r;
365 396
366 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
367 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
385 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
386 (cell)->player = 0; \ 417 (cell)->player = 0; \
387 } while (0) 418 } while (0)
388 419
389static void 420static void
390map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
391{ 422{
392 int x, y; 423 int x, y;
393 maprow *row; 424 maprow *row;
394 mapcell *cell; 425 mapcell *cell;
395 426
412 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
413 } 444 }
414 } 445 }
415} 446}
416 447
417typedef struct { 448struct smooth_key
449{
418 tileid tile; 450 tileid tile;
419 uint8_t x, y, level; 451 uint8_t x, y, level;
420} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
421 471
422static void 472static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
424{ 474{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
426 476
427 if (SvIOK (*sv)) 477 if (it == h.end ())
428 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
429 else 479 else
430 sv_setiv (*sv, bits); 480 it->second |= bits;
431} 481}
432 482
433static void 483static void
434music_finished (void) 484music_finished (void)
435{ 485{
452 ev.code = 1; 502 ev.code = 1;
453 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
454 ev.data2 = 0; 504 ev.data2 = 0;
455 505
456 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
457} 514}
458 515
459static unsigned int 516static unsigned int
460minpot (unsigned int n) 517minpot (unsigned int n)
461{ 518{
471 n |= n >> 16; 528 n |= n >> 16;
472 529
473 return n + 1; 530 return n + 1;
474} 531}
475 532
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
487/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
488#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
489#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
490 536
491/******************************************************************************/ 537/******************************************************************************/
544 590
545 return mod; 591 return mod;
546} 592}
547 593
548static void 594static void
549deliantra_main () 595deliantra_main (SV *real_main)
550{ 596{
551 char *argv[] = { 0 }; 597 dSP;
552 call_argv ("::main", G_DISCARD | G_VOID, argv); 598
599 PUSHMARK (SP);
600 call_sv (real_main, G_DISCARD | G_VOID);
553} 601}
554 602
555#ifdef __MACOSX__ 603#ifdef __MACOSX__
604 static SV *real_main;
605
556 /* to due surprising braindamage on the side of SDL design, we 606 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main() 607 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which, 608 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 609 * due to shared library magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back. 610 * and which calls our main (== SDL_main) back.
561 */ 611 */
562 extern C_LINKAGE int 612 extern C_LINKAGE int
563 main (int argc, char *argv[]) 613 main (int argc, char *argv[])
564 { 614 {
565 deliantra_main (); 615 deliantra_main (real_main);
566 } 616 }
567 617
568 #undef main 618 #undef main
569 619
570 extern C_LINKAGE int main (int argc, char *argv[]); 620 extern C_LINKAGE int main (int argc, char *argv[]);
571 621
572 static void 622 static void
573 SDL_braino (void) 623 SDL_main_hack (SV *real_main_)
574 { 624 {
625 real_main = real_main_;
626
575 char *argv[] = { "deliantra client", 0 }; 627 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv); 628 (main) (1, argv);
577 } 629 }
578#else 630#else
579 static void 631 static void
580 SDL_braino (void) 632 SDL_main_hack (SV *real_main)
581 { 633 {
582 deliantra_main (); 634 deliantra_main (real_main);
583 } 635 }
584#endif 636#endif
585 637
586MODULE = Deliantra::Client PACKAGE = DC 638MODULE = Deliantra::Client PACKAGE = DC
587 639
788 840
789 const_iv (FOW_DARKNESS) 841 const_iv (FOW_DARKNESS)
790# undef const_iv 842# undef const_iv
791 }; 843 };
792 844
793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 845 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 846 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795 847
796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 848 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 849 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798} 850}
799 851
815NV ceil (NV x) 867NV ceil (NV x)
816 868
817IV minpot (UV n) 869IV minpot (UV n)
818 870
819IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
876
877NV distance (NV dx, NV dy)
878 CODE:
879 RETVAL = pow (dx * dx + dy * dy, 0.5);
880 OUTPUT:
881 RETVAL
820 882
821void 883void
822pango_init () 884pango_init ()
823 CODE: 885 CODE:
824{ 886{
832#endif 894#endif
833} 895}
834 896
835char *SDL_GetError () 897char *SDL_GetError ()
836 898
837void SDL_braino () 899void SDL_main_hack (SV *real_main)
900 PROTOTYPE: &
838 901
839int SDL_Init (U32 flags) 902int SDL_Init (U32 flags)
840 903
841int SDL_InitSubSystem (U32 flags) 904int SDL_InitSubSystem (U32 flags)
842 905
843void SDL_QuitSubSystem (U32 flags) 906void SDL_QuitSubSystem (U32 flags)
844 907
845void SDL_Quit () 908void SDL_Quit ()
846 909
847int SDL_GL_SetAttribute (int attr, int value) 910int SDL_GL_SetAttribute (int attr, int value)
911 C_ARGS: (SDL_GLattr)attr, value
848 912
849int SDL_GL_GetAttribute (int attr) 913int SDL_GL_GetAttribute (int attr)
850 CODE: 914 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL)) 915 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
852 XSRETURN_UNDEF; 916 XSRETURN_UNDEF;
853 OUTPUT: 917 OUTPUT:
854 RETVAL 918 RETVAL
855 919
856void 920void
911 ); 975 );
912 976
913 if (RETVAL) 977 if (RETVAL)
914 { 978 {
915 av_clear (texture_av); 979 av_clear (texture_av);
916
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 980#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
919#include "glfunc.h" 981#include "glfunc.h"
920#undef GL_FUNC 982#undef GL_FUNC
983 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
984 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921 } 985 }
922} 986}
923 OUTPUT: 987 OUTPUT:
924 RETVAL 988 RETVAL
989
990void
991SDL_WM_SetCaption (const char *title, const char *icon)
925 992
926void 993void
927SDL_GL_SwapBuffers () 994SDL_GL_SwapBuffers ()
928 995
929char * 996char *
930SDL_GetKeyName (int sym) 997SDL_GetKeyName (int sym)
998 C_ARGS: (SDLKey)sym
931 999
932int 1000int
933SDL_GetAppState () 1001SDL_GetAppState ()
934 1002
935int 1003int
936SDL_GetModState () 1004SDL_GetModState ()
937 1005
1006int
1007SDL_WaitEvent ()
1008 C_ARGS: 0
1009
938void 1010void
1011SDL_PumpEvents ()
1012
1013void
939poll_events () 1014peep_events ()
940 PPCODE: 1015 PPCODE:
941{ 1016{
942 SDL_Event ev; 1017 SDL_Event ev;
943 1018
944 SDL_PumpEvents (); 1019 SDL_PumpEvents ();
1010 1085
1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1086 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1012 } 1087 }
1013} 1088}
1014 1089
1090char *
1091SDL_AudioDriverName ()
1092 CODE:
1093{
1094 char buf [256];
1095 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1096 XSRETURN_UNDEF;
1097
1098 RETVAL = buf;
1099}
1100 OUTPUT:
1101 RETVAL
1102
1015int 1103int
1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1104Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1017 POSTCALL: 1105 POSTCALL:
1018 Mix_HookMusicFinished (music_finished); 1106 Mix_HookMusicFinished (music_finished);
1019 Mix_ChannelFinished (channel_finished); 1107 Mix_ChannelFinished (channel_finished);
1020 1108
1021void 1109void
1022Mix_QuerySpec () 1110Mix_QuerySpec ()
1081add_font (char *file) 1169add_font (char *file)
1082 CODE: 1170 CODE:
1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1171 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT: 1172 OUTPUT:
1085 RETVAL 1173 RETVAL
1174
1175void
1176IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1177
1178# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1179void
1180Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1086 1181
1087void 1182void
1088load_image_inline (SV *image_) 1183load_image_inline (SV *image_)
1089 ALIAS: 1184 ALIAS:
1090 load_image_file = 1 1185 load_image_file = 1
1136 1231
1137 SDL_LockSurface (surface2); 1232 SDL_LockSurface (surface2);
1138 EXTEND (SP, 6); 1233 EXTEND (SP, 6);
1139 PUSHs (sv_2mortal (newSViv (surface2->w))); 1234 PUSHs (sv_2mortal (newSViv (surface2->w)));
1140 PUSHs (sv_2mortal (newSViv (surface2->h))); 1235 PUSHs (sv_2mortal (newSViv (surface2->h)));
1141 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1236 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1142 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1237 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1143 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1238 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1144 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1239 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1145 SDL_UnlockSurface (surface2); 1240 SDL_UnlockSurface (surface2);
1146 1241
1206#if DEBUG 1301#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1302 VALGRIND_DO_LEAK_CHECK;
1208#endif 1303#endif
1209} 1304}
1210 1305
1306int
1307SvREFCNT (SV *sv)
1308 CODE:
1309 RETVAL = SvREFCNT (sv);
1310 OUTPUT:
1311 RETVAL
1312
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1313MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1314
1213PROTOTYPES: DISABLE 1315PROTOTYPES: DISABLE
1214 1316
1215DC::Font 1317DC::Font
1216new_from_file (SV *class, char *path, int id = 0) 1318new_from_file (SV *klass, char *path, int id = 0)
1217 CODE: 1319 CODE:
1218{ 1320{
1219 int count; 1321 int count;
1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1322 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1221 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1323 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1250 PROTOTYPE: 1352 PROTOTYPE:
1251 CODE: 1353 CODE:
1252 tc_restore (); 1354 tc_restore ();
1253 1355
1254DC::Layout 1356DC::Layout
1255new (SV *class) 1357new (SV *klass)
1256 CODE: 1358 CODE:
1257 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1258 1360
1259 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1260 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1261 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1262 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1263 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1264 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1265 RETVAL->font = 0; 1367 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
1267 1368
1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1269 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1270 OUTPUT: 1371 OUTPUT:
1271 RETVAL 1372 RETVAL
1272 1373
1273void 1374void
1274DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1275 CODE: 1376 CODE:
1276 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1277 rc_free (self->rc);
1278 Safefree (self); 1378 delete self;
1279 1379
1280void 1380void
1281set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1282 CODE: 1382 CODE:
1283{ 1383{
1409 1509
1410void 1510void
1411set_height (DC::Layout self, int base_height) 1511set_height (DC::Layout self, int base_height)
1412 CODE: 1512 CODE:
1413 if (self->base_height != base_height) 1513 if (self->base_height != base_height)
1414 { 1514 {
1415 self->base_height = base_height; 1515 self->base_height = base_height;
1416 layout_update_font (self); 1516 layout_update_font (self);
1417 } 1517 }
1418 1518
1419void 1519void
1537} 1637}
1538 1638
1539void 1639void
1540render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1541 CODE: 1641 CODE:
1542 rc_clear (self->rc); 1642 self->rc.clear ();
1543 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1544 self->pl, 1644 self->pl,
1545 self->rc, 1645 &self->rc,
1546 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1547 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1548 flags 1648 flags
1549 ); 1649 );
1550 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1565 1665
1566 rc_draw (self->rc); 1666 self->rc.draw ();
1567 1667
1568 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1571} 1671}
1646 glDisable (GL_ALPHA_TEST); 1746 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1747 glDisable (GL_BLEND);
1648 } 1748 }
1649} 1749}
1650 1750
1751void
1752draw_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)
1753 PROTOTYPE: @
1754 CODE:
1755{
1756 glEnable (GL_BLEND);
1757 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1758 glEnable (GL_TEXTURE_2D);
1759 glBindTexture (GL_TEXTURE_2D, name1);
1760
1761 glColor3f (intensity, intensity, intensity);
1762 glPushMatrix ();
1763 glScalef (1./3, 1./3, 1.);
1764
1765 if (blend > 0.f)
1766 {
1767 float dx3 = dx * -3.f / w;
1768 float dy3 = dy * -3.f / h;
1769 GLfloat env_color[4] = { 0., 0., 0., blend };
1770
1771 /* interpolate the two shadow textures */
1772 /* stage 0 == rgb(glcolor) + alpha(t0) */
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774
1775 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1776 gl.ActiveTexture (GL_TEXTURE1);
1777 glEnable (GL_TEXTURE_2D);
1778 glBindTexture (GL_TEXTURE_2D, name2);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1780
1781 /* rgb == rgb(glcolor) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1783 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1785
1786 /* alpha = interpolate t0, t1 by env_alpha */
1787 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1788
1789 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1798
1799 glBegin (GL_QUADS);
1800 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1804 glEnd ();
1805
1806 glDisable (GL_TEXTURE_2D);
1807 gl.ActiveTexture (GL_TEXTURE0);
1808 }
1809 else
1810 {
1811 /* simple blending of one texture, also opengl <1.3 path */
1812 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1813
1814 glBegin (GL_QUADS);
1815 glTexCoord2f (0, 0); glVertex2f (0, 0);
1816 glTexCoord2f (0, t); glVertex2f (0, h);
1817 glTexCoord2f (s, t); glVertex2f (w, h);
1818 glTexCoord2f (s, 0); glVertex2f (w, 0);
1819 glEnd ();
1820 }
1821
1822 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1823 {
1824 int x, y;
1825 int dx3 = dx * 3;
1826 int dy3 = dy * 3;
1827
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1829 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1830 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1831 glTranslatef (-1., -1., 0);
1832 glBegin (GL_QUADS);
1833
1834 for (y = 1; y < h; y += 3)
1835 {
1836 int y1 = y - dy3;
1837 int y1valid = y1 >= 0 && y1 < h;
1838
1839 for (x = 1; x < w; x += 3)
1840 {
1841 int x1 = x - dx3;
1842 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1843 uint8_t h2;
1844
1845 if (y1valid && x1 >= 0 && x1 < w)
1846 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1847 else
1848 h2 = 1; /* out of range == invisible */
1849
1850 if (h1 || h2)
1851 {
1852 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1853 glColor4f (1., 1., 1., alpha);
1854
1855 glTexCoord2f (0, 0.); glVertex2i (x , y );
1856 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1857 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1858 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1859 }
1860 }
1861 }
1862 }
1863
1864 glEnd ();
1865
1866 glPopMatrix ();
1867
1868 glDisable (GL_TEXTURE_2D);
1869 glDisable (GL_BLEND);
1870}
1871
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1872IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1873 CODE:
1653{ 1874{
1654 GLint width; 1875 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1876 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1662MODULE = Deliantra::Client PACKAGE = DC::Map 1883MODULE = Deliantra::Client PACKAGE = DC::Map
1663 1884
1664PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1665 1886
1666DC::Map 1887DC::Map
1667new (SV *class) 1888new (SV *klass)
1668 CODE: 1889 CODE:
1669 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1670 RETVAL->x = 0; 1891 RETVAL->x = 0;
1671 RETVAL->y = 0; 1892 RETVAL->y = 0;
1672 RETVAL->w = 0; 1893 RETVAL->w = 0;
1673 RETVAL->h = 0; 1894 RETVAL->h = 0;
1674 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
1711 1932
1712void 1933void
1713set_smooth (DC::Map self, int face, int smooth, int level) 1934set_smooth (DC::Map self, int face, int smooth, int level)
1714 CODE: 1935 CODE:
1715{ 1936{
1716 tileid texid; 1937 tileid texid;
1717 maptex *tex; 1938 maptex *tex;
1718 1939
1719 if (face < 0 || face >= self->faces) 1940 if (face < 0 || face >= self->faces)
1720 return; 1941 return;
1721 1942
1722 if (smooth < 0 || smooth >= self->faces) 1943 if (smooth < 0 || smooth >= self->faces)
1723 return; 1944 return;
1724 1945
1725 texid = self->face2tile [face]; 1946 texid = self->face2tile [face];
1726 1947
1727 if (!texid) 1948 if (!texid)
1728 return; 1949 return;
1729 1950
1730 tex = self->tex + texid; 1951 tex = self->tex + texid;
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1980 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1981 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1982 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1983 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1984}
1985
1986void
1987expire_textures (DC::Map self, int texid, int count)
1988 PPCODE:
1989 for (; texid < self->texs && count; ++texid, --count)
1990 {
1991 maptex *tex = self->tex + texid;
1992
1993 if (tex->name)
1994 {
1995 if (tex->unused)
1996 {
1997 tex->name = 0;
1998 tex->unused = 0;
1999 XPUSHs (sv_2mortal (newSViv (texid)));
2000 }
2001 else
2002 tex->unused = 1;
2003 }
2004 }
1764 2005
1765int 2006int
1766ox (DC::Map self) 2007ox (DC::Map self)
1767 ALIAS: 2008 ALIAS:
1768 oy = 1 2009 oy = 1
1800 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
1801 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
1802 2043
1803 while (self->y < 0) 2044 while (self->y < 0)
1804 { 2045 {
1805 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
1806 2047
1807 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
1808 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
1809 } 2050 }
1810} 2051}
1811 2052
1812SV * 2053SV *
1813map1a_update (DC::Map self, SV *data_, int extmap) 2054map1a_update (DC::Map self, SV *data_)
1814 CODE: 2055 CODE:
1815{ 2056{
1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2057 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1817 uint8_t *data_end = (uint8_t *)SvEND (data_); 2058 uint8_t *data_end = (uint8_t *)SvEND (data_);
1818 mapcell *cell; 2059 mapcell *cell;
1839 2080
1840 //TODO: don't trust server data to be in-range(!) 2081 //TODO: don't trust server data to be in-range(!)
1841 2082
1842 if (flags & 8) 2083 if (flags & 8)
1843 { 2084 {
2085 uint8_t ext, cmd;
2086
1844 if (extmap) 2087 do
1845 { 2088 {
1846 uint8_t ext, cmd; 2089 ext = *data++;
2090 cmd = ext & 0x7f;
1847 2091
1848 do 2092 if (cmd < 4)
2093 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2094 else if (cmd == 5) // health
1849 { 2095 {
1850 ext = *data++;
1851 cmd = ext & 0x7f;
1852
1853 if (cmd < 4)
1854 cell->darkness = 255 - ext * 64 + 1;
1855 else if (cmd == 5) // health
1856 {
1857 cell->stat_width = 1; 2096 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2097 cell->stat_hp = *data++;
1859 }
1860 else if (cmd == 6) // monster width
1861 cell->stat_width = *data++ + 1;
1862 else if (cmd == 0x47)
1863 {
1864 if (*data == 1) cell->player = data [1];
1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1868
1869 data += *data + 1;
1870 }
1871 else if (cmd == 8) // cell flags
1872 cell->flags = *data++;
1873 else if (ext & 0x40) // unknown, multibyte => skip
1874 data += *data + 1;
1875 else
1876 data++;
1877 } 2098 }
1878 while (ext & 0x80); 2099 else if (cmd == 6) // monster width
2100 cell->stat_width = *data++ + 1;
2101 else if (cmd == 0x47)
2102 {
2103 if (*data == 1) cell->player = data [1];
2104 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2105 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2106 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2107
2108 data += *data + 1;
2109 }
2110 else if (cmd == 8) // cell flags
2111 cell->flags = *data++;
2112 else if (ext & 0x40) // unknown, multibyte => skip
2113 data += *data + 1;
2114 else
2115 data++;
1879 } 2116 }
1880 else 2117 while (ext & 0x80);
1881 cell->darkness = *data++ + 1;
1882 } 2118 }
1883 2119
1884 for (z = 0; z <= 2; ++z) 2120 for (z = 0; z <= 2; ++z)
1885 if (flags & (4 >> z)) 2121 if (flags & (4 >> z))
1886 { 2122 {
1889 cell->tile [z] = self->face2tile [face]; 2125 cell->tile [z] = self->face2tile [face];
1890 2126
1891 if (cell->tile [z]) 2127 if (cell->tile [z])
1892 { 2128 {
1893 maptex *tex = self->tex + cell->tile [z]; 2129 maptex *tex = self->tex + cell->tile [z];
2130 tex->unused = 0;
1894 if (!tex->name) 2131 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2132 av_push (missing, newSViv (cell->tile [z]));
1896 2133
1897 if (tex->smoothtile) 2134 if (tex->smoothtile)
1898 { 2135 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2136 maptex *smooth = self->tex + tex->smoothtile;
2137 smooth->unused = 0;
1900 if (!smooth->name) 2138 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2139 av_push (missing, newSViv (tex->smoothtile));
1902 } 2140 }
1903 } 2141 }
1904 } 2142 }
1932 ? self->row + y 2170 ? self->row + y
1933 : 0; 2171 : 0;
1934 2172
1935 for (x = x0; x < x1; x++) 2173 for (x = x0; x < x1; x++)
1936 { 2174 {
1937 int r = 32, g = 32, b = 32, a = 192; 2175 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2176
1939 if (row && row->c0 <= x && x < row->c1) 2177 if (row && row->c0 <= x && x < row->c1)
1940 { 2178 {
1941 mapcell *cell = row->col + (x - row->c0); 2179 mapcell *cell = row->col + (x - row->c0);
1942 2180
1944 { 2182 {
1945 maptex tex = self->tex [cell->tile [z]]; 2183 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2184 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2185 int a1 = tex.a;
1948 2186
1949 r = (r * a0 + tex.r * a1) / 255; 2187 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2188 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2189 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2190 a = div255 (a * a0 + tex.a * a1);
1953 } 2191 }
1954 } 2192 }
1955 2193
1956 *map++ = (r ) 2194 *map++ = (r )
1957 | (g << 8) 2195 | (g << 8)
1958 | (b << 16) 2196 | (b << 16)
1959 | (a << 24); 2197 | (a << 24);
1960 } 2198 }
1961 } 2199 }
1962 2200
1963 RETVAL = map_sv; 2201 RETVAL = map_sv;
1964} 2202}
1965 OUTPUT: 2203 OUTPUT:
1966 RETVAL 2204 RETVAL
1967 2205
1968void 2206void
1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2207draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1970 CODE: 2208 CODE:
1971{ 2209{
1972 int x, y, z; 2210 int x, y, z;
1973 2211
1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2212 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1977 smooth_key skey;
1978 int pl_x, pl_y; 2213 int pl_x, pl_y;
1979 maptex pl_tex; 2214 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2216 rc_t rc_ov;
1981 rc_key_t key; 2217 rc_key_t key;
1982 rc_array_t *arr; 2218 rc_t::array_t *arr;
1983 2219
1984 pl_tex.name = 0; 2220 pl_tex.name = 0;
1985 2221
1986 // thats current max. sorry. 2222 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
1989
1990 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey));
1992 2225
1993 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
1994 key.r = 255; 2227 key.r = 255;
1995 key.g = 255; 2228 key.g = 255;
1996 key.b = 255; 2229 key.b = 255;
1997 key.a = 255; 2230 key.a = 255;
1998 key.mode = GL_QUADS; 2231 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2232 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2233
2002 mx += self->x; 2234 mx += self->x;
2003 my += self->y; 2235 my += self->y;
2004 2236
2005 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
2006 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
2007 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
2008 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2009 2241
2010 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2011 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
2012 { 2244 {
2013 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2262
2031 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
2032 { 2264 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2268 key.texname = -1;
2034 2269
2035 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
2037 { 2272 {
2038 maprow *row = self->row + (y + my); 2273 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2279 tileid tile = cell->tile [z];
2045 2280
2046 if (tile) 2281 if (tile)
2047 { 2282 {
2048 maptex tex = self->tex [tile]; 2283 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2284 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2285
2052 if (key.texname != tex.name) 2286 if (key.texname != tex.name)
2053 { 2287 {
2288 self->tex [tile].unused = 0;
2289
2054 if (!tex.name) 2290 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2292
2057 key.texname = tex.name; 2293 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
2059 } 2295 }
2060 2296
2297 px = (x + 1) * Th - tex.w;
2298 py = (y + 1) * Tw - tex.h;
2299
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2062 { 2301 {
2063 pl_x = px; 2302 pl_x = px;
2064 pl_y = py; 2303 pl_y = py;
2065 pl_tex = tex; 2304 pl_tex = tex;
2066 continue; 2305 continue;
2067 } 2306 }
2068 2307
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2310 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098 2312
2099 // update smooth hash 2313 // update smooth hash
2100 if (tex.smoothtile) 2314 if (tex.smoothtile)
2101 { 2315 {
2102 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
2104 2318
2105 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
2106 2320
2107 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
2108 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
2109 2323
2110 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
2118 2332
2119 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2120 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2121 2335
2122 // full tile 2336 // full tile
2123 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2124 2338
2125 // borders 2339 // borders
2126 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2127 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2341 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2128 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2342 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2129 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2130 2344
2131 // corners 2345 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2133 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2347 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2134 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2348 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2135 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2350 }
2351 }
2352
2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2354 {
2355 // overlays such as the speech bubble, probably more to come
2356 if (cell->flags & 1)
2357 {
2358 rc_key_t key_ov = key;
2359 maptex tex = self->tex[TEXID_SPEECH];
2360 int px = x * Tw + Tw * 2 / 32;
2361 int py = y * Th - Th * 6 / 32;
2362
2363 key_ov.texname = tex.name;
2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2365
2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2136 } 2370 }
2137 } 2371 }
2138 } 2372 }
2139 } 2373 }
2140 2374
2141 rc_draw (rc); 2375 rc.draw ();
2142 rc_clear (rc); 2376 rc.clear ();
2143 2377
2144 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2145 // this is basically counting sort 2379 // this is basically counting sort
2146 { 2380 {
2147 int w, b; 2381 int w, b;
2148 2382
2149 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2151 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2152 { 2388 {
2153 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2154 if (smask) 2390 IV bits = it->second;
2155 for (b = 0; b < 32; ++b) 2391
2156 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2157 { 2395 {
2158 int level = (w << 5) | b; 2396 maptex tex = self->tex [skey.tile];
2397 int px = (((int)skey.x) - 1) * Tw;
2398 int py = (((int)skey.y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
2159 HE *he; 2404 if (tex.name)
2160
2161 hv_iterinit (smooth);
2162 while ((he = hv_iternext (smooth)))
2163 { 2405 {
2164 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2165 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2166 2408 if (key.texname != tex.name)
2167 if (!(bits & 0x1000)
2168 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y])
2170 { 2409 {
2171 maptex tex = self->tex [skey->tile]; 2410 self->tex [skey.tile].unused = 0;
2172 int px = (((int)skey->x) - 1) * T;
2173 int py = (((int)skey->y) - 1) * T;
2174 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column
2178 2411
2179 if (tex.name)
2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
2183 if (key.texname != tex.name)
2184 {
2185 glEnd (); 2412 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2188 } 2415 }
2189 2416
2190 if (border) 2417 if (border)
2191 { 2418 {
2192 float ox = border * dx; 2419 float ox = border * dx;
2193 2420
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2425 }
2199 2426
2200 if (corner) 2427 if (corner)
2201 { 2428 {
2202 float ox = corner * dx; 2429 float ox = corner * dx;
2203 2430
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 }
2209 }
2210 } 2435 }
2211 } 2436 }
2212 } 2437 }
2213 } 2438 }
2214 2439
2215 glEnd (); 2440 glEnd ();
2216 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1; 2442 key.texname = -1;
2218 } 2443 }
2219
2220 hv_clear (smooth);
2221 } 2444 }
2222 2445
2223 if (pl_tex.name) 2446 if (pl_tex.name)
2224 { 2447 {
2225 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2226 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2227 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2228 2451
2229 key.texname = tex.name; 2452 key.texname = tex.name;
2230 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2231 2454
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2457 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2236 2459
2237 rc_draw (rc); 2460 rc.draw ();
2238 } 2461 }
2239 2462
2463 rc_ov.draw ();
2464 rc_ov.clear ();
2465
2240 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2241 rc_free (rc);
2242 2467
2243 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2246 { 2471 {
2249 for (x = 0; x < sw; x++) 2474 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2475 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2476 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2253 2478
2254 int px = x * T; 2479 int px = x * Tw;
2255 int py = y * T; 2480 int py = y * Th;
2481
2482 if (ecb_expect_false (cell->player == player))
2483 {
2484 px += sdx;
2485 py += sdy;
2486 }
2256 2487
2257 if (cell->stat_hp) 2488 if (cell->stat_hp)
2258 { 2489 {
2259 int width = cell->stat_width * T; 2490 int width = cell->stat_width * Tw;
2260 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2491 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2261 2492
2262 glColor3ub (0, 0, 0); 2493 glColor3ub (0, 0, 0);
2263 glRectf (px + 1, py - thick - 2, 2494 glRectf (px + 1, py - thick - 2,
2264 px + width - 1, py); 2495 px + width - 1, py);
2265 2496
2271 } 2502 }
2272 } 2503 }
2273} 2504}
2274 2505
2275void 2506void
2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2507draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2277 CODE: 2508 CODE:
2278{ 2509{
2279 static float color[16][3] = { 2510 static float color[16][3] = {
2280 { 0.00F, 0.00F, 0.00F }, 2511 { 0.00f, 0.00f, 0.00f },
2281 { 1.00F, 1.00F, 1.00F }, 2512 { 1.00f, 1.00f, 1.00f },
2282 { 0.00F, 0.00F, 0.55F }, 2513 { 0.00f, 0.00f, 0.55f },
2283 { 1.00F, 0.00F, 0.00F }, 2514 { 1.00f, 0.00f, 0.00f },
2284 2515
2285 { 1.00F, 0.54F, 0.00F }, 2516 { 1.00f, 0.54f, 0.00f },
2286 { 0.11F, 0.56F, 1.00F }, 2517 { 0.11f, 0.56f, 1.00f },
2287 { 0.93F, 0.46F, 0.00F }, 2518 { 0.93f, 0.46f, 0.00f },
2288 { 0.18F, 0.54F, 0.34F }, 2519 { 0.18f, 0.54f, 0.34f },
2289 2520
2290 { 0.56F, 0.73F, 0.56F }, 2521 { 0.56f, 0.73f, 0.56f },
2291 { 0.80F, 0.80F, 0.80F }, 2522 { 0.80f, 0.80f, 0.80f },
2292 { 0.55F, 0.41F, 0.13F }, 2523 { 0.55f, 0.41f, 0.13f },
2293 { 0.99F, 0.77F, 0.26F }, 2524 { 0.99f, 0.77f, 0.26f },
2294 2525
2295 { 0.74F, 0.65F, 0.41F }, 2526 { 0.74f, 0.65f, 0.41f },
2296 2527
2297 { 0.00F, 1.00F, 1.00F }, 2528 { 0.00f, 1.00f, 1.00f },
2298 { 1.00F, 0.00F, 1.00F }, 2529 { 1.00f, 0.00f, 1.00f },
2299 { 1.00F, 1.00F, 0.00F }, 2530 { 1.00f, 1.00f, 0.00f },
2300 }; 2531 };
2301 2532
2302 int x, y; 2533 int x, y;
2303 2534
2304 glEnable (GL_TEXTURE_2D); 2535 glEnable (GL_TEXTURE_2D);
2536 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2537 * but the nvidia driver (185.18.14) mishandles alpha textures
2538 * and takes the colour from god knows where instead of using
2539 * Cp. MODULATE results in the same colour, but slightly different
2540 * alpha, but atcually gives us the correct colour with nvidia.
2541 */
2305 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2542 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2306 glEnable (GL_BLEND); 2543 glEnable (GL_BLEND);
2307 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2544 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2308 glBegin (GL_QUADS); 2545 glBegin (GL_QUADS);
2309 2546
2310 for (y = 0; y < h; y++) 2547 for (y = 0; y < h; y++)
2314 2551
2315 if (m) 2552 if (m)
2316 { 2553 {
2317 float *c = color [m & 15]; 2554 float *c = color [m & 15];
2318 2555
2319 float tx1 = m & 0x40 ? 0.5 : 0.; 2556 float tx1 = m & 0x40 ? 0.5f : 0.f;
2320 float tx2 = tx1 + 0.5; 2557 float tx2 = tx1 + 0.5f;
2321 2558
2322 glColor4f (c[0], c[1], c[2], 0.75); 2559 glColor4f (c[0], c[1], c[2], 1);
2323 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2560 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2324 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2561 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2325 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2562 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2326 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2563 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2327 } 2564 }
2335void 2572void
2336fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2573fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2337 PPCODE: 2574 PPCODE:
2338{ 2575{
2339 int x, y; 2576 int x, y;
2340 int sw1 = sw + 2; 2577 int sw1 = sw + 2;
2341 int sh1 = sh + 2; 2578 int sh1 = sh + 2;
2342 int sh3 = sh * 3; 2579 int sh3 = sh * 3;
2343 int sw34 = (sw * 3 + 3) & ~3; 2580 int sw3 = sw * 3;
2581 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2582 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2344 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2583 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2345 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2584 memset (darkness1, 0, sw1*sh1);
2346 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2347 2585
2348 SvPOK_only (darkness3_sv); 2586 SvPOK_only (darkness3_sv);
2349 SvCUR_set (darkness3_sv, sw34 * sh3); 2587 SvCUR_set (darkness3_sv, sw3 * sh3);
2350 2588
2351 mx += self->x - 1; 2589 mx += self->x - 1;
2352 my += self->y - 1; 2590 my += self->y - 1;
2353
2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355 2591
2356 for (y = 0; y < sh1; y++) 2592 for (y = 0; y < sh1; y++)
2357 if (0 <= y + my && y + my < self->rows) 2593 if (0 <= y + my && y + my < self->rows)
2358 { 2594 {
2359 maprow *row = self->row + (y + my); 2595 maprow *row = self->row + (y + my);
2362 if (row->c0 <= x + mx && x + mx < row->c1) 2598 if (row->c0 <= x + mx && x + mx < row->c1)
2363 { 2599 {
2364 mapcell *cell = row->col + (x + mx - row->c0); 2600 mapcell *cell = row->col + (x + mx - row->c0);
2365 2601
2366 darkness1 [y * sw1 + x] = cell->darkness 2602 darkness1 [y * sw1 + x] = cell->darkness
2367 ? 255 - (cell->darkness - 1) 2603 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2368 : 255 - FOW_DARKNESS; 2604 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2369 } 2605 }
2370 } 2606 }
2371 2607
2372 for (y = 0; y < sh; ++y) 2608 for (y = 0; y < sh; ++y)
2373 for (x = 0; x < sw; ++x) 2609 for (x = 0; x < sw; ++x)
2392 2628
2393 uint8_t r13 = (d13 + d23 + d12) / 3; 2629 uint8_t r13 = (d13 + d23 + d12) / 3;
2394 uint8_t r23 = d23; 2630 uint8_t r23 = d23;
2395 uint8_t r33 = (d23 + d33 + d32) / 3; 2631 uint8_t r33 = (d23 + d33 + d32) / 3;
2396 2632
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2633 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2398 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2634 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2399 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2635 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2636 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2401 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2637 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2402 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2638 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2639 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2404 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2640 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2405 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2641 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2406 } 2642 }
2407 2643
2408 free (darkness1); 2644 free (darkness1);
2409 2645
2410 EXTEND (SP, 3); 2646 EXTEND (SP, 3);
2411 PUSHs (sv_2mortal (newSViv (sw34))); 2647 PUSHs (sv_2mortal (newSViv (sw3)));
2412 PUSHs (sv_2mortal (newSViv (sh3))); 2648 PUSHs (sv_2mortal (newSViv (sh3)));
2413 PUSHs (darkness3_sv); 2649 PUSHs (darkness3_sv);
2414} 2650}
2415 2651
2416SV * 2652SV *
2479 else 2715 else
2480 *data++ = 0; 2716 *data++ = 0;
2481 } 2717 }
2482 } 2718 }
2483 2719
2484 /* if size is w*h + 5 then no data has been found */ 2720 /* if size is w*h + 5 then no data has been found */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2721 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 { 2722 {
2487 SvPOK_only (data_sv); 2723 SvPOK_only (data_sv);
2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2724 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 } 2725 }
2490 2726
2491 RETVAL = data_sv; 2727 RETVAL = data_sv;
2492} 2728}
2493 OUTPUT: 2729 OUTPUT:
2494 RETVAL 2730 RETVAL
2495 2731
2496void 2732void
2503 STRLEN len; 2739 STRLEN len;
2504 uint8_t *data, *end; 2740 uint8_t *data, *end;
2505 2741
2506 len = SvLEN (data_sv); 2742 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2743 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv); 2744 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2509 end = data + len + 8; 2745 end = data + len + 8;
2510 2746
2511 if (len < 5) 2747 if (len < 5)
2512 XSRETURN_EMPTY; 2748 XSRETURN_EMPTY;
2513 2749
2574} 2810}
2575 2811
2576MODULE = Deliantra::Client PACKAGE = DC::RW 2812MODULE = Deliantra::Client PACKAGE = DC::RW
2577 2813
2578DC::RW 2814DC::RW
2579new (SV *class, SV *data_sv) 2815new (SV *klass, SV *data_sv)
2580 CODE: 2816 CODE:
2581{ 2817{
2582 STRLEN datalen; 2818 STRLEN datalen;
2583 char *data = SvPVbyte (data_sv, datalen); 2819 char *data = SvPVbyte (data_sv, datalen);
2584 2820
2586} 2822}
2587 OUTPUT: 2823 OUTPUT:
2588 RETVAL 2824 RETVAL
2589 2825
2590DC::RW 2826DC::RW
2591new_from_file (SV *class, const char *path, const char *mode = "rb") 2827new_from_file (SV *klass, const char *path, const char *mode = "rb")
2592 CODE: 2828 CODE:
2593 RETVAL = SDL_RWFromFile (path, mode); 2829 RETVAL = SDL_RWFromFile (path, mode);
2594 OUTPUT: 2830 OUTPUT:
2595 RETVAL 2831 RETVAL
2596 2832
2614 if (RETVAL < 0) 2850 if (RETVAL < 0)
2615 { 2851 {
2616 RETVAL = Mix_GroupOldest (-1); 2852 RETVAL = Mix_GroupOldest (-1);
2617 2853
2618 if (RETVAL < 0) 2854 if (RETVAL < 0)
2855 {
2856 // happens sometimes, maybe it just stopped playing(?)
2857 RETVAL = Mix_GroupAvailable (-1);
2858
2859 if (RETVAL < 0)
2619 XSRETURN_UNDEF; 2860 XSRETURN_UNDEF;
2620 2861 }
2862 else
2621 Mix_HaltChannel (RETVAL); 2863 Mix_HaltChannel (RETVAL);
2622 } 2864 }
2623 2865
2624 Mix_UnregisterAllEffects (RETVAL); 2866 Mix_UnregisterAllEffects (RETVAL);
2625 Mix_Volume (RETVAL, 128); 2867 Mix_Volume (RETVAL, 128);
2626} 2868}
2673void 2915void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2916set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE: 2917 CODE:
2676{ 2918{
2677 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2919 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2920 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2921 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680} 2922}
2681 2923
2682void 2924void
2683set_reverse_stereo (DC::Channel self, int flip) 2925set_reverse_stereo (DC::Channel self, int flip)
2686 2928
2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2929MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688 2930
2689PROTOTYPES: DISABLE 2931PROTOTYPES: DISABLE
2690 2932
2933void
2934decoders ()
2935 PPCODE:
2936#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2937 int i, num = Mix_GetNumChunkDecoders ();
2938 EXTEND (SP, num);
2939 for (i = 0; i < num; ++i)
2940 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2941#else
2942 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2943#endif
2944
2691DC::MixChunk 2945DC::MixChunk
2692new (SV *class, DC::RW rwops) 2946new (SV *klass, DC::RW rwops)
2693 CODE: 2947 CODE:
2694 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2948 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2695 OUTPUT: 2949 OUTPUT:
2696 RETVAL 2950 RETVAL
2697 2951
2727 OUTPUT: 2981 OUTPUT:
2728 RETVAL 2982 RETVAL
2729 2983
2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2984MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2731 2985
2986void
2987decoders ()
2988 PPCODE:
2989#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2990 int i, num = Mix_GetNumMusicDecoders ();
2991 EXTEND (SP, num);
2992 for (i = 0; i < num; ++i)
2993 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2994#else
2995 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2996#endif
2997
2732int 2998int
2733volume (int volume = -1) 2999volume (int volume = -1)
2734 PROTOTYPE: ;$ 3000 PROTOTYPE: ;$
2735 CODE: 3001 CODE:
2736 if (items > 0) 3002 if (items > 0)
2747void 3013void
2748halt () 3014halt ()
2749 CODE: 3015 CODE:
2750 Mix_HaltMusic (); 3016 Mix_HaltMusic ();
2751 3017
3018int
3019playing ()
3020 CODE:
3021 RETVAL = Mix_PlayingMusic ();
3022 OUTPUT:
3023 RETVAL
3024
2752DC::MixMusic 3025DC::MixMusic
2753new (SV *class, DC::RW rwops) 3026new (SV *klass, DC::RW rwops)
2754 CODE: 3027 CODE:
2755 RETVAL = Mix_LoadMUS_RW (rwops); 3028 RETVAL = Mix_LoadMUS_RW (rwops);
2756 OUTPUT: 3029 OUTPUT:
2757 RETVAL 3030 RETVAL
2758 3031
2786 } *civ, const_iv[] = { 3059 } *civ, const_iv[] = {
2787# define const_iv(name) { # name, (IV)name } 3060# define const_iv(name) { # name, (IV)name }
2788 const_iv (GL_VENDOR), 3061 const_iv (GL_VENDOR),
2789 const_iv (GL_VERSION), 3062 const_iv (GL_VERSION),
2790 const_iv (GL_EXTENSIONS), 3063 const_iv (GL_EXTENSIONS),
3064 const_iv (GL_MAX_TEXTURE_UNITS),
2791 const_iv (GL_COLOR_MATERIAL), 3065 const_iv (GL_COLOR_MATERIAL),
2792 const_iv (GL_SMOOTH), 3066 const_iv (GL_SMOOTH),
2793 const_iv (GL_FLAT), 3067 const_iv (GL_FLAT),
2794 const_iv (GL_DITHER), 3068 const_iv (GL_DITHER),
2795 const_iv (GL_BLEND), 3069 const_iv (GL_BLEND),
2807 const_iv (GL_ZERO), 3081 const_iv (GL_ZERO),
2808 const_iv (GL_SRC_ALPHA), 3082 const_iv (GL_SRC_ALPHA),
2809 const_iv (GL_DST_ALPHA), 3083 const_iv (GL_DST_ALPHA),
2810 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3084 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2811 const_iv (GL_ONE_MINUS_DST_ALPHA), 3085 const_iv (GL_ONE_MINUS_DST_ALPHA),
3086 const_iv (GL_SRC_COLOR),
3087 const_iv (GL_DST_COLOR),
3088 const_iv (GL_ONE_MINUS_SRC_COLOR),
3089 const_iv (GL_ONE_MINUS_DST_COLOR),
2812 const_iv (GL_SRC_ALPHA_SATURATE), 3090 const_iv (GL_SRC_ALPHA_SATURATE),
2813 const_iv (GL_RGB), 3091 const_iv (GL_RGB),
2814 const_iv (GL_RGBA), 3092 const_iv (GL_RGBA),
2815 const_iv (GL_RGBA4), 3093 const_iv (GL_RGBA4),
2816 const_iv (GL_RGBA8), 3094 const_iv (GL_RGBA8),
2884 const_iv (GL_NICEST), 3162 const_iv (GL_NICEST),
2885 const_iv (GL_V2F), 3163 const_iv (GL_V2F),
2886 const_iv (GL_V3F), 3164 const_iv (GL_V3F),
2887 const_iv (GL_T2F_V3F), 3165 const_iv (GL_T2F_V3F),
2888 const_iv (GL_T2F_N3F_V3F), 3166 const_iv (GL_T2F_N3F_V3F),
3167 const_iv (GL_FUNC_ADD),
3168 const_iv (GL_FUNC_SUBTRACT),
3169 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2889# undef const_iv 3170# undef const_iv
2890 }; 3171 };
2891 3172
2892 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3173 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2893 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3174 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2894 3175
2895 texture_av = newAV (); 3176 texture_av = newAV ();
2896 AvREAL_off (texture_av); 3177 AvREAL_off (texture_av);
2897} 3178}
2898 3179
2900disable_GL_EXT_blend_func_separate () 3181disable_GL_EXT_blend_func_separate ()
2901 CODE: 3182 CODE:
2902 gl.BlendFuncSeparate = 0; 3183 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0; 3184 gl.BlendFuncSeparateEXT = 0;
2904 3185
2905char * 3186void
3187apple_nvidia_bug (int enable)
3188
3189const char *
2906gl_vendor () 3190gl_vendor ()
2907 CODE: 3191 CODE:
2908 RETVAL = (char *)glGetString (GL_VENDOR); 3192 RETVAL = (const char *)glGetString (GL_VENDOR);
2909 OUTPUT: 3193 OUTPUT:
2910 RETVAL 3194 RETVAL
2911 3195
2912char * 3196const char *
2913gl_version () 3197gl_version ()
2914 CODE: 3198 CODE:
2915 RETVAL = (char *)glGetString (GL_VERSION); 3199 RETVAL = (const char *)glGetString (GL_VERSION);
2916 OUTPUT: 3200 OUTPUT:
2917 RETVAL 3201 RETVAL
2918 3202
2919char * 3203const char *
2920gl_extensions () 3204gl_extensions ()
2921 CODE: 3205 CODE:
2922 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3206 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2923 OUTPUT: 3207 OUTPUT:
2924 RETVAL 3208 RETVAL
2925 3209
2926const char *glGetString (GLenum pname) 3210const char *glGetString (GLenum pname)
3211 CODE:
3212 RETVAL = (const char *)glGetString (pname);
3213 OUTPUT:
3214 RETVAL
2927 3215
2928GLint glGetInteger (GLenum pname) 3216GLint glGetInteger (GLenum pname)
2929 CODE: 3217 CODE:
2930 glGetIntegerv (pname, &RETVAL); 3218 glGetIntegerv (pname, &RETVAL);
2931 OUTPUT: 3219 OUTPUT:
2939 3227
2940int glGetError () 3228int glGetError ()
2941 3229
2942void glFinish () 3230void glFinish ()
2943 3231
3232void glFlush ()
3233
2944void glClear (int mask) 3234void glClear (int mask)
2945 3235
2946void glClearColor (float r, float g, float b, float a = 1.0) 3236void glClearColor (float r, float g, float b, float a = 1.0)
2947 PROTOTYPE: @ 3237 PROTOTYPE: @
2948 3238
2957void glBlendFunc (int sfactor, int dfactor) 3247void glBlendFunc (int sfactor, int dfactor)
2958 3248
2959void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3249void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2960 CODE: 3250 CODE:
2961 gl_BlendFuncSeparate (sa, da, saa, daa); 3251 gl_BlendFuncSeparate (sa, da, saa, daa);
3252
3253# void glBlendEquation (int se)
2962 3254
2963void glDepthMask (int flag) 3255void glDepthMask (int flag)
2964 3256
2965void glLogicOp (int opcode) 3257void glLogicOp (int opcode)
2966 3258
3001void glRotate (float angle, float x, float y, float z) 3293void glRotate (float angle, float x, float y, float z)
3002 CODE: 3294 CODE:
3003 glRotatef (angle, x, y, z); 3295 glRotatef (angle, x, y, z);
3004 3296
3005void glColor (float r, float g, float b, float a = 1.0) 3297void glColor (float r, float g, float b, float a = 1.0)
3298 PROTOTYPE: @
3006 ALIAS: 3299 ALIAS:
3007 glColor_premultiply = 1 3300 glColor_premultiply = 1
3008 CODE: 3301 CODE:
3009 if (ix) 3302 if (ix)
3010 { 3303 {
3116 3409
3117void glEndList () 3410void glEndList ()
3118 3411
3119void glCallList (int list) 3412void glCallList (int list)
3120 3413
3414void c_init ()
3415 CODE:
3416 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3417 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3418
3121MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3419MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3122 3420
3123PROTOTYPES: DISABLE 3421PROTOTYPES: DISABLE
3124 3422
3125void 3423void
3126find_widget (SV *self, NV x, NV y) 3424find_widget (SV *self, NV x, NV y)
3127 PPCODE: 3425 PPCODE:
3128{ 3426{
3129 if (within_widget (self, x, y)) 3427 if (within_widget (self, x, y))
3130 XPUSHs (self); 3428 XPUSHs (self);
3131} 3429}
3132 3430
3133BOOT: 3431BOOT:
3134{ 3432{
3142 3440
3143void 3441void
3144draw (SV *self) 3442draw (SV *self)
3145 CODE: 3443 CODE:
3146{ 3444{
3147 HV *hv; 3445 HV *hv;
3148 SV **svp; 3446 SV **svp;
3149 NV x, y, w, h; 3447 NV x, y, w, h;
3150 SV *draw_x_sv = GvSV (draw_x_gv); 3448 SV *draw_x_sv = GvSV (draw_x_gv);
3151 SV *draw_y_sv = GvSV (draw_y_gv); 3449 SV *draw_y_sv = GvSV (draw_y_gv);
3152 SV *draw_w_sv = GvSV (draw_w_gv); 3450 SV *draw_w_sv = GvSV (draw_w_gv);
3153 SV *draw_h_sv = GvSV (draw_h_gv); 3451 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines