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.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
33 37
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 39
36#include <SDL.h> 40#include <SDL.h>
37#include <SDL_thread.h> 41#include <SDL_thread.h>
41#include <SDL_opengl.h> 45#include <SDL_opengl.h>
42 46
43/* work around os x broken headers */ 47/* work around os x broken headers */
44#ifdef __MACOSX__ 48#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46#endif 52#endif
47 53
48#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
50 56
51#include <glib/gmacros.h> 57#include <glib.h>
52 58
53#include <pango/pango.h> 59#include <pango/pango.h>
54 60
55#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
80#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
82 88
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
85#define FOW_DARKNESS 64 93#define FOW_DARKNESS 50
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 94#define DARKNESS_ADJUST(n) (n)
87 95
88#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
90 98
91#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
95 103
96#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
97 105
98#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
101 127
102static AV *texture_av; 128static AV *texture_av;
103 129
104static struct 130static struct
105{ 131{
162{ 188{
163 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
164 190
165 while (attrs) 191 while (attrs)
166 { 192 {
167 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 194
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 196 return 1;
171 197
172 attrs = attrs->next; 198 attrs = attrs->next;
173 } 199 }
174 200
175 return 0; 201 return 0;
176} 202}
177 203
178typedef struct cf_layout { 204struct cf_layout {
179 PangoLayout *pl; 205 PangoLayout *pl;
180 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
181 int base_height; 207 int base_height;
182 DC__Font font; 208 DC__Font font;
183 rc_t *rc; 209 rc_t *rc;
184} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
185 213
186static DC__Font default_font; 214static DC__Font default_font;
187static PangoContext *opengl_context; 215static PangoContext *opengl_context;
188static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
189 217
190static void 218static void
191substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
192{ 220{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 224#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 226}
199 227
200static void 228static void
230} 258}
231 259
232typedef uint16_t tileid; 260typedef uint16_t tileid;
233typedef uint16_t faceid; 261typedef uint16_t faceid;
234 262
235typedef struct { 263struct maptex
264{
236 GLuint name; 265 GLuint name;
237 int w, h; 266 int w, h;
238 float s, t; 267 float s, t;
239 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
240 tileid smoothtile; 269 tileid smoothtile;
241 uint8_t smoothlevel; 270 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */ 271 uint8_t unused; /* set to zero on use */
243} maptex; 272};
244 273
245typedef struct { 274struct mapcell
275{
246 uint32_t player; 276 uint32_t player;
247 tileid tile[3]; 277 tileid tile[3];
248 uint16_t darkness; 278 uint16_t darkness;
249 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
250} mapcell; 280};
251 281
252typedef struct { 282struct maprow
283{
253 int32_t c0, c1; 284 int32_t c0, c1;
254 mapcell *col; 285 mapcell *col;
255} maprow; 286};
256 287
257typedef struct map { 288struct mapgrid {
258 int x, y, w, h; 289 int x, y, w, h;
259 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
260 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
261 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
262 293
263 int32_t rows; 294 int32_t rows;
264 maprow *row; 295 maprow *row;
265} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
266 299
267static char * 300static char *
268prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
269{ 302{
270 char *p; 303 char *p;
288 321
289#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291 324
292static void 325static void
293need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
294{ 327{
295 while (self->faces <= face) 328 while (self->faces <= face)
296 { 329 {
297 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
298 self->faces *= 2; 331 self->faces *= 2;
299 } 332 }
300} 333}
301 334
302static void 335static void
303need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
304{ 337{
305 while (self->texs <= texid) 338 while (self->texs <= texid)
306 { 339 {
307 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
308 self->texs *= 2; 341 self->texs *= 2;
309 } 342 }
310} 343}
311 344
312static maprow * 345static maprow *
313map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
314{ 347{
315 if (0 > y) 348 if (0 > y)
316 { 349 {
317 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
318 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
356 389
357 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
358} 391}
359 392
360static mapcell * 393static mapcell *
361map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
362{ 395{
363 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
364} 397}
365 398
366static void 399static void
367map_clear (DC__Map self) 400map_clear (mapgrid *self)
368{ 401{
369 int r; 402 int r;
370 403
371 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
372 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
390 (cell)->flags = 0; \ 423 (cell)->flags = 0; \
391 (cell)->player = 0; \ 424 (cell)->player = 0; \
392 } while (0) 425 } while (0)
393 426
394static void 427static void
395map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
396{ 429{
397 int x, y; 430 int x, y;
398 maprow *row; 431 maprow *row;
399 mapcell *cell; 432 mapcell *cell;
400 433
417 CELL_CLEAR (cell); 450 CELL_CLEAR (cell);
418 } 451 }
419 } 452 }
420} 453}
421 454
422typedef struct { 455struct smooth_key
456{
423 tileid tile; 457 tileid tile;
424 uint8_t x, y, level; 458 uint8_t x, y, level;
425} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
426 478
427static void 479static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 481{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
431 483
432 if (SvIOK (*sv)) 484 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
434 else 486 else
435 sv_setiv (*sv, bits); 487 it->second |= bits;
436} 488}
437 489
438static void 490static void
439music_finished (void) 491music_finished (void)
440{ 492{
457 ev.code = 1; 509 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 511 ev.data2 = 0;
460 512
461 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
514}
515
516// approximately divide by 255
517static unsigned int
518div255 (unsigned int n)
519{
520 return (n + (n >> 8)) >> 8;
462} 521}
463 522
464static unsigned int 523static unsigned int
465minpot (unsigned int n) 524minpot (unsigned int n)
466{ 525{
549 608
550 return mod; 609 return mod;
551} 610}
552 611
553static void 612static void
554deliantra_main () 613deliantra_main (SV *real_main)
555{ 614{
556 char *argv[] = { 0 }; 615 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
558} 619}
559 620
560#ifdef __MACOSX__ 621#ifdef __MACOSX__
622 static SV *real_main;
623
561 /* to due surprising braindamage on the side of SDL design, we 624 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 625 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which, 626 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 628 * and which calls our main (== SDL_main) back.
566 */ 629 */
567 extern C_LINKAGE int 630 extern C_LINKAGE int
568 main (int argc, char *argv[]) 631 main (int argc, char *argv[])
569 { 632 {
570 deliantra_main (); 633 deliantra_main (real_main);
571 } 634 }
572 635
573 #undef main 636 #undef main
574 637
575 extern C_LINKAGE int main (int argc, char *argv[]); 638 extern C_LINKAGE int main (int argc, char *argv[]);
576 639
577 static void 640 static void
578 SDL_braino (void) 641 SDL_main_hack (SV *real_main_)
579 { 642 {
643 real_main = real_main_;
644
580 char *argv[] = { "deliantra client", 0 }; 645 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 646 (main) (1, argv);
582 } 647 }
583#else 648#else
584 static void 649 static void
585 SDL_braino (void) 650 SDL_main_hack (SV *real_main)
586 { 651 {
587 deliantra_main (); 652 deliantra_main (real_main);
588 } 653 }
589#endif 654#endif
590 655
591MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
592 657
793 858
794 const_iv (FOW_DARKNESS) 859 const_iv (FOW_DARKNESS)
795# undef const_iv 860# undef const_iv
796 }; 861 };
797 862
798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 863 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 865
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 868}
804 869
843#endif 908#endif
844} 909}
845 910
846char *SDL_GetError () 911char *SDL_GetError ()
847 912
848void SDL_braino () 913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
849 915
850int SDL_Init (U32 flags) 916int SDL_Init (U32 flags)
851 917
852int SDL_InitSubSystem (U32 flags) 918int SDL_InitSubSystem (U32 flags)
853 919
854void SDL_QuitSubSystem (U32 flags) 920void SDL_QuitSubSystem (U32 flags)
855 921
856void SDL_Quit () 922void SDL_Quit ()
857 923
858int SDL_GL_SetAttribute (int attr, int value) 924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
859 926
860int SDL_GL_GetAttribute (int attr) 927int SDL_GL_GetAttribute (int attr)
861 CODE: 928 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL)) 929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
863 XSRETURN_UNDEF; 930 XSRETURN_UNDEF;
864 OUTPUT: 931 OUTPUT:
865 RETVAL 932 RETVAL
866 933
867void 934void
922 ); 989 );
923 990
924 if (RETVAL) 991 if (RETVAL)
925 { 992 {
926 av_clear (texture_av); 993 av_clear (texture_av);
927
928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
930#include "glfunc.h" 995#include "glfunc.h"
931#undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932 } 999 }
933} 1000}
934 OUTPUT: 1001 OUTPUT:
935 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
936 1006
937void 1007void
938SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
939 1009
940char * 1010char *
941SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
942 1013
943int 1014int
944SDL_GetAppState () 1015SDL_GetAppState ()
945 1016
946int 1017int
947SDL_GetModState () 1018SDL_GetModState ()
948 1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
949void 1024void
1025SDL_PumpEvents ()
1026
1027void
950poll_events () 1028peep_events ()
951 PPCODE: 1029 PPCODE:
952{ 1030{
953 SDL_Event ev; 1031 SDL_Event ev;
954 1032
955 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
1021 1099
1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1100 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1023 } 1101 }
1024} 1102}
1025 1103
1104char *
1105SDL_AudioDriverName ()
1106 CODE:
1107{
1108 char buf [256];
1109 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1110 XSRETURN_UNDEF;
1111
1112 RETVAL = buf;
1113}
1114 OUTPUT:
1115 RETVAL
1116
1026int 1117int
1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1028 POSTCALL: 1119 POSTCALL:
1029 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
1030 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
1031 1122
1032void 1123void
1033Mix_QuerySpec () 1124Mix_QuerySpec ()
1092add_font (char *file) 1183add_font (char *file)
1093 CODE: 1184 CODE:
1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT: 1186 OUTPUT:
1096 RETVAL 1187 RETVAL
1188
1189void
1190IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1191
1192# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1193void
1194Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1097 1195
1098void 1196void
1099load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
1100 ALIAS: 1198 ALIAS:
1101 load_image_file = 1 1199 load_image_file = 1
1147 1245
1148 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
1149 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
1150 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
1151 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
1152 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1153 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1154 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1155 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1156 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
1157 1255
1229MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1230 1328
1231PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1232 1330
1233DC::Font 1331DC::Font
1234new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1235 CODE: 1333 CODE:
1236{ 1334{
1237 int count; 1335 int count;
1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1239 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1268 PROTOTYPE: 1366 PROTOTYPE:
1269 CODE: 1367 CODE:
1270 tc_restore (); 1368 tc_restore ();
1271 1369
1272DC::Layout 1370DC::Layout
1273new (SV *class) 1371new (SV *klass)
1274 CODE: 1372 CODE:
1275 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1276 1374
1277 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1278 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1427 1525
1428void 1526void
1429set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1430 CODE: 1528 CODE:
1431 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1432 { 1530 {
1433 self->base_height = base_height; 1531 self->base_height = base_height;
1434 layout_update_font (self); 1532 layout_update_font (self);
1435 } 1533 }
1436 1534
1437void 1535void
1665 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1666 } 1764 }
1667} 1765}
1668 1766
1669void 1767void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 1768draw_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)
1671 PROTOTYPE: @ 1769 PROTOTYPE: @
1672 CODE: 1770 CODE:
1673{ 1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674 glEnable (GL_TEXTURE_2D); 1774 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1775 glBindTexture (GL_TEXTURE_2D, name1);
1678 1776
1679 glColor3f (intensity, intensity, intensity); 1777 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix (); 1778 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.); 1779 glScalef (1./3, 1./3, 1.);
1682 1780
1683 if (blend > 0.f) 1781 if (blend > 0.f)
1684 { 1782 {
1685 float S2, T2; /* 0. 0. for texture 2 */ 1783 float dx3 = dx * -3.f / w;
1686 float w = w1 > w2 ? w1 : w2; 1784 float dy3 = dy * -3.f / h;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend }; 1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1689 1786
1690 /* interpolate the two shadow textures */ 1787 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1697 glBindTexture (GL_TEXTURE_2D, name2); 1794 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1796
1700 /* rgb == rgb(glcolor) */ 1797 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1801
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1802 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1804
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714 1811
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717 1814
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS); 1815 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1734 glEnd (); 1820 glEnd ();
1735 1821
1736 glDisable (GL_TEXTURE_2D); 1822 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0); 1823 gl.ActiveTexture (GL_TEXTURE0);
1738 } 1824 }
1740 { 1826 {
1741 /* simple blending of one texture, also opengl <1.3 path */ 1827 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743 1829
1744 glBegin (GL_QUADS); 1830 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1832 glTexCoord2f (0, t); glVertex2f (0, h);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1833 glTexCoord2f (s, t); glVertex2f (w, h);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1749 glEnd (); 1835 glEnd ();
1750 } 1836 }
1837
1838 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1839 {
1840 int x, y;
1841 int dx3 = dx * 3;
1842 int dy3 = dy * 3;
1843
1844 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1845 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1846 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1847 glTranslatef (-1., -1., 0);
1848 glBegin (GL_QUADS);
1849
1850 for (y = 1; y < h; y += 3)
1851 {
1852 int y1 = y - dy3;
1853 int y1valid = y1 >= 0 && y1 < h;
1854
1855 for (x = 1; x < w; x += 3)
1856 {
1857 int x1 = x - dx3;
1858 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1859 uint8_t h2;
1860
1861 if (y1valid && x1 >= 0 && x1 < w)
1862 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1863 else
1864 h2 = 1; /* out of range == invisible */
1865
1866 if (h1 || h2)
1867 {
1868 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1869 glColor4f (1., 1., 1., alpha);
1870
1871 glTexCoord2f (0, 0.); glVertex2i (x , y );
1872 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1873 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1874 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1875 }
1876 }
1877 }
1878 }
1879
1880 glEnd ();
1751 1881
1752 glPopMatrix (); 1882 glPopMatrix ();
1753 1883
1754 glDisable (GL_TEXTURE_2D); 1884 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND); 1885 glDisable (GL_BLEND);
1769MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1770 1900
1771PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1772 1902
1773DC::Map 1903DC::Map
1774new (SV *class) 1904new (SV *klass)
1775 CODE: 1905 CODE:
1776 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1777 RETVAL->x = 0; 1907 RETVAL->x = 0;
1778 RETVAL->y = 0; 1908 RETVAL->y = 0;
1779 RETVAL->w = 0; 1909 RETVAL->w = 0;
1780 RETVAL->h = 0; 1910 RETVAL->h = 0;
1781 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1818 1948
1819void 1949void
1820set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1821 CODE: 1951 CODE:
1822{ 1952{
1823 tileid texid; 1953 tileid texid;
1824 maptex *tex; 1954 maptex *tex;
1825 1955
1826 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1827 return; 1957 return;
1828 1958
1829 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1830 return; 1960 return;
1831 1961
1832 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1833 1963
1834 if (!texid) 1964 if (!texid)
1835 return; 1965 return;
1836 1966
1837 tex = self->tex + texid; 1967 tex = self->tex + texid;
1870} 2000}
1871 2001
1872void 2002void
1873expire_textures (DC::Map self, int texid, int count) 2003expire_textures (DC::Map self, int texid, int count)
1874 PPCODE: 2004 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count) 2005 for (; texid < self->texs && count; ++texid, --count)
1876 { 2006 {
1877 maptex *tex = self->tex + texid; 2007 maptex *tex = self->tex + texid;
1878 2008
1879 if (tex->name) 2009 if (tex->name)
1880 { 2010 {
1935 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1936 } 2066 }
1937} 2067}
1938 2068
1939SV * 2069SV *
1940map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1941 CODE: 2071 CODE:
1942{ 2072{
1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1944 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1945 mapcell *cell; 2075 mapcell *cell;
1966 2096
1967 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1968 2098
1969 if (flags & 8) 2099 if (flags & 8)
1970 { 2100 {
2101 uint8_t ext, cmd;
2102
1971 if (extmap) 2103 do
1972 { 2104 {
1973 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1974 2107
1975 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
1976 { 2111 {
1977 ext = *data++;
1978 cmd = ext & 0x7f;
1979
1980 if (cmd < 4)
1981 cell->darkness = 255 - ext * 64 + 1;
1982 else if (cmd == 5) // health
1983 {
1984 cell->stat_width = 1; 2112 cell->stat_width = 1;
1985 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1986 }
1987 else if (cmd == 6) // monster width
1988 cell->stat_width = *data++ + 1;
1989 else if (cmd == 0x47)
1990 {
1991 if (*data == 1) cell->player = data [1];
1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1995
1996 data += *data + 1;
1997 }
1998 else if (cmd == 8) // cell flags
1999 cell->flags = *data++;
2000 else if (ext & 0x40) // unknown, multibyte => skip
2001 data += *data + 1;
2002 else
2003 data++;
2004 } 2114 }
2005 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
2006 } 2132 }
2007 else 2133 while (ext & 0x80);
2008 cell->darkness = *data++ + 1;
2009 } 2134 }
2010 2135
2011 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
2012 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
2013 { 2138 {
2061 ? self->row + y 2186 ? self->row + y
2062 : 0; 2187 : 0;
2063 2188
2064 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
2065 { 2190 {
2066 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
2067 2192
2068 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
2069 { 2194 {
2070 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
2071 2196
2073 { 2198 {
2074 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
2075 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
2076 int a1 = tex.a; 2201 int a1 = tex.a;
2077 2202
2078 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
2079 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
2080 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
2081 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
2082 } 2207 }
2083 } 2208 }
2084 2209
2085 *map++ = (r ) 2210 *map++ = (r )
2086 | (g << 8) 2211 | (g << 8)
2087 | (b << 16) 2212 | (b << 16)
2088 | (a << 24); 2213 | (a << 24);
2089 } 2214 }
2090 } 2215 }
2091 2216
2092 RETVAL = map_sv; 2217 RETVAL = map_sv;
2093} 2218}
2094 OUTPUT: 2219 OUTPUT:
2095 RETVAL 2220 RETVAL
2096 2221
2097void 2222void
2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2099 CODE: 2224 CODE:
2100{ 2225{
2101 int x, y, z; 2226 int x, y, z;
2102 2227
2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2106 smooth_key skey; 2230 smooth_key skey;
2107 int pl_x, pl_y; 2231 int pl_x, pl_y;
2108 maptex pl_tex; 2232 maptex pl_tex;
2109 rc_t *rc = rc_alloc (); 2233 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc (); 2234 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key; 2235 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden; 2236 rc_array_t *arr;
2113 2237
2114 pl_tex.name = 0; 2238 pl_tex.name = 0;
2115 2239
2116 // that's current max. sorry. 2240 // that's current max. sorry.
2117 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
2155 2279
2156 glEnable (GL_BLEND); 2280 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159 2283
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
2163 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
2164 { 2285 {
2286 smooth_hash smooth;
2165 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1; 2288 key.texname = -1;
2167 2289
2168 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
2169 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
2190 2312
2191 key.texname = tex.name; 2313 key.texname = tex.name;
2192 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
2193 } 2315 }
2194 2316
2195 px = (x + 1) * T - tex.w; 2317 px = (x + 1) * Th - tex.w;
2196 py = (y + 1) * T - tex.h; 2318 py = (y + 1) * Tw - tex.h;
2197 2319
2198 if (expect_false (cell->player == player) && expect_false (z == 2)) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 { 2321 {
2200 pl_x = px; 2322 pl_x = px;
2201 pl_y = py; 2323 pl_y = py;
2230 2352
2231 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2232 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
2233 2355
2234 // full tile 2356 // full tile
2235 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2236 2358
2237 // borders 2359 // borders
2238 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2239 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2240 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2241 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2242 2364
2243 // corners 2365 // corners
2244 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2248 } 2370 }
2249 } 2371 }
2250 2372
2251 if (expect_false (z == 2)) 2373 if (expect_false (z == 2) && expect_false (cell->flags))
2252 { 2374 {
2253 /* draw question marks on top of hidden spaces */ 2375 // overlays such as the speech bubble, probably more to come
2254 if (!cell->darkness) 2376 if (cell->flags & 1)
2255 { 2377 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key; 2378 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH]; 2379 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr; 2380 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32; 2381 int px = x * Tw + Tw * 2 / 32;
2275 int py = y * T - T * 6 / 32; 2382 int py = y * Th - Th * 6 / 32;
2276 2383
2277 key_ov.texname = tex.name; 2384 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov); 2385 arr = rc_array (rc_ov, &key_ov);
2279 2386
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2284 }
2285 } 2391 }
2286 } 2392 }
2287 } 2393 }
2288 } 2394 }
2289 2395
2305 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2306 { 2412 {
2307 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2308 HE *he; 2414 HE *he;
2309 2415
2310 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2311 while ((he = hv_iternext (smooth)))
2312 { 2417 {
2313 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2314 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2315 2420
2316 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2317 && skey->level == level 2422 && skey.level == level
2318 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2319 { 2424 {
2320 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2321 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
2322 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
2323 int border = bits & 15; 2428 int border = bits & 15;
2324 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2326 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2327 2432
2329 { 2434 {
2330 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2331 // save gobs of state changes. 2436 // save gobs of state changes.
2332 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2333 { 2438 {
2334 self->tex [skey->tile].unused = 0; 2439 self->tex [skey.tile].unused = 0;
2335 2440
2336 glEnd (); 2441 glEnd ();
2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2338 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2339 } 2444 }
2340 2445
2341 if (border) 2446 if (border)
2342 { 2447 {
2343 float ox = border * dx; 2448 float ox = border * dx;
2344 2449
2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349 } 2454 }
2350 2455
2351 if (corner) 2456 if (corner)
2352 { 2457 {
2353 float ox = corner * dx; 2458 float ox = corner * dx;
2354 2459
2355 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359 } 2464 }
2360 } 2465 }
2361 } 2466 }
2362 } 2467 }
2363 } 2468 }
2365 2470
2366 glEnd (); 2471 glEnd ();
2367 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1; 2473 key.texname = -1;
2369 } 2474 }
2370
2371 hv_clear (smooth);
2372 } 2475 }
2373 2476
2374 if (pl_tex.name) 2477 if (pl_tex.name)
2375 { 2478 {
2376 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2404 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2405 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2406 { 2509 {
2407 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2408 2511
2409 int px = x * T; 2512 int px = x * Tw;
2410 int py = y * T; 2513 int py = y * Th;
2411 2514
2412 if (expect_false (cell->player == player)) 2515 if (expect_false (cell->player == player))
2413 { 2516 {
2414 px += sdx; 2517 px += sdx;
2415 py += sdy; 2518 py += sdy;
2416 } 2519 }
2417 2520
2418 if (cell->stat_hp) 2521 if (cell->stat_hp)
2419 { 2522 {
2420 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422 2525
2423 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2424 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2425 px + width - 1, py); 2528 px + width - 1, py);
2426 2529
2463 int x, y; 2566 int x, y;
2464 2567
2465 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2569 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures 2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using 2571 * and takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different 2572 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia. 2573 * alpha, but atcually gives us the correct colour with nvidia.
2471 */ 2574 */
2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
2502void 2605void
2503fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2606fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2504 PPCODE: 2607 PPCODE:
2505{ 2608{
2506 int x, y; 2609 int x, y;
2507 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2508 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2509 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2510 int sw34 = (sw * 3 + 3) & ~3; 2613 int sw3 = sw * 3;
2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2617 memset (darkness1, 0, sw1*sh1);
2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2514 2618
2515 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2516 SvCUR_set (darkness3_sv, sw34 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2517 2621
2518 mx += self->x - 1; 2622 mx += self->x - 1;
2519 my += self->y - 1; 2623 my += self->y - 1;
2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522 2624
2523 for (y = 0; y < sh1; y++) 2625 for (y = 0; y < sh1; y++)
2524 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
2525 { 2627 {
2526 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
2559 2661
2560 uint8_t r13 = (d13 + d23 + d12) / 3; 2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2561 uint8_t r23 = d23; 2663 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3; 2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2563 2665
2564 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2670 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2569 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573 } 2675 }
2574 2676
2575 free (darkness1); 2677 free (darkness1);
2576 2678
2577 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
2578 PUSHs (sv_2mortal (newSViv (sw34))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
2579 PUSHs (sv_2mortal (newSViv (sh3))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
2580 PUSHs (darkness3_sv); 2682 PUSHs (darkness3_sv);
2581} 2683}
2582 2684
2583SV * 2685SV *
2646 else 2748 else
2647 *data++ = 0; 2749 *data++ = 0;
2648 } 2750 }
2649 } 2751 }
2650 2752
2651 /* if size is w*h + 5 then no data has been found */ 2753 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 { 2755 {
2654 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 } 2758 }
2657 2759
2658 RETVAL = data_sv; 2760 RETVAL = data_sv;
2659} 2761}
2660 OUTPUT: 2762 OUTPUT:
2661 RETVAL 2763 RETVAL
2662 2764
2663void 2765void
2670 STRLEN len; 2772 STRLEN len;
2671 uint8_t *data, *end; 2773 uint8_t *data, *end;
2672 2774
2673 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2676 end = data + len + 8; 2778 end = data + len + 8;
2677 2779
2678 if (len < 5) 2780 if (len < 5)
2679 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2680 2782
2741} 2843}
2742 2844
2743MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2744 2846
2745DC::RW 2847DC::RW
2746new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2747 CODE: 2849 CODE:
2748{ 2850{
2749 STRLEN datalen; 2851 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2751 2853
2753} 2855}
2754 OUTPUT: 2856 OUTPUT:
2755 RETVAL 2857 RETVAL
2756 2858
2757DC::RW 2859DC::RW
2758new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2759 CODE: 2861 CODE:
2760 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2761 OUTPUT: 2863 OUTPUT:
2762 RETVAL 2864 RETVAL
2763 2865
2781 if (RETVAL < 0) 2883 if (RETVAL < 0)
2782 { 2884 {
2783 RETVAL = Mix_GroupOldest (-1); 2885 RETVAL = Mix_GroupOldest (-1);
2784 2886
2785 if (RETVAL < 0) 2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2786 XSRETURN_UNDEF; 2893 XSRETURN_UNDEF;
2787 2894 }
2895 else
2788 Mix_HaltChannel (RETVAL); 2896 Mix_HaltChannel (RETVAL);
2789 } 2897 }
2790 2898
2791 Mix_UnregisterAllEffects (RETVAL); 2899 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128); 2900 Mix_Volume (RETVAL, 128);
2793} 2901}
2853 2961
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855 2963
2856PROTOTYPES: DISABLE 2964PROTOTYPES: DISABLE
2857 2965
2966void
2967decoders ()
2968 PPCODE:
2969#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2970 int i, num = Mix_GetNumChunkDecoders ();
2971 EXTEND (SP, num);
2972 for (i = 0; i < num; ++i)
2973 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2974#else
2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2976#endif
2977
2858DC::MixChunk 2978DC::MixChunk
2859new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2860 CODE: 2980 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862 OUTPUT: 2982 OUTPUT:
2863 RETVAL 2983 RETVAL
2864 2984
2894 OUTPUT: 3014 OUTPUT:
2895 RETVAL 3015 RETVAL
2896 3016
2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898 3018
3019void
3020decoders ()
3021 PPCODE:
3022#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3023 int i, num = Mix_GetNumMusicDecoders ();
3024 EXTEND (SP, num);
3025 for (i = 0; i < num; ++i)
3026 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3027#else
3028 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3029#endif
3030
2899int 3031int
2900volume (int volume = -1) 3032volume (int volume = -1)
2901 PROTOTYPE: ;$ 3033 PROTOTYPE: ;$
2902 CODE: 3034 CODE:
2903 if (items > 0) 3035 if (items > 0)
2914void 3046void
2915halt () 3047halt ()
2916 CODE: 3048 CODE:
2917 Mix_HaltMusic (); 3049 Mix_HaltMusic ();
2918 3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
3055 OUTPUT:
3056 RETVAL
3057
2919DC::MixMusic 3058DC::MixMusic
2920new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2921 CODE: 3060 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2923 OUTPUT: 3062 OUTPUT:
2924 RETVAL 3063 RETVAL
2925 3064
3062 const_iv (GL_FUNC_SUBTRACT), 3201 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064# undef const_iv 3203# undef const_iv
3065 }; 3204 };
3066 3205
3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3206 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069 3208
3070 texture_av = newAV (); 3209 texture_av = newAV ();
3071 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
3072} 3211}
3073 3212
3078 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
3079 3218
3080void 3219void
3081apple_nvidia_bug (int enable) 3220apple_nvidia_bug (int enable)
3082 3221
3083char * 3222const char *
3084gl_vendor () 3223gl_vendor ()
3085 CODE: 3224 CODE:
3086 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
3087 OUTPUT: 3226 OUTPUT:
3088 RETVAL 3227 RETVAL
3089 3228
3090char * 3229const char *
3091gl_version () 3230gl_version ()
3092 CODE: 3231 CODE:
3093 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
3094 OUTPUT: 3233 OUTPUT:
3095 RETVAL 3234 RETVAL
3096 3235
3097char * 3236const char *
3098gl_extensions () 3237gl_extensions ()
3099 CODE: 3238 CODE:
3100 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3101 OUTPUT: 3240 OUTPUT:
3102 RETVAL 3241 RETVAL
3103 3242
3104const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
3105 3248
3106GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
3107 CODE: 3250 CODE:
3108 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
3109 OUTPUT: 3252 OUTPUT:
3116 RETVAL 3259 RETVAL
3117 3260
3118int glGetError () 3261int glGetError ()
3119 3262
3120void glFinish () 3263void glFinish ()
3264
3265void glFlush ()
3121 3266
3122void glClear (int mask) 3267void glClear (int mask)
3123 3268
3124void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
3125 PROTOTYPE: @ 3270 PROTOTYPE: @
3297 3442
3298void glEndList () 3443void glEndList ()
3299 3444
3300void glCallList (int list) 3445void glCallList (int list)
3301 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303 3453
3304PROTOTYPES: DISABLE 3454PROTOTYPES: DISABLE
3305 3455
3306void 3456void
3307find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
3308 PPCODE: 3458 PPCODE:
3309{ 3459{
3310 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
3311 XPUSHs (self); 3461 XPUSHs (self);
3312} 3462}
3313 3463
3314BOOT: 3464BOOT:
3315{ 3465{
3323 3473
3324void 3474void
3325draw (SV *self) 3475draw (SV *self)
3326 CODE: 3476 CODE:
3327{ 3477{
3328 HV *hv; 3478 HV *hv;
3329 SV **svp; 3479 SV **svp;
3330 NV x, y, w, h; 3480 NV x, y, w, h;
3331 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3332 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3333 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3334 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines