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

Diff Legend

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