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.203 by root, Thu Jul 19 13:45:16 2007 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 2018 UTC

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

Diff Legend

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