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.326 by root, Sun Nov 18 03:06:13 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines