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

Diff Legend

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