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

Diff Legend

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