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.196 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 2018 UTC

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

Diff Legend

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