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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines