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.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 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)) 82#include "salloc.h"
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 83
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 85
86/* this is used as fow flag as well, so has to have a different value */
87/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 88#define FOW_DARKNESS 50
89#define DARKNESS_ADJUST(n) (n)
87 90
88#define MAP_EXTEND_X 32 91#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 92#define MAP_EXTEND_Y 512
90 93
91#define MIN_FONT_HEIGHT 10 94#define MIN_FONT_HEIGHT 10
92 95
93/* mask out modifiers we are not interested in */ 96/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 97#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
98
99#define KMOD_LRAM 0x10000 // our extension
100
101#define TEXID_SPEECH 1
102#define TEXID_NOFACE 2
103
104// approximately divide by 255
105static unsigned int
106div255 (unsigned int n)
107{
108 return (n + (n >> 8)) >> 8;
109}
110
111static unsigned int
112minpot (unsigned int n)
113{
114 if (!n)
115 return 0;
116
117 --n;
118
119 n |= n >> 1;
120 n |= n >> 2;
121 n |= n >> 4;
122 n |= n >> 8;
123 n |= n >> 16;
124
125 return n + 1;
126}
127
128static char *
129fast_sv_grow (SV *sv, STRLEN need)
130{
131 STRLEN len = SvLEN (sv);
132 STRLEN want = SvCUR (sv) + need;
133
134 if (ecb_expect_false (len < want))
135 {
136 do
137 len *= 2;
138 while (len < want);
139
140 sv_grow (sv, len);
141 }
142
143 SvCUR_set (sv, want);
144 return SvEND (sv) - need;
145}
95 146
96static AV *texture_av; 147static AV *texture_av;
97 148
98static struct 149static struct
99{ 150{
156{ 207{
157 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
158 209
159 while (attrs) 210 while (attrs)
160 { 211 {
161 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 213
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 215 return 1;
165 216
166 attrs = attrs->next; 217 attrs = attrs->next;
167 } 218 }
168 219
169 return 0; 220 return 0;
170} 221}
171 222
172typedef struct cf_layout { 223struct cf_layout {
173 PangoLayout *pl; 224 PangoLayout *pl;
174 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
175 int base_height; 226 int base_height;
176 DC__Font font; 227 DC__Font font;
177 rc_t *rc; 228 rc_t rc;
178} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
179 232
180static DC__Font default_font; 233static DC__Font default_font;
181static PangoContext *opengl_context; 234static PangoContext *opengl_context;
182static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
183 236
184static void 237static void
185substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
186{ 239{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 243#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 245}
193 246
194static void 247static void
221 274
222 *w = rect.width; 275 *w = rect.width;
223 *h = rect.height; 276 *h = rect.height;
224} 277}
225 278
279/////////////////////////////////////////////////////////////////////////////
280
226typedef uint16_t tileid; 281typedef uint16_t tileid;
227typedef uint16_t faceid; 282typedef uint16_t faceid;
228 283
229typedef struct { 284struct maptex
285{
230 GLuint name; 286 GLuint name;
231 int w, h; 287 int w, h;
232 float s, t; 288 float s, t;
233 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
234 tileid smoothtile; 290 tileid smoothtile;
235 uint8_t smoothlevel; 291 uint8_t smoothlevel;
236} maptex; 292 uint8_t unused; /* set to zero on use */
293};
237 294
238typedef struct { 295struct mapcell
296{
239 uint32_t player; 297 uint32_t player;
240 tileid tile[3]; 298 tileid tile[3];
241 uint16_t darkness; 299 uint16_t darkness;
242 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
243} mapcell; 301};
244 302
245typedef struct { 303struct maprow
304{
246 int32_t c0, c1; 305 int32_t c0, c1;
247 mapcell *col; 306 mapcell *col;
248} maprow; 307};
249 308
250typedef struct map { 309struct mapgrid {
251 int x, y, w, h; 310 int x, y, w, h;
252 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
253 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
254 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
255 314
256 int32_t rows; 315 int32_t rows;
257 maprow *row; 316 maprow *row;
258} *DC__Map; 317};
259 318
260static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
261prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
262{ 324{
263 char *p; 325 T *p;
264 326
265 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
266 Zero (p, inc, char); 328 Zero (p, inc, T);
267 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
268 Safefree (ptr); 330 Safefree (ptr);
269 331
270 return p; 332 ptr = p;
271} 333}
272 334
273static char * 335template<typename T>
336ecb_cold static void
274append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
275{ 338{
276 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
277 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
278
279 return ptr;
280} 341}
281
282#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
283#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
284 342
285static void 343static void
286need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
287{ 345{
288 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
289 { 347 return;
348
349 size_t newsize = minpot (face + 1);
290 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
291 self->faces *= 2; 351 self->faces = newsize;
292 }
293} 352}
294 353
295static void 354static void
296need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
297{ 356{
298 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
299 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
300 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
301 self->texs *= 2; 362 self->texs = newsize;
302 }
303} 363}
304 364
305static maprow * 365static maprow *
306map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
307{ 367{
308 if (0 > y) 368 if (0 > y)
309 { 369 {
310 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
312 372
313 self->rows += extend; 373 self->rows += extend;
314 self->y += extend; 374 self->y += extend;
315 y += extend; 375 y += extend;
316 } 376 }
317 else if (y >= self->rows) 377 else if (y >= self->rows)
318 { 378 {
319 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
320 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
321 self->rows += extend; 381 self->rows += extend;
322 } 382 }
323 383
324 return self->row + y; 384 return self->row + y;
325} 385}
335 } 395 }
336 396
337 if (row->c0 > x) 397 if (row->c0 > x)
338 { 398 {
339 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
340 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
341 row->c0 -= extend; 401 row->c0 -= extend;
342 } 402 }
343 else if (x >= row->c1) 403 else if (x >= row->c1)
344 { 404 {
345 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
346 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
347 row->c1 += extend; 407 row->c1 += extend;
348 } 408 }
349 409
350 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
351} 411}
352 412
353static mapcell * 413static mapcell *
354map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
355{ 415{
356 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
357} 417}
358 418
359static void 419static void
360map_clear (DC__Map self) 420map_clear (mapgrid *self)
361{ 421{
362 int r; 422 int r;
363 423
364 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
384 (cell)->player = 0; \ 444 (cell)->player = 0; \
385 } while (0) 445 } while (0)
386 446
387static void 447static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 449{
390 int x, y; 450 int x, y;
391 maprow *row; 451 maprow *row;
392 mapcell *cell; 452 mapcell *cell;
393 453
410 CELL_CLEAR (cell); 470 CELL_CLEAR (cell);
411 } 471 }
412 } 472 }
413} 473}
414 474
415typedef struct { 475struct smooth_key
476{
416 tileid tile; 477 tileid tile;
417 uint8_t x, y, level; 478 uint8_t x, y, level;
418} smooth_key; 479
480 bool operator == (const smooth_key &o) const
481 {
482 return tile == o.tile && x == o.x && y == o.y && level == o.level;
483 }
484};
485
486typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
487
488namespace std {
489 template <>
490 struct hash<smooth_key>
491 {
492 size_t operator () (const smooth_key &v) const
493 {
494 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
495 }
496 };
497}
419 498
420static void 499static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 501{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
424 503
425 if (SvIOK (*sv)) 504 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
427 else 506 else
428 sv_setiv (*sv, bits); 507 it->second |= bits;
429} 508}
430 509
431static void 510static void
432music_finished (void) 511music_finished (void)
433{ 512{
452 ev.data2 = 0; 531 ev.data2 = 0;
453 532
454 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
455} 534}
456 535
457static unsigned int
458minpot (unsigned int n)
459{
460 if (!n)
461 return 0;
462
463 --n;
464
465 n |= n >> 1;
466 n |= n >> 2;
467 n |= n >> 4;
468 n |= n >> 8;
469 n |= n >> 16;
470
471 return n + 1;
472}
473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
485/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
486#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
487#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
488 539
489/******************************************************************************/ 540/******************************************************************************/
527 return 0; 578 return 0;
528 579
529 return 1; 580 return 1;
530} 581}
531 582
583/******************************************************************************/
584
585/* process keyboard modifiers */
586static int
587mod_munge (int mod)
588{
589 mod &= MOD_MASK;
590
591 if (mod & (KMOD_META | KMOD_ALT))
592 mod |= KMOD_LRAM;
593
594 return mod;
595}
596
532static void 597static void
533deliantra_main () 598deliantra_main (SV *real_main)
534{ 599{
535 char *argv[] = { 0 }; 600 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 601
602 PUSHMARK (SP);
603 call_sv (real_main, G_DISCARD | G_VOID);
537} 604}
538 605
539#ifdef __MACOSX__ 606#ifdef __MACOSX__
607 static SV *real_main;
608
540 /* to due surprising braindamage on the side of SDL design, we 609 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 610 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 611 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 612 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 613 * and which calls our main (== SDL_main) back.
545 */ 614 */
546 extern C_LINKAGE int 615 extern C_LINKAGE int
547 main (int argc, char *argv[]) 616 main (int argc, char *argv[])
548 { 617 {
549 deliantra_main (); 618 deliantra_main (real_main);
550 } 619 }
551 620
552 #undef main 621 #undef main
553 622
554 extern C_LINKAGE int main (int argc, char *argv[]); 623 extern C_LINKAGE int main (int argc, char *argv[]);
555 624
556 static void 625 static void
557 SDL_braino (void) 626 SDL_main_hack (SV *real_main_)
558 { 627 {
628 real_main = real_main_;
629
559 char *argv[] = { "deliantra client", 0 }; 630 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 631 (main) (1, argv);
561 } 632 }
562#else 633#else
563 static void 634 static void
564 SDL_braino (void) 635 SDL_main_hack (SV *real_main)
565 { 636 {
566 deliantra_main (); 637 deliantra_main (real_main);
567 } 638 }
568#endif 639#endif
569 640
570MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
571 642
737 const_iv (KMOD_RMETA), 808 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 809 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 810 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 811 const_iv (KMOD_MODE),
741 812
813 const_iv (KMOD_LRAM),
814
742 const_iv (MIX_DEFAULT_FORMAT), 815 const_iv (MIX_DEFAULT_FORMAT),
743 816
744 const_iv (SDL_INIT_TIMER), 817 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 818 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 819 const_iv (SDL_INIT_VIDEO),
770 843
771 const_iv (FOW_DARKNESS) 844 const_iv (FOW_DARKNESS)
772# undef const_iv 845# undef const_iv
773 }; 846 };
774 847
775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 848 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777 850
778 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780} 853}
781 854
796 869
797NV ceil (NV x) 870NV ceil (NV x)
798 871
799IV minpot (UV n) 872IV minpot (UV n)
800 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
801IV popcount (UV n) 880IV popcount (UV n)
881 CODE:
882 RETVAL = ecb_popcount32 (n);
883 OUTPUT:
884 RETVAL
885
886NV distance (NV dx, NV dy)
887 CODE:
888 RETVAL = pow (dx * dx + dy * dy, 0.5);
889 OUTPUT:
890 RETVAL
802 891
803void 892void
804pango_init () 893pango_init ()
805 CODE: 894 CODE:
806{ 895{
814#endif 903#endif
815} 904}
816 905
817char *SDL_GetError () 906char *SDL_GetError ()
818 907
819void SDL_braino () 908void SDL_main_hack (SV *real_main)
909 PROTOTYPE: &
820 910
821int SDL_Init (U32 flags) 911int SDL_Init (U32 flags)
822 912
823int SDL_InitSubSystem (U32 flags) 913int SDL_InitSubSystem (U32 flags)
824 914
825void SDL_QuitSubSystem (U32 flags) 915void SDL_QuitSubSystem (U32 flags)
826 916
827void SDL_Quit () 917void SDL_Quit ()
828 918
829int SDL_GL_SetAttribute (int attr, int value) 919int SDL_GL_SetAttribute (int attr, int value)
920 C_ARGS: (SDL_GLattr)attr, value
830 921
831int SDL_GL_GetAttribute (int attr) 922int SDL_GL_GetAttribute (int attr)
832 CODE: 923 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL)) 924 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834 XSRETURN_UNDEF; 925 XSRETURN_UNDEF;
835 OUTPUT: 926 OUTPUT:
836 RETVAL 927 RETVAL
837 928
838void 929void
893 ); 984 );
894 985
895 if (RETVAL) 986 if (RETVAL)
896 { 987 {
897 av_clear (texture_av); 988 av_clear (texture_av);
898
899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 989#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
901#include "glfunc.h" 990#include "glfunc.h"
902#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 994 }
904} 995}
905 OUTPUT: 996 OUTPUT:
906 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
907 1001
908void 1002void
909SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
910 1004
911char * 1005char *
912SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
913 1008
914int 1009int
915SDL_GetAppState () 1010SDL_GetAppState ()
916 1011
917int 1012int
918SDL_GetModState () 1013SDL_GetModState ()
919 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
920void 1019void
1020SDL_PumpEvents ()
1021
1022void
921poll_events () 1023peep_events ()
922 PPCODE: 1024 PPCODE:
923{ 1025{
924 SDL_Event ev; 1026 SDL_Event ev;
925 1027
926 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
933 { 1035 {
934 case SDL_KEYDOWN: 1036 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1037 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1038 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1039 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1040 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1041 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1042 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1043 break;
942 1044
943 case SDL_ACTIVEEVENT: 1045 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1046 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1064 x = ev.motion.x;
963 y = ev.motion.y; 1065 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1066 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1067 }
966 1068
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1069 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1070 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1071 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1072 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1073 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1074 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1094
993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1095 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
994 } 1096 }
995} 1097}
996 1098
1099char *
1100SDL_AudioDriverName ()
1101 CODE:
1102{
1103 char buf [256];
1104 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1105 XSRETURN_UNDEF;
1106
1107 RETVAL = buf;
1108}
1109 OUTPUT:
1110 RETVAL
1111
997int 1112int
998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1113Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
999 POSTCALL: 1114 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
1002 1117
1003void 1118void
1004Mix_QuerySpec () 1119Mix_QuerySpec ()
1063add_font (char *file) 1178add_font (char *file)
1064 CODE: 1179 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1181 OUTPUT:
1067 RETVAL 1182 RETVAL
1183
1184void
1185IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1186
1187# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1188void
1189Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1068 1190
1069void 1191void
1070load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
1071 ALIAS: 1193 ALIAS:
1072 load_image_file = 1 1194 load_image_file = 1
1118 1240
1119 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
1120 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
1121 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
1122 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
1123 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1124 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1246 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1125 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
1128 1250
1188#if DEBUG 1310#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1311 VALGRIND_DO_LEAK_CHECK;
1190#endif 1312#endif
1191} 1313}
1192 1314
1315int
1316SvREFCNT (SV *sv)
1317 CODE:
1318 RETVAL = SvREFCNT (sv);
1319 OUTPUT:
1320 RETVAL
1321
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1323
1195PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1196 1325
1197DC::Font 1326DC::Font
1198new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1199 CODE: 1328 CODE:
1200{ 1329{
1201 int count; 1330 int count;
1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1232 PROTOTYPE: 1361 PROTOTYPE:
1233 CODE: 1362 CODE:
1234 tc_restore (); 1363 tc_restore ();
1235 1364
1236DC::Layout 1365DC::Layout
1237new (SV *class) 1366new (SV *klass)
1238 CODE: 1367 CODE:
1239 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1240 1369
1241 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1242 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1243 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1244 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1245 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1246 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1247 RETVAL->font = 0; 1376 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1249 1377
1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1251 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1252 OUTPUT: 1380 OUTPUT:
1253 RETVAL 1381 RETVAL
1254 1382
1255void 1383void
1256DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1257 CODE: 1385 CODE:
1258 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1259 rc_free (self->rc);
1260 Safefree (self); 1387 delete self;
1261 1388
1262void 1389void
1263set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1264 CODE: 1391 CODE:
1265{ 1392{
1391 1518
1392void 1519void
1393set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1394 CODE: 1521 CODE:
1395 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1396 { 1523 {
1397 self->base_height = base_height; 1524 self->base_height = base_height;
1398 layout_update_font (self); 1525 layout_update_font (self);
1399 } 1526 }
1400 1527
1401void 1528void
1519} 1646}
1520 1647
1521void 1648void
1522render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1523 CODE: 1650 CODE:
1524 rc_clear (self->rc); 1651 self->rc.clear ();
1525 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1526 self->pl, 1653 self->pl,
1527 self->rc, 1654 &self->rc,
1528 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1529 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1530 flags 1657 flags
1531 ); 1658 );
1532 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1547 1674
1548 rc_draw (self->rc); 1675 self->rc.draw ();
1549 1676
1550 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1553} 1680}
1628 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1630 } 1757 }
1631} 1758}
1632 1759
1760void
1761draw_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)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1633IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1634 CODE: 1882 CODE:
1635{ 1883{
1636 GLint width; 1884 GLint width;
1637 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1644MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1645 1893
1646PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1647 1895
1648DC::Map 1896DC::Map
1649new (SV *class) 1897new (SV *klass)
1650 CODE: 1898 CODE:
1651 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1652 RETVAL->x = 0; 1900 RETVAL->x = 0;
1653 RETVAL->y = 0; 1901 RETVAL->y = 0;
1654 RETVAL->w = 0; 1902 RETVAL->w = 0;
1655 RETVAL->h = 0; 1903 RETVAL->h = 0;
1656 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1693 1941
1694void 1942void
1695set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1696 CODE: 1944 CODE:
1697{ 1945{
1698 tileid texid; 1946 tileid texid;
1699 maptex *tex; 1947 maptex *tex;
1700 1948
1701 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1702 return; 1950 return;
1703 1951
1704 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1705 return; 1953 return;
1706 1954
1707 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1708 1956
1709 if (!texid) 1957 if (!texid)
1710 return; 1958 return;
1711 1959
1712 tex = self->tex + texid; 1960 tex = self->tex + texid;
1741 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1989 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1742 // use uglier nearest interpolation because linear suffers 1990 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1991 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1992 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 1993}
1994
1995void
1996expire_textures (DC::Map self, int texid, int count)
1997 PPCODE:
1998 for (; texid < self->texs && count; ++texid, --count)
1999 {
2000 maptex *tex = self->tex + texid;
2001
2002 if (tex->name)
2003 {
2004 if (tex->unused)
2005 {
2006 tex->name = 0;
2007 tex->unused = 0;
2008 XPUSHs (sv_2mortal (newSViv (texid)));
2009 }
2010 else
2011 tex->unused = 1;
2012 }
2013 }
1746 2014
1747int 2015int
1748ox (DC::Map self) 2016ox (DC::Map self)
1749 ALIAS: 2017 ALIAS:
1750 oy = 1 2018 oy = 1
1782 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1783 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1784 2052
1785 while (self->y < 0) 2053 while (self->y < 0)
1786 { 2054 {
1787 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1788 2056
1789 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1790 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1791 } 2059 }
1792} 2060}
1793 2061
1794SV * 2062SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1796 CODE: 2064 CODE:
1797{ 2065{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2068 mapcell *cell;
1821 2089
1822 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1823 2091
1824 if (flags & 8) 2092 if (flags & 8)
1825 { 2093 {
2094 uint8_t ext, cmd;
2095
1826 if (extmap) 2096 do
1827 { 2097 {
1828 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1829 2100
1830 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1831 { 2104 {
1832 ext = *data++;
1833 cmd = ext & 0x7f;
1834
1835 if (cmd < 4)
1836 cell->darkness = 255 - ext * 64 + 1;
1837 else if (cmd == 5) // health
1838 {
1839 cell->stat_width = 1; 2105 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1841 }
1842 else if (cmd == 6) // monster width
1843 cell->stat_width = *data++ + 1;
1844 else if (cmd == 0x47)
1845 {
1846 if (*data == 1) cell->player = data [1];
1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1850
1851 data += *data + 1;
1852 }
1853 else if (cmd == 8) // cell flags
1854 cell->flags = *data++;
1855 else if (ext & 0x40) // unknown, multibyte => skip
1856 data += *data + 1;
1857 else
1858 data++;
1859 } 2107 }
1860 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1861 } 2125 }
1862 else 2126 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2127 }
1865 2128
1866 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1868 { 2131 {
1871 cell->tile [z] = self->face2tile [face]; 2134 cell->tile [z] = self->face2tile [face];
1872 2135
1873 if (cell->tile [z]) 2136 if (cell->tile [z])
1874 { 2137 {
1875 maptex *tex = self->tex + cell->tile [z]; 2138 maptex *tex = self->tex + cell->tile [z];
2139 tex->unused = 0;
1876 if (!tex->name) 2140 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 2141 av_push (missing, newSViv (cell->tile [z]));
1878 2142
1879 if (tex->smoothtile) 2143 if (tex->smoothtile)
1880 { 2144 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2145 maptex *smooth = self->tex + tex->smoothtile;
2146 smooth->unused = 0;
1882 if (!smooth->name) 2147 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2148 av_push (missing, newSViv (tex->smoothtile));
1884 } 2149 }
1885 } 2150 }
1886 } 2151 }
1914 ? self->row + y 2179 ? self->row + y
1915 : 0; 2180 : 0;
1916 2181
1917 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1918 { 2183 {
1919 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2185
1921 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1922 { 2187 {
1923 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1924 2189
1926 { 2191 {
1927 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2194 int a1 = tex.a;
1930 2195
1931 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1935 } 2200 }
1936 } 2201 }
1937 2202
1938 *map++ = (r ) 2203 *map++ = (r )
1939 | (g << 8) 2204 | (g << 8)
1940 | (b << 16) 2205 | (b << 16)
1941 | (a << 24); 2206 | (a << 24);
1942 } 2207 }
1943 } 2208 }
1944 2209
1945 RETVAL = map_sv; 2210 RETVAL = map_sv;
1946} 2211}
1947 OUTPUT: 2212 OUTPUT:
1948 RETVAL 2213 RETVAL
1949 2214
1950void 2215void
1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1952 CODE: 2217 CODE:
1953{ 2218{
1954 int x, y, z; 2219 int x, y, z;
1955 2220
1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2221 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1959 smooth_key skey;
1960 int pl_x, pl_y; 2222 int pl_x, pl_y;
1961 maptex pl_tex; 2223 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2225 rc_t rc_ov;
1963 rc_key_t key; 2226 rc_key_t key;
1964 rc_array_t *arr; 2227 rc_t::array_t *arr;
1965 2228
1966 pl_tex.name = 0; 2229 pl_tex.name = 0;
1967 2230
1968 // thats current max. sorry. 2231 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
1971
1972 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey));
1974 2234
1975 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
1976 key.r = 255; 2236 key.r = 255;
1977 key.g = 255; 2237 key.g = 255;
1978 key.b = 255; 2238 key.b = 255;
1979 key.a = 255; 2239 key.a = 255;
1980 key.mode = GL_QUADS; 2240 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2241 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2242
1984 mx += self->x; 2243 mx += self->x;
1985 my += self->y; 2244 my += self->y;
1986 2245
1987 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
1988 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
1989 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
1990 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1991 2250
1992 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
1994 { 2253 {
1995 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2271
2013 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
2014 { 2273 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2274 std::bitset<256> smooth_level; // one bit for every possible smooth level
2275 smooth_key skey;
2276 smooth_hash smooth;
2277 key.texname = -1;
2016 2278
2017 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
2019 { 2281 {
2020 maprow *row = self->row + (y + my); 2282 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2288 tileid tile = cell->tile [z];
2027 2289
2028 if (tile) 2290 if (tile)
2029 { 2291 {
2030 maptex tex = self->tex [tile]; 2292 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2293 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2294
2034 if (key.texname != tex.name) 2295 if (key.texname != tex.name)
2035 { 2296 {
2297 self->tex [tile].unused = 0;
2298
2036 if (!tex.name) 2299 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2301
2039 key.texname = tex.name; 2302 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
2041 } 2304 }
2042 2305
2306 px = (x + 1) * Th - tex.w;
2307 py = (y + 1) * Tw - tex.h;
2308
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2044 { 2310 {
2045 pl_x = px; 2311 pl_x = px;
2046 pl_y = py; 2312 pl_y = py;
2047 pl_tex = tex; 2313 pl_tex = tex;
2048 continue; 2314 continue;
2049 } 2315 }
2050 2316
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2319 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2055
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
2059 if (cell->flags & 1)
2060 {
2061 maptex tex = self->tex [1];
2062 int px = x * T + T * 2 / 32;
2063 int py = y * T - T * 6 / 32;
2064
2065 if (tex.name)
2066 {
2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077 }
2078 }
2079 }
2080 2321
2081 // update smooth hash 2322 // update smooth hash
2082 if (tex.smoothtile) 2323 if (tex.smoothtile)
2083 { 2324 {
2084 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2086 2327
2087 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2088 2329
2089 // add bits to current tile and all neighbours. skey.x|y is 2330 // add bits to current tile and all neighbours. skey.x|y is
2090 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2091 2332
2092 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
2100 2341
2101 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2102 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2103 2344
2104 // full tile 2345 // full tile
2105 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2346 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2106 2347
2107 // borders 2348 // borders
2108 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2349 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2109 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2350 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2110 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2351 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2111 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2352 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2112 2353
2113 // corners 2354 // corners
2114 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2355 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2115 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2356 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2116 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2357 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2117 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2358 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2359 }
2360 }
2361
2362 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2363 {
2364 // overlays such as the speech bubble, probably more to come
2365 if (cell->flags & 1)
2366 {
2367 rc_key_t key_ov = key;
2368 maptex tex = self->tex[TEXID_SPEECH];
2369 int px = x * Tw + Tw * 2 / 32;
2370 int py = y * Th - Th * 6 / 32;
2371
2372 key_ov.texname = tex.name;
2373 rc_t::array_t &arr = rc_ov.array (key_ov);
2374
2375 arr.t2f_v3f (0 , 0 , px , py , 0);
2376 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2377 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2378 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2118 } 2379 }
2119 } 2380 }
2120 } 2381 }
2121 } 2382 }
2122 2383
2123 rc_draw (rc); 2384 rc.draw ();
2124 rc_clear (rc); 2385 rc.clear ();
2125 2386
2126 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2127 // this is basically counting sort 2388 // this is basically counting sort
2128 { 2389 {
2129 int w, b; 2390 int w, b;
2130 2391
2131 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2133 for (w = 0; w < 256 / 32; ++w) 2394 for (int level = 0; level < smooth_level.size (); ++level)
2395 if (smooth_level[level])
2396 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2134 { 2397 {
2135 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2136 if (smask) 2399 IV bits = it->second;
2137 for (b = 0; b < 32; ++b) 2400
2138 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2139 { 2404 {
2140 int level = (w << 5) | b; 2405 maptex tex = self->tex [skey.tile];
2406 int px = (((int)skey.x) - 1) * Tw;
2407 int py = (((int)skey.y) - 1) * Th;
2408 int border = bits & 15;
2409 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2410 float dx = tex.s * .0625f; // 16 images/row
2411 float dy = tex.t * .5f ; // 2 images/column
2412
2141 HE *he; 2413 if (tex.name)
2142
2143 hv_iterinit (smooth);
2144 while ((he = hv_iternext (smooth)))
2145 { 2414 {
2146 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2147 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2148 2417 if (key.texname != tex.name)
2149 if (!(bits & 0x1000)
2150 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y])
2152 { 2418 {
2153 maptex tex = self->tex [skey->tile]; 2419 self->tex [skey.tile].unused = 0;
2154 int px = (((int)skey->x) - 1) * T;
2155 int py = (((int)skey->y) - 1) * T;
2156 int border = bits & 15;
2157 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2158 float dx = tex.s * .0625f; // 16 images/row
2159 float dy = tex.t * .5f ; // 2 images/column
2160 2420
2161 if (tex.name)
2162 {
2163 // this time avoiding texture state changes
2164 // save gobs of state changes.
2165 if (key.texname != tex.name)
2166 {
2167 glEnd (); 2421 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2170 } 2424 }
2171 2425
2172 if (border) 2426 if (border)
2173 { 2427 {
2174 float ox = border * dx; 2428 float ox = border * dx;
2175 2429
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2434 }
2181 2435
2182 if (corner) 2436 if (corner)
2183 { 2437 {
2184 float ox = corner * dx; 2438 float ox = corner * dx;
2185 2439
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 }
2191 }
2192 } 2444 }
2193 } 2445 }
2194 } 2446 }
2195 } 2447 }
2196 2448
2197 glEnd (); 2449 glEnd ();
2198 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1; 2451 key.texname = -1;
2200 } 2452 }
2201
2202 hv_clear (smooth);
2203 } 2453 }
2204 2454
2205 if (pl_tex.name) 2455 if (pl_tex.name)
2206 { 2456 {
2207 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2208 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2209 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2210 2460
2211 key.texname = tex.name; 2461 key.texname = tex.name;
2212 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2213 2463
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2466 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2218 2468
2219 rc_draw (rc); 2469 rc.draw ();
2220 } 2470 }
2221 2471
2472 rc_ov.draw ();
2473 rc_ov.clear ();
2474
2222 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2223 rc_free (rc);
2224 2476
2225 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2228 { 2480 {
2231 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2485 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2235 2487
2236 int px = x * T; 2488 int px = x * Tw;
2237 int py = y * T; 2489 int py = y * Th;
2490
2491 if (ecb_expect_false (cell->player == player))
2492 {
2493 px += sdx;
2494 py += sdy;
2495 }
2238 2496
2239 if (cell->stat_hp) 2497 if (cell->stat_hp)
2240 { 2498 {
2241 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2501
2244 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2504 px + width - 1, py);
2247 2505
2253 } 2511 }
2254 } 2512 }
2255} 2513}
2256 2514
2257void 2515void
2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2516draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2259 CODE: 2517 CODE:
2260{ 2518{
2261 static float color[16][3] = { 2519 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2520 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2521 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2522 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2523 { 1.00f, 0.00f, 0.00f },
2266 2524
2267 { 1.00F, 0.54F, 0.00F }, 2525 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2526 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2527 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2528 { 0.18f, 0.54f, 0.34f },
2271 2529
2272 { 0.56F, 0.73F, 0.56F }, 2530 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2531 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2532 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2533 { 0.99f, 0.77f, 0.26f },
2276 2534
2277 { 0.74F, 0.65F, 0.41F }, 2535 { 0.74f, 0.65f, 0.41f },
2278 2536
2279 { 0.00F, 1.00F, 1.00F }, 2537 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2538 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2539 { 1.00f, 1.00f, 0.00f },
2282 }; 2540 };
2283 2541
2284 int x, y; 2542 int x, y;
2285 2543
2286 glEnable (GL_TEXTURE_2D); 2544 glEnable (GL_TEXTURE_2D);
2545 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2546 * but the nvidia driver (185.18.14) mishandles alpha textures
2547 * and takes the colour from god knows where instead of using
2548 * Cp. MODULATE results in the same colour, but slightly different
2549 * alpha, but atcually gives us the correct colour with nvidia.
2550 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2551 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2552 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2553 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2554 glBegin (GL_QUADS);
2291 2555
2292 for (y = 0; y < h; y++) 2556 for (y = 0; y < h; y++)
2296 2560
2297 if (m) 2561 if (m)
2298 { 2562 {
2299 float *c = color [m & 15]; 2563 float *c = color [m & 15];
2300 2564
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2565 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2566 float tx2 = tx1 + 0.5f;
2303 2567
2304 glColor4f (c[0], c[1], c[2], 0.75); 2568 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2569 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2570 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2571 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2572 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2573 }
2317void 2581void
2318fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2582fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2319 PPCODE: 2583 PPCODE:
2320{ 2584{
2321 int x, y; 2585 int x, y;
2322 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2325 int sw34 = (sw * 3 + 3) & ~3; 2589 int sw3 = sw * 3;
2590 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2591 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2593 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2594
2330 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2597
2333 mx += self->x - 1; 2598 mx += self->x - 1;
2334 my += self->y - 1; 2599 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2600
2338 for (y = 0; y < sh1; y++) 2601 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2602 if (0 <= y + my && y + my < self->rows)
2340 { 2603 {
2341 maprow *row = self->row + (y + my); 2604 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2607 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2608 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2609 mapcell *cell = row->col + (x + mx - row->c0);
2347 2610
2348 darkness1 [y * sw1 + x] = cell->darkness 2611 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2612 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2613 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2614 }
2352 } 2615 }
2353 2616
2354 for (y = 0; y < sh; ++y) 2617 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2618 for (x = 0; x < sw; ++x)
2374 2637
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2638 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2639 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2640 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2641
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2651 }
2389 2652
2390 free (darkness1); 2653 free (darkness1);
2391 2654
2392 EXTEND (SP, 3); 2655 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2656 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2657 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2658 PUSHs (darkness3_sv);
2396} 2659}
2397 2660
2398SV * 2661SV *
2461 else 2724 else
2462 *data++ = 0; 2725 *data++ = 0;
2463 } 2726 }
2464 } 2727 }
2465 2728
2466 /* if size is w*h + 5 then no data has been found */ 2729 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2730 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 { 2731 {
2469 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 } 2734 }
2472 2735
2473 RETVAL = data_sv; 2736 RETVAL = data_sv;
2474} 2737}
2475 OUTPUT: 2738 OUTPUT:
2476 RETVAL 2739 RETVAL
2477 2740
2478void 2741void
2485 STRLEN len; 2748 STRLEN len;
2486 uint8_t *data, *end; 2749 uint8_t *data, *end;
2487 2750
2488 len = SvLEN (data_sv); 2751 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2752 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv); 2753 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491 end = data + len + 8; 2754 end = data + len + 8;
2492 2755
2493 if (len < 5) 2756 if (len < 5)
2494 XSRETURN_EMPTY; 2757 XSRETURN_EMPTY;
2495 2758
2556} 2819}
2557 2820
2558MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2559 2822
2560DC::RW 2823DC::RW
2561new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2562 CODE: 2825 CODE:
2563{ 2826{
2564 STRLEN datalen; 2827 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2566 2829
2568} 2831}
2569 OUTPUT: 2832 OUTPUT:
2570 RETVAL 2833 RETVAL
2571 2834
2572DC::RW 2835DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574 CODE: 2837 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT: 2839 OUTPUT:
2577 RETVAL 2840 RETVAL
2578 2841
2596 if (RETVAL < 0) 2859 if (RETVAL < 0)
2597 { 2860 {
2598 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2599 2862
2600 if (RETVAL < 0) 2863 if (RETVAL < 0)
2864 {
2865 // happens sometimes, maybe it just stopped playing(?)
2866 RETVAL = Mix_GroupAvailable (-1);
2867
2868 if (RETVAL < 0)
2601 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2602 2870 }
2871 else
2603 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2604 } 2873 }
2605 2874
2606 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2608} 2877}
2655void 2924void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2925set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2926 CODE:
2658{ 2927{
2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2928 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2929 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2930 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2931}
2663 2932
2664void 2933void
2665set_reverse_stereo (DC::Channel self, int flip) 2934set_reverse_stereo (DC::Channel self, int flip)
2668 2937
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2939
2671PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2672 2941
2942void
2943decoders ()
2944 PPCODE:
2945#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2946 int i, num = Mix_GetNumChunkDecoders ();
2947 EXTEND (SP, num);
2948 for (i = 0; i < num; ++i)
2949 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2950#else
2951 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2952#endif
2953
2673DC::MixChunk 2954DC::MixChunk
2674new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2675 CODE: 2956 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT: 2958 OUTPUT:
2678 RETVAL 2959 RETVAL
2679 2960
2709 OUTPUT: 2990 OUTPUT:
2710 RETVAL 2991 RETVAL
2711 2992
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 2994
2995void
2996decoders ()
2997 PPCODE:
2998#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2999 int i, num = Mix_GetNumMusicDecoders ();
3000 EXTEND (SP, num);
3001 for (i = 0; i < num; ++i)
3002 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3003#else
3004 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3005#endif
3006
2714int 3007int
2715volume (int volume = -1) 3008volume (int volume = -1)
2716 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2717 CODE: 3010 CODE:
2718 if (items > 0) 3011 if (items > 0)
2729void 3022void
2730halt () 3023halt ()
2731 CODE: 3024 CODE:
2732 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2733 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2734DC::MixMusic 3034DC::MixMusic
2735new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2736 CODE: 3036 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2738 OUTPUT: 3038 OUTPUT:
2739 RETVAL 3039 RETVAL
2740 3040
2768 } *civ, const_iv[] = { 3068 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3069# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3070 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3071 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3072 const_iv (GL_EXTENSIONS),
3073 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3074 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3075 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3076 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3077 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3078 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3090 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3091 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3092 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3093 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 const_iv (GL_ONE_MINUS_DST_ALPHA), 3094 const_iv (GL_ONE_MINUS_DST_ALPHA),
3095 const_iv (GL_SRC_COLOR),
3096 const_iv (GL_DST_COLOR),
3097 const_iv (GL_ONE_MINUS_SRC_COLOR),
3098 const_iv (GL_ONE_MINUS_DST_COLOR),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3099 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3100 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3101 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3102 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3103 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3171 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3172 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3173 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3174 const_iv (GL_T2F_V3F),
2870 const_iv (GL_T2F_N3F_V3F), 3175 const_iv (GL_T2F_N3F_V3F),
3176 const_iv (GL_FUNC_ADD),
3177 const_iv (GL_FUNC_SUBTRACT),
3178 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2871# undef const_iv 3179# undef const_iv
2872 }; 3180 };
2873 3181
2874 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3182 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3184
2877 texture_av = newAV (); 3185 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
2879} 3187}
2880 3188
2882disable_GL_EXT_blend_func_separate () 3190disable_GL_EXT_blend_func_separate ()
2883 CODE: 3191 CODE:
2884 gl.BlendFuncSeparate = 0; 3192 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
2886 3194
2887char * 3195void
3196apple_nvidia_bug (int enable)
3197
3198const char *
2888gl_vendor () 3199gl_vendor ()
2889 CODE: 3200 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3202 OUTPUT:
2892 RETVAL 3203 RETVAL
2893 3204
2894char * 3205const char *
2895gl_version () 3206gl_version ()
2896 CODE: 3207 CODE:
2897 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
2898 OUTPUT: 3209 OUTPUT:
2899 RETVAL 3210 RETVAL
2900 3211
2901char * 3212const char *
2902gl_extensions () 3213gl_extensions ()
2903 CODE: 3214 CODE:
2904 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905 OUTPUT: 3216 OUTPUT:
2906 RETVAL 3217 RETVAL
2907 3218
2908const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
2909 3224
2910GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
2911 CODE: 3226 CODE:
2912 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT: 3228 OUTPUT:
2921 3236
2922int glGetError () 3237int glGetError ()
2923 3238
2924void glFinish () 3239void glFinish ()
2925 3240
3241void glFlush ()
3242
2926void glClear (int mask) 3243void glClear (int mask)
2927 3244
2928void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3246 PROTOTYPE: @
2930 3247
2939void glBlendFunc (int sfactor, int dfactor) 3256void glBlendFunc (int sfactor, int dfactor)
2940 3257
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3258void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3259 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3260 gl_BlendFuncSeparate (sa, da, saa, daa);
3261
3262# void glBlendEquation (int se)
2944 3263
2945void glDepthMask (int flag) 3264void glDepthMask (int flag)
2946 3265
2947void glLogicOp (int opcode) 3266void glLogicOp (int opcode)
2948 3267
2983void glRotate (float angle, float x, float y, float z) 3302void glRotate (float angle, float x, float y, float z)
2984 CODE: 3303 CODE:
2985 glRotatef (angle, x, y, z); 3304 glRotatef (angle, x, y, z);
2986 3305
2987void glColor (float r, float g, float b, float a = 1.0) 3306void glColor (float r, float g, float b, float a = 1.0)
3307 PROTOTYPE: @
2988 ALIAS: 3308 ALIAS:
2989 glColor_premultiply = 1 3309 glColor_premultiply = 1
2990 CODE: 3310 CODE:
2991 if (ix) 3311 if (ix)
2992 { 3312 {
3098 3418
3099void glEndList () 3419void glEndList ()
3100 3420
3101void glCallList (int list) 3421void glCallList (int list)
3102 3422
3423void c_init ()
3424 CODE:
3425 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3426 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3427
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3428MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3429
3105PROTOTYPES: DISABLE 3430PROTOTYPES: DISABLE
3106 3431
3107void 3432void
3108find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
3109 PPCODE: 3434 PPCODE:
3110{ 3435{
3111 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
3112 XPUSHs (self); 3437 XPUSHs (self);
3113} 3438}
3114 3439
3115BOOT: 3440BOOT:
3116{ 3441{
3124 3449
3125void 3450void
3126draw (SV *self) 3451draw (SV *self)
3127 CODE: 3452 CODE:
3128{ 3453{
3129 HV *hv; 3454 HV *hv;
3130 SV **svp; 3455 SV **svp;
3131 NV x, y, w, h; 3456 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
3135 SV *draw_h_sv = GvSV (draw_h_gv); 3460 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines