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.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.333 by root, Mon Nov 19 01:23:01 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> 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}
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
807 1109
808int 1110int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 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);
813 1115
814void 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}
1131
1132void
815Mix_CloseAudio () 1133Mix_CloseAudio ()
816 1134
817int 1135int
818Mix_AllocateChannels (int numchans = -1) 1136Mix_AllocateChannels (int numchans = -1)
1137
1138const char *
1139Mix_GetError ()
819 1140
820void 1141void
821lowdelay (int fd, int val = 1) 1142lowdelay (int fd, int val = 1)
822 CODE: 1143 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1144 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1170 }
850 } 1171 }
851#endif 1172#endif
852} 1173}
853 1174
854void 1175int
855add_font (char *file) 1176add_font (char *file)
856 CODE: 1177 CODE:
857 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)
858 1188
859void 1189void
860load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
861 ALIAS: 1191 ALIAS:
862 load_image_file = 1 1192 load_image_file = 1
908 1238
909 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
910 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
911 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
912 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
913 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
914 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)));
915 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
916 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
917 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
918 1248
948void 1278void
949error (char *message) 1279error (char *message)
950 CODE: 1280 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1281 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1282#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1283 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1284#endif
955 1285
956void 1286void
957fatal (char *message) 1287fatal (char *message)
958 CODE: 1288 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1289 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1290#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1291 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1292#endif
963 _exit (1); 1293 _exit (1);
964 1294
965void 1295void
966_exit (int retval = 0) 1296_exit (int retval = 0)
978#if DEBUG 1308#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
980#endif 1310#endif
981} 1311}
982 1312
983MODULE = 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
984 1321
985PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
986 1323
987CFPlus::Font 1324DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
989 CODE: 1326 CODE:
990{ 1327{
991 int count; 1328 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
993 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
995} 1332}
996 OUTPUT: 1333 OUTPUT:
997 RETVAL 1334 RETVAL
998 1335
999void 1336void
1000DESTROY (CFPlus::Font self) 1337DESTROY (DC::Font self)
1001 CODE: 1338 CODE:
1002 pango_font_description_free (self); 1339 pango_font_description_free (self);
1003 1340
1004void 1341void
1005make_default (CFPlus::Font self) 1342make_default (DC::Font self)
1006 PROTOTYPE: $ 1343 PROTOTYPE: $
1007 CODE: 1344 CODE:
1008 default_font = self; 1345 default_font = self;
1009 1346
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1347MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1348
1012PROTOTYPES: DISABLE 1349PROTOTYPES: DISABLE
1013 1350
1014void 1351void
1015reset_glyph_cache () 1352glyph_cache_backup ()
1016 PROTOTYPE: 1353 PROTOTYPE:
1017 CODE: 1354 CODE:
1355 tc_backup ();
1356
1357void
1358glyph_cache_restore ()
1359 PROTOTYPE:
1360 CODE:
1018 tc_clear (); 1361 tc_restore ();
1019 1362
1020CFPlus::Layout 1363DC::Layout
1021new (SV *class) 1364new (SV *klass)
1022 CODE: 1365 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1366 RETVAL = new cf_layout;
1024 1367
1025 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1026 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1027 RETVAL->g = 1.; 1370 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1371 RETVAL->b = 1.;
1034 layout_update_font (RETVAL); 1377 layout_update_font (RETVAL);
1035 OUTPUT: 1378 OUTPUT:
1036 RETVAL 1379 RETVAL
1037 1380
1038void 1381void
1039DESTROY (CFPlus::Layout self) 1382DESTROY (DC::Layout self)
1040 CODE: 1383 CODE:
1041 g_object_unref (self->pl); 1384 g_object_unref (self->pl);
1042 Safefree (self); 1385 delete self;
1043 1386
1044void 1387void
1045set_text (CFPlus::Layout self, SV *text_) 1388set_text (DC::Layout self, SV *text_)
1046 CODE: 1389 CODE:
1047{ 1390{
1048 STRLEN textlen; 1391 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1392 char *text = SvPVutf8 (text_, textlen);
1050 1393
1051 pango_layout_set_text (self->pl, text, textlen); 1394 pango_layout_set_text (self->pl, text, textlen);
1052} 1395}
1053 1396
1054void 1397void
1055set_markup (CFPlus::Layout self, SV *text_) 1398set_markup (DC::Layout self, SV *text_)
1056 CODE: 1399 CODE:
1057{ 1400{
1058 STRLEN textlen; 1401 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1402 char *text = SvPVutf8 (text_, textlen);
1060 1403
1061 pango_layout_set_markup (self->pl, text, textlen); 1404 pango_layout_set_markup (self->pl, text, textlen);
1062} 1405}
1063 1406
1064void 1407void
1065set_shapes (CFPlus::Layout self, ...) 1408set_shapes (DC::Layout self, ...)
1066 CODE: 1409 CODE:
1067{ 1410{
1068 PangoAttrList *attrs = 0; 1411 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1413 const char *pos = text;
1105 if (attrs) 1448 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1449 pango_layout_set_attributes (self->pl, attrs);
1107} 1450}
1108 1451
1109void 1452void
1110get_shapes (CFPlus::Layout self) 1453get_shapes (DC::Layout self)
1111 PPCODE: 1454 PPCODE:
1112{ 1455{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1456 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1457
1115 do 1458 do
1116 { 1459 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1460 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1461
1119 if (run && shape_attr_p (run)) 1462 if (run && shape_attr_p (run))
1120 { 1463 {
1121 PangoRectangle extents; 1464 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1465 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1473
1131 pango_layout_iter_free (iter); 1474 pango_layout_iter_free (iter);
1132} 1475}
1133 1476
1134int 1477int
1135has_wrapped (CFPlus::Layout self) 1478has_wrapped (DC::Layout self)
1136 CODE: 1479 CODE:
1137{ 1480{
1138 int lines = 1; 1481 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1482 const char *text = pango_layout_get_text (self->pl);
1140 1483
1145} 1488}
1146 OUTPUT: 1489 OUTPUT:
1147 RETVAL 1490 RETVAL
1148 1491
1149SV * 1492SV *
1150get_text (CFPlus::Layout self) 1493get_text (DC::Layout self)
1151 CODE: 1494 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1495 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1496 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1497 OUTPUT:
1155 RETVAL 1498 RETVAL
1156 1499
1157void 1500void
1158set_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.)
1159 CODE: 1502 CODE:
1160 self->r = r; 1503 self->r = r;
1161 self->g = g; 1504 self->g = g;
1162 self->b = b; 1505 self->b = b;
1163 self->a = a; 1506 self->a = a;
1164 1507
1165void 1508void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1509set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1510 CODE:
1168 if (self->font != font) 1511 if (self->font != font)
1169 { 1512 {
1170 self->font = font; 1513 self->font = font;
1171 layout_update_font (self); 1514 layout_update_font (self);
1172 } 1515 }
1173 1516
1174void 1517void
1175set_height (CFPlus::Layout self, int base_height) 1518set_height (DC::Layout self, int base_height)
1176 CODE: 1519 CODE:
1177 if (self->base_height != base_height) 1520 if (self->base_height != base_height)
1178 { 1521 {
1179 self->base_height = base_height; 1522 self->base_height = base_height;
1180 layout_update_font (self); 1523 layout_update_font (self);
1181 } 1524 }
1182 1525
1183void 1526void
1184set_width (CFPlus::Layout self, int max_width = -1) 1527set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1528 CODE:
1186 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);
1187 1530
1188void 1531void
1189set_indent (CFPlus::Layout self, int indent) 1532set_indent (DC::Layout self, int indent)
1190 CODE: 1533 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1534 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1535
1193void 1536void
1194set_spacing (CFPlus::Layout self, int spacing) 1537set_spacing (DC::Layout self, int spacing)
1195 CODE: 1538 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1539 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1540
1198void 1541void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1542set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1543 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1544 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1545 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1546 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1547 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1548 : PANGO_ELLIPSIZE_NONE
1206 ); 1549 );
1207 1550
1208void 1551void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1552set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1553 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1554 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1555
1213void 1556void
1214size (CFPlus::Layout self) 1557size (DC::Layout self)
1215 PPCODE: 1558 PPCODE:
1216{ 1559{
1217 int w, h; 1560 int w, h;
1218 1561
1219 layout_get_pixel_size (self, &w, &h); 1562 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1565 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1566 PUSHs (sv_2mortal (newSViv (h)));
1224} 1567}
1225 1568
1226int 1569int
1227descent (CFPlus::Layout self) 1570descent (DC::Layout self)
1228 CODE: 1571 CODE:
1229{ 1572{
1230 PangoRectangle rect; 1573 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1574 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1575 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1576 RETVAL = PANGO_DESCENT (rect);
1234} 1577}
1235 OUTPUT: 1578 OUTPUT:
1236 RETVAL 1579 RETVAL
1237 1580
1238int 1581int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1582xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1583 CODE:
1241{ 1584{
1242 int index, trailing; 1585 int index, trailing;
1243 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);
1244 RETVAL = index + trailing; 1587 RETVAL = index + trailing;
1245} 1588}
1246 OUTPUT: 1589 OUTPUT:
1247 RETVAL 1590 RETVAL
1248 1591
1249void 1592void
1250cursor_pos (CFPlus::Layout self, int index) 1593cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1594 PPCODE:
1252{ 1595{
1253 PangoRectangle strong_pos; 1596 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1597 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1598
1256 EXTEND (SP, 3); 1599 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1600 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1601 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1602 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1603}
1261 1604
1262void 1605void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1606index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1607 PPCODE:
1265{ 1608{
1266 int line, x; 1609 int line, x;
1267 1610
1268 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)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1613 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1614 --line;
1615#endif
1271 EXTEND (SP, 2); 1616 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1617 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1618 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1619}
1275 1620
1276void 1621void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1622line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1623 PPCODE:
1279{ 1624{
1280 PangoLayoutLine *lp; 1625 PangoLayoutLine *lp;
1281 int index, trailing; 1626 int index, trailing;
1282 1627
1283 if (line < 0) 1628 if (line < 0)
1284 XSRETURN_EMPTY; 1629 XSRETURN_EMPTY;
1285 1630
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1631 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1632 XSRETURN_EMPTY; /* do better */
1288 1633
1289 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);
1290 1635
1291 EXTEND (SP, 2); 1636 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1642 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1643 }
1299} 1644}
1300 1645
1301void 1646void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1647render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1648 CODE:
1649 self->rc.clear ();
1304 pango_opengl_render_layout_subpixel ( 1650 pango_opengl_render_layout_subpixel (
1305 self->pl, 1651 self->pl,
1652 &self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1653 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1654 self->r, self->g, self->b, self->a,
1308 flags 1655 flags
1309 ); 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);
1310 1660
1311MODULE = 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
1312 1681
1313PROTOTYPES: ENABLE 1682PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1683
1317void 1684void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1685pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1686 CODE:
1320{ 1687{
1347 HV *hv = (HV *)SvRV (self); 1714 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1715 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1716 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1717 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1718
1719 if (name <= 0)
1720 XSRETURN_EMPTY;
1721
1352 if (items < 5) 1722 if (items < 5)
1353 { 1723 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1724 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1725 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1726 }
1383 glDisable (GL_ALPHA_TEST); 1753 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1754 glDisable (GL_BLEND);
1385 } 1755 }
1386} 1756}
1387 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
1388IV 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)
1389 CODE: 1880 CODE:
1390{ 1881{
1391 GLint width; 1882 GLint width;
1392 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);
1394 RETVAL = width > 0; 1885 RETVAL = width > 0;
1395} 1886}
1396 OUTPUT: 1887 OUTPUT:
1397 RETVAL 1888 RETVAL
1398 1889
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1890MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1891
1401PROTOTYPES: DISABLE 1892PROTOTYPES: DISABLE
1402 1893
1403CFPlus::Map 1894DC::Map
1404new (SV *class) 1895new (SV *klass)
1405 CODE: 1896 CODE:
1406 New (0, RETVAL, 1, struct map); 1897 New (0, RETVAL, 1, mapgrid);
1407 RETVAL->x = 0; 1898 RETVAL->x = 0;
1408 RETVAL->y = 0; 1899 RETVAL->y = 0;
1409 RETVAL->w = 0; 1900 RETVAL->w = 0;
1410 RETVAL->h = 0; 1901 RETVAL->h = 0;
1411 RETVAL->ox = 0; 1902 RETVAL->ox = 0;
1416 RETVAL->row = 0; 1907 RETVAL->row = 0;
1417 OUTPUT: 1908 OUTPUT:
1418 RETVAL 1909 RETVAL
1419 1910
1420void 1911void
1421DESTROY (CFPlus::Map self) 1912DESTROY (DC::Map self)
1422 CODE: 1913 CODE:
1423{ 1914{
1424 map_clear (self); 1915 map_clear (self);
1425 Safefree (self->face2tile); 1916 Safefree (self->face2tile);
1426 Safefree (self->tex); 1917 Safefree (self->tex);
1427 Safefree (self); 1918 Safefree (self);
1428} 1919}
1429 1920
1430void 1921void
1431resize (CFPlus::Map self, int map_width, int map_height) 1922resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1923 CODE:
1433 self->w = map_width; 1924 self->w = map_width;
1434 self->h = map_height; 1925 self->h = map_height;
1435 1926
1436void 1927void
1437clear (CFPlus::Map self) 1928clear (DC::Map self)
1438 CODE: 1929 CODE:
1439 map_clear (self); 1930 map_clear (self);
1440 1931
1441void 1932void
1442set_tileid (CFPlus::Map self, int face, int tile) 1933set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1934 CODE:
1444{ 1935{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1936 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1937 need_texid (self, tile);
1447} 1938}
1448 1939
1449void 1940void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1941set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1942 CODE:
1452{ 1943{
1453 tileid texid; 1944 tileid texid;
1454 maptex *tex; 1945 maptex *tex;
1455 1946
1456 if (face < 0 || face >= self->faces) 1947 if (face < 0 || face >= self->faces)
1457 return; 1948 return;
1458 1949
1459 if (smooth < 0 || smooth >= self->faces) 1950 if (smooth < 0 || smooth >= self->faces)
1460 return; 1951 return;
1461 1952
1462 texid = self->face2tile [face]; 1953 texid = self->face2tile [face];
1463 1954
1464 if (!texid) 1955 if (!texid)
1465 return; 1956 return;
1466 1957
1467 tex = self->tex + texid; 1958 tex = self->tex + texid;
1468 tex->smoothtile = self->face2tile [smooth]; 1959 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1960 tex->smoothlevel = level;
1470} 1961}
1471 1962
1472void 1963void
1473set_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)
1474 CODE: 1965 CODE:
1475{ 1966{
1476 need_texid (self, texid); 1967 need_texid (self, texid);
1477 1968
1478 { 1969 {
1497 // use uglier nearest interpolation because linear suffers 1988 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1989 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1990 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1991}
1501 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
1502int 2013int
1503ox (CFPlus::Map self) 2014ox (DC::Map self)
1504 ALIAS: 2015 ALIAS:
1505 oy = 1 2016 oy = 1
1506 x = 2 2017 x = 2
1507 y = 3 2018 y = 3
1508 w = 4 2019 w = 4
1519 } 2030 }
1520 OUTPUT: 2031 OUTPUT:
1521 RETVAL 2032 RETVAL
1522 2033
1523void 2034void
1524scroll (CFPlus::Map self, int dx, int dy) 2035scroll (DC::Map self, int dx, int dy)
1525 CODE: 2036 CODE:
1526{ 2037{
1527 if (dx > 0) 2038 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 2039 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 2040 else if (dx < 0)
1537 self->ox += dx; self->x += dx; 2048 self->ox += dx; self->x += dx;
1538 self->oy += dy; self->y += dy; 2049 self->oy += dy; self->y += dy;
1539 2050
1540 while (self->y < 0) 2051 while (self->y < 0)
1541 { 2052 {
1542 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2053 prepend (self->row, self->rows, MAP_EXTEND_Y);
1543 2054
1544 self->rows += MAP_EXTEND_Y; 2055 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 2056 self->y += MAP_EXTEND_Y;
1546 } 2057 }
1547} 2058}
1548 2059
1549void 2060SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 2061map1a_update (DC::Map self, SV *data_)
1551 CODE: 2062 CODE:
1552{ 2063{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2064 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 2065 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 2066 mapcell *cell;
1556 int x, y, flags; 2067 int x, y, z, flags;
2068 AV *missing = newAV ();
2069 RETVAL = newRV_noinc ((SV *)missing);
1557 2070
1558 while (data < data_end - 1) 2071 while (data < data_end - 1)
1559 { 2072 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 2073 flags = (data [0] << 8) + data [1]; data += 2;
1561 2074
1574 2087
1575 //TODO: don't trust server data to be in-range(!) 2088 //TODO: don't trust server data to be in-range(!)
1576 2089
1577 if (flags & 8) 2090 if (flags & 8)
1578 { 2091 {
2092 uint8_t ext, cmd;
2093
1579 if (extmap) 2094 do
1580 { 2095 {
1581 uint8_t ext, cmd; 2096 ext = *data++;
2097 cmd = ext & 0x7f;
1582 2098
1583 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
1584 { 2102 {
1585 ext = *data++;
1586 cmd = ext & 0x3f;
1587
1588 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health
1591 {
1592 cell->stat_width = 1; 2103 cell->stat_width = 1;
1593 cell->stat_hp = *data++; 2104 cell->stat_hp = *data++;
1594 }
1595 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47)
1598 {
1599 if (*data == 4)
1600 ; // decode player count
1601
1602 data += *data + 1;
1603 }
1604 else if (cmd == 8) // cell flags
1605 cell->flags = *data++;
1606 else if (ext & 0x40) // unknown, multibyte => skip
1607 data += *data + 1;
1608 else
1609 data++;
1610 } 2105 }
1611 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++;
1612 } 2123 }
1613 else 2124 while (ext & 0x80);
1614 cell->darkness = *data++ + 1;
1615 } 2125 }
1616 2126
2127 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 2128 if (flags & (4 >> z))
1618 { 2129 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 2130 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 2131 need_facenum (self, face);
1621 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 }
1622 } 2149 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 2150 }
1638 else 2151 else
1639 cell->darkness = 0; 2152 CELL_CLEAR (cell);
1640 } 2153 }
1641} 2154}
2155 OUTPUT:
2156 RETVAL
1642 2157
1643SV * 2158SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2159mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 2160 CODE:
1646{ 2161{
1647 int x1, x; 2162 int x1, x;
1648 int y1, y; 2163 int y1, y;
1649 int z; 2164 int z;
1662 ? self->row + y 2177 ? self->row + y
1663 : 0; 2178 : 0;
1664 2179
1665 for (x = x0; x < x1; x++) 2180 for (x = x0; x < x1; x++)
1666 { 2181 {
1667 int r = 32, g = 32, b = 32, a = 192; 2182 unsigned int r = 32, g = 32, b = 32, a = 192;
1668 2183
1669 if (row && row->c0 <= x && x < row->c1) 2184 if (row && row->c0 <= x && x < row->c1)
1670 { 2185 {
1671 mapcell *cell = row->col + (x - row->c0); 2186 mapcell *cell = row->col + (x - row->c0);
1672 2187
1674 { 2189 {
1675 maptex tex = self->tex [cell->tile [z]]; 2190 maptex tex = self->tex [cell->tile [z]];
1676 int a0 = 255 - tex.a; 2191 int a0 = 255 - tex.a;
1677 int a1 = tex.a; 2192 int a1 = tex.a;
1678 2193
1679 r = (r * a0 + tex.r * a1) / 255; 2194 r = div255 (r * a0 + tex.r * a1);
1680 g = (g * a0 + tex.g * a1) / 255; 2195 g = div255 (g * a0 + tex.g * a1);
1681 b = (b * a0 + tex.b * a1) / 255; 2196 b = div255 (b * a0 + tex.b * a1);
1682 a = (a * a0 + tex.a * a1) / 255; 2197 a = div255 (a * a0 + tex.a * a1);
1683 } 2198 }
1684 } 2199 }
1685 2200
1686 *map++ = (r ) 2201 *map++ = (r )
1687 | (g << 8) 2202 | (g << 8)
1688 | (b << 16) 2203 | (b << 16)
1689 | (a << 24); 2204 | (a << 24);
1690 } 2205 }
1691 } 2206 }
1692 2207
1693 RETVAL = map_sv; 2208 RETVAL = map_sv;
1694} 2209}
1695 OUTPUT: 2210 OUTPUT:
1696 RETVAL 2211 RETVAL
1697 2212
1698void 2213void
1699draw (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)
1700 CODE: 2215 CODE:
1701{ 2216{
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1705 smooth_key skey;
1706 int x, y, z; 2217 int x, y, z;
1707 int last_name;
1708 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
1709 // thats current max. sorry. 2229 // that's current max. sorry.
1710 if (sw > 255) sw = 255; 2230 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2231 if (sh > 255) sh = 255;
1712 2232
1713 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2233 memset (&key, 0, sizeof (key));
1715 2234 key.r = 255;
1716 glColor4ub (255, 255, 255, 255); 2235 key.g = 255;
1717 2236 key.b = 255;
1718 glEnable (GL_BLEND); 2237 key.a = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2238 key.mode = GL_QUADS;
1720 glEnable (GL_TEXTURE_2D); 2239 key.format = GL_T2F_V3F;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1722
1723 glBegin (GL_QUADS);
1724
1725 last_name = 0;
1726 2240
1727 mx += self->x; 2241 mx += self->x;
1728 my += self->y; 2242 my += self->y;
1729 2243
1730 // first pass: determine smooth_max 2244 // first pass: determine smooth_max
1731 // rather ugly, if you ask me 2245 // rather ugly, if you ask me
1732 // could also be stored inside mapcell and updated on change 2246 // could also be stored inside mapcell and updated on change
1733 memset (smooth_max, 0, sizeof (smooth_max)); 2247 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1734 2248
1735 for (y = 0; y < sh; y++) 2249 for (y = 0; y < sh; y++)
1736 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
1737 { 2251 {
1738 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2261 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2262 self->tex [cell->tile [2]].smoothlevel));
1749 } 2263 }
1750 } 2264 }
1751 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
1752 for (z = 0; z <= 2; z++) 2270 for (z = 0; z <= 2; z++)
1753 { 2271 {
1754 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;
1755 2276
1756 for (y = 0; y < sh; y++) 2277 for (y = 0; y < sh; y++)
1757 if (0 <= y + my && y + my < self->rows) 2278 if (0 <= y + my && y + my < self->rows)
1758 { 2279 {
1759 maprow *row = self->row + (y + my); 2280 maprow *row = self->row + (y + my);
1765 tileid tile = cell->tile [z]; 2286 tileid tile = cell->tile [z];
1766 2287
1767 if (tile) 2288 if (tile)
1768 { 2289 {
1769 maptex tex = self->tex [tile]; 2290 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2291 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 2292
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2293 if (key.texname != tex.name)
1776 { 2294 {
2295 self->tex [tile].unused = 0;
2296
1777 if (!tex.name) 2297 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2298 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1779 2299
2300 key.texname = tex.name;
1780 glEnd (); 2301 arr = &rc.array (key);
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1782 glBegin (GL_QUADS);
1783 } 2302 }
1784 2303
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2304 px = (x + 1) * Th - tex.w;
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2305 py = (y + 1) * Tw - tex.h;
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789 2306
1790 if (cell->flags && z == 2) 2307 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
1791 { 2308 {
1792 if (cell->flags & 1) 2309 pl_x = px;
2310 pl_y = py;
2311 pl_tex = tex;
1793 { 2312 continue;
1794 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32;
1797
1798 glEnd ();
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1800 glBegin (GL_QUADS);
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 }
1807 } 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);
1808 2319
1809 // update smooth hash 2320 // update smooth hash
1810 if (tex.smoothtile) 2321 if (tex.smoothtile)
1811 { 2322 {
1812 skey.tile = tex.smoothtile; 2323 skey.tile = tex.smoothtile;
1813 skey.level = tex.smoothlevel; 2324 skey.level = tex.smoothlevel;
1814 2325
1815 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2326 smooth_level[tex.smoothlevel] = 1;
1816 2327
1817 // 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
1818 // shifted +1|+1 so we always stay positive. 2329 // shifted +1|+1 so we always stay positive.
1819 2330
1820 // bits is ___n cccc CCCC bbbb 2331 // bits is ___n cccc CCCC bbbb
1828 2339
1829 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2340 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1830 // ·· ·· ·┏ ┓· 2341 // ·· ·· ·┏ ┓·
1831 2342
1832 // full tile 2343 // full tile
1833 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);
1834 2345
1835 // borders 2346 // borders
1836 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);
1837 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);
1838 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);
1839 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);
1840 2351
1841 // corners 2352 // corners
1842 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);
1843 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);
1844 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);
1845 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);
1846 } 2377 }
1847 } 2378 }
1848 } 2379 }
1849 } 2380 }
1850 2381
2382 rc.draw ();
2383 rc.clear ();
2384
1851 // go through all smoothlevels, lowest to highest, then draw. 2385 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2386 // this is basically counting sort
1853 { 2387 {
1854 int w, b; 2388 int w, b;
1855 2389
1856 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)
1857 { 2395 {
1858 uint32_t smask = smooth_level [w]; 2396 smooth_key &skey = it->first;
1859 if (smask) 2397 IV bits = it->second;
1860 for (b = 0; b < 32; ++b) 2398
1861 if (smask & (((uint32_t)1) << b)) 2399 if (!(bits & 0x1000)
2400 && skey.level == level
2401 && level > smooth_max [skey.x][skey.y])
1862 { 2402 {
1863 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
1864 HE *he; 2411 if (tex.name)
1865
1866 hv_iterinit (smooth);
1867 while ((he = hv_iternext (smooth)))
1868 { 2412 {
1869 smooth_key *skey = (smooth_key *)HeKEY (he); 2413 // this time avoiding texture state changes
1870 IV bits = SvIVX (HeVAL (he)); 2414 // save gobs of state changes.
1871 2415 if (key.texname != tex.name)
1872 if (!(bits & 0x1000)
1873 && skey->level == level
1874 && level > smooth_max [skey->x][skey->y])
1875 { 2416 {
1876 maptex tex = self->tex [skey->tile]; 2417 self->tex [skey.tile].unused = 0;
1877 int px = (((int)skey->x) - 1) * T;
1878 int py = (((int)skey->y) - 1) * T;
1879 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column
1883 2418
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name)
1887 {
1888 if (!tex.name)
1889 continue; // smoothing not yet available
1890
1891 glEnd (); 2419 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2420 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2421 glBegin (GL_QUADS);
1894 } 2422 }
1895 2423
1896 if (border) 2424 if (border)
1897 { 2425 {
1898 float ox = border * dx; 2426 float ox = border * dx;
1899 2427
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2428 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2429 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2431 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
1904 } 2432 }
1905 2433
1906 if (corner) 2434 if (corner)
1907 { 2435 {
1908 float ox = corner * dx; 2436 float ox = corner * dx;
1909 2437
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2438 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2439 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2440 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1914 }
1915 } 2442 }
1916 } 2443 }
1917 } 2444 }
1918 } 2445 }
2446
2447 glEnd ();
2448 glDisable (GL_TEXTURE_2D);
2449 key.texname = -1;
1919 } 2450 }
1920
1921 hv_clear (smooth);
1922 } 2451 }
1923 2452
1924 glEnd (); 2453 if (pl_tex.name)
2454 {
2455 maptex tex = pl_tex;
2456 int px = pl_x + sdx;
2457 int py = pl_y + sdy;
1925 2458
1926 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
1927 glDisable (GL_BLEND); 2473 glDisable (GL_BLEND);
1928 2474
1929 // top layer: overlays such as the health bar 2475 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2476 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2477 if (0 <= y + my && y + my < self->rows)
1935 for (x = 0; x < sw; x++) 2481 for (x = 0; x < sw; x++)
1936 if (row->c0 <= x + mx && x + mx < row->c1) 2482 if (row->c0 <= x + mx && x + mx < row->c1)
1937 { 2483 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2484 mapcell *cell = row->col + (x + mx - row->c0);
1939 2485
1940 int px = x * T; 2486 int px = x * Tw;
1941 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 }
1942 2494
1943 if (cell->stat_hp) 2495 if (cell->stat_hp)
1944 { 2496 {
1945 int width = cell->stat_width * T; 2497 int width = cell->stat_width * Tw;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2498 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
1947 2499
1948 glColor3ub (0, 0, 0); 2500 glColor3ub (0, 0, 0);
1949 glRectf (px + 1, py - thick - 2, 2501 glRectf (px + 1, py - thick - 2,
1950 px + width - 1, py); 2502 px + width - 1, py);
1951 2503
1957 } 2509 }
1958 } 2510 }
1959} 2511}
1960 2512
1961void 2513void
1962draw_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)
1963 CODE: 2515 CODE:
1964{ 2516{
1965 static float color[16][3] = { 2517 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2518 { 0.00f, 0.00f, 0.00f },
1967 { 1.00F, 1.00F, 1.00F }, 2519 { 1.00f, 1.00f, 1.00f },
1968 { 0.00F, 0.00F, 0.55F }, 2520 { 0.00f, 0.00f, 0.55f },
1969 { 1.00F, 0.00F, 0.00F }, 2521 { 1.00f, 0.00f, 0.00f },
1970 2522
1971 { 1.00F, 0.54F, 0.00F }, 2523 { 1.00f, 0.54f, 0.00f },
1972 { 0.11F, 0.56F, 1.00F }, 2524 { 0.11f, 0.56f, 1.00f },
1973 { 0.93F, 0.46F, 0.00F }, 2525 { 0.93f, 0.46f, 0.00f },
1974 { 0.18F, 0.54F, 0.34F }, 2526 { 0.18f, 0.54f, 0.34f },
1975 2527
1976 { 0.56F, 0.73F, 0.56F }, 2528 { 0.56f, 0.73f, 0.56f },
1977 { 0.80F, 0.80F, 0.80F }, 2529 { 0.80f, 0.80f, 0.80f },
1978 { 0.55F, 0.41F, 0.13F }, 2530 { 0.55f, 0.41f, 0.13f },
1979 { 0.99F, 0.77F, 0.26F }, 2531 { 0.99f, 0.77f, 0.26f },
1980 2532
1981 { 0.74F, 0.65F, 0.41F }, 2533 { 0.74f, 0.65f, 0.41f },
1982 2534
1983 { 0.00F, 1.00F, 1.00F }, 2535 { 0.00f, 1.00f, 1.00f },
1984 { 1.00F, 0.00F, 1.00F }, 2536 { 1.00f, 0.00f, 1.00f },
1985 { 1.00F, 1.00F, 0.00F }, 2537 { 1.00f, 1.00f, 0.00f },
1986 }; 2538 };
1987 2539
1988 int x, y; 2540 int x, y;
1989 2541
1990 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 */
1991 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2549 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1992 glEnable (GL_BLEND); 2550 glEnable (GL_BLEND);
1993 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2551 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1994 glBegin (GL_QUADS); 2552 glBegin (GL_QUADS);
1995 2553
1996 for (y = 0; y < h; y++) 2554 for (y = 0; y < h; y++)
2000 2558
2001 if (m) 2559 if (m)
2002 { 2560 {
2003 float *c = color [m & 15]; 2561 float *c = color [m & 15];
2004 2562
2005 float tx1 = m & 0x40 ? 0.5 : 0.; 2563 float tx1 = m & 0x40 ? 0.5f : 0.f;
2006 float tx2 = tx1 + 0.5; 2564 float tx2 = tx1 + 0.5f;
2007 2565
2008 glColor4f (c[0], c[1], c[2], 0.75); 2566 glColor4f (c[0], c[1], c[2], 1);
2009 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2567 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2010 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2568 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2011 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2569 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2012 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2570 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2013 } 2571 }
2017 glDisable (GL_BLEND); 2575 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2576 glDisable (GL_TEXTURE_2D);
2019} 2577}
2020 2578
2021void 2579void
2022fow_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)
2023 PPCODE: 2581 PPCODE:
2024{ 2582{
2025 int x, y; 2583 int x, y;
2026 int sw1 = sw + 2; 2584 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2585 int sh1 = sh + 2;
2028 int sh3 = sh * 3; 2586 int sh3 = sh * 3;
2029 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);
2030 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2590 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2031 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2591 memset (darkness1, 0, sw1*sh1);
2032 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2033 2592
2034 SvPOK_only (darkness3_sv); 2593 SvPOK_only (darkness3_sv);
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2594 SvCUR_set (darkness3_sv, sw3 * sh3);
2036 2595
2037 mx += self->x - 1; 2596 mx += self->x - 1;
2038 my += self->y - 1; 2597 my += self->y - 1;
2039
2040 memset (darkness1, 255, sw1 * sh1);
2041 2598
2042 for (y = 0; y < sh1; y++) 2599 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2600 if (0 <= y + my && y + my < self->rows)
2044 { 2601 {
2045 maprow *row = self->row + (y + my); 2602 maprow *row = self->row + (y + my);
2048 if (row->c0 <= x + mx && x + mx < row->c1) 2605 if (row->c0 <= x + mx && x + mx < row->c1)
2049 { 2606 {
2050 mapcell *cell = row->col + (x + mx - row->c0); 2607 mapcell *cell = row->col + (x + mx - row->c0);
2051 2608
2052 darkness1 [y * sw1 + x] = cell->darkness 2609 darkness1 [y * sw1 + x] = cell->darkness
2053 ? 255 - (cell->darkness - 1) 2610 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2054 : 255 - FOW_DARKNESS; 2611 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2055 } 2612 }
2056 } 2613 }
2057 2614
2058 for (y = 0; y < sh; ++y) 2615 for (y = 0; y < sh; ++y)
2059 for (x = 0; x < sw; ++x) 2616 for (x = 0; x < sw; ++x)
2078 2635
2079 uint8_t r13 = (d13 + d23 + d12) / 3; 2636 uint8_t r13 = (d13 + d23 + d12) / 3;
2080 uint8_t r23 = d23; 2637 uint8_t r23 = d23;
2081 uint8_t r33 = (d23 + d33 + d32) / 3; 2638 uint8_t r33 = (d23 + d33 + d32) / 3;
2082 2639
2083 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2084 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2085 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2086 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2087 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 */
2088 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2089 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2090 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2091 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2092 } 2649 }
2093 2650
2094 free (darkness1); 2651 free (darkness1);
2095 2652
2096 EXTEND (SP, 3); 2653 EXTEND (SP, 3);
2097 PUSHs (sv_2mortal (newSViv (sw34))); 2654 PUSHs (sv_2mortal (newSViv (sw3)));
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2655 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2656 PUSHs (darkness3_sv);
2100} 2657}
2101 2658
2102SV * 2659SV *
2103get_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)
2104 CODE: 2661 CODE:
2105{ 2662{
2106 int x, y, x1, y1; 2663 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2664 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2665 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2722 else
2166 *data++ = 0; 2723 *data++ = 0;
2167 } 2724 }
2168 } 2725 }
2169 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 {
2170 SvPOK_only (data_sv); 2730 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2731 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2732 }
2733
2172 RETVAL = data_sv; 2734 RETVAL = data_sv;
2173} 2735}
2174 OUTPUT: 2736 OUTPUT:
2175 RETVAL 2737 RETVAL
2176 2738
2177void 2739void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2740set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2741 PPCODE:
2180{ 2742{
2181 int x, y, z; 2743 int x, y, z;
2182 int w, h; 2744 int w, h;
2183 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;
2184 2756
2185 if (*data++ != 0) 2757 if (*data++ != 0)
2186 return; /* version mismatch */ 2758 XSRETURN_EMPTY; /* version mismatch */
2187 2759
2188 w = *data++ << 8; w |= *data++; 2760 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2761 h = *data++ << 8; h |= *data++;
2190 2762
2191 // 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
2203 { 2775 {
2204 maprow *row = map_get_row (self, y); 2776 maprow *row = map_get_row (self, y);
2205 2777
2206 for (x = x0; x < x1; x++) 2778 for (x = x0; x < x1; x++)
2207 { 2779 {
2780 uint8_t flags;
2781
2782 if (data + 7 >= end)
2783 XSRETURN_EMPTY;
2784
2208 uint8_t flags = *data++; 2785 flags = *data++;
2209 2786
2210 if (flags) 2787 if (flags)
2211 { 2788 {
2212 mapcell *cell = row_get_cell (row, x); 2789 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2790 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2793 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2794 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2795
2219 if (cell->darkness == 0) 2796 if (cell->darkness == 0)
2220 { 2797 {
2221 cell->darkness = 0; 2798 /*cell->darkness = 0;*/
2799 EXTEND (SP, 3);
2222 2800
2223 for (z = 0; z <= 2; z++) 2801 for (z = 0; z <= 2; z++)
2224 { 2802 {
2225 tileid t = tile [z]; 2803 tileid t = tile [z];
2226 2804
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2805 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2806 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2807 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2808 need_texid (self, t);
2231 } 2809 }
2232 2810
2233 cell->tile [z] = t; 2811 cell->tile [z] = t;
2234 } 2812 }
2236 } 2814 }
2237 } 2815 }
2238 } 2816 }
2239} 2817}
2240 2818
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2819MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2820
2243CFPlus::RW 2821DC::RW
2244new (SV *class, SV *data_sv) 2822new (SV *klass, SV *data_sv)
2245 CODE: 2823 CODE:
2246{ 2824{
2247 STRLEN datalen; 2825 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2826 char *data = SvPVbyte (data_sv, datalen);
2249 2827
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2828 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2829}
2252 OUTPUT: 2830 OUTPUT:
2253 RETVAL 2831 RETVAL
2254 2832
2255CFPlus::RW 2833DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2834new_from_file (SV *klass, const char *path, const char *mode = "rb")
2257 CODE: 2835 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2836 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2837 OUTPUT:
2260 RETVAL 2838 RETVAL
2261 2839
2840# fails on win32:
2841# dc.xs(2268) : error C2059: syntax error : '('
2262void 2842#void
2263close (CFPlus::RW self) 2843#close (DC::RW self)
2264 CODE: 2844# CODE:
2265 SDL_RWclose (self); 2845# (self->(close)) (self);
2266 2846
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2847MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2848
2269PROTOTYPES: DISABLE 2849PROTOTYPES: DISABLE
2270 2850
2851DC::Channel
2852find ()
2853 CODE:
2854{
2855 RETVAL = Mix_GroupAvailable (-1);
2856
2857 if (RETVAL < 0)
2858 {
2859 RETVAL = Mix_GroupOldest (-1);
2860
2861 if (RETVAL < 0)
2862 {
2863 // happens sometimes, maybe it just stopped playing(?)
2864 RETVAL = Mix_GroupAvailable (-1);
2865
2866 if (RETVAL < 0)
2867 XSRETURN_UNDEF;
2868 }
2869 else
2870 Mix_HaltChannel (RETVAL);
2871 }
2872
2873 Mix_UnregisterAllEffects (RETVAL);
2874 Mix_Volume (RETVAL, 128);
2875}
2876 OUTPUT:
2877 RETVAL
2878
2879void
2880halt (DC::Channel self)
2881 CODE:
2882 Mix_HaltChannel (self);
2883
2884void
2885expire (DC::Channel self, int ticks = -1)
2886 CODE:
2887 Mix_ExpireChannel (self, ticks);
2888
2889void
2890fade_out (DC::Channel self, int ticks = -1)
2891 CODE:
2892 Mix_FadeOutChannel (self, ticks);
2893
2271int 2894int
2272volume (CFPlus::Channel self, int volume) 2895volume (DC::Channel self, int volume)
2273 CODE: 2896 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2897 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275 OUTPUT: 2898 OUTPUT:
2276 RETVAL 2899 RETVAL
2277 2900
2278int 2901void
2279unregister_all_effects (CFPlus::Channel self) 2902unregister_all_effects (DC::Channel self)
2280 CODE: 2903 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2904 Mix_UnregisterAllEffects (self);
2282 OUTPUT:
2283 RETVAL
2284 2905
2285int 2906void
2286set_panning (CFPlus::Channel self, int left, int right) 2907set_panning (DC::Channel self, int left, int right)
2287 CODE: 2908 CODE:
2909 left = CLAMP (left , 0, 255);
2910 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2911 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2912
2292int 2913void
2293set_distance (CFPlus::Channel self, int distance) 2914set_distance (DC::Channel self, int distance)
2294 CODE: 2915 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2916 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2917
2299int 2918void
2300set_position (CFPlus::Channel self, int angle, int distance) 2919set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2920 CODE:
2921
2922void
2923set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2924 CODE:
2925{
2926 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2927 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2928 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2929}
2304 RETVAL
2305 2930
2306int 2931void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2932set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2933 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2934 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2935
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2936MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2937
2315PROTOTYPES: DISABLE 2938PROTOTYPES: DISABLE
2316 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
2317CFPlus::MixChunk 2952DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2953new (SV *klass, DC::RW rwops)
2319 CODE: 2954 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2955 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2956 OUTPUT:
2322 RETVAL 2957 RETVAL
2323 2958
2324void 2959void
2325DESTROY (CFPlus::MixChunk self) 2960DESTROY (DC::MixChunk self)
2326 CODE: 2961 CODE:
2327 Mix_FreeChunk (self); 2962 Mix_FreeChunk (self);
2328 2963
2329int 2964int
2330volume (CFPlus::MixChunk self, int volume = -1) 2965volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2966 CODE:
2967 if (items > 1)
2968 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2969 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2970 OUTPUT:
2334 RETVAL 2971 RETVAL
2335 2972
2336CFPlus::Channel 2973DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2974play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2975 CODE:
2976{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2977 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2978
2979 if (RETVAL < 0)
2980 XSRETURN_UNDEF;
2981
2982 if (channel < 0)
2983 {
2340 Mix_UnregisterAllEffects (RETVAL); 2984 Mix_UnregisterAllEffects (RETVAL);
2985 Mix_Volume (RETVAL, 128);
2986 }
2987}
2341 OUTPUT: 2988 OUTPUT:
2342 RETVAL 2989 RETVAL
2343 2990
2344MODULE = 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
2345 3004
2346int 3005int
2347volume (int volume = -1) 3006volume (int volume = -1)
2348 PROTOTYPE: ;$ 3007 PROTOTYPE: ;$
2349 CODE: 3008 CODE:
3009 if (items > 0)
3010 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 3011 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 3012 OUTPUT:
2352 RETVAL 3013 RETVAL
2353 3014
3015void
3016fade_out (int ms)
3017 CODE:
3018 Mix_FadeOutMusic (ms);
3019
3020void
3021halt ()
3022 CODE:
3023 Mix_HaltMusic ();
3024
2354int 3025int
2355fade_out (int ms) 3026playing ()
2356 CODE: 3027 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 3028 RETVAL = Mix_PlayingMusic ();
2358 OUTPUT: 3029 OUTPUT:
2359 RETVAL 3030 RETVAL
2360 3031
2361void
2362halt ()
2363 CODE:
2364 Mix_HaltMusic ();
2365
2366CFPlus::MixMusic 3032DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 3033new (SV *klass, DC::RW rwops)
2368 CODE: 3034 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 3035 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 3036 OUTPUT:
2371 RETVAL 3037 RETVAL
2372 3038
2373void 3039void
2374DESTROY (CFPlus::MixMusic self) 3040DESTROY (DC::MixMusic self)
2375 CODE: 3041 CODE:
2376 Mix_FreeMusic (self); 3042 Mix_FreeMusic (self);
2377 3043
2378int 3044int
2379play (CFPlus::MixMusic self, int loops = -1) 3045play (DC::MixMusic self, int loops = -1)
2380 CODE: 3046 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 3047 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 3048 OUTPUT:
2383 RETVAL 3049 RETVAL
2384 3050
2385int 3051void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3052fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 3053 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 3054 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 3055
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3056MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 3057
2394PROTOTYPES: ENABLE 3058PROTOTYPES: ENABLE
2395 3059
2396BOOT: 3060BOOT:
2397{ 3061{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3062 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 3063 static const struct {
2400 const char *name; 3064 const char *name;
2401 IV iv; 3065 IV iv;
2402 } *civ, const_iv[] = { 3066 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 3067# define const_iv(name) { # name, (IV)name }
2404 const_iv (GL_VENDOR), 3068 const_iv (GL_VENDOR),
2405 const_iv (GL_VERSION), 3069 const_iv (GL_VERSION),
2406 const_iv (GL_EXTENSIONS), 3070 const_iv (GL_EXTENSIONS),
3071 const_iv (GL_MAX_TEXTURE_UNITS),
2407 const_iv (GL_COLOR_MATERIAL), 3072 const_iv (GL_COLOR_MATERIAL),
2408 const_iv (GL_SMOOTH), 3073 const_iv (GL_SMOOTH),
2409 const_iv (GL_FLAT), 3074 const_iv (GL_FLAT),
2410 const_iv (GL_DITHER), 3075 const_iv (GL_DITHER),
2411 const_iv (GL_BLEND), 3076 const_iv (GL_BLEND),
2423 const_iv (GL_ZERO), 3088 const_iv (GL_ZERO),
2424 const_iv (GL_SRC_ALPHA), 3089 const_iv (GL_SRC_ALPHA),
2425 const_iv (GL_DST_ALPHA), 3090 const_iv (GL_DST_ALPHA),
2426 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3091 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2427 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),
2428 const_iv (GL_SRC_ALPHA_SATURATE), 3097 const_iv (GL_SRC_ALPHA_SATURATE),
2429 const_iv (GL_RGB), 3098 const_iv (GL_RGB),
2430 const_iv (GL_RGBA), 3099 const_iv (GL_RGBA),
2431 const_iv (GL_RGBA4), 3100 const_iv (GL_RGBA4),
2432 const_iv (GL_RGBA8), 3101 const_iv (GL_RGBA8),
2438 const_iv (GL_INTENSITY), 3107 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 3108 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 3109 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 3110 const_iv (GL_FLOAT),
2442 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),
2443 const_iv (GL_COMPILE), 3118 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 3119 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 3120 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 3121 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 3122 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3161 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 3162 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 3163 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 3164 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 3165 const_iv (GL_GENERATE_MIPMAP_HINT),
3166 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 3167 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 3168 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 3169 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 3170 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 3171 const_iv (GL_V3F),
2496 const_iv (GL_T2F_V3F), 3172 const_iv (GL_T2F_V3F),
2497 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),
2498# undef const_iv 3177# undef const_iv
2499 }; 3178 };
2500 3179
2501 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--)
2502 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3181 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2503 3182
2504 texture_av = newAV (); 3183 texture_av = newAV ();
2505 AvREAL_off (texture_av); 3184 AvREAL_off (texture_av);
2506} 3185}
2507 3186
2508char * 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 *
2509gl_vendor () 3197gl_vendor ()
2510 CODE: 3198 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 3199 RETVAL = (const char *)glGetString (GL_VENDOR);
2512 OUTPUT: 3200 OUTPUT:
2513 RETVAL 3201 RETVAL
2514 3202
2515char * 3203const char *
2516gl_version () 3204gl_version ()
2517 CODE: 3205 CODE:
2518 RETVAL = (char *)glGetString (GL_VERSION); 3206 RETVAL = (const char *)glGetString (GL_VERSION);
2519 OUTPUT: 3207 OUTPUT:
2520 RETVAL 3208 RETVAL
2521 3209
2522char * 3210const char *
2523gl_extensions () 3211gl_extensions ()
2524 CODE: 3212 CODE:
2525 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3213 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2526 OUTPUT: 3214 OUTPUT:
2527 RETVAL 3215 RETVAL
2528 3216
2529const char *glGetString (GLenum pname) 3217const char *glGetString (GLenum pname)
3218 CODE:
3219 RETVAL = (const char *)glGetString (pname);
3220 OUTPUT:
3221 RETVAL
2530 3222
2531GLint glGetInteger (GLenum pname) 3223GLint glGetInteger (GLenum pname)
2532 CODE: 3224 CODE:
2533 glGetIntegerv (pname, &RETVAL); 3225 glGetIntegerv (pname, &RETVAL);
2534 OUTPUT: 3226 OUTPUT:
2542 3234
2543int glGetError () 3235int glGetError ()
2544 3236
2545void glFinish () 3237void glFinish ()
2546 3238
3239void glFlush ()
3240
2547void glClear (int mask) 3241void glClear (int mask)
2548 3242
2549void glClearColor (float r, float g, float b, float a = 1.0) 3243void glClearColor (float r, float g, float b, float a = 1.0)
2550 PROTOTYPE: @ 3244 PROTOTYPE: @
2551 3245
2560void glBlendFunc (int sfactor, int dfactor) 3254void glBlendFunc (int sfactor, int dfactor)
2561 3255
2562void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3256void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2563 CODE: 3257 CODE:
2564 gl_BlendFuncSeparate (sa, da, saa, daa); 3258 gl_BlendFuncSeparate (sa, da, saa, daa);
3259
3260# void glBlendEquation (int se)
2565 3261
2566void glDepthMask (int flag) 3262void glDepthMask (int flag)
2567 3263
2568void glLogicOp (int opcode) 3264void glLogicOp (int opcode)
2569 3265
2604void glRotate (float angle, float x, float y, float z) 3300void glRotate (float angle, float x, float y, float z)
2605 CODE: 3301 CODE:
2606 glRotatef (angle, x, y, z); 3302 glRotatef (angle, x, y, z);
2607 3303
2608void 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: @
2609 ALIAS: 3306 ALIAS:
2610 glColor_premultiply = 1 3307 glColor_premultiply = 1
2611 CODE: 3308 CODE:
2612 if (ix) 3309 if (ix)
2613 { 3310 {
2633 3330
2634void glRect (float x1, float y1, float x2, float y2) 3331void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 3332 CODE:
2636 glRectf (x1, y1, x2, y2); 3333 glRectf (x1, y1, x2, y2);
2637 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
2638PROTOTYPES: ENABLE 3344PROTOTYPES: ENABLE
2639 3345
2640void glBegin (int mode) 3346void glBegin (int mode)
2641 3347
2642void glEnd () 3348void glEnd ()
2674void 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)
2675 CODE: 3381 CODE:
2676 if (gl.SeparableFilter2D) 3382 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3383 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 3384
2679void 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)
2680 3386
2681void 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)
2682 3388
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 3389void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 3390
2710 3416
2711void glEndList () 3417void glEndList ()
2712 3418
2713void glCallList (int list) 3419void glCallList (int list)
2714 3420
2715MODULE = 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
2716 3427
2717PROTOTYPES: DISABLE 3428PROTOTYPES: DISABLE
2718 3429
2719void 3430void
2720find_widget (SV *self, NV x, NV y) 3431find_widget (SV *self, NV x, NV y)
2721 PPCODE: 3432 PPCODE:
2722{ 3433{
2723 if (within_widget (self, x, y)) 3434 if (within_widget (self, x, y))
2724 XPUSHs (self); 3435 XPUSHs (self);
2725} 3436}
2726 3437
2727BOOT: 3438BOOT:
2728{ 3439{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3440 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 3441
2731 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);
2732 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);
2733 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);
2734 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);
2735} 3446}
2736 3447
2737void 3448void
2738draw (SV *self) 3449draw (SV *self)
2739 CODE: 3450 CODE:
2740{ 3451{
2741 HV *hv; 3452 HV *hv;
2742 SV **svp; 3453 SV **svp;
2743 NV x, y, w, h; 3454 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 3455 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 3456 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 3457 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 3458 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 3459 double draw_x, draw_y;
2750 3460
2751 if (!SvROK (self)) 3461 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3462 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 3463
2754 hv = (HV *)SvRV (self); 3464 hv = (HV *)SvRV (self);
2755 3465
2756 if (SvTYPE (hv) != SVt_PVHV) 3466 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3467 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 3468
2759 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.;
2760 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.;
2761 3471
2762 if (!h || !w) 3472 if (!h || !w)
2782 { 3492 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3493 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3494
2785 if (svp && SvTRUE (*svp)) 3495 if (svp && SvTRUE (*svp))
2786 { 3496 {
2787 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);
2788 glEnable (GL_BLEND); 3498 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3499 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3500 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3501 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3502 glVertex2f (w, 0);
2795 glEnd (); 3505 glEnd ();
2796 glDisable (GL_BLEND); 3506 glDisable (GL_BLEND);
2797 } 3507 }
2798 } 3508 }
2799#if 0 3509#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3510 // draw borders, for debugging
2801 glPushMatrix; 3511 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3512 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3513 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3514 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3515 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3516 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3517 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3518 glVertex2f (0 , h - 1);
2809 glEnd; 3519 glEnd ();
2810 glPopMatrix; 3520 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3521#endif
2814 PUSHMARK (SP); 3522 PUSHMARK (SP);
2815 XPUSHs (self); 3523 XPUSHs (self);
2816 PUTBACK; 3524 PUTBACK;
2817 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