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.262 by root, Wed Jul 16 20:12:27 2008 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 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>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
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);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
78 89
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
82 96
83#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
85 99
86#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
87 101
88/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90 104
91#if 1 105#define KMOD_LRAM 0x10000 // our extension
92# define PARACHUTE SDL_INIT_NOPARACHUTE 106
93#else 107#define TEXID_SPEECH 1
94# define PARACHUTE 0 108#define TEXID_NOFACE 2
95#endif 109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
96 128
97static AV *texture_av; 129static AV *texture_av;
98 130
99static struct 131static struct
100{ 132{
157{ 189{
158 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
159 191
160 while (attrs) 192 while (attrs)
161 { 193 {
162 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
163 195
164 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
165 return 1; 197 return 1;
166 198
167 attrs = attrs->next; 199 attrs = attrs->next;
168 } 200 }
169 201
170 return 0; 202 return 0;
171} 203}
172 204
173typedef struct cf_layout { 205struct cf_layout {
174 PangoLayout *pl; 206 PangoLayout *pl;
175 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
176 int base_height; 208 int base_height;
177 DC__Font font; 209 DC__Font font;
178 rc_t *rc; 210 rc_t rc;
179} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
180 214
181static DC__Font default_font; 215static DC__Font default_font;
182static PangoContext *opengl_context; 216static PangoContext *opengl_context;
183static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
184 218
185static void 219static void
186substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
187{ 221{
188 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
189#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
190 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
191#endif 225#endif
192 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
193} 227}
194 228
195static void 229static void
225} 259}
226 260
227typedef uint16_t tileid; 261typedef uint16_t tileid;
228typedef uint16_t faceid; 262typedef uint16_t faceid;
229 263
230typedef struct { 264struct maptex
265{
231 GLuint name; 266 GLuint name;
232 int w, h; 267 int w, h;
233 float s, t; 268 float s, t;
234 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
235 tileid smoothtile; 270 tileid smoothtile;
236 uint8_t smoothlevel; 271 uint8_t smoothlevel;
237} maptex; 272 uint8_t unused; /* set to zero on use */
273};
238 274
239typedef struct { 275struct mapcell
276{
240 uint32_t player; 277 uint32_t player;
241 tileid tile[3]; 278 tileid tile[3];
242 uint16_t darkness; 279 uint16_t darkness;
243 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
244} mapcell; 281};
245 282
246typedef struct { 283struct maprow
284{
247 int32_t c0, c1; 285 int32_t c0, c1;
248 mapcell *col; 286 mapcell *col;
249} maprow; 287};
250 288
251typedef struct map { 289struct mapgrid {
252 int x, y, w, h; 290 int x, y, w, h;
253 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
254 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
255 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
256 294
257 int32_t rows; 295 int32_t rows;
258 maprow *row; 296 maprow *row;
259} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
260 300
261static char * 301static char *
262prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
263{ 303{
264 char *p; 304 char *p;
282 322
283#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
284#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
285 325
286static void 326static void
287need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
288{ 328{
289 while (self->faces <= face) 329 while (self->faces <= face)
290 { 330 {
291 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
292 self->faces *= 2; 332 self->faces *= 2;
293 } 333 }
294} 334}
295 335
296static void 336static void
297need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
298{ 338{
299 while (self->texs <= texid) 339 while (self->texs <= texid)
300 { 340 {
301 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
302 self->texs *= 2; 342 self->texs *= 2;
303 } 343 }
304} 344}
305 345
306static maprow * 346static maprow *
307map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
308{ 348{
309 if (0 > y) 349 if (0 > y)
310 { 350 {
311 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
312 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
350 390
351 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
352} 392}
353 393
354static mapcell * 394static mapcell *
355map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
356{ 396{
357 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
358} 398}
359 399
360static void 400static void
361map_clear (DC__Map self) 401map_clear (mapgrid *self)
362{ 402{
363 int r; 403 int r;
364 404
365 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
366 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
373 self->oy = 0; 413 self->oy = 0;
374 self->row = 0; 414 self->row = 0;
375 self->rows = 0; 415 self->rows = 0;
376} 416}
377 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
378static void 428static void
379map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
380{ 430{
381 int x, y; 431 int x, y;
382 maprow *row; 432 maprow *row;
383 mapcell *cell; 433 mapcell *cell;
384 434
396 if (x >= row->c1) 446 if (x >= row->c1)
397 break; 447 break;
398 448
399 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
400 450
401 cell->darkness = 0; 451 CELL_CLEAR (cell);
402 cell->stat_hp = 0;
403 cell->flags = 0;
404 cell->player = 0;
405 } 452 }
406 } 453 }
407} 454}
408 455
409typedef struct { 456struct smooth_key
457{
410 tileid tile; 458 tileid tile;
411 uint8_t x, y, level; 459 uint8_t x, y, level;
412} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
413 479
414static void 480static void
415smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
416{ 482{
417 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
418 484
419 if (SvIOK (*sv)) 485 if (it == h.end ())
420 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
421 else 487 else
422 sv_setiv (*sv, bits); 488 it->second |= bits;
423} 489}
424 490
425static void 491static void
426music_finished (void) 492music_finished (void)
427{ 493{
444 ev.code = 1; 510 ev.code = 1;
445 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
446 ev.data2 = 0; 512 ev.data2 = 0;
447 513
448 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
449} 522}
450 523
451static unsigned int 524static unsigned int
452minpot (unsigned int n) 525minpot (unsigned int n)
453{ 526{
520 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
521 return 0; 594 return 0;
522 595
523 return 1; 596 return 1;
524} 597}
598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
525 656
526MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
527 658
528PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
529 660
558 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
559 690
560 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
561 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
562 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
563 744
564 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
566 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
567 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
643 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
644 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
645 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
646 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
647 828
829 const_iv (KMOD_LRAM),
830
648 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
832
833 const_iv (SDL_INIT_TIMER),
834 const_iv (SDL_INIT_AUDIO),
835 const_iv (SDL_INIT_VIDEO),
836 const_iv (SDL_INIT_CDROM),
837 const_iv (SDL_INIT_JOYSTICK),
838 const_iv (SDL_INIT_EVERYTHING),
839 const_iv (SDL_INIT_NOPARACHUTE),
840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
649# undef const_iv 861# undef const_iv
650 }; 862 };
651 863
652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
654 866
655 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
656 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
657} 869}
658 870
674NV ceil (NV x) 886NV ceil (NV x)
675 887
676IV minpot (UV n) 888IV minpot (UV n)
677 889
678IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
679 897
680void 898void
681pango_init () 899pango_init ()
682 CODE: 900 CODE:
683{ 901{
689 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif 909#endif
692} 910}
693 911
694char *
695SDL_GetError () 912char *SDL_GetError ()
696 913
697int 914void SDL_main_hack (SV *real_main)
698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
699 916
700void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
701SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
702 934
703void 935void
704SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
705 PPCODE: 937 PPCODE:
706{ 938{
718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
721 953
722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
723#if SDL_VERSION_ATLEAST(1,2,10)
724 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
725 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
726#endif
727 956
728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
729 958
730 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
731 while (*m) 960 while (*m)
732 { 961 {
733 if ((*m)->w >= 800 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
734 { 963 {
735 AV *av = newAV (); 964 AV *av = newAV ();
736 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
737 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
761 ); 990 );
762 991
763 if (RETVAL) 992 if (RETVAL)
764 { 993 {
765 av_clear (texture_av); 994 av_clear (texture_av);
766
767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
768#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
769#include "glfunc.h" 996#include "glfunc.h"
770#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
771 } 1000 }
772} 1001}
773 OUTPUT: 1002 OUTPUT:
774 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
775 1007
776void 1008void
777SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
778 1010
779char * 1011char *
780SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
781 1014
782int 1015int
783SDL_GetAppState () 1016SDL_GetAppState ()
784 1017
785int 1018int
786SDL_GetModState () 1019SDL_GetModState ()
787 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
788void 1025void
1026SDL_PumpEvents ()
1027
1028void
789poll_events () 1029peep_events ()
790 PPCODE: 1030 PPCODE:
791{ 1031{
792 SDL_Event ev; 1032 SDL_Event ev;
793 1033
794 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
801 { 1041 {
802 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
803 case SDL_KEYUP: 1043 case SDL_KEYUP:
804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
809 break; 1049 break;
810 1050
811 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
830 x = ev.motion.x; 1070 x = ev.motion.x;
831 y = ev.motion.y; 1071 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 } 1073 }
834 1074
835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
836 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
837 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
838 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
839 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
840 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
860 1100
861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
862 } 1102 }
863} 1103}
864 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
865int 1118int
866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
867 POSTCALL: 1120 POSTCALL:
868 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
869 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
870 1123
871void 1124void
872Mix_QuerySpec () 1125Mix_QuerySpec ()
931add_font (char *file) 1184add_font (char *file)
932 CODE: 1185 CODE:
933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT: 1187 OUTPUT:
935 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
936 1196
937void 1197void
938load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
939 ALIAS: 1199 ALIAS:
940 load_image_file = 1 1200 load_image_file = 1
986 1246
987 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
988 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
989 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
990 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
991 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
992 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
993 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
994 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
995 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
996 1256
1056#if DEBUG 1316#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1058#endif 1318#endif
1059} 1319}
1060 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1061MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1062 1329
1063PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1064 1331
1065DC::Font 1332DC::Font
1066new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1067 CODE: 1334 CODE:
1068{ 1335{
1069 int count; 1336 int count;
1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1071 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1100 PROTOTYPE: 1367 PROTOTYPE:
1101 CODE: 1368 CODE:
1102 tc_restore (); 1369 tc_restore ();
1103 1370
1104DC::Layout 1371DC::Layout
1105new (SV *class) 1372new (SV *klass)
1106 CODE: 1373 CODE:
1107 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1108 1375
1109 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1110 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1111 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1112 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1113 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1114 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1115 RETVAL->font = 0; 1382 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
1117 1383
1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1119 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1120 OUTPUT: 1386 OUTPUT:
1121 RETVAL 1387 RETVAL
1122 1388
1123void 1389void
1124DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1125 CODE: 1391 CODE:
1126 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1127 rc_free (self->rc);
1128 Safefree (self); 1393 delete self;
1129 1394
1130void 1395void
1131set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1132 CODE: 1397 CODE:
1133{ 1398{
1259 1524
1260void 1525void
1261set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1262 CODE: 1527 CODE:
1263 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1264 { 1529 {
1265 self->base_height = base_height; 1530 self->base_height = base_height;
1266 layout_update_font (self); 1531 layout_update_font (self);
1267 } 1532 }
1268 1533
1269void 1534void
1387} 1652}
1388 1653
1389void 1654void
1390render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1391 CODE: 1656 CODE:
1392 rc_clear (self->rc); 1657 self->rc.clear ();
1393 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1394 self->pl, 1659 self->pl,
1395 self->rc, 1660 &self->rc,
1396 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1397 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1398 flags 1663 flags
1399 ); 1664 );
1400 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1411 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1412 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1413 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1414 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1415 1680
1416 rc_draw (self->rc); 1681 self->rc.draw ();
1417 1682
1418 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1419 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1420 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1421} 1686}
1496 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1497 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1498 } 1763 }
1499} 1764}
1500 1765
1766void
1767draw_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)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1501IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1502 CODE: 1888 CODE:
1503{ 1889{
1504 GLint width; 1890 GLint width;
1505 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1512MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1513 1899
1514PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1515 1901
1516DC::Map 1902DC::Map
1517new (SV *class) 1903new (SV *klass)
1518 CODE: 1904 CODE:
1519 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1520 RETVAL->x = 0; 1906 RETVAL->x = 0;
1521 RETVAL->y = 0; 1907 RETVAL->y = 0;
1522 RETVAL->w = 0; 1908 RETVAL->w = 0;
1523 RETVAL->h = 0; 1909 RETVAL->h = 0;
1524 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1561 1947
1562void 1948void
1563set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1564 CODE: 1950 CODE:
1565{ 1951{
1566 tileid texid; 1952 tileid texid;
1567 maptex *tex; 1953 maptex *tex;
1568 1954
1569 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1570 return; 1956 return;
1571 1957
1572 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1573 return; 1959 return;
1574 1960
1575 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1576 1962
1577 if (!texid) 1963 if (!texid)
1578 return; 1964 return;
1579 1965
1580 tex = self->tex + texid; 1966 tex = self->tex + texid;
1609 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1995 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1610 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1611 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1613} 1999}
2000
2001void
2002expire_textures (DC::Map self, int texid, int count)
2003 PPCODE:
2004 for (; texid < self->texs && count; ++texid, --count)
2005 {
2006 maptex *tex = self->tex + texid;
2007
2008 if (tex->name)
2009 {
2010 if (tex->unused)
2011 {
2012 tex->name = 0;
2013 tex->unused = 0;
2014 XPUSHs (sv_2mortal (newSViv (texid)));
2015 }
2016 else
2017 tex->unused = 1;
2018 }
2019 }
1614 2020
1615int 2021int
1616ox (DC::Map self) 2022ox (DC::Map self)
1617 ALIAS: 2023 ALIAS:
1618 oy = 1 2024 oy = 1
1658 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1659 } 2065 }
1660} 2066}
1661 2067
1662SV * 2068SV *
1663map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1664 CODE: 2070 CODE:
1665{ 2071{
1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1667 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1668 mapcell *cell; 2074 mapcell *cell;
1689 2095
1690 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1691 2097
1692 if (flags & 8) 2098 if (flags & 8)
1693 { 2099 {
2100 uint8_t ext, cmd;
2101
1694 if (extmap) 2102 do
1695 { 2103 {
1696 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1697 2106
1698 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1699 { 2110 {
1700 ext = *data++;
1701 cmd = ext & 0x7f;
1702
1703 if (cmd < 4)
1704 cell->darkness = 255 - ext * 64 + 1;
1705 else if (cmd == 5) // health
1706 {
1707 cell->stat_width = 1; 2111 cell->stat_width = 1;
1708 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1709 }
1710 else if (cmd == 6) // monster width
1711 cell->stat_width = *data++ + 1;
1712 else if (cmd == 0x47)
1713 {
1714 if (*data == 1) cell->player = data [1];
1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1718
1719 data += *data + 1;
1720 }
1721 else if (cmd == 8) // cell flags
1722 cell->flags = *data++;
1723 else if (ext & 0x40) // unknown, multibyte => skip
1724 data += *data + 1;
1725 else
1726 data++;
1727 } 2113 }
1728 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1729 } 2131 }
1730 else 2132 while (ext & 0x80);
1731 cell->darkness = *data++ + 1;
1732 } 2133 }
1733 2134
1734 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1735 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1736 { 2137 {
1739 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1740 2141
1741 if (cell->tile [z]) 2142 if (cell->tile [z])
1742 { 2143 {
1743 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1744 if (!tex->name) 2146 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1746 2148
1747 if (tex->smoothtile) 2149 if (tex->smoothtile)
1748 { 2150 {
1749 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1750 if (!smooth->name) 2153 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1752 } 2155 }
1753 } 2156 }
1754 } 2157 }
1755 } 2158 }
1756 else 2159 else
1757 cell->darkness = 0; 2160 CELL_CLEAR (cell);
1758 } 2161 }
1759} 2162}
1760 OUTPUT: 2163 OUTPUT:
1761 RETVAL 2164 RETVAL
1762 2165
1782 ? self->row + y 2185 ? self->row + y
1783 : 0; 2186 : 0;
1784 2187
1785 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1786 { 2189 {
1787 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1788 2191
1789 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1790 { 2193 {
1791 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1792 2195
1794 { 2197 {
1795 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1796 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1797 int a1 = tex.a; 2200 int a1 = tex.a;
1798 2201
1799 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1800 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1801 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1802 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1803 } 2206 }
1804 } 2207 }
1805 2208
1806 *map++ = (r ) 2209 *map++ = (r )
1807 | (g << 8) 2210 | (g << 8)
1808 | (b << 16) 2211 | (b << 16)
1809 | (a << 24); 2212 | (a << 24);
1810 } 2213 }
1811 } 2214 }
1812 2215
1813 RETVAL = map_sv; 2216 RETVAL = map_sv;
1814} 2217}
1815 OUTPUT: 2218 OUTPUT:
1816 RETVAL 2219 RETVAL
1817 2220
1818void 2221void
1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1820 CODE: 2223 CODE:
1821{ 2224{
1822 int x, y, z; 2225 int x, y, z;
1823 2226
1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1827 smooth_key skey;
1828 int pl_x, pl_y; 2228 int pl_x, pl_y;
1829 maptex pl_tex; 2229 maptex pl_tex;
1830 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1831 rc_key_t key; 2232 rc_key_t key;
1832 rc_array_t *arr; 2233 rc_t::array_t *arr;
1833 2234
1834 pl_tex.name = 0; 2235 pl_tex.name = 0;
1835 2236
1836 // thats current max. sorry. 2237 // that's current max. sorry.
1837 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1838 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1839
1840 // clear key, in case of extra padding
1841 memset (&skey, 0, sizeof (skey));
1842 2240
1843 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1844 key.r = 255; 2242 key.r = 255;
1845 key.g = 255; 2243 key.g = 255;
1846 key.b = 255; 2244 key.b = 255;
1847 key.a = 255; 2245 key.a = 255;
1848 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1849 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1850 key.texname = -1;
1851 2248
1852 mx += self->x; 2249 mx += self->x;
1853 my += self->y; 2250 my += self->y;
1854 2251
1855 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1856 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1857 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1858 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1859 2256
1860 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1861 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1862 { 2259 {
1863 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1878 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1880 2277
1881 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1882 { 2279 {
1883 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2283 key.texname = -1;
1884 2284
1885 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1887 { 2287 {
1888 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
1894 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
1895 2295
1896 if (tile) 2296 if (tile)
1897 { 2297 {
1898 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1899 int px = (x + 1) * T - tex.w; 2299 int px, py;
1900 int py = (y + 1) * T - tex.h;
1901 2300
1902 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
1903 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1904 if (!tex.name) 2305 if (!tex.name)
1905 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1906 2307
1907 key.texname = tex.name; 2308 key.texname = tex.name;
1908 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
1909 } 2310 }
2311
2312 px = (x + 1) * Th - tex.w;
2313 py = (y + 1) * Tw - tex.h;
1910 2314
1911 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
1912 { 2316 {
1913 pl_x = px; 2317 pl_x = px;
1914 pl_y = py; 2318 pl_y = py;
1915 pl_tex = tex; 2319 pl_tex = tex;
1916 continue; 2320 continue;
1917 } 2321 }
1918 2322
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1921 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1923
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1927 if (cell->flags & 1)
1928 {
1929 maptex tex = self->tex [1];
1930 int px = x * T + T * 2 / 32;
1931 int py = y * T - T * 6 / 32;
1932
1933 if (tex.name)
1934 {
1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1945 }
1946 }
1947 }
1948 2327
1949 // update smooth hash 2328 // update smooth hash
1950 if (tex.smoothtile) 2329 if (tex.smoothtile)
1951 { 2330 {
1952 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
1953 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
1954 2333
1955 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
1956 2335
1957 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
1958 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
1959 2338
1960 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
1968 2347
1969 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1970 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
1971 2350
1972 // full tile 2351 // full tile
1973 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1974 2353
1975 // borders 2354 // borders
1976 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1977 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2356 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1978 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2357 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1979 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1980 2359
1981 // corners 2360 // corners
1982 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1983 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2362 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1984 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2363 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1985 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1986 } 2385 }
1987 } 2386 }
1988 } 2387 }
1989 } 2388 }
1990 2389
1991 rc_draw (rc); 2390 rc.draw ();
1992 rc_clear (rc); 2391 rc.clear ();
1993 2392
1994 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
1995 // this is basically counting sort 2394 // this is basically counting sort
1996 { 2395 {
1997 int w, b; 2396 int w, b;
1998 2397
1999 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2000 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2001 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2002 { 2403 {
2003 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2004 if (smask) 2405 IV bits = it->second;
2005 for (b = 0; b < 32; ++b) 2406
2006 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2007 { 2410 {
2008 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
2009 HE *he; 2419 if (tex.name)
2010
2011 hv_iterinit (smooth);
2012 while ((he = hv_iternext (smooth)))
2013 { 2420 {
2014 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2015 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2016 2423 if (key.texname != tex.name)
2017 if (!(bits & 0x1000)
2018 && skey->level == level
2019 && level > smooth_max [skey->x][skey->y])
2020 { 2424 {
2021 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
2022 int px = (((int)skey->x) - 1) * T;
2023 int py = (((int)skey->y) - 1) * T;
2024 int border = bits & 15;
2025 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2026 float dx = tex.s * .0625f; // 16 images/row
2027 float dy = tex.t * .5f ; // 2 images/column
2028 2426
2029 if (tex.name)
2030 {
2031 // this time avoiding texture state changes
2032 // save gobs of state changes.
2033 if (key.texname != tex.name)
2034 {
2035 glEnd (); 2427 glEnd ();
2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2037 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2038 } 2430 }
2039 2431
2040 if (border) 2432 if (border)
2041 { 2433 {
2042 float ox = border * dx; 2434 float ox = border * dx;
2043 2435
2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2048 } 2440 }
2049 2441
2050 if (corner) 2442 if (corner)
2051 { 2443 {
2052 float ox = corner * dx; 2444 float ox = corner * dx;
2053 2445
2054 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2058 }
2059 }
2060 } 2450 }
2061 } 2451 }
2062 } 2452 }
2063 } 2453 }
2064 2454
2065 glEnd (); 2455 glEnd ();
2066 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1; 2457 key.texname = -1;
2068 } 2458 }
2069
2070 hv_clear (smooth);
2071 } 2459 }
2072 2460
2073 if (pl_tex.name) 2461 if (pl_tex.name)
2074 { 2462 {
2075 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2076 int px = pl_x + pdx; 2464 int px = pl_x + sdx;
2077 int py = pl_y + pdy; 2465 int py = pl_y + sdy;
2078 2466
2079 key.texname = tex.name; 2467 key.texname = tex.name;
2080 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2081 2469
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2083 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2084 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2086 2474
2087 rc_draw (rc); 2475 rc.draw ();
2088 } 2476 }
2089 2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2090 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2091 rc_free (rc);
2092 2482
2093 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2094 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2095 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2096 { 2486 {
2099 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2100 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2101 { 2491 {
2102 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2103 2493
2104 int px = x * T; 2494 int px = x * Tw;
2105 int py = y * T; 2495 int py = y * Th;
2496
2497 if (expect_false (cell->player == player))
2498 {
2499 px += sdx;
2500 py += sdy;
2501 }
2106 2502
2107 if (cell->stat_hp) 2503 if (cell->stat_hp)
2108 { 2504 {
2109 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2110 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2111 2507
2112 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2113 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2114 px + width - 1, py); 2510 px + width - 1, py);
2115 2511
2121 } 2517 }
2122 } 2518 }
2123} 2519}
2124 2520
2125void 2521void
2126draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2127 CODE: 2523 CODE:
2128{ 2524{
2129 static float color[16][3] = { 2525 static float color[16][3] = {
2130 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2131 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2132 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2133 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2134 2530
2135 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2136 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2137 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2138 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2139 2535
2140 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2141 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2142 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2143 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2144 2540
2145 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2146 2542
2147 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2148 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2149 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2150 }; 2546 };
2151 2547
2152 int x, y; 2548 int x, y;
2153 2549
2154 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
2155 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2156 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2159 2561
2160 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2164 2566
2165 if (m) 2567 if (m)
2166 { 2568 {
2167 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2168 2570
2169 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2170 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2171 2573
2172 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2173 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2174 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2175 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2176 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2177 } 2579 }
2185void 2587void
2186fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2187 PPCODE: 2589 PPCODE:
2188{ 2590{
2189 int x, y; 2591 int x, y;
2190 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2191 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2192 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2193 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2194 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2195 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2196 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2197 2600
2198 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2199 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2200 2603
2201 mx += self->x - 1; 2604 mx += self->x - 1;
2202 my += self->y - 1; 2605 my += self->y - 1;
2203
2204 memset (darkness1, 255, sw1 * sh1);
2205 2606
2206 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2207 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2208 { 2609 {
2209 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2212 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2213 { 2614 {
2214 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2215 2616
2216 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2217 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2218 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2219 } 2620 }
2220 } 2621 }
2221 2622
2222 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2223 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2242 2643
2243 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2244 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2245 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2246 2647
2247 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2250 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2253 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2256 } 2657 }
2257 2658
2258 free (darkness1); 2659 free (darkness1);
2259 2660
2260 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2261 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2262 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2263 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2264} 2665}
2265 2666
2266SV * 2667SV *
2329 else 2730 else
2330 *data++ = 0; 2731 *data++ = 0;
2331 } 2732 }
2332 } 2733 }
2333 2734
2334 /* if size is w*h + 5 then no data has been found */ 2735 /* if size is w*h + 5 then no data has been found */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 { 2737 {
2337 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 } 2740 }
2340 2741
2341 RETVAL = data_sv; 2742 RETVAL = data_sv;
2342} 2743}
2343 OUTPUT: 2744 OUTPUT:
2344 RETVAL 2745 RETVAL
2345 2746
2346void 2747void
2353 STRLEN len; 2754 STRLEN len;
2354 uint8_t *data, *end; 2755 uint8_t *data, *end;
2355 2756
2356 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2359 end = data + len + 8; 2760 end = data + len + 8;
2360 2761
2361 if (len < 5) 2762 if (len < 5)
2362 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2363 2764
2424} 2825}
2425 2826
2426MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2427 2828
2428DC::RW 2829DC::RW
2429new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2430 CODE: 2831 CODE:
2431{ 2832{
2432 STRLEN datalen; 2833 STRLEN datalen;
2433 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2434 2835
2436} 2837}
2437 OUTPUT: 2838 OUTPUT:
2438 RETVAL 2839 RETVAL
2439 2840
2440DC::RW 2841DC::RW
2441new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2442 CODE: 2843 CODE:
2443 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2444 OUTPUT: 2845 OUTPUT:
2445 RETVAL 2846 RETVAL
2446 2847
2464 if (RETVAL < 0) 2865 if (RETVAL < 0)
2465 { 2866 {
2466 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2467 2868
2468 if (RETVAL < 0) 2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2469 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2470 2876 }
2877 else
2471 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2472 } 2879 }
2473 2880
2474 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2476} 2883}
2523void 2930void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE: 2932 CODE:
2526{ 2933{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530} 2937}
2531 2938
2532void 2939void
2533set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2536 2943
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538 2945
2539PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2540 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2541DC::MixChunk 2960DC::MixChunk
2542new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2543 CODE: 2962 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2545 OUTPUT: 2964 OUTPUT:
2546 RETVAL 2965 RETVAL
2547 2966
2577 OUTPUT: 2996 OUTPUT:
2578 RETVAL 2997 RETVAL
2579 2998
2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2581 3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
3012
2582int 3013int
2583volume (int volume = -1) 3014volume (int volume = -1)
2584 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2585 CODE: 3016 CODE:
2586 if (items > 0) 3017 if (items > 0)
2597void 3028void
2598halt () 3029halt ()
2599 CODE: 3030 CODE:
2600 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2601 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2602DC::MixMusic 3040DC::MixMusic
2603new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2604 CODE: 3042 CODE:
2605 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2606 OUTPUT: 3044 OUTPUT:
2607 RETVAL 3045 RETVAL
2608 3046
2636 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2637# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2638 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2639 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2640 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2641 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2642 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2643 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2644 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2645 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2657 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2658 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2659 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2660 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2661 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2662 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2663 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2664 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2665 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2666 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2734 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2735 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2736 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2737 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2738 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2739# undef const_iv 3185# undef const_iv
2740 }; 3186 };
2741 3187
2742 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2743 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2744 3190
2745 texture_av = newAV (); 3191 texture_av = newAV ();
2746 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2747} 3193}
2748 3194
2750disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2751 CODE: 3197 CODE:
2752 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2754 3200
2755char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2756gl_vendor () 3205gl_vendor ()
2757 CODE: 3206 CODE:
2758 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2759 OUTPUT: 3208 OUTPUT:
2760 RETVAL 3209 RETVAL
2761 3210
2762char * 3211const char *
2763gl_version () 3212gl_version ()
2764 CODE: 3213 CODE:
2765 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2766 OUTPUT: 3215 OUTPUT:
2767 RETVAL 3216 RETVAL
2768 3217
2769char * 3218const char *
2770gl_extensions () 3219gl_extensions ()
2771 CODE: 3220 CODE:
2772 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2773 OUTPUT: 3222 OUTPUT:
2774 RETVAL 3223 RETVAL
2775 3224
2776const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2777 3230
2778GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2779 CODE: 3232 CODE:
2780 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2781 OUTPUT: 3234 OUTPUT:
2789 3242
2790int glGetError () 3243int glGetError ()
2791 3244
2792void glFinish () 3245void glFinish ()
2793 3246
3247void glFlush ()
3248
2794void glClear (int mask) 3249void glClear (int mask)
2795 3250
2796void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2797 PROTOTYPE: @ 3252 PROTOTYPE: @
2798 3253
2807void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2808 3263
2809void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2810 CODE: 3265 CODE:
2811 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2812 3269
2813void glDepthMask (int flag) 3270void glDepthMask (int flag)
2814 3271
2815void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2816 3273
2851void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2852 CODE: 3309 CODE:
2853 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2854 3311
2855void glColor (float r, float g, float b, float a = 1.0) 3312void glColor (float r, float g, float b, float a = 1.0)
3313 PROTOTYPE: @
2856 ALIAS: 3314 ALIAS:
2857 glColor_premultiply = 1 3315 glColor_premultiply = 1
2858 CODE: 3316 CODE:
2859 if (ix) 3317 if (ix)
2860 { 3318 {
2966 3424
2967void glEndList () 3425void glEndList ()
2968 3426
2969void glCallList (int list) 3427void glCallList (int list)
2970 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2972 3435
2973PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
2974 3437
2975void 3438void
2976find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
2977 PPCODE: 3440 PPCODE:
2978{ 3441{
2979 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
2980 XPUSHs (self); 3443 XPUSHs (self);
2981} 3444}
2982 3445
2983BOOT: 3446BOOT:
2984{ 3447{
2992 3455
2993void 3456void
2994draw (SV *self) 3457draw (SV *self)
2995 CODE: 3458 CODE:
2996{ 3459{
2997 HV *hv; 3460 HV *hv;
2998 SV **svp; 3461 SV **svp;
2999 NV x, y, w, h; 3462 NV x, y, w, h;
3000 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3001 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3002 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3003 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines