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.176 by root, Tue Apr 10 09:39:48 2007 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 2018 UTC

… …
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
20#include "flat_hash_map.hpp"
21
15#ifdef _WIN32 22#ifdef _WIN32
16# undef pipe 23# undef pipe
24// microsoft vs. C
25# define sqrtf(x) sqrt(x)
26# define atan2f(x,y) atan2(x,y)
27# define M_PI 3.14159265f
17#endif 28#endif
18 29
19#include <assert.h> 30#include <cassert>
20#include <math.h> 31#include <cmath>
21#include <string.h> 32#include <cstring>
22#include <stdio.h> 33#include <cstdio>
23#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37
38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
24 39
25#include <SDL.h> 40#include <SDL.h>
41#include <SDL_thread.h>
26#include <SDL_endian.h> 42#include <SDL_endian.h>
27#include <SDL_image.h> 43#include <SDL_image.h>
28#include <SDL_mixer.h> 44#include <SDL_mixer.h>
29#include <SDL_opengl.h> 45#include <SDL_opengl.h>
30 46
47/* work around os x broken headers */
48#ifdef __MACOSX__
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);
52#endif
53
31#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
33 56
34#include <glib/gmacros.h> 57#include <glib.h>
35 58
36#include <pango/pango.h> 59#include <pango/pango.h>
60
61#ifndef PANGO_VERSION_CHECK
62# define PANGO_VERSION_CHECK(a,b,c) 0
63#endif
64
65#if !PANGO_VERSION_CHECK (1, 15, 2)
66# define pango_layout_get_line_readonly pango_layout_get_line
67# define pango_layout_get_lines_readonly pango_layout_get_lines
68# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
69# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
70#endif
37 71
38#ifndef _WIN32 72#ifndef _WIN32
39# include <sys/types.h> 73# include <sys/types.h>
40# include <sys/socket.h> 74# include <sys/socket.h>
41# include <netinet/in.h> 75# include <netinet/in.h>
42# include <netinet/tcp.h> 76# include <netinet/tcp.h>
43# include <inttypes.h> 77# include <inttypes.h>
44#endif 78#endif
45 79
80#if __GNUC__ >= 4
81# define expect(expr,value) __builtin_expect ((expr),(value))
82#else
83# define expect(expr,value) (expr)
84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
88
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47 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 */
48#define FOW_DARKNESS 32 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
49 95
50#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
52 98
53#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
54 100
55#if 0 101/* mask out modifiers we are not interested in */
56# define PARACHUTE SDL_INIT_NOPARACHUTE 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
57#else 103
58# define PARACHUTE 0 104#define KMOD_LRAM 0x10000 // our extension
59#endif 105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
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}
127
128static AV *texture_av;
60 129
61static struct 130static struct
62{ 131{
63#define GL_FUNC(ptr,name) ptr name; 132#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 133#include "glfunc.h"
65#undef GL_FUNC 134#undef GL_FUNC
66} gl; 135} gl;
67 136
137static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 138gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 139{
70 if (gl.BlendFuncSeparate) 140 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 141 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 142 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 143 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 144 else
75 glBlendFunc (sa, da); 145 glBlendFunc (sa, da);
76} 146}
77 147
148static GLuint
149gen_texture ()
150{
151 GLuint name;
152
153 if (AvFILL (texture_av) >= 0)
154 name = (GLuint)(size_t)av_pop (texture_av);
155 else
156 glGenTextures (1, &name);
157
158 return name;
159}
160
161static void
162del_texture (GLuint name)
163{
164 /* make a half-assed attempt at returning the memory used by the texture */
165 /* textures are frequently being reused by cfplus anyway */
166 /*glBindTexture (GL_TEXTURE_2D, name);*/
167 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
168 av_push (texture_av, (SV *)(size_t)name);
169 glDeleteTextures (1, &name);
170}
171
78#include "texcache.c" 172#include "texcache.c"
173#include "rendercache.c"
79 174
80#include "pango-font.c" 175#include "pango-font.c"
81#include "pango-fontmap.c" 176#include "pango-fontmap.c"
82#include "pango-render.c" 177#include "pango-render.c"
83 178
179typedef IV DC__Channel;
180typedef SDL_RWops *DC__RW;
84typedef Mix_Chunk *CFPlus__MixChunk; 181typedef Mix_Chunk *DC__MixChunk;
85typedef Mix_Music *CFPlus__MixMusic; 182typedef Mix_Music *DC__MixMusic;
86 183
87typedef PangoFontDescription *CFPlus__Font; 184typedef PangoFontDescription *DC__Font;
88 185
89static int 186static int
90shape_attr_p (PangoLayoutRun *run) 187shape_attr_p (PangoLayoutRun *run)
91{ 188{
92 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
93 190
94 while (attrs) 191 while (attrs)
95 { 192 {
96 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
97 194
98 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
99 return 1; 196 return 1;
100 197
101 attrs = attrs->next; 198 attrs = attrs->next;
102 } 199 }
103 200
104 return 0; 201 return 0;
105} 202}
106 203
107typedef struct cf_layout { 204struct cf_layout {
108 PangoLayout *pl; 205 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
110 int base_height; 207 int base_height;
111 CFPlus__Font font; 208 DC__Font font;
112} *CFPlus__Layout; 209 rc_t *rc;
210};
113 211
212typedef cf_layout *DC__Layout;
213
114static CFPlus__Font default_font; 214static DC__Font default_font;
115static PangoContext *opengl_context; 215static PangoContext *opengl_context;
116static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
117 217
118static void 218static void
119substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
120{ 220{
121 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
122#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
124#endif 224#endif
125 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
126} 226}
127 227
128static void 228static void
129layout_update_font (CFPlus__Layout self) 229layout_update_font (DC__Layout self)
130{ 230{
131 /* use a random scale factor to account for unknown descenders, 0.8 works 231 /* use a random scale factor to account for unknown descenders, 0.8 works
132 * reasonably well with bitstream vera 232 * reasonably well with dejavu/bistream fonts
133 */ 233 */
134 PangoFontDescription *font = self->font ? self->font : default_font; 234 PangoFontDescription *font = self->font ? self->font : default_font;
135 235
136 pango_font_description_set_absolute_size (font, 236 pango_font_description_set_absolute_size (font,
137 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 237 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
138 238
139 pango_layout_set_font_description (self->pl, font); 239 pango_layout_set_font_description (self->pl, font);
140} 240}
141 241
142static void 242static void
143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 243layout_get_pixel_size (DC__Layout self, int *w, int *h)
144{ 244{
145 PangoRectangle rect; 245 PangoRectangle rect;
146 246
147 // get_pixel_* wrongly rounds down 247 // get_pixel_* wrongly rounds down
148 pango_layout_get_extents (self->pl, 0, &rect); 248 pango_layout_get_extents (self->pl, 0, &rect);
… …
158} 258}
159 259
160typedef uint16_t tileid; 260typedef uint16_t tileid;
161typedef uint16_t faceid; 261typedef uint16_t faceid;
162 262
163typedef struct { 263struct maptex
264{
164 int name; 265 GLuint name;
165 int w, h; 266 int w, h;
166 float s, t; 267 float s, t;
167 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
168 tileid smoothtile; 269 tileid smoothtile;
169 uint8_t smoothlevel; 270 uint8_t smoothlevel;
170} maptex; 271 uint8_t unused; /* set to zero on use */
272};
171 273
172typedef struct { 274struct mapcell
275{
173 uint32_t player; 276 uint32_t player;
174 tileid tile[3]; 277 tileid tile[3];
175 uint16_t darkness; 278 uint16_t darkness;
176 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
177} mapcell; 280};
178 281
179typedef struct { 282struct maprow
283{
180 int32_t c0, c1; 284 int32_t c0, c1;
181 mapcell *col; 285 mapcell *col;
182} maprow; 286};
183 287
184typedef struct map { 288struct mapgrid {
185 int x, y, w, h; 289 int x, y, w, h;
186 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
187 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
188 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
189 293
190 int32_t rows; 294 int32_t rows;
191 maprow *row; 295 maprow *row;
192} *CFPlus__Map; 296};
297
298typedef mapgrid *DC__Map;
193 299
194static char * 300static char *
195prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
196{ 302{
197 char *p; 303 char *p;
… …
215 321
216#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))
217#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))
218 324
219static void 325static void
220need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
221{ 327{
222 while (self->faces <= face) 328 while (self->faces <= face)
223 { 329 {
224 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
225 self->faces *= 2; 331 self->faces *= 2;
226 } 332 }
227} 333}
228 334
229static void 335static void
230need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
231{ 337{
232 while (self->texs <= texid) 338 while (self->texs <= texid)
233 { 339 {
234 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
235 self->texs *= 2; 341 self->texs *= 2;
236 } 342 }
237} 343}
238 344
239static maprow * 345static maprow *
240map_get_row (CFPlus__Map self, int y) 346map_get_row (mapgrid *self, int y)
241{ 347{
242 if (0 > y) 348 if (0 > y)
243 { 349 {
244 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
245 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
… …
283 389
284 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
285} 391}
286 392
287static mapcell * 393static mapcell *
288map_get_cell (CFPlus__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
289{ 395{
290 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
291} 397}
292 398
293static void 399static void
294map_clear (CFPlus__Map self) 400map_clear (mapgrid *self)
295{ 401{
296 int r; 402 int r;
297 403
298 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
299 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
… …
306 self->oy = 0; 412 self->oy = 0;
307 self->row = 0; 413 self->row = 0;
308 self->rows = 0; 414 self->rows = 0;
309} 415}
310 416
417#define CELL_CLEAR(cell) \
418 do { \
419 if ((cell)->player) \
420 (cell)->tile [2] = 0; \
421 (cell)->darkness = 0; \
422 (cell)->stat_hp = 0; \
423 (cell)->flags = 0; \
424 (cell)->player = 0; \
425 } while (0)
426
311static void 427static void
312map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
313{ 429{
314 int x, y; 430 int x, y;
315 maprow *row; 431 maprow *row;
316 mapcell *cell; 432 mapcell *cell;
317 433
… …
329 if (x >= row->c1) 445 if (x >= row->c1)
330 break; 446 break;
331 447
332 cell = row->col + x - row->c0; 448 cell = row->col + x - row->c0;
333 449
334 cell->darkness = 0; 450 CELL_CLEAR (cell);
335 cell->stat_hp = 0;
336 cell->flags = 0;
337 cell->player = 0;
338 } 451 }
339 } 452 }
340} 453}
341 454
342typedef struct { 455struct smooth_key
456{
343 tileid tile; 457 tileid tile;
344 uint8_t x, y, level; 458 uint8_t x, y, level;
345} 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}
346 478
347static void 479static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
349{ 481{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 482 auto &&it = h.find (key);
351 483
352 if (SvIOK (*sv)) 484 if (it == h.end ())
353 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
354 else 486 else
355 sv_setiv (*sv, bits); 487 it->second |= bits;
356} 488}
357 489
358static void 490static void
359music_finished (void) 491music_finished (void)
360{ 492{
… …
377 ev.code = 1; 509 ev.code = 1;
378 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
379 ev.data2 = 0; 511 ev.data2 = 0;
380 512
381 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;
382} 521}
383 522
384static unsigned int 523static unsigned int
385minpot (unsigned int n) 524minpot (unsigned int n)
386{ 525{
… …
396 n |= n >> 16; 535 n |= n >> 16;
397 536
398 return n + 1; 537 return n + 1;
399} 538}
400 539
540static unsigned int
541popcount (unsigned int n)
542{
543 n -= (n >> 1) & 0x55555555U;
544 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
545 n = ((n >> 4) + n) & 0x0f0f0f0fU;
546 n *= 0x01010101U;
547
548 return n >> 24;
549}
550
401/* SDL should provide this, really. */ 551/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 552#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 553#define SDLK_MODIFIER_MAX 314
404 554
405MODULE = CFPlus PACKAGE = CFPlus 555/******************************************************************************/
556
557static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
558static GV *hover_gv;
559
560static int
561within_widget (SV *widget, NV x, NV y)
562{
563 HV *self;
564 SV **svp;
565 NV wx, ww, wy, wh;
566
567 if (!SvROK (widget))
568 return 0;
569
570 self = (HV *)SvRV (widget);
571
572 if (SvTYPE (self) != SVt_PVHV)
573 return 0;
574
575 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
576 if (y < wy)
577 return 0;
578
579 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
580 if (y >= wy + wh)
581 return 0;
582
583 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
584 if (x < wx)
585 return 0;
586
587 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
588 if (x >= wx + ww)
589 return 0;
590
591 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
592 if (!svp || !SvTRUE (*svp))
593 return 0;
594
595 return 1;
596}
597
598/******************************************************************************/
599
600/* process keyboard modifiers */
601static int
602mod_munge (int mod)
603{
604 mod &= MOD_MASK;
605
606 if (mod & (KMOD_META | KMOD_ALT))
607 mod |= KMOD_LRAM;
608
609 return mod;
610}
611
612static void
613deliantra_main (SV *real_main)
614{
615 dSP;
616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
619}
620
621#ifdef __MACOSX__
622 static SV *real_main;
623
624 /* to due surprising braindamage on the side of SDL design, we
625 * do some mind-boggling hack here: SDL requires a custom main()
626 * on OS X, so... we provide one and call the original main(), which,
627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
628 * and which calls our main (== SDL_main) back.
629 */
630 extern C_LINKAGE int
631 main (int argc, char *argv[])
632 {
633 deliantra_main (real_main);
634 }
635
636 #undef main
637
638 extern C_LINKAGE int main (int argc, char *argv[]);
639
640 static void
641 SDL_main_hack (SV *real_main_)
642 {
643 real_main = real_main_;
644
645 char *argv[] = { "deliantra client", 0 };
646 (main) (1, argv);
647 }
648#else
649 static void
650 SDL_main_hack (SV *real_main)
651 {
652 deliantra_main (real_main);
653 }
654#endif
655
656MODULE = Deliantra::Client PACKAGE = DC
406 657
407PROTOTYPES: ENABLE 658PROTOTYPES: ENABLE
408 659
409BOOT: 660BOOT:
410{ 661{
411 HV *stash = gv_stashpv ("CFPlus", 1); 662 HV *stash = gv_stashpv ("DC", 1);
412 static const struct { 663 static const struct {
413 const char *name; 664 const char *name;
414 IV iv; 665 IV iv;
415 } *civ, const_iv[] = { 666 } *civ, const_iv[] = {
416# define const_iv(name) { # name, (IV)name } 667# define const_iv(name) { # name, (IV)name }
… …
438 689
439 const_iv (SDL_APPINPUTFOCUS), 690 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS), 691 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE), 692 const_iv (SDL_APPACTIVE),
442 693
694
695 const_iv (SDLK_UNKNOWN),
696 const_iv (SDLK_FIRST),
697 const_iv (SDLK_BACKSPACE),
698 const_iv (SDLK_TAB),
699 const_iv (SDLK_CLEAR),
700 const_iv (SDLK_RETURN),
701 const_iv (SDLK_PAUSE),
702 const_iv (SDLK_ESCAPE),
703 const_iv (SDLK_SPACE),
704 const_iv (SDLK_EXCLAIM),
705 const_iv (SDLK_QUOTEDBL),
706 const_iv (SDLK_HASH),
707 const_iv (SDLK_DOLLAR),
708 const_iv (SDLK_AMPERSAND),
709 const_iv (SDLK_QUOTE),
710 const_iv (SDLK_LEFTPAREN),
711 const_iv (SDLK_RIGHTPAREN),
712 const_iv (SDLK_ASTERISK),
713 const_iv (SDLK_PLUS),
714 const_iv (SDLK_COMMA),
715 const_iv (SDLK_MINUS),
716 const_iv (SDLK_PERIOD),
717 const_iv (SDLK_SLASH),
718 const_iv (SDLK_0),
719 const_iv (SDLK_1),
720 const_iv (SDLK_2),
721 const_iv (SDLK_3),
722 const_iv (SDLK_4),
723 const_iv (SDLK_5),
724 const_iv (SDLK_6),
725 const_iv (SDLK_7),
726 const_iv (SDLK_8),
727 const_iv (SDLK_9),
728 const_iv (SDLK_COLON),
729 const_iv (SDLK_SEMICOLON),
730 const_iv (SDLK_LESS),
731 const_iv (SDLK_EQUALS),
732 const_iv (SDLK_GREATER),
733 const_iv (SDLK_QUESTION),
734 const_iv (SDLK_AT),
735
736 const_iv (SDLK_LEFTBRACKET),
737 const_iv (SDLK_BACKSLASH),
738 const_iv (SDLK_RIGHTBRACKET),
739 const_iv (SDLK_CARET),
740 const_iv (SDLK_UNDERSCORE),
741 const_iv (SDLK_BACKQUOTE),
742 const_iv (SDLK_DELETE),
743
744 const_iv (SDLK_FIRST),
745 const_iv (SDLK_LAST),
443 const_iv (SDLK_KP0), 746 const_iv (SDLK_KP0),
444 const_iv (SDLK_KP1), 747 const_iv (SDLK_KP1),
445 const_iv (SDLK_KP2), 748 const_iv (SDLK_KP2),
446 const_iv (SDLK_KP3), 749 const_iv (SDLK_KP3),
447 const_iv (SDLK_KP4), 750 const_iv (SDLK_KP4),
… …
519 const_iv (KMOD_LMETA), 822 const_iv (KMOD_LMETA),
520 const_iv (KMOD_RMETA), 823 const_iv (KMOD_RMETA),
521 const_iv (KMOD_NUM), 824 const_iv (KMOD_NUM),
522 const_iv (KMOD_CAPS), 825 const_iv (KMOD_CAPS),
523 const_iv (KMOD_MODE), 826 const_iv (KMOD_MODE),
827
828 const_iv (KMOD_LRAM),
829
830 const_iv (MIX_DEFAULT_FORMAT),
831
832 const_iv (SDL_INIT_TIMER),
833 const_iv (SDL_INIT_AUDIO),
834 const_iv (SDL_INIT_VIDEO),
835 const_iv (SDL_INIT_CDROM),
836 const_iv (SDL_INIT_JOYSTICK),
837 const_iv (SDL_INIT_EVERYTHING),
838 const_iv (SDL_INIT_NOPARACHUTE),
839 const_iv (SDL_INIT_EVENTTHREAD),
840
841 const_iv (SDL_GL_RED_SIZE),
842 const_iv (SDL_GL_GREEN_SIZE),
843 const_iv (SDL_GL_BLUE_SIZE),
844 const_iv (SDL_GL_ALPHA_SIZE),
845 const_iv (SDL_GL_DOUBLEBUFFER),
846 const_iv (SDL_GL_BUFFER_SIZE),
847 const_iv (SDL_GL_DEPTH_SIZE),
848 const_iv (SDL_GL_STENCIL_SIZE),
849 const_iv (SDL_GL_ACCUM_RED_SIZE),
850 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
851 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
852 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
853 const_iv (SDL_GL_STEREO),
854 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
855 const_iv (SDL_GL_MULTISAMPLESAMPLES),
856 const_iv (SDL_GL_ACCELERATED_VISUAL),
857 const_iv (SDL_GL_SWAP_CONTROL),
858
859 const_iv (FOW_DARKNESS)
524# undef const_iv 860# undef const_iv
525 }; 861 };
526 862
527 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--)
528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
529 865
530 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
531 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
532} 868}
533 869
… …
545 RETVAL 881 RETVAL
546 882
547NV floor (NV x) 883NV floor (NV x)
548 884
549NV ceil (NV x) 885NV ceil (NV x)
886
887IV minpot (UV n)
888
889IV popcount (UV n)
890
891NV distance (NV dx, NV dy)
892 CODE:
893 RETVAL = pow (dx * dx + dy * dy, 0.5);
894 OUTPUT:
895 RETVAL
550 896
551void 897void
552pango_init () 898pango_init ()
553 CODE: 899 CODE:
554{ 900{
555 opengl_fontmap = pango_opengl_font_map_new (); 901 opengl_fontmap = pango_opengl_font_map_new ();
556 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 902 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
557 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 903 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
904 /*pango_context_set_font_description (opengl_context, default_font);*/
905#if PANGO_VERSION_CHECK (1, 15, 2)
906 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
907 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
908#endif
558} 909}
559 910
560int 911char *SDL_GetError ()
561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
562 912
563void 913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
915
916int SDL_Init (U32 flags)
917
918int SDL_InitSubSystem (U32 flags)
919
920void SDL_QuitSubSystem (U32 flags)
921
564SDL_Quit () 922void SDL_Quit ()
565 923
924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
926
927int SDL_GL_GetAttribute (int attr)
928 CODE:
929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
930 XSRETURN_UNDEF;
931 OUTPUT:
932 RETVAL
933
566void 934void
567SDL_ListModes () 935SDL_ListModes (int rgb, int alpha)
568 PPCODE: 936 PPCODE:
569{ 937{
570 SDL_Rect **m; 938 SDL_Rect **m;
571 939
572 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 940 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 941 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 942 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 943 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576 944
577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 945 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 946 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579 947
580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 948 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 952
585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 953 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586#if SDL_VERSION_ATLEAST(1,2,10)
587 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
588 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 954 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589#endif
590
591 SDL_EnableUNICODE (1);
592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
593 955
594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 956 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
595 957
596 if (m && m != (SDL_Rect **)-1) 958 if (m && m != (SDL_Rect **)-1)
597 while (*m) 959 while (*m)
598 { 960 {
961 if ((*m)->w >= 400 && (*m)->h >= 300)
962 {
599 AV *av = newAV (); 963 AV *av = newAV ();
600 av_push (av, newSViv ((*m)->w)); 964 av_push (av, newSViv ((*m)->w));
601 av_push (av, newSViv ((*m)->h)); 965 av_push (av, newSViv ((*m)->h));
966 av_push (av, newSViv (rgb));
967 av_push (av, newSViv (alpha));
602 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 968 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
969 }
603 970
604 ++m; 971 ++m;
605 } 972 }
606} 973}
607 974
608char *
609SDL_GetError ()
610
611int 975int
612SDL_SetVideoMode (int w, int h, int fullscreen) 976SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613 CODE: 977 CODE:
978{
979 SDL_EnableUNICODE (1);
980 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
981
982 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
983 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
984 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
985 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
986
614 RETVAL = !!SDL_SetVideoMode ( 987 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 988 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 989 );
990
617 if (RETVAL) 991 if (RETVAL)
618 { 992 {
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 993 av_clear (texture_av);
620# 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);
621# include "glfunc.h" 995#include "glfunc.h"
622# undef GL_FUNC 996#undef GL_FUNC
997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
623 } 999 }
1000}
624 OUTPUT: 1001 OUTPUT:
625 RETVAL 1002 RETVAL
1003
1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
626 1006
627void 1007void
628SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
629 1009
630char * 1010char *
631SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
632 1013
1014int
1015SDL_GetAppState ()
1016
1017int
1018SDL_GetModState ()
1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
633void 1024void
634SDL_PollEvent () 1025SDL_PumpEvents ()
1026
1027void
1028peep_events ()
635 PPCODE: 1029 PPCODE:
636{ 1030{
637 SDL_Event ev; 1031 SDL_Event ev;
638 1032
639 while (SDL_PollEvent (&ev)) 1033 SDL_PumpEvents ();
1034 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 1035 {
641 HV *hv = newHV (); 1036 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 1037 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 1038
644 switch (ev.type) 1039 switch (ev.type)
645 { 1040 {
646 case SDL_KEYDOWN: 1041 case SDL_KEYDOWN:
647 case SDL_KEYUP: 1042 case SDL_KEYUP:
648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1043 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1044 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
650 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1045 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
651 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1046 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1047 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
653 break; 1048 break;
654 1049
655 case SDL_ACTIVEEVENT: 1050 case SDL_ACTIVEEVENT:
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1051 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 1052 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 1053 break;
659 1054
660 case SDL_MOUSEMOTION: 1055 case SDL_MOUSEMOTION:
1056 {
1057 int state = ev.motion.state;
1058 int x = ev.motion.x;
1059 int y = ev.motion.y;
1060 int xrel = ev.motion.xrel;
1061 int yrel = ev.motion.yrel;
1062
1063 /* do simplistic event compression */
1064 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
1065 && state == ev.motion.state)
1066 {
1067 xrel += ev.motion.xrel;
1068 yrel += ev.motion.yrel;
1069 x = ev.motion.x;
1070 y = ev.motion.y;
1071 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
1072 }
1073
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1074 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 1075 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 1076 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 1077 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 1078 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 1079 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
1080 }
668 break; 1081 break;
669 1082
670 case SDL_MOUSEBUTTONDOWN: 1083 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 1084 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1085 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
673 1086
674 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1087 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
675 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1088 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
676 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1089 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
677 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1090 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
682 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1095 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
683 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1096 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
684 break; 1097 break;
685 } 1098 }
686 1099
687 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1100 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
688 } 1101 }
689} 1102}
690 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
691int 1117int
692Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
693 POSTCALL: 1119 POSTCALL:
694 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
695 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
696 1122
697void 1123void
1124Mix_QuerySpec ()
1125 PPCODE:
1126{
1127 int freq, channels;
1128 Uint16 format;
1129
1130 if (Mix_QuerySpec (&freq, &format, &channels))
1131 {
1132 EXTEND (SP, 3);
1133 PUSHs (sv_2mortal (newSViv (freq)));
1134 PUSHs (sv_2mortal (newSViv (format)));
1135 PUSHs (sv_2mortal (newSViv (channels)));
1136 }
1137}
1138
1139void
698Mix_CloseAudio () 1140Mix_CloseAudio ()
699 1141
700int 1142int
701Mix_AllocateChannels (int numchans = -1) 1143Mix_AllocateChannels (int numchans = -1)
702 1144
1145const char *
1146Mix_GetError ()
1147
703void 1148void
704lowdelay (int fd, int val = 1) 1149lowdelay (int fd, int val = 1)
705 CODE: 1150 CODE:
706#ifndef _WIN32
707 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 1151 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708#endif
709 1152
710void 1153void
711win32_proxy_info () 1154win32_proxy_info ()
712 PPCODE: 1155 PPCODE:
713{ 1156{
… …
734 } 1177 }
735 } 1178 }
736#endif 1179#endif
737} 1180}
738 1181
739void 1182int
740add_font (char *file) 1183add_font (char *file)
741 CODE: 1184 CODE:
742 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1186 OUTPUT:
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)
743 1195
744void 1196void
745load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
746 ALIAS: 1198 ALIAS:
747 load_image_file = 1 1199 load_image_file = 1
… …
750 STRLEN image_len; 1202 STRLEN image_len;
751 char *image = (char *)SvPVbyte (image_, image_len); 1203 char *image = (char *)SvPVbyte (image_, image_len);
752 SDL_Surface *surface, *surface2; 1204 SDL_Surface *surface, *surface2;
753 SDL_PixelFormat fmt; 1205 SDL_PixelFormat fmt;
754 SDL_RWops *rw = ix 1206 SDL_RWops *rw = ix
755 ? SDL_RWFromFile (image, "r") 1207 ? SDL_RWFromFile (image, "rb")
756 : SDL_RWFromConstMem (image, image_len); 1208 : SDL_RWFromConstMem (image, image_len);
757 1209
758 if (!rw) 1210 if (!rw)
759 croak ("load_image: %s", SDL_GetError ()); 1211 croak ("load_image: %s", SDL_GetError ());
760 1212
… …
793 1245
794 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
795 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
796 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
797 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
798 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
799 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)));
800 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
801 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
802 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
803 1255
… …
833void 1285void
834error (char *message) 1286error (char *message)
835 CODE: 1287 CODE:
836 fprintf (stderr, "ERROR: %s\n", message); 1288 fprintf (stderr, "ERROR: %s\n", message);
837#ifdef _WIN32 1289#ifdef _WIN32
838 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1290 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
839#endif 1291#endif
840 1292
841void 1293void
842fatal (char *message) 1294fatal (char *message)
843 CODE: 1295 CODE:
844 fprintf (stderr, "FATAL: %s\n", message); 1296 fprintf (stderr, "FATAL: %s\n", message);
845#ifdef _WIN32 1297#ifdef _WIN32
846 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1298 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
847#endif 1299#endif
848 _exit (1); 1300 _exit (1);
849 1301
850void 1302void
851_exit (int retval = 0) 1303_exit (int retval = 0)
… …
854 ExitThread (retval); // unclean, please beam me up 1306 ExitThread (retval); // unclean, please beam me up
855#else 1307#else
856 _exit (retval); 1308 _exit (retval);
857#endif 1309#endif
858 1310
859MODULE = CFPlus PACKAGE = CFPlus::Font 1311void
1312debug ()
1313 CODE:
1314{
1315#if DEBUG
1316 VALGRIND_DO_LEAK_CHECK;
1317#endif
1318}
860 1319
861CFPlus::Font 1320int
1321SvREFCNT (SV *sv)
1322 CODE:
1323 RETVAL = SvREFCNT (sv);
1324 OUTPUT:
1325 RETVAL
1326
1327MODULE = Deliantra::Client PACKAGE = DC::Font
1328
1329PROTOTYPES: DISABLE
1330
1331DC::Font
862new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
863 CODE: 1333 CODE:
864{ 1334{
865 int count; 1335 int count;
866 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
867 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
869} 1339}
870 OUTPUT: 1340 OUTPUT:
871 RETVAL 1341 RETVAL
872 1342
873void 1343void
874DESTROY (CFPlus::Font self) 1344DESTROY (DC::Font self)
875 CODE: 1345 CODE:
876 pango_font_description_free (self); 1346 pango_font_description_free (self);
877 1347
878void 1348void
879make_default (CFPlus::Font self) 1349make_default (DC::Font self)
1350 PROTOTYPE: $
880 CODE: 1351 CODE:
881 default_font = self; 1352 default_font = self;
882 1353
883MODULE = CFPlus PACKAGE = CFPlus::Layout 1354MODULE = Deliantra::Client PACKAGE = DC::Layout
884 1355
1356PROTOTYPES: DISABLE
1357
885void 1358void
886reset_glyph_cache () 1359glyph_cache_backup ()
1360 PROTOTYPE:
887 CODE: 1361 CODE:
1362 tc_backup ();
1363
1364void
1365glyph_cache_restore ()
1366 PROTOTYPE:
1367 CODE:
888 tc_clear (); 1368 tc_restore ();
889 1369
890CFPlus::Layout 1370DC::Layout
891new (SV *class) 1371new (SV *klass)
892 CODE: 1372 CODE:
893 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
894 1374
895 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
896 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
897 RETVAL->g = 1.; 1377 RETVAL->g = 1.;
898 RETVAL->b = 1.; 1378 RETVAL->b = 1.;
899 RETVAL->a = 1.; 1379 RETVAL->a = 1.;
900 RETVAL->base_height = MIN_FONT_HEIGHT; 1380 RETVAL->base_height = MIN_FONT_HEIGHT;
901 RETVAL->font = 0; 1381 RETVAL->font = 0;
1382 RETVAL->rc = rc_alloc ();
902 1383
903 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
904 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
905 OUTPUT: 1386 OUTPUT:
906 RETVAL 1387 RETVAL
907 1388
908void 1389void
909DESTROY (CFPlus::Layout self) 1390DESTROY (DC::Layout self)
910 CODE: 1391 CODE:
911 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1393 rc_free (self->rc);
912 Safefree (self); 1394 Safefree (self);
913 1395
914void 1396void
915set_text (CFPlus::Layout self, SV *text_) 1397set_text (DC::Layout self, SV *text_)
916 CODE: 1398 CODE:
917{ 1399{
918 STRLEN textlen; 1400 STRLEN textlen;
919 char *text = SvPVutf8 (text_, textlen); 1401 char *text = SvPVutf8 (text_, textlen);
920 1402
921 pango_layout_set_text (self->pl, text, textlen); 1403 pango_layout_set_text (self->pl, text, textlen);
922} 1404}
923 1405
924void 1406void
925set_markup (CFPlus::Layout self, SV *text_) 1407set_markup (DC::Layout self, SV *text_)
926 CODE: 1408 CODE:
927{ 1409{
928 STRLEN textlen; 1410 STRLEN textlen;
929 char *text = SvPVutf8 (text_, textlen); 1411 char *text = SvPVutf8 (text_, textlen);
930 1412
931 pango_layout_set_markup (self->pl, text, textlen); 1413 pango_layout_set_markup (self->pl, text, textlen);
932} 1414}
933 1415
934void 1416void
935set_shapes (CFPlus::Layout self, ...) 1417set_shapes (DC::Layout self, ...)
936 CODE: 1418 CODE:
937{ 1419{
938 PangoAttrList *attrs = 0; 1420 PangoAttrList *attrs = 0;
939 const char *text = pango_layout_get_text (self->pl); 1421 const char *text = pango_layout_get_text (self->pl);
940 const char *pos = text; 1422 const char *pos = text;
… …
975 if (attrs) 1457 if (attrs)
976 pango_layout_set_attributes (self->pl, attrs); 1458 pango_layout_set_attributes (self->pl, attrs);
977} 1459}
978 1460
979void 1461void
980get_shapes (CFPlus::Layout self) 1462get_shapes (DC::Layout self)
981 PPCODE: 1463 PPCODE:
982{ 1464{
983 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1465 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
984 1466
985 do 1467 do
986 { 1468 {
987 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1469 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
988 1470
989 if (run && shape_attr_p (run)) 1471 if (run && shape_attr_p (run))
990 { 1472 {
991 PangoRectangle extents; 1473 PangoRectangle extents;
992 pango_layout_iter_get_run_extents (iter, 0, &extents); 1474 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1000 1482
1001 pango_layout_iter_free (iter); 1483 pango_layout_iter_free (iter);
1002} 1484}
1003 1485
1004int 1486int
1005has_wrapped (CFPlus::Layout self) 1487has_wrapped (DC::Layout self)
1006 CODE: 1488 CODE:
1007{ 1489{
1008 int lines = 1; 1490 int lines = 1;
1009 const char *text = pango_layout_get_text (self->pl); 1491 const char *text = pango_layout_get_text (self->pl);
1010 1492
… …
1015} 1497}
1016 OUTPUT: 1498 OUTPUT:
1017 RETVAL 1499 RETVAL
1018 1500
1019SV * 1501SV *
1020get_text (CFPlus::Layout self) 1502get_text (DC::Layout self)
1021 CODE: 1503 CODE:
1022 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1504 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1023 sv_utf8_decode (RETVAL); 1505 sv_utf8_decode (RETVAL);
1024 OUTPUT: 1506 OUTPUT:
1025 RETVAL 1507 RETVAL
1026 1508
1027void 1509void
1028set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1510set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1029 CODE: 1511 CODE:
1030 self->r = r; 1512 self->r = r;
1031 self->g = g; 1513 self->g = g;
1032 self->b = b; 1514 self->b = b;
1033 self->a = a; 1515 self->a = a;
1034 1516
1035void 1517void
1036set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1518set_font (DC::Layout self, DC::Font font = 0)
1037 CODE: 1519 CODE:
1038 if (self->font != font) 1520 if (self->font != font)
1039 { 1521 {
1040 self->font = font; 1522 self->font = font;
1041 layout_update_font (self); 1523 layout_update_font (self);
1042 } 1524 }
1043 1525
1044void 1526void
1045set_height (CFPlus::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1046 CODE: 1528 CODE:
1047 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1048 { 1530 {
1049 self->base_height = base_height; 1531 self->base_height = base_height;
1050 layout_update_font (self); 1532 layout_update_font (self);
1051 } 1533 }
1052 1534
1053void 1535void
1054set_width (CFPlus::Layout self, int max_width = -1) 1536set_width (DC::Layout self, int max_width = -1)
1055 CODE: 1537 CODE:
1056 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1538 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1057 1539
1058void 1540void
1059set_indent (CFPlus::Layout self, int indent) 1541set_indent (DC::Layout self, int indent)
1060 CODE: 1542 CODE:
1061 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1543 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1062 1544
1063void 1545void
1064set_spacing (CFPlus::Layout self, int spacing) 1546set_spacing (DC::Layout self, int spacing)
1065 CODE: 1547 CODE:
1066 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1548 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1067 1549
1068void 1550void
1069set_ellipsise (CFPlus::Layout self, int ellipsise) 1551set_ellipsise (DC::Layout self, int ellipsise)
1070 CODE: 1552 CODE:
1071 pango_layout_set_ellipsize (self->pl, 1553 pango_layout_set_ellipsize (self->pl,
1072 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1554 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1073 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1555 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1074 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1556 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1075 : PANGO_ELLIPSIZE_NONE 1557 : PANGO_ELLIPSIZE_NONE
1076 ); 1558 );
1077 1559
1078void 1560void
1079set_single_paragraph_mode (CFPlus::Layout self, int spm) 1561set_single_paragraph_mode (DC::Layout self, int spm)
1080 CODE: 1562 CODE:
1081 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1563 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1082 1564
1083void 1565void
1084size (CFPlus::Layout self) 1566size (DC::Layout self)
1085 PPCODE: 1567 PPCODE:
1086{ 1568{
1087 int w, h; 1569 int w, h;
1088 1570
1089 layout_get_pixel_size (self, &w, &h); 1571 layout_get_pixel_size (self, &w, &h);
… …
1092 PUSHs (sv_2mortal (newSViv (w))); 1574 PUSHs (sv_2mortal (newSViv (w)));
1093 PUSHs (sv_2mortal (newSViv (h))); 1575 PUSHs (sv_2mortal (newSViv (h)));
1094} 1576}
1095 1577
1096int 1578int
1097descent (CFPlus::Layout self) 1579descent (DC::Layout self)
1098 CODE: 1580 CODE:
1099{ 1581{
1100 PangoRectangle rect; 1582 PangoRectangle rect;
1101 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1583 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1102 pango_layout_line_get_pixel_extents (line, 0, &rect); 1584 pango_layout_line_get_pixel_extents (line, 0, &rect);
1103 RETVAL = PANGO_DESCENT (rect); 1585 RETVAL = PANGO_DESCENT (rect);
1104} 1586}
1105 OUTPUT: 1587 OUTPUT:
1106 RETVAL 1588 RETVAL
1107 1589
1108int 1590int
1109xy_to_index (CFPlus::Layout self, int x, int y) 1591xy_to_index (DC::Layout self, int x, int y)
1110 CODE: 1592 CODE:
1111{ 1593{
1112 int index, trailing; 1594 int index, trailing;
1113 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1595 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1114 RETVAL = index + trailing; 1596 RETVAL = index + trailing;
1115} 1597}
1116 OUTPUT: 1598 OUTPUT:
1117 RETVAL 1599 RETVAL
1118 1600
1119void 1601void
1120cursor_pos (CFPlus::Layout self, int index) 1602cursor_pos (DC::Layout self, int index)
1121 PPCODE: 1603 PPCODE:
1122{ 1604{
1123 PangoRectangle strong_pos; 1605 PangoRectangle pos;
1124 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1606 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1125 1607
1126 EXTEND (SP, 3); 1608 EXTEND (SP, 3);
1127 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1609 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1128 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1129 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1130} 1612}
1131 1613
1132void 1614void
1133index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1615index_to_line_x (DC::Layout self, int index, int trailing = 0)
1134 PPCODE: 1616 PPCODE:
1135{ 1617{
1136 int line, x; 1618 int line, x;
1137 1619
1138 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1620 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1621#if !PANGO_VERSION_CHECK (1, 17, 3)
1139 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1622 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1140 1623 --line;
1624#endif
1141 EXTEND (SP, 2); 1625 EXTEND (SP, 2);
1142 PUSHs (sv_2mortal (newSViv (line - 1))); 1626 PUSHs (sv_2mortal (newSViv (line)));
1143 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1627 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1144} 1628}
1145 1629
1146void 1630void
1147line_x_to_index (CFPlus::Layout self, int line, int x) 1631line_x_to_index (DC::Layout self, int line, int x)
1148 PPCODE: 1632 PPCODE:
1149{ 1633{
1150 PangoLayoutLine *lp; 1634 PangoLayoutLine *lp;
1151 int index, trailing; 1635 int index, trailing;
1152 1636
1153 if (line < 0) 1637 if (line < 0)
1154 XSRETURN_EMPTY; 1638 XSRETURN_EMPTY;
1155 1639
1156 if (!(lp = pango_layout_get_line (self->pl, line))) 1640 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1157 XSRETURN_EMPTY; /* do better */ 1641 XSRETURN_EMPTY; /* do better */
1158 1642
1159 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1643 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1160 1644
1161 EXTEND (SP, 2); 1645 EXTEND (SP, 2);
… …
1167 PUSHs (sv_2mortal (newSViv (trailing))); 1651 PUSHs (sv_2mortal (newSViv (trailing)));
1168 } 1652 }
1169} 1653}
1170 1654
1171void 1655void
1172render (CFPlus::Layout self, float x, float y, int flags = 0) 1656render (DC::Layout self, float x, float y, int flags = 0)
1173 PPCODE: 1657 CODE:
1658 rc_clear (self->rc);
1174 pango_opengl_render_layout_subpixel ( 1659 pango_opengl_render_layout_subpixel (
1175 self->pl, 1660 self->pl,
1661 self->rc,
1176 x * PANGO_SCALE, y * PANGO_SCALE, 1662 x * PANGO_SCALE, y * PANGO_SCALE,
1177 self->r, self->g, self->b, self->a, 1663 self->r, self->g, self->b, self->a,
1178 flags 1664 flags
1179 ); 1665 );
1666 // we assume that context_change actually clears/frees stuff
1667 // and does not do any recomputation...
1668 pango_layout_context_changed (self->pl);
1180 1669
1181MODULE = CFPlus PACKAGE = CFPlus::Texture
1182
1183void 1670void
1184pad2pot (SV *data_, SV *w_, SV *h_) 1671draw (DC::Layout self)
1185 CODE: 1672 CODE:
1186{ 1673{
1187 int ow = SvIV (w_); 1674 glEnable (GL_TEXTURE_2D);
1188 int oh = SvIV (h_); 1675 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1676 glEnable (GL_BLEND);
1677 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1678 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1679 glEnable (GL_ALPHA_TEST);
1680 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1189 1681
1190 if (ow && oh) 1682 rc_draw (self->rc);
1683
1684 glDisable (GL_ALPHA_TEST);
1685 glDisable (GL_BLEND);
1686 glDisable (GL_TEXTURE_2D);
1687}
1688
1689MODULE = Deliantra::Client PACKAGE = DC::Texture
1690
1691PROTOTYPES: ENABLE
1692
1693void
1694pad (SV *data_, int ow, int oh, int nw, int nh)
1695 CODE:
1696{
1697 if ((nw != ow || nh != oh) && SvOK (data_))
1191 { 1698 {
1192 int nw = minpot (ow);
1193 int nh = minpot (oh);
1194
1195 if (nw != ow || nh != oh)
1196 {
1197 if (SvOK (data_))
1198 {
1199 STRLEN datalen; 1699 STRLEN datalen;
1200 char *data = SvPVbyte (data_, datalen); 1700 char *data = SvPVbyte (data_, datalen);
1201 int bpp = datalen / (ow * oh); 1701 int bpp = datalen / (ow * oh);
1202 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1702 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1203 1703
1204 SvPOK_only (result_); 1704 SvPOK_only (result_);
1205 SvCUR_set (result_, nw * nh * bpp); 1705 SvCUR_set (result_, nw * nh * bpp);
1206 1706
1207 memset (SvPVX (result_), 0, nw * nh * bpp); 1707 memset (SvPVX (result_), 0, nw * nh * bpp);
1208 while (oh--) 1708 while (oh--)
1209 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1709 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1210 1710
1211 sv_setsv (data_, result_); 1711 sv_setsv (data_, result_);
1212 }
1213
1214 sv_setiv (w_, nw);
1215 sv_setiv (h_, nh);
1216 }
1217 } 1712 }
1218} 1713}
1219 1714
1220void 1715void
1221draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1716draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1227{ 1722{
1228 HV *hv = (HV *)SvRV (self); 1723 HV *hv = (HV *)SvRV (self);
1229 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1724 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1230 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1725 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1231 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1726 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1727
1728 if (name <= 0)
1729 XSRETURN_EMPTY;
1232 1730
1233 if (items < 5) 1731 if (items < 5)
1234 { 1732 {
1235 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1733 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1236 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1734 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1264 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1265 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1266 } 1764 }
1267} 1765}
1268 1766
1269MODULE = CFPlus PACKAGE = CFPlus::Map 1767void
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)
1769 PROTOTYPE: @
1770 CODE:
1771{
1772 glEnable (GL_BLEND);
1773 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1774 glEnable (GL_TEXTURE_2D);
1775 glBindTexture (GL_TEXTURE_2D, name1);
1270 1776
1271CFPlus::Map 1777 glColor3f (intensity, intensity, intensity);
1778 glPushMatrix ();
1779 glScalef (1./3, 1./3, 1.);
1780
1781 if (blend > 0.f)
1782 {
1783 float dx3 = dx * -3.f / w;
1784 float dy3 = dy * -3.f / h;
1785 GLfloat env_color[4] = { 0., 0., 0., blend };
1786
1787 /* interpolate the two shadow textures */
1788 /* stage 0 == rgb(glcolor) + alpha(t0) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1790
1791 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1792 gl.ActiveTexture (GL_TEXTURE1);
1793 glEnable (GL_TEXTURE_2D);
1794 glBindTexture (GL_TEXTURE_2D, name2);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1796
1797 /* rgb == rgb(glcolor) */
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1801
1802 /* alpha = interpolate t0, t1 by env_alpha */
1803 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1808
1809 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1810 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1811
1812 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1813 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1814
1815 glBegin (GL_QUADS);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 gl.ActiveTexture (GL_TEXTURE0);
1824 }
1825 else
1826 {
1827 /* simple blending of one texture, also opengl <1.3 path */
1828 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1829
1830 glBegin (GL_QUADS);
1831 glTexCoord2f (0, 0); glVertex2f (0, 0);
1832 glTexCoord2f (0, t); glVertex2f (0, h);
1833 glTexCoord2f (s, t); glVertex2f (w, h);
1834 glTexCoord2f (s, 0); glVertex2f (w, 0);
1835 glEnd ();
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 ();
1881
1882 glPopMatrix ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886}
1887
1888IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1889 CODE:
1890{
1891 GLint width;
1892 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1893 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1894 RETVAL = width > 0;
1895}
1896 OUTPUT:
1897 RETVAL
1898
1899MODULE = Deliantra::Client PACKAGE = DC::Map
1900
1901PROTOTYPES: DISABLE
1902
1903DC::Map
1272new (SV *class) 1904new (SV *klass)
1273 CODE: 1905 CODE:
1274 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1275 RETVAL->x = 0; 1907 RETVAL->x = 0;
1276 RETVAL->y = 0; 1908 RETVAL->y = 0;
1277 RETVAL->w = 0; 1909 RETVAL->w = 0;
1278 RETVAL->h = 0; 1910 RETVAL->h = 0;
1279 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
… …
1284 RETVAL->row = 0; 1916 RETVAL->row = 0;
1285 OUTPUT: 1917 OUTPUT:
1286 RETVAL 1918 RETVAL
1287 1919
1288void 1920void
1289DESTROY (CFPlus::Map self) 1921DESTROY (DC::Map self)
1290 CODE: 1922 CODE:
1291{ 1923{
1292 map_clear (self); 1924 map_clear (self);
1293 Safefree (self->face2tile); 1925 Safefree (self->face2tile);
1294 Safefree (self->tex); 1926 Safefree (self->tex);
1295 Safefree (self); 1927 Safefree (self);
1296} 1928}
1297 1929
1298void 1930void
1299resize (CFPlus::Map self, int map_width, int map_height) 1931resize (DC::Map self, int map_width, int map_height)
1300 CODE: 1932 CODE:
1301 self->w = map_width; 1933 self->w = map_width;
1302 self->h = map_height; 1934 self->h = map_height;
1303 1935
1304void 1936void
1305clear (CFPlus::Map self) 1937clear (DC::Map self)
1306 CODE: 1938 CODE:
1307 map_clear (self); 1939 map_clear (self);
1308 1940
1309void 1941void
1310set_tileid (CFPlus::Map self, int face, int tile) 1942set_tileid (DC::Map self, int face, int tile)
1311 CODE: 1943 CODE:
1312{ 1944{
1313 need_facenum (self, face); self->face2tile [face] = tile; 1945 need_facenum (self, face); self->face2tile [face] = tile;
1314 need_texid (self, tile); 1946 need_texid (self, tile);
1315} 1947}
1316 1948
1317void 1949void
1318set_smooth (CFPlus::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1319 CODE: 1951 CODE:
1320{ 1952{
1321 tileid texid; 1953 tileid texid;
1322 maptex *tex; 1954 maptex *tex;
1323 1955
1324 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1325 return; 1957 return;
1326 1958
1327 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1328 return; 1960 return;
1329 1961
1330 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1331 1963
1332 if (!texid) 1964 if (!texid)
1333 return; 1965 return;
1334 1966
1335 tex = self->tex + texid; 1967 tex = self->tex + texid;
1336 tex->smoothtile = self->face2tile [smooth]; 1968 tex->smoothtile = self->face2tile [smooth];
1337 tex->smoothlevel = level; 1969 tex->smoothlevel = level;
1338} 1970}
1339 1971
1340void 1972void
1341set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1973set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1342 CODE: 1974 CODE:
1343{ 1975{
1344 need_texid (self, texid); 1976 need_texid (self, texid);
1345 1977
1346 { 1978 {
… …
1365 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1366 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1367 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1368} 2000}
1369 2001
2002void
2003expire_textures (DC::Map self, int texid, int count)
2004 PPCODE:
2005 for (; texid < self->texs && count; ++texid, --count)
2006 {
2007 maptex *tex = self->tex + texid;
2008
2009 if (tex->name)
2010 {
2011 if (tex->unused)
2012 {
2013 tex->name = 0;
2014 tex->unused = 0;
2015 XPUSHs (sv_2mortal (newSViv (texid)));
2016 }
2017 else
2018 tex->unused = 1;
2019 }
2020 }
2021
1370int 2022int
1371ox (CFPlus::Map self) 2023ox (DC::Map self)
1372 ALIAS: 2024 ALIAS:
1373 oy = 1 2025 oy = 1
1374 x = 2 2026 x = 2
1375 y = 3 2027 y = 3
1376 w = 4 2028 w = 4
… …
1387 } 2039 }
1388 OUTPUT: 2040 OUTPUT:
1389 RETVAL 2041 RETVAL
1390 2042
1391void 2043void
1392scroll (CFPlus::Map self, int dx, int dy) 2044scroll (DC::Map self, int dx, int dy)
1393 CODE: 2045 CODE:
1394{ 2046{
1395 if (dx > 0) 2047 if (dx > 0)
1396 map_blank (self, self->x, self->y, dx, self->h); 2048 map_blank (self, self->x, self->y, dx, self->h);
1397 else if (dx < 0) 2049 else if (dx < 0)
1398 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 2050 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1399 2051
1400 if (dy > 0) 2052 if (dy > 0)
1401 map_blank (self, self->x, self->y, self->w, dy); 2053 map_blank (self, self->x, self->y, self->w, dy);
1402 else if (dy < 0) 2054 else if (dy < 0)
1403 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 2055 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1404 2056
1405 self->ox += dx; self->x += dx; 2057 self->ox += dx; self->x += dx;
1406 self->oy += dy; self->y += dy; 2058 self->oy += dy; self->y += dy;
1407 2059
1408 while (self->y < 0) 2060 while (self->y < 0)
… …
1412 self->rows += MAP_EXTEND_Y; 2064 self->rows += MAP_EXTEND_Y;
1413 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1414 } 2066 }
1415} 2067}
1416 2068
1417void 2069SV *
1418map1a_update (CFPlus::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1419 CODE: 2071 CODE:
1420{ 2072{
1421 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1422 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1423 mapcell *cell; 2075 mapcell *cell;
1424 int x, y, flags; 2076 int x, y, z, flags;
2077 AV *missing = newAV ();
2078 RETVAL = newRV_noinc ((SV *)missing);
1425 2079
1426 while (data < data_end - 1) 2080 while (data < data_end - 1)
1427 { 2081 {
1428 flags = (data [0] << 8) + data [1]; data += 2; 2082 flags = (data [0] << 8) + data [1]; data += 2;
1429 2083
… …
1442 2096
1443 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1444 2098
1445 if (flags & 8) 2099 if (flags & 8)
1446 { 2100 {
2101 uint8_t ext, cmd;
2102
1447 if (extmap) 2103 do
1448 { 2104 {
1449 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1450 2107
1451 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
1452 { 2111 {
1453 ext = *data++;
1454 cmd = ext & 0x3f;
1455
1456 if (cmd < 4)
1457 cell->darkness = 255 - ext * 64 + 1;
1458 else if (cmd == 5) // health
1459 {
1460 cell->stat_width = 1; 2112 cell->stat_width = 1;
1461 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1462 }
1463 else if (cmd == 6) // monster width
1464 cell->stat_width = *data++ + 1;
1465 else if (cmd == 0x47)
1466 {
1467 if (*data == 8)
1468 ; // decode player uuid
1469
1470 data += *data + 1;
1471 }
1472 else if (cmd == 8) // cell flags
1473 cell->flags = *data++;
1474 else if (ext & 0x40) // unknown, multibyte => skip
1475 data += *data + 1;
1476 else
1477 data++;
1478 } 2114 }
1479 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++;
1480 } 2132 }
1481 else 2133 while (ext & 0x80);
1482 cell->darkness = *data++ + 1;
1483 } 2134 }
1484 2135
2136 for (z = 0; z <= 2; ++z)
1485 if (flags & 4) 2137 if (flags & (4 >> z))
1486 { 2138 {
1487 faceid face = (data [0] << 8) + data [1]; data += 2; 2139 faceid face = (data [0] << 8) + data [1]; data += 2;
1488 need_facenum (self, face); 2140 need_facenum (self, face);
1489 cell->tile [0] = self->face2tile [face]; 2141 cell->tile [z] = self->face2tile [face];
2142
2143 if (cell->tile [z])
2144 {
2145 maptex *tex = self->tex + cell->tile [z];
2146 tex->unused = 0;
2147 if (!tex->name)
2148 av_push (missing, newSViv (cell->tile [z]));
2149
2150 if (tex->smoothtile)
2151 {
2152 maptex *smooth = self->tex + tex->smoothtile;
2153 smooth->unused = 0;
2154 if (!smooth->name)
2155 av_push (missing, newSViv (tex->smoothtile));
2156 }
2157 }
1490 } 2158 }
1491
1492 if (flags & 2)
1493 {
1494 faceid face = (data [0] << 8) + data [1]; data += 2;
1495 need_facenum (self, face);
1496 cell->tile [1] = self->face2tile [face];
1497 }
1498
1499 if (flags & 1)
1500 {
1501 faceid face = (data [0] << 8) + data [1]; data += 2;
1502 need_facenum (self, face);
1503 cell->tile [2] = self->face2tile [face];
1504 }
1505 } 2159 }
1506 else 2160 else
1507 cell->darkness = 0; 2161 CELL_CLEAR (cell);
1508 } 2162 }
1509} 2163}
2164 OUTPUT:
2165 RETVAL
1510 2166
1511SV * 2167SV *
1512mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2168mapmap (DC::Map self, int x0, int y0, int w, int h)
1513 CODE: 2169 CODE:
1514{ 2170{
1515 int x1, x; 2171 int x1, x;
1516 int y1, y; 2172 int y1, y;
1517 int z; 2173 int z;
… …
1530 ? self->row + y 2186 ? self->row + y
1531 : 0; 2187 : 0;
1532 2188
1533 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1534 { 2190 {
1535 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1536 2192
1537 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1538 { 2194 {
1539 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1540 2196
… …
1542 { 2198 {
1543 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1544 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1545 int a1 = tex.a; 2201 int a1 = tex.a;
1546 2202
1547 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1548 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1549 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1550 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1551 } 2207 }
1552 } 2208 }
1553 2209
1554 *map++ = (r ) 2210 *map++ = (r )
1555 | (g << 8) 2211 | (g << 8)
1556 | (b << 16) 2212 | (b << 16)
1557 | (a << 24); 2213 | (a << 24);
1558 } 2214 }
1559 } 2215 }
1560 2216
1561 RETVAL = map_sv; 2217 RETVAL = map_sv;
1562} 2218}
1563 OUTPUT: 2219 OUTPUT:
1564 RETVAL 2220 RETVAL
1565 2221
1566void 2222void
1567draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 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)
1568 CODE: 2224 CODE:
1569{ 2225{
1570 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2226 int x, y, z;
2227
1571 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
1572 uint8_t smooth_max[256][256]; 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1573 smooth_key skey; 2230 smooth_key skey;
1574 int x, y, z; 2231 int pl_x, pl_y;
1575 int last_name; 2232 maptex pl_tex;
2233 rc_t *rc = rc_alloc ();
2234 rc_t *rc_ov = rc_alloc ();
2235 rc_key_t key;
2236 rc_array_t *arr;
1576 2237
2238 pl_tex.name = 0;
2239
1577 // thats current max. sorry. 2240 // that's current max. sorry.
1578 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1579 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1580 2243
1581 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1582 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
1583 2246
1584 glColor4ub (255, 255, 255, 255); 2247 memset (&key, 0, sizeof (key));
1585 2248 key.r = 255;
1586 glEnable (GL_BLEND); 2249 key.g = 255;
1587 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2250 key.b = 255;
1588 glEnable (GL_TEXTURE_2D); 2251 key.a = 255;
1589 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 key.mode = GL_QUADS;
1590 2253 key.format = GL_T2F_V3F;
1591 glBegin (GL_QUADS);
1592
1593 last_name = 0;
1594 2254
1595 mx += self->x; 2255 mx += self->x;
1596 my += self->y; 2256 my += self->y;
1597 2257
1598 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
… …
1608 for (x = 0; x < sw; x++) 2268 for (x = 0; x < sw; x++)
1609 if (row->c0 <= x + mx && x + mx < row->c1) 2269 if (row->c0 <= x + mx && x + mx < row->c1)
1610 { 2270 {
1611 mapcell *cell = row->col + (x + mx - row->c0); 2271 mapcell *cell = row->col + (x + mx - row->c0);
1612 2272
1613 for (z = 0; z <= 2; z++)
1614 {
1615 uint8_t level = self->tex [cell->tile [z]].smoothlevel;
1616 if (level > smooth_max [x + 1][y + 1])
1617 smooth_max [x + 1][y + 1] = level; 2273 smooth_max[x + 1][y + 1] =
1618 } 2274 MAX (self->tex [cell->tile [0]].smoothlevel,
2275 MAX (self->tex [cell->tile [1]].smoothlevel,
2276 self->tex [cell->tile [2]].smoothlevel));
1619 } 2277 }
1620 } 2278 }
1621 2279
2280 glEnable (GL_BLEND);
2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2283
1622 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1623 { 2285 {
2286 smooth_hash smooth;
1624 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1625 2289
1626 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1627 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1628 { 2292 {
1629 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
… …
1635 tileid tile = cell->tile [z]; 2299 tileid tile = cell->tile [z];
1636 2300
1637 if (tile) 2301 if (tile)
1638 { 2302 {
1639 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1640 int px = (x + 1) * T - tex.w; 2304 int px, py;
1641 int py = (y + 1) * T - tex.h;
1642 2305
1643 // suppressing texture state switches here
1644 // is only moderately effective, but worth the extra effort
1645 if (last_name != tex.name) 2306 if (key.texname != tex.name)
1646 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1647 if (!tex.name) 2310 if (!tex.name)
1648 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1649 2312
1650 glEnd (); 2313 key.texname = tex.name;
1651 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2314 arr = rc_array (rc, &key);
1652 glBegin (GL_QUADS);
1653 } 2315 }
1654 2316
1655 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2317 px = (x + 1) * Th - tex.w;
1656 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2318 py = (y + 1) * Tw - tex.h;
1657 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1658 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1659 2319
1660 if (cell->flags && z == 2) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
1661 { 2321 {
1662 if (cell->flags & 1) 2322 pl_x = px;
2323 pl_y = py;
2324 pl_tex = tex;
1663 { 2325 continue;
1664 maptex tex = self->tex [1];
1665 int px = x * T + T * 2 / 32;
1666 int py = y * T - T * 6 / 32;
1667
1668 glEnd ();
1669 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1670 glBegin (GL_QUADS);
1671
1672 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1673 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1674 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1675 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1676 }
1677 } 2326 }
2327
2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1678 2332
1679 // update smooth hash 2333 // update smooth hash
1680 if (tex.smoothtile) 2334 if (tex.smoothtile)
1681 { 2335 {
1682 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
… …
1685 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2339 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1686 2340
1687 // add bits to current tile and all neighbours. skey.x|y is 2341 // add bits to current tile and all neighbours. skey.x|y is
1688 // shifted +1|+1 so we always stay positive. 2342 // shifted +1|+1 so we always stay positive.
1689 2343
2344 // bits is ___n cccc CCCC bbbb
2345 // n do not draw borders&corners
2346 // c draw these corners, but...
2347 // C ... not these
2348 // b draw these borders
2349
2350 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
2351 // ┃· ·· ·┃ ━━
2352
2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2354 // ·· ·· ·┏ ┓·
2355
1690 // full tile 2356 // full tile
1691 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);
1692 2358
1693 // borders 2359 // borders
1694 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1695 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1696 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);
1697 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);
1698 2364
1699 // corners 2365 // corners
1700 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);
1701 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);
1702 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);
1703 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);
2370 }
2371 }
2372
2373 if (expect_false (z == 2) && expect_false (cell->flags))
2374 {
2375 // overlays such as the speech bubble, probably more to come
2376 if (cell->flags & 1)
2377 {
2378 rc_key_t key_ov = key;
2379 maptex tex = self->tex [TEXID_SPEECH];
2380 rc_array_t *arr;
2381 int px = x * Tw + Tw * 2 / 32;
2382 int py = y * Th - Th * 6 / 32;
2383
2384 key_ov.texname = tex.name;
2385 arr = rc_array (rc_ov, &key_ov);
2386
2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1704 } 2391 }
1705 } 2392 }
1706 } 2393 }
1707 } 2394 }
1708 2395
2396 rc_draw (rc);
2397 rc_clear (rc);
2398
1709 // go through all smoothlevels, lowest to highest, then draw 2399 // go through all smoothlevels, lowest to highest, then draw.
1710 // this is basically counting sort 2400 // this is basically counting sort
1711 { 2401 {
1712 int w, b; 2402 int w, b;
1713 2403
2404 glEnable (GL_TEXTURE_2D);
2405 glBegin (GL_QUADS);
1714 for (w = 0; w < 256 / 32; ++w) 2406 for (w = 0; w < 256 / 32; ++w)
1715 { 2407 {
1716 uint32_t smask = smooth_level [w]; 2408 uint32_t smask = smooth_level [w];
1717 if (smask) 2409 if (smask)
1718 for (b = 0; b < 32; ++b) 2410 for (b = 0; b < 32; ++b)
1719 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
1720 { 2412 {
1721 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
1722 HE *he; 2414 HE *he;
1723 2415
1724 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1725 while ((he = hv_iternext (smooth)))
1726 { 2417 {
1727 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
1728 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
1729
1730 // bits is ___n cccc CCCC bbbb
1731 // n do not draw borders&corners
1732 // c draw these corners, but...
1733 // C ... not these
1734 // b draw these borders
1735 2420
1736 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
1737 && skey->level == level 2422 && skey.level == level
1738 && level >= smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
1739 { 2424 {
1740 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
1741 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
1742 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
1743 int border = bits & 15; 2428 int border = bits & 15;
1744 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1745 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
1746 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
1747 2432
1748 // this time naively avoiding texture state changes
1749 // save gobs of state changes.
1750 if (last_name != tex.name) 2433 if (tex.name)
1751 { 2434 {
2435 // this time avoiding texture state changes
2436 // save gobs of state changes.
1752 if (!tex.name) 2437 if (key.texname != tex.name)
1753 continue; // smoothing not yet available 2438 {
2439 self->tex [skey.tile].unused = 0;
1754 2440
1755 glEnd (); 2441 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1757 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
1758 } 2444 }
1759 2445
1760 if (border) 2446 if (border)
1761 { 2447 {
1762 float ox = border * dx; 2448 float ox = border * dx;
1763 2449
1764 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1765 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1766 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1767 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1768 } 2454 }
1769 2455
1770 if (corner) 2456 if (corner)
1771 { 2457 {
1772 float ox = corner * dx; 2458 float ox = corner * dx;
1773 2459
1774 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1775 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1776 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1777 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2464 }
1778 } 2465 }
1779 } 2466 }
1780 } 2467 }
1781 } 2468 }
1782 } 2469 }
2470
2471 glEnd ();
2472 glDisable (GL_TEXTURE_2D);
2473 key.texname = -1;
1783 } 2474 }
1784
1785 hv_clear (smooth);
1786 } 2475 }
1787 2476
1788 glEnd (); 2477 if (pl_tex.name)
2478 {
2479 maptex tex = pl_tex;
2480 int px = pl_x + sdx;
2481 int py = pl_y + sdy;
1789 2482
1790 glDisable (GL_TEXTURE_2D); 2483 key.texname = tex.name;
2484 arr = rc_array (rc, &key);
2485
2486 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2487 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2488 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2490
2491 rc_draw (rc);
2492 }
2493
2494 rc_draw (rc_ov);
2495 rc_clear (rc_ov);
2496
1791 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2498 rc_free (rc);
2499 rc_free (rc_ov);
1792 2500
1793 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
1794 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
1795 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
1796 { 2504 {
… …
1799 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
1800 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
1801 { 2509 {
1802 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
1803 2511
1804 int px = x * T; 2512 int px = x * Tw;
1805 int py = y * T; 2513 int py = y * Th;
2514
2515 if (expect_false (cell->player == player))
2516 {
2517 px += sdx;
2518 py += sdy;
2519 }
1806 2520
1807 if (cell->stat_hp) 2521 if (cell->stat_hp)
1808 { 2522 {
1809 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
1810 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1811 2525
1812 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
1813 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
1814 px + width - 1, py); 2528 px + width - 1, py);
1815 2529
… …
1821 } 2535 }
1822 } 2536 }
1823} 2537}
1824 2538
1825void 2539void
1826draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2540draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1827 CODE: 2541 CODE:
1828{ 2542{
1829 static float color[16][3] = { 2543 static float color[16][3] = {
1830 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
1831 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
1832 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
1833 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
1834 2548
1835 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
1836 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
1837 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
1838 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
1839 2553
1840 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
1841 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
1842 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
1843 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
1844 2558
1845 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
1846 2560
1847 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
1848 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
1849 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
1850 }; 2564 };
1851 2565
1852 int x, y; 2566 int x, y;
1853 2567
1854 glEnable (GL_TEXTURE_2D); 2568 glEnable (GL_TEXTURE_2D);
2569 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2570 * but the nvidia driver (185.18.14) mishandles alpha textures
2571 * and takes the colour from god knows where instead of using
2572 * Cp. MODULATE results in the same colour, but slightly different
2573 * alpha, but atcually gives us the correct colour with nvidia.
2574 */
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1856 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
1857 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1858 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
1859 2579
1860 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
… …
1864 2584
1865 if (m) 2585 if (m)
1866 { 2586 {
1867 float *c = color [m & 15]; 2587 float *c = color [m & 15];
1868 2588
1869 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
1870 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
1871 2591
1872 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
1873 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1874 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1875 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1876 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1877 } 2597 }
… …
1881 glDisable (GL_BLEND); 2601 glDisable (GL_BLEND);
1882 glDisable (GL_TEXTURE_2D); 2602 glDisable (GL_TEXTURE_2D);
1883} 2603}
1884 2604
1885void 2605void
1886fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2606fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1887 PPCODE: 2607 PPCODE:
1888{ 2608{
1889 int x, y; 2609 int x, y;
1890 int sw4 = (sw + 3) & ~3; 2610 int sw1 = sw + 2;
2611 int sh1 = sh + 2;
2612 int sh3 = sh * 3;
2613 int sw3 = sw * 3;
1891 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1892 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1893 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1894 memset (darkness, 255, sw4 * sh); 2617 memset (darkness1, 0, sw1*sh1);
2618
1895 SvPOK_only (darkness_sv); 2619 SvPOK_only (darkness3_sv);
1896 SvCUR_set (darkness_sv, sw4 * sh); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
1897 2621
1898 mx += self->x; 2622 mx += self->x - 1;
1899 my += self->y; 2623 my += self->y - 1;
1900 2624
1901 for (y = 0; y < sh; y++) 2625 for (y = 0; y < sh1; y++)
1902 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
1903 { 2627 {
1904 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
1905 2629
1906 for (x = 0; x < sw; x++) 2630 for (x = 0; x < sw1; x++)
1907 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
1908 { 2632 {
1909 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
1910 2634
1911 darkness[y * sw4 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
1912 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1913 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
1914 } 2638 }
1915 } 2639 }
1916 2640
2641 for (y = 0; y < sh; ++y)
2642 for (x = 0; x < sw; ++x)
2643 {
2644 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2645 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2646 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2647 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2648 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2649 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2650 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2651 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2652 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2653
2654 uint8_t r11 = (d11 + d21 + d12) / 3;
2655 uint8_t r21 = d21;
2656 uint8_t r31 = (d21 + d31 + d32) / 3;
2657
2658 uint8_t r12 = d12;
2659 uint8_t r22 = d22;
2660 uint8_t r32 = d32;
2661
2662 uint8_t r13 = (d13 + d23 + d12) / 3;
2663 uint8_t r23 = d23;
2664 uint8_t r33 = (d23 + d33 + d32) / 3;
2665
2666 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2667 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2668 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2670 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2671 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2673 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2674 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2675 }
2676
2677 free (darkness1);
2678
1917 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
1918 PUSHs (sv_2mortal (newSViv (sw4))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
1919 PUSHs (sv_2mortal (newSViv (sh))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
1920 PUSHs (darkness_sv); 2682 PUSHs (darkness3_sv);
1921} 2683}
1922 2684
1923SV * 2685SV *
1924get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2686get_rect (DC::Map self, int x0, int y0, int w, int h)
1925 CODE: 2687 CODE:
1926{ 2688{
1927 int x, y, x1, y1; 2689 int x, y, x1, y1;
1928 SV *data_sv = newSV (w * h * 7 + 5); 2690 SV *data_sv = newSV (w * h * 7 + 5);
1929 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2691 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1986 else 2748 else
1987 *data++ = 0; 2749 *data++ = 0;
1988 } 2750 }
1989 } 2751 }
1990 2752
2753 /* if size is w*h + 5 then no data has been found */
2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2755 {
1991 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
1992 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2758 }
2759
1993 RETVAL = data_sv; 2760 RETVAL = data_sv;
1994} 2761}
1995 OUTPUT: 2762 OUTPUT:
1996 RETVAL 2763 RETVAL
1997 2764
1998void 2765void
1999set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2766set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2000 PPCODE: 2767 PPCODE:
2001{ 2768{
2002 int x, y, z; 2769 int x, y, z;
2003 int w, h; 2770 int w, h;
2004 int x1, y1; 2771 int x1, y1;
2772 STRLEN len;
2773 uint8_t *data, *end;
2774
2775 len = SvLEN (data_sv);
2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2778 end = data + len + 8;
2779
2780 if (len < 5)
2781 XSRETURN_EMPTY;
2005 2782
2006 if (*data++ != 0) 2783 if (*data++ != 0)
2007 return; /* version mismatch */ 2784 XSRETURN_EMPTY; /* version mismatch */
2008 2785
2009 w = *data++ << 8; w |= *data++; 2786 w = *data++ << 8; w |= *data++;
2010 h = *data++ << 8; h |= *data++; 2787 h = *data++ << 8; h |= *data++;
2011 2788
2012 // we need to do this 'cause we don't keep an absolute coord system for rows 2789 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2024 { 2801 {
2025 maprow *row = map_get_row (self, y); 2802 maprow *row = map_get_row (self, y);
2026 2803
2027 for (x = x0; x < x1; x++) 2804 for (x = x0; x < x1; x++)
2028 { 2805 {
2806 uint8_t flags;
2807
2808 if (data + 7 >= end)
2809 XSRETURN_EMPTY;
2810
2029 uint8_t flags = *data++; 2811 flags = *data++;
2030 2812
2031 if (flags) 2813 if (flags)
2032 { 2814 {
2033 mapcell *cell = row_get_cell (row, x); 2815 mapcell *cell = row_get_cell (row, x);
2034 tileid tile[3] = { 0, 0, 0 }; 2816 tileid tile[3] = { 0, 0, 0 };
… …
2037 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2819 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2038 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2820 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2039 2821
2040 if (cell->darkness == 0) 2822 if (cell->darkness == 0)
2041 { 2823 {
2042 cell->darkness = 0; 2824 /*cell->darkness = 0;*/
2825 EXTEND (SP, 3);
2043 2826
2044 for (z = 0; z <= 2; z++) 2827 for (z = 0; z <= 2; z++)
2045 { 2828 {
2046 tileid t = tile [z]; 2829 tileid t = tile [z];
2047 2830
2048 if (t >= self->texs || (t && !self->tex [t].name)) 2831 if (t >= self->texs || (t && !self->tex [t].name))
2049 { 2832 {
2050 XPUSHs (sv_2mortal (newSViv (t))); 2833 PUSHs (sv_2mortal (newSViv (t)));
2051 need_texid (self, t); 2834 need_texid (self, t);
2052 } 2835 }
2053 2836
2054 cell->tile [z] = t; 2837 cell->tile [z] = t;
2055 } 2838 }
… …
2057 } 2840 }
2058 } 2841 }
2059 } 2842 }
2060} 2843}
2061 2844
2062MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2063 2846
2064CFPlus::MixChunk 2847DC::RW
2065new_from_file (SV *class, char *path) 2848new (SV *klass, SV *data_sv)
2066 CODE: 2849 CODE:
2067 RETVAL = Mix_LoadWAV (path); 2850{
2851 STRLEN datalen;
2852 char *data = SvPVbyte (data_sv, datalen);
2853
2854 RETVAL = SDL_RWFromConstMem (data, datalen);
2855}
2068 OUTPUT: 2856 OUTPUT:
2069 RETVAL 2857 RETVAL
2070 2858
2859DC::RW
2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2861 CODE:
2862 RETVAL = SDL_RWFromFile (path, mode);
2863 OUTPUT:
2864 RETVAL
2865
2866# fails on win32:
2867# dc.xs(2268) : error C2059: syntax error : '('
2071void 2868#void
2869#close (DC::RW self)
2870# CODE:
2871# (self->(close)) (self);
2872
2873MODULE = Deliantra::Client PACKAGE = DC::Channel
2874
2875PROTOTYPES: DISABLE
2876
2877DC::Channel
2878find ()
2879 CODE:
2880{
2881 RETVAL = Mix_GroupAvailable (-1);
2882
2883 if (RETVAL < 0)
2884 {
2885 RETVAL = Mix_GroupOldest (-1);
2886
2887 if (RETVAL < 0)
2888 {
2889 // happens sometimes, maybe it just stopped playing(?)
2890 RETVAL = Mix_GroupAvailable (-1);
2891
2892 if (RETVAL < 0)
2893 XSRETURN_UNDEF;
2894 }
2895 else
2896 Mix_HaltChannel (RETVAL);
2897 }
2898
2899 Mix_UnregisterAllEffects (RETVAL);
2900 Mix_Volume (RETVAL, 128);
2901}
2902 OUTPUT:
2903 RETVAL
2904
2905void
2906halt (DC::Channel self)
2907 CODE:
2908 Mix_HaltChannel (self);
2909
2910void
2911expire (DC::Channel self, int ticks = -1)
2912 CODE:
2913 Mix_ExpireChannel (self, ticks);
2914
2915void
2916fade_out (DC::Channel self, int ticks = -1)
2917 CODE:
2918 Mix_FadeOutChannel (self, ticks);
2919
2920int
2921volume (DC::Channel self, int volume)
2922 CODE:
2923 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2924 OUTPUT:
2925 RETVAL
2926
2927void
2928unregister_all_effects (DC::Channel self)
2929 CODE:
2930 Mix_UnregisterAllEffects (self);
2931
2932void
2933set_panning (DC::Channel self, int left, int right)
2934 CODE:
2935 left = CLAMP (left , 0, 255);
2936 right = CLAMP (right, 0, 255);
2937 Mix_SetPanning (self, left, right);
2938
2939void
2940set_distance (DC::Channel self, int distance)
2941 CODE:
2942 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2943
2944void
2945set_position (DC::Channel self, int angle, int distance)
2946 CODE:
2947
2948void
2949set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2950 CODE:
2951{
2952 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2953 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2954 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2955}
2956
2957void
2958set_reverse_stereo (DC::Channel self, int flip)
2959 CODE:
2960 Mix_SetReverseStereo (self, flip);
2961
2962MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2963
2964PROTOTYPES: DISABLE
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
2978DC::MixChunk
2979new (SV *klass, DC::RW rwops)
2980 CODE:
2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2982 OUTPUT:
2983 RETVAL
2984
2985void
2072DESTROY (CFPlus::MixChunk self) 2986DESTROY (DC::MixChunk self)
2073 CODE: 2987 CODE:
2074 Mix_FreeChunk (self); 2988 Mix_FreeChunk (self);
2075 2989
2076int 2990int
2077volume (CFPlus::MixChunk self, int volume = -1) 2991volume (DC::MixChunk self, int volume = -1)
2078 CODE: 2992 CODE:
2993 if (items > 1)
2994 volume = CLAMP (volume, 0, 128);
2079 RETVAL = Mix_VolumeChunk (self, volume); 2995 RETVAL = Mix_VolumeChunk (self, volume);
2080 OUTPUT: 2996 OUTPUT:
2081 RETVAL 2997 RETVAL
2082 2998
2083int 2999DC::Channel
2084play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 3000play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2085 CODE: 3001 CODE:
3002{
2086 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 3003 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
3004
3005 if (RETVAL < 0)
3006 XSRETURN_UNDEF;
3007
3008 if (channel < 0)
3009 {
3010 Mix_UnregisterAllEffects (RETVAL);
3011 Mix_Volume (RETVAL, 128);
3012 }
3013}
2087 OUTPUT: 3014 OUTPUT:
2088 RETVAL 3015 RETVAL
2089 3016
2090MODULE = CFPlus PACKAGE = CFPlus::MixMusic 3017MODULE = Deliantra::Client PACKAGE = DC::MixMusic
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
2091 3030
2092int 3031int
2093volume (int volume = -1) 3032volume (int volume = -1)
3033 PROTOTYPE: ;$
2094 CODE: 3034 CODE:
3035 if (items > 0)
3036 volume = CLAMP (volume, 0, 128);
2095 RETVAL = Mix_VolumeMusic (volume); 3037 RETVAL = Mix_VolumeMusic (volume);
2096 OUTPUT: 3038 OUTPUT:
2097 RETVAL 3039 RETVAL
2098 3040
2099CFPlus::MixMusic 3041void
2100new_from_file (SV *class, char *path) 3042fade_out (int ms)
2101 CODE: 3043 CODE:
2102 RETVAL = Mix_LoadMUS (path); 3044 Mix_FadeOutMusic (ms);
3045
3046void
3047halt ()
3048 CODE:
3049 Mix_HaltMusic ();
3050
3051int
3052playing ()
3053 CODE:
3054 RETVAL = Mix_PlayingMusic ();
2103 OUTPUT: 3055 OUTPUT:
2104 RETVAL 3056 RETVAL
2105 3057
3058DC::MixMusic
3059new (SV *klass, DC::RW rwops)
3060 CODE:
3061 RETVAL = Mix_LoadMUS_RW (rwops);
3062 OUTPUT:
3063 RETVAL
3064
2106void 3065void
2107DESTROY (CFPlus::MixMusic self) 3066DESTROY (DC::MixMusic self)
2108 CODE: 3067 CODE:
2109 Mix_FreeMusic (self); 3068 Mix_FreeMusic (self);
2110 3069
2111int 3070int
2112play (CFPlus::MixMusic self, int loops = -1) 3071play (DC::MixMusic self, int loops = -1)
2113 CODE: 3072 CODE:
2114 RETVAL = Mix_PlayMusic (self, loops); 3073 RETVAL = Mix_PlayMusic (self, loops);
2115 OUTPUT: 3074 OUTPUT:
2116 RETVAL 3075 RETVAL
2117 3076
2118MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3077void
3078fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
3079 CODE:
3080 Mix_FadeInMusicPos (self, loops, ms, position);
3081
3082MODULE = Deliantra::Client PACKAGE = DC::OpenGL
3083
3084PROTOTYPES: ENABLE
2119 3085
2120BOOT: 3086BOOT:
2121{ 3087{
2122 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3088 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2123 static const struct { 3089 static const struct {
2124 const char *name; 3090 const char *name;
2125 IV iv; 3091 IV iv;
2126 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2127# define const_iv(name) { # name, (IV)name } 3093# define const_iv(name) { # name, (IV)name }
3094 const_iv (GL_VENDOR),
3095 const_iv (GL_VERSION),
3096 const_iv (GL_EXTENSIONS),
3097 const_iv (GL_MAX_TEXTURE_UNITS),
2128 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2129 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2130 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2131 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2132 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
… …
2136 const_iv (GL_ALPHA_TEST), 3106 const_iv (GL_ALPHA_TEST),
2137 const_iv (GL_NORMALIZE), 3107 const_iv (GL_NORMALIZE),
2138 const_iv (GL_RESCALE_NORMAL), 3108 const_iv (GL_RESCALE_NORMAL),
2139 const_iv (GL_FRONT), 3109 const_iv (GL_FRONT),
2140 const_iv (GL_BACK), 3110 const_iv (GL_BACK),
3111 const_iv (GL_AUX0),
2141 const_iv (GL_AND), 3112 const_iv (GL_AND),
2142 const_iv (GL_ONE), 3113 const_iv (GL_ONE),
2143 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2144 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2145 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2146 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2147 const_iv (GL_ONE_MINUS_DST_ALPHA), 3118 const_iv (GL_ONE_MINUS_DST_ALPHA),
3119 const_iv (GL_SRC_COLOR),
3120 const_iv (GL_DST_COLOR),
3121 const_iv (GL_ONE_MINUS_SRC_COLOR),
3122 const_iv (GL_ONE_MINUS_DST_COLOR),
2148 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2149 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2150 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2151 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2152 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
… …
2158 const_iv (GL_INTENSITY), 3133 const_iv (GL_INTENSITY),
2159 const_iv (GL_LUMINANCE), 3134 const_iv (GL_LUMINANCE),
2160 const_iv (GL_LUMINANCE_ALPHA), 3135 const_iv (GL_LUMINANCE_ALPHA),
2161 const_iv (GL_FLOAT), 3136 const_iv (GL_FLOAT),
2162 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3137 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3138 const_iv (GL_COMPRESSED_ALPHA_ARB),
3139 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3140 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3141 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3142 const_iv (GL_COMPRESSED_RGB_ARB),
3143 const_iv (GL_COMPRESSED_RGBA_ARB),
2163 const_iv (GL_COMPILE), 3144 const_iv (GL_COMPILE),
3145 const_iv (GL_PROXY_TEXTURE_1D),
3146 const_iv (GL_PROXY_TEXTURE_2D),
2164 const_iv (GL_TEXTURE_1D), 3147 const_iv (GL_TEXTURE_1D),
2165 const_iv (GL_TEXTURE_2D), 3148 const_iv (GL_TEXTURE_2D),
2166 const_iv (GL_TEXTURE_ENV), 3149 const_iv (GL_TEXTURE_ENV),
2167 const_iv (GL_TEXTURE_MAG_FILTER), 3150 const_iv (GL_TEXTURE_MAG_FILTER),
2168 const_iv (GL_TEXTURE_MIN_FILTER), 3151 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2189 const_iv (GL_COLOR_LOGIC_OP), 3172 const_iv (GL_COLOR_LOGIC_OP),
2190 const_iv (GL_SEPARABLE_2D), 3173 const_iv (GL_SEPARABLE_2D),
2191 const_iv (GL_CONVOLUTION_2D), 3174 const_iv (GL_CONVOLUTION_2D),
2192 const_iv (GL_CONVOLUTION_BORDER_MODE), 3175 const_iv (GL_CONVOLUTION_BORDER_MODE),
2193 const_iv (GL_CONSTANT_BORDER), 3176 const_iv (GL_CONSTANT_BORDER),
3177 const_iv (GL_POINTS),
2194 const_iv (GL_LINES), 3178 const_iv (GL_LINES),
2195 const_iv (GL_LINE_STRIP), 3179 const_iv (GL_LINE_STRIP),
2196 const_iv (GL_LINE_LOOP), 3180 const_iv (GL_LINE_LOOP),
2197 const_iv (GL_QUADS), 3181 const_iv (GL_QUADS),
2198 const_iv (GL_QUAD_STRIP), 3182 const_iv (GL_QUAD_STRIP),
2199 const_iv (GL_TRIANGLES), 3183 const_iv (GL_TRIANGLES),
2200 const_iv (GL_TRIANGLE_STRIP), 3184 const_iv (GL_TRIANGLE_STRIP),
2201 const_iv (GL_TRIANGLE_FAN), 3185 const_iv (GL_TRIANGLE_FAN),
3186 const_iv (GL_POLYGON),
2202 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3187 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
3188 const_iv (GL_POINT_SMOOTH_HINT),
3189 const_iv (GL_LINE_SMOOTH_HINT),
3190 const_iv (GL_POLYGON_SMOOTH_HINT),
3191 const_iv (GL_GENERATE_MIPMAP_HINT),
3192 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2203 const_iv (GL_FASTEST), 3193 const_iv (GL_FASTEST),
3194 const_iv (GL_DONT_CARE),
3195 const_iv (GL_NICEST),
2204 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2205 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2206 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2207 const_iv (GL_T2F_N3F_V3F), 3199 const_iv (GL_T2F_N3F_V3F),
3200 const_iv (GL_FUNC_ADD),
3201 const_iv (GL_FUNC_SUBTRACT),
3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2208# undef const_iv 3203# undef const_iv
2209 }; 3204 };
2210 3205
2211 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--)
2212 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2213}
2214 3208
2215char * 3209 texture_av = newAV ();
3210 AvREAL_off (texture_av);
3211}
3212
3213void
3214disable_GL_EXT_blend_func_separate ()
3215 CODE:
3216 gl.BlendFuncSeparate = 0;
3217 gl.BlendFuncSeparateEXT = 0;
3218
3219void
3220apple_nvidia_bug (int enable)
3221
3222const char *
2216gl_vendor () 3223gl_vendor ()
2217 CODE: 3224 CODE:
2218 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2219 OUTPUT: 3226 OUTPUT:
2220 RETVAL 3227 RETVAL
2221 3228
2222char * 3229const char *
2223gl_version () 3230gl_version ()
2224 CODE: 3231 CODE:
2225 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2226 OUTPUT: 3233 OUTPUT:
2227 RETVAL 3234 RETVAL
2228 3235
2229char * 3236const char *
2230gl_extensions () 3237gl_extensions ()
2231 CODE: 3238 CODE:
2232 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2233 OUTPUT: 3240 OUTPUT:
2234 RETVAL 3241 RETVAL
2235 3242
3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
3248
3249GLint glGetInteger (GLenum pname)
3250 CODE:
3251 glGetIntegerv (pname, &RETVAL);
3252 OUTPUT:
3253 RETVAL
3254
3255GLdouble glGetDouble (GLenum pname)
3256 CODE:
3257 glGetDoublev (pname, &RETVAL);
3258 OUTPUT:
3259 RETVAL
3260
2236int glGetError () 3261int glGetError ()
2237 3262
2238void glFinish () 3263void glFinish ()
3264
3265void glFlush ()
2239 3266
2240void glClear (int mask) 3267void glClear (int mask)
2241 3268
2242void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2243 PROTOTYPE: @ 3270 PROTOTYPE: @
… …
2254 3281
2255void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2256 CODE: 3283 CODE:
2257 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
2258 3285
3286# void glBlendEquation (int se)
3287
2259void glDepthMask (int flag) 3288void glDepthMask (int flag)
2260 3289
2261void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2262 3291
2263void glColorMask (int red, int green, int blue, int alpha) 3292void glColorMask (int red, int green, int blue, int alpha)
… …
2277# near_ and far_ are due to microsofts buggy "c" compiler 3306# near_ and far_ are due to microsofts buggy "c" compiler
2278void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3307void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2279 3308
2280# near_ and far_ are due to microsofts buggy "c" compiler 3309# near_ and far_ are due to microsofts buggy "c" compiler
2281void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3310void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3311
3312PROTOTYPES: DISABLE
2282 3313
2283void glViewport (int x, int y, int width, int height) 3314void glViewport (int x, int y, int width, int height)
2284 3315
2285void glScissor (int x, int y, int width, int height) 3316void glScissor (int x, int y, int width, int height)
2286 3317
… …
2294 3325
2295void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2296 CODE: 3327 CODE:
2297 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2298 3329
2299void glBegin (int mode)
2300
2301void glEnd ()
2302
2303void glColor (float r, float g, float b, float a = 1.0) 3330void glColor (float r, float g, float b, float a = 1.0)
2304 PROTOTYPE: @ 3331 PROTOTYPE: @
2305 ALIAS: 3332 ALIAS:
2306 glColor_premultiply = 1 3333 glColor_premultiply = 1
2307 CODE: 3334 CODE:
2308 if (ix) 3335 if (ix)
2309 { 3336 {
… …
2312 b *= a; 3339 b *= a;
2313 } 3340 }
2314 // microsoft visual "c" rounds instead of truncating... 3341 // microsoft visual "c" rounds instead of truncating...
2315 glColor4f (r, g, b, a); 3342 glColor4f (r, g, b, a);
2316 3343
2317void glInterleavedArrays (int format, int stride, char *data)
2318
2319void glDrawElements (int mode, int count, int type, char *indices)
2320
2321# 1.2 void glDrawRangeElements (int mode, int start, int end
2322
2323void glRasterPos (float x, float y, float z = 0.) 3344void glRasterPos (float x, float y, float z = 0.)
2324 CODE: 3345 CODE:
2325 glRasterPos3f (0, 0, z); 3346 glRasterPos3f (0, 0, z);
2326 glBitmap (0, 0, 0, 0, x, y, 0); 3347 glBitmap (0, 0, 0, 0, x, y, 0);
2327 3348
… …
2331 3352
2332void glTexCoord (float s, float t) 3353void glTexCoord (float s, float t)
2333 CODE: 3354 CODE:
2334 glTexCoord2f (s, t); 3355 glTexCoord2f (s, t);
2335 3356
3357void glRect (float x1, float y1, float x2, float y2)
3358 CODE:
3359 glRectf (x1, y1, x2, y2);
3360
3361void glRect_lineloop (float x1, float y1, float x2, float y2)
3362 CODE:
3363 glBegin (GL_LINE_LOOP);
3364 glVertex2f (x1, y1);
3365 glVertex2f (x2, y1);
3366 glVertex2f (x2, y2);
3367 glVertex2f (x1, y2);
3368 glEnd ();
3369
3370PROTOTYPES: ENABLE
3371
3372void glBegin (int mode)
3373
3374void glEnd ()
3375
3376void glPointSize (GLfloat size)
3377
3378void glLineWidth (GLfloat width)
3379
3380void glInterleavedArrays (int format, int stride, char *data)
3381
3382void glDrawElements (int mode, int count, int type, char *indices)
3383
3384# 1.2 void glDrawRangeElements (int mode, int start, int end
3385
2336void glTexEnv (int target, int pname, float param) 3386void glTexEnv (int target, int pname, float param)
2337 CODE: 3387 CODE:
2338 glTexEnvf (target, pname, param); 3388 glTexEnvf (target, pname, param);
2339 3389
2340void glTexParameter (int target, int pname, float param) 3390void glTexParameter (int target, int pname, float param)
… …
2356void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3406void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2357 CODE: 3407 CODE:
2358 if (gl.SeparableFilter2D) 3408 if (gl.SeparableFilter2D)
2359 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3409 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2360 3410
2361void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3411void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2362 3412
2363void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3413void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2364 3414
2365void glDrawPixels (int width, int height, int format, int type, char *pixels) 3415void glDrawPixels (int width, int height, int format, int type, char *pixels)
3416
3417void glPixelZoom (float x, float y)
2366 3418
2367void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3419void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2368 3420
2369int glGenTexture () 3421int glGenTexture ()
2370 CODE: 3422 CODE:
2371{ 3423 RETVAL = gen_texture ();
2372 GLuint name;
2373 glGenTextures (1, &name);
2374 RETVAL = name;
2375}
2376 OUTPUT: 3424 OUTPUT:
2377 RETVAL 3425 RETVAL
2378 3426
2379void glDeleteTexture (int name) 3427void glDeleteTexture (int name)
2380 CODE: 3428 CODE:
2381{
2382 GLuint name_ = name;
2383 glDeleteTextures (1, &name_); 3429 del_texture (name);
2384} 3430
2385
2386int glGenList () 3431int glGenList ()
2387 CODE: 3432 CODE:
2388 RETVAL = glGenLists (1); 3433 RETVAL = glGenLists (1);
2389 OUTPUT: 3434 OUTPUT:
2390 RETVAL 3435 RETVAL
… …
2397 3442
2398void glEndList () 3443void glEndList ()
2399 3444
2400void glCallList (int list) 3445void glCallList (int list)
2401 3446
3447void c_init ()
3448 CODE:
3449 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3450 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3451
3452MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3453
3454PROTOTYPES: DISABLE
3455
3456void
3457find_widget (SV *self, NV x, NV y)
3458 PPCODE:
3459{
3460 if (within_widget (self, x, y))
3461 XPUSHs (self);
3462}
3463
3464BOOT:
3465{
3466 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3467
3468 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3469 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3470 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3471 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3472}
3473
3474void
3475draw (SV *self)
3476 CODE:
3477{
3478 HV *hv;
3479 SV **svp;
3480 NV x, y, w, h;
3481 SV *draw_x_sv = GvSV (draw_x_gv);
3482 SV *draw_y_sv = GvSV (draw_y_gv);
3483 SV *draw_w_sv = GvSV (draw_w_gv);
3484 SV *draw_h_sv = GvSV (draw_h_gv);
3485 double draw_x, draw_y;
3486
3487 if (!SvROK (self))
3488 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3489
3490 hv = (HV *)SvRV (self);
3491
3492 if (SvTYPE (hv) != SVt_PVHV)
3493 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3494
3495 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3496 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3497
3498 if (!h || !w)
3499 XSRETURN_EMPTY;
3500
3501 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3502 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3503
3504 draw_x = SvNV (draw_x_sv) + x;
3505 draw_y = SvNV (draw_y_sv) + y;
3506
3507 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3508 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3509 XSRETURN_EMPTY;
3510
3511 sv_setnv (draw_x_sv, draw_x);
3512 sv_setnv (draw_y_sv, draw_y);
3513
3514 glPushMatrix ();
3515 glTranslated (x, y, 0);
3516
3517 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3518 {
3519 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3520
3521 if (svp && SvTRUE (*svp))
3522 {
3523 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3524 glEnable (GL_BLEND);
3525 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3526 glBegin (GL_QUADS);
3527 glVertex2f (0, 0);
3528 glVertex2f (w, 0);
3529 glVertex2f (w, h);
3530 glVertex2f (0, h);
3531 glEnd ();
3532 glDisable (GL_BLEND);
3533 }
3534 }
3535#if 0
3536 // draw borders, for debugging
3537 glPushMatrix ();
3538 glColor4f (1., 1., 0., 1.);
3539 glTranslatef (.5, .5, 0.);
3540 glBegin (GL_LINE_LOOP);
3541 glVertex2f (0 , 0);
3542 glVertex2f (w - 1, 0);
3543 glVertex2f (w - 1, h - 1);
3544 glVertex2f (0 , h - 1);
3545 glEnd ();
3546 glPopMatrix ();
3547#endif
3548 PUSHMARK (SP);
3549 XPUSHs (self);
3550 PUTBACK;
3551 call_method ("_draw", G_VOID | G_DISCARD);
3552 SPAGAIN;
3553
3554 glPopMatrix ();
3555
3556 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3557 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3558}
3559

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines