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.206 by root, Thu Jul 19 23:29:16 2007 UTC vs.
Revision 1.334 by root, Mon Nov 19 01:37:28 2018 UTC

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

Diff Legend

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