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.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines