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.225 by root, Sat Aug 11 12:07:54 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
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 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
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#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
50 72
51#ifndef _WIN32 73#ifndef _WIN32
52# include <sys/types.h> 74# include <sys/types.h>
53# include <sys/socket.h> 75# include <sys/socket.h>
54# include <netinet/in.h> 76# include <netinet/in.h>
55# include <netinet/tcp.h> 77# include <netinet/tcp.h>
56# include <inttypes.h> 78# include <inttypes.h>
57#endif 79#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 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 */
61#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
62 96
63#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
65 99
66#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
67 101
68#if 0 102/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 104
71# define PARACHUTE 0 105#define KMOD_LRAM 0x10000 // our extension
72#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}
73 128
74static AV *texture_av; 129static AV *texture_av;
75 130
76static struct 131static struct
77{ 132{
… …
120 175
121#include "pango-font.c" 176#include "pango-font.c"
122#include "pango-fontmap.c" 177#include "pango-fontmap.c"
123#include "pango-render.c" 178#include "pango-render.c"
124 179
125typedef IV CFPlus__Channel; 180typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 181typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 182typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 183typedef Mix_Music *DC__MixMusic;
129 184
130typedef PangoFontDescription *CFPlus__Font; 185typedef PangoFontDescription *DC__Font;
131 186
132static int 187static int
133shape_attr_p (PangoLayoutRun *run) 188shape_attr_p (PangoLayoutRun *run)
134{ 189{
135 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
136 191
137 while (attrs) 192 while (attrs)
138 { 193 {
139 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 195
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 197 return 1;
143 198
144 attrs = attrs->next; 199 attrs = attrs->next;
145 } 200 }
146 201
147 return 0; 202 return 0;
148} 203}
149 204
150typedef struct cf_layout { 205struct cf_layout {
151 PangoLayout *pl; 206 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
153 int base_height; 208 int base_height;
154 CFPlus__Font font; 209 DC__Font font;
155 rc_t *rc; 210 rc_t rc;
156} *CFPlus__Layout; 211};
157 212
213typedef cf_layout *DC__Layout;
214
158static CFPlus__Font default_font; 215static DC__Font default_font;
159static PangoContext *opengl_context; 216static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
161 218
162static void 219static void
163substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
164{ 221{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 225#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 227}
171 228
172static void 229static void
173layout_update_font (CFPlus__Layout self) 230layout_update_font (DC__Layout self)
174{ 231{
175 /* 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
176 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
177 */ 234 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
179 236
180 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 239
183 pango_layout_set_font_description (self->pl, font); 240 pango_layout_set_font_description (self->pl, font);
184} 241}
185 242
186static void 243static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 244layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 245{
189 PangoRectangle rect; 246 PangoRectangle rect;
190 247
191 // get_pixel_* wrongly rounds down 248 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 249 pango_layout_get_extents (self->pl, 0, &rect);
… …
202} 259}
203 260
204typedef uint16_t tileid; 261typedef uint16_t tileid;
205typedef uint16_t faceid; 262typedef uint16_t faceid;
206 263
207typedef struct { 264struct maptex
265{
208 int name; 266 GLuint name;
209 int w, h; 267 int w, h;
210 float s, t; 268 float s, t;
211 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
212 tileid smoothtile; 270 tileid smoothtile;
213 uint8_t smoothlevel; 271 uint8_t smoothlevel;
214} maptex; 272 uint8_t unused; /* set to zero on use */
273};
215 274
216typedef struct { 275struct mapcell
276{
217 uint32_t player; 277 uint32_t player;
218 tileid tile[3]; 278 tileid tile[3];
219 uint16_t darkness; 279 uint16_t darkness;
220 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
221} mapcell; 281};
222 282
223typedef struct { 283struct maprow
284{
224 int32_t c0, c1; 285 int32_t c0, c1;
225 mapcell *col; 286 mapcell *col;
226} maprow; 287};
227 288
228typedef struct map { 289struct mapgrid {
229 int x, y, w, h; 290 int x, y, w, h;
230 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
231 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
233 294
234 int32_t rows; 295 int32_t rows;
235 maprow *row; 296 maprow *row;
236} *CFPlus__Map; 297};
237 298
238static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
239prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
240{ 304{
241 char *p; 305 T *p;
242 306
243 New (0, p, sze + inc, char); 307 New (0, p, sze + inc, T);
244 Zero (p, inc, char); 308 Zero (p, inc, T);
245 Move (ptr, p + inc, sze, char); 309 Move (ptr, p + inc, sze, T);
246 Safefree (ptr); 310 Safefree (ptr);
247 311
248 return p; 312 ptr = p;
249} 313}
250 314
251static char * 315template<typename T>
252append (char *ptr, int sze, int inc)
253{
254 Renew (ptr, sze + inc, char);
255 Zero (ptr + sze, inc, char);
256
257 return ptr;
258}
259
260#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
261#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
262
263static 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
264need_facenum (struct map *self, faceid face) 324need_facenum (struct mapgrid *self, faceid face)
265{ 325{
266 while (self->faces <= face) 326 while (self->faces <= face)
267 { 327 {
268 Append (tileid, self->face2tile, self->faces, self->faces); 328 append (self->face2tile, self->faces, self->faces);
269 self->faces *= 2; 329 self->faces *= 2;
270 } 330 }
271} 331}
272 332
273static void 333static void
274need_texid (struct map *self, int texid) 334need_texid (struct mapgrid *self, int texid)
275{ 335{
276 while (self->texs <= texid) 336 while (self->texs <= texid)
277 { 337 {
278 Append (maptex, self->tex, self->texs, self->texs); 338 append (self->tex, self->texs, self->texs);
279 self->texs *= 2; 339 self->texs *= 2;
280 } 340 }
281} 341}
282 342
283static maprow * 343static maprow *
284map_get_row (CFPlus__Map self, int y) 344map_get_row (mapgrid *self, int y)
285{ 345{
286 if (0 > y) 346 if (0 > y)
287 { 347 {
288 int extend = - y + MAP_EXTEND_Y; 348 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 349 prepend (self->row, self->rows, extend);
290 350
291 self->rows += extend; 351 self->rows += extend;
292 self->y += extend; 352 self->y += extend;
293 y += extend; 353 y += extend;
294 } 354 }
295 else if (y >= self->rows) 355 else if (y >= self->rows)
296 { 356 {
297 int extend = y - self->rows + MAP_EXTEND_Y; 357 int extend = y - self->rows + MAP_EXTEND_Y;
298 Append (maprow, self->row, self->rows, extend); 358 append (self->row, self->rows, extend);
299 self->rows += extend; 359 self->rows += extend;
300 } 360 }
301 361
302 return self->row + y; 362 return self->row + y;
303} 363}
… …
313 } 373 }
314 374
315 if (row->c0 > x) 375 if (row->c0 > x)
316 { 376 {
317 int extend = row->c0 - x + MAP_EXTEND_X; 377 int extend = row->c0 - x + MAP_EXTEND_X;
318 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 378 prepend (row->col, row->c1 - row->c0, extend);
319 row->c0 -= extend; 379 row->c0 -= extend;
320 } 380 }
321 else if (x >= row->c1) 381 else if (x >= row->c1)
322 { 382 {
323 int extend = x - row->c1 + MAP_EXTEND_X; 383 int extend = x - row->c1 + MAP_EXTEND_X;
324 Append (mapcell, row->col, row->c1 - row->c0, extend); 384 append (row->col, row->c1 - row->c0, extend);
325 row->c1 += extend; 385 row->c1 += extend;
326 } 386 }
327 387
328 return row->col + (x - row->c0); 388 return row->col + (x - row->c0);
329} 389}
330 390
331static mapcell * 391static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 392map_get_cell (mapgrid *self, int x, int y)
333{ 393{
334 return row_get_cell (map_get_row (self, y), x); 394 return row_get_cell (map_get_row (self, y), x);
335} 395}
336 396
337static void 397static void
338map_clear (CFPlus__Map self) 398map_clear (mapgrid *self)
339{ 399{
340 int r; 400 int r;
341 401
342 for (r = 0; r < self->rows; r++) 402 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 403 Safefree (self->row[r].col);
… …
350 self->oy = 0; 410 self->oy = 0;
351 self->row = 0; 411 self->row = 0;
352 self->rows = 0; 412 self->rows = 0;
353} 413}
354 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
355static void 425static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 426map_blank (mapgrid *self, int x0, int y0, int w, int h)
357{ 427{
358 int x, y; 428 int x, y;
359 maprow *row; 429 maprow *row;
360 mapcell *cell; 430 mapcell *cell;
361 431
… …
373 if (x >= row->c1) 443 if (x >= row->c1)
374 break; 444 break;
375 445
376 cell = row->col + x - row->c0; 446 cell = row->col + x - row->c0;
377 447
378 cell->darkness = 0; 448 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 449 }
383 } 450 }
384} 451}
385 452
386typedef struct { 453struct smooth_key
454{
387 tileid tile; 455 tileid tile;
388 uint8_t x, y, level; 456 uint8_t x, y, level;
389} 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}
390 476
391static void 477static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits) 478smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
393{ 479{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 480 auto &&it = h.find (key);
395 481
396 if (SvIOK (*sv)) 482 if (it == h.end ())
397 SvIV_set (*sv, SvIVX (*sv) | bits); 483 h.insert (std::make_pair (key, bits));
398 else 484 else
399 sv_setiv (*sv, bits); 485 it->second |= bits;
400} 486}
401 487
402static void 488static void
403music_finished (void) 489music_finished (void)
404{ 490{
… …
421 ev.code = 1; 507 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 508 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 509 ev.data2 = 0;
424 510
425 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;
426} 519}
427 520
428static unsigned int 521static unsigned int
429minpot (unsigned int n) 522minpot (unsigned int n)
430{ 523{
… …
440 n |= n >> 16; 533 n |= n >> 16;
441 534
442 return n + 1; 535 return n + 1;
443} 536}
444 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
445/* SDL should provide this, really. */ 549/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 550#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 551#define SDLK_MODIFIER_MAX 314
448 552
449/******************************************************************************/ 553/******************************************************************************/
… …
487 return 0; 591 return 0;
488 592
489 return 1; 593 return 1;
490} 594}
491 595
492MODULE = 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
493 655
494PROTOTYPES: ENABLE 656PROTOTYPES: ENABLE
495 657
496BOOT: 658BOOT:
497{ 659{
498 HV *stash = gv_stashpv ("CFPlus", 1); 660 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 661 static const struct {
500 const char *name; 662 const char *name;
501 IV iv; 663 IV iv;
502 } *civ, const_iv[] = { 664 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 665# define const_iv(name) { # name, (IV)name }
… …
525 687
526 const_iv (SDL_APPINPUTFOCUS), 688 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 689 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 690 const_iv (SDL_APPACTIVE),
529 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),
530 const_iv (SDLK_KP0), 744 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 745 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 746 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 747 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 748 const_iv (SDLK_KP4),
… …
606 const_iv (KMOD_LMETA), 820 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 821 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 822 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 823 const_iv (KMOD_CAPS),
610 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)
611# undef const_iv 858# undef const_iv
612 }; 859 };
613 860
614 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--)
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 862 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
616 863
617 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 864 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
618 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 865 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
619} 866}
620 867
… …
632 RETVAL 879 RETVAL
633 880
634NV floor (NV x) 881NV floor (NV x)
635 882
636NV 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
637 894
638void 895void
639pango_init () 896pango_init ()
640 CODE: 897 CODE:
641{ 898{
642 opengl_fontmap = pango_opengl_font_map_new (); 899 opengl_fontmap = pango_opengl_font_map_new ();
643 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);
644 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
645} 907}
646 908
647char *
648SDL_GetError () 909char *SDL_GetError ()
649 910
650int 911void SDL_main_hack (SV *real_main)
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 912 PROTOTYPE: &
652 913
653void 914int SDL_Init (U32 flags)
915
916int SDL_InitSubSystem (U32 flags)
917
918void SDL_QuitSubSystem (U32 flags)
919
654SDL_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
655 931
656void 932void
657SDL_ListModes (int rgb, int alpha) 933SDL_ListModes (int rgb, int alpha)
658 PPCODE: 934 PPCODE:
659{ 935{
… …
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 947 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 948 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 949 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 950
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 951 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 952 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 953
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 954 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 955
683 if (m && m != (SDL_Rect **)-1) 956 if (m && m != (SDL_Rect **)-1)
684 while (*m) 957 while (*m)
685 { 958 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 959 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 960 {
688 AV *av = newAV (); 961 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 962 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 963 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 964 av_push (av, newSViv (rgb));
… …
714 ); 987 );
715 988
716 if (RETVAL) 989 if (RETVAL)
717 { 990 {
718 av_clear (texture_av); 991 av_clear (texture_av);
719
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
721#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);
722#include "glfunc.h" 993#include "glfunc.h"
723#undef GL_FUNC 994#undef GL_FUNC
995 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
996 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
724 } 997 }
725} 998}
726 OUTPUT: 999 OUTPUT:
727 RETVAL 1000 RETVAL
1001
1002void
1003SDL_WM_SetCaption (const char *title, const char *icon)
728 1004
729void 1005void
730SDL_GL_SwapBuffers () 1006SDL_GL_SwapBuffers ()
731 1007
732char * 1008char *
733SDL_GetKeyName (int sym) 1009SDL_GetKeyName (int sym)
1010 C_ARGS: (SDLKey)sym
734 1011
735int 1012int
736SDL_GetAppState () 1013SDL_GetAppState ()
737 1014
1015int
1016SDL_GetModState ()
1017
1018int
1019SDL_WaitEvent ()
1020 C_ARGS: 0
1021
738void 1022void
1023SDL_PumpEvents ()
1024
1025void
739poll_events () 1026peep_events ()
740 PPCODE: 1027 PPCODE:
741{ 1028{
742 SDL_Event ev; 1029 SDL_Event ev;
743 1030
744 SDL_PumpEvents (); 1031 SDL_PumpEvents ();
… …
751 { 1038 {
752 case SDL_KEYDOWN: 1039 case SDL_KEYDOWN:
753 case SDL_KEYUP: 1040 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1042 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 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);
757 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 */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1045 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 1046 break;
760 1047
761 case SDL_ACTIVEEVENT: 1048 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1049 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
780 x = ev.motion.x; 1067 x = ev.motion.x;
781 y = ev.motion.y; 1068 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1069 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 1070 }
784 1071
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1072 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 1073 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 1074 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 1075 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1076 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1077 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1078 }
792 break; 1079 break;
793 1080
794 case SDL_MOUSEBUTTONDOWN: 1081 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1082 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1083 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1084
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1085 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1086 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1087 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1088 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1093 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1094 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1095 break;
809 } 1096 }
810 1097
811 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))));
812 } 1099 }
813} 1100}
814 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
1114
815int 1115int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1116Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 1117 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1118 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1119 Mix_ChannelFinished (channel_finished);
1120
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}
820 1136
821void 1137void
822Mix_CloseAudio () 1138Mix_CloseAudio ()
823 1139
824int 1140int
… …
859 } 1175 }
860 } 1176 }
861#endif 1177#endif
862} 1178}
863 1179
864void 1180int
865add_font (char *file) 1181add_font (char *file)
866 CODE: 1182 CODE:
867 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)
868 1193
869void 1194void
870load_image_inline (SV *image_) 1195load_image_inline (SV *image_)
871 ALIAS: 1196 ALIAS:
872 load_image_file = 1 1197 load_image_file = 1
… …
918 1243
919 SDL_LockSurface (surface2); 1244 SDL_LockSurface (surface2);
920 EXTEND (SP, 6); 1245 EXTEND (SP, 6);
921 PUSHs (sv_2mortal (newSViv (surface2->w))); 1246 PUSHs (sv_2mortal (newSViv (surface2->w)));
922 PUSHs (sv_2mortal (newSViv (surface2->h))); 1247 PUSHs (sv_2mortal (newSViv (surface2->h)));
923 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1248 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
924 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)));
925 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1250 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
926 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1251 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
927 SDL_UnlockSurface (surface2); 1252 SDL_UnlockSurface (surface2);
928 1253
… …
958void 1283void
959error (char *message) 1284error (char *message)
960 CODE: 1285 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1286 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1287#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1288 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1289#endif
965 1290
966void 1291void
967fatal (char *message) 1292fatal (char *message)
968 CODE: 1293 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1294 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1295#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1296 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1297#endif
973 _exit (1); 1298 _exit (1);
974 1299
975void 1300void
976_exit (int retval = 0) 1301_exit (int retval = 0)
… …
988#if DEBUG 1313#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1314 VALGRIND_DO_LEAK_CHECK;
990#endif 1315#endif
991} 1316}
992 1317
993MODULE = 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
994 1326
995PROTOTYPES: DISABLE 1327PROTOTYPES: DISABLE
996 1328
997CFPlus::Font 1329DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1330new_from_file (SV *klass, char *path, int id = 0)
999 CODE: 1331 CODE:
1000{ 1332{
1001 int count; 1333 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1334 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1335 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
… …
1005} 1337}
1006 OUTPUT: 1338 OUTPUT:
1007 RETVAL 1339 RETVAL
1008 1340
1009void 1341void
1010DESTROY (CFPlus::Font self) 1342DESTROY (DC::Font self)
1011 CODE: 1343 CODE:
1012 pango_font_description_free (self); 1344 pango_font_description_free (self);
1013 1345
1014void 1346void
1015make_default (CFPlus::Font self) 1347make_default (DC::Font self)
1016 PROTOTYPE: $ 1348 PROTOTYPE: $
1017 CODE: 1349 CODE:
1018 default_font = self; 1350 default_font = self;
1019 1351
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1352MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1353
1022PROTOTYPES: DISABLE 1354PROTOTYPES: DISABLE
1023 1355
1024void 1356void
1025reset_glyph_cache () 1357glyph_cache_backup ()
1026 PROTOTYPE: 1358 PROTOTYPE:
1027 CODE: 1359 CODE:
1360 tc_backup ();
1361
1362void
1363glyph_cache_restore ()
1364 PROTOTYPE:
1365 CODE:
1028 tc_clear (); 1366 tc_restore ();
1029 1367
1030CFPlus::Layout 1368DC::Layout
1031new (SV *class) 1369new (SV *klass)
1032 CODE: 1370 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1371 RETVAL = new cf_layout;
1034 1372
1035 RETVAL->pl = pango_layout_new (opengl_context); 1373 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->r = 1.; 1374 RETVAL->r = 1.;
1037 RETVAL->g = 1.; 1375 RETVAL->g = 1.;
1038 RETVAL->b = 1.; 1376 RETVAL->b = 1.;
1039 RETVAL->a = 1.; 1377 RETVAL->a = 1.;
1040 RETVAL->base_height = MIN_FONT_HEIGHT; 1378 RETVAL->base_height = MIN_FONT_HEIGHT;
1041 RETVAL->font = 0; 1379 RETVAL->font = 0;
1042 RETVAL->rc = rc_alloc ();
1043 1380
1044 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1381 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1045 layout_update_font (RETVAL); 1382 layout_update_font (RETVAL);
1046 OUTPUT: 1383 OUTPUT:
1047 RETVAL 1384 RETVAL
1048 1385
1049void 1386void
1050DESTROY (CFPlus::Layout self) 1387DESTROY (DC::Layout self)
1051 CODE: 1388 CODE:
1052 g_object_unref (self->pl); 1389 g_object_unref (self->pl);
1053 rc_free (self->rc);
1054 Safefree (self); 1390 delete self;
1055 1391
1056void 1392void
1057set_text (CFPlus::Layout self, SV *text_) 1393set_text (DC::Layout self, SV *text_)
1058 CODE: 1394 CODE:
1059{ 1395{
1060 STRLEN textlen; 1396 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1397 char *text = SvPVutf8 (text_, textlen);
1062 1398
1063 pango_layout_set_text (self->pl, text, textlen); 1399 pango_layout_set_text (self->pl, text, textlen);
1064} 1400}
1065 1401
1066void 1402void
1067set_markup (CFPlus::Layout self, SV *text_) 1403set_markup (DC::Layout self, SV *text_)
1068 CODE: 1404 CODE:
1069{ 1405{
1070 STRLEN textlen; 1406 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1407 char *text = SvPVutf8 (text_, textlen);
1072 1408
1073 pango_layout_set_markup (self->pl, text, textlen); 1409 pango_layout_set_markup (self->pl, text, textlen);
1074} 1410}
1075 1411
1076void 1412void
1077set_shapes (CFPlus::Layout self, ...) 1413set_shapes (DC::Layout self, ...)
1078 CODE: 1414 CODE:
1079{ 1415{
1080 PangoAttrList *attrs = 0; 1416 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1417 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1418 const char *pos = text;
… …
1117 if (attrs) 1453 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1454 pango_layout_set_attributes (self->pl, attrs);
1119} 1455}
1120 1456
1121void 1457void
1122get_shapes (CFPlus::Layout self) 1458get_shapes (DC::Layout self)
1123 PPCODE: 1459 PPCODE:
1124{ 1460{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1461 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1462
1127 do 1463 do
1128 { 1464 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1465 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1466
1131 if (run && shape_attr_p (run)) 1467 if (run && shape_attr_p (run))
1132 { 1468 {
1133 PangoRectangle extents; 1469 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1470 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1142 1478
1143 pango_layout_iter_free (iter); 1479 pango_layout_iter_free (iter);
1144} 1480}
1145 1481
1146int 1482int
1147has_wrapped (CFPlus::Layout self) 1483has_wrapped (DC::Layout self)
1148 CODE: 1484 CODE:
1149{ 1485{
1150 int lines = 1; 1486 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1487 const char *text = pango_layout_get_text (self->pl);
1152 1488
… …
1157} 1493}
1158 OUTPUT: 1494 OUTPUT:
1159 RETVAL 1495 RETVAL
1160 1496
1161SV * 1497SV *
1162get_text (CFPlus::Layout self) 1498get_text (DC::Layout self)
1163 CODE: 1499 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1500 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1501 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1502 OUTPUT:
1167 RETVAL 1503 RETVAL
1168 1504
1169void 1505void
1170set_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.)
1171 CODE: 1507 CODE:
1172 self->r = r; 1508 self->r = r;
1173 self->g = g; 1509 self->g = g;
1174 self->b = b; 1510 self->b = b;
1175 self->a = a; 1511 self->a = a;
1176 1512
1177void 1513void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1514set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1515 CODE:
1180 if (self->font != font) 1516 if (self->font != font)
1181 { 1517 {
1182 self->font = font; 1518 self->font = font;
1183 layout_update_font (self); 1519 layout_update_font (self);
1184 } 1520 }
1185 1521
1186void 1522void
1187set_height (CFPlus::Layout self, int base_height) 1523set_height (DC::Layout self, int base_height)
1188 CODE: 1524 CODE:
1189 if (self->base_height != base_height) 1525 if (self->base_height != base_height)
1190 { 1526 {
1191 self->base_height = base_height; 1527 self->base_height = base_height;
1192 layout_update_font (self); 1528 layout_update_font (self);
1193 } 1529 }
1194 1530
1195void 1531void
1196set_width (CFPlus::Layout self, int max_width = -1) 1532set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1533 CODE:
1198 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);
1199 1535
1200void 1536void
1201set_indent (CFPlus::Layout self, int indent) 1537set_indent (DC::Layout self, int indent)
1202 CODE: 1538 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1539 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1540
1205void 1541void
1206set_spacing (CFPlus::Layout self, int spacing) 1542set_spacing (DC::Layout self, int spacing)
1207 CODE: 1543 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1544 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1545
1210void 1546void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1547set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1548 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1549 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1550 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1551 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1552 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1553 : PANGO_ELLIPSIZE_NONE
1218 ); 1554 );
1219 1555
1220void 1556void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1557set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1558 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1559 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1560
1225void 1561void
1226size (CFPlus::Layout self) 1562size (DC::Layout self)
1227 PPCODE: 1563 PPCODE:
1228{ 1564{
1229 int w, h; 1565 int w, h;
1230 1566
1231 layout_get_pixel_size (self, &w, &h); 1567 layout_get_pixel_size (self, &w, &h);
… …
1234 PUSHs (sv_2mortal (newSViv (w))); 1570 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1571 PUSHs (sv_2mortal (newSViv (h)));
1236} 1572}
1237 1573
1238int 1574int
1239descent (CFPlus::Layout self) 1575descent (DC::Layout self)
1240 CODE: 1576 CODE:
1241{ 1577{
1242 PangoRectangle rect; 1578 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1579 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1580 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1581 RETVAL = PANGO_DESCENT (rect);
1246} 1582}
1247 OUTPUT: 1583 OUTPUT:
1248 RETVAL 1584 RETVAL
1249 1585
1250int 1586int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1587xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1588 CODE:
1253{ 1589{
1254 int index, trailing; 1590 int index, trailing;
1255 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);
1256 RETVAL = index + trailing; 1592 RETVAL = index + trailing;
1257} 1593}
1258 OUTPUT: 1594 OUTPUT:
1259 RETVAL 1595 RETVAL
1260 1596
1261void 1597void
1262cursor_pos (CFPlus::Layout self, int index) 1598cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1599 PPCODE:
1264{ 1600{
1265 PangoRectangle strong_pos; 1601 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1602 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1603
1268 EXTEND (SP, 3); 1604 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1605 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1606 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1607 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1608}
1273 1609
1274void 1610void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1611index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1612 PPCODE:
1277{ 1613{
1278 int line, x; 1614 int line, x;
1279 1615
1280 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)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1618 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1619 --line;
1620#endif
1283 EXTEND (SP, 2); 1621 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1622 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1623 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1624}
1287 1625
1288void 1626void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1627line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1628 PPCODE:
1291{ 1629{
1292 PangoLayoutLine *lp; 1630 PangoLayoutLine *lp;
1293 int index, trailing; 1631 int index, trailing;
1294 1632
1295 if (line < 0) 1633 if (line < 0)
1296 XSRETURN_EMPTY; 1634 XSRETURN_EMPTY;
1297 1635
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1636 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1637 XSRETURN_EMPTY; /* do better */
1300 1638
1301 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);
1302 1640
1303 EXTEND (SP, 2); 1641 EXTEND (SP, 2);
… …
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1647 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1648 }
1311} 1649}
1312 1650
1313void 1651void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1652render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1653 CODE:
1316 rc_clear (self->rc); 1654 self->rc.clear ();
1317 pango_opengl_render_layout_subpixel ( 1655 pango_opengl_render_layout_subpixel (
1318 self->pl, 1656 self->pl,
1319 self->rc, 1657 &self->rc,
1320 x * PANGO_SCALE, y * PANGO_SCALE, 1658 x * PANGO_SCALE, y * PANGO_SCALE,
1321 self->r, self->g, self->b, self->a, 1659 self->r, self->g, self->b, self->a,
1322 flags 1660 flags
1323 ); 1661 );
1324 // we assume that context_change actually clears/frees stuff 1662 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1663 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1664 pango_layout_context_changed (self->pl);
1327 1665
1328void 1666void
1329draw (CFPlus::Layout self) 1667draw (DC::Layout self)
1330 CODE: 1668 CODE:
1331{ 1669{
1332 glEnable (GL_TEXTURE_2D); 1670 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1671 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1672 glEnable (GL_BLEND);
1335 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1673 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1336 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1674 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1337 glEnable (GL_ALPHA_TEST); 1675 glEnable (GL_ALPHA_TEST);
1338 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1676 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1339 1677
1340 rc_draw (self->rc); 1678 self->rc.draw ();
1341 1679
1342 glDisable (GL_ALPHA_TEST); 1680 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1681 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1682 glDisable (GL_TEXTURE_2D);
1345} 1683}
1346 1684
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1685MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1686
1349PROTOTYPES: ENABLE 1687PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1688
1353void 1689void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1690pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1691 CODE:
1356{ 1692{
… …
1422 glDisable (GL_ALPHA_TEST); 1758 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1759 glDisable (GL_BLEND);
1424 } 1760 }
1425} 1761}
1426 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
1427IV 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)
1428 CODE: 1885 CODE:
1429{ 1886{
1430 GLint width; 1887 GLint width;
1431 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);
… …
1433 RETVAL = width > 0; 1890 RETVAL = width > 0;
1434} 1891}
1435 OUTPUT: 1892 OUTPUT:
1436 RETVAL 1893 RETVAL
1437 1894
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1895MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1896
1440PROTOTYPES: DISABLE 1897PROTOTYPES: DISABLE
1441 1898
1442CFPlus::Map 1899DC::Map
1443new (SV *class) 1900new (SV *klass)
1444 CODE: 1901 CODE:
1445 New (0, RETVAL, 1, struct map); 1902 New (0, RETVAL, 1, mapgrid);
1446 RETVAL->x = 0; 1903 RETVAL->x = 0;
1447 RETVAL->y = 0; 1904 RETVAL->y = 0;
1448 RETVAL->w = 0; 1905 RETVAL->w = 0;
1449 RETVAL->h = 0; 1906 RETVAL->h = 0;
1450 RETVAL->ox = 0; 1907 RETVAL->ox = 0;
… …
1455 RETVAL->row = 0; 1912 RETVAL->row = 0;
1456 OUTPUT: 1913 OUTPUT:
1457 RETVAL 1914 RETVAL
1458 1915
1459void 1916void
1460DESTROY (CFPlus::Map self) 1917DESTROY (DC::Map self)
1461 CODE: 1918 CODE:
1462{ 1919{
1463 map_clear (self); 1920 map_clear (self);
1464 Safefree (self->face2tile); 1921 Safefree (self->face2tile);
1465 Safefree (self->tex); 1922 Safefree (self->tex);
1466 Safefree (self); 1923 Safefree (self);
1467} 1924}
1468 1925
1469void 1926void
1470resize (CFPlus::Map self, int map_width, int map_height) 1927resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1928 CODE:
1472 self->w = map_width; 1929 self->w = map_width;
1473 self->h = map_height; 1930 self->h = map_height;
1474 1931
1475void 1932void
1476clear (CFPlus::Map self) 1933clear (DC::Map self)
1477 CODE: 1934 CODE:
1478 map_clear (self); 1935 map_clear (self);
1479 1936
1480void 1937void
1481set_tileid (CFPlus::Map self, int face, int tile) 1938set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1939 CODE:
1483{ 1940{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1941 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1942 need_texid (self, tile);
1486} 1943}
1487 1944
1488void 1945void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1946set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1947 CODE:
1491{ 1948{
1492 tileid texid; 1949 tileid texid;
1493 maptex *tex; 1950 maptex *tex;
1494 1951
1495 if (face < 0 || face >= self->faces) 1952 if (face < 0 || face >= self->faces)
1496 return; 1953 return;
1497 1954
1498 if (smooth < 0 || smooth >= self->faces) 1955 if (smooth < 0 || smooth >= self->faces)
1499 return; 1956 return;
1500 1957
1501 texid = self->face2tile [face]; 1958 texid = self->face2tile [face];
1502 1959
1503 if (!texid) 1960 if (!texid)
1504 return; 1961 return;
1505 1962
1506 tex = self->tex + texid; 1963 tex = self->tex + texid;
1507 tex->smoothtile = self->face2tile [smooth]; 1964 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1965 tex->smoothlevel = level;
1509} 1966}
1510 1967
1511void 1968void
1512set_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)
1513 CODE: 1970 CODE:
1514{ 1971{
1515 need_texid (self, texid); 1972 need_texid (self, texid);
1516 1973
1517 { 1974 {
… …
1536 // use uglier nearest interpolation because linear suffers 1993 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1994 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1995 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1996}
1540 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
1541int 2018int
1542ox (CFPlus::Map self) 2019ox (DC::Map self)
1543 ALIAS: 2020 ALIAS:
1544 oy = 1 2021 oy = 1
1545 x = 2 2022 x = 2
1546 y = 3 2023 y = 3
1547 w = 4 2024 w = 4
… …
1558 } 2035 }
1559 OUTPUT: 2036 OUTPUT:
1560 RETVAL 2037 RETVAL
1561 2038
1562void 2039void
1563scroll (CFPlus::Map self, int dx, int dy) 2040scroll (DC::Map self, int dx, int dy)
1564 CODE: 2041 CODE:
1565{ 2042{
1566 if (dx > 0) 2043 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 2044 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 2045 else if (dx < 0)
… …
1576 self->ox += dx; self->x += dx; 2053 self->ox += dx; self->x += dx;
1577 self->oy += dy; self->y += dy; 2054 self->oy += dy; self->y += dy;
1578 2055
1579 while (self->y < 0) 2056 while (self->y < 0)
1580 { 2057 {
1581 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2058 prepend (self->row, self->rows, MAP_EXTEND_Y);
1582 2059
1583 self->rows += MAP_EXTEND_Y; 2060 self->rows += MAP_EXTEND_Y;
1584 self->y += MAP_EXTEND_Y; 2061 self->y += MAP_EXTEND_Y;
1585 } 2062 }
1586} 2063}
1587 2064
1588SV * 2065SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 2066map1a_update (DC::Map self, SV *data_)
1590 CODE: 2067 CODE:
1591{ 2068{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2069 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 2070 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 2071 mapcell *cell;
… …
1615 2092
1616 //TODO: don't trust server data to be in-range(!) 2093 //TODO: don't trust server data to be in-range(!)
1617 2094
1618 if (flags & 8) 2095 if (flags & 8)
1619 { 2096 {
2097 uint8_t ext, cmd;
2098
1620 if (extmap) 2099 do
1621 { 2100 {
1622 uint8_t ext, cmd; 2101 ext = *data++;
2102 cmd = ext & 0x7f;
1623 2103
1624 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
1625 { 2107 {
1626 ext = *data++;
1627 cmd = ext & 0x3f;
1628
1629 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health
1632 {
1633 cell->stat_width = 1; 2108 cell->stat_width = 1;
1634 cell->stat_hp = *data++; 2109 cell->stat_hp = *data++;
1635 }
1636 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47)
1639 {
1640 if (*data == 4)
1641 ; // decode player count
1642
1643 data += *data + 1;
1644 }
1645 else if (cmd == 8) // cell flags
1646 cell->flags = *data++;
1647 else if (ext & 0x40) // unknown, multibyte => skip
1648 data += *data + 1;
1649 else
1650 data++;
1651 } 2110 }
1652 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++;
1653 } 2128 }
1654 else 2129 while (ext & 0x80);
1655 cell->darkness = *data++ + 1;
1656 } 2130 }
1657 2131
1658 for (z = 0; z <= 2; ++z) 2132 for (z = 0; z <= 2; ++z)
1659 if (flags & (4 >> z)) 2133 if (flags & (4 >> z))
1660 { 2134 {
… …
1663 cell->tile [z] = self->face2tile [face]; 2137 cell->tile [z] = self->face2tile [face];
1664 2138
1665 if (cell->tile [z]) 2139 if (cell->tile [z])
1666 { 2140 {
1667 maptex *tex = self->tex + cell->tile [z]; 2141 maptex *tex = self->tex + cell->tile [z];
2142 tex->unused = 0;
1668 if (!tex->name) 2143 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2144 av_push (missing, newSViv (cell->tile [z]));
1670 2145
1671 if (tex->smoothtile) 2146 if (tex->smoothtile)
1672 { 2147 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2148 maptex *smooth = self->tex + tex->smoothtile;
2149 smooth->unused = 0;
1674 if (!smooth->name) 2150 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2151 av_push (missing, newSViv (tex->smoothtile));
1676 } 2152 }
1677 } 2153 }
1678 } 2154 }
1679 } 2155 }
1680 else 2156 else
1681 cell->darkness = 0; 2157 CELL_CLEAR (cell);
1682 } 2158 }
1683} 2159}
1684 OUTPUT: 2160 OUTPUT:
1685 RETVAL 2161 RETVAL
1686 2162
1687SV * 2163SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2164mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2165 CODE:
1690{ 2166{
1691 int x1, x; 2167 int x1, x;
1692 int y1, y; 2168 int y1, y;
1693 int z; 2169 int z;
… …
1706 ? self->row + y 2182 ? self->row + y
1707 : 0; 2183 : 0;
1708 2184
1709 for (x = x0; x < x1; x++) 2185 for (x = x0; x < x1; x++)
1710 { 2186 {
1711 int r = 32, g = 32, b = 32, a = 192; 2187 unsigned int r = 32, g = 32, b = 32, a = 192;
1712 2188
1713 if (row && row->c0 <= x && x < row->c1) 2189 if (row && row->c0 <= x && x < row->c1)
1714 { 2190 {
1715 mapcell *cell = row->col + (x - row->c0); 2191 mapcell *cell = row->col + (x - row->c0);
1716 2192
… …
1718 { 2194 {
1719 maptex tex = self->tex [cell->tile [z]]; 2195 maptex tex = self->tex [cell->tile [z]];
1720 int a0 = 255 - tex.a; 2196 int a0 = 255 - tex.a;
1721 int a1 = tex.a; 2197 int a1 = tex.a;
1722 2198
1723 r = (r * a0 + tex.r * a1) / 255; 2199 r = div255 (r * a0 + tex.r * a1);
1724 g = (g * a0 + tex.g * a1) / 255; 2200 g = div255 (g * a0 + tex.g * a1);
1725 b = (b * a0 + tex.b * a1) / 255; 2201 b = div255 (b * a0 + tex.b * a1);
1726 a = (a * a0 + tex.a * a1) / 255; 2202 a = div255 (a * a0 + tex.a * a1);
1727 } 2203 }
1728 } 2204 }
1729 2205
1730 *map++ = (r ) 2206 *map++ = (r )
1731 | (g << 8) 2207 | (g << 8)
1732 | (b << 16) 2208 | (b << 16)
1733 | (a << 24); 2209 | (a << 24);
1734 } 2210 }
1735 } 2211 }
1736 2212
1737 RETVAL = map_sv; 2213 RETVAL = map_sv;
1738} 2214}
1739 OUTPUT: 2215 OUTPUT:
1740 RETVAL 2216 RETVAL
1741 2217
1742void 2218void
1743draw (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)
1744 CODE: 2220 CODE:
1745{ 2221{
1746 int x, y, z; 2222 int x, y, z;
1747 2223
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2224 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1751 smooth_key skey; 2225 int pl_x, pl_y;
1752 2226 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2227 rc_t rc;
2228 rc_t rc_ov;
1754 rc_key_t key; 2229 rc_key_t key;
1755 rc_array_t *arr; 2230 rc_t::array_t *arr;
1756 2231
2232 pl_tex.name = 0;
2233
1757 // thats current max. sorry. 2234 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2235 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2236 if (sh > 255) sh = 255;
1760
1761 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey));
1763 2237
1764 memset (&key, 0, sizeof (key)); 2238 memset (&key, 0, sizeof (key));
1765 key.r = 255; 2239 key.r = 255;
1766 key.g = 255; 2240 key.g = 255;
1767 key.b = 255; 2241 key.b = 255;
1768 key.a = 255; 2242 key.a = 255;
1769 key.mode = GL_QUADS; 2243 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2244 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2245
1773 mx += self->x; 2246 mx += self->x;
1774 my += self->y; 2247 my += self->y;
1775 2248
1776 // first pass: determine smooth_max 2249 // first pass: determine smooth_max
1777 // rather ugly, if you ask me 2250 // rather ugly, if you ask me
1778 // could also be stored inside mapcell and updated on change 2251 // could also be stored inside mapcell and updated on change
1779 memset (smooth_max, 0, sizeof (smooth_max)); 2252 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1780 2253
1781 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
1782 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
1783 { 2256 {
1784 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
… …
1799 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2273 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2274
1802 for (z = 0; z <= 2; z++) 2275 for (z = 0; z <= 2; z++)
1803 { 2276 {
1804 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;
1805 2281
1806 for (y = 0; y < sh; y++) 2282 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2283 if (0 <= y + my && y + my < self->rows)
1808 { 2284 {
1809 maprow *row = self->row + (y + my); 2285 maprow *row = self->row + (y + my);
… …
1817 if (tile) 2293 if (tile)
1818 { 2294 {
1819 maptex tex = self->tex [tile]; 2295 maptex tex = self->tex [tile];
1820 int px, py; 2296 int px, py;
1821 2297
1822 // suppressing texture state switches here
1823 // is only moderately effective, but worth the extra effort
1824 if (key.texname != tex.name) 2298 if (key.texname != tex.name)
1825 { 2299 {
2300 self->tex [tile].unused = 0;
2301
1826 if (!tex.name) 2302 if (!tex.name)
1827 tex = self->tex [2]; /* missing, replace by noface */ 2303 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1828 2304
1829 key.texname = tex.name; 2305 key.texname = tex.name;
1830 arr = rc_array (rc, &key); 2306 arr = &rc.array (key);
1831 } 2307 }
1832 2308
1833 px = (x + 1) * T - tex.w; 2309 px = (x + 1) * Th - tex.w;
1834 py = (y + 1) * T - tex.h; 2310 py = (y + 1) * Tw - tex.h;
1835 2311
1836 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2312 if (expect_false (cell->player == player) && expect_false (z == 2))
1837 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1838 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1839 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1840
1841 if (cell->flags && z == 2)
1842 { 2313 {
1843 // overlays such as the speech bubble, probably more to come 2314 pl_x = px;
1844 if (cell->flags & 1) 2315 pl_y = py;
2316 pl_tex = tex;
1845 { 2317 continue;
1846 maptex tex = self->tex [1];
1847 int px = x * T + T * 2 / 32;
1848 int py = y * T - T * 6 / 32;
1849
1850 if (tex.name)
1851 {
1852 if (key.texname != tex.name)
1853 {
1854 key.texname = tex.name;
1855 arr = rc_array (rc, &key);
1856 }
1857
1858 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1859 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1860 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1861 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1862 }
1863 }
1864 } 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);
1865 2324
1866 // update smooth hash 2325 // update smooth hash
1867 if (tex.smoothtile) 2326 if (tex.smoothtile)
1868 { 2327 {
1869 skey.tile = tex.smoothtile; 2328 skey.tile = tex.smoothtile;
1870 skey.level = tex.smoothlevel; 2329 skey.level = tex.smoothlevel;
1871 2330
1872 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2331 smooth_level[tex.smoothlevel] = 1;
1873 2332
1874 // 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
1875 // shifted +1|+1 so we always stay positive. 2334 // shifted +1|+1 so we always stay positive.
1876 2335
1877 // bits is ___n cccc CCCC bbbb 2336 // bits is ___n cccc CCCC bbbb
… …
1885 2344
1886 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2345 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1887 // ·· ·· ·┏ ┓· 2346 // ·· ·· ·┏ ┓·
1888 2347
1889 // full tile 2348 // full tile
1890 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);
1891 2350
1892 // borders 2351 // borders
1893 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);
1894 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);
1895 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);
1896 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);
1897 2356
1898 // corners 2357 // corners
1899 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);
1900 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);
1901 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);
1902 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);
1903 } 2382 }
1904 } 2383 }
1905 } 2384 }
1906 } 2385 }
1907 2386
1908 rc_draw (rc); 2387 rc.draw ();
1909 rc_clear (rc); 2388 rc.clear ();
1910 2389
1911 // go through all smoothlevels, lowest to highest, then draw. 2390 // go through all smoothlevels, lowest to highest, then draw.
1912 // this is basically counting sort 2391 // this is basically counting sort
1913 { 2392 {
1914 int w, b; 2393 int w, b;
1915 2394
1916 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)
1917 { 2400 {
1918 uint32_t smask = smooth_level [w]; 2401 smooth_key &skey = it->first;
1919 if (smask) 2402 IV bits = it->second;
1920 for (b = 0; b < 32; ++b) 2403
1921 if (smask & (((uint32_t)1) << b)) 2404 if (!(bits & 0x1000)
2405 && skey.level == level
2406 && level > smooth_max [skey.x][skey.y])
1922 { 2407 {
1923 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
1924 HE *he; 2416 if (tex.name)
1925
1926 hv_iterinit (smooth);
1927 while ((he = hv_iternext (smooth)))
1928 { 2417 {
1929 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 // this time avoiding texture state changes
1930 IV bits = SvIVX (HeVAL (he)); 2419 // save gobs of state changes.
1931 2420 if (key.texname != tex.name)
1932 if (!(bits & 0x1000)
1933 && skey->level == level
1934 && level > smooth_max [skey->x][skey->y])
1935 { 2421 {
1936 maptex tex = self->tex [skey->tile]; 2422 self->tex [skey.tile].unused = 0;
1937 int px = (((int)skey->x) - 1) * T;
1938 int py = (((int)skey->y) - 1) * T;
1939 int border = bits & 15;
1940 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1941 float dx = tex.s * .0625f; // 16 images/row
1942 float dy = tex.t * .5f ; // 2 images/column
1943 2423
1944 if (tex.name)
1945 { 2424 glEnd ();
1946 // this time avoiding texture state changes
1947 // save gobs of state changes.
1948 if (key.texname != tex.name) 2425 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1949 { 2426 glBegin (GL_QUADS);
1950 key.texname = tex.name;
1951 arr = rc_array (rc, &key);
1952 }
1953
1954 if (border)
1955 {
1956 float ox = border * dx;
1957
1958 rc_t2f_v3f (arr, ox , 0.f , px , py , 0);
1959 rc_t2f_v3f (arr, ox , dy , px , py + T, 0);
1960 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);
1961 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);
1962 }
1963
1964 if (corner)
1965 {
1966 float ox = corner * dx;
1967
1968 rc_t2f_v3f (arr, ox , dy , px , py , 0);
1969 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);
1970 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);
1971 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);
1972 }
1973 } 2427 }
2428
2429 if (border)
2430 {
2431 float ox = border * dx;
2432
2433 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2434 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2435 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2436 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2437 }
2438
2439 if (corner)
2440 {
2441 float ox = corner * dx;
2442
2443 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2444 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2445 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2446 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
1974 } 2447 }
1975 } 2448 }
1976 } 2449 }
1977 } 2450 }
2451
2452 glEnd ();
2453 glDisable (GL_TEXTURE_2D);
2454 key.texname = -1;
1978 } 2455 }
1979
1980 hv_clear (smooth);
1981 rc_draw (rc);
1982 rc_clear (rc);
1983 } 2456 }
1984 2457
2458 if (pl_tex.name)
2459 {
2460 maptex tex = pl_tex;
2461 int px = pl_x + sdx;
2462 int py = pl_y + sdy;
2463
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
1985 glDisable (GL_BLEND); 2478 glDisable (GL_BLEND);
1986 rc_free (rc);
1987 2479
1988 // top layer: overlays such as the health bar 2480 // top layer: overlays such as the health bar
1989 for (y = 0; y < sh; y++) 2481 for (y = 0; y < sh; y++)
1990 if (0 <= y + my && y + my < self->rows) 2482 if (0 <= y + my && y + my < self->rows)
1991 { 2483 {
… …
1994 for (x = 0; x < sw; x++) 2486 for (x = 0; x < sw; x++)
1995 if (row->c0 <= x + mx && x + mx < row->c1) 2487 if (row->c0 <= x + mx && x + mx < row->c1)
1996 { 2488 {
1997 mapcell *cell = row->col + (x + mx - row->c0); 2489 mapcell *cell = row->col + (x + mx - row->c0);
1998 2490
1999 int px = x * T; 2491 int px = x * Tw;
2000 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 }
2001 2499
2002 if (cell->stat_hp) 2500 if (cell->stat_hp)
2003 { 2501 {
2004 int width = cell->stat_width * T; 2502 int width = cell->stat_width * Tw;
2005 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2503 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2006 2504
2007 glColor3ub (0, 0, 0); 2505 glColor3ub (0, 0, 0);
2008 glRectf (px + 1, py - thick - 2, 2506 glRectf (px + 1, py - thick - 2,
2009 px + width - 1, py); 2507 px + width - 1, py);
2010 2508
… …
2016 } 2514 }
2017 } 2515 }
2018} 2516}
2019 2517
2020void 2518void
2021draw_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)
2022 CODE: 2520 CODE:
2023{ 2521{
2024 static float color[16][3] = { 2522 static float color[16][3] = {
2025 { 0.00F, 0.00F, 0.00F }, 2523 { 0.00f, 0.00f, 0.00f },
2026 { 1.00F, 1.00F, 1.00F }, 2524 { 1.00f, 1.00f, 1.00f },
2027 { 0.00F, 0.00F, 0.55F }, 2525 { 0.00f, 0.00f, 0.55f },
2028 { 1.00F, 0.00F, 0.00F }, 2526 { 1.00f, 0.00f, 0.00f },
2029 2527
2030 { 1.00F, 0.54F, 0.00F }, 2528 { 1.00f, 0.54f, 0.00f },
2031 { 0.11F, 0.56F, 1.00F }, 2529 { 0.11f, 0.56f, 1.00f },
2032 { 0.93F, 0.46F, 0.00F }, 2530 { 0.93f, 0.46f, 0.00f },
2033 { 0.18F, 0.54F, 0.34F }, 2531 { 0.18f, 0.54f, 0.34f },
2034 2532
2035 { 0.56F, 0.73F, 0.56F }, 2533 { 0.56f, 0.73f, 0.56f },
2036 { 0.80F, 0.80F, 0.80F }, 2534 { 0.80f, 0.80f, 0.80f },
2037 { 0.55F, 0.41F, 0.13F }, 2535 { 0.55f, 0.41f, 0.13f },
2038 { 0.99F, 0.77F, 0.26F }, 2536 { 0.99f, 0.77f, 0.26f },
2039 2537
2040 { 0.74F, 0.65F, 0.41F }, 2538 { 0.74f, 0.65f, 0.41f },
2041 2539
2042 { 0.00F, 1.00F, 1.00F }, 2540 { 0.00f, 1.00f, 1.00f },
2043 { 1.00F, 0.00F, 1.00F }, 2541 { 1.00f, 0.00f, 1.00f },
2044 { 1.00F, 1.00F, 0.00F }, 2542 { 1.00f, 1.00f, 0.00f },
2045 }; 2543 };
2046 2544
2047 int x, y; 2545 int x, y;
2048 2546
2049 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 */
2050 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2554 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2051 glEnable (GL_BLEND); 2555 glEnable (GL_BLEND);
2052 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2556 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2053 glBegin (GL_QUADS); 2557 glBegin (GL_QUADS);
2054 2558
2055 for (y = 0; y < h; y++) 2559 for (y = 0; y < h; y++)
… …
2059 2563
2060 if (m) 2564 if (m)
2061 { 2565 {
2062 float *c = color [m & 15]; 2566 float *c = color [m & 15];
2063 2567
2064 float tx1 = m & 0x40 ? 0.5 : 0.; 2568 float tx1 = m & 0x40 ? 0.5f : 0.f;
2065 float tx2 = tx1 + 0.5; 2569 float tx2 = tx1 + 0.5f;
2066 2570
2067 glColor4f (c[0], c[1], c[2], 0.75); 2571 glColor4f (c[0], c[1], c[2], 1);
2068 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2572 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2069 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2573 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2070 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2574 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2071 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2575 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2072 } 2576 }
… …
2076 glDisable (GL_BLEND); 2580 glDisable (GL_BLEND);
2077 glDisable (GL_TEXTURE_2D); 2581 glDisable (GL_TEXTURE_2D);
2078} 2582}
2079 2583
2080void 2584void
2081fow_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)
2082 PPCODE: 2586 PPCODE:
2083{ 2587{
2084 int x, y; 2588 int x, y;
2085 int sw1 = sw + 2; 2589 int sw1 = sw + 2;
2086 int sh1 = sh + 2; 2590 int sh1 = sh + 2;
2087 int sh3 = sh * 3; 2591 int sh3 = sh * 3;
2088 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);
2089 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2595 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2090 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2596 memset (darkness1, 0, sw1*sh1);
2091 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2092 2597
2093 SvPOK_only (darkness3_sv); 2598 SvPOK_only (darkness3_sv);
2094 SvCUR_set (darkness3_sv, sw34 * sh3); 2599 SvCUR_set (darkness3_sv, sw3 * sh3);
2095 2600
2096 mx += self->x - 1; 2601 mx += self->x - 1;
2097 my += self->y - 1; 2602 my += self->y - 1;
2098
2099 memset (darkness1, 255, sw1 * sh1);
2100 2603
2101 for (y = 0; y < sh1; y++) 2604 for (y = 0; y < sh1; y++)
2102 if (0 <= y + my && y + my < self->rows) 2605 if (0 <= y + my && y + my < self->rows)
2103 { 2606 {
2104 maprow *row = self->row + (y + my); 2607 maprow *row = self->row + (y + my);
… …
2107 if (row->c0 <= x + mx && x + mx < row->c1) 2610 if (row->c0 <= x + mx && x + mx < row->c1)
2108 { 2611 {
2109 mapcell *cell = row->col + (x + mx - row->c0); 2612 mapcell *cell = row->col + (x + mx - row->c0);
2110 2613
2111 darkness1 [y * sw1 + x] = cell->darkness 2614 darkness1 [y * sw1 + x] = cell->darkness
2112 ? 255 - (cell->darkness - 1) 2615 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2113 : 255 - FOW_DARKNESS; 2616 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2114 } 2617 }
2115 } 2618 }
2116 2619
2117 for (y = 0; y < sh; ++y) 2620 for (y = 0; y < sh; ++y)
2118 for (x = 0; x < sw; ++x) 2621 for (x = 0; x < sw; ++x)
… …
2137 2640
2138 uint8_t r13 = (d13 + d23 + d12) / 3; 2641 uint8_t r13 = (d13 + d23 + d12) / 3;
2139 uint8_t r23 = d23; 2642 uint8_t r23 = d23;
2140 uint8_t r33 = (d23 + d33 + d32) / 3; 2643 uint8_t r33 = (d23 + d33 + d32) / 3;
2141 2644
2142 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2143 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2144 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2647 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2145 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2146 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 */
2147 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2650 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2148 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2149 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2150 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2653 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2151 } 2654 }
2152 2655
2153 free (darkness1); 2656 free (darkness1);
2154 2657
2155 EXTEND (SP, 3); 2658 EXTEND (SP, 3);
2156 PUSHs (sv_2mortal (newSViv (sw34))); 2659 PUSHs (sv_2mortal (newSViv (sw3)));
2157 PUSHs (sv_2mortal (newSViv (sh3))); 2660 PUSHs (sv_2mortal (newSViv (sh3)));
2158 PUSHs (darkness3_sv); 2661 PUSHs (darkness3_sv);
2159} 2662}
2160 2663
2161SV * 2664SV *
2162get_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)
2163 CODE: 2666 CODE:
2164{ 2667{
2165 int x, y, x1, y1; 2668 int x, y, x1, y1;
2166 SV *data_sv = newSV (w * h * 7 + 5); 2669 SV *data_sv = newSV (w * h * 7 + 5);
2167 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2670 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2224 else 2727 else
2225 *data++ = 0; 2728 *data++ = 0;
2226 } 2729 }
2227 } 2730 }
2228 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 {
2229 SvPOK_only (data_sv); 2735 SvPOK_only (data_sv);
2230 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2736 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2737 }
2738
2231 RETVAL = data_sv; 2739 RETVAL = data_sv;
2232} 2740}
2233 OUTPUT: 2741 OUTPUT:
2234 RETVAL 2742 RETVAL
2235 2743
2236void 2744void
2237set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2745set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2238 PPCODE: 2746 PPCODE:
2239{ 2747{
2240 int x, y, z; 2748 int x, y, z;
2241 int w, h; 2749 int w, h;
2242 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;
2243 2761
2244 if (*data++ != 0) 2762 if (*data++ != 0)
2245 return; /* version mismatch */ 2763 XSRETURN_EMPTY; /* version mismatch */
2246 2764
2247 w = *data++ << 8; w |= *data++; 2765 w = *data++ << 8; w |= *data++;
2248 h = *data++ << 8; h |= *data++; 2766 h = *data++ << 8; h |= *data++;
2249 2767
2250 // 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
… …
2262 { 2780 {
2263 maprow *row = map_get_row (self, y); 2781 maprow *row = map_get_row (self, y);
2264 2782
2265 for (x = x0; x < x1; x++) 2783 for (x = x0; x < x1; x++)
2266 { 2784 {
2785 uint8_t flags;
2786
2787 if (data + 7 >= end)
2788 XSRETURN_EMPTY;
2789
2267 uint8_t flags = *data++; 2790 flags = *data++;
2268 2791
2269 if (flags) 2792 if (flags)
2270 { 2793 {
2271 mapcell *cell = row_get_cell (row, x); 2794 mapcell *cell = row_get_cell (row, x);
2272 tileid tile[3] = { 0, 0, 0 }; 2795 tileid tile[3] = { 0, 0, 0 };
… …
2275 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2798 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2276 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2799 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2277 2800
2278 if (cell->darkness == 0) 2801 if (cell->darkness == 0)
2279 { 2802 {
2280 cell->darkness = 0; 2803 /*cell->darkness = 0;*/
2804 EXTEND (SP, 3);
2281 2805
2282 for (z = 0; z <= 2; z++) 2806 for (z = 0; z <= 2; z++)
2283 { 2807 {
2284 tileid t = tile [z]; 2808 tileid t = tile [z];
2285 2809
2286 if (t >= self->texs || (t && !self->tex [t].name)) 2810 if (t >= self->texs || (t && !self->tex [t].name))
2287 { 2811 {
2288 XPUSHs (sv_2mortal (newSViv (t))); 2812 PUSHs (sv_2mortal (newSViv (t)));
2289 need_texid (self, t); 2813 need_texid (self, t);
2290 } 2814 }
2291 2815
2292 cell->tile [z] = t; 2816 cell->tile [z] = t;
2293 } 2817 }
… …
2295 } 2819 }
2296 } 2820 }
2297 } 2821 }
2298} 2822}
2299 2823
2300MODULE = CFPlus PACKAGE = CFPlus::RW 2824MODULE = Deliantra::Client PACKAGE = DC::RW
2301 2825
2302CFPlus::RW 2826DC::RW
2303new (SV *class, SV *data_sv) 2827new (SV *klass, SV *data_sv)
2304 CODE: 2828 CODE:
2305{ 2829{
2306 STRLEN datalen; 2830 STRLEN datalen;
2307 char *data = SvPVbyte (data_sv, datalen); 2831 char *data = SvPVbyte (data_sv, datalen);
2308 2832
2309 RETVAL = SDL_RWFromConstMem (data, datalen); 2833 RETVAL = SDL_RWFromConstMem (data, datalen);
2310} 2834}
2311 OUTPUT: 2835 OUTPUT:
2312 RETVAL 2836 RETVAL
2313 2837
2314CFPlus::RW 2838DC::RW
2315new_from_file (SV *class, const char *path, const char *mode = "rb") 2839new_from_file (SV *klass, const char *path, const char *mode = "rb")
2316 CODE: 2840 CODE:
2317 RETVAL = SDL_RWFromFile (path, mode); 2841 RETVAL = SDL_RWFromFile (path, mode);
2318 OUTPUT: 2842 OUTPUT:
2319 RETVAL 2843 RETVAL
2320 2844
2321# fails on win32: 2845# fails on win32:
2322# CFPlus.xs(2268) : error C2059: syntax error : '(' 2846# dc.xs(2268) : error C2059: syntax error : '('
2323#void 2847#void
2324#close (CFPlus::RW self) 2848#close (DC::RW self)
2325# CODE: 2849# CODE:
2326# (self->(close)) (self); 2850# (self->(close)) (self);
2327 2851
2328MODULE = CFPlus PACKAGE = CFPlus::Channel 2852MODULE = Deliantra::Client PACKAGE = DC::Channel
2329 2853
2330PROTOTYPES: DISABLE 2854PROTOTYPES: DISABLE
2331 2855
2332CFPlus::Channel 2856DC::Channel
2333find () 2857find ()
2334 CODE: 2858 CODE:
2335{ 2859{
2336 RETVAL = Mix_GroupAvailable (-1); 2860 RETVAL = Mix_GroupAvailable (-1);
2337 2861
2338 if (RETVAL < 0) 2862 if (RETVAL < 0)
2339 { 2863 {
2340 RETVAL = Mix_GroupOldest (-1); 2864 RETVAL = Mix_GroupOldest (-1);
2341 2865
2342 if (RETVAL < 0) 2866 if (RETVAL < 0)
2867 {
2868 // happens sometimes, maybe it just stopped playing(?)
2869 RETVAL = Mix_GroupAvailable (-1);
2870
2871 if (RETVAL < 0)
2343 XSRETURN_UNDEF; 2872 XSRETURN_UNDEF;
2344 2873 }
2874 else
2345 Mix_HaltChannel (RETVAL); 2875 Mix_HaltChannel (RETVAL);
2346 } 2876 }
2347 2877
2348 Mix_UnregisterAllEffects (RETVAL); 2878 Mix_UnregisterAllEffects (RETVAL);
2349 Mix_Volume (RETVAL, 128); 2879 Mix_Volume (RETVAL, 128);
2350} 2880}
2351 OUTPUT: 2881 OUTPUT:
2352 RETVAL 2882 RETVAL
2353 2883
2354void 2884void
2355halt (CFPlus::Channel self) 2885halt (DC::Channel self)
2356 CODE: 2886 CODE:
2357 Mix_HaltChannel (self); 2887 Mix_HaltChannel (self);
2358 2888
2359void 2889void
2360expire (CFPlus::Channel self, int ticks = -1) 2890expire (DC::Channel self, int ticks = -1)
2361 CODE: 2891 CODE:
2362 Mix_ExpireChannel (self, ticks); 2892 Mix_ExpireChannel (self, ticks);
2363 2893
2364void 2894void
2365fade_out (CFPlus::Channel self, int ticks = -1) 2895fade_out (DC::Channel self, int ticks = -1)
2366 CODE: 2896 CODE:
2367 Mix_FadeOutChannel (self, ticks); 2897 Mix_FadeOutChannel (self, ticks);
2368 2898
2369int 2899int
2370volume (CFPlus::Channel self, int volume) 2900volume (DC::Channel self, int volume)
2371 CODE: 2901 CODE:
2372 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2902 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373 OUTPUT: 2903 OUTPUT:
2374 RETVAL 2904 RETVAL
2375 2905
2376void 2906void
2377unregister_all_effects (CFPlus::Channel self) 2907unregister_all_effects (DC::Channel self)
2378 CODE: 2908 CODE:
2379 Mix_UnregisterAllEffects (self); 2909 Mix_UnregisterAllEffects (self);
2380 2910
2381void 2911void
2382set_panning (CFPlus::Channel self, int left, int right) 2912set_panning (DC::Channel self, int left, int right)
2383 CODE: 2913 CODE:
2384 left = CLAMP (left , 0, 255); 2914 left = CLAMP (left , 0, 255);
2385 right = CLAMP (right, 0, 255); 2915 right = CLAMP (right, 0, 255);
2386 Mix_SetPanning (self, left, right); 2916 Mix_SetPanning (self, left, right);
2387 2917
2388void 2918void
2389set_distance (CFPlus::Channel self, int distance) 2919set_distance (DC::Channel self, int distance)
2390 CODE: 2920 CODE:
2391 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2921 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392 2922
2393void 2923void
2394set_position (CFPlus::Channel self, int angle, int distance) 2924set_position (DC::Channel self, int angle, int distance)
2395 CODE: 2925 CODE:
2396 2926
2397void 2927void
2398set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2928set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399 CODE: 2929 CODE:
2400{ 2930{
2401 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2931 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2932 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2403 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2933 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404} 2934}
2405 2935
2406void 2936void
2407set_reverse_stereo (CFPlus::Channel self, int flip) 2937set_reverse_stereo (DC::Channel self, int flip)
2408 CODE: 2938 CODE:
2409 Mix_SetReverseStereo (self, flip); 2939 Mix_SetReverseStereo (self, flip);
2410 2940
2411MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2941MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412 2942
2413PROTOTYPES: DISABLE 2943PROTOTYPES: DISABLE
2414 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
2415CFPlus::MixChunk 2957DC::MixChunk
2416new (SV *class, CFPlus::RW rwops) 2958new (SV *klass, DC::RW rwops)
2417 CODE: 2959 CODE:
2418 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2960 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419 OUTPUT: 2961 OUTPUT:
2420 RETVAL 2962 RETVAL
2421 2963
2422void 2964void
2423DESTROY (CFPlus::MixChunk self) 2965DESTROY (DC::MixChunk self)
2424 CODE: 2966 CODE:
2425 Mix_FreeChunk (self); 2967 Mix_FreeChunk (self);
2426 2968
2427int 2969int
2428volume (CFPlus::MixChunk self, int volume = -1) 2970volume (DC::MixChunk self, int volume = -1)
2429 CODE: 2971 CODE:
2430 if (items > 1) 2972 if (items > 1)
2431 volume = CLAMP (volume, 0, 128); 2973 volume = CLAMP (volume, 0, 128);
2432 RETVAL = Mix_VolumeChunk (self, volume); 2974 RETVAL = Mix_VolumeChunk (self, volume);
2433 OUTPUT: 2975 OUTPUT:
2434 RETVAL 2976 RETVAL
2435 2977
2436CFPlus::Channel 2978DC::Channel
2437play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2979play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438 CODE: 2980 CODE:
2439{ 2981{
2440 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2982 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441 2983
2442 if (RETVAL < 0) 2984 if (RETVAL < 0)
… …
2449 } 2991 }
2450} 2992}
2451 OUTPUT: 2993 OUTPUT:
2452 RETVAL 2994 RETVAL
2453 2995
2454MODULE = 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
2455 3009
2456int 3010int
2457volume (int volume = -1) 3011volume (int volume = -1)
2458 PROTOTYPE: ;$ 3012 PROTOTYPE: ;$
2459 CODE: 3013 CODE:
… …
2471void 3025void
2472halt () 3026halt ()
2473 CODE: 3027 CODE:
2474 Mix_HaltMusic (); 3028 Mix_HaltMusic ();
2475 3029
3030int
3031playing ()
3032 CODE:
3033 RETVAL = Mix_PlayingMusic ();
3034 OUTPUT:
3035 RETVAL
3036
2476CFPlus::MixMusic 3037DC::MixMusic
2477new (SV *class, CFPlus::RW rwops) 3038new (SV *klass, DC::RW rwops)
2478 CODE: 3039 CODE:
2479 RETVAL = Mix_LoadMUS_RW (rwops); 3040 RETVAL = Mix_LoadMUS_RW (rwops);
2480 OUTPUT: 3041 OUTPUT:
2481 RETVAL 3042 RETVAL
2482 3043
2483void 3044void
2484DESTROY (CFPlus::MixMusic self) 3045DESTROY (DC::MixMusic self)
2485 CODE: 3046 CODE:
2486 Mix_FreeMusic (self); 3047 Mix_FreeMusic (self);
2487 3048
2488int 3049int
2489play (CFPlus::MixMusic self, int loops = -1) 3050play (DC::MixMusic self, int loops = -1)
2490 CODE: 3051 CODE:
2491 RETVAL = Mix_PlayMusic (self, loops); 3052 RETVAL = Mix_PlayMusic (self, loops);
2492 OUTPUT: 3053 OUTPUT:
2493 RETVAL 3054 RETVAL
2494 3055
2495void 3056void
2496fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3057fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497 CODE: 3058 CODE:
2498 Mix_FadeInMusicPos (self, loops, ms, position); 3059 Mix_FadeInMusicPos (self, loops, ms, position);
2499 3060
2500MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3061MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501 3062
2502PROTOTYPES: ENABLE 3063PROTOTYPES: ENABLE
2503 3064
2504BOOT: 3065BOOT:
2505{ 3066{
2506 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3067 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507 static const struct { 3068 static const struct {
2508 const char *name; 3069 const char *name;
2509 IV iv; 3070 IV iv;
2510 } *civ, const_iv[] = { 3071 } *civ, const_iv[] = {
2511# define const_iv(name) { # name, (IV)name } 3072# define const_iv(name) { # name, (IV)name }
2512 const_iv (GL_VENDOR), 3073 const_iv (GL_VENDOR),
2513 const_iv (GL_VERSION), 3074 const_iv (GL_VERSION),
2514 const_iv (GL_EXTENSIONS), 3075 const_iv (GL_EXTENSIONS),
3076 const_iv (GL_MAX_TEXTURE_UNITS),
2515 const_iv (GL_COLOR_MATERIAL), 3077 const_iv (GL_COLOR_MATERIAL),
2516 const_iv (GL_SMOOTH), 3078 const_iv (GL_SMOOTH),
2517 const_iv (GL_FLAT), 3079 const_iv (GL_FLAT),
2518 const_iv (GL_DITHER), 3080 const_iv (GL_DITHER),
2519 const_iv (GL_BLEND), 3081 const_iv (GL_BLEND),
… …
2531 const_iv (GL_ZERO), 3093 const_iv (GL_ZERO),
2532 const_iv (GL_SRC_ALPHA), 3094 const_iv (GL_SRC_ALPHA),
2533 const_iv (GL_DST_ALPHA), 3095 const_iv (GL_DST_ALPHA),
2534 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3096 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2535 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),
2536 const_iv (GL_SRC_ALPHA_SATURATE), 3102 const_iv (GL_SRC_ALPHA_SATURATE),
2537 const_iv (GL_RGB), 3103 const_iv (GL_RGB),
2538 const_iv (GL_RGBA), 3104 const_iv (GL_RGBA),
2539 const_iv (GL_RGBA4), 3105 const_iv (GL_RGBA4),
2540 const_iv (GL_RGBA8), 3106 const_iv (GL_RGBA8),
… …
2546 const_iv (GL_INTENSITY), 3112 const_iv (GL_INTENSITY),
2547 const_iv (GL_LUMINANCE), 3113 const_iv (GL_LUMINANCE),
2548 const_iv (GL_LUMINANCE_ALPHA), 3114 const_iv (GL_LUMINANCE_ALPHA),
2549 const_iv (GL_FLOAT), 3115 const_iv (GL_FLOAT),
2550 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),
2551 const_iv (GL_COMPILE), 3123 const_iv (GL_COMPILE),
2552 const_iv (GL_PROXY_TEXTURE_1D), 3124 const_iv (GL_PROXY_TEXTURE_1D),
2553 const_iv (GL_PROXY_TEXTURE_2D), 3125 const_iv (GL_PROXY_TEXTURE_2D),
2554 const_iv (GL_TEXTURE_1D), 3126 const_iv (GL_TEXTURE_1D),
2555 const_iv (GL_TEXTURE_2D), 3127 const_iv (GL_TEXTURE_2D),
… …
2594 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3166 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595 const_iv (GL_POINT_SMOOTH_HINT), 3167 const_iv (GL_POINT_SMOOTH_HINT),
2596 const_iv (GL_LINE_SMOOTH_HINT), 3168 const_iv (GL_LINE_SMOOTH_HINT),
2597 const_iv (GL_POLYGON_SMOOTH_HINT), 3169 const_iv (GL_POLYGON_SMOOTH_HINT),
2598 const_iv (GL_GENERATE_MIPMAP_HINT), 3170 const_iv (GL_GENERATE_MIPMAP_HINT),
3171 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599 const_iv (GL_FASTEST), 3172 const_iv (GL_FASTEST),
2600 const_iv (GL_DONT_CARE), 3173 const_iv (GL_DONT_CARE),
2601 const_iv (GL_NICEST), 3174 const_iv (GL_NICEST),
2602 const_iv (GL_V2F), 3175 const_iv (GL_V2F),
2603 const_iv (GL_V3F), 3176 const_iv (GL_V3F),
2604 const_iv (GL_T2F_V3F), 3177 const_iv (GL_T2F_V3F),
2605 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),
2606# undef const_iv 3182# undef const_iv
2607 }; 3183 };
2608 3184
2609 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--)
2610 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3186 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2611 3187
2612 texture_av = newAV (); 3188 texture_av = newAV ();
2613 AvREAL_off (texture_av); 3189 AvREAL_off (texture_av);
2614} 3190}
2615 3191
2616char * 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 *
2617gl_vendor () 3202gl_vendor ()
2618 CODE: 3203 CODE:
2619 RETVAL = (char *)glGetString (GL_VENDOR); 3204 RETVAL = (const char *)glGetString (GL_VENDOR);
2620 OUTPUT: 3205 OUTPUT:
2621 RETVAL 3206 RETVAL
2622 3207
2623char * 3208const char *
2624gl_version () 3209gl_version ()
2625 CODE: 3210 CODE:
2626 RETVAL = (char *)glGetString (GL_VERSION); 3211 RETVAL = (const char *)glGetString (GL_VERSION);
2627 OUTPUT: 3212 OUTPUT:
2628 RETVAL 3213 RETVAL
2629 3214
2630char * 3215const char *
2631gl_extensions () 3216gl_extensions ()
2632 CODE: 3217 CODE:
2633 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3218 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2634 OUTPUT: 3219 OUTPUT:
2635 RETVAL 3220 RETVAL
2636 3221
2637const char *glGetString (GLenum pname) 3222const char *glGetString (GLenum pname)
3223 CODE:
3224 RETVAL = (const char *)glGetString (pname);
3225 OUTPUT:
3226 RETVAL
2638 3227
2639GLint glGetInteger (GLenum pname) 3228GLint glGetInteger (GLenum pname)
2640 CODE: 3229 CODE:
2641 glGetIntegerv (pname, &RETVAL); 3230 glGetIntegerv (pname, &RETVAL);
2642 OUTPUT: 3231 OUTPUT:
… …
2650 3239
2651int glGetError () 3240int glGetError ()
2652 3241
2653void glFinish () 3242void glFinish ()
2654 3243
3244void glFlush ()
3245
2655void glClear (int mask) 3246void glClear (int mask)
2656 3247
2657void glClearColor (float r, float g, float b, float a = 1.0) 3248void glClearColor (float r, float g, float b, float a = 1.0)
2658 PROTOTYPE: @ 3249 PROTOTYPE: @
2659 3250
… …
2668void glBlendFunc (int sfactor, int dfactor) 3259void glBlendFunc (int sfactor, int dfactor)
2669 3260
2670void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3261void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2671 CODE: 3262 CODE:
2672 gl_BlendFuncSeparate (sa, da, saa, daa); 3263 gl_BlendFuncSeparate (sa, da, saa, daa);
3264
3265# void glBlendEquation (int se)
2673 3266
2674void glDepthMask (int flag) 3267void glDepthMask (int flag)
2675 3268
2676void glLogicOp (int opcode) 3269void glLogicOp (int opcode)
2677 3270
… …
2712void glRotate (float angle, float x, float y, float z) 3305void glRotate (float angle, float x, float y, float z)
2713 CODE: 3306 CODE:
2714 glRotatef (angle, x, y, z); 3307 glRotatef (angle, x, y, z);
2715 3308
2716void 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: @
2717 ALIAS: 3311 ALIAS:
2718 glColor_premultiply = 1 3312 glColor_premultiply = 1
2719 CODE: 3313 CODE:
2720 if (ix) 3314 if (ix)
2721 { 3315 {
… …
2741 3335
2742void glRect (float x1, float y1, float x2, float y2) 3336void glRect (float x1, float y1, float x2, float y2)
2743 CODE: 3337 CODE:
2744 glRectf (x1, y1, x2, y2); 3338 glRectf (x1, y1, x2, y2);
2745 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
2746PROTOTYPES: ENABLE 3349PROTOTYPES: ENABLE
2747 3350
2748void glBegin (int mode) 3351void glBegin (int mode)
2749 3352
2750void glEnd () 3353void glEnd ()
… …
2782void 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)
2783 CODE: 3386 CODE:
2784 if (gl.SeparableFilter2D) 3387 if (gl.SeparableFilter2D)
2785 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3388 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786 3389
2787void 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)
2788 3391
2789void 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)
2790 3393
2791void glDrawPixels (int width, int height, int format, int type, char *pixels) 3394void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792 3395
… …
2818 3421
2819void glEndList () 3422void glEndList ()
2820 3423
2821void glCallList (int list) 3424void glCallList (int list)
2822 3425
2823MODULE = 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
2824 3432
2825PROTOTYPES: DISABLE 3433PROTOTYPES: DISABLE
2826 3434
2827void 3435void
2828find_widget (SV *self, NV x, NV y) 3436find_widget (SV *self, NV x, NV y)
2829 PPCODE: 3437 PPCODE:
2830{ 3438{
2831 if (within_widget (self, x, y)) 3439 if (within_widget (self, x, y))
2832 XPUSHs (self); 3440 XPUSHs (self);
2833} 3441}
2834 3442
2835BOOT: 3443BOOT:
2836{ 3444{
2837 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3445 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838 3446
2839 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);
2840 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);
2841 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);
2842 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);
2843} 3451}
2844 3452
2845void 3453void
2846draw (SV *self) 3454draw (SV *self)
2847 CODE: 3455 CODE:
2848{ 3456{
2849 HV *hv; 3457 HV *hv;
2850 SV **svp; 3458 SV **svp;
2851 NV x, y, w, h; 3459 NV x, y, w, h;
2852 SV *draw_x_sv = GvSV (draw_x_gv); 3460 SV *draw_x_sv = GvSV (draw_x_gv);
2853 SV *draw_y_sv = GvSV (draw_y_gv); 3461 SV *draw_y_sv = GvSV (draw_y_gv);
2854 SV *draw_w_sv = GvSV (draw_w_gv); 3462 SV *draw_w_sv = GvSV (draw_w_gv);
2855 SV *draw_h_sv = GvSV (draw_h_gv); 3463 SV *draw_h_sv = GvSV (draw_h_gv);
2856 SV *hover;
2857 double draw_x, draw_y, draw_w, draw_h; 3464 double draw_x, draw_y;
2858 3465
2859 if (!SvROK (self)) 3466 if (!SvROK (self))
2860 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3467 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861 3468
2862 hv = (HV *)SvRV (self); 3469 hv = (HV *)SvRV (self);
2863 3470
2864 if (SvTYPE (hv) != SVt_PVHV) 3471 if (SvTYPE (hv) != SVt_PVHV)
2865 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3472 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866 3473
2867 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.;
2868 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.;
2869 3476
2870 if (!h || !w) 3477 if (!h || !w)
… …
2890 { 3497 {
2891 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3498 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892 3499
2893 if (svp && SvTRUE (*svp)) 3500 if (svp && SvTRUE (*svp))
2894 { 3501 {
2895 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);
2896 glEnable (GL_BLEND); 3503 glEnable (GL_BLEND);
2897 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3504 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898 glBegin (GL_QUADS); 3505 glBegin (GL_QUADS);
2899 glVertex2f (0, 0); 3506 glVertex2f (0, 0);
2900 glVertex2f (w, 0); 3507 glVertex2f (w, 0);
… …
2903 glEnd (); 3510 glEnd ();
2904 glDisable (GL_BLEND); 3511 glDisable (GL_BLEND);
2905 } 3512 }
2906 } 3513 }
2907#if 0 3514#if 0
2908 if ($ENV{CFPLUS_DEBUG} & 1) { 3515 // draw borders, for debugging
2909 glPushMatrix; 3516 glPushMatrix ();
2910 glColor 1, 1, 0, 1; 3517 glColor4f (1., 1., 0., 1.);
2911 glTranslate 0.375, 0.375; 3518 glTranslatef (.5, .5, 0.);
2912 glBegin GL_LINE_LOOP; 3519 glBegin (GL_LINE_LOOP);
2913 glVertex 0 , 0; 3520 glVertex2f (0 , 0);
2914 glVertex $self->{w} - 1, 0; 3521 glVertex2f (w - 1, 0);
2915 glVertex $self->{w} - 1, $self->{h} - 1; 3522 glVertex2f (w - 1, h - 1);
2916 glVertex 0 , $self->{h} - 1; 3523 glVertex2f (0 , h - 1);
2917 glEnd; 3524 glEnd ();
2918 glPopMatrix; 3525 glPopMatrix ();
2919 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920 }
2921#endif 3526#endif
2922 PUSHMARK (SP); 3527 PUSHMARK (SP);
2923 XPUSHs (self); 3528 XPUSHs (self);
2924 PUTBACK; 3529 PUTBACK;
2925 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