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

Diff Legend

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