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.179 by root, Wed Apr 11 04:32:51 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)
1144
1145const char *
1146Mix_GetError ()
702 1147
703void 1148void
704lowdelay (int fd, int val = 1) 1149lowdelay (int fd, int val = 1)
705 CODE: 1150 CODE:
706 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1151 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
732 } 1177 }
733 } 1178 }
734#endif 1179#endif
735} 1180}
736 1181
737void 1182int
738add_font (char *file) 1183add_font (char *file)
739 CODE: 1184 CODE:
740 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)
741 1195
742void 1196void
743load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
744 ALIAS: 1198 ALIAS:
745 load_image_file = 1 1199 load_image_file = 1
… …
748 STRLEN image_len; 1202 STRLEN image_len;
749 char *image = (char *)SvPVbyte (image_, image_len); 1203 char *image = (char *)SvPVbyte (image_, image_len);
750 SDL_Surface *surface, *surface2; 1204 SDL_Surface *surface, *surface2;
751 SDL_PixelFormat fmt; 1205 SDL_PixelFormat fmt;
752 SDL_RWops *rw = ix 1206 SDL_RWops *rw = ix
753 ? SDL_RWFromFile (image, "r") 1207 ? SDL_RWFromFile (image, "rb")
754 : SDL_RWFromConstMem (image, image_len); 1208 : SDL_RWFromConstMem (image, image_len);
755 1209
756 if (!rw) 1210 if (!rw)
757 croak ("load_image: %s", SDL_GetError ()); 1211 croak ("load_image: %s", SDL_GetError ());
758 1212
… …
791 1245
792 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
793 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
794 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
795 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
796 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
797 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)));
798 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
799 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
800 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
801 1255
… …
831void 1285void
832error (char *message) 1286error (char *message)
833 CODE: 1287 CODE:
834 fprintf (stderr, "ERROR: %s\n", message); 1288 fprintf (stderr, "ERROR: %s\n", message);
835#ifdef _WIN32 1289#ifdef _WIN32
836 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1290 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
837#endif 1291#endif
838 1292
839void 1293void
840fatal (char *message) 1294fatal (char *message)
841 CODE: 1295 CODE:
842 fprintf (stderr, "FATAL: %s\n", message); 1296 fprintf (stderr, "FATAL: %s\n", message);
843#ifdef _WIN32 1297#ifdef _WIN32
844 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1298 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
845#endif 1299#endif
846 _exit (1); 1300 _exit (1);
847 1301
848void 1302void
849_exit (int retval = 0) 1303_exit (int retval = 0)
… …
852 ExitThread (retval); // unclean, please beam me up 1306 ExitThread (retval); // unclean, please beam me up
853#else 1307#else
854 _exit (retval); 1308 _exit (retval);
855#endif 1309#endif
856 1310
857MODULE = CFPlus PACKAGE = CFPlus::Font 1311void
1312debug ()
1313 CODE:
1314{
1315#if DEBUG
1316 VALGRIND_DO_LEAK_CHECK;
1317#endif
1318}
858 1319
859CFPlus::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
860new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
861 CODE: 1333 CODE:
862{ 1334{
863 int count; 1335 int count;
864 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
865 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
867} 1339}
868 OUTPUT: 1340 OUTPUT:
869 RETVAL 1341 RETVAL
870 1342
871void 1343void
872DESTROY (CFPlus::Font self) 1344DESTROY (DC::Font self)
873 CODE: 1345 CODE:
874 pango_font_description_free (self); 1346 pango_font_description_free (self);
875 1347
876void 1348void
877make_default (CFPlus::Font self) 1349make_default (DC::Font self)
1350 PROTOTYPE: $
878 CODE: 1351 CODE:
879 default_font = self; 1352 default_font = self;
880 1353
881MODULE = CFPlus PACKAGE = CFPlus::Layout 1354MODULE = Deliantra::Client PACKAGE = DC::Layout
882 1355
1356PROTOTYPES: DISABLE
1357
883void 1358void
884reset_glyph_cache () 1359glyph_cache_backup ()
1360 PROTOTYPE:
885 CODE: 1361 CODE:
1362 tc_backup ();
1363
1364void
1365glyph_cache_restore ()
1366 PROTOTYPE:
1367 CODE:
886 tc_clear (); 1368 tc_restore ();
887 1369
888CFPlus::Layout 1370DC::Layout
889new (SV *class) 1371new (SV *klass)
890 CODE: 1372 CODE:
891 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
892 1374
893 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
894 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
895 RETVAL->g = 1.; 1377 RETVAL->g = 1.;
896 RETVAL->b = 1.; 1378 RETVAL->b = 1.;
897 RETVAL->a = 1.; 1379 RETVAL->a = 1.;
898 RETVAL->base_height = MIN_FONT_HEIGHT; 1380 RETVAL->base_height = MIN_FONT_HEIGHT;
899 RETVAL->font = 0; 1381 RETVAL->font = 0;
1382 RETVAL->rc = rc_alloc ();
900 1383
901 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
902 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
903 OUTPUT: 1386 OUTPUT:
904 RETVAL 1387 RETVAL
905 1388
906void 1389void
907DESTROY (CFPlus::Layout self) 1390DESTROY (DC::Layout self)
908 CODE: 1391 CODE:
909 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1393 rc_free (self->rc);
910 Safefree (self); 1394 Safefree (self);
911 1395
912void 1396void
913set_text (CFPlus::Layout self, SV *text_) 1397set_text (DC::Layout self, SV *text_)
914 CODE: 1398 CODE:
915{ 1399{
916 STRLEN textlen; 1400 STRLEN textlen;
917 char *text = SvPVutf8 (text_, textlen); 1401 char *text = SvPVutf8 (text_, textlen);
918 1402
919 pango_layout_set_text (self->pl, text, textlen); 1403 pango_layout_set_text (self->pl, text, textlen);
920} 1404}
921 1405
922void 1406void
923set_markup (CFPlus::Layout self, SV *text_) 1407set_markup (DC::Layout self, SV *text_)
924 CODE: 1408 CODE:
925{ 1409{
926 STRLEN textlen; 1410 STRLEN textlen;
927 char *text = SvPVutf8 (text_, textlen); 1411 char *text = SvPVutf8 (text_, textlen);
928 1412
929 pango_layout_set_markup (self->pl, text, textlen); 1413 pango_layout_set_markup (self->pl, text, textlen);
930} 1414}
931 1415
932void 1416void
933set_shapes (CFPlus::Layout self, ...) 1417set_shapes (DC::Layout self, ...)
934 CODE: 1418 CODE:
935{ 1419{
936 PangoAttrList *attrs = 0; 1420 PangoAttrList *attrs = 0;
937 const char *text = pango_layout_get_text (self->pl); 1421 const char *text = pango_layout_get_text (self->pl);
938 const char *pos = text; 1422 const char *pos = text;
… …
973 if (attrs) 1457 if (attrs)
974 pango_layout_set_attributes (self->pl, attrs); 1458 pango_layout_set_attributes (self->pl, attrs);
975} 1459}
976 1460
977void 1461void
978get_shapes (CFPlus::Layout self) 1462get_shapes (DC::Layout self)
979 PPCODE: 1463 PPCODE:
980{ 1464{
981 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1465 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
982 1466
983 do 1467 do
984 { 1468 {
985 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1469 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
986 1470
987 if (run && shape_attr_p (run)) 1471 if (run && shape_attr_p (run))
988 { 1472 {
989 PangoRectangle extents; 1473 PangoRectangle extents;
990 pango_layout_iter_get_run_extents (iter, 0, &extents); 1474 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
998 1482
999 pango_layout_iter_free (iter); 1483 pango_layout_iter_free (iter);
1000} 1484}
1001 1485
1002int 1486int
1003has_wrapped (CFPlus::Layout self) 1487has_wrapped (DC::Layout self)
1004 CODE: 1488 CODE:
1005{ 1489{
1006 int lines = 1; 1490 int lines = 1;
1007 const char *text = pango_layout_get_text (self->pl); 1491 const char *text = pango_layout_get_text (self->pl);
1008 1492
… …
1013} 1497}
1014 OUTPUT: 1498 OUTPUT:
1015 RETVAL 1499 RETVAL
1016 1500
1017SV * 1501SV *
1018get_text (CFPlus::Layout self) 1502get_text (DC::Layout self)
1019 CODE: 1503 CODE:
1020 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1504 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1021 sv_utf8_decode (RETVAL); 1505 sv_utf8_decode (RETVAL);
1022 OUTPUT: 1506 OUTPUT:
1023 RETVAL 1507 RETVAL
1024 1508
1025void 1509void
1026set_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.)
1027 CODE: 1511 CODE:
1028 self->r = r; 1512 self->r = r;
1029 self->g = g; 1513 self->g = g;
1030 self->b = b; 1514 self->b = b;
1031 self->a = a; 1515 self->a = a;
1032 1516
1033void 1517void
1034set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1518set_font (DC::Layout self, DC::Font font = 0)
1035 CODE: 1519 CODE:
1036 if (self->font != font) 1520 if (self->font != font)
1037 { 1521 {
1038 self->font = font; 1522 self->font = font;
1039 layout_update_font (self); 1523 layout_update_font (self);
1040 } 1524 }
1041 1525
1042void 1526void
1043set_height (CFPlus::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1044 CODE: 1528 CODE:
1045 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1046 { 1530 {
1047 self->base_height = base_height; 1531 self->base_height = base_height;
1048 layout_update_font (self); 1532 layout_update_font (self);
1049 } 1533 }
1050 1534
1051void 1535void
1052set_width (CFPlus::Layout self, int max_width = -1) 1536set_width (DC::Layout self, int max_width = -1)
1053 CODE: 1537 CODE:
1054 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);
1055 1539
1056void 1540void
1057set_indent (CFPlus::Layout self, int indent) 1541set_indent (DC::Layout self, int indent)
1058 CODE: 1542 CODE:
1059 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1543 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1060 1544
1061void 1545void
1062set_spacing (CFPlus::Layout self, int spacing) 1546set_spacing (DC::Layout self, int spacing)
1063 CODE: 1547 CODE:
1064 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1548 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1065 1549
1066void 1550void
1067set_ellipsise (CFPlus::Layout self, int ellipsise) 1551set_ellipsise (DC::Layout self, int ellipsise)
1068 CODE: 1552 CODE:
1069 pango_layout_set_ellipsize (self->pl, 1553 pango_layout_set_ellipsize (self->pl,
1070 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1554 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1071 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1555 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1072 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1556 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1073 : PANGO_ELLIPSIZE_NONE 1557 : PANGO_ELLIPSIZE_NONE
1074 ); 1558 );
1075 1559
1076void 1560void
1077set_single_paragraph_mode (CFPlus::Layout self, int spm) 1561set_single_paragraph_mode (DC::Layout self, int spm)
1078 CODE: 1562 CODE:
1079 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1563 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1080 1564
1081void 1565void
1082size (CFPlus::Layout self) 1566size (DC::Layout self)
1083 PPCODE: 1567 PPCODE:
1084{ 1568{
1085 int w, h; 1569 int w, h;
1086 1570
1087 layout_get_pixel_size (self, &w, &h); 1571 layout_get_pixel_size (self, &w, &h);
… …
1090 PUSHs (sv_2mortal (newSViv (w))); 1574 PUSHs (sv_2mortal (newSViv (w)));
1091 PUSHs (sv_2mortal (newSViv (h))); 1575 PUSHs (sv_2mortal (newSViv (h)));
1092} 1576}
1093 1577
1094int 1578int
1095descent (CFPlus::Layout self) 1579descent (DC::Layout self)
1096 CODE: 1580 CODE:
1097{ 1581{
1098 PangoRectangle rect; 1582 PangoRectangle rect;
1099 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1583 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1100 pango_layout_line_get_pixel_extents (line, 0, &rect); 1584 pango_layout_line_get_pixel_extents (line, 0, &rect);
1101 RETVAL = PANGO_DESCENT (rect); 1585 RETVAL = PANGO_DESCENT (rect);
1102} 1586}
1103 OUTPUT: 1587 OUTPUT:
1104 RETVAL 1588 RETVAL
1105 1589
1106int 1590int
1107xy_to_index (CFPlus::Layout self, int x, int y) 1591xy_to_index (DC::Layout self, int x, int y)
1108 CODE: 1592 CODE:
1109{ 1593{
1110 int index, trailing; 1594 int index, trailing;
1111 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);
1112 RETVAL = index + trailing; 1596 RETVAL = index + trailing;
1113} 1597}
1114 OUTPUT: 1598 OUTPUT:
1115 RETVAL 1599 RETVAL
1116 1600
1117void 1601void
1118cursor_pos (CFPlus::Layout self, int index) 1602cursor_pos (DC::Layout self, int index)
1119 PPCODE: 1603 PPCODE:
1120{ 1604{
1121 PangoRectangle strong_pos; 1605 PangoRectangle pos;
1122 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1606 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1123 1607
1124 EXTEND (SP, 3); 1608 EXTEND (SP, 3);
1125 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1609 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1126 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1610 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1127 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1611 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1128} 1612}
1129 1613
1130void 1614void
1131index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1615index_to_line_x (DC::Layout self, int index, int trailing = 0)
1132 PPCODE: 1616 PPCODE:
1133{ 1617{
1134 int line, x; 1618 int line, x;
1135 1619
1136 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)
1137 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1622 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1138 1623 --line;
1624#endif
1139 EXTEND (SP, 2); 1625 EXTEND (SP, 2);
1140 PUSHs (sv_2mortal (newSViv (line - 1))); 1626 PUSHs (sv_2mortal (newSViv (line)));
1141 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1627 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1142} 1628}
1143 1629
1144void 1630void
1145line_x_to_index (CFPlus::Layout self, int line, int x) 1631line_x_to_index (DC::Layout self, int line, int x)
1146 PPCODE: 1632 PPCODE:
1147{ 1633{
1148 PangoLayoutLine *lp; 1634 PangoLayoutLine *lp;
1149 int index, trailing; 1635 int index, trailing;
1150 1636
1151 if (line < 0) 1637 if (line < 0)
1152 XSRETURN_EMPTY; 1638 XSRETURN_EMPTY;
1153 1639
1154 if (!(lp = pango_layout_get_line (self->pl, line))) 1640 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1155 XSRETURN_EMPTY; /* do better */ 1641 XSRETURN_EMPTY; /* do better */
1156 1642
1157 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);
1158 1644
1159 EXTEND (SP, 2); 1645 EXTEND (SP, 2);
… …
1165 PUSHs (sv_2mortal (newSViv (trailing))); 1651 PUSHs (sv_2mortal (newSViv (trailing)));
1166 } 1652 }
1167} 1653}
1168 1654
1169void 1655void
1170render (CFPlus::Layout self, float x, float y, int flags = 0) 1656render (DC::Layout self, float x, float y, int flags = 0)
1171 PPCODE: 1657 CODE:
1658 rc_clear (self->rc);
1172 pango_opengl_render_layout_subpixel ( 1659 pango_opengl_render_layout_subpixel (
1173 self->pl, 1660 self->pl,
1661 self->rc,
1174 x * PANGO_SCALE, y * PANGO_SCALE, 1662 x * PANGO_SCALE, y * PANGO_SCALE,
1175 self->r, self->g, self->b, self->a, 1663 self->r, self->g, self->b, self->a,
1176 flags 1664 flags
1177 ); 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);
1178 1669
1179MODULE = CFPlus PACKAGE = CFPlus::Texture
1180
1181void 1670void
1182pad2pot (SV *data_, SV *w_, SV *h_) 1671draw (DC::Layout self)
1183 CODE: 1672 CODE:
1184{ 1673{
1185 int ow = SvIV (w_); 1674 glEnable (GL_TEXTURE_2D);
1186 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);
1187 1681
1188 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_))
1189 { 1698 {
1190 int nw = minpot (ow);
1191 int nh = minpot (oh);
1192
1193 if (nw != ow || nh != oh)
1194 {
1195 if (SvOK (data_))
1196 {
1197 STRLEN datalen; 1699 STRLEN datalen;
1198 char *data = SvPVbyte (data_, datalen); 1700 char *data = SvPVbyte (data_, datalen);
1199 int bpp = datalen / (ow * oh); 1701 int bpp = datalen / (ow * oh);
1200 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1702 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1201 1703
1202 SvPOK_only (result_); 1704 SvPOK_only (result_);
1203 SvCUR_set (result_, nw * nh * bpp); 1705 SvCUR_set (result_, nw * nh * bpp);
1204 1706
1205 memset (SvPVX (result_), 0, nw * nh * bpp); 1707 memset (SvPVX (result_), 0, nw * nh * bpp);
1206 while (oh--) 1708 while (oh--)
1207 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);
1208 1710
1209 sv_setsv (data_, result_); 1711 sv_setsv (data_, result_);
1210 }
1211
1212 sv_setiv (w_, nw);
1213 sv_setiv (h_, nh);
1214 }
1215 } 1712 }
1216} 1713}
1217 1714
1218void 1715void
1219draw_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.)
… …
1225{ 1722{
1226 HV *hv = (HV *)SvRV (self); 1723 HV *hv = (HV *)SvRV (self);
1227 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1724 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1228 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1725 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1229 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;
1230 1730
1231 if (items < 5) 1731 if (items < 5)
1232 { 1732 {
1233 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1733 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1234 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1734 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1262 glDisable (GL_ALPHA_TEST); 1762 glDisable (GL_ALPHA_TEST);
1263 glDisable (GL_BLEND); 1763 glDisable (GL_BLEND);
1264 } 1764 }
1265} 1765}
1266 1766
1267MODULE = 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);
1268 1776
1269CFPlus::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
1270new (SV *class) 1904new (SV *klass)
1271 CODE: 1905 CODE:
1272 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1273 RETVAL->x = 0; 1907 RETVAL->x = 0;
1274 RETVAL->y = 0; 1908 RETVAL->y = 0;
1275 RETVAL->w = 0; 1909 RETVAL->w = 0;
1276 RETVAL->h = 0; 1910 RETVAL->h = 0;
1277 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
… …
1282 RETVAL->row = 0; 1916 RETVAL->row = 0;
1283 OUTPUT: 1917 OUTPUT:
1284 RETVAL 1918 RETVAL
1285 1919
1286void 1920void
1287DESTROY (CFPlus::Map self) 1921DESTROY (DC::Map self)
1288 CODE: 1922 CODE:
1289{ 1923{
1290 map_clear (self); 1924 map_clear (self);
1291 Safefree (self->face2tile); 1925 Safefree (self->face2tile);
1292 Safefree (self->tex); 1926 Safefree (self->tex);
1293 Safefree (self); 1927 Safefree (self);
1294} 1928}
1295 1929
1296void 1930void
1297resize (CFPlus::Map self, int map_width, int map_height) 1931resize (DC::Map self, int map_width, int map_height)
1298 CODE: 1932 CODE:
1299 self->w = map_width; 1933 self->w = map_width;
1300 self->h = map_height; 1934 self->h = map_height;
1301 1935
1302void 1936void
1303clear (CFPlus::Map self) 1937clear (DC::Map self)
1304 CODE: 1938 CODE:
1305 map_clear (self); 1939 map_clear (self);
1306 1940
1307void 1941void
1308set_tileid (CFPlus::Map self, int face, int tile) 1942set_tileid (DC::Map self, int face, int tile)
1309 CODE: 1943 CODE:
1310{ 1944{
1311 need_facenum (self, face); self->face2tile [face] = tile; 1945 need_facenum (self, face); self->face2tile [face] = tile;
1312 need_texid (self, tile); 1946 need_texid (self, tile);
1313} 1947}
1314 1948
1315void 1949void
1316set_smooth (CFPlus::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1317 CODE: 1951 CODE:
1318{ 1952{
1319 tileid texid; 1953 tileid texid;
1320 maptex *tex; 1954 maptex *tex;
1321 1955
1322 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1323 return; 1957 return;
1324 1958
1325 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1326 return; 1960 return;
1327 1961
1328 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1329 1963
1330 if (!texid) 1964 if (!texid)
1331 return; 1965 return;
1332 1966
1333 tex = self->tex + texid; 1967 tex = self->tex + texid;
1334 tex->smoothtile = self->face2tile [smooth]; 1968 tex->smoothtile = self->face2tile [smooth];
1335 tex->smoothlevel = level; 1969 tex->smoothlevel = level;
1336} 1970}
1337 1971
1338void 1972void
1339set_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)
1340 CODE: 1974 CODE:
1341{ 1975{
1342 need_texid (self, texid); 1976 need_texid (self, texid);
1343 1977
1344 { 1978 {
… …
1363 // use uglier nearest interpolation because linear suffers 1997 // use uglier nearest interpolation because linear suffers
1364 // from transparent color bleeding and ugly wrapping effects. 1998 // from transparent color bleeding and ugly wrapping effects.
1365 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1366} 2000}
1367 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
1368int 2022int
1369ox (CFPlus::Map self) 2023ox (DC::Map self)
1370 ALIAS: 2024 ALIAS:
1371 oy = 1 2025 oy = 1
1372 x = 2 2026 x = 2
1373 y = 3 2027 y = 3
1374 w = 4 2028 w = 4
… …
1385 } 2039 }
1386 OUTPUT: 2040 OUTPUT:
1387 RETVAL 2041 RETVAL
1388 2042
1389void 2043void
1390scroll (CFPlus::Map self, int dx, int dy) 2044scroll (DC::Map self, int dx, int dy)
1391 CODE: 2045 CODE:
1392{ 2046{
1393 if (dx > 0) 2047 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 2048 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 2049 else if (dx < 0)
1396 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);
1397 2051
1398 if (dy > 0) 2052 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 2053 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 2054 else if (dy < 0)
1401 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);
1402 2056
1403 self->ox += dx; self->x += dx; 2057 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 2058 self->oy += dy; self->y += dy;
1405 2059
1406 while (self->y < 0) 2060 while (self->y < 0)
… …
1410 self->rows += MAP_EXTEND_Y; 2064 self->rows += MAP_EXTEND_Y;
1411 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1412 } 2066 }
1413} 2067}
1414 2068
1415void 2069SV *
1416map1a_update (CFPlus::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1417 CODE: 2071 CODE:
1418{ 2072{
1419 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1420 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1421 mapcell *cell; 2075 mapcell *cell;
1422 int x, y, flags; 2076 int x, y, z, flags;
2077 AV *missing = newAV ();
2078 RETVAL = newRV_noinc ((SV *)missing);
1423 2079
1424 while (data < data_end - 1) 2080 while (data < data_end - 1)
1425 { 2081 {
1426 flags = (data [0] << 8) + data [1]; data += 2; 2082 flags = (data [0] << 8) + data [1]; data += 2;
1427 2083
… …
1440 2096
1441 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
1442 2098
1443 if (flags & 8) 2099 if (flags & 8)
1444 { 2100 {
2101 uint8_t ext, cmd;
2102
1445 if (extmap) 2103 do
1446 { 2104 {
1447 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
1448 2107
1449 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
1450 { 2111 {
1451 ext = *data++;
1452 cmd = ext & 0x3f;
1453
1454 if (cmd < 4)
1455 cell->darkness = 255 - ext * 64 + 1;
1456 else if (cmd == 5) // health
1457 {
1458 cell->stat_width = 1; 2112 cell->stat_width = 1;
1459 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
1460 }
1461 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47)
1464 {
1465 if (*data == 8)
1466 ; // decode player uuid
1467
1468 data += *data + 1;
1469 }
1470 else if (cmd == 8) // cell flags
1471 cell->flags = *data++;
1472 else if (ext & 0x40) // unknown, multibyte => skip
1473 data += *data + 1;
1474 else
1475 data++;
1476 } 2114 }
1477 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++;
1478 } 2132 }
1479 else 2133 while (ext & 0x80);
1480 cell->darkness = *data++ + 1;
1481 } 2134 }
1482 2135
2136 for (z = 0; z <= 2; ++z)
1483 if (flags & 4) 2137 if (flags & (4 >> z))
1484 { 2138 {
1485 faceid face = (data [0] << 8) + data [1]; data += 2; 2139 faceid face = (data [0] << 8) + data [1]; data += 2;
1486 need_facenum (self, face); 2140 need_facenum (self, face);
1487 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 }
1488 } 2158 }
1489
1490 if (flags & 2)
1491 {
1492 faceid face = (data [0] << 8) + data [1]; data += 2;
1493 need_facenum (self, face);
1494 cell->tile [1] = self->face2tile [face];
1495 }
1496
1497 if (flags & 1)
1498 {
1499 faceid face = (data [0] << 8) + data [1]; data += 2;
1500 need_facenum (self, face);
1501 cell->tile [2] = self->face2tile [face];
1502 }
1503 } 2159 }
1504 else 2160 else
1505 cell->darkness = 0; 2161 CELL_CLEAR (cell);
1506 } 2162 }
1507} 2163}
2164 OUTPUT:
2165 RETVAL
1508 2166
1509SV * 2167SV *
1510mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2168mapmap (DC::Map self, int x0, int y0, int w, int h)
1511 CODE: 2169 CODE:
1512{ 2170{
1513 int x1, x; 2171 int x1, x;
1514 int y1, y; 2172 int y1, y;
1515 int z; 2173 int z;
… …
1528 ? self->row + y 2186 ? self->row + y
1529 : 0; 2187 : 0;
1530 2188
1531 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
1532 { 2190 {
1533 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
1534 2192
1535 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
1536 { 2194 {
1537 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
1538 2196
… …
1540 { 2198 {
1541 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
1542 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
1543 int a1 = tex.a; 2201 int a1 = tex.a;
1544 2202
1545 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
1546 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
1547 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
1548 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
1549 } 2207 }
1550 } 2208 }
1551 2209
1552 *map++ = (r ) 2210 *map++ = (r )
1553 | (g << 8) 2211 | (g << 8)
1554 | (b << 16) 2212 | (b << 16)
1555 | (a << 24); 2213 | (a << 24);
1556 } 2214 }
1557 } 2215 }
1558 2216
1559 RETVAL = map_sv; 2217 RETVAL = map_sv;
1560} 2218}
1561 OUTPUT: 2219 OUTPUT:
1562 RETVAL 2220 RETVAL
1563 2221
1564void 2222void
1565draw (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)
1566 CODE: 2224 CODE:
1567{ 2225{
1568 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2226 int x, y, z;
2227
1569 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
1570 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1571 smooth_key skey; 2230 smooth_key skey;
1572 int x, y, z; 2231 int pl_x, pl_y;
1573 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;
1574 2237
2238 pl_tex.name = 0;
2239
1575 // thats current max. sorry. 2240 // that's current max. sorry.
1576 if (sw > 255) sw = 255; 2241 if (sw > 255) sw = 255;
1577 if (sh > 255) sh = 255; 2242 if (sh > 255) sh = 255;
1578 2243
1579 // clear key, in case of extra padding 2244 // clear key, in case of extra padding
1580 memset (&skey, 0, sizeof (skey)); 2245 memset (&skey, 0, sizeof (skey));
1581 2246
1582 glColor4ub (255, 255, 255, 255); 2247 memset (&key, 0, sizeof (key));
1583 2248 key.r = 255;
1584 glEnable (GL_BLEND); 2249 key.g = 255;
1585 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2250 key.b = 255;
1586 glEnable (GL_TEXTURE_2D); 2251 key.a = 255;
1587 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 key.mode = GL_QUADS;
1588 2253 key.format = GL_T2F_V3F;
1589 glBegin (GL_QUADS);
1590
1591 last_name = 0;
1592 2254
1593 mx += self->x; 2255 mx += self->x;
1594 my += self->y; 2256 my += self->y;
1595 2257
1596 // first pass: determine smooth_max 2258 // first pass: determine smooth_max
… …
1613 MAX (self->tex [cell->tile [1]].smoothlevel, 2275 MAX (self->tex [cell->tile [1]].smoothlevel,
1614 self->tex [cell->tile [2]].smoothlevel)); 2276 self->tex [cell->tile [2]].smoothlevel));
1615 } 2277 }
1616 } 2278 }
1617 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
1618 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
1619 { 2285 {
2286 smooth_hash smooth;
1620 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1;
1621 2289
1622 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
1623 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
1624 { 2292 {
1625 maprow *row = self->row + (y + my); 2293 maprow *row = self->row + (y + my);
… …
1631 tileid tile = cell->tile [z]; 2299 tileid tile = cell->tile [z];
1632 2300
1633 if (tile) 2301 if (tile)
1634 { 2302 {
1635 maptex tex = self->tex [tile]; 2303 maptex tex = self->tex [tile];
1636 int px = (x + 1) * T - tex.w; 2304 int px, py;
1637 int py = (y + 1) * T - tex.h;
1638 2305
1639 // suppressing texture state switches here
1640 // is only moderately effective, but worth the extra effort
1641 if (last_name != tex.name) 2306 if (key.texname != tex.name)
1642 { 2307 {
2308 self->tex [tile].unused = 0;
2309
1643 if (!tex.name) 2310 if (!tex.name)
1644 tex = self->tex [2]; /* missing, replace by noface */ 2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1645 2312
1646 glEnd (); 2313 key.texname = tex.name;
1647 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2314 arr = rc_array (rc, &key);
1648 glBegin (GL_QUADS);
1649 } 2315 }
1650 2316
1651 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2317 px = (x + 1) * Th - tex.w;
1652 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2318 py = (y + 1) * Tw - tex.h;
1653 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1654 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1655 2319
1656 if (cell->flags && z == 2) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
1657 { 2321 {
1658 if (cell->flags & 1) 2322 pl_x = px;
2323 pl_y = py;
2324 pl_tex = tex;
1659 { 2325 continue;
1660 maptex tex = self->tex [1];
1661 int px = x * T + T * 2 / 32;
1662 int py = y * T - T * 6 / 32;
1663
1664 glEnd ();
1665 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1666 glBegin (GL_QUADS);
1667
1668 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1669 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1670 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1671 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1672 }
1673 } 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);
1674 2332
1675 // update smooth hash 2333 // update smooth hash
1676 if (tex.smoothtile) 2334 if (tex.smoothtile)
1677 { 2335 {
1678 skey.tile = tex.smoothtile; 2336 skey.tile = tex.smoothtile;
… …
1681 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2339 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1682 2340
1683 // 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
1684 // shifted +1|+1 so we always stay positive. 2342 // shifted +1|+1 so we always stay positive.
1685 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
1686 // full tile 2356 // full tile
1687 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);
1688 2358
1689 // borders 2359 // borders
1690 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);
1691 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);
1692 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);
1693 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);
1694 2364
1695 // corners 2365 // corners
1696 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);
1697 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);
1698 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);
1699 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);
1700 } 2391 }
1701 } 2392 }
1702 } 2393 }
1703 } 2394 }
1704 2395
2396 rc_draw (rc);
2397 rc_clear (rc);
2398
1705 // go through all smoothlevels, lowest to highest, then draw 2399 // go through all smoothlevels, lowest to highest, then draw.
1706 // this is basically counting sort 2400 // this is basically counting sort
1707 { 2401 {
1708 int w, b; 2402 int w, b;
1709 2403
2404 glEnable (GL_TEXTURE_2D);
2405 glBegin (GL_QUADS);
1710 for (w = 0; w < 256 / 32; ++w) 2406 for (w = 0; w < 256 / 32; ++w)
1711 { 2407 {
1712 uint32_t smask = smooth_level [w]; 2408 uint32_t smask = smooth_level [w];
1713 if (smask) 2409 if (smask)
1714 for (b = 0; b < 32; ++b) 2410 for (b = 0; b < 32; ++b)
1715 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
1716 { 2412 {
1717 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
1718 HE *he; 2414 HE *he;
1719 2415
1720 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1721 while ((he = hv_iternext (smooth)))
1722 { 2417 {
1723 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
1724 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
1725
1726 // bits is ___n cccc CCCC bbbb
1727 // n do not draw borders&corners
1728 // c draw these corners, but...
1729 // C ... not these
1730 // b draw these borders
1731 2420
1732 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
1733 && skey->level == level 2422 && skey.level == level
1734 && level >= smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
1735 { 2424 {
1736 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
1737 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
1738 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
1739 int border = bits & 15; 2428 int border = bits & 15;
1740 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1741 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
1742 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
1743 2432
1744 // this time naively avoiding texture state changes
1745 // save gobs of state changes.
1746 if (last_name != tex.name) 2433 if (tex.name)
1747 { 2434 {
2435 // this time avoiding texture state changes
2436 // save gobs of state changes.
1748 if (!tex.name) 2437 if (key.texname != tex.name)
1749 continue; // smoothing not yet available 2438 {
2439 self->tex [skey.tile].unused = 0;
1750 2440
1751 glEnd (); 2441 glEnd ();
1752 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1753 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
1754 } 2444 }
1755 2445
1756 if (border) 2446 if (border)
1757 { 2447 {
1758 float ox = border * dx; 2448 float ox = border * dx;
1759 2449
1760 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1761 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1762 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1763 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1764 } 2454 }
1765 2455
1766 if (corner) 2456 if (corner)
1767 { 2457 {
1768 float ox = corner * dx; 2458 float ox = corner * dx;
1769 2459
1770 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1771 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1772 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2464 }
1774 } 2465 }
1775 } 2466 }
1776 } 2467 }
1777 } 2468 }
1778 } 2469 }
2470
2471 glEnd ();
2472 glDisable (GL_TEXTURE_2D);
2473 key.texname = -1;
1779 } 2474 }
1780
1781 hv_clear (smooth);
1782 } 2475 }
1783 2476
1784 glEnd (); 2477 if (pl_tex.name)
2478 {
2479 maptex tex = pl_tex;
2480 int px = pl_x + sdx;
2481 int py = pl_y + sdy;
1785 2482
1786 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
1787 glDisable (GL_BLEND); 2497 glDisable (GL_BLEND);
2498 rc_free (rc);
2499 rc_free (rc_ov);
1788 2500
1789 // top layer: overlays such as the health bar 2501 // top layer: overlays such as the health bar
1790 for (y = 0; y < sh; y++) 2502 for (y = 0; y < sh; y++)
1791 if (0 <= y + my && y + my < self->rows) 2503 if (0 <= y + my && y + my < self->rows)
1792 { 2504 {
… …
1795 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
1796 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
1797 { 2509 {
1798 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
1799 2511
1800 int px = x * T; 2512 int px = x * Tw;
1801 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 }
1802 2520
1803 if (cell->stat_hp) 2521 if (cell->stat_hp)
1804 { 2522 {
1805 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
1806 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1807 2525
1808 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
1809 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
1810 px + width - 1, py); 2528 px + width - 1, py);
1811 2529
… …
1817 } 2535 }
1818 } 2536 }
1819} 2537}
1820 2538
1821void 2539void
1822draw_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)
1823 CODE: 2541 CODE:
1824{ 2542{
1825 static float color[16][3] = { 2543 static float color[16][3] = {
1826 { 0.00F, 0.00F, 0.00F }, 2544 { 0.00f, 0.00f, 0.00f },
1827 { 1.00F, 1.00F, 1.00F }, 2545 { 1.00f, 1.00f, 1.00f },
1828 { 0.00F, 0.00F, 0.55F }, 2546 { 0.00f, 0.00f, 0.55f },
1829 { 1.00F, 0.00F, 0.00F }, 2547 { 1.00f, 0.00f, 0.00f },
1830 2548
1831 { 1.00F, 0.54F, 0.00F }, 2549 { 1.00f, 0.54f, 0.00f },
1832 { 0.11F, 0.56F, 1.00F }, 2550 { 0.11f, 0.56f, 1.00f },
1833 { 0.93F, 0.46F, 0.00F }, 2551 { 0.93f, 0.46f, 0.00f },
1834 { 0.18F, 0.54F, 0.34F }, 2552 { 0.18f, 0.54f, 0.34f },
1835 2553
1836 { 0.56F, 0.73F, 0.56F }, 2554 { 0.56f, 0.73f, 0.56f },
1837 { 0.80F, 0.80F, 0.80F }, 2555 { 0.80f, 0.80f, 0.80f },
1838 { 0.55F, 0.41F, 0.13F }, 2556 { 0.55f, 0.41f, 0.13f },
1839 { 0.99F, 0.77F, 0.26F }, 2557 { 0.99f, 0.77f, 0.26f },
1840 2558
1841 { 0.74F, 0.65F, 0.41F }, 2559 { 0.74f, 0.65f, 0.41f },
1842 2560
1843 { 0.00F, 1.00F, 1.00F }, 2561 { 0.00f, 1.00f, 1.00f },
1844 { 1.00F, 0.00F, 1.00F }, 2562 { 1.00f, 0.00f, 1.00f },
1845 { 1.00F, 1.00F, 0.00F }, 2563 { 1.00f, 1.00f, 0.00f },
1846 }; 2564 };
1847 2565
1848 int x, y; 2566 int x, y;
1849 2567
1850 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 */
1851 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2575 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1852 glEnable (GL_BLEND); 2576 glEnable (GL_BLEND);
1853 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2577 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1854 glBegin (GL_QUADS); 2578 glBegin (GL_QUADS);
1855 2579
1856 for (y = 0; y < h; y++) 2580 for (y = 0; y < h; y++)
… …
1860 2584
1861 if (m) 2585 if (m)
1862 { 2586 {
1863 float *c = color [m & 15]; 2587 float *c = color [m & 15];
1864 2588
1865 float tx1 = m & 0x40 ? 0.5 : 0.; 2589 float tx1 = m & 0x40 ? 0.5f : 0.f;
1866 float tx2 = tx1 + 0.5; 2590 float tx2 = tx1 + 0.5f;
1867 2591
1868 glColor4f (c[0], c[1], c[2], 0.75); 2592 glColor4f (c[0], c[1], c[2], 1);
1869 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2593 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1870 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2594 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1871 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2595 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1872 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2596 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1873 } 2597 }
… …
1877 glDisable (GL_BLEND); 2601 glDisable (GL_BLEND);
1878 glDisable (GL_TEXTURE_2D); 2602 glDisable (GL_TEXTURE_2D);
1879} 2603}
1880 2604
1881void 2605void
1882fow_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)
1883 PPCODE: 2607 PPCODE:
1884{ 2608{
1885 int x, y; 2609 int x, y;
1886 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;
1887 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
1888 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1889 2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1890 memset (darkness, 255, sw4 * sh); 2617 memset (darkness1, 0, sw1*sh1);
2618
1891 SvPOK_only (darkness_sv); 2619 SvPOK_only (darkness3_sv);
1892 SvCUR_set (darkness_sv, sw4 * sh); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
1893 2621
1894 mx += self->x; 2622 mx += self->x - 1;
1895 my += self->y; 2623 my += self->y - 1;
1896 2624
1897 for (y = 0; y < sh; y++) 2625 for (y = 0; y < sh1; y++)
1898 if (0 <= y + my && y + my < self->rows) 2626 if (0 <= y + my && y + my < self->rows)
1899 { 2627 {
1900 maprow *row = self->row + (y + my); 2628 maprow *row = self->row + (y + my);
1901 2629
1902 for (x = 0; x < sw; x++) 2630 for (x = 0; x < sw1; x++)
1903 if (row->c0 <= x + mx && x + mx < row->c1) 2631 if (row->c0 <= x + mx && x + mx < row->c1)
1904 { 2632 {
1905 mapcell *cell = row->col + (x + mx - row->c0); 2633 mapcell *cell = row->col + (x + mx - row->c0);
1906 2634
1907 darkness[y * sw4 + x] = cell->darkness 2635 darkness1 [y * sw1 + x] = cell->darkness
1908 ? 255 - (cell->darkness - 1) 2636 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
1909 : 255 - FOW_DARKNESS; 2637 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
1910 } 2638 }
1911 } 2639 }
1912 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
1913 EXTEND (SP, 3); 2679 EXTEND (SP, 3);
1914 PUSHs (sv_2mortal (newSViv (sw4))); 2680 PUSHs (sv_2mortal (newSViv (sw3)));
1915 PUSHs (sv_2mortal (newSViv (sh))); 2681 PUSHs (sv_2mortal (newSViv (sh3)));
1916 PUSHs (darkness_sv); 2682 PUSHs (darkness3_sv);
1917} 2683}
1918 2684
1919SV * 2685SV *
1920get_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)
1921 CODE: 2687 CODE:
1922{ 2688{
1923 int x, y, x1, y1; 2689 int x, y, x1, y1;
1924 SV *data_sv = newSV (w * h * 7 + 5); 2690 SV *data_sv = newSV (w * h * 7 + 5);
1925 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2691 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1982 else 2748 else
1983 *data++ = 0; 2749 *data++ = 0;
1984 } 2750 }
1985 } 2751 }
1986 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 {
1987 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
1988 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2758 }
2759
1989 RETVAL = data_sv; 2760 RETVAL = data_sv;
1990} 2761}
1991 OUTPUT: 2762 OUTPUT:
1992 RETVAL 2763 RETVAL
1993 2764
1994void 2765void
1995set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2766set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1996 PPCODE: 2767 PPCODE:
1997{ 2768{
1998 int x, y, z; 2769 int x, y, z;
1999 int w, h; 2770 int w, h;
2000 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;
2001 2782
2002 if (*data++ != 0) 2783 if (*data++ != 0)
2003 return; /* version mismatch */ 2784 XSRETURN_EMPTY; /* version mismatch */
2004 2785
2005 w = *data++ << 8; w |= *data++; 2786 w = *data++ << 8; w |= *data++;
2006 h = *data++ << 8; h |= *data++; 2787 h = *data++ << 8; h |= *data++;
2007 2788
2008 // 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
… …
2020 { 2801 {
2021 maprow *row = map_get_row (self, y); 2802 maprow *row = map_get_row (self, y);
2022 2803
2023 for (x = x0; x < x1; x++) 2804 for (x = x0; x < x1; x++)
2024 { 2805 {
2806 uint8_t flags;
2807
2808 if (data + 7 >= end)
2809 XSRETURN_EMPTY;
2810
2025 uint8_t flags = *data++; 2811 flags = *data++;
2026 2812
2027 if (flags) 2813 if (flags)
2028 { 2814 {
2029 mapcell *cell = row_get_cell (row, x); 2815 mapcell *cell = row_get_cell (row, x);
2030 tileid tile[3] = { 0, 0, 0 }; 2816 tileid tile[3] = { 0, 0, 0 };
… …
2033 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2819 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2034 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2820 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2035 2821
2036 if (cell->darkness == 0) 2822 if (cell->darkness == 0)
2037 { 2823 {
2038 cell->darkness = 0; 2824 /*cell->darkness = 0;*/
2825 EXTEND (SP, 3);
2039 2826
2040 for (z = 0; z <= 2; z++) 2827 for (z = 0; z <= 2; z++)
2041 { 2828 {
2042 tileid t = tile [z]; 2829 tileid t = tile [z];
2043 2830
2044 if (t >= self->texs || (t && !self->tex [t].name)) 2831 if (t >= self->texs || (t && !self->tex [t].name))
2045 { 2832 {
2046 XPUSHs (sv_2mortal (newSViv (t))); 2833 PUSHs (sv_2mortal (newSViv (t)));
2047 need_texid (self, t); 2834 need_texid (self, t);
2048 } 2835 }
2049 2836
2050 cell->tile [z] = t; 2837 cell->tile [z] = t;
2051 } 2838 }
… …
2053 } 2840 }
2054 } 2841 }
2055 } 2842 }
2056} 2843}
2057 2844
2058MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2059 2846
2060CFPlus::MixChunk 2847DC::RW
2061new_from_file (SV *class, char *path) 2848new (SV *klass, SV *data_sv)
2062 CODE: 2849 CODE:
2063 RETVAL = Mix_LoadWAV (path); 2850{
2851 STRLEN datalen;
2852 char *data = SvPVbyte (data_sv, datalen);
2853
2854 RETVAL = SDL_RWFromConstMem (data, datalen);
2855}
2064 OUTPUT: 2856 OUTPUT:
2065 RETVAL 2857 RETVAL
2066 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 : '('
2067void 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
2068DESTROY (CFPlus::MixChunk self) 2986DESTROY (DC::MixChunk self)
2069 CODE: 2987 CODE:
2070 Mix_FreeChunk (self); 2988 Mix_FreeChunk (self);
2071 2989
2072int 2990int
2073volume (CFPlus::MixChunk self, int volume = -1) 2991volume (DC::MixChunk self, int volume = -1)
2074 CODE: 2992 CODE:
2993 if (items > 1)
2994 volume = CLAMP (volume, 0, 128);
2075 RETVAL = Mix_VolumeChunk (self, volume); 2995 RETVAL = Mix_VolumeChunk (self, volume);
2076 OUTPUT: 2996 OUTPUT:
2077 RETVAL 2997 RETVAL
2078 2998
2079int 2999DC::Channel
2080play (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)
2081 CODE: 3001 CODE:
3002{
2082 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}
2083 OUTPUT: 3014 OUTPUT:
2084 RETVAL 3015 RETVAL
2085 3016
2086MODULE = 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
2087 3030
2088int 3031int
2089volume (int volume = -1) 3032volume (int volume = -1)
3033 PROTOTYPE: ;$
2090 CODE: 3034 CODE:
3035 if (items > 0)
3036 volume = CLAMP (volume, 0, 128);
2091 RETVAL = Mix_VolumeMusic (volume); 3037 RETVAL = Mix_VolumeMusic (volume);
2092 OUTPUT: 3038 OUTPUT:
2093 RETVAL 3039 RETVAL
2094 3040
2095CFPlus::MixMusic 3041void
2096new_from_file (SV *class, char *path) 3042fade_out (int ms)
2097 CODE: 3043 CODE:
2098 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 ();
2099 OUTPUT: 3055 OUTPUT:
2100 RETVAL 3056 RETVAL
2101 3057
3058DC::MixMusic
3059new (SV *klass, DC::RW rwops)
3060 CODE:
3061 RETVAL = Mix_LoadMUS_RW (rwops);
3062 OUTPUT:
3063 RETVAL
3064
2102void 3065void
2103DESTROY (CFPlus::MixMusic self) 3066DESTROY (DC::MixMusic self)
2104 CODE: 3067 CODE:
2105 Mix_FreeMusic (self); 3068 Mix_FreeMusic (self);
2106 3069
2107int 3070int
2108play (CFPlus::MixMusic self, int loops = -1) 3071play (DC::MixMusic self, int loops = -1)
2109 CODE: 3072 CODE:
2110 RETVAL = Mix_PlayMusic (self, loops); 3073 RETVAL = Mix_PlayMusic (self, loops);
2111 OUTPUT: 3074 OUTPUT:
2112 RETVAL 3075 RETVAL
2113 3076
2114MODULE = 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
2115 3085
2116BOOT: 3086BOOT:
2117{ 3087{
2118 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3088 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2119 static const struct { 3089 static const struct {
2120 const char *name; 3090 const char *name;
2121 IV iv; 3091 IV iv;
2122 } *civ, const_iv[] = { 3092 } *civ, const_iv[] = {
2123# 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),
2124 const_iv (GL_COLOR_MATERIAL), 3098 const_iv (GL_COLOR_MATERIAL),
2125 const_iv (GL_SMOOTH), 3099 const_iv (GL_SMOOTH),
2126 const_iv (GL_FLAT), 3100 const_iv (GL_FLAT),
2127 const_iv (GL_DITHER), 3101 const_iv (GL_DITHER),
2128 const_iv (GL_BLEND), 3102 const_iv (GL_BLEND),
… …
2132 const_iv (GL_ALPHA_TEST), 3106 const_iv (GL_ALPHA_TEST),
2133 const_iv (GL_NORMALIZE), 3107 const_iv (GL_NORMALIZE),
2134 const_iv (GL_RESCALE_NORMAL), 3108 const_iv (GL_RESCALE_NORMAL),
2135 const_iv (GL_FRONT), 3109 const_iv (GL_FRONT),
2136 const_iv (GL_BACK), 3110 const_iv (GL_BACK),
3111 const_iv (GL_AUX0),
2137 const_iv (GL_AND), 3112 const_iv (GL_AND),
2138 const_iv (GL_ONE), 3113 const_iv (GL_ONE),
2139 const_iv (GL_ZERO), 3114 const_iv (GL_ZERO),
2140 const_iv (GL_SRC_ALPHA), 3115 const_iv (GL_SRC_ALPHA),
2141 const_iv (GL_DST_ALPHA), 3116 const_iv (GL_DST_ALPHA),
2142 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3117 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2143 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),
2144 const_iv (GL_SRC_ALPHA_SATURATE), 3123 const_iv (GL_SRC_ALPHA_SATURATE),
2145 const_iv (GL_RGB), 3124 const_iv (GL_RGB),
2146 const_iv (GL_RGBA), 3125 const_iv (GL_RGBA),
2147 const_iv (GL_RGBA4), 3126 const_iv (GL_RGBA4),
2148 const_iv (GL_RGBA8), 3127 const_iv (GL_RGBA8),
… …
2154 const_iv (GL_INTENSITY), 3133 const_iv (GL_INTENSITY),
2155 const_iv (GL_LUMINANCE), 3134 const_iv (GL_LUMINANCE),
2156 const_iv (GL_LUMINANCE_ALPHA), 3135 const_iv (GL_LUMINANCE_ALPHA),
2157 const_iv (GL_FLOAT), 3136 const_iv (GL_FLOAT),
2158 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),
2159 const_iv (GL_COMPILE), 3144 const_iv (GL_COMPILE),
3145 const_iv (GL_PROXY_TEXTURE_1D),
3146 const_iv (GL_PROXY_TEXTURE_2D),
2160 const_iv (GL_TEXTURE_1D), 3147 const_iv (GL_TEXTURE_1D),
2161 const_iv (GL_TEXTURE_2D), 3148 const_iv (GL_TEXTURE_2D),
2162 const_iv (GL_TEXTURE_ENV), 3149 const_iv (GL_TEXTURE_ENV),
2163 const_iv (GL_TEXTURE_MAG_FILTER), 3150 const_iv (GL_TEXTURE_MAG_FILTER),
2164 const_iv (GL_TEXTURE_MIN_FILTER), 3151 const_iv (GL_TEXTURE_MIN_FILTER),
… …
2185 const_iv (GL_COLOR_LOGIC_OP), 3172 const_iv (GL_COLOR_LOGIC_OP),
2186 const_iv (GL_SEPARABLE_2D), 3173 const_iv (GL_SEPARABLE_2D),
2187 const_iv (GL_CONVOLUTION_2D), 3174 const_iv (GL_CONVOLUTION_2D),
2188 const_iv (GL_CONVOLUTION_BORDER_MODE), 3175 const_iv (GL_CONVOLUTION_BORDER_MODE),
2189 const_iv (GL_CONSTANT_BORDER), 3176 const_iv (GL_CONSTANT_BORDER),
3177 const_iv (GL_POINTS),
2190 const_iv (GL_LINES), 3178 const_iv (GL_LINES),
2191 const_iv (GL_LINE_STRIP), 3179 const_iv (GL_LINE_STRIP),
2192 const_iv (GL_LINE_LOOP), 3180 const_iv (GL_LINE_LOOP),
2193 const_iv (GL_QUADS), 3181 const_iv (GL_QUADS),
2194 const_iv (GL_QUAD_STRIP), 3182 const_iv (GL_QUAD_STRIP),
2195 const_iv (GL_TRIANGLES), 3183 const_iv (GL_TRIANGLES),
2196 const_iv (GL_TRIANGLE_STRIP), 3184 const_iv (GL_TRIANGLE_STRIP),
2197 const_iv (GL_TRIANGLE_FAN), 3185 const_iv (GL_TRIANGLE_FAN),
3186 const_iv (GL_POLYGON),
2198 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),
2199 const_iv (GL_FASTEST), 3193 const_iv (GL_FASTEST),
3194 const_iv (GL_DONT_CARE),
3195 const_iv (GL_NICEST),
2200 const_iv (GL_V2F), 3196 const_iv (GL_V2F),
2201 const_iv (GL_V3F), 3197 const_iv (GL_V3F),
2202 const_iv (GL_T2F_V3F), 3198 const_iv (GL_T2F_V3F),
2203 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),
2204# undef const_iv 3203# undef const_iv
2205 }; 3204 };
2206 3205
2207 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--)
2208 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2209}
2210 3208
2211char * 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 *
2212gl_vendor () 3223gl_vendor ()
2213 CODE: 3224 CODE:
2214 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
2215 OUTPUT: 3226 OUTPUT:
2216 RETVAL 3227 RETVAL
2217 3228
2218char * 3229const char *
2219gl_version () 3230gl_version ()
2220 CODE: 3231 CODE:
2221 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
2222 OUTPUT: 3233 OUTPUT:
2223 RETVAL 3234 RETVAL
2224 3235
2225char * 3236const char *
2226gl_extensions () 3237gl_extensions ()
2227 CODE: 3238 CODE:
2228 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2229 OUTPUT: 3240 OUTPUT:
2230 RETVAL 3241 RETVAL
2231 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
2232int glGetError () 3261int glGetError ()
2233 3262
2234void glFinish () 3263void glFinish ()
3264
3265void glFlush ()
2235 3266
2236void glClear (int mask) 3267void glClear (int mask)
2237 3268
2238void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
2239 PROTOTYPE: @ 3270 PROTOTYPE: @
… …
2250 3281
2251void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3282void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2252 CODE: 3283 CODE:
2253 gl_BlendFuncSeparate (sa, da, saa, daa); 3284 gl_BlendFuncSeparate (sa, da, saa, daa);
2254 3285
3286# void glBlendEquation (int se)
3287
2255void glDepthMask (int flag) 3288void glDepthMask (int flag)
2256 3289
2257void glLogicOp (int opcode) 3290void glLogicOp (int opcode)
2258 3291
2259void glColorMask (int red, int green, int blue, int alpha) 3292void glColorMask (int red, int green, int blue, int alpha)
… …
2273# near_ and far_ are due to microsofts buggy "c" compiler 3306# near_ and far_ are due to microsofts buggy "c" compiler
2274void 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_)
2275 3308
2276# near_ and far_ are due to microsofts buggy "c" compiler 3309# near_ and far_ are due to microsofts buggy "c" compiler
2277void 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
2278 3313
2279void glViewport (int x, int y, int width, int height) 3314void glViewport (int x, int y, int width, int height)
2280 3315
2281void glScissor (int x, int y, int width, int height) 3316void glScissor (int x, int y, int width, int height)
2282 3317
… …
2290 3325
2291void glRotate (float angle, float x, float y, float z) 3326void glRotate (float angle, float x, float y, float z)
2292 CODE: 3327 CODE:
2293 glRotatef (angle, x, y, z); 3328 glRotatef (angle, x, y, z);
2294 3329
2295void glBegin (int mode)
2296
2297void glEnd ()
2298
2299void glColor (float r, float g, float b, float a = 1.0) 3330void glColor (float r, float g, float b, float a = 1.0)
2300 PROTOTYPE: @ 3331 PROTOTYPE: @
2301 ALIAS: 3332 ALIAS:
2302 glColor_premultiply = 1 3333 glColor_premultiply = 1
2303 CODE: 3334 CODE:
2304 if (ix) 3335 if (ix)
2305 { 3336 {
… …
2308 b *= a; 3339 b *= a;
2309 } 3340 }
2310 // microsoft visual "c" rounds instead of truncating... 3341 // microsoft visual "c" rounds instead of truncating...
2311 glColor4f (r, g, b, a); 3342 glColor4f (r, g, b, a);
2312 3343
2313void glInterleavedArrays (int format, int stride, char *data)
2314
2315void glDrawElements (int mode, int count, int type, char *indices)
2316
2317# 1.2 void glDrawRangeElements (int mode, int start, int end
2318
2319void glRasterPos (float x, float y, float z = 0.) 3344void glRasterPos (float x, float y, float z = 0.)
2320 CODE: 3345 CODE:
2321 glRasterPos3f (0, 0, z); 3346 glRasterPos3f (0, 0, z);
2322 glBitmap (0, 0, 0, 0, x, y, 0); 3347 glBitmap (0, 0, 0, 0, x, y, 0);
2323 3348
… …
2327 3352
2328void glTexCoord (float s, float t) 3353void glTexCoord (float s, float t)
2329 CODE: 3354 CODE:
2330 glTexCoord2f (s, t); 3355 glTexCoord2f (s, t);
2331 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
2332void glTexEnv (int target, int pname, float param) 3386void glTexEnv (int target, int pname, float param)
2333 CODE: 3387 CODE:
2334 glTexEnvf (target, pname, param); 3388 glTexEnvf (target, pname, param);
2335 3389
2336void glTexParameter (int target, int pname, float param) 3390void glTexParameter (int target, int pname, float param)
… …
2352void 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)
2353 CODE: 3407 CODE:
2354 if (gl.SeparableFilter2D) 3408 if (gl.SeparableFilter2D)
2355 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3409 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2356 3410
2357void 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)
2358 3412
2359void 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)
2360 3414
2361void 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)
2362 3418
2363void 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)
2364 3420
2365int glGenTexture () 3421int glGenTexture ()
2366 CODE: 3422 CODE:
2367{ 3423 RETVAL = gen_texture ();
2368 GLuint name;
2369 glGenTextures (1, &name);
2370 RETVAL = name;
2371}
2372 OUTPUT: 3424 OUTPUT:
2373 RETVAL 3425 RETVAL
2374 3426
2375void glDeleteTexture (int name) 3427void glDeleteTexture (int name)
2376 CODE: 3428 CODE:
2377{
2378 GLuint name_ = name;
2379 glDeleteTextures (1, &name_); 3429 del_texture (name);
2380} 3430
2381
2382int glGenList () 3431int glGenList ()
2383 CODE: 3432 CODE:
2384 RETVAL = glGenLists (1); 3433 RETVAL = glGenLists (1);
2385 OUTPUT: 3434 OUTPUT:
2386 RETVAL 3435 RETVAL
… …
2393 3442
2394void glEndList () 3443void glEndList ()
2395 3444
2396void glCallList (int list) 3445void glCallList (int list)
2397 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