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.219 by root, Mon Aug 6 05:06:32 2007 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

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

Diff Legend

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